diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index af951cc3e805..fb5f6c8e9a0b 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1259,6 +1259,13 @@ as many tests should be enabled as possible. Failing tests can still be a good indication that the package is not in a valid state. ::: +::: {.note} +We only want to test the functionality of a package. In particular, we are not +interested in coverage, formatting, and type checking. If pytest fails with +`unrecognized arguments: --cov`, add `pytest-cov-stub` to `nativeCheckInputs` +rather than `pytest-cov`. +::: + #### Using pytest {#using-pytest} Pytest is the most common test runner for python repositories. A trivial diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index f739ba9cd1f5..02b08039812b 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -21,7 +21,7 @@ -- Create the first release note entry in this section! +- Added `rewriteURL` attribute to the nixpkgs `config`, to allow for rewriting the URLs downloaded by `fetchurl`. ## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib} diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 29b57e9f6d31..43795dfc94f6 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -599,6 +599,8 @@ Additional file types can be supported by setting the `unpackCmd` variable (see The list of source files or directories to be unpacked or copied. One of these must be set. Note that if you use `srcs`, you should also set `sourceRoot` or `setSourceRoot`. +These should ideally actually be sources and licensed under a FLOSS license. If you have to use a binary upstream release or package non-free software, make sure you correctly mark your derivation as such in the [`sourceProvenance`](#var-meta-sourceProvenance) and [`license`](#sec-meta-license) fields of the [`meta`](#chap-meta) section. + ##### `sourceRoot` {#var-stdenv-sourceRoot} After unpacking all of `src` and `srcs`, if neither of `sourceRoot` and `setSourceRoot` are set, `unpackPhase` of the generic builder checks that the unpacking produced a single directory and moves the current working directory into it. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d386ed624478..835ec2814e89 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2896,17 +2896,11 @@ name = "Brandon Elam Barker"; }; bbenne10 = { - email = "Bryan.Bennett@protonmail.com"; + email = "Bryan.Bennett+nixpkgs@proton.me"; matrix = "@bryan.bennett:matrix.org"; github = "bbenne10"; githubId = 687376; name = "Bryan Bennett"; - keys = [ - { - # compare with https://keybase.io/bbenne10 - fingerprint = "41EA 00B4 00F9 6970 1CB2 D3AF EF90 E3E9 8B8F 5C0B"; - } - ]; }; bbenno = { email = "nix@bbenno.com"; @@ -16167,7 +16161,7 @@ email = "mightyiampresence@gmail.com"; github = "mightyiam"; githubId = 635591; - name = "Shahar Dawn Or"; + name = "Shahar \"Dawn\" Or"; }; mihaimaruseac = { email = "mihaimaruseac@gmail.com"; @@ -17721,6 +17715,12 @@ github = "nikstur"; githubId = 61635709; }; + nilathedragon = { + email = "nilathedragon@pm.me"; + name = "Nila The Dragon"; + github = "nilathedragon"; + githubId = 43315617; + }; nilp0inter = { email = "robertomartinezp@gmail.com"; github = "nilp0inter"; @@ -27252,6 +27252,11 @@ githubId = 4113027; name = "Jesper Geertsen Jonsson"; }; + yethal = { + github = "yethal"; + githubId = 26117918; + name = "Yethal"; + }; yinfeng = { email = "lin.yinfeng@outlook.com"; github = "linyinfeng"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 3ac3b6fe6e19..35aa999a58be 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -913,6 +913,7 @@ with lib.maintainers; ngi = { members = [ eljamm + ethancedwards8 fricklerhandwerk wegank ]; diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index bde64c2c14e8..625dd1516cd5 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -749,6 +749,15 @@ "module-services-davis-basic-usage": [ "index.html#module-services-davis-basic-usage" ], + "module-services-draupnir": [ + "index.html#module-services-draupnir" + ], + "module-services-draupnir-setup": [ + "index.html#module-services-draupnir-setup" + ], + "module-services-draupnir-setup-ems": [ + "index.html#module-services-draupnir-setup-ems" + ], "module-services-castopod": [ "index.html#module-services-castopod" ], diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 4c44cc4e5b08..fa08bb988f7e 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -22,8 +22,12 @@ - [Broadcast Box](https://github.com/Glimesh/broadcast-box), a WebRTC broadcast server. Available as [services.broadcast-box](options.html#opt-services.broadcast-box.enable). +- [Draupnir](https://github.com/the-draupnir-project/draupnir), a Matrix moderation bot. Available as [services.draupnir](#opt-services.draupnir.enable). + - [SuiteNumérique Docs](https://github.com/suitenumerique/docs), a collaborative note taking, wiki and documentation web platform and alternative to Notion or Outline. Available as [services.lasuite-docs](#opt-services.lasuite-docs.enable). +[dwl](https://codeberg.org/dwl/dwl), a compact, hackable compositor for Wayland based on wlroots. Available as [programs.dwl](#opt-programs.dwl.enable). + ## Backward Incompatibilities {#sec-release-25.11-incompatibilities} @@ -40,5 +44,7 @@ - `services.clamsmtp` is unmaintained and was removed from Nixpkgs. +- `services.dnscrypt-proxy2` gains a `package` option to specify dnscrypt-proxy package to use. + - `amdgpu` kernel driver overdrive mode can now be enabled by setting [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable) and customized through [hardware.amdgpu.overdrive.ppfeaturemask](#opt-hardware.amdgpu.overdrive.ppfeaturemask). This allows for fine-grained control over the GPU's performance and maybe required by overclocking softwares like Corectrl and Lact. These new options replace old options such as {option}`programs.corectrl.gpuOverclock.enable` and {option}`programs.tuxclocker.enableAMD`. diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index ae09839d071d..1038fadec37d 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -49,6 +49,7 @@ if (-e "/etc/nixos-generate-config.conf") { $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path } $kernel = $cfg->val("Defaults", "Kernel") // $kernel; + $flake = $cfg->val("Defaults", "Flake") // $flake; } for (my $n = 0; $n < scalar @ARGV; $n++) { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f093b10dc188..34419e33f3f3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -332,6 +332,7 @@ ./programs/vivid.nix ./programs/wavemon.nix ./programs/wayland/cardboard.nix + ./programs/wayland/dwl.nix ./programs/wayland/gtklock.nix ./programs/wayland/hyprland.nix ./programs/wayland/hyprlock.nix @@ -757,6 +758,7 @@ ./services/matrix/conduit.nix ./services/matrix/continuwuity.nix ./services/matrix/dendrite.nix + ./services/matrix/draupnir.nix ./services/matrix/hebbot.nix ./services/matrix/hookshot.nix ./services/matrix/lk-jwt-service.nix diff --git a/nixos/modules/programs/gpu-screen-recorder.nix b/nixos/modules/programs/gpu-screen-recorder.nix index 5a9401943dfe..156123de7a38 100644 --- a/nixos/modules/programs/gpu-screen-recorder.nix +++ b/nixos/modules/programs/gpu-screen-recorder.nix @@ -34,6 +34,12 @@ in capabilities = "cap_sys_admin+ep"; source = "${package}/bin/gsr-kms-server"; }; + security.wrappers."gpu-screen-recorder" = { + owner = "root"; + group = "root"; + capabilities = "cap_sys_nice+ep"; + source = "${package}/bin/gpu-screen-recorder"; + }; }; meta.maintainers = with lib.maintainers; [ timschumi ]; diff --git a/nixos/modules/programs/wayland/dwl.nix b/nixos/modules/programs/wayland/dwl.nix new file mode 100644 index 000000000000..5e3ac932b212 --- /dev/null +++ b/nixos/modules/programs/wayland/dwl.nix @@ -0,0 +1,104 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.dwl; +in +{ + options.programs.dwl = { + enable = lib.mkEnableOption '' + Dwl is a compact, hackable compositor for Wayland based on wlroots. + You can manually launch Dwl by executing "exec dwl" on a TTY. + ''; + + package = lib.mkPackageOption pkgs "dwl" { + example = '' + # Lets apply bar patch from: + # https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/bar + (pkgs.dwl.override { + configH = ./dwl-config.h; + }).overrideAttrs (oldAttrs: { + buildInputs = + oldAttrs.buildInputs or [] + ++ [ + pkgs.libdrm + pkgs.fcft + ]; + patches = oldAttrs.patches or [] ++ [ + ./bar-0.7.patch + ]; + }); + ''; + }; + + extraSessionCommands = lib.mkOption { + default = ""; + type = lib.types.lines; + description = '' + Shell commands executed just before dwl is started. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + # Create systemd target for dwl session + systemd.user.targets.dwl-session = { + description = "dwl compositor session"; + documentation = [ "man:systemd.special(7)" ]; + bindsTo = [ "graphical-session.target" ]; + wants = [ "graphical-session-pre.target" ]; + after = [ "graphical-session-pre.target" ]; + }; + + # Create wrapper script for dwl + environment.etc."xdg/dwl-session" = { + text = '' + #!${pkgs.runtimeShell} + # Import environment variables + ${cfg.extraSessionCommands} + # Setup systemd user environment + systemctl --user import-environment DISPLAY WAYLAND_DISPLAY + systemctl --user start dwl-session.target + # Start dwl + exec ${lib.getExe cfg.package} + ''; + mode = "0755"; # Make it executable + }; + + # Create desktop entry for display managers + services.displayManager.sessionPackages = + let + dwlDesktopFile = pkgs.writeTextFile { + name = "dwl-desktop-entry"; + destination = "/share/wayland-sessions/dwl.desktop"; + text = '' + [Desktop Entry] + Name=dwl + Comment=Dynamic window manager for Wayland + Exec=/etc/xdg/dwl-session + Type=Application + ''; + }; + + dwlSession = pkgs.symlinkJoin { + name = "dwl-session"; + paths = [ dwlDesktopFile ]; + passthru.providedSessions = [ "dwl" ]; + }; + in + [ dwlSession ]; + + # Configure XDG portal for dwl (minimal configuration) + xdg.portal.config.dwl.default = lib.mkDefault [ + "wlr" + "gtk" + ]; + }; + + meta.maintainers = with lib.maintainers; [ gurjaka ]; +} diff --git a/nixos/modules/services/matrix/draupnir.md b/nixos/modules/services/matrix/draupnir.md new file mode 100644 index 000000000000..1d6bce2c4e63 --- /dev/null +++ b/nixos/modules/services/matrix/draupnir.md @@ -0,0 +1,62 @@ +# Draupnir (Matrix Moderation Bot) {#module-services-draupnir} + +This chapter will show you how to set up your own, self-hosted +[Draupnir](https://github.com/the-draupnir-project/Draupnir) instance. + +As an all-in-one moderation tool, it can protect your server from +malicious invites, spam messages, and whatever else you don't want. +In addition to server-level protection, Draupnir is great for communities +wanting to protect their rooms without having to use their personal +accounts for moderation. + +The bot by default includes support for bans, redactions, anti-spam, +server ACLs, room directory changes, room alias transfers, account +deactivation, room shutdown, and more. (This depends on homeserver configuration and implementation.) + +See the [README](https://github.com/the-draupnir-project/draupnir#readme) +page and the [Moderator's guide](https://the-draupnir-project.github.io/draupnir-documentation/moderator/setting-up-and-configuring) +for additional instructions on how to setup and use Draupnir. + +For [additional settings](#opt-services.draupnir.settings) +see [the default configuration](https://github.com/the-draupnir-project/Draupnir/blob/main/config/default.yaml). + +## Draupnir Setup {#module-services-draupnir-setup} + +First create a new unencrypted, private room which will be used as the management room for Draupnir. +This is the room in which moderators will interact with Draupnir and where it will log possible errors and debugging information. +You'll need to set this room ID or alias in [services.draupnir.settings.managementRoom](#opt-services.draupnir.settings.managementRoom). + +Next, create a new user for Draupnir on your homeserver, if one does not already exist. + +The Draupnir Matrix user expects to be free of any rate limiting. +See [Synapse #6286](https://github.com/matrix-org/synapse/issues/6286) +for an example on how to achieve this. + +If you want Draupnir to be able to deactivate users, move room aliases, shut down rooms, etc. +you'll need to make the Draupnir user a Matrix server admin. + +Now invite the Draupnir user to the management room. +Draupnir will automatically try to join this room on startup. + +```nix +{ + services.draupnir = { + enable = true; + + settings = { + homeserverUrl = "https://matrix.org"; + managementRoom = "!yyy:example.org"; + }; + + secrets = { + accessToken = "/path/to/secret/containing/access-token"; + }; + }; +} +``` + +### Element Matrix Services (EMS) {#module-services-draupnir-setup-ems} + +If you are using a managed ["Element Matrix Services (EMS)"](https://ems.element.io/) +server, you will need to consent to the terms and conditions. Upon startup, an error +log entry with a URL to the consent page will be generated. diff --git a/nixos/modules/services/matrix/draupnir.nix b/nixos/modules/services/matrix/draupnir.nix new file mode 100644 index 000000000000..e4dfa5d2917b --- /dev/null +++ b/nixos/modules/services/matrix/draupnir.nix @@ -0,0 +1,257 @@ +{ + config, + options, + lib, + pkgs, + ... +}: + +let + cfg = config.services.draupnir; + opt = options.services.draupnir; + + format = pkgs.formats.yaml { }; + configFile = format.generate "draupnir.yaml" cfg.settings; + + inherit (lib) + literalExpression + mkEnableOption + mkOption + mkPackageOption + mkRemovedOptionModule + mkRenamedOptionModule + types + ; +in +{ + imports = [ + # Removed options for those migrating from the Mjolnir module + (mkRenamedOptionModule + [ "services" "draupnir" "dataPath" ] + [ "services" "draupnir" "settings" "dataPath" ] + ) + (mkRenamedOptionModule + [ "services" "draupnir" "homeserverUrl" ] + [ "services" "draupnir" "settings" "homeserverUrl" ] + ) + (mkRenamedOptionModule + [ "services" "draupnir" "managementRoom" ] + [ "services" "draupnir" "settings" "managementRoom" ] + ) + (mkRenamedOptionModule + [ "services" "draupnir" "accessTokenFile" ] + [ "services" "draupnir" "secrets" "accessToken" ] + ) + (mkRemovedOptionModule [ "services" "draupnir" "pantalaimon" ] '' + `services.draupnir.pantalaimon.*` has been removed because it depends on the deprecated and vulnerable + libolm library for end-to-end encryption and upstream support for Pantalaimon in Draupnir is limited. + See for details. + If you nontheless require E2EE via Pantalaimon, you can configure `services.pantalaimon-headless.instances` + yourself and use that with `services.draupnir.settings.pantalaimon` and `services.draupnir.secrets.pantalaimon.password`. + '') + ]; + + options.services.draupnir = { + enable = mkEnableOption "Draupnir, a moderations bot for Matrix"; + + package = mkPackageOption pkgs "draupnir" { }; + + settings = mkOption { + example = literalExpression '' + { + homeserverUrl = "https://matrix.org"; + managementRoom = "#moderators:example.org"; + + autojoinOnlyIfManager = true; + automaticallyRedactForReasons = [ "spam" "advertising" ]; + } + ''; + description = '' + Free-form settings written to Draupnir's configuration file. + See [Draupnir's default configuration](https://github.com/the-draupnir-project/Draupnir/blob/main/config/default.yaml) for available settings. + ''; + default = { }; + type = types.submodule { + freeformType = format.type; + options = { + homeserverUrl = mkOption { + type = types.str; + example = "https://matrix.org"; + description = '' + Base URL of the Matrix homeserver that provides the Client-Server API. + + ::: {.note} + When using Pantalaimon, set this to the Pantalaimon URL and + {option}`${opt.settings}.rawHomeserverUrl` to the public URL. + ::: + ''; + }; + + rawHomeserverUrl = mkOption { + type = types.str; + example = "https://matrix.org"; + default = cfg.settings.homeserverUrl; + defaultText = literalExpression "config.${opt.settings}.homeserverUrl"; + description = '' + Public base URL of the Matrix homeserver that provides the Client-Server API when using the Draupnir's + [Report forwarding feature](https://the-draupnir-project.github.io/draupnir-documentation/bot/homeserver-administration#report-forwarding). + + ::: {.warning} + When using Pantalaimon, do not set this to the Pantalaimon URL! + ::: + ''; + }; + + managementRoom = mkOption { + type = types.str; + example = "#moderators:example.org"; + description = '' + The room ID or alias where moderators can use the bot's functionality. + + The bot has no access controls, so anyone in this room can use the bot - secure this room! + Do not enable end-to-end encryption for this room, unless set up with Pantalaimon. + + ::: {.warning} + When using a room alias, make sure the alias used is on the local homeserver! + This prevents an issue where the control room becomes undefined when the alias can't be resolved. + ::: + ''; + }; + + dataPath = mkOption { + type = types.path; + readOnly = true; + default = "/var/lib/draupnir"; + description = '' + The path Draupnir will store its state/data in. + + ::: {.warning} + This option is read-only. + ::: + + ::: {.note} + If you want to customize where this data is stored, use a bind mount. + ::: + ''; + }; + }; + }; + }; + + secrets = { + accessToken = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + File containing the access token for Draupnir's Matrix account + to be used in place of {option}`${opt.settings}.accessToken`. + ''; + }; + + pantalaimon.password = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + File containing the password for Draupnir's Matrix account when used in + conjunction with Pantalaimon to be used in place of + {option}`${opt.settings}.pantalaimon.password`. + + ::: {.warning} + Take note that upstream has limited Pantalaimon and E2EE support: + and + . + ::: + ''; + }; + + web.synapseHTTPAntispam.authorization = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + File containing the secret token when using the Synapse HTTP Antispam module + to be used in place of + {option}`${opt.settings}.web.synapseHTTPAntispam.authorization`. + + See for details. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + # Removed option for those migrating from the Mjolnir module - mkRemovedOption module does *not* work with submodules. + assertion = !(cfg.settings ? protectedRooms); + message = "Unset ${opt.settings}.protectedRooms, as it is unsupported on Draupnir. Add these rooms via `!draupnir rooms add` instead."; + } + ]; + + systemd.services.draupnir = { + description = "Draupnir - a moderation bot for Matrix"; + wants = [ + "network-online.target" + "matrix-synapse.service" + "conduit.service" + "dendrite.service" + ]; + after = [ + "network-online.target" + "matrix-synapse.service" + "conduit.service" + "dendrite.service" + ]; + wantedBy = [ "multi-user.target" ]; + + startLimitIntervalSec = 0; + serviceConfig = { + ExecStart = toString ( + [ + (lib.getExe cfg.package) + "--draupnir-config" + configFile + ] + ++ lib.optionals (cfg.secrets.accessToken != null) [ + "--access-token-path" + "%d/access_token" + ] + ++ lib.optionals (cfg.secrets.pantalaimon.password != null) [ + "--pantalaimon-password-path" + "%d/pantalaimon_password" + ] + ++ lib.optionals (cfg.secrets.web.synapseHTTPAntispam.authorization != null) [ + "--http-antispam-authorization-path" + "%d/http_antispam_authorization" + ] + ); + + WorkingDirectory = "/var/lib/draupnir"; + StateDirectory = "draupnir"; + StateDirectoryMode = "0700"; + ProtectHome = true; + PrivateDevices = true; + Restart = "on-failure"; + RestartSec = "5s"; + DynamicUser = true; + LoadCredential = + lib.optionals (cfg.secrets.accessToken != null) [ + "access_token:${cfg.secrets.accessToken}" + ] + ++ lib.optionals (cfg.secrets.pantalaimon.password != null) [ + "pantalaimon_password:${cfg.secrets.pantalaimon.password}" + ] + ++ lib.optionals (cfg.secrets.web.synapseHTTPAntispam.authorization != null) [ + "http_antispam_authorization:${cfg.secrets.web.synapseHTTPAntispam.authorization}" + ]; + }; + }; + }; + + meta = { + doc = ./draupnir.md; + maintainers = with lib.maintainers; [ + RorySys + emilylange + ]; + }; +} diff --git a/nixos/modules/services/networking/dnscrypt-proxy2.nix b/nixos/modules/services/networking/dnscrypt-proxy2.nix index 273d0b3a6bbb..d305d8cb524b 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -4,22 +4,25 @@ pkgs, ... }: -with lib; let + cfg = config.services.dnscrypt-proxy2; + in { options.services.dnscrypt-proxy2 = { - enable = mkEnableOption "dnscrypt-proxy2"; + enable = lib.mkEnableOption "dnscrypt-proxy2"; - settings = mkOption { + package = lib.mkPackageOption pkgs "dnscrypt-proxy" { }; + + settings = lib.mkOption { description = '' Attrset that is converted and passed as TOML config file. For available params, see: ''; - example = literalExpression '' + example = lib.literalExpression '' { sources.public-resolvers = { urls = [ "https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md" ]; @@ -29,27 +32,27 @@ in }; } ''; - type = types.attrs; + type = lib.types.attrs; default = { }; }; - upstreamDefaults = mkOption { + upstreamDefaults = lib.mkOption { description = '' Whether to base the config declared in {option}`services.dnscrypt-proxy2.settings` on the upstream example config () Disable this if you want to declare your dnscrypt config from scratch. ''; - type = types.bool; + type = lib.types.bool; default = true; }; - configFile = mkOption { + configFile = lib.mkOption { description = '' Path to TOML config file. See: If this option is set, it will override any configuration done in options.services.dnscrypt-proxy2.settings. ''; example = "/etc/dnscrypt-proxy/dnscrypt-proxy.toml"; - type = types.path; + type = lib.types.path; default = pkgs.runCommand "dnscrypt-proxy.toml" { @@ -70,11 +73,11 @@ in } ${pkgs.buildPackages.remarshal}/bin/json2toml < config.json > $out ''; - defaultText = literalMD "TOML file generated from {option}`services.dnscrypt-proxy2.settings`"; + defaultText = lib.literalMD "TOML file generated from {option}`services.dnscrypt-proxy2.settings`"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { networking.nameservers = lib.mkDefault [ "127.0.0.1" ]; @@ -94,7 +97,7 @@ in AmbientCapabilities = "CAP_NET_BIND_SERVICE"; CacheDirectory = "dnscrypt-proxy"; DynamicUser = true; - ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${cfg.configFile}"; + ExecStart = "${lib.getExe cfg.package} -config ${cfg.configFile}"; LockPersonality = true; LogsDirectory = "dnscrypt-proxy"; MemoryDenyWriteExecute = true; diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index aa205d1f60b4..ff46a52ca17a 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -5,8 +5,6 @@ ... }: -with lib; - let cfg = config.services.murmur; forking = cfg.logFile != null; @@ -18,64 +16,49 @@ let autobanTimeframe=${toString cfg.autobanTimeframe} autobanTime=${toString cfg.autobanTime} - logfile=${optionalString (cfg.logFile != null) cfg.logFile} - ${optionalString forking "pidfile=/run/murmur/murmurd.pid"} + logfile=${lib.optionalString (cfg.logFile != null) cfg.logFile} + ${lib.optionalString forking "pidfile=/run/murmur/murmurd.pid"} welcometext="${cfg.welcometext}" port=${toString cfg.port} - ${optionalString (cfg.hostName != "") "host=${cfg.hostName}"} - ${optionalString (cfg.password != "") "serverpassword=${cfg.password}"} + ${lib.optionalString (cfg.hostName != "") "host=${cfg.hostName}"} + ${lib.optionalString (cfg.password != "") "serverpassword=${cfg.password}"} bandwidth=${toString cfg.bandwidth} users=${toString cfg.users} textmessagelength=${toString cfg.textMsgLength} imagemessagelength=${toString cfg.imgMsgLength} - allowhtml=${boolToString cfg.allowHtml} + allowhtml=${lib.boolToString cfg.allowHtml} logdays=${toString cfg.logDays} - bonjour=${boolToString cfg.bonjour} - sendversion=${boolToString cfg.sendVersion} + bonjour=${lib.boolToString cfg.bonjour} + sendversion=${lib.boolToString cfg.sendVersion} - ${optionalString (cfg.registerName != "") "registerName=${cfg.registerName}"} - ${optionalString (cfg.registerPassword != "") "registerPassword=${cfg.registerPassword}"} - ${optionalString (cfg.registerUrl != "") "registerUrl=${cfg.registerUrl}"} - ${optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"} + ${lib.optionalString (cfg.registerName != "") "registerName=${cfg.registerName}"} + ${lib.optionalString (cfg.registerPassword != "") "registerPassword=${cfg.registerPassword}"} + ${lib.optionalString (cfg.registerUrl != "") "registerUrl=${cfg.registerUrl}"} + ${lib.optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"} - certrequired=${boolToString cfg.clientCertRequired} - ${optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"} - ${optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"} - ${optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"} + certrequired=${lib.boolToString cfg.clientCertRequired} + ${lib.optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"} + ${lib.optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"} + ${lib.optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"} - ${optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"} + ${lib.optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"} ${cfg.extraConfig} ''; in { - imports = [ - (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ]) - (mkRemovedOptionModule [ "services" "murmur" "pidfile" ] "Hardcoded to /run/murmur/murmurd.pid now") - ]; - options = { services.murmur = { - enable = mkOption { - type = types.bool; - default = false; - description = "If enabled, start the Murmur Mumble server."; - }; + enable = lib.mkEnableOption "Mumble server"; - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Open ports in the firewall for the Murmur Mumble server. - ''; - }; + openFirewall = lib.mkEnableOption "opening ports in the firewall for the Mumble server"; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "murmur"; description = '' The name of an existing user to use to run the service. @@ -83,8 +66,8 @@ in ''; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "murmur"; description = '' The name of an existing group to use to run the service. @@ -92,16 +75,16 @@ in ''; }; - stateDir = mkOption { - type = types.path; + stateDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/murmur"; description = '' Directory to store data for the server. ''; }; - autobanAttempts = mkOption { - type = types.int; + autobanAttempts = lib.mkOption { + type = lib.types.int; default = 10; description = '' Number of attempts a client is allowed to make in @@ -110,8 +93,8 @@ in ''; }; - autobanTimeframe = mkOption { - type = types.int; + autobanTimeframe = lib.mkOption { + type = lib.types.int; default = 120; description = '' Timeframe in which a client can connect without being banned @@ -119,47 +102,47 @@ in ''; }; - autobanTime = mkOption { - type = types.int; + autobanTime = lib.mkOption { + type = lib.types.int; default = 300; description = "The amount of time an IP ban lasts (in seconds)."; }; - logFile = mkOption { - type = types.nullOr types.path; + logFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; example = "/var/log/murmur/murmurd.log"; description = "Path to the log file for Murmur daemon. Empty means log to journald."; }; - welcometext = mkOption { - type = types.str; + welcometext = lib.mkOption { + type = lib.types.str; default = ""; description = "Welcome message for connected clients."; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 64738; description = "Ports to bind to (UDP and TCP)."; }; - hostName = mkOption { - type = types.str; + hostName = lib.mkOption { + type = lib.types.str; default = ""; description = "Host to bind to. Defaults binding on all addresses."; }; - package = mkPackageOption pkgs "murmur" { }; + package = lib.mkPackageOption pkgs "murmur" { }; - password = mkOption { - type = types.str; + password = lib.mkOption { + type = lib.types.str; default = ""; description = "Required password to join server, if specified."; }; - bandwidth = mkOption { - type = types.int; + bandwidth = lib.mkOption { + type = lib.types.int; default = 72000; description = '' Maximum bandwidth (in bits per second) that clients may send @@ -167,26 +150,26 @@ in ''; }; - users = mkOption { - type = types.int; + users = lib.mkOption { + type = lib.types.int; default = 100; description = "Maximum number of concurrent clients allowed."; }; - textMsgLength = mkOption { - type = types.int; + textMsgLength = lib.mkOption { + type = lib.types.int; default = 5000; description = "Max length of text messages. Set 0 for no limit."; }; - imgMsgLength = mkOption { - type = types.int; + imgMsgLength = lib.mkOption { + type = lib.types.int; default = 131072; description = "Max length of image messages. Set 0 for no limit."; }; - allowHtml = mkOption { - type = types.bool; + allowHtml = lib.mkOption { + type = lib.types.bool; default = true; description = '' Allow HTML in client messages, comments, and channel @@ -194,8 +177,8 @@ in ''; }; - logDays = mkOption { - type = types.int; + logDays = lib.mkOption { + type = lib.types.int; default = 31; description = '' How long to store RPC logs for in the database. Set 0 to @@ -203,23 +186,16 @@ in ''; }; - bonjour = mkOption { - type = types.bool; - default = false; - description = '' - Enable Bonjour auto-discovery, which allows clients over - your LAN to automatically discover Murmur servers. - ''; - }; + bonjour = lib.mkEnableOption "Bonjour auto-discovery, which allows clients over your LAN to automatically discover Mumble servers"; - sendVersion = mkOption { - type = types.bool; + sendVersion = lib.mkOption { + type = lib.types.bool; default = true; description = "Send Murmur version in UDP response."; }; - registerName = mkOption { - type = types.str; + registerName = lib.mkOption { + type = lib.types.str; default = ""; description = '' Public server registration name, and also the name of the @@ -228,8 +204,8 @@ in ''; }; - registerPassword = mkOption { - type = types.str; + registerPassword = lib.mkOption { + type = lib.types.str; default = ""; description = '' Public server registry password, used authenticate your @@ -238,14 +214,14 @@ in ''; }; - registerUrl = mkOption { - type = types.str; + registerUrl = lib.mkOption { + type = lib.types.str; default = ""; description = "URL website for your server."; }; - registerHostname = mkOption { - type = types.str; + registerHostname = lib.mkOption { + type = lib.types.str; default = ""; description = '' DNS hostname where your server can be reached. This is only @@ -255,40 +231,36 @@ in ''; }; - clientCertRequired = mkOption { - type = types.bool; - default = false; - description = "Require clients to authenticate via certificates."; - }; + clientCertRequired = lib.mkEnableOption "requiring clients to authenticate via certificates"; - sslCert = mkOption { - type = types.str; + sslCert = lib.mkOption { + type = lib.types.str; default = ""; description = "Path to your SSL certificate."; }; - sslKey = mkOption { - type = types.str; + sslKey = lib.mkOption { + type = lib.types.str; default = ""; description = "Path to your SSL key."; }; - sslCa = mkOption { - type = types.str; + sslCa = lib.mkOption { + type = lib.types.str; default = ""; description = "Path to your SSL CA certificate."; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = "Extra configuration to put into murmur.ini."; }; - environmentFile = mkOption { - type = types.nullOr types.path; + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; - example = literalExpression ''"''${config.services.murmur.stateDir}/murmurd.env"''; + example = lib.literalExpression ''"''${config.services.murmur.stateDir}/murmurd.env"''; description = '' Environment file as defined in {manpage}`systemd.exec(5)`. @@ -311,8 +283,8 @@ in ''; }; - dbus = mkOption { - type = types.enum [ + dbus = lib.mkOption { + type = lib.types.enum [ null "session" "system" @@ -323,19 +295,19 @@ in }; }; - config = mkIf cfg.enable { - users.users.murmur = mkIf (cfg.user == "murmur") { + config = lib.mkIf cfg.enable { + users.users.murmur = lib.mkIf (cfg.user == "murmur") { description = "Murmur Service user"; home = cfg.stateDir; createHome = true; uid = config.ids.uids.murmur; group = cfg.group; }; - users.groups.murmur = mkIf (cfg.group == "murmur") { + users.groups.murmur = lib.mkIf (cfg.group == "murmur") { gid = config.ids.gids.murmur; }; - networking.firewall = mkIf cfg.openFirewall { + networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; allowedUDPPorts = [ cfg.port ]; }; @@ -353,8 +325,8 @@ in serviceConfig = { # murmurd doesn't fork when logging to the console. Type = if forking then "forking" else "simple"; - PIDFile = mkIf forking "/run/murmur/murmurd.pid"; - EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; + PIDFile = lib.mkIf forking "/run/murmur/murmurd.pid"; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; ExecStart = "${cfg.package}/bin/mumble-server -ini /run/murmur/murmurd.ini"; Restart = "always"; RuntimeDirectory = "murmur"; @@ -390,7 +362,7 @@ in # currently not included in upstream package, addition requested at # https://github.com/mumble-voip/mumble/issues/6078 - services.dbus.packages = mkIf (cfg.dbus == "system") [ + services.dbus.packages = lib.mkIf (cfg.dbus == "system") [ (pkgs.writeTextFile { name = "murmur-dbus-policy"; text = '' @@ -432,19 +404,19 @@ in r /run/murmur/murmurd.ini, r ${configFile}, '' - + optionalString (cfg.logFile != null) '' + + lib.optionalString (cfg.logFile != null) '' rw ${cfg.logFile}, '' - + optionalString (cfg.sslCert != "") '' + + lib.optionalString (cfg.sslCert != "") '' r ${cfg.sslCert}, '' - + optionalString (cfg.sslKey != "") '' + + lib.optionalString (cfg.sslKey != "") '' r ${cfg.sslKey}, '' - + optionalString (cfg.sslCa != "") '' + + lib.optionalString (cfg.sslCa != "") '' r ${cfg.sslCa}, '' - + optionalString (cfg.dbus != null) '' + + lib.optionalString (cfg.dbus != null) '' dbus bus=${cfg.dbus} '' + '' diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index c7f193f4e6fc..002144888ecf 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -54,15 +54,10 @@ let ++ optional (cfg.provision.extraJsonFile != null) cfg.provision.extraJsonFile ++ mapAttrsToList (_: x: x.basicSecretFile) cfg.provision.systems.oauth2 ); - secretDirectories = unique ( - map builtins.dirOf ( - [ - cfg.serverSettings.tls_chain - cfg.serverSettings.tls_key - ] - ++ optionals cfg.provision.enable provisionSecretFiles - ) - ); + secretPaths = [ + cfg.serverSettings.tls_chain + cfg.serverSettings.tls_key + ] ++ optionals cfg.provision.enable provisionSecretFiles; # Merge bind mount paths and remove paths where a prefix is already mounted. # This makes sure that if e.g. the tls_chain is in the nix store and /nix/store is already in the mount @@ -881,7 +876,7 @@ in ( defaultServiceConfig // { - BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ secretDirectories); + BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ secretPaths); } ) { @@ -895,8 +890,6 @@ in BindPaths = [ - # To create the socket - "/run/kanidmd:/run/kanidmd" # To store backups cfg.serverSettings.online_backup.path ] diff --git a/nixos/modules/services/web-apps/glance.nix b/nixos/modules/services/web-apps/glance.nix index ff5fd1195639..4f96b550fb6e 100644 --- a/nixos/modules/services/web-apps/glance.nix +++ b/nixos/modules/services/web-apps/glance.nix @@ -100,14 +100,64 @@ in for more. Settings containing secret data should be set to an - attribute set containing the attribute - _secret - a string pointing to a file - containing the value the option should be set to. See the - example in `services.glance.settings.pages` at the weather widget + attribute set with this format: `{ _secret = "/path/to/secret"; }`. + See the example in `services.glance.settings.pages` at the weather widget with a location secret to get a better picture of this. + + Alternatively, you can use a single file with environment variables, + see `services.glance.environmentFile`. ''; }; + environmentFile = mkOption { + type = types.nullOr types.path; + description = + let + singleQuotes = "''"; + in + '' + Path to an environment file as defined in {manpage}`systemd.exec(5)`. + + See upstream documentation + . + + Example content of the file: + ``` + TIMEZONE=Europe/Paris + ``` + + Example `services.glance.settings.pages` configuration: + ```nix + [ + { + name = "Home"; + columns = [ + { + size = "full"; + widgets = [ + { + type = "clock"; + timezone = "\''${TIMEZONE}"; + label = "Local Time"; + } + ]; + } + ]; + } + ]; + ``` + + Note that when using Glance's `''${ENV_VAR}` syntax in Nix, + you need to escape it as follows: use `\''${ENV_VAR}` in `"` strings + and `${singleQuotes}''${ENV_VAR}` in `${singleQuotes}` strings. + + Alternatively, you can put each secret in it's own file, + see `services.glance.settings`. + ''; + default = "/dev/null"; + example = "/var/lib/secrets/glance"; + }; + openFirewall = mkOption { type = types.bool; default = false; @@ -159,6 +209,7 @@ in ''; ExecStart = "${getExe cfg.package} --config ${mergedSettingsFile}"; WorkingDirectory = "/var/lib/glance"; + EnvironmentFile = cfg.environmentFile; StateDirectory = "glance"; RuntimeDirectory = "glance"; RuntimeDirectoryMode = "0755"; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 8ac3df70df97..9e54440138c9 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -905,8 +905,8 @@ let boolValues ++ [ "static" - "dhcp-on-stop" - "dhcp" + "dynamic-on-stop" + "dynamic" ] )) ]; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index ef2a5a685003..e46434559d3c 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -5,11 +5,31 @@ utils, ... }@moduleArgs: - -with lib; -with utils; - let + inherit (lib) + any + attrValues + concatMapStrings + concatMapStringsSep + concatStringsSep + elem + filter + flip + head + literalExpression + mkDefault + mkEnableOption + mkIf + mkMerge + mkOption + optional + optionalAttrs + optionalString + toposort + types + ; + inherit (utils) fsBefore; + # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; @@ -61,7 +81,7 @@ let description = "Location of the mounted file system."; }; - stratis.poolUuid = lib.mkOption { + stratis.poolUuid = mkOption { type = types.uniq (types.nullOr types.str); description = '' UUID of the stratis pool that the fs is located in @@ -166,9 +186,7 @@ let }; - config.device = lib.mkIf (config.label != null) ( - lib.mkDefault "/dev/disk/by-label/${escape config.label}" - ); + config.device = mkIf (config.label != null) (mkDefault "/dev/disk/by-label/${escape config.label}"); config.options = let @@ -320,7 +338,7 @@ in boot.supportedFilesystems = mkOption { default = { }; - example = lib.literalExpression '' + example = literalExpression '' { btrfs = true; zfs = lib.mkForce false; @@ -471,7 +489,7 @@ in # Filesystems. ${makeFstabEntries fileSystems { }} - ${lib.optionalString (config.swapDevices != [ ]) "# Swap devices."} + ${optionalString (config.swapDevices != [ ]) "# Swap devices."} ${flip concatMapStrings config.swapDevices (sw: "${sw.realDevice} none swap ${swapOptions sw}\n")} ''; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a2236c4f779b..6612389caa09 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -409,11 +409,13 @@ in domination = runTest ./domination.nix; dovecot = handleTest ./dovecot.nix { }; drawterm = discoverTests (import ./drawterm.nix); + draupnir = runTest ./matrix/draupnir.nix; drbd = runTest ./drbd.nix; druid = handleTestOn [ "x86_64-linux" ] ./druid { }; drupal = runTest ./drupal.nix; drbd-driver = runTest ./drbd-driver.nix; dublin-traceroute = runTest ./dublin-traceroute.nix; + dwl = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./dwl.nix; earlyoom = handleTestOn [ "x86_64-linux" ] ./earlyoom.nix { }; early-mount-options = handleTest ./early-mount-options.nix { }; ec2-config = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-config or { }; @@ -1527,7 +1529,6 @@ in zoom-us = runTest ./zoom-us.nix; zram-generator = runTest ./zram-generator.nix; zrepl = runTest ./zrepl.nix; - zsh-history = runTest ./zsh-history.nix; zwave-js = runTest ./zwave-js.nix; zwave-js-ui = runTest ./zwave-js-ui.nix; } diff --git a/nixos/tests/dwl.nix b/nixos/tests/dwl.nix new file mode 100644 index 000000000000..6398ebeba5cf --- /dev/null +++ b/nixos/tests/dwl.nix @@ -0,0 +1,43 @@ +{ lib, ... }: +{ + name = "dwl_test_vm"; + + meta = { + maintainers = with lib.maintainers; [ gurjaka ]; + }; + + nodes.machine = + { + pkgs, + lib, + ... + }: + { + imports = [ + ./common/user-account.nix + ./common/wayland-cage.nix + ]; + + environment.systemPackages = [ pkgs.foot ]; + + services.displayManager.defaultSession = lib.mkForce "dwl"; + + programs.dwl.enable = true; + }; + + testScript = '' + with subtest("ensure dwl starts"): + machine.wait_for_file("/run/user/1000/wayland-0") + + with subtest("ensure foot is installed"): + machine.succeed("which foot") + + with subtest("ensure we can open a new terminal"): + # sleep 3 is required to make sure dwl has started + # TODO: find better way to identify dwl session + machine.sleep(3) + machine.send_key("alt-shift-ret") + machine.sleep(3) + machine.screenshot("terminal") + ''; +} diff --git a/nixos/tests/matrix/draupnir.nix b/nixos/tests/matrix/draupnir.nix new file mode 100644 index 000000000000..18dae8b2fffb --- /dev/null +++ b/nixos/tests/matrix/draupnir.nix @@ -0,0 +1,150 @@ +{ + lib, + ... +}: + +{ + name = "draupnir"; + meta.maintainers = with lib.maintainers; [ + RorySys + emilylange + ]; + + nodes = { + homeserver = + { pkgs, ... }: + { + services.matrix-synapse = { + enable = true; + log.root.level = "WARNING"; + settings = { + database.name = "sqlite3"; + registration_shared_secret = "supersecret-registration"; + + listeners = [ + { + bind_addresses = [ + "::" + ]; + port = 8008; + resources = [ + { + compress = true; + names = [ "client" ]; + } + { + compress = false; + names = [ "federation" ]; + } + ]; + tls = false; + type = "http"; + x_forwarded = false; + } + ]; + }; + }; + + specialisation.draupnir = { + inheritParentConfig = true; + + configuration.services.draupnir = { + enable = true; + settings = { + homeserverUrl = "http://localhost:8008"; + managementRoom = "#moderators:homeserver"; + }; + secrets = { + accessToken = "/tmp/draupnir-access-token"; + }; + }; + }; + + environment.systemPackages = with pkgs; [ + curl + jq + (writers.writePython3Bin "test_draupnir_in_matrix" + { + libraries = [ python3Packages.matrix-nio ]; + flakeIgnore = [ "E501" ]; + } + '' + import asyncio + from nio import AsyncClient, MatrixRoom, RoomMemberEvent, RoomMessageNotice + + + async def main() -> None: + client = AsyncClient("http://localhost:8008", "moderator") + + async def member_callback(room: MatrixRoom, event: RoomMemberEvent) -> None: + if event.membership == "join" and event.sender == "@draupnir:homeserver": + await client.room_send( + room_id=room.room_id, + message_type="m.room.message", + content={ + "msgtype": "m.text", + "body": "!draupnir status" + } + ) + + async def message_callback(room: MatrixRoom, event: RoomMessageNotice) -> None: + print(f"{event.sender}: {event.body}") + if event.sender == "@draupnir:homeserver": + await client.close() + exit(0) + + client.add_event_callback(member_callback, RoomMemberEvent) + client.add_event_callback(message_callback, RoomMessageNotice) + + print(await client.login("password")) + + room = await client.room_create( + name="Moderators", + alias="moderators", + invite=["@draupnir:homeserver"], + power_level_override={ + "users": { + "@draupnir:homeserver": 100, + "@moderator:homeserver": 100, + } + } + ) + print(room) + + print(await client.join(room.room_id)) + + await client.sync_forever(timeout=30000) + + + asyncio.run(main()) + '' + ) + ]; + }; + }; + + testScript = + { nodes, ... }: + '' + import json + + homeserver.wait_for_unit("matrix-synapse.service") + homeserver.wait_until_succeeds("curl --fail -L http://localhost:8008/") + + homeserver.succeed("matrix-synapse-register_new_matrix_user -u draupnir -p password --no-admin") + homeserver.succeed("matrix-synapse-register_new_matrix_user -u moderator -p password --no-admin") + + # get draupnir access token + payload = json.dumps({ "type": "m.login.password", "user": "draupnir", "password": "password" }) + homeserver.succeed( + f"curl --fail --json '{payload}' http://localhost:8008/_matrix/client/v3/login" + + " | jq -r .access_token" + + " | tee /tmp/draupnir-access-token" + ) + + homeserver.succeed("${nodes.homeserver.system.build.toplevel}/specialisation/draupnir/bin/switch-to-configuration test") + homeserver.wait_for_unit("draupnir.service") + + print(homeserver.succeed("test_draupnir_in_matrix >&2", timeout=60)) + ''; +} diff --git a/nixos/tests/nixos-generate-config.nix b/nixos/tests/nixos-generate-config.nix index c887403bbda3..175849bcac62 100644 --- a/nixos/tests/nixos-generate-config.nix +++ b/nixos/tests/nixos-generate-config.nix @@ -46,5 +46,11 @@ machine.succeed("rm -rf /etc/nixos") machine.succeed("nixos-generate-config --flake") machine.succeed("nix-instantiate --parse /etc/nixos/flake.nix /etc/nixos/configuration.nix /etc/nixos/hardware-configuration.nix") + + machine.succeed("mv /etc/nixos /etc/nixos-with-flake-arg") + machine.succeed("printf '[Defaults]\nFlake = 1\n' > /etc/nixos-generate-config.conf") + machine.succeed("nixos-generate-config") + machine.succeed("nix-instantiate --parse /etc/nixos/flake.nix /etc/nixos/configuration.nix /etc/nixos/hardware-configuration.nix") + machine.succeed("diff -r /etc/nixos /etc/nixos-with-flake-arg") ''; } diff --git a/nixos/tests/thelounge.nix b/nixos/tests/thelounge.nix index 5214d10739ba..92b3fa848058 100644 --- a/nixos/tests/thelounge.nix +++ b/nixos/tests/thelounge.nix @@ -7,7 +7,8 @@ import ./make-test-python.nix { { services.thelounge = { enable = true; - plugins = [ pkgs.theLoungePlugins.themes.solarized ]; + # nodePackages.thelounge-theme-* has been removed + # plugins = [ pkgs.theLoungePlugins.themes.solarized ]; }; }; @@ -28,7 +29,7 @@ import ./make-test-python.nix { machine.wait_for_unit("thelounge.service") machine.wait_for_open_port(9000) - private.wait_until_succeeds("journalctl -u thelounge.service | grep thelounge-theme-solarized") + # private.wait_until_succeeds("journalctl -u thelounge.service | grep thelounge-theme-solarized") private.wait_until_succeeds("journalctl -u thelounge.service | grep 'in private mode'") public.wait_until_succeeds("journalctl -u thelounge.service | grep 'in public mode'") ''; diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix deleted file mode 100644 index fe3dd44a25e2..000000000000 --- a/nixos/tests/zsh-history.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ pkgs, ... }: -{ - name = "zsh-history"; - meta = with pkgs.lib.maintainers; { - maintainers = [ ]; - }; - - nodes.default = - { ... }: - { - programs = { - zsh.enable = true; - }; - environment.systemPackages = [ pkgs.zsh-history ]; - programs.zsh.interactiveShellInit = '' - source ${pkgs.zsh-history.out}/share/zsh/init.zsh - ''; - users.users.root.shell = "${pkgs.zsh}/bin/zsh"; - }; - - testScript = '' - start_all() - default.wait_for_unit("multi-user.target") - default.wait_until_succeeds("pgrep -f 'agetty.*tty1'") - - # Login - default.wait_until_tty_matches("1", "login: ") - default.send_chars("root\n") - default.wait_until_tty_matches("1", r"\nroot@default\b") - - # Generate some history - default.send_chars("echo foobar\n") - default.wait_until_tty_matches("1", "foobar") - - # Ensure that command was recorded in history - default.succeed("/run/current-system/sw/bin/history list | grep -q foobar") - ''; -} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4c41f43d7063..f4b84f57180d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -386,12 +386,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2025-05-27"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "a9ba109549de51e3b4594d39a1c07f14b9d0cfa5"; - sha256 = "1fh8xynmdj0ag6ppid6gi288gjwp59w2p2ishfl3zyjwlkv7kxkh"; + rev = "307a3320d3ec6c8ddafd62c4c661e71bc20cb93f"; + sha256 = "17025v5zzp848jglz2iws1fgdji8dwvxknfas6fvkg3m7m79n38i"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.hydraPlatforms = [ ]; @@ -647,12 +647,12 @@ final: prev: { aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2025-04-20"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "2e00d1d4248f08dddfceacb8d2996e51e13e00f6"; - sha256 = "18rhmpqs8440hn4g5786znj37fzb01wa3zws33rlq9vm6sfb0grw"; + rev = "5c0df1679bf7c814c924dc6646cc5291daca8363"; + sha256 = "1dhsg3bli32d0p36c9f1i95p7h9hn5czr1zwlcd3v926qzj9wp1j"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -895,12 +895,12 @@ final: prev: { astrocore = buildVimPlugin { pname = "astrocore"; - version = "2025-04-30"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrocore"; - rev = "c797dd5a592e2bd154f2503e231b8a4083659534"; - sha256 = "1dmdnk3hggdssbaqz9bdf7h29chc64vw20bnxv5n6qrnrfrsfqx0"; + rev = "cd9a7d82f00df90b7f76e73ef1569551b6993a5f"; + sha256 = "1jg94s5i6q756nq0f7jcw5gvgqwipmnnf8k82sfrsvc0k3j8p126"; }; meta.homepage = "https://github.com/AstroNvim/astrocore/"; meta.hydraPlatforms = [ ]; @@ -908,12 +908,12 @@ final: prev: { astrolsp = buildVimPlugin { pname = "astrolsp"; - version = "2025-05-13"; + version = "2025-05-31"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrolsp"; - rev = "f2604d0de0bfd3c442a2f2a47d9e7be850467883"; - sha256 = "0pgz1ndrksqicdpq5dyqq3a1clwi5d3vd3xfdd6v7ckzndg5gxqb"; + rev = "a215b1caedfc93092374fe5f1d63f958b9efa568"; + sha256 = "0bynmjjdcgkyfgw3dy54j9pzczv9gpcda63jlqlbakdhh6w7zibs"; }; meta.homepage = "https://github.com/AstroNvim/astrolsp/"; meta.hydraPlatforms = [ ]; @@ -1325,12 +1325,12 @@ final: prev: { bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2025-03-08"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "97124a0b81f886abc0d666ebec512b92425d67b6"; - sha256 = "16yfdnl92x3z47a0l3zn3gxdcyirrr1pvr5vf1afpmryn9ng7b4k"; + rev = "ab8393d1a314d96314605369b4b1e6bc7737f2b5"; + sha256 = "12fia7ix4c515kjkm8hqrk4x7cbzm81kz3sk33r3qmdh7mm4rwiv"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; meta.hydraPlatforms = [ ]; @@ -1364,12 +1364,12 @@ final: prev: { base16-nvim = buildVimPlugin { pname = "base16-nvim"; - version = "2025-05-26"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "RRethy"; repo = "base16-nvim"; - rev = "f9ce7474c54803cb0fa308b0b91549d394a07940"; - sha256 = "1d575pa225ws5rhabr17if5pl8vfy1ks1a9w3rx7f47vdk8ars4m"; + rev = "5d0fcd834d48048822e36221ab067bedb3ef5c93"; + sha256 = "035j1x44sjk0vhcbp18nm1lq32z8ra8qp8wlij3382mai8jrrb06"; }; meta.homepage = "https://github.com/RRethy/base16-nvim/"; meta.hydraPlatforms = [ ]; @@ -1390,12 +1390,12 @@ final: prev: { base46 = buildVimPlugin { pname = "base46"; - version = "2025-05-24"; + version = "2025-05-30"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "b4cb646df33e9140271211671256dd148e127595"; - sha256 = "0ihlzaglyf1s1wmzqbz1q677vcjxxxbvbp9y398sdn6mkj6kvv4n"; + rev = "2dbb72f4ae6f78cb3adc60c2c3b69524f97c9cd6"; + sha256 = "16p0syfvf70b0zzdndm3d2jwbqssgcpl1bzvbzjzbsqy3xi8n1w2"; }; meta.homepage = "https://github.com/nvchad/base46/"; meta.hydraPlatforms = [ ]; @@ -1533,12 +1533,12 @@ final: prev: { blink-cmp-git = buildVimPlugin { pname = "blink-cmp-git"; - version = "2025-05-25"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "Kaiser-Yang"; repo = "blink-cmp-git"; - rev = "e78e9ff3de63f82685e3c5f2eed1ec203222f63b"; - sha256 = "1s7pb7if902gn0lrvyvwrbp7vpixmpri6g2h1lz0dbp5wcwy2cwn"; + rev = "28f302c3917e374b91acb3d2ff2da5cd392679f5"; + sha256 = "0mf84n2zqf8wg2hpjadd33bi2ps0abdgbww8bnsyc6w6lii3jwk9"; }; meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-git/"; meta.hydraPlatforms = [ ]; @@ -1624,12 +1624,12 @@ final: prev: { blink-ripgrep-nvim = buildVimPlugin { pname = "blink-ripgrep.nvim"; - version = "2025-05-13"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "blink-ripgrep.nvim"; - rev = "a910b62c896eee2d0e74eb48b3ff5eedd211db69"; - sha256 = "0xinh3rxjrglkzgw9d80x1scl20h2gxzkl3f3cjzpz04rrr6slsm"; + rev = "3b146c70869c3f42c623341ad8befe9a073087a6"; + sha256 = "0058rns7sgkzsfkgdqlx51bi04fn6hxv4ddl8g32mpq27dji13pn"; }; meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; meta.hydraPlatforms = [ ]; @@ -1858,12 +1858,12 @@ final: prev: { catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2025-05-26"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "56a9dfd1e05868cf3189369aad87242941396563"; - sha256 = "082rlnsxm1ip5mhpgc37nyp96s2hmvkcd4cbbvsvzdghiq4kl51b"; + rev = "a0c769bc7cd04bbbf258b3d5f01e2bdce744108d"; + sha256 = "08qv1had0gi2hzd854j7xyq3s3z9bvf1x40bav05ll52xkksn5vx"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; meta.hydraPlatforms = [ ]; @@ -1871,12 +1871,12 @@ final: prev: { catppuccin-vim = buildVimPlugin { pname = "catppuccin-vim"; - version = "2024-08-14"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "060000804cf50315ac6dd986bc4d84fbc40cbc9c"; - sha256 = "1faxniddq6zcsb93bsm93lkf01mc4jfzxls5vyxmac6rc5v2k1n4"; + rev = "a72bc6487f4fb47c36539e29f5496ac7ba8e136c"; + sha256 = "02mqlpw64am42wcikqcckh20i2vr50md4nyv5hiim4wmmdqich7q"; }; meta.homepage = "https://github.com/catppuccin/vim/"; meta.hydraPlatforms = [ ]; @@ -1923,12 +1923,12 @@ final: prev: { chadtree = buildVimPlugin { pname = "chadtree"; - version = "2025-05-21"; + version = "2025-05-31"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "c09921c0157b718ced8ec469d7397a5f29ee7d94"; - sha256 = "1r1rwfq2dn91zrpn47b18y8n58lfbxp44srsa9d7df5ff769yrcz"; + rev = "bc34bbf898c5832fae1390c963365be5f71bb152"; + sha256 = "1iggi65sid081z06b15wpszac1lx0chn2wxlsivqp2c3rmfc0pyb"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.hydraPlatforms = [ ]; @@ -2872,12 +2872,12 @@ final: prev: { coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2025-05-25"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "4bf93f031261b7a7cdff38aaac7a12b564e2f00c"; - sha256 = "1j0v2zw3d3q5aia8qkagclzcdir0cmf844bgxrcr0wy4lcbgm6lz"; + rev = "9f7f280194f70229ec667721373a74d238618220"; + sha256 = "0bmpc1dsd796dmg4ig9i1ijl2a4p9jd1dfmwppmfdlpp9awqp7n3"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.hydraPlatforms = [ ]; @@ -2924,12 +2924,12 @@ final: prev: { codecompanion-history-nvim = buildVimPlugin { pname = "codecompanion-history.nvim"; - version = "2025-05-23"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "ravitemer"; repo = "codecompanion-history.nvim"; - rev = "36f1a611a2bed70b57a50c877ffc50bdb74c9d23"; - sha256 = "1kb208i6n8k2qcbagmcnbmmxl62k2vwgm16y4xpkl78vayza9gf8"; + rev = "66943e78bcacaa27f4ac4a398df4016eb5413ecd"; + sha256 = "053sk528m4cq8xmawqk2vgrdwp5f9m1zv4vnx3n9r4zglp75ibar"; }; meta.homepage = "https://github.com/ravitemer/codecompanion-history.nvim/"; meta.hydraPlatforms = [ ]; @@ -2937,12 +2937,12 @@ final: prev: { codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "2025-05-28"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "43185768e353065f910dcf5915386404f0e950da"; - sha256 = "0yii24w0py4gjqldb59gdawphl66fhdljivyh43fw9bcbypqmksj"; + rev = "cdf772165782e55a451c0793bf4c2a89926b89bd"; + sha256 = "1q2c35b5razr2aav9k8gn3z3z2j7vx4haf12gm4w9dj35gx3d3kq"; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.hydraPlatforms = [ ]; @@ -3210,12 +3210,12 @@ final: prev: { conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2025-05-22"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "6feb2f28f9a9385e401857b21eeac3c1b66dd628"; - sha256 = "1vfjv81b27qja3byfzskv1y57jsqwy6y0mac1ry7xpdbnva3vxwc"; + rev = "0e93e0d12d2f7ebdea9e3e444dfaff0050cefbe6"; + sha256 = "0hvpvk0gs76b9sfzrzhmrq9d7rab3ldim0vf18qf424xl72fbw8b"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -3302,12 +3302,12 @@ final: prev: { copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2025-05-28"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "5f726c8e6bbcd7461ee0b870d4e6c8a973b55b64"; - sha256 = "08caf8v2a9vs8m85krq14d2ps2ljqi0n2f1h6nplzp02qr9x1w6j"; + rev = "c1bb86abbed1a52a11ab3944ef00c8410520543d"; + sha256 = "11w41p4wah0w6f1lyhrr214h761rcic7nfnriszk2b25q4ifj4db"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; meta.hydraPlatforms = [ ]; @@ -3393,12 +3393,12 @@ final: prev: { coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2025-05-29"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "a3da881bb97e36891c9c9892e5f789e159db0d26"; - sha256 = "05xsplqd6fm5vs9gg1w2w5ym51b382bl7mf1zblsmlg0y9s3p9qi"; + rev = "09ce78ef988eacad5393ed73908613554b1ea30c"; + sha256 = "1zbpvd90h2jmim9kbp1g9zvacb7qvfkdpi1m6rnqvmii2g5sqvw1"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; meta.hydraPlatforms = [ ]; @@ -3445,12 +3445,12 @@ final: prev: { crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2025-05-28"; + version = "2025-05-30"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "fc59684a10706cce85e356d03b07fda535bec533"; - sha256 = "00myb5ny8zlcz8rnqnmbizh86wik96m1lz4v9n5lcql7xmz02amr"; + rev = "5d8b1bef686db0fabe5f1bb593744b617e8f1405"; + sha256 = "1zy81gdfis2wmhhsi1qjnmxpfpsviscwdyypnnccqhp7z3lwcf5h"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; meta.hydraPlatforms = [ ]; @@ -3471,12 +3471,12 @@ final: prev: { csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; - version = "2025-05-07"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "csharpls-extended-lsp.nvim"; - rev = "9cdc993347cfb51d102bf5da1ebf6bf4fc4683e4"; - sha256 = "0ls3m94qk4vjwki7bjrf4di9fiwvh9hhkahav28c3nz14j559gs4"; + rev = "79ea71655a705be38a113809d7e9e15aaa0695b2"; + sha256 = "1a4igb5ldhw3wnhbf06fn97qgxfgmnqz86ss6ycc9y4g7jaj0bi7"; }; meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; meta.hydraPlatforms = [ ]; @@ -3653,12 +3653,12 @@ final: prev: { dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2025-05-21"; + version = "2025-06-03"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "0f99b3cd66b9fde13926724c67c6e1abeb48e07d"; - sha256 = "0s0i568nj4mkq0q29gjj9cm050p7n8b2jykbkyl7qajc1piwa93x"; + rev = "c42fcfbd96dfcaa486c0a0ab52494316f1c31350"; + sha256 = "1lydgxs3j1jbyrn1ybpm43l7wfbix9mlvymb2frg93dlg0gw4zd3"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; meta.hydraPlatforms = [ ]; @@ -3770,12 +3770,12 @@ final: prev: { ddc-vim = buildVimPlugin { pname = "ddc.vim"; - version = "2025-05-29"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc.vim"; - rev = "70db25791969d39ec9f8a3795b37fce707975502"; - sha256 = "1ncb1m1l77vskf4cfra098722wdq89lgn36cvy54yv2byiqjfcrp"; + rev = "57fc46eef055a9ef8c9b75a01291567a13bf22fe"; + sha256 = "19wr7n18ds2x36khjca5a1wlmphm3vfa76lhlcpskfwxwckpnvmz"; }; meta.homepage = "https://github.com/Shougo/ddc.vim/"; meta.hydraPlatforms = [ ]; @@ -4396,12 +4396,12 @@ final: prev: { dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2025-05-24"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "f7ecb0c3600ca1dc467c361e9af40f97289d7aad"; - sha256 = "107hiyjbxpkz6caa3hj9j9n4r1bd3g6nsl7k6piwg6ldkxjd2miz"; + rev = "ce1db78abd1fae838abc23740b8fc9525679d6dc"; + sha256 = "17jlzw6qa685w2kqilvlh3i0rmjsp4cscrb7bw71k7cp5s6xxpsn"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; meta.hydraPlatforms = [ ]; @@ -4422,12 +4422,12 @@ final: prev: { easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "2025-05-28"; + version = "2025-06-03"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "a641cc44781ef59fae48c2bc85aa272933e647e0"; - sha256 = "0hpms7lrrffkpg2nrcy5vfyp7abnfc4arvh1d2icvwwk0bgcp0qv"; + rev = "9fe1ca3e5c9128609b45bf23771935729fc50af0"; + sha256 = "0z1f5hcmjf4fbkmsh0h9nw0mxlyqx69b2gh49hndmx5nk2zagsql"; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.hydraPlatforms = [ ]; @@ -4645,12 +4645,12 @@ final: prev: { everforest = buildVimPlugin { pname = "everforest"; - version = "2025-04-16"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "ffa5a2032fd41903135fa829bd4b49ba2e1d5d18"; - sha256 = "1s1m9z8061yvdr124hvwdpfhkyx1l46gcp860rz1bxlbk5h02g1z"; + rev = "c4bb2ae687ae21938775f436cf213492702a0cf3"; + sha256 = "0id5lhd7iqhh4qh427d83k3iczvdgs5nfi20i0409ww41wrpj6db"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; meta.hydraPlatforms = [ ]; @@ -4749,12 +4749,12 @@ final: prev: { fastfold = buildVimPlugin { pname = "fastfold"; - version = "2024-12-15"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "fff6d05064dec4d7e1398aa507db35fcd57edfb4"; - sha256 = "11s9js2cavqihmk4shskmk9hvdk4hq9gypy5b14r169ly64rhg00"; + rev = "c1ddfa1a0e00316d1161ce11438ec980348b8cb9"; + sha256 = "1m8npkahkr1zm7kx6ig8skxg03h7ds927g7gykbbi2iddi1k2n7l"; }; meta.homepage = "https://github.com/konfekt/fastfold/"; meta.hydraPlatforms = [ ]; @@ -5323,12 +5323,12 @@ final: prev: { git-messenger-vim = buildVimPlugin { pname = "git-messenger.vim"; - version = "2024-09-05"; + version = "2025-05-30"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "edc603d4cda7894a743e383e16c638e206d03148"; - sha256 = "0b9wkjxlc2d91wrjhqkpph9mcix3ndpqy3bdr1xajxnjz9lsy22a"; + rev = "fd124457378a295a5d1036af4954b35d6b807385"; + sha256 = "0bwfwvkwgffw0c3c3awmsh5qfz8s5zmvajv2ry0a1sajik9jpzzl"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; meta.hydraPlatforms = [ ]; @@ -5375,12 +5375,12 @@ final: prev: { gitignore-nvim = buildVimPlugin { pname = "gitignore.nvim"; - version = "2025-03-23"; + version = "2025-05-30"; src = fetchFromGitHub { owner = "wintermute-cell"; repo = "gitignore.nvim"; - rev = "47cefc0b6ea412e1e149552b10ebfe9f7f0b8952"; - sha256 = "0z631qr6vdk4m2vq615qfq0l9c6gkwrpwd4icglhpcnss9vxa52i"; + rev = "0344f643768c4d64af4add8c1bdddf6f7d4c9010"; + sha256 = "1xm430incyprhmxxg1spn35kdmsg7svdl8z9z7gzpfddafhvw2zm"; }; meta.homepage = "https://github.com/wintermute-cell/gitignore.nvim/"; meta.hydraPlatforms = [ ]; @@ -5466,12 +5466,12 @@ final: prev: { go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2025-05-23"; + version = "2025-05-30"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "e1b763cab2cfd3c60207873dbc925c9be49913c0"; - sha256 = "092d0qbsdqs8wj77k41an6an0javr6p6lds4klc6wwh0k1jhdhci"; + rev = "a3455f48cff718a86275115523dcc735535a13aa"; + sha256 = "1fw9bpn2x48rk6262p4zk520170lh6m7qgs81d5m4hd0nbasz1gg"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; meta.hydraPlatforms = [ ]; @@ -6248,12 +6248,12 @@ final: prev: { inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; - version = "2025-05-06"; + version = "2025-05-31"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "2eaff20526ff6101337b84f4b0d238c11f47d7f4"; - sha256 = "09h885nl9kiyygfxly762r52bdz9isaz2aamjfj143vihfs70pnf"; + rev = "a3e31af13844534c66041ce92f29af7745883875"; + sha256 = "0a9zm9yqi8pvs89mks0aixv1kmgia76ighxd9yqxfm62p9j6npxl"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; meta.hydraPlatforms = [ ]; @@ -6261,12 +6261,12 @@ final: prev: { incline-nvim = buildVimPlugin { pname = "incline.nvim"; - version = "2025-03-24"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "b0o"; repo = "incline.nvim"; - rev = "27040695b3bbfcd3257669037bd008d1a892831d"; - sha256 = "1frm25a0fa13x6ihimi94p21pipxs93s3bbapjjhzmg4z08npj75"; + rev = "0fd2d5a27504dba7fdc507a53275f22c081fe640"; + sha256 = "19x35z2sj3hl3icrxzbs67xhxgq9d237vhgzqrz8ppdc74p8wgaz"; }; meta.homepage = "https://github.com/b0o/incline.nvim/"; meta.hydraPlatforms = [ ]; @@ -6641,12 +6641,12 @@ final: prev: { kanagawa-paper-nvim = buildVimPlugin { pname = "kanagawa-paper.nvim"; - version = "2025-05-29"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "thesimonho"; repo = "kanagawa-paper.nvim"; - rev = "c61bf936b9bb4b0888de74735fc147bd0b525c64"; - sha256 = "12lcjvg5bammrhwrkw2j5a2l8jcj8vxh0bys8brkylg6s3m2b0hq"; + rev = "9815b97b8e7e9913495ce2a88afbd47bf31edf25"; + sha256 = "1px6m7s1dk3k2fn282w8mvv622j458iz88jyhvjp10bcpspck5ib"; }; meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/"; meta.hydraPlatforms = [ ]; @@ -6758,12 +6758,12 @@ final: prev: { kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2025-05-25"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "aa462decb4aa2f0cb9783fba4ad8f401b042c3be"; - sha256 = "1xarhds6jxmlgv3ngbwizdl404ylj2r394ffdknb5cjkz31ybii6"; + rev = "1568d31c9d115d6cf36da9fc6bf047e00830f730"; + sha256 = "1kp535fdvw9bzw78p4skqh9xrsnz7647w0j077b9gns7lkcwgyrj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; @@ -6889,12 +6889,12 @@ final: prev: { lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2025-05-27"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "d3d2dcd8c85db8c0cff76608704374c316ac991c"; - sha256 = "00gs7imirlswaxswfdxf143h9rk6r4j0imbknx5srwcjp168d93s"; + rev = "a04cc6f296271fc99468b97ff1dcf12efebf3b5d"; + sha256 = "0kvhlgxval4wp8lv3vjp6ad9f0h031qha3n5nczdi7g19l6x26jf"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; meta.hydraPlatforms = [ ]; @@ -6928,12 +6928,12 @@ final: prev: { leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2025-05-28"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "212429314c5bfa41f4154bfa8805f7227ba6a880"; - sha256 = "0kb61kxy4pmfc7ca2h5qzdsfvnjwl2b173jw0gvmi9j7lc7cipnl"; + rev = "9958013bd9c41e6f32af0202b9ea41055fe4667e"; + sha256 = "1l4hpjwfa2d2vkfrymjsv1zn0clx6vxnr0xzlfdi2jg41ms1niwq"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; meta.hydraPlatforms = [ ]; @@ -7643,12 +7643,12 @@ final: prev: { markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2025-05-27"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "1edad11ca4a1fddf171c07a1a3d81e24cef08410"; - sha256 = "04mz29dlrazqici70fkqbp0b1n7ig3zbj31466iv123jjx4cxv0q"; + rev = "c3b270ac84391b9792dba122d47139c741217311"; + sha256 = "1lskdf92s9vjd6jdmnh1dmpjyb93xww4axwlnz7md7155cajqlyd"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -7657,12 +7657,12 @@ final: prev: { mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2025-05-28"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "mason-org"; repo = "mason-lspconfig.nvim"; - rev = "67da97f8c2fd12d05427bb485ce07ee6418e0a51"; - sha256 = "09wpha0g0z4qjnlbr5znmdrfv6iiflyk75ksb97v1d074aq779qa"; + rev = "bef29b653ba71d442816bf56286c2a686210be04"; + sha256 = "08nsyzzflaplvy626ai8qpcdl7hjh2q4zgiamh1w2xz9pvy2rm01"; }; meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/"; meta.hydraPlatforms = [ ]; @@ -7709,12 +7709,12 @@ final: prev: { mason-tool-installer-nvim = buildVimPlugin { pname = "mason-tool-installer.nvim"; - version = "2025-05-13"; + version = "2025-05-30"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "75d60a8f928decd8b38897f80849768b7c540a5b"; - sha256 = "1l0qgr99gsjrgab997n6l76252420hl0yy51dgkw092lpqkx1xki"; + rev = "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903"; + sha256 = "1nirz0i0x7aa8lnl2q6r2a36x7w33qinaf3gfprbaacdb3xspzhl"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; meta.hydraPlatforms = [ ]; @@ -7800,12 +7800,12 @@ final: prev: { melange-nvim = buildVimPlugin { pname = "melange-nvim"; - version = "2025-01-16"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "savq"; repo = "melange-nvim"; - rev = "2db5407f2f6d6d6286f50f2f7365728d66f6f3ae"; - sha256 = "0lac9qisdkvnab8r4wb2qfnp8h006swwrl5cdx4xzw5wdrlhkkvb"; + rev = "a51c6faa4fb09331382f87be99f71a8aa48dd422"; + sha256 = "1342j1mlzw51prp9w9ink03mmsjbq0jdp7xk86qazaia3k8ynnd9"; }; meta.homepage = "https://github.com/savq/melange-nvim/"; meta.hydraPlatforms = [ ]; @@ -7865,12 +7865,12 @@ final: prev: { mini-ai = buildVimPlugin { pname = "mini.ai"; - version = "2025-05-29"; + version = "2025-05-31"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.ai"; - rev = "4b5348fac5912f1957f4c012c2e0ab0c4b865386"; - sha256 = "12hvn1dd4qcjj4ah56na9l6n55kz2x0k5krwswij2amws2a7g1wc"; + rev = "5225f16eacf4dce2cb7204ca345123ef54e209d6"; + sha256 = "0vqf5xywkqw84r96malik5jxib7ifr9vpk1f6ifj74d23ldqzs1c"; }; meta.homepage = "https://github.com/echasnovski/mini.ai/"; meta.hydraPlatforms = [ ]; @@ -8125,12 +8125,12 @@ final: prev: { mini-hues = buildVimPlugin { pname = "mini.hues"; - version = "2025-04-12"; + version = "2025-06-03"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.hues"; - rev = "f1fa8ad34788eada276f0b8a41d96a15622933de"; - sha256 = "0yap91dqnr4jpwz1krmzay5p89pxb8v6m5457b6sm6f98956zgqq"; + rev = "62f16a7b4704d051f69c39dbbe867dfdb4f0d3ed"; + sha256 = "0hmflllpxmp39d1x1lx0j6w3mm2yin3mf0mjgfics2s6jdami3pj"; }; meta.homepage = "https://github.com/echasnovski/mini.hues/"; meta.hydraPlatforms = [ ]; @@ -8190,12 +8190,12 @@ final: prev: { mini-keymap = buildVimPlugin { pname = "mini.keymap"; - version = "2025-05-20"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.keymap"; - rev = "2aa0a66d6cbf15c9cea331d976ac4d4b9f01621e"; - sha256 = "18samb1yjvmw2yjl0l4csl484aqah71qr19zspx46z5dk3jib908"; + rev = "da545fb70161aedb5331572ddcbffbdb8e31d8ce"; + sha256 = "0s1x9c2rbz947g3wnbcf50hrs8d6wvqia2y4mi1nk0zafp3v1ijb"; }; meta.homepage = "https://github.com/echasnovski/mini.keymap/"; meta.hydraPlatforms = [ ]; @@ -8255,12 +8255,12 @@ final: prev: { mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2025-05-29"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "25c8959b3fcf0461271a21dd204e6f3cd1cd7806"; - sha256 = "1qqf539ikm6smiags4srlqg5b7g6l1pmd3ssm37d13xqfhfhq2gd"; + rev = "c3d398d8bfbd18ae24cb22a17cde1aaad3764cd3"; + sha256 = "1gc67yassyasxl9z6da75rhxgnbclcvlpgbx0z3v48l91ampmv7g"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; meta.hydraPlatforms = [ ]; @@ -8320,12 +8320,12 @@ final: prev: { mini-snippets = buildVimPlugin { pname = "mini.snippets"; - version = "2025-04-18"; + version = "2025-06-03"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.snippets"; - rev = "d005684e620e76eb2a5fbbbd211a1eba7212b4aa"; - sha256 = "19xmqzgx0lv6m6lp6dn4pcr53clgjyrlnh45j795cy9szizw4y0x"; + rev = "6f0de3c3f97a8c015f99619f72edf9b2880b6886"; + sha256 = "0pbkwp5p0y3djf3xfvmnf6ys1w5287gyhas09s94ha2ghhsyzy2w"; }; meta.homepage = "https://github.com/echasnovski/mini.snippets/"; meta.hydraPlatforms = [ ]; @@ -8372,12 +8372,12 @@ final: prev: { mini-surround = buildVimPlugin { pname = "mini.surround"; - version = "2025-05-27"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.surround"; - rev = "f4307f935ad87cfe3e570dbaae485b35cce4e5ec"; - sha256 = "0gmzcnvwlrbvg8swi54lhx5zjrcx60xmzvan8fis2llbf8dz04ig"; + rev = "0d278217ca98ffa5b768701fb57f52a88b1e1f93"; + sha256 = "0r93kgzd5xhykcwxzfjcmdmcd2dmj80hxqfd4r6ikbaxq6b6vnk0"; }; meta.homepage = "https://github.com/echasnovski/mini.surround/"; meta.hydraPlatforms = [ ]; @@ -8892,12 +8892,12 @@ final: prev: { neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2025-05-23"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "3f1dd2de5045659e00bfbe27c8aca3b52c1fdbde"; - sha256 = "0mh0wv4x2pi6khwbp3fvi40n6hd3sz5ak81w9vf2xn3hh2z0mmqc"; + rev = "f3e8633f06007e015f855d3c1ec0cee23af14d8e"; + sha256 = "04ddr8cl67xk7i459y49m3mfxc3ca8kbdzmiwwz3ksrfhxyzr0g1"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; meta.hydraPlatforms = [ ]; @@ -8918,12 +8918,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2025-05-30"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "5ebd6c29c88931fe7c603f087b4c32ac8157d901"; - sha256 = "1byjy0bvb2q281zzk88a2lq1rkqzw9q4fr2if6lbcq5h89vdly6k"; + rev = "27ad122b711ad1ab7fe1cd8d352ded0c454ec05e"; + sha256 = "1n3fi1njgqg27g1aakizi2bqclk0f3hxqzym9ya1jh7dxaxagp3x"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.hydraPlatforms = [ ]; @@ -8996,12 +8996,12 @@ final: prev: { neogit = buildVimPlugin { pname = "neogit"; - version = "2025-05-29"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "51eeadb9d3c1768ad1e247d1bde604c252b5768f"; - sha256 = "09jv9nx8z0p7h65lap8m2k0h5yqnylcp7ynpk1aphip3kkkjgbq9"; + rev = "89a2df9a882868ddfa2a757e3224f57971e38329"; + sha256 = "0smcr2y4nrgdsp7nk2v06dhpchl2gsrn9ckzhzwq1smdh0nlgdkf"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.hydraPlatforms = [ ]; @@ -9179,12 +9179,12 @@ final: prev: { neotest-dart = buildVimPlugin { pname = "neotest-dart"; - version = "2025-02-26"; + version = "2025-06-03"; src = fetchFromGitHub { owner = "sidlatau"; repo = "neotest-dart"; - rev = "ec1cecdfd44c82632f5fbdcad3dc77622fe4ee67"; - sha256 = "1nxswiijd2fpz5ilvi5jf924p0krkhbjmgmn6kp9gjl0f6dp1al4"; + rev = "5ee074c9593639b60ebc452102d951438c815aac"; + sha256 = "1hkggr8mls7ilbr5vw9iqfgbf7nspspbisdzkp7mfvx5358jf1cw"; }; meta.homepage = "https://github.com/sidlatau/neotest-dart/"; meta.hydraPlatforms = [ ]; @@ -9205,12 +9205,12 @@ final: prev: { neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2025-05-13"; + version = "2025-05-30"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "b27e6ed8197b232909658322a823b901295b54ec"; - sha256 = "13k2c2lqxcvylglnhzj4q8nra8134nisdkv55381i2rzrjnvsl4c"; + rev = "962af8bcb73622b0f44f1e25a0441f5783fe5665"; + sha256 = "001z2j0nr6qa9m5jr1l341pyw1h9105ywk7ns6bnl6y73sqa0rx0"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; meta.hydraPlatforms = [ ]; @@ -9258,12 +9258,12 @@ final: prev: { neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2025-05-27"; + version = "2025-05-31"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "4b1b145c94b29e36e35704238350f583fae03646"; - sha256 = "0xsfs6w2a3ljwv1glpscigml4slddz5059k8md4yih5lsywvf4xq"; + rev = "863a9d8cef20b7392aac77eaa7d116faa8344aab"; + sha256 = "04knx74iqwqm1w165jp0jnjf3nas8mdfsqp9yw5vz7krn6cgywql"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; meta.hydraPlatforms = [ ]; @@ -9298,12 +9298,12 @@ final: prev: { neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2025-05-26"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "04ced6ff82940047ca92b0b654271289982e0bd7"; - sha256 = "14hl022zx3fxhk1d8887cgsfrql8pyl3cgdmp06hxp5bm064z228"; + rev = "f2a3373ccc5e41ce53dd2f3fa76e8b0a82cf3613"; + sha256 = "06jgrcrbjrpi4wfkschcrwyzapy4bcssfy03vnxw2lj6c5czjrwz"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; meta.hydraPlatforms = [ ]; @@ -9610,12 +9610,12 @@ final: prev: { nerdy-nvim = buildVimPlugin { pname = "nerdy.nvim"; - version = "2025-03-09"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "2KAbhishek"; repo = "nerdy.nvim"; - rev = "14bdcd13265dfc80e6ca6cee0598c5880729e24f"; - sha256 = "1xci5viwiyzxj644vxbh8n6y3irkjvqxfmxjiad25adr8qv4qx7x"; + rev = "dcf0afa6cd5a325d6779cb75d8d703dc2188adbb"; + sha256 = "0d82dk112dpnk1i4x2gg32nq8fpjc8irv5kj9xnh1m6s4aycg25v"; }; meta.homepage = "https://github.com/2KAbhishek/nerdy.nvim/"; meta.hydraPlatforms = [ ]; @@ -9779,12 +9779,12 @@ final: prev: { nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2025-05-29"; + version = "2025-06-03"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "878983844698427d19c4e479fb14a462f39624f7"; - sha256 = "1iwdifqypfck8mmnby7ww6y9vi9cvdf2dj7d03n1amqqq0mpn0h9"; + rev = "757e1580182f62162a22da6131645a7c51397a25"; + sha256 = "10q2kck6mjnvsk0c3rcnakfqij3757wj67rmml0zgg0k43bar423"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; meta.hydraPlatforms = [ ]; @@ -9818,12 +9818,12 @@ final: prev: { no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2025-05-29"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "137c9c4992fc51f43047bed4ba8aaf021edcd858"; - sha256 = "080kfnnwfy1jlqqjanhvwghh890ixjgvq915xpipvs1llnjfb1rg"; + rev = "ecdfe60f23134089fac92659e688b65fdd8b5cc0"; + sha256 = "0a5xmflib60k81gj6v11m1wymnzknyjxl5ydxpawyx61y36k3xhc"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; meta.hydraPlatforms = [ ]; @@ -9961,12 +9961,12 @@ final: prev: { nvchad = buildVimPlugin { pname = "nvchad"; - version = "2025-05-07"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "d4e5b8a10f01c06e18d2a8bb66761a3596562a67"; - sha256 = "1nhqp61msi1p472d885w4lrj6al3363iydyvdi02h3n0fb95ghx7"; + rev = "478299d3455e22e375df468bba7cf9e2cadcc189"; + sha256 = "179qbxbs01ra289lag7pq7bajs44xmsjhpdlfj4795w2zh5bdjca"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; meta.hydraPlatforms = [ ]; @@ -9974,12 +9974,12 @@ final: prev: { nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2025-05-24"; + version = "2025-06-03"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "7c51760f8772a6695875ac29f8b3c398da7753f0"; - sha256 = "05slbvdsq0iladmd88wb4a59vh5mbsjb9mhcyfwhx0xicnsfyb8s"; + rev = "b7c656064ec54f77bc6c75e4c51108ba451e6d7a"; + sha256 = "12zqah2zgsi3ic3blhkcyhg8ahpzywk20hjq0gxl7ijpqfqq73d6"; }; meta.homepage = "https://github.com/nvchad/ui/"; meta.hydraPlatforms = [ ]; @@ -10208,12 +10208,12 @@ final: prev: { nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2025-05-22"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "b0f983507e3702f073bfe1516846e58b56d4e42f"; - sha256 = "17fcxlfkzh75q8sasjf21jbh18s78v9g80p5qrlgi0caqznj0hv7"; + rev = "ea82027c3447dc1a022be9a9884de276c05cd33a"; + sha256 = "0m91bqbprp6n00m7kk5wqrhl237a5q082m98xak6r7gvxg1c7ac7"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; meta.hydraPlatforms = [ ]; @@ -10312,12 +10312,12 @@ final: prev: { nvim-dap-view = buildVimPlugin { pname = "nvim-dap-view"; - version = "2025-05-27"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "igorlfs"; repo = "nvim-dap-view"; - rev = "186c9580895f8552a6e0eff8087e643a824dac2d"; - sha256 = "0lp19h19ylmrgl8nsrp9ijk3z148lrf9k11cjj7r4hc03b95frk2"; + rev = "7b305ecbbdeb5c6fb7463e68e42c44c19add60b9"; + sha256 = "0788q2p5534l9qsxpd9ik6dwd99pfprr1j8cszvffl6mh1rjf9ss"; }; meta.homepage = "https://github.com/igorlfs/nvim-dap-view/"; meta.hydraPlatforms = [ ]; @@ -10481,12 +10481,12 @@ final: prev: { nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2025-05-23"; + version = "2025-06-03"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "9ffcfde58d230ccd591811611c0dd204aa247728"; - sha256 = "0ix8b2xgjcamcx3v9k9m6qzffwv990na80f0hwp3m3l34idhwh8c"; + rev = "9097dfdab09c0610c5057a0161f68d9e9a187657"; + sha256 = "0hf826dk6wvfmzs7d6xrnilkvqlrdnfrrr5h5b4jyvqy8k0zsckv"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; meta.hydraPlatforms = [ ]; @@ -10676,12 +10676,12 @@ final: prev: { nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2025-05-04"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "9fca94011b3ea22826660a6ceae3ccc1f54d89ce"; - sha256 = "1rab4akawxfl84qadif9v8q94bvpjl6qaczjsb1s3hvpxa33wnmh"; + rev = "8227b50451d60aa370e67cc5f8bad8b14783551c"; + sha256 = "068b7kygi0wb39hz1gqjl1spqf6lrlas61yw0khxb83j7kwcy655"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; meta.hydraPlatforms = [ ]; @@ -10689,12 +10689,12 @@ final: prev: { nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2025-05-22"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "b47cbb249351873e3a571751c3fb66ed6369852f"; - sha256 = "0cs6vs58p98fv6nmqsyik2kws6xnqbny79gl39mmyssm3z9mpps8"; + rev = "cc26ae6a620298bb3f33b0e0681f99a10ae57781"; + sha256 = "0jspqgw8zwz79jrlcqr15waaxzw68n5c10bvhm3hqw02dr0bbipq"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; meta.hydraPlatforms = [ ]; @@ -10741,12 +10741,12 @@ final: prev: { nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2025-05-27"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "b8e7957bde4cbb3cb25a13a62548f7c273b026e9"; - sha256 = "1lalfwgp5hw7dq5ixh5k0wa8r5a81xkbx0k7nwl0j17krwxvlm4w"; + rev = "036885e8e5456d3907626b634693234f628afef6"; + sha256 = "1zkjmr33srzdcjriwdlvq1dmpia7n0xgy3k5l3cdhrfn66k3mwl2"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.hydraPlatforms = [ ]; @@ -10806,12 +10806,12 @@ final: prev: { nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2025-05-19"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "d1639b7fccd845875e33444c7860ad292ab8670d"; - sha256 = "1f6cgzs3vwqdva06jdcmyy5rldjlxg8x5fbdyq61hbl3xw5qjvsq"; + rev = "5ab889232ccb6e749094294e7979fda4a71fdecb"; + sha256 = "10asl4vi6di8vzhhjsczf8c5l16lcj0ygj2fbylav44ydy4dlwxd"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; meta.hydraPlatforms = [ ]; @@ -11040,12 +11040,12 @@ final: prev: { nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "2025-05-22"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "f51c39e9d47fdd64ded74caec9d27d115dc0ea5f"; - sha256 = "0simmkf59gb41w9chhq6apzr6k34jr9s68578mng5n3y7419gny3"; + rev = "1738c92fe35f95a0f9814cd5984534c50f1b5103"; + sha256 = "101lhrnqqywzx9c0n0ad60a7pwgpwrnw1jsy0wqkav1d3l3pqllr"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; meta.hydraPlatforms = [ ]; @@ -11235,12 +11235,12 @@ final: prev: { nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2025-05-26"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "ebcaccda1c575fa19a8087445276e6671e2b9b37"; - sha256 = "1x1yw3xjpn2g0qxsniyjq4pxkccycbz499mwp9m6h8xdyhbafsvg"; + rev = "1c733e8c1957dc67f47580fe9c458a13b5612d5b"; + sha256 = "1a92zsb1r48s6cjphvx406lbxyc1v9w3gk9kkp3ri0k1l134aaw8"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; meta.hydraPlatforms = [ ]; @@ -11261,12 +11261,12 @@ final: prev: { nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2025-05-29"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "ed1cf48d5af252248c55f50b9427e8ce883a2c6b"; - sha256 = "1y2z2z8h8nmrpcg2igrbmbzs96y9dmcgfajbljqci5fbihqh7vbz"; + rev = "464a443b5a6657f39772b20baa95d02ffe97b268"; + sha256 = "1q8ll6lkgqc2vhr9jz687a9rgzxrd0swy8cnsy2mb6c6626sxxhq"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; meta.hydraPlatforms = [ ]; @@ -11534,12 +11534,12 @@ final: prev: { nvzone-menu = buildVimPlugin { pname = "nvzone-menu"; - version = "2025-04-13"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "nvzone"; repo = "menu"; - rev = "8adb036ec34c679050913864cbc98cc64eb91f6c"; - sha256 = "0yxs5fmj6swbbwnkwvji5hp553692mnaww87y1ag6xj14g5i96sl"; + rev = "7a0a4a2896b715c066cfbe320bdc048091874cc6"; + sha256 = "11jafag2wsap9vmzd19ndfrbyyd685gn9jh580lbpniprbld0rz0"; }; meta.homepage = "https://github.com/nvzone/menu/"; meta.hydraPlatforms = [ ]; @@ -11625,12 +11625,12 @@ final: prev: { octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2025-05-27"; + version = "2025-06-03"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "53a424b7432d97f3ef0b5cf7a08972d7c9974f5a"; - sha256 = "1dnmnhqvs7131h5g4037yh1m6zz9l5azg40qp6fmyg68pcr065sy"; + rev = "ef7ece509e43cf757f027aa41436c0a40f4ed8bb"; + sha256 = "0smi2g8c7cfaj72jrdsx4na42x8yw9hmyrxrc0jp4swml8cymzfg"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.hydraPlatforms = [ ]; @@ -11703,12 +11703,12 @@ final: prev: { one-small-step-for-vimkind = buildVimPlugin { pname = "one-small-step-for-vimkind"; - version = "2025-05-29"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "jbyuki"; repo = "one-small-step-for-vimkind"; - rev = "76642dc962bcfafe5dcc693d95a61c29845f6127"; - sha256 = "02i9xxg36bwl9pzjvh8xwm04xq7b1m0npjnlq1qgr6f8b3ks2aia"; + rev = "81415bd613479d6d6d55e99ac9057264fe6aadac"; + sha256 = "1cr0slzggfbdhqapl2sw80hkqsayh08wigga1xkdcqvzikwjjal3"; }; meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/"; meta.hydraPlatforms = [ ]; @@ -11755,12 +11755,12 @@ final: prev: { onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2025-05-25"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "18c1722ade40d7b268cbd942939239b5f3e7acaf"; - sha256 = "1z4j78kgd57xy30pf00nznbzibjf5qspr83yh4vn7sw6rg5dilcx"; + rev = "5ffd45b3602bc1ed75f0b2be6c5c1f6ba5c6b796"; + sha256 = "02zn53vda99mjb3ygy6jpjhlb0v4anbjndrn0g9awzi3dyv7gcsa"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; meta.hydraPlatforms = [ ]; @@ -11872,12 +11872,12 @@ final: prev: { otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2025-05-14"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "fa436071c67233e6cd466268212feaf4ff4ed406"; - sha256 = "0i8bkgyh8zaszm15h8lznd9ik1fh0l0mdcwyam4mnn4q0nhjqznb"; + rev = "1348aad77adac26fe3dff44aa220c5a7e96aa8ae"; + sha256 = "0qdc2dy16jk9a081g1kfiiibxfmzwxvnl5d5m239mcfivzkwn8yq"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; meta.hydraPlatforms = [ ]; @@ -11912,12 +11912,12 @@ final: prev: { oxocarbon-nvim = buildVimPlugin { pname = "oxocarbon.nvim"; - version = "2024-08-28"; + version = "2025-05-30"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "004777819ba294423b638a35a75c9f0c7be758ed"; - sha256 = "1qllk870nqc9nhkdgmqm8km2rar6dsmyhfhpcfx8crrg640yfbqy"; + rev = "acdfdd5d319c36170b5ad2a120283bec2f450081"; + sha256 = "1byvqvrnf56y050r6dl4sykn22z11i8qxxai8j552a06l7jxyiw4"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; meta.hydraPlatforms = [ ]; @@ -12003,12 +12003,12 @@ final: prev: { papercolor-theme-slim = buildVimPlugin { pname = "papercolor-theme-slim"; - version = "2025-05-29"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "pappasam"; repo = "papercolor-theme-slim"; - rev = "d62413a30a8b17076a701d4083838bc237e05e35"; - sha256 = "0bf34z03dqlb426na1f6bh0z0ni5vpmbwrfdzziqm9ybn9gzc4hm"; + rev = "41338b61dd1ff8a12a711c7de355f1e48353c1d8"; + sha256 = "1npa7kfgxraw11mlsb9r55s6cy9hx0dsqw0mdmds30kl0m1wdvxg"; }; meta.homepage = "https://github.com/pappasam/papercolor-theme-slim/"; meta.hydraPlatforms = [ ]; @@ -12029,12 +12029,12 @@ final: prev: { parrot-nvim = buildVimPlugin { pname = "parrot.nvim"; - version = "2025-05-29"; + version = "2025-05-31"; src = fetchFromGitHub { owner = "frankroeder"; repo = "parrot.nvim"; - rev = "a884f12ca143ee223abccc645ea4edb871b82cf8"; - sha256 = "03ik4gyr8z6pm47r2xqvvgn1nlpm59bw50q7lis7sbzr6qkgm71k"; + rev = "378d7706a392c06eabe0ddbbdc6ed5fa57ca4db0"; + sha256 = "1q9fg57vp7gvxlvzbml5j9vvzsivby384h0y5bxg32nvggj4amhy"; }; meta.homepage = "https://github.com/frankroeder/parrot.nvim/"; meta.hydraPlatforms = [ ]; @@ -12420,12 +12420,12 @@ final: prev: { pum-vim = buildVimPlugin { pname = "pum.vim"; - version = "2025-05-03"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "Shougo"; repo = "pum.vim"; - rev = "4728300b8c6e0887256362648a0e2a3acf2ea22e"; - sha256 = "1l467rwv42bw6lb7jzfqw83gnwgx5aabm43w1944ddmck7mz6ic3"; + rev = "697bbb620803482c13b8faf36742dfcea4eedb09"; + sha256 = "02wnq3jhkcvcckvj119hkmbmr5v5phyrncz1fk6nppd1w5xyggnf"; }; meta.homepage = "https://github.com/Shougo/pum.vim/"; meta.hydraPlatforms = [ ]; @@ -12499,12 +12499,12 @@ final: prev: { qmk-nvim = buildVimPlugin { pname = "qmk.nvim"; - version = "2024-09-14"; + version = "2025-05-31"; src = fetchFromGitHub { owner = "codethread"; repo = "qmk.nvim"; - rev = "ad51cb15e607da0983fcf9882d38a2aafac32149"; - sha256 = "14b8mx7hxv06cnh6xb1z0nrkhlj7xaxdky6lcmajn9bp9spdzlmq"; + rev = "348ab2cd4f319f7c9881ca8b1bc0241e9b4d6619"; + sha256 = "11vnmhaslgphy07bngfcxi1jiyprdm1lm6n2vi5y9qi7ky8y8hrz"; }; meta.homepage = "https://github.com/codethread/qmk.nvim/"; meta.hydraPlatforms = [ ]; @@ -12707,12 +12707,12 @@ final: prev: { refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2025-05-21"; + version = "2025-06-03"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "64dbe67bf7c28c864488262d267c799f80cae9ba"; - sha256 = "07p55lf8d0y6lb11jg44w2p5p6x91xarns51ric5j58w2ynkwdcw"; + rev = "9cd0186ffe76fe6abc64c0aafb775c8f776ab5ee"; + sha256 = "0zfgndnidqxkypywdghscygrzbmxh2pm0hzz1k56hz5lvd33ww61"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; meta.hydraPlatforms = [ ]; @@ -12759,12 +12759,12 @@ final: prev: { remote-sshfs-nvim = buildVimPlugin { pname = "remote-sshfs.nvim"; - version = "2025-05-29"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "nosduco"; repo = "remote-sshfs.nvim"; - rev = "1307b3645af5ce60b9e42f06d27eb5a1fab18fc7"; - sha256 = "0qqf71j3c4686wwq8v0jh8gskbakinkx878p5yifkjld4j77qg3c"; + rev = "6e893c32ff7c5b8d0d501b748c525fa53963fb35"; + sha256 = "0q4bhq153k3smq4nhiqf9zyni4yyx96swc6radj7j53vwhadafbr"; }; meta.homepage = "https://github.com/nosduco/remote-sshfs.nvim/"; meta.hydraPlatforms = [ ]; @@ -12785,12 +12785,12 @@ final: prev: { render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2025-05-29"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "048d68028d09ad2e134e7059032b8192a85180b9"; - sha256 = "1bz8y9pdw3fivnb99jm0ciz4wsbpfsiz1xvl81cprjcvcddhhkpw"; + rev = "6f5a4c36d9383b2a916facaa63dcd573afa11ee8"; + sha256 = "15q8169wxslr6kmzqagvsj20j745cym72a2yjmdavh61mgs56rxh"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; meta.hydraPlatforms = [ ]; @@ -12824,12 +12824,12 @@ final: prev: { resession-nvim = buildVimPlugin { pname = "resession.nvim"; - version = "2025-03-24"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "resession.nvim"; - rev = "fd08e476c4e2f826905c384a3a301a821758764b"; - sha256 = "0l6hzzz1n3mlhab97hdy1zy5z3i22v9fk3an5a3wrgjn8sgsm25i"; + rev = "84c81e5fd8a94dc85a60b97089536174e558e288"; + sha256 = "1jhv172izp772fn07lf4a80kcd7sj2j5cq763h0xaafb4h03kjax"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/resession.nvim/"; @@ -12916,12 +12916,12 @@ final: prev: { roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "2025-05-26"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "seblyng"; repo = "roslyn.nvim"; - rev = "65769488fca061e5663c575c73da277ec1e5abc2"; - sha256 = "0sy0f8ygxnrmb7c2w8m9y2fqwcn9bbfxa3nmm3vk3i4in8mjfzn2"; + rev = "21c8ff60d6e36b3938c88d81cc98096e2156d77f"; + sha256 = "00lm72l8zqav2cjv8m0vgrn5s359rbqi6a2p23hr6zbhwx8wbzj4"; }; meta.homepage = "https://github.com/seblyng/roslyn.nvim/"; meta.hydraPlatforms = [ ]; @@ -13268,12 +13268,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2025-05-23"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "5ef94ca23b28148187846fc46f10184aad4d17b0"; - sha256 = "04y30g6xfwzfw9qj7z5kh1yifz4cc2q7krnyzc08siwwvnsfdlkz"; + rev = "e80bf81015a342b78e3e9ef0395a09ca91f666de"; + sha256 = "12nd3cra6dw5nyqgcp9cvsrdxrf4m575ngi3f03180cpnsw6vhmx"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.hydraPlatforms = [ ]; @@ -13541,12 +13541,12 @@ final: prev: { splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2025-04-12"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "6af1cdcae4b46a90dbcd59ce0ca3543f34c7732c"; - sha256 = "026pnf7pvz1qz3f4cqwm086nv2f9apgc8qiyvysygfq8vsr6azpj"; + rev = "451c70158aaccf806d29be69a0d4482734a4f9ee"; + sha256 = "17c6vkiqyx8dcb93nvplvw5y16xmy04cmdrapj4vpm357n8a2qq7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -13685,12 +13685,12 @@ final: prev: { statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2025-04-20"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "a2580e009a3b4c51b5978768d907dafae2c919ac"; - sha256 = "0k3wj5mzv38wrmq17pd9xpdcc8p3l1bwx078931ylrga5j1ld3vx"; + rev = "c46172d0911aa5d49ba5f39f4351d1bb7aa289cc"; + sha256 = "02aajcwrbhjxkd4hykjcwj8anv3vq09ma04sj1n49ysmkr210lcw"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; meta.hydraPlatforms = [ ]; @@ -14012,12 +14012,12 @@ final: prev: { tagbar = buildVimPlugin { pname = "tagbar"; - version = "2024-12-27"; + version = "2025-06-03"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "8de7694c0aeda253073098bbc9fb890b2902ddb8"; - sha256 = "1s3x0p0j7fx4xzalfq4fjnmf5vdhh398pfd08j8j5qc1f0p09fmq"; + rev = "b72250e9d77b7a5cf9be067875dc5270652b005e"; + sha256 = "19p2j36bzjma3rgxxms1ckw4ir6sngiz3df8gkmjnxszdwaw5fva"; }; meta.homepage = "https://github.com/preservim/tagbar/"; meta.hydraPlatforms = [ ]; @@ -14704,12 +14704,12 @@ final: prev: { tinted-vim = buildVimPlugin { pname = "tinted-vim"; - version = "2025-05-26"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "tinted-vim"; - rev = "2c76bae44d0e2c4e8fbb3f6b0ba944e898c38579"; - sha256 = "1v19sh05i8jw4a13n205jqni4mz6xsl79q1lxr92nzwzka1dry6l"; + rev = "658b34995a253d0ee4764103a0e17440b6cfb45a"; + sha256 = "1b0gsw1nld6r886npp0s64si7x3dpvmjr7vmr4a3jwi1jday15cg"; }; meta.homepage = "https://github.com/tinted-theming/tinted-vim/"; meta.hydraPlatforms = [ ]; @@ -14730,12 +14730,12 @@ final: prev: { tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2025-05-12"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "b6ed8038dfd256eb963a2c79cb30f0f4683551a0"; - sha256 = "0na7v97iqsc9416v6qhdnazzmzkx283hxvgihl16lj91cs4z7yh9"; + rev = "cac10593c4baaacd0f2a1f4d8ba9508667bf3f79"; + sha256 = "1s60j36rv08mg33dk8a8hip9r9f4mplv81d6rbhfy38l3kz518yp"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; meta.hydraPlatforms = [ ]; @@ -14887,12 +14887,12 @@ final: prev: { transparent-nvim = buildVimPlugin { pname = "transparent.nvim"; - version = "2024-08-25"; + version = "2025-05-30"; src = fetchFromGitHub { owner = "xiyaowong"; repo = "transparent.nvim"; - rev = "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21"; - sha256 = "14d9jy9lzybr49i287n9ijcphrppb3l0kgixdpd5r7daqn0qncza"; + rev = "d41ae9b56ac2706cb3db4b16afe5cd6903013937"; + sha256 = "1sdn8zc9jwn0fvz9qsl79fx9hr3lqb4bw9v30znm267lf20b035s"; }; meta.homepage = "https://github.com/xiyaowong/transparent.nvim/"; meta.hydraPlatforms = [ ]; @@ -14913,12 +14913,12 @@ final: prev: { treewalker-nvim = buildVimPlugin { pname = "treewalker.nvim"; - version = "2025-05-27"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "aaronik"; repo = "treewalker.nvim"; - rev = "86ae3cf9896b43f3cfa35b962428f32fed8b5ee8"; - sha256 = "1d6v2pb1lxzbf084zggz99j8w3yd2wiskbhylks6slzn965vkhjb"; + rev = "fe814c2181dc3004d97073a613c20554cc1a7d7b"; + sha256 = "05dkiilkqzl488k1ifwk5xj48zfy14pzny062llm2jyc7pxcrwlk"; }; meta.homepage = "https://github.com/aaronik/treewalker.nvim/"; meta.hydraPlatforms = [ ]; @@ -15174,12 +15174,12 @@ final: prev: { ultisnips = buildVimPlugin { pname = "ultisnips"; - version = "2025-03-09"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "dbc458e110bb49299da76ec53f8b09b4f6dce28a"; - sha256 = "1yqnbqq0zxfq8zlaibq0k4n525a5cjp68gab2jhcf76jyczi53wb"; + rev = "b22a86f9dcc5257624bff3c72d8b902eac468aad"; + sha256 = "195pkgzjv24qw1y92phjmvird00filrzl5i28mm139sdshzqnx14"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; meta.hydraPlatforms = [ ]; @@ -15239,12 +15239,12 @@ final: prev: { unison = buildVimPlugin { pname = "unison"; - version = "2025-05-28"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "7f153635463cb45f8ebe62fbec17e8d18aadb813"; - sha256 = "0dhdmjib6vwry8axaim0dd61dv8jbysdsma7bk44cnp6wpv9pm9k"; + rev = "3766e89f85cb838a89d14e36f5ca836ce022e8b1"; + sha256 = "1sxcypq5fgmjif30vqgdgql6mbvbdm9ckidri6mp6p8rhqy9ssm4"; }; meta.homepage = "https://github.com/unisonweb/unison/"; meta.hydraPlatforms = [ ]; @@ -15369,12 +15369,12 @@ final: prev: { vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2025-04-26"; + version = "2025-05-30"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "c9fe6475abcf58ec03b4950c063adb7578cb308c"; - sha256 = "115qdv45ifscd8clsi03pk9m29dzxzxnm0wzczg2qy4lkc8525ws"; + rev = "169373867147a45db6b5ce5855addbcc1a4d6893"; + sha256 = "09wfp8zm7s3mcsi2j0wps1lwhrlivq5jzjhnl5fiimz441d4k3hn"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; meta.hydraPlatforms = [ ]; @@ -15798,12 +15798,12 @@ final: prev: { vim-airline-themes = buildVimPlugin { pname = "vim-airline-themes"; - version = "2025-01-02"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "cda3b5ea087f7e301a3d4e61727108f66ba6dd20"; - sha256 = "1w792m7j8sk1qh3z336nz2d81pa1pnp7iqmlpigdzwm66yig67q4"; + rev = "0e976956eb674db8a6f72fae4dda6d1277433660"; + sha256 = "04md0ig673l4lidcskaikkc246j04vrz63ns002wp5dpsvchcczk"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; meta.hydraPlatforms = [ ]; @@ -15824,12 +15824,12 @@ final: prev: { vim-android = buildVimPlugin { pname = "vim-android"; - version = "2024-09-05"; + version = "2025-05-31"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "62192c9079b942aa3c9f6d34a1bc312bf54d0301"; - sha256 = "0d1miihh7f7kghp88a8q38b19hfhlnwg821rd6yc2w7yvkzfh7bx"; + rev = "1445cd5359f0c8597ac34428a8d273427d4ab0fe"; + sha256 = "0vqahgvfsmrmad2fjar1p5jmvlpxrflszlx624klqm3q0xx7l7in"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; meta.hydraPlatforms = [ ]; @@ -16604,12 +16604,12 @@ final: prev: { vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2025-04-14"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "460432301a5cb280ea265ddfa15c9f3dcd1d26b7"; - sha256 = "0adpm2sv0lwcfgn90lka3wj8slzbx0bl3lp201syrc8w6w7jgljr"; + rev = "2900a1617b3df1a48683d872eadbe1101146a49a"; + sha256 = "070x8c82a29ik68qy71j6dbznakc5vzr2b3kyicaiindbqavcbgv"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; meta.hydraPlatforms = [ ]; @@ -17423,12 +17423,12 @@ final: prev: { vim-go = buildVimPlugin { pname = "vim-go"; - version = "2025-05-26"; + version = "2025-05-31"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "68d769bfcdf0ba57af793c6b177a4a9b9b02bdf1"; - sha256 = "0mpgq856j4mzga809s90lhlbhgywdi1hsz0zssjbd9wzjdypf9r2"; + rev = "787342da47bc5fe6fa88e9d65842c6a0a6304700"; + sha256 = "0r0f7kfp47lna4xc5jsk159080qac2j6shs7pymrdlaxfn0gyn0d"; }; meta.homepage = "https://github.com/fatih/vim-go/"; meta.hydraPlatforms = [ ]; @@ -17488,12 +17488,12 @@ final: prev: { vim-gruvbox8 = buildVimPlugin { pname = "vim-gruvbox8"; - version = "2025-05-29"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "24c410a45189564fbd96f6ada022df2ad8e6d0d0"; - sha256 = "1v1zjb7bf78ri0d8b7py25p75dv3i1d3cyb11vxlw2gwh0n5waz8"; + rev = "9ac7db13bfe3cffb836f844e567efad71174238a"; + sha256 = "15mdy3r94i33m1y941943qa96xrmkxirq61ck4d2b9ms0xfc7iqn"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; meta.hydraPlatforms = [ ]; @@ -18543,12 +18543,12 @@ final: prev: { vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2025-05-16"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "56c714495ec7f40cf2c7e92fb124067c7951e650"; - sha256 = "011kb5fi3mahpv9n5iwgbmc6h9drsry57wr31x95g0yqr3s97viy"; + rev = "c478d4a72bbf397eff42743198f1939f6a264736"; + sha256 = "0v6dqj30h6pqhx07lk65r8mi30yjphya9wn2wz5hfky1rl1wrwrq"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; meta.hydraPlatforms = [ ]; @@ -19999,12 +19999,12 @@ final: prev: { vim-solarized8 = buildVimPlugin { pname = "vim-solarized8"; - version = "2025-05-29"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-solarized8"; - rev = "7693d4aaa77edcfbdd7f6cb0109fdd2a5eb663c9"; - sha256 = "1gl4qlirrgzlrckmvrx173dn1nxba5bzhp8jmx46ym9fx6v0y9dx"; + rev = "2f31fc2239c965d7dd9754ba8160582c99211e12"; + sha256 = "0s02xs7asba82ibzj03s68869jc767r5aihcji00gr5f7gkmsha3"; }; meta.homepage = "https://github.com/lifepillar/vim-solarized8/"; meta.hydraPlatforms = [ ]; @@ -20051,12 +20051,12 @@ final: prev: { vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2025-05-15"; + version = "2025-06-05"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "2c65832b77195fa78424138553ebc13dba5f2574"; - sha256 = "065r3yq2zl86nn19191hn5ivy63ddndxy51qbkafi3hmifzisav7"; + rev = "5e5dbebfae3b239bf5b5fdae1ba748940468830e"; + sha256 = "0hicyp3q6hhpsk6v944v3if6v47a8xsg2czz4qka8rlggc039v9w"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; meta.hydraPlatforms = [ ]; @@ -20194,12 +20194,12 @@ final: prev: { vim-svelte = buildVimPlugin { pname = "vim-svelte"; - version = "2022-10-27"; + version = "2025-05-30"; src = fetchFromGitHub { owner = "evanleck"; repo = "vim-svelte"; - rev = "0e93ec53c3667753237282926fec626785622c1c"; - sha256 = "1vv10bx2q463bjg7gvjy5lfxn0177s2r8i8xlwy2kg4620n0g5xi"; + rev = "f6df955ad86583e9751487eb7550fae9e53d2d6b"; + sha256 = "1ksihgv8hbmhckxwrbrbq8nq1m6rihygczfxm1cljhmwx38qmp6i"; }; meta.homepage = "https://github.com/evanleck/vim-svelte/"; meta.hydraPlatforms = [ ]; @@ -20325,12 +20325,12 @@ final: prev: { vim-test = buildVimPlugin { pname = "vim-test"; - version = "2025-04-02"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "b0c3e13249699a522c8b472ff79eff40d2935476"; - sha256 = "0qcqg8cklj1lkl7mx0nk49jgdk2vy6l5mlk7ajs7s35bkbk8kmv1"; + rev = "202d4cd6ace8399014d5c0e81385cb65da398642"; + sha256 = "0rscbqx2yf4xav8fq3r2dz70k87vsn7lkzkg1yf9q8dkfarvwyyi"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; meta.hydraPlatforms = [ ]; @@ -20481,12 +20481,12 @@ final: prev: { vim-tmux-navigator = buildVimPlugin { pname = "vim-tmux-navigator"; - version = "2025-05-28"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "a74836d404c295e799a6ba59794e37fe257509ec"; - sha256 = "14hdk3qba4zdbzvamgsj7zfkv2l3rpq8sllib619bsxz815x50d1"; + rev = "97e58f2b3b4f8fd30ce149302f10202f363cc361"; + sha256 = "0xg9gdybrpm02m3jff393bdhdaynisanidc6zr6hv8lc66vcl6j3"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; meta.hydraPlatforms = [ ]; @@ -20936,12 +20936,12 @@ final: prev: { vim-zettel = buildVimPlugin { pname = "vim-zettel"; - version = "2025-05-29"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "55db0f204f4cc9e3008f55979e6829222c56e19d"; - sha256 = "10nd7n7g7fpdv3pv6sbk3zwfdhq3zxiiq4gp2xpq53xaji2xm7ks"; + rev = "ba9268e4b99510b5aef3d839fbf4326540b99bf4"; + sha256 = "1ddiz8v03fbmw8qrhvp3bxwp08lvwrbacw15dhcqdihjkwx4jx5m"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; meta.hydraPlatforms = [ ]; @@ -21145,12 +21145,12 @@ final: prev: { vimtex = buildVimPlugin { pname = "vimtex"; - version = "2025-05-17"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "08760834ce04903deb6f8760e61c11cf6f6b2f89"; - sha256 = "1shgfcq7lzcq8y069b7sn9x1syjc7afadfnjiq4kq5sn0i0xvlxs"; + rev = "f20b11458e97250d690ce0dc8670759b838cace9"; + sha256 = "1ihq3l1wx7pbm6qw1gky8r51f2z08c723gvc19j1mklcg4gxgw7z"; }; meta.homepage = "https://github.com/lervag/vimtex/"; meta.hydraPlatforms = [ ]; @@ -21249,12 +21249,12 @@ final: prev: { visual-whitespace-nvim = buildVimPlugin { pname = "visual-whitespace.nvim"; - version = "2025-05-21"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "mcauley-penney"; repo = "visual-whitespace.nvim"; - rev = "97445894de3f7d56193876e56356e13f73940149"; - sha256 = "0mc0gm8mc6cvilm3l2hfkfa3dbd2aw4hdirzb041fyy1mi4gq4l1"; + rev = "11b654e7e053e52e375297f472c8824a74b1b965"; + sha256 = "0ivs92hr1gbz6hap9vm31gxypdjrqffv4si4hh9nxvaw2hcnmasv"; }; meta.homepage = "https://github.com/mcauley-penney/visual-whitespace.nvim/"; meta.hydraPlatforms = [ ]; @@ -21392,12 +21392,12 @@ final: prev: { wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2025-03-07"; + version = "2025-06-02"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "bb404d4c67ecb4af768d9fe15f235709722ff78d"; - sha256 = "0llykkcbg7cdi62g002a8fnbldx0z34fkxwsnrs7a8znbrxf1ya6"; + rev = "52e1abfaa87a61f624ec59ee51ed1fe9ea43986d"; + sha256 = "1ld5ffhi708jaw61x200maym9gqh5h9b1b7rxhnr69x862n1qzr0"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; meta.hydraPlatforms = [ ]; @@ -21666,12 +21666,12 @@ final: prev: { yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2025-05-28"; + version = "2025-06-01"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "59c22d1a8bcb3d00a7115ef7f2d59b90cf989ab3"; - sha256 = "09a6sbs9ipkwncmgwalnvm29myp639m4z8rybdsd5i8s5019fshv"; + rev = "e2ddbaa88ec61d0b96e3d53ba851b0e7a0b36f14"; + sha256 = "1d3lk4q5ivysvjmy8pq2l39cd2sabwkh9y0iizcydaa2vdax8cyy"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; meta.hydraPlatforms = [ ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index 19b4fd806bb7..3207844a8a6b 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,12 +12,12 @@ pkgs, }: let - version = "0.0.23-unstable-2025-06-02"; + version = "0.0.24-unstable-2025-06-05"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "647a459a2b87e5c9b2987cb44150b71beffdfb10"; - hash = "sha256-GgLOcVp2IuMBr4aBRWJTvrAuWWiMEIHmec/S97piBaM="; + rev = "12bdb66ea4749f9f59861e7165a4de6cfbf4eb22"; + hash = "sha256-dUtvMkb85HR7xzMoCHeeJIwwyQPdwHNdQHUMyA7+EsU="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 4164a6c0f229..636a43b767d7 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -172,9 +172,9 @@ in aerial-nvim = super.aerial-nvim.overrideAttrs { # optional dependencies - nvimSkipModules = [ - "lualine.components.aerial" - "telescope._extensions.aerial" + checkInputs = with self; [ + lualine-nvim + telescope-nvim ]; }; @@ -212,11 +212,8 @@ in }; asyncrun-vim = super.asyncrun-vim.overrideAttrs { - nvimSkipModules = [ - # vim plugin with optional toggleterm integration - "asyncrun.toggleterm" - "asyncrun.toggleterm2" - ]; + # Optional toggleterm integration + checkInputs = [ self.toggleterm-nvim ]; }; autosave-nvim = super.autosave-nvim.overrideAttrs { @@ -224,12 +221,8 @@ in }; auto-session = super.auto-session.overrideAttrs { - # optional telescope dependency - nvimSkipModules = [ - "auto-session.session-lens.actions" - "auto-session.session-lens.init" - "telescope._extensions.session-lens" - ]; + # Optional integration + checkInputs = [ self.telescope-nvim ]; }; aw-watcher-vim = super.aw-watcher-vim.overrideAttrs { @@ -241,6 +234,11 @@ in }; bamboo-nvim = super.bamboo-nvim.overrideAttrs { + # Optional integration + checkInputs = with self; [ + barbecue-nvim + lualine-nvim + ]; nvimSkipModules = [ # Requires config table "bamboo.colors" @@ -249,14 +247,17 @@ in "bamboo-light" "bamboo-vulgaris" "bamboo-multiplex" - # Optional modules - "lualine.themes.bamboo" "barbecue.theme.bamboo" ]; }; barbar-nvim = super.barbar-nvim.overrideAttrs { - # nvim-web-devicons dependency + # Optional integrations + checkInputs = with self; [ + bufferline-nvim + nvim-web-devicons + ]; + # E5108: Error executing lua ...implugin-barbar.nvim-2025-04-28/lua/bufferline/utils.lua:10: module 'barbar.utils.hl' not found: nvimSkipModules = [ "bufferline.utils" ]; }; @@ -621,14 +622,18 @@ in }; codecompanion-nvim = super.codecompanion-nvim.overrideAttrs { + checkInputs = with self; [ + # Optional completion + blink-cmp + nvim-cmp + # Optional pickers + fzf-lua + mini-nvim + snacks-nvim + telescope-nvim + ]; dependencies = [ self.plenary-nvim ]; nvimSkipModules = [ - # Optional provider dependencies - "codecompanion.providers.actions.mini_pick" - "codecompanion.providers.actions.snacks" - "codecompanion.providers.actions.telescope" - "codecompanion.providers.actions.fzf_lua" - "codecompanion.providers.diff.mini_diff" # Requires setup call "codecompanion.actions.static" "codecompanion.actions.init" @@ -1306,9 +1311,12 @@ in }; go-nvim = super.go-nvim.overrideAttrs { + checkInputs = with self; [ + luasnip + null-ls-nvim + nvim-treesitter + ]; nvimSkipModules = [ - # Null-ls - "go.null_ls" # _GO_NVIM_CFG "go.inlay" "go.project" @@ -1316,16 +1324,9 @@ in "go.tags" "go.gotests" "go.format" - # nvim-treesitter - "go.gotest" - "go.ginkgo" "go.ts.go" - "go.ts.utils" "go.ts.nodes" - "go.fixplurals" - # Luasnip "go.snips" - "snips.all" "snips.go" ]; }; @@ -1390,11 +1391,9 @@ in }; haskell-tools-nvim = neovimUtils.buildNeovimPlugin { + # Optional integrations + checkInputs = [ self.telescope-nvim ]; luaAttr = luaPackages.haskell-tools-nvim; - nvimSkipModules = [ - # Optional telescope integration - "haskell-tools.hoogle.helpers" - ]; }; helpview-nvim = super.helpview-nvim.overrideAttrs { @@ -1407,10 +1406,10 @@ in himalaya-vim = super.himalaya-vim.overrideAttrs { buildInputs = [ himalaya ]; - # vim plugin with optional telescope lua module - nvimSkipModules = [ - "himalaya.folder.pickers.fzflua" - "himalaya.folder.pickers.telescope" + # Optional integrations + checkInputs = with self; [ + fzf-lua + telescope-nvim ]; }; @@ -1827,8 +1826,8 @@ in }; material-vim = super.material-vim.overrideAttrs { - # vim plugin with optional lualine module - nvimSkipModules = "material.lualine"; + # Optional integration + checkInputs = [ self.lualine-nvim ]; }; meson = buildVimPlugin { @@ -1903,11 +1902,11 @@ in }; molten-nvim = super.molten-nvim.overrideAttrs { - nvimSkipModules = [ - # Optional image providers - "load_image_nvim" - "load_wezterm_nvim" - "load_snacks_nvim" + # Optional image providers + checkInputs = with self; [ + image-nvim + snacks-nvim + wezterm-nvim ]; }; @@ -1957,9 +1956,11 @@ in }; neogit = super.neogit.overrideAttrs { + # Optional diffview integration + checkInputs = [ self.diffview-nvim ]; dependencies = [ self.plenary-nvim ]; nvimSkipModules = [ - # Optional diffview integration + # E5108: Error executing lua ...vim-2024-06-13/lua/diffview/api/views/diff/diff_view.lua:13: attempt to index global 'DiffviewGlobal' (a nil value) "neogit.integrations.diffview" "neogit.popups.diff.actions" "neogit.popups.diff.init" @@ -2223,11 +2224,12 @@ in }; netman-nvim = super.netman-nvim.overrideAttrs { - nvimSkipModules = [ - # Optional neo-tree integration - "netman.ui.neo-tree.init" - "netman.ui.neo-tree.commands" - "netman.ui.neo-tree.components" + # Optional neo-tree integration + checkInputs = with self; [ + neo-tree-nvim + # FIXME: propagate `neo-tree` dependencies + nui-nvim + plenary-nvim ]; }; @@ -2313,9 +2315,12 @@ in }; nvim-autopairs = super.nvim-autopairs.overrideAttrs { + # Optional completion dependency + checkInputs = with self; [ + nvim-cmp + ]; nvimSkipModules = [ - # Optional completion dependencies - "nvim-autopairs.completion.cmp" + # compe not packaged anymore "nvim-autopairs.completion.compe" ]; }; @@ -2492,10 +2497,10 @@ in }; nvim-neoclip-lua = super.nvim-neoclip-lua.overrideAttrs { - nvimSkipModules = [ - # Optional dependencies - "neoclip.fzf" - "neoclip.telescope" + # Optional dependencies + checkInputs = with self; [ + fzf-lua + telescope-nvim ]; }; @@ -2506,7 +2511,9 @@ in nvim-notify = super.nvim-notify.overrideAttrs { # Optional fzf integration - nvimSkipModules = "notify.integrations.fzf"; + checkInputs = [ + self.fzf-lua + ]; }; nvim-nu = super.nvim-nu.overrideAttrs { @@ -2532,13 +2539,17 @@ in }; nvim-snippets = super.nvim-snippets.overrideAttrs { - # Optional cmp integration - nvimSkipModules = "snippets.utils.cmp"; + checkInputs = [ + # Optional cmp integration + self.nvim-cmp + ]; }; nvim-surround = super.nvim-surround.overrideAttrs { - # Optional treesitter integration - nvimSkipModules = "nvim-surround.queries"; + checkInputs = [ + # Optional treesitter integration + self.nvim-treesitter + ]; }; nvim-teal-maker = super.nvim-teal-maker.overrideAttrs { @@ -2550,6 +2561,8 @@ in }; nvim-test = super.nvim-test.overrideAttrs { + # Optional toggleterm integration + checkInputs = [ self.toggleterm-nvim ]; dependencies = with self; [ nvim-treesitter nvim-treesitter-parsers.c_sharp @@ -2563,8 +2576,6 @@ in nvim-treesitter-parsers.zig ]; nvimSkipModules = [ - # Optional toggleterm integration - "nvim-test.terms.toggleterm" # Broken runners "nvim-test.runners.zig" "nvim-test.runners.hspec" @@ -2767,9 +2778,11 @@ in }; overseer-nvim = super.overseer-nvim.overrideAttrs { - checkInputs = [ + checkInputs = with self; [ # Optional integration - self.neotest + neotest + toggleterm-nvim + nvim-dap ]; checkPhase = '' runHook preCheck @@ -2782,11 +2795,6 @@ in runHook postCheck ''; - nvimSkipModules = [ - # Optional integrations - "overseer.strategy.toggleterm" - "overseer.dap" - ]; }; package-info-nvim = super.package-info-nvim.overrideAttrs { @@ -3036,6 +3044,8 @@ in }; snacks-nvim = super.snacks-nvim.overrideAttrs { + # Optional trouble integration + checkInputs = [ self.trouble-nvim ]; nvimSkipModules = [ # Requires setup call first # attempt to index global 'Snacks' (a nil value) @@ -3060,8 +3070,6 @@ in "snacks.win" "snacks.words" "snacks.zen" - # Optional trouble integration - "trouble.sources.profiler" # TODO: Plugin requires libsqlite available, create a test for it "snacks.picker.util.db" ]; @@ -3427,6 +3435,7 @@ in }; tokyonight-nvim = super.tokyonight-nvim.overrideAttrs { + checkInputs = [ self.fzf-lua ]; nvimSkipModules = [ # Meta file "tokyonight.docs" @@ -3478,11 +3487,13 @@ in }; typescript-nvim = super.typescript-nvim.overrideAttrs { + checkInputs = [ + # Optional null-ls integration + self.none-ls-nvim + ]; dependencies = with self; [ nvim-lspconfig ]; - # Optional null-ls integration - nvimSkipModules = [ "typescript.extensions.null-ls.code-actions.init" ]; }; typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs { @@ -3807,7 +3818,7 @@ in vim-illuminate = super.vim-illuminate.overrideAttrs { # Optional treesitter integration - nvimSkipModules = "illuminate.providers.treesitter"; + checkInputs = [ self.nvim-treesitter ]; }; vim-isort = super.vim-isort.overrideAttrs { @@ -3939,14 +3950,17 @@ in }; whichpy-nvim = super.whichpy-nvim.overrideAttrs { - checkInputs = with self; [ - telescope-nvim + checkInputs = [ + # Optional telescope integration + self.telescope-nvim ]; }; wiki-vim = super.wiki-vim.overrideAttrs { - # Optional telescope integration - nvimSkipModules = [ "wiki.telescope" ]; + checkInputs = [ + # Optional telescope integration + self.telescope-nvim + ]; }; windows-nvim = super.windows-nvim.overrideAttrs { @@ -3989,10 +4003,9 @@ in }; yanky-nvim = super.yanky-nvim.overrideAttrs { - nvimSkipModules = [ + checkInputs = with self; [ # Optional telescope integration - "yanky.telescope.mapping" - "yanky.telescope.yank_history" + telescope-nvim ]; }; @@ -4074,12 +4087,12 @@ in }; zk-nvim = super.zk-nvim.overrideAttrs { - # Optional integrations - nvimSkipModules = [ - "zk.pickers.fzf_lua" - "zk.pickers.minipick" - "zk.pickers.snacks_picker" - "zk.pickers.telescope" + checkInputs = with self; [ + # Optional pickers + fzf-lua + mini-nvim + snacks-nvim + telescope-nvim ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index 296b3366339c..9e627cf34681 100644 --- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -7,8 +7,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "25.0.3"; - hash = "sha256-rD2Uzzt8xfkfgM+Y0NLe7lthfxinv1Zatpr56OjfABM="; + version = "25.0.4"; + hash = "sha256-J+H/PShsOGwt0AZExLApXLl86XQdZbE5cPS9v4gOXWc="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9976a987cbe4..60d7fbdf9682 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -786,8 +786,8 @@ let mktplcRef = { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.14.19"; - hash = "sha256-HgrUTrYHJNC8tS8qZza98Tr3T0O0NMb7DgddNf3m7XY="; + version = "0.14.20"; + hash = "sha256-Q45o7UAqyPuSMI02BOyXHzD5eqOJLYcYGnwA+eppEj4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog"; @@ -1210,8 +1210,8 @@ let mktplcRef = { publisher = "DanielSanMedium"; name = "dscodegpt"; - version = "3.12.38"; - hash = "sha256-+9OsFH586I8/P7WzadRHS9tX22/bxOByJB2LDSqp2Nk="; + version = "3.12.39"; + hash = "sha256-CShqaG3P6b9JdAtbqFyGn7RGZX8ov98sYJiBy9RCXnE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; @@ -1279,8 +1279,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.59.0"; - hash = "sha256-zbK7kRa9k5xIM7BcwMOT1pRO7637eMUCUzgQwnpBCvI="; + version = "0.60.0"; + hash = "sha256-Buwa63HahT96qhhuvARW7p1u9kbkoEyA9usoh60m3KE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -1643,8 +1643,8 @@ let mktplcRef = { publisher = "editorconfig"; name = "editorconfig"; - version = "0.17.2"; - hash = "sha256-Xi2+mN6zjIKm0HWxfRAFs2vYkZ10Gv6poR2b2d8XCug="; + version = "0.17.4"; + hash = "sha256-MYPYhSKAxgaZ0UijxU+xiO4HDPLtXGymhN+2YmTev8M="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/EditorConfig.EditorConfig/changelog"; @@ -2129,8 +2129,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.17.0"; - hash = "sha256-4/wGrHFB7yn7WTJq9igOU6XTOQZ1PGZ6kdMBP/IlZqw="; + version = "6.21.0"; + hash = "sha256-vaOAk4ovQjUcnBtxqMlRstYLvR6uzmqGk3Sx6zV6wvY="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -2619,8 +2619,8 @@ let mktplcRef = { name = "gruvbox"; publisher = "jdinhlife"; - version = "1.26.0"; - hash = "sha256-XSDGwJ8zL1y9EZqk2wixMEV5GRjQngs8Pvu9QppWCNI="; + version = "1.28.0"; + hash = "sha256-XwQzbbZU6MfYcT50/0YgQp8UaOeQskEvEQPZXG72lLk="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/jdinhlife.gruvbox/changelog"; @@ -3264,8 +3264,8 @@ let mktplcRef = { publisher = "ms-azuretools"; name = "vscode-docker"; - version = "1.29.6"; - hash = "sha256-kHQuS6wxp3Gu5WSjWRXXMLwSrv7LBSsnsNu7VY4H/J0="; + version = "2.0.0"; + hash = "sha256-Yxysekp9nC91g7M5oXppOF+Rf4Jf/PD+X3inmdVfVmo="; }; meta = { description = "Docker Extension for Visual Studio Code"; @@ -3284,8 +3284,8 @@ let mktplcRef = { name = "vscode-dotnet-runtime"; publisher = "ms-dotnettools"; - version = "2.3.3"; - hash = "sha256-l+/r0C+BZr8H8qBKenVP3b4qYGR57Lol+Y1Q2XUGl24="; + version = "2.3.5"; + hash = "sha256-Hik1BNhvcCs/IzqSvc2dPu3v6PhCZSqovFH4ODVJMnE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog"; @@ -4303,8 +4303,8 @@ let mktplcRef = { publisher = "seatonjiang"; name = "gitmoji-vscode"; - version = "1.2.5"; - hash = "sha256-lWd7SyYNxoDauMecJq11akTiwEKBeXuR4htDYCbb6n4="; + version = "1.3.0"; + hash = "sha256-vr6UKd+7g6J8XEY57sCqPpLuxNC4KOvf7nddDKaceaU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/seatonjiang.gitmoji-vscode/changelog"; @@ -4617,8 +4617,8 @@ let mktplcRef = { name = "vscode-stylelint"; publisher = "stylelint"; - version = "1.5.0"; - hash = "sha256-SHUb7+eL0PWlw/KUidXPvE5+MFsJz1Fi7Csptiw8j4M="; + version = "1.5.1"; + hash = "sha256-Sbp2zy/6PcsMlUPe94spm3JrWxBYHfd7py3f4rb+0G4="; }; meta = { description = "Official Stylelint extension for Visual Studio Code"; @@ -4942,8 +4942,8 @@ let mktplcRef = { name = "vscode-testscript"; publisher = "twpayne"; - version = "0.0.5"; - hash = "sha256-rAkwcEmonZArN7Vls8k5ey+6V1b5bICTJoOSxgtnv+A="; + version = "0.0.6"; + hash = "sha256-y8Esm6nnLf+4FPxy4aZxrTPOxx+zoWm7mUrxZ1dsPyM="; }; meta = { description = "Syntax highlighting support for testscript"; @@ -5019,8 +5019,8 @@ let mktplcRef = { name = "vscode-mdx"; publisher = "unifiedjs"; - version = "1.8.14"; - hash = "sha256-kIQPvmLkqZa3jPxIfJ3LDyIvr5yXQTsO7uzzvFa9EJM="; + version = "1.8.15"; + hash = "sha256-n2aWgvhSaU7TU45yeIUU8OmIMOAVYYB500jxrChPeA4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/unifiedjs.vscode-mdx/changelog"; @@ -5371,8 +5371,8 @@ let mktplcRef = { name = "gitblame"; publisher = "waderyan"; - version = "11.1.2"; - sha256 = "sha256-TlvMyFmtJQtpsjbdh3bPiRaMHro0M7gKOgtGc2bQLN4="; + version = "11.1.3"; + sha256 = "sha256-r+fmb382hzxD7frrsNZTJk6uPahO7QBfKTJWA0ObWFI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog"; @@ -5643,8 +5643,8 @@ let mktplcRef = { name = "vscode-zig"; publisher = "ziglang"; - version = "0.6.9"; - hash = "sha256-R18NnnsYVLmCNdGU0plIYn2MKrlSedfJoXH/amxKKaY="; + version = "0.6.10"; + hash = "sha256-Tptl+tJ2ZlnKyswdTjnPJakhiiJn+1XmB82rbk8aO1w="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix index 0976cf6d1ea3..7f81447eeb4e 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.27.2"; - hash = "sha256-nwBDQNs5qrA0TxQZVtuXRiOy0iBNOCFpIim0x2k37YA="; + version = "0.27.3"; + hash = "sha256-b7zvbDzwJcHAp9tn2ibtyeErrH2KNbgqT4Ir7aqLMQg="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix index 668b086c4c78..8c4253b97f92 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.323.0"; - hash = "sha256-rTAq6snn3HAARrYbMJYy7aZ5rDucLfFS/t01VPjgXAo="; + version = "1.326.0"; + hash = "sha256-bZ8Cm3bowUCWq4mMv/7rWIBOdw1U6UoH7RODz20/r9U="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix index 2b8a3b4a72fa..fe4664ade4b1 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-azuretools"; name = "vscode-bicep"; - version = "0.35.1"; - hash = "sha256-Ggp3Z3pxPMEDxgzjPYNr830wx+upkBP4YAbKiOivbYs="; + version = "0.36.1"; + hash = "sha256-yrSIHTGHZ1m6fLGrtVlT4UHyWpKuzGKdywBDsMepd4g="; }; buildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index c63008ac40e1..b92fd0df4aae 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -16,19 +16,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-XHx64V8JJl+/kb+kkTowu7mE7ysBRhUQJqicxjbHM3k="; + hash = "sha256-bpvaGnl6LQaZazuk/xGHxbNUsEMph0tDAaAOBIuikVQ="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-Pm3jUARrH8bksiCpYtUvo0UB3Oq67EjJGYLGLV54rl4="; + hash = "sha256-yBT5sAZHXX66vuTDo+opPLBnCX09tBQYscW5LaiS3nU="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-hgd7tpRn2WP0PL4IOpZLL6Uzw1V9rSqlOTDfgFxwWGk="; + hash = "sha256-W7qGN3VbS1BJT+887mSqegKheLimYR59gNj7QOZBvyg="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-PQPxwwHbLXa5+p/SfH4IFu/OBEa/1CKdfaM+HAegiDA="; + hash = "sha256-OlsoQsA6qHoIwRRVvMpjyO9BOdR63mRcSFkM9i0nFH0="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}") @@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csdevkit"; publisher = "ms-dotnettools"; - version = "1.19.63"; + version = "1.20.35"; inherit (extInfo) hash arch; }; sourceRoot = "extension"; # This has more than one folder. diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index 9581bd107502..24bb51ff0b4f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -17,19 +17,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-yJ4bAxIg3yfQJPWJcl6jUMwQ/ssHkstJWuEp3wr0dDA="; + hash = "sha256-rxXyDIDANtWUT4z6SK+fHwMXu/xSOIGtNpILdlC5lMc="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-EpWHwansBwBD0aYoW2ek7iWFbp+s7ZH6ug3ejoSRG5U="; + hash = "sha256-3JLnZr7pGOY0wSmo9PpQclDE/Yb99qJLALgEBAPn4Ms="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-345hK47tyMGMJDKiujwpECDHMbRpLi17x2lH2rMX9Lg="; + hash = "sha256-yhP5dXP42ZKsoLZ3CySY+Nw2c0bF4IKDc0Le9ky+Qmc="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-u/vflQd285SuZ41ASd8nJgs+lN6892J3x6lPgWqVY+Y="; + hash = "sha256-KtOZ4AzsS30nF0DtJJT/CaLRD6Pa9pz1hYBgvxPbzZw="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}") @@ -39,7 +39,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csharp"; publisher = "ms-dotnettools"; - version = "2.76.27"; + version = "2.80.16"; inherit (extInfo) hash arch; }; diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix index 86b8bd729f71..85359d2a95ca 100644 --- a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix +++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "r"; publisher = "reditorsupport"; - version = "2.8.5"; - hash = "sha256-cZeZdrViEae9sRb9GyB/LeSQ5NRb/fAp3qQW9mPMbsM="; + version = "2.8.6"; + hash = "sha256-T/Qh0WfTfXMzPonbg9NMII5qFptfNoApFFiZCT5rR3Y="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index 0ad4f9cab313..9cf7d817b7b6 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "RooVeterinaryInc"; name = "roo-cline"; - version = "3.18.3"; - hash = "sha256-kg4kXO7UwDQPXb6CAysaez2v8FPRMbX+f41vE68V0QA="; + version = "3.19.3"; + hash = "sha256-7GZD7oCrkGcG7B/pgXK92hL0QyyodmqyxOcRhTt5LMs="; }; passthru.updateScript = vscode-extension-update-script { }; diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index 0a1efe2ea845..93a8d164f8c5 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.36.0"; - hash = "sha256-HbOPoDu0R47US+UtK7i2BLiYgUhnNMD1i6Ibo8h3Auk="; + version = "1.37.0"; + hash = "sha256-ovCxcr1m3GmRu45hr5DG781xkQdANbQYLvV2gFhG4eQ="; }; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index dcde6f9ae3ee..d66f9957aeb1 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = { description = "Comic reader for cross-platform reading and managing your digital comic collection"; - homepage = "http://www.yacreader.com"; + homepage = "https://www.yacreader.com"; license = lib.licenses.gpl3; mainProgram = "YACReader"; maintainers = [ ]; diff --git a/pkgs/applications/misc/kchmviewer/default.nix b/pkgs/applications/misc/kchmviewer/default.nix deleted file mode 100644 index f3ecbdf87e37..000000000000 --- a/pkgs/applications/misc/kchmviewer/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - qmake, - wrapQtAppsHook, - chmlib, - libzip, - qtwebengine, -}: - -stdenv.mkDerivation rec { - pname = "kchmviewer"; - version = "8.0"; - - src = fetchFromGitHub { - owner = "gyunaev"; - repo = pname; - rev = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-YNpiBf6AFBCRbAZRPODvqGbQQedJJJrZFQIQyzIeBlw="; - }; - - patches = [ - # remove unused webkit - (fetchpatch { - url = "https://github.com/gyunaev/kchmviewer/commit/a4a3984465cb635822953350c571950ae726b539.patch"; - sha256 = "sha256-nHW18a4SrTG4fETJmKS4ojHXwnX1d1uN1m4H0GIuI28="; - }) - # QtWebengine fixes - (fetchpatch { - url = "https://github.com/gyunaev/kchmviewer/commit/9ac73e7ad15de08aab6b1198115be2eb44da7afe.patch"; - sha256 = "sha256-qg2ytqA2On7jg19WZmHIOU7vLQI2hoyqItySLEA64SY="; - }) - (fetchpatch { - url = "https://github.com/gyunaev/kchmviewer/commit/99a6d94bdfce9c4578cce82707e71863a71d1453.patch"; - sha256 = "sha256-o8JkaMmcJObmMt+o/6ooCAPCi+yRAWDAgxV+tR5eHfY="; - }) - ]; - - buildInputs = [ - chmlib - libzip - qtwebengine - ]; - - nativeBuildInputs = [ - qmake - wrapQtAppsHook - ]; - - postInstall = '' - install -Dm755 bin/kchmviewer -t $out/bin - install -Dm644 packages/kchmviewer.png -t $out/share/pixmaps - install -Dm644 packages/kchmviewer.desktop -t $out/share/applications - ''; - - meta = with lib; { - description = "CHM (Winhelp) files viewer"; - mainProgram = "kchmviewer"; - homepage = "http://www.ulduzsoft.com/linux/kchmviewer/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 62b7d58859d6..8a89807bd6fe 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -54,7 +54,7 @@ mkDerivation rec { meta = with lib; { description = "WYSIWYM frontend for LaTeX, DocBook"; - homepage = "http://www.lyx.org"; + homepage = "https://www.lyx.org"; license = licenses.gpl2Plus; maintainers = [ maintainers.vcunat ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index 0783d9cf16bf..8c99c0830ca0 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -10,9 +10,9 @@ ocamlPackages.buildDunePackage rec { src = fetchFromGitHub { owner = "pelzlpj"; - repo = pname; - rev = "release-${version}"; - sha256 = "1rx2nl6cdv609pfymnbq53pi3ql5fr4kda8x10ycd9xq2gc4f21g"; + repo = "orpie"; + tag = "release-${version}"; + sha256 = "sha256-LwhH2BO4p8Y8CB2pNkl2heIR7yh42erdTcDsxgy1ouc="; }; patches = [ ./prefix.patch ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix index f67bffe378d7..02dcc819e4f8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -1,2477 +1,2477 @@ { - version = "140.0b4"; + version = "140.0b5"; sources = [ { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ach/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ach/firefox-140.0b5.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "ed1554afe2f6f16e43600abc464a5093f9668cbe2c2f9ff2c2a5c7751924dfcc"; + sha256 = "1f0375f886207ee6dde86ddbb12445774197020d37d749560618865b479b98d7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/af/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/af/firefox-140.0b5.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "2c42439d6d8aebb5e9cd5a7a662d181fa421a6baca7288492bf22f1f919001f8"; + sha256 = "7e7cf35862873d17ab3bbc1feb285d79b263b8a3cd78e310dabef83ba622979e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/an/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/an/firefox-140.0b5.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "413ccf730b5429950731693c968f1839c9c84772c62e2d06c9e93e1724015230"; + sha256 = "95700689dccb1e1035f8642c4fd3ccba7cd7985b967992cabd75ab82d3bf83d5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ar/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ar/firefox-140.0b5.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f99f746fb9d1996cc2aec0881c78d01d871d5c0feae57ac07f2a81cf4b295247"; + sha256 = "214f50dcc2566cef3db820eef8b211187d1f46ab973b55bce948f975166ec527"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ast/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ast/firefox-140.0b5.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "becb101ca6fbcf2452ff5d025524b465815ebebb3507f3f2f24c42ef1e2cd2cb"; + sha256 = "9847906a18ee8f83708c20954443cecd00644b83f0b9fbbd3fc435e728fc3881"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/az/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/az/firefox-140.0b5.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "1c8ce7b3c1a3d0fe79f2039d0386cc8bfb36583331db2e76d4fef0e36fe3dd01"; + sha256 = "73dd33ed39918c78a298808fbd6666e122ef5bb8e027437e5b84c9fd0ed49c8e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/be/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/be/firefox-140.0b5.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "0e24d3516d2a464e9bbf4b575c8f3ab54c724102c89d19890c3a629e3d53d4aa"; + sha256 = "dc15d821f6ef14ad47e1faaf47fa33e1f47e6d2fe2c6991c1b05c42b93caa646"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bg/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/bg/firefox-140.0b5.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "d7184793c5aaf2d53a15de10f97a3f74a04f47a17a4864a3ab0fdd082d14c8ef"; + sha256 = "15754b928c5de3ad978134ec7a41cab691e80541a7b77d40f587a4ef49056ca3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bn/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/bn/firefox-140.0b5.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "5b29c8c9dea8541a00c94b35af1b05681b3f7e5533f50724bbcdfad23fe4b374"; + sha256 = "d6608a03f465ba43d6a19745d371e896f751c9965b39d48864fb51acd657ade9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/br/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/br/firefox-140.0b5.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "90e8da40dc2fad16a3fcee7fd04e7d8b9507dd0bbeb343f1feb5cead4351a53f"; + sha256 = "e92b43c268562f6601367d8fcd5cbff941c0bde8c2f5e83f01a5e8606d25e1b4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bs/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/bs/firefox-140.0b5.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "a2aca9afe6c3bc00d0f3c885a29d4ad6537a5a9f9e34bec196592c8c18d7fd09"; + sha256 = "d93a05def66a977d4a30fbd84c9238128ce1f4790584b7a8d649b953b97b63ca"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ca-valencia/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ca-valencia/firefox-140.0b5.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "5d4bc97a8726f34b93d1c066e7417904be8017e209a912eb08116d97a21d4350"; + sha256 = "ce716548b10a8dc0e61b065e9b388f00f83596f7cd02aad650260f6690bb3e26"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ca/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ca/firefox-140.0b5.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "2a33c442ae382b834a78ee4358f0771bb6edd5c6382ec9f298861a2eca11b79e"; + sha256 = "649ca4101a10ef6dd1daa520b1cf6a131c1379298241db3cee23d5df6ef60677"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cak/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/cak/firefox-140.0b5.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e0d45404dee8ee5bdf301fbafd876d6a20597d0bf52a7765aaa5069115825f3d"; + sha256 = "6fb8e27c6068aa3b91e4405b1c5272ef9258cc5d9ebc8b521129694faa7afdab"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cs/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/cs/firefox-140.0b5.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "892e04a3707da1bcf31d1b7ebf3ca896e4eb28e833fde42c0c86d1d6bc4f7ad3"; + sha256 = "665afa6ff95c2893d025827e19a2a00283f4317a5dbe70fd699b72f6c1b88032"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cy/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/cy/firefox-140.0b5.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "51251020df6ef2436f91994c7bd6760bc27ce79f24f4044dc27ea35a827508df"; + sha256 = "747e19b6455197097bff2376537e07a7b221683b57cd8f94d87531607f9c4c60"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/da/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/da/firefox-140.0b5.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "d0a7f95babaf32f19267f36a1553159a340187deb131a8c68c6807e15afeca32"; + sha256 = "3c07cb7562cccaee370526f6f3377eba01bd497d15b32e38813aaf20e872a6f1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/de/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/de/firefox-140.0b5.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "df0c0ab4772c2004be8fb9f1db5ca8d00ed2ef4217c60138db991c2b5dbbe439"; + sha256 = "3190ba13d9e483e6b245058e73fcfa2b14b45ecfca089e0d58b719903bcbc49f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/dsb/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/dsb/firefox-140.0b5.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "af4a92e19e01ab664e26b7c59fe34a230f4dd3bfcc4bca59d1d71a46936d7800"; + sha256 = "b989fb3ef4c972bd17eb590e66e4f829bdcd1ec3d1a1f1cfe0c16607448c8e4b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/el/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/el/firefox-140.0b5.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ece534644114af64ee062608aeb0d04c7fedacde76c80ace8931692a89213015"; + sha256 = "b903e43d0e2d1ec0b434c979e90a00c4df1a39f59c5698b0dbdfc1f1eccae780"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-CA/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/en-CA/firefox-140.0b5.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "494aa1d40b6faa19bf16be5f75a8eaec0b6903e22a3b85bf6db969815c67e744"; + sha256 = "1b6586b6d6e646f690d8ef05fe05a019e3320fbd16b4945ddcbb18bbf841ee80"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-GB/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/en-GB/firefox-140.0b5.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8cb6a84fb9fcc27115de62396eff3a24de1b4eb87fdbba649536d4a877bb9e90"; + sha256 = "b80c1cf17aa66d6d1cf35f3166ca9d409ac169e7f33f7159daebfe7cc714f825"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-US/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/en-US/firefox-140.0b5.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4e7af27ab23d6b5da4cef54989c510612f55ec058f53106b1f51152b25db4d9b"; + sha256 = "e57259f92dc44630d5f0ed60e24cc3358cc7053754171134f1c8d5413aa297e0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/eo/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/eo/firefox-140.0b5.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "fd5a6ab7fc1748b1444f655ceafe5fb83441baa6ad70b10aed44a2e973dc7f33"; + sha256 = "b413dd6127f3661945a98691d972b72dde13dff6460e0a8a7cdf4b0b8ac05bf6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-AR/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-AR/firefox-140.0b5.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "16a4e466fc24c65736ebbf83ac2cba1fdc0f74ca28a10faf0c5748776bf0c1f8"; + sha256 = "e832a156c248c826e2d4b3026fcec5dfa2c395a22de474d26a08d912e150b029"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-CL/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-CL/firefox-140.0b5.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "9750c945c67f351ac9a8d5be40cefee79f4dd6974cfdcd5f1f7162da8d2466f0"; + sha256 = "72b105af7610696a56f0ac576d92f09c2890891bc6057988f9af7e803893dc7f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-ES/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-ES/firefox-140.0b5.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f174e7a9ad5d95dabede5e2339b1750c6f85e2bb0d1f8dc654d242ba00b39c00"; + sha256 = "8b49655f00932ba12a7c4d182f00c69109130c0d55dfe9c58400c1d81c79aa70"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-MX/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-MX/firefox-140.0b5.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b9257a36159ad9e65fde2e5580efafa722600d6a27ac2996fbba49fb2fbe0c08"; + sha256 = "00ecb996a022264e13bd1d7877dbcbbefc16ebd272cb55d0e2bf6f59f17c1629"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/et/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/et/firefox-140.0b5.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d1c583e56238a293e1fbe9eebfb6cbdc33eafec1c5286ff5765debd2f68b0ce4"; + sha256 = "371a145b068313d3bc2f2a2229e6db80a109b5d82c2030f9e952a1638dc79a31"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/eu/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/eu/firefox-140.0b5.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "def0cd7abfc22a6f60927bd232ac93d504ddb26e3e4983d9708e31b7341db75a"; + sha256 = "df1c9b82cdfafee8495e7c2f668fcad116866f9cff8047a3cee9490242386edd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fa/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fa/firefox-140.0b5.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "44e74ebd3258cc16be4e2d9f6718b08e7e6c60f0239f990006727c42662d925f"; + sha256 = "9209168394b752bd142ede109f93cb2291c58d61457a1d8e9835525a43befbd9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ff/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ff/firefox-140.0b5.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "bde7c76e9728ba604b297d6924034983f7846077daba3fa959710bbd18f3e525"; + sha256 = "f56c153920106cfe48bd822e6e1c8d1c9d9075bc868a06e3ad92a38a603f0b1d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fi/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fi/firefox-140.0b5.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e71fe4950ab0395cadce49dc7774940ff126476004155270de788660963af6d9"; + sha256 = "3dd2e61b36e421c21bab47aa32e72156197f650f1d930a39106b1519b30bc9a6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fr/firefox-140.0b5.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "73d3bcd3efa9828c4c46dab307ea2fb7478700a8a4746aa81d35e31d969756ef"; + sha256 = "83ca5faffd5679f63d9abf7ce95e68ef66e764e49ac0babdd35ec20217086a47"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fur/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fur/firefox-140.0b5.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "e81e8ad39b55548bc88666bb7adc03ce18fc5ba57d31c0d94c90202897e29cc5"; + sha256 = "43e0cce06fb685e2a7c2dd0c19cb8d340d821976ca582400222626bc75cec5f6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fy-NL/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fy-NL/firefox-140.0b5.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c064a6fdb1b474f9cce223691e216a9a232041326b1ef1dc47175c406e7619b9"; + sha256 = "804fbcdaecab060280ca1c86f92c41b9e5e4b8384eafebba56ce2524f8a2ae7d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ga-IE/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ga-IE/firefox-140.0b5.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "09fd356ab21d082b7b2ca96ac05bbc8691e0b833a96cd20e01058228506fba7d"; + sha256 = "b4e9e07084cc1683befabd6353b7df48bb093c08d52eebf1c8ae571f106553bb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gd/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gd/firefox-140.0b5.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2c2128f710ef3ff6d462c9420d1e0080a280fbe74279b99fd48f90b607b43dce"; + sha256 = "37b708878f8835eb98214d236ba6749776dc98db251f4b5443b9405882920e51"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gl/firefox-140.0b5.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8bd114ad5da25dbd4672519939d39e1b865abcdb64d672f51a66b7ffbdadb68d"; + sha256 = "a91659c8dcef37a9b94c71e8e0741ace6e705e9f36dfc65b1a604dcc50357ade"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gn/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gn/firefox-140.0b5.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "8af55045fcf0f4f28f1ce09e5a540c6a28ac2f7040a0f41599298fdbc898a750"; + sha256 = "6d50592dc20b4e3b874eef21e50c5b5b5bff5fcce5d71c959c8c044e690648ca"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gu-IN/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gu-IN/firefox-140.0b5.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "a05701804e12296468c1c5b0f41352117c3564e81987d9f085a1a5aa21ff8345"; + sha256 = "15ef43dba8a61a8fb0717b132b57d510f57f40ceeab758cfca5b4b7bb152cc55"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/he/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/he/firefox-140.0b5.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "569bfc9273743adf40a346f9d921ea9828e1356d384969287dca95d4f008d7a9"; + sha256 = "bb9c0e28b3526e2873728ed0b912cf3ac5aabbe48e7cd3181b75bbcd2706fa06"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hi-IN/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hi-IN/firefox-140.0b5.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "07b8ba1226e79cc94cd081d7a845b9d2f19960cd622cb1b09f7e03bd2ae07bf6"; + sha256 = "078f4ff60fedb0ca2f4955997cc9f80c77923195aa45ff9c4a9d428a5982ff4d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hr/firefox-140.0b5.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "212bdc93f22821083001f8e605fcc3bb898a2af5aa03adcfe5361f72461142c1"; + sha256 = "7bde8d2f20e21705000f9ccde96ac4444a002d822e7d8b35b6b5550931a42b9d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hsb/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hsb/firefox-140.0b5.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "7d4ea28a2c6adaf9e71f4694d35f7aece693b6f4e3634ce21df45e7c0c0145dd"; + sha256 = "2143fe5abf7cbc3bcefdfb17cb6ab9e751bd33bf8b1e9a00fad356d3490b34d7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hu/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hu/firefox-140.0b5.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "9165f21b67d2714d2704f23c93026c1ceecca3db09faaec9782640fef16cbc0b"; + sha256 = "fbba0f840bc931ab4515fc8e5d9f38ac54ee090f127f381160c9f8a26f1d12cc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hy-AM/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hy-AM/firefox-140.0b5.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ce04cecbfcac04037bce64d5cd06995416cbfd4232dae04515fd0edf8a1fb6eb"; + sha256 = "bd3259df39763727d25de9bba943bc4037535c90ba3ebfa42e7b1835b683e772"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ia/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ia/firefox-140.0b5.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "241daa6215d95180879c077a94733058d804e9b08aa285f50a07362e95955fce"; + sha256 = "a0bd18ac32ff40fca8b255878013eee13a357d2aab8693376ca9e17d535bc8c8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/id/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/id/firefox-140.0b5.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "563114161ebad123b8c98d53fd45dc4f42a36c43699b476039fc136503f4a3d3"; + sha256 = "de80edc3b03c238f448a7710fc74c061ed4a281692771667788cf2ad1afa175e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/is/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/is/firefox-140.0b5.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "aceeaea1d110c7404eb6514dc2c0bb498cfc0f7dc01fe49b3b28362672adacb9"; + sha256 = "b85126641862e01bb17da1f8e316630157d7dfe18f4670579221b049f8edd891"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/it/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/it/firefox-140.0b5.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "9f723893095f114ad85e1efeb8241018e77fe2c67c130d7c1e3528347d83e7df"; + sha256 = "456adcf9c274637e211c8d0f19e64f288ab83a4a24b353fc55b399ed92ba8ebd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ja/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ja/firefox-140.0b5.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "3e4c5d1b66bf80cf6c60c30394852c4413157bfe00c04648dabec7d461d83685"; + sha256 = "90235c0a0fa89fb72e64760fa613ffed6bc4c829019a4fd4744e15be523891e9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ka/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ka/firefox-140.0b5.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "39c96201f2965d1c4e04bb7e10b380d2fba4466545c6f7ed6065466edeb796cc"; + sha256 = "be4c4ed1517876d1b8fc6bc61827f2517e41a5f6456f9a66687948e458699da8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kab/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/kab/firefox-140.0b5.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "785ed68e6de6fe0c683b424aa985649e0057bcceb3fff29389df590662019b6b"; + sha256 = "19e9316dd5b08edb3e44a067446c2d87fc222a562c1fca8f2b8985652b0b69b1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kk/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/kk/firefox-140.0b5.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ed6314351021e49aa00ea3121545d17b884d0a016b210e80ae4a0426ff5089f2"; + sha256 = "9bcd6689af6b3931acebdf57eae4d36b9fbe13e1efe7e1c458af146a6fca0b71"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/km/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/km/firefox-140.0b5.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "03af2b330ca148cd24a5155fbc31f331b4cc849dc65fc92aa566652a692118ea"; + sha256 = "461dec754f0c5acb4100fd980aa50244dba4f17129dba26bef5d25bc95bc7079"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kn/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/kn/firefox-140.0b5.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "5af858ea0c84882e6f432ce0cb49b890dd9dbfc77f7f0a1df3e9dceb2a055857"; + sha256 = "d7b6b9442a088633245e7dfa9d75748d3c8a8549eeaac41b147d2d61e2ea2c52"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ko/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ko/firefox-140.0b5.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "e05d5fbf17993d217ee9c87935181540b1fb3fae861e9c9432c677a144d6d5a4"; + sha256 = "97ba610de2be5754682a903f56bfb486301ea9fdd6fd59320715a05cac426bd5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lij/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/lij/firefox-140.0b5.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "ff343e1471223c89b91b7dd5ec432517907cc3e2f7abfb4652a3fcb6c327ff39"; + sha256 = "0a96d7be3e3522ae802eca359080f99adaeb5cb534c0e96588a87b3c1f6899d3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lt/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/lt/firefox-140.0b5.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "7b200ec16524ca006ecbe4a9110a1c18d7d795e71be1f46d402f494de194c3f2"; + sha256 = "2fd758c3e16e9c2289683bfe219f7b950269f21a359fec496c3fffbff915bb13"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lv/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/lv/firefox-140.0b5.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ec4214a35bfa6fadef80a22a68f74bfa493d98f2a1c9ac56d795ddab892e1154"; + sha256 = "b0375b051d45de1722893042c2a6adf36cfb0a463078da62603a06421610b2f2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/mk/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/mk/firefox-140.0b5.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "12224a1d1326bb76fccecdc44ef10b943a348c5db0b0986fe1f973a515496c23"; + sha256 = "fdc935009644294a4349474c28d087c29ca1a07934dc7b5ba11e34c367f858e0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/mr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/mr/firefox-140.0b5.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "8caa52f7d7eba810af4ee5fe666a0f8b42f06178a048b9c3df552d60de229512"; + sha256 = "38675d2e5500a21d93f8184f0e1839a490405dd56701bae901a1f4fecd0e41fa"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ms/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ms/firefox-140.0b5.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2ec5bd3d8077427e6f897f24a65dd0795106b41c53f869e198c473d80f9a1187"; + sha256 = "9fe67041bba54945fbdf969c0c585bee99560132a2fe85db632400c08cf341d0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/my/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/my/firefox-140.0b5.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "43e005ebbc0e36c28beeb7459e4332f258a5ed4c7782ac1edfe9e667f0f27320"; + sha256 = "bc8d5e0d70b4c0ba24ba956b460f5d70fd6a9c2d09bb6effa9f142655ccb6547"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nb-NO/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/nb-NO/firefox-140.0b5.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "22e97b6b60c15ebd0aecd0d4c4add317cc33f60a05cbfcb7e2cbbf415b740fca"; + sha256 = "b97f0e0d3f2018d82778039a27a11b67021936c9bf526ff85b4795e6040fe563"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ne-NP/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ne-NP/firefox-140.0b5.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "1e16445ab882842732731a9c03d68a6c1f2141ee2a78a00d2cec4d8310361657"; + sha256 = "05d9dd4c60971f42262e16cb42417acdbe36c595fada3bdac9b4ad1b9797d736"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/nl/firefox-140.0b5.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "da05f794f09e9c91b7b0abb0d446ff0d93d4e21ec9519464a29d39d8025e9144"; + sha256 = "ddf3b254e789cc5133ed56b3ddf83f8cec6b9f1b8d840d3885c92c3395b18198"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nn-NO/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/nn-NO/firefox-140.0b5.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "2d1b1f7ef8610cc251c1555218babc2d93e8189088dc00fd5c64d76e5d1b1524"; + sha256 = "34aece8d99b5b0996b5fc46ce3bc622e052dce3bff8313c4248de22e2391823c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/oc/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/oc/firefox-140.0b5.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "89ea5fa03cc3ad404bdcf4a8586daa44a9de04552be5618f5fca1cd033572832"; + sha256 = "f7f36e08f8602abcaa855cde1f825e6ea68aeef51fb9ccf48cab40868ddb7ad0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pa-IN/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pa-IN/firefox-140.0b5.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "4722a3918593e032bd846f1ffd00e432014e84afc4f65b84d40b6345972456d5"; + sha256 = "9a6d448c1b564dbe8f839ea47ff03d5f9b029895e095d916ac9d6b4e47957887"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pl/firefox-140.0b5.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "5dc3a51b9d3b63be9c55ee7fa3e6bc489fec279c1cdda3fb7a905d2b892bc236"; + sha256 = "cfcec2e6a45f8808d5ac1ab24760b28a21c77851b607e358b225a144fbf87e97"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pt-BR/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pt-BR/firefox-140.0b5.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "47c5182687c634fe5d71bd4e4de4fa564fb1c5e11cdc1e1909c61ef4887ae64e"; + sha256 = "b586d6f8327547fd985ab8ece9effe5ae508f839a9c4e85012c39174fab21eb4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pt-PT/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pt-PT/firefox-140.0b5.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ac74c82c721cd6690cbc5d684b684f9b8856ee369f6336a582a7afaa70796ddf"; + sha256 = "4aec4f5a831ad1720d3705059ac2a7ada0842b730d9df5ba00b628f068209a6d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/rm/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/rm/firefox-140.0b5.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c0b3597bdb10e90649b0d4d7f7021fae07540f59b8ff001c37e3384ca191a290"; + sha256 = "03fefcfec26e178b1af63f35c8889536a96af3f40f95ec967b7f47e3af28f061"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ro/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ro/firefox-140.0b5.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "bbf4412b492a5aa9c69a24e98549cf58715174dc7a5332ad68e7057096c57712"; + sha256 = "8b0ad9ee6e3572bb46cd2ee3f0d2ce5c0a31801b713c28307b9239c124f9baee"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ru/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ru/firefox-140.0b5.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "a9760586112083eb36a80ad983ba2b2871d9388567de54786a074639ad1e60d2"; + sha256 = "81c813ef203182d8d1d3b66ba9f096dfa6be1620d013852f4582c728ebc1e08e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sat/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sat/firefox-140.0b5.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "66207f430c6ca2ec178d749c1a73950b13d4532f455303689cb6f333dd42d534"; + sha256 = "171b85bf91ed8e51568ca1510455d6f12044a414604e0950c20ae9b7ab9e7425"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sc/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sc/firefox-140.0b5.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "39a81cdcab313029ef8517a8c5ba99ee00bad85eb0d8bcb4e474e978bec531b8"; + sha256 = "dfe78faa9752928e3fa198379392963363c22669d6a830ab5d03fa596a436584"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sco/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sco/firefox-140.0b5.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "dc12f5de8d130e29ed6afdd973999f02d64a7e24a0319b4315dacd284411cbb5"; + sha256 = "333cb935eafd06ede21d8f29fc9b94c2ef617f97b7ef29612af5842e57a0a20f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/si/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/si/firefox-140.0b5.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "882a0fe884852ae0674e504385801f5d37bc385f750cba7a657cce3b5208b915"; + sha256 = "7fc61ce0118c16c866ae74e15aa68b8cba8a799afead5841efe85c799adbeb21"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sk/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sk/firefox-140.0b5.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ea153b3fc99a99391cefd60bd1ad85c7f20d8ab75c8ede046400ba11cc84270a"; + sha256 = "fbf4c3f430558a1925f8aeb263ef9f31313b7dac9a5f965cca5c58643d183e61"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/skr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/skr/firefox-140.0b5.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "8bf2a2bd7162e0d77975ca84e90a11e5e3a3768dc6f2aa514ae337c6297234e3"; + sha256 = "ae4933c0bc448b40f44de22ea8ca6d3c65fc767df3e41a1224c44365a9c86f58"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sl/firefox-140.0b5.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e84d6fc022ba4073b8fe718b97bd24f2a4607aa2373bfed8d5e3342392378d79"; + sha256 = "4a91e009d7ee4fb7586874212f5c8244c228836ca22f5eb7a2dbe2b915587492"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/son/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/son/firefox-140.0b5.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "288cab80c8fc5f4d86c11e3a2eb7b709c7c83b1a9bb0af6277270e5de2c1a3a4"; + sha256 = "2448c45428dc05793a0fe4fe90209809879b4476d4199f942ca4e4bbdbf2b025"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sq/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sq/firefox-140.0b5.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "01ac1ac79660e7881254e734b5fdd27bca4d5e4ca59edb9596f7e06351d70ac6"; + sha256 = "0f11bea317827b4fd23cbc6e3bb70aa10f7f879886c16a9106fee8521ca1f440"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sr/firefox-140.0b5.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "fb3785faf424ced77ad426ca57af0f3e012a95369b1d21c2e45a0ee20b141513"; + sha256 = "449844010b9fe25100d21a796203cd05353b3151ea012a7f6dcabd2992057c2d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sv-SE/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sv-SE/firefox-140.0b5.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "fdd59c366029567c7304766df55c1b26cf343ea894ce860c09c9b6fc7de2d329"; + sha256 = "f03a9888f5b98b3bf371bc0617a604892abda50220348bb76fa41d2600ad091e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/szl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/szl/firefox-140.0b5.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "a134efee05e83eab94598023c344f8a5d1689577e3a502394207404c31f9e617"; + sha256 = "68b101310ca823bb8ca02a86644704afdd6ce52378d96537cca4cbeee6670a5b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ta/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ta/firefox-140.0b5.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "d9435ca50da4cccea83236810861f171b82c226e309cfcdc4bc482cc7700824f"; + sha256 = "199406d08eb4b0c0002123eb13bb43d894f19de3686406542b75b63ea9debdca"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/te/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/te/firefox-140.0b5.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "c39704e465a36dca6aab92f286212be3bf19d3bb13ffd9beb116c082a93d5b5b"; + sha256 = "4fe2b70b0038bd505b1d98d711bfb7495decaae51dbc9a7728e23ad05d72fc60"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tg/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/tg/firefox-140.0b5.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "8f7399c91dace4831a8ee9e8577cc1c5a4f6adf03dca99727b4a02dd75e3fd44"; + sha256 = "bebe0aa276b1aa9c029898487ad71e4ab7e19419c973afd0bb308a86c70d1af1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/th/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/th/firefox-140.0b5.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "0272f94a2af35c3b1c119f840f773048172216512d413fc96bac3000d700af47"; + sha256 = "26f91bf692ab8e1ded4f1cdd7701786098c4019ee5cbf55abc5c7ed1dabb1e70"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/tl/firefox-140.0b5.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "651df98e8048a27031bd7a3e2fc831f730a096b353c8ee4bc122dbb2efa9f9b8"; + sha256 = "4f143b73ee41bcaa442db99e65a86f47d2f517e854fdaea51ac32f23acc51feb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/tr/firefox-140.0b5.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "3cf549f861a4116de29a557bb156c20ac00fe4c74b3d7d34ee034c58d93e02c0"; + sha256 = "4804e037f5f1c77d94f539a7ecf55ed1fd76e24a240276a32274d1bab8b78f0f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/trs/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/trs/firefox-140.0b5.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "e95c80ae3cde23c2e5c46d275a3cf7fc7eafff7501e36f8eed75c35715099a82"; + sha256 = "0eecf30a34a7253efb99fd12f354dda39aba1a967ef9fdc2491399a7fa2d6f83"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/uk/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/uk/firefox-140.0b5.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5a449bbdcc17018e4ab397da53fb494088822785ad12a8cecedbf29b3f4ab469"; + sha256 = "1676a467fc60e18d7625a2d8ff56447ee2d324ece1798f2a72e01fdd04b07590"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ur/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ur/firefox-140.0b5.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "83bc6404434776cdfffe5dbb881ae129c770105199db75d93cb548e6d8e1b786"; + sha256 = "d1be9330ced56239b4b060fa0840dc66e0eb6672e56b7c53ee6d3a9a7ab66497"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/uz/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/uz/firefox-140.0b5.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "03e14237adb3018e6f87a8c5f5f8958027de62bc61ae13d32f243416be24f8a3"; + sha256 = "fba3e9e66bae2d51de4d619c878434794a31928a6f17198b88cf9b3611b5dd8b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/vi/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/vi/firefox-140.0b5.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4b894630987ede195b9cefd5d1820dee6947b90059e852ab3af121edb26c23a6"; + sha256 = "389182910fc820cd7742b6adb9693c6d819e7ef18d8d59c3947d742f863858c4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/xh/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/xh/firefox-140.0b5.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "21ec74dba16ce06e4801454ff7f12a08776eb51f811395910f5db5ef86c476ca"; + sha256 = "54a8be4548e339b09d8f0a580e21dcfaf6b805879cc4b11d322ad1c7e61814c3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/zh-CN/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/zh-CN/firefox-140.0b5.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c6b51c4b57e7930133f9b787a771f6ffbc07557c039f94c5e897b338a9429379"; + sha256 = "910a3c47ad88ce41190640d00d13b9bce983fe82b1b424c2e0ea8ffdc46cb8c7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/zh-TW/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/zh-TW/firefox-140.0b5.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "58cb18063b47f3fb738769a9384adb48f5ac31350209328f013a683f4bf55736"; + sha256 = "084aef73cc86d91d0de87756d24c10bd9408d669766be163ef2ca654255d3ad2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ach/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ach/firefox-140.0b5.tar.xz"; locale = "ach"; arch = "linux-i686"; - sha256 = "ba1ea1cb0fc6050123edbaf5c49211c8ee2c897fb01cebd85092d3802ad90007"; + sha256 = "31b38971dbb4179219abebba2e4af9ebc7408cc22efa7d509a6d2e95e4483d31"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/af/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/af/firefox-140.0b5.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "a9b39fedc4a4fbd62a8a2ff8c56bee38c2785c5172a6017da1b01efca8e79981"; + sha256 = "088d709c208f5b6c61ac3b2c9f92b1033f2f4e12ec8c59d6818e489f83c6ce7a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/an/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/an/firefox-140.0b5.tar.xz"; locale = "an"; arch = "linux-i686"; - sha256 = "b70844ad6f608cc3f9d212929e4e278ab86eb7a0ee6933ac73a4673a54979533"; + sha256 = "2f6ea2031c3297c08acf4129727c439839a8187169caaa3cfb4f7e0af435c0d7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ar/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ar/firefox-140.0b5.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "a3964ca7ef4331a9dfc59a2782ba02695e63698200920435b34cfb5d2a91b74c"; + sha256 = "f655136b09c77116ea3a34ff249233e704630f82fbeeca4e69e536e6cf54e5f4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ast/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ast/firefox-140.0b5.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "7953ed51d14b92a69ef579e9d36f0abdcf9e8e29e3e87f9c098605e520dbbb92"; + sha256 = "bc037b74217b18486f22f749150c43fdd5832f9468fcd78f874d686af07f9d12"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/az/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/az/firefox-140.0b5.tar.xz"; locale = "az"; arch = "linux-i686"; - sha256 = "e306ba790d170ce433de39816ee322200d9332d9e4b4a3200233c77aed23fd46"; + sha256 = "7518cb0f99987c58c6974073e207b3d61acf0da2205113c5b2850e017d96ef6a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/be/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/be/firefox-140.0b5.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "c95ff9d17f160b66e5d98b50cc9e3e23cb602e96535a20dc6d106648b634af5f"; + sha256 = "3e282507c63ba8c1cae72de29776aa0acafee8d3ce761e08cd6be80679de5806"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bg/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/bg/firefox-140.0b5.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "7612be680b6232be9bf25f44e9878d705da84d9c06f689ce39b704cd5b467a3d"; + sha256 = "802ad40c1faf63046840e79268ab2c1f57e07976c61c0b88569c0ae6b1fa1126"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bn/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/bn/firefox-140.0b5.tar.xz"; locale = "bn"; arch = "linux-i686"; - sha256 = "0ff1f5370c1c3ca852880b85bb5b0274a86a2129769b63dcec7dfe2c0dc24d01"; + sha256 = "0d7e8b4014c21fcd432026a0ba8ec404fb29e19788ce781703e3c66af888c989"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/br/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/br/firefox-140.0b5.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "5cfb59c58c42c84b8b27eb764ba734513e3943182de27a924bfd9886fffcd7bc"; + sha256 = "73e555c48f77650ac03e23f914bf555bb680aa43cdf31611149b5605106fbd6f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bs/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/bs/firefox-140.0b5.tar.xz"; locale = "bs"; arch = "linux-i686"; - sha256 = "82b6944f76105800a44cd0a6cc734a41901c84afdf504d32ffcee1ea6930302e"; + sha256 = "b21e377b6fd7caab4b3296936bff662e3798ebee398d81569937e14b3a7911c9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ca-valencia/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ca-valencia/firefox-140.0b5.tar.xz"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b431b242cf9ca2c894cc1ea30efd512c2aa390da9a4ac03ebceb019b8dfe07ff"; + sha256 = "5c6e85f38e21832b4bde1a818b013559ca0afc13877b84f31e2fd0fd15d23110"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ca/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ca/firefox-140.0b5.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "ab394498f4a9557cdca2b060e458c65d93cb95441464b36dd6131e3690d9edf0"; + sha256 = "636fa17ab60cc9229d6def795fdd225104455d5c39764af63534f8c9cbeb038f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cak/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/cak/firefox-140.0b5.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "04d17aafda6d62a9c3a225fd6136d1ed6f97d2a09f2580cf947f434f8ff1b63c"; + sha256 = "c1a802e80a78e50504c0134071f83ecffdfe8ec96960ab6b13c586b29bc7b6d9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cs/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/cs/firefox-140.0b5.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "5286ed9fcd63351bea906c7b24b33398492bc2b8fe6e6ec0b07946f88630243f"; + sha256 = "2f91cc15d3c298c70c41ec327c462bff3a25bd84a292a731ef0ede406253aa22"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cy/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/cy/firefox-140.0b5.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "cb83d8e01aba72c385dd9b9cc4a2a5fd791533481d9bddf32eb8b0245701adbe"; + sha256 = "dbaa4dd4487b3851c82ae57157076197df67eb51d635dce9ba4bdc107c121ea6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/da/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/da/firefox-140.0b5.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "48b9bbfd7985809559b801353e104ec5ab56654a0141e23e04220ed851705ed9"; + sha256 = "e70bad35611124a24952eb7e5eefb2e40df4d7c91998fa62f8da1d73c468f6f8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/de/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/de/firefox-140.0b5.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "b6b189a3c7b2fe43dce76e1021f96e45417d462847a743a1e77b683266aafcc5"; + sha256 = "ad4a122375d2bbf9d5f53d8001a13e7655b42f7cd1e8f85c4ccdeb5a1fcb29bb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/dsb/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/dsb/firefox-140.0b5.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "11fa034d78efe86b64d6d06902d4e4e2bc65ca3ad26f9d4921ea58cb09984876"; + sha256 = "cf60d3e0baa038a8e8541ff60df61f992d2e8924f8b623a853f1c18b6b621c70"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/el/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/el/firefox-140.0b5.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "31f822245236d5176e4b03ff56b1c65a40ba7bb466410aea2b118776f710aec8"; + sha256 = "c182514ffe63d2f89f048034df5cbab78503a0c0604abe01beb3877be052fa83"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-CA/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/en-CA/firefox-140.0b5.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "38fc5dc95972a11cd02b1c081ee321716a42e98ec6ef7e3f435d4b1221bf2ce1"; + sha256 = "2e35526cfbf9ec90ca05e03086eb8ed38126c7df4e2019549b071b1fc1c702c9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-GB/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/en-GB/firefox-140.0b5.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "0fef7f42cae9c59916fa6057d364d708c802a1f94941f90caaacb3035296e544"; + sha256 = "faffc77533d11a3c95ae03604cea6d89724fd3888b80a75d3d294ba0e1a3738a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-US/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/en-US/firefox-140.0b5.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "13669006bc1b4910b522c29ff090f2678be9fa240f4f267616af593c10ef462f"; + sha256 = "6b4c4042ebba0447e2abdba1492f74a3d64294c08f6ead9486389df079719511"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/eo/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/eo/firefox-140.0b5.tar.xz"; locale = "eo"; arch = "linux-i686"; - sha256 = "9e7e27590c325c569d52230fc011cae9e9ac01bb812e2e18e5f0267fe55a2918"; + sha256 = "7533ece466a96dbde70e989b65f6cb54d932198b1c0b14a436513a23dbf70d73"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-AR/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-AR/firefox-140.0b5.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e6c051adaecd6f60d1fc4709d9303cf466024be18742966edbaf43a36789999c"; + sha256 = "3f9f4246aa07b6e4eebb829147b6b36677f640d4165f0309e573577abdec0090"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-CL/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-CL/firefox-140.0b5.tar.xz"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "b8517c7afbc67ead810e626fa1ea48f1684e19d6dcd662798725b8b892bde6b3"; + sha256 = "d38573e34c9e65d91bb2183e6a4b2dae26746a3906eaf61326810da7c16b6b60"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-ES/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-ES/firefox-140.0b5.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "c4c0b29a4a060a0c8af8629adf6ca0ff2976f78cc64aec6fb008b87858e273e8"; + sha256 = "31a88ca04d74fa7e9276090eb75c5605cae5e560b4383b2308486dd31b6aac2c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-MX/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-MX/firefox-140.0b5.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "49b3abcab9b709150d6e972049f2b6de488c46a12419ea9f1f6197f66e91e8b0"; + sha256 = "dba3c5ee85d385c9ba25bc30f6c1dad03d942f5ef8263dfdcfc92daff280fc94"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/et/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/et/firefox-140.0b5.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "75a4e80ebf1b76c63552b333d09d2955dcb96695c3a2a1ce4e1c1923f088fb1e"; + sha256 = "9be9acf89163402f93ace157412617d6a4b4cc15c657d7053eb1237029738e80"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/eu/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/eu/firefox-140.0b5.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "8ea8d99a94ebc7b8f42d8e10bd95842bbfdd536482efcc122b81be83cdcf3735"; + sha256 = "519305e7e193995715b89a21dc2a625071fbdf3ac65aef24ce5a8617864b3acc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fa/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fa/firefox-140.0b5.tar.xz"; locale = "fa"; arch = "linux-i686"; - sha256 = "e6bef39a4ecd26f015a73c01e16a3c7002ea10940b656c44d143718f0142fe10"; + sha256 = "238f5f7b0d5fc5bdc407e64ad1daeebb411360f1f2bca8190593dd477ef36ffd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ff/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ff/firefox-140.0b5.tar.xz"; locale = "ff"; arch = "linux-i686"; - sha256 = "d10e07baef739462e5416f0b274e5ad28ee3d80b46baa1a6fa3cb58ff60ee058"; + sha256 = "198c8ad774c8cfae507024576afd485a16d4d7d1e83ccae711151ab90b19b625"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fi/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fi/firefox-140.0b5.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "e49ff3f9972a37af4c5e9b63004ba1830c52f6857731c698d3c865e54be1afc5"; + sha256 = "659adb1e73e8797637a2c2e0d035d1e17423d2a50aa1ef9545b20ce80471df52"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fr/firefox-140.0b5.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "f994e1c351ea6baf9a180f78815c64279c9012de3a5081f0556979834e626d3c"; + sha256 = "4681342dfdd4dad61553a441eddfcb6fd4e682ccaa8b8d62bf13c052845b34be"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fur/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fur/firefox-140.0b5.tar.xz"; locale = "fur"; arch = "linux-i686"; - sha256 = "5d3b63899668bb1c644e0c4c99bf12ebdc0537ae9c3b7254b109f79d45861f8d"; + sha256 = "5bc884aed861946b0672b21bc109ef022246bdd2db03efb18e368f16a676494b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fy-NL/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fy-NL/firefox-140.0b5.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "b1200734203936c991271a16d46be20e4142ad5ac3f86b37c1dac8aa93d57957"; + sha256 = "168b6a3e1a9ca5bf492042ac69d837bb33ae596e94e3dcae08a74121f2074084"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ga-IE/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ga-IE/firefox-140.0b5.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "1b56d9d55166127ebfc90662ce1165ca70f47aa44efe41fa43f5bd78e82a7d61"; + sha256 = "338d580883071a761bec3e3da24d35ffc052eb17629f6f2443febb88c2c03199"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gd/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gd/firefox-140.0b5.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "2a822268acefc09e5ba26dee73982de407c4d9aac8c8abe9621c487245654571"; + sha256 = "7ef232669d13c123ff4cc1f90860006118535e29d309e62bda58680327f94441"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gl/firefox-140.0b5.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "81e91beebc926105e03b1866b83d4558c89220e2281a5d1ad5ecfbf384529ee3"; + sha256 = "bd5e5f72002d0bbaa383ce42ec93b604d783403439f8833579e2efbb07a4c7bd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gn/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gn/firefox-140.0b5.tar.xz"; locale = "gn"; arch = "linux-i686"; - sha256 = "fc0ea462b9700642e36ca02589e84be42bdd1943bc014fd1fc3f2601d076e6a3"; + sha256 = "7e625da091883d57f8aa7ed3ec060feba9328c55b735de718777b76222fd0e82"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gu-IN/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gu-IN/firefox-140.0b5.tar.xz"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "32917a5d626a841856998e2596691b20e86d2e18dc4417f553966b8e4738681d"; + sha256 = "95e9aff8285cb9aafe2214d6dce93d263c281a0764d1c2b156d75c11de182e0d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/he/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/he/firefox-140.0b5.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "d34160eb61dfd9095fbf5c576e787da856815b4510e8d80d1f3e9a948032f7b3"; + sha256 = "1d19868991246f680f80ce6345791872590556393a27c7ddf95cf88044a9966d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hi-IN/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hi-IN/firefox-140.0b5.tar.xz"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "51828123c95c9d6cc2e36ca3c2c411e7919d7f5555f36674b6f804ab262e4d4d"; + sha256 = "f8b88f626cc9877fb18b3c14738f53866e60e9a2eac65f76efcd33c52f5342bf"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hr/firefox-140.0b5.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "3c4c02943f7a6c60a0a7c87158e03747d4a9e44f1e49cab054b7d35811cfb4f1"; + sha256 = "5044709e5e8a7833ebeb776ef2452b6b649e8772d3755c05e27cec934b9e4146"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hsb/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hsb/firefox-140.0b5.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "2885f4677dd03b444a4eec840cebfb9e8bca4b1f091c155e9370b30c9bcbaa41"; + sha256 = "a0be36a177558e786fa83d570dd474e820f871c1a8b2a271b860b1e3d9a11202"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hu/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hu/firefox-140.0b5.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "4a0aacef612ee558547ea65b43d461ae4f1e4484d8f1b1f08d1e0e1123c39a11"; + sha256 = "d047f4eab64cd13b150687d0ee8ac0f2a6742f31bd0466d3f07005c2c36c6045"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hy-AM/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hy-AM/firefox-140.0b5.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "756af49598e57e4e604b9d7ae3420fc1d1f92520e9387e769ec32dbf7b88e799"; + sha256 = "0041adc487a2a6ad619ddedf225edbc1bcb0ccffa547d57c962312a0fefd45dc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ia/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ia/firefox-140.0b5.tar.xz"; locale = "ia"; arch = "linux-i686"; - sha256 = "4c21904867ebbcf124d66a611454c9170f4974c4056edbe7b85fccc530a89821"; + sha256 = "df8f85019145dc181a1ba2ce3e4d38fc076d4a269bf55c9f8c84cba3564c599e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/id/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/id/firefox-140.0b5.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "20b890969b74c69d5b08b5249a2c90abd35e209bc0f604c501c666a8698525bf"; + sha256 = "12f0c14b9fae63ba2bb43f2f5cd42ee7eaa93666d1c592549d4bd34b5a1dc5a8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/is/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/is/firefox-140.0b5.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "0a9a6a5847f6e941d5e4dd1dc005811950b136d9f603aaf4cf7137ef254fa72e"; + sha256 = "a0dd980be044409d5ff9ce9063130338399dd8be0221f3ac05d2296c36f666a9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/it/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/it/firefox-140.0b5.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "31dba20ca0561d706ed27a981578c2009ec7b16e34747b203f032e94ee7c58e4"; + sha256 = "3da4194adb4d2fe2003357f8fdda6ac9bcbfc0157a5b9d1a47784184a97ec901"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ja/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ja/firefox-140.0b5.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "1fea25b831a12066f42dc06a6b266de967eabd096c313d07f13cc70723a2cac4"; + sha256 = "d088fd24e8b02ee67e6c9214c63543d82141062c6ed135c0b4c60bfe79135c45"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ka/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ka/firefox-140.0b5.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "3a1d9c4bc047759380d0b32c379d21ca79dbfc583548fd8f7c8f04a09bec6a01"; + sha256 = "9c3c6266e37138bb3f9af48b6a4f9dcebccfc356fa2785a800180dca3f1b0513"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kab/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/kab/firefox-140.0b5.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "9983545d86d35e4e7550edc155a58ff2109daec31f8221c3f4f6bf39a2e5e6f8"; + sha256 = "1b3fa3bb800bf323210af14329529f4211ffb637281c69c7cde0e3c017dbeccb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kk/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/kk/firefox-140.0b5.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "888ca132a30e062cfca97fd1583ac5c67bc74b6ec24d988ea37ba55af2a79843"; + sha256 = "75938c7f4bd5af50df2ebb88275b7cc597342b9423b4e5a84b99fc3a5205e4e3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/km/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/km/firefox-140.0b5.tar.xz"; locale = "km"; arch = "linux-i686"; - sha256 = "311fba327c8c69382296a0aa25ac374c50b179e297a255b69b3699d5a4c45a71"; + sha256 = "f96fb28c8c1136e082140732b290c928c9bd7dce3b06b0bab066b38471dc3cc9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kn/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/kn/firefox-140.0b5.tar.xz"; locale = "kn"; arch = "linux-i686"; - sha256 = "6ca08c6ce3c707130fee2a835b151dc49b2d7f36f4bb520cfa9390bc7c415731"; + sha256 = "6bd3d219077118ef67c1ebbb803c857dc04c674607ae264b0946247b870f81ba"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ko/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ko/firefox-140.0b5.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "df91e05dbcb7e0d0ee071a98716df1406a13f31e1e35aab9861aa4fabde2b19a"; + sha256 = "37540ac5c5e624d11125ed9673292ccafa35be4e6e662c8c9786beac2fb321ec"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lij/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/lij/firefox-140.0b5.tar.xz"; locale = "lij"; arch = "linux-i686"; - sha256 = "d2e4f16f289dc27c5e86260ca43fbded3d9e72d53b287994868e0e8aa61b90c9"; + sha256 = "c7bcc816b14aa145d48fd5076effc4f00d79432ae12b5714fae8d0550918686d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lt/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/lt/firefox-140.0b5.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "5fe6fec4ab706cb36f18a0106052189e0d4003ff30b2fae3f2f686cba43dc03e"; + sha256 = "3c6b7495391e8e59d1cf2085ee4d7850989b4112cb9e68206bc75f0e20acf4de"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lv/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/lv/firefox-140.0b5.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "cf3ff655c1dccd8760eced7c80afd3a56c55b7ebfc9b0fc9dcf0f44511265bfd"; + sha256 = "add8c79b308fe6b4a12db0342cd1c4036e6e1a6007bfdade4c90c6e5a612493d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/mk/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/mk/firefox-140.0b5.tar.xz"; locale = "mk"; arch = "linux-i686"; - sha256 = "4d0da6a59535c9c1411b6f6aa55a7302eed58cd2f53f0ff53e04a192cb8b6103"; + sha256 = "0ef1d0d8ba0550f1cd1ed9ff80b18a19f4a9abe4e2861709883c4e0011fabd0d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/mr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/mr/firefox-140.0b5.tar.xz"; locale = "mr"; arch = "linux-i686"; - sha256 = "34c88897c19103f20389bde6c25e0a63a2501d95b51b2e3d4c361afae7c7fa97"; + sha256 = "124145c79a65804bca92a11586b3f420e093d7d84f068b61e9a0c8ea9a17df62"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ms/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ms/firefox-140.0b5.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "086fe715d88df9c1a7c0248427f15ad667ef21d63778294b2034e5e6e8b6e705"; + sha256 = "e3ee714e18c5a8ecdedd3f53fe8825054ddc2f12943bce3952aad9840093665e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/my/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/my/firefox-140.0b5.tar.xz"; locale = "my"; arch = "linux-i686"; - sha256 = "f0b76fa4dca799e4a6dc301e121d9d665921b57d2b5a6e2f4930ed238db1da97"; + sha256 = "09aa50674311c91c6894ad159289922c1344a0f80b29e2273d9126a57e47dd87"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nb-NO/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/nb-NO/firefox-140.0b5.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "3db95dcaa7e87cff94f840755ed3c2c044d087e7efc9e4e0e66656def33d0658"; + sha256 = "3f61fce6f15fd873eb33a8deac9b11c0f0e835c81e48ecdd615f2358678227e4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ne-NP/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ne-NP/firefox-140.0b5.tar.xz"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "772ddc3bda37a90f96ebf2c0031f6b382e1551b46b24636fb1fdf327438e6bc3"; + sha256 = "28a5ad4cd3691b9fd8b56203810e0071667370773cc725dc85a6918082b3a98e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/nl/firefox-140.0b5.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "52cfa752621f9671ca20ff58f17daf8231b6b25fdd93a0ab7089ee9ba30545c4"; + sha256 = "eb6aaf0fd490205fb55a50422363c49cb2e9334e8d9b17589f90bcdae2eda99e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nn-NO/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/nn-NO/firefox-140.0b5.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "0f0da43087dde742473ae10ce9aaaf698a82ecd7f6934a22115eeedd25d9f096"; + sha256 = "225b9dd0b61653a729946b7e2a694998486e10397cae85b1aca6bff7d81a70d6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/oc/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/oc/firefox-140.0b5.tar.xz"; locale = "oc"; arch = "linux-i686"; - sha256 = "59c4b11f86d1699f696d820a7b7f188744a4b05ed8969b16e4e275994e885592"; + sha256 = "4cbbdae996545ecfb2b0503fae50986cef6fceccbe72d68eee301f1a0a83c5a0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pa-IN/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pa-IN/firefox-140.0b5.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "e00b35803b0327542c1b8205bae4cd92a0f4d0996d04f6d0e102271def7faba7"; + sha256 = "71e3e3aa45afd446fc060600c475f1efed29856f99c5f8eddc009a4197758776"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pl/firefox-140.0b5.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "8a608042c8e0bc3b680c43a17f2c2056e33e7ec08786925e84e78770d2dd56f0"; + sha256 = "928e1b89d48c504ceef9622ccee53b1e73bf007160de8c2a47fe27679700a217"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pt-BR/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pt-BR/firefox-140.0b5.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "e53f0c8f5f95aa91285ecec905eb0f4319241c6d0213fc18005be9a6b217e856"; + sha256 = "a6641527d0bb48f1ebd0e943a1b6520cb20fdc017a99781996ee7cb3224d432f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pt-PT/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pt-PT/firefox-140.0b5.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "4c9776ae68caff9fb70b72f4bdeb11479cae6de27e2a55d8cb861b741b753155"; + sha256 = "73ff19ebdc38f46a463bd850df6529e73260be52892e54cbc809f3ce22a910e8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/rm/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/rm/firefox-140.0b5.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "065aea6a7a7557aa03eca1448b98a1f6d28d63623dc20d6c5a2f810ffb034009"; + sha256 = "a770b4d0efcb405f06c493064a252b1171d0f4a9676e2305ac6a7ebbd94bd415"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ro/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ro/firefox-140.0b5.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "c32c420d584098f614af1009dd6bc9ea2b90447c2681684f36ce16824113ba28"; + sha256 = "9dc409c431468cdd06b17fc4341eb9e32952cfa09a49b666c50ca926ed18c168"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ru/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ru/firefox-140.0b5.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "2bfbab38ec47b41af7b52a712aa1e8ee8530834f186147ea3ec4d96da3f75538"; + sha256 = "70c0285e2c6d0a9e4b9f0ebe7f1704fbebd0c116f145dc2efccb31564c44ec90"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sat/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sat/firefox-140.0b5.tar.xz"; locale = "sat"; arch = "linux-i686"; - sha256 = "dee5070ffc55dc9ea07db4f2fcef6f0114e919b744f077d083a07db56df140cd"; + sha256 = "a31c13e572411b3a21ad460335bee076012ee0fcb736156b0d0adacd2e16d685"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sc/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sc/firefox-140.0b5.tar.xz"; locale = "sc"; arch = "linux-i686"; - sha256 = "508d7612dfcd6b021b8491b4a81a5554e333bc09c499076807c55fb8d855c840"; + sha256 = "4e2452c54842dfabe8ef514766c6678023260ed0ca621cf95f1a38a855358eb0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sco/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sco/firefox-140.0b5.tar.xz"; locale = "sco"; arch = "linux-i686"; - sha256 = "fd658e1c2470ab0428e55d045ff28b5b84b1b598064104184bdc2d4a5d3c9435"; + sha256 = "964377cb40cdf509a0117b7b18eeebfef92807502ba93b8d0744cabc19590d1f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/si/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/si/firefox-140.0b5.tar.xz"; locale = "si"; arch = "linux-i686"; - sha256 = "40e764c31003d7d14040eaa0c414c1ceee0a189cecaad1340e3979c6e8357c15"; + sha256 = "046f379314acc324d62aa2e4fc3fe06b1cbf4506609029c9e9694ab44ab31efc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sk/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sk/firefox-140.0b5.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "775c2ba89716d160f918d14f2b0308ec36d82f62891444fa8900f404928f9c0a"; + sha256 = "c0b3443e765be546c04d609150cd0d0aebcfa83f8142da85ad6af921e2a286af"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/skr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/skr/firefox-140.0b5.tar.xz"; locale = "skr"; arch = "linux-i686"; - sha256 = "307088fdb23dc49e94125b291c489c94c24852a7a9183bef7c24e0c6021dfe51"; + sha256 = "ef7d2d23ad027e4d263d61e1d581fb6b6e3e8f75567d46f6cc2d769034dfa822"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sl/firefox-140.0b5.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "4e44491b0516f11d1bad2a5bdf3a36d6a910b686d2b41461c41eaba11c96d337"; + sha256 = "b2c87ac86184c0860c35e11ed46205c695cbcd9efc68dc6253754161cb1bb4ba"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/son/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/son/firefox-140.0b5.tar.xz"; locale = "son"; arch = "linux-i686"; - sha256 = "9298a06871c2f64c7ef8f1431a414c9618c6bb1fb7ddfd8bd7c44b05db7100e7"; + sha256 = "a7588f9989c1ade6420dc81d3192a74283b63fa62d2968e98604cb10e6e2a079"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sq/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sq/firefox-140.0b5.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "31c4d00e0fa5f40b595601ebca3d6915a1063f0c54c4a5d4e6a38f200e682452"; + sha256 = "b0930917909caa42a400471105887dee86af422c3faea00d41f79826e11f4b6c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sr/firefox-140.0b5.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "4bec7611e461fddbbdb227fddfbd9a75b385159e21b2cae079f90d4f08ca7e91"; + sha256 = "4fd3e9643e6835053dfa9e41857aa4858513f5e0e51155ccde6fc74f13f85755"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sv-SE/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sv-SE/firefox-140.0b5.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "cb0ec16d9499c30569efd03432a54afd2d5fba3814b4bcb8910ba2f15e72f0b8"; + sha256 = "2604b9a5e6204d90799a2deb7a5fe0428265b857c073304c8633de4f410db45d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/szl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/szl/firefox-140.0b5.tar.xz"; locale = "szl"; arch = "linux-i686"; - sha256 = "b5499e418ce022f9c586a02304632099a40c24d1c85ce4e0c860cb62e549cb07"; + sha256 = "cfa4729ce0645fb581b00b10cf46784d6c5bc44f1fa313e3ec2476f85c7b993a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ta/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ta/firefox-140.0b5.tar.xz"; locale = "ta"; arch = "linux-i686"; - sha256 = "8ae42a4880e83ac18d95b4fe6b7291bbd6edd0a6712849ad0a7e773c93b63576"; + sha256 = "7293bd556ab5ba7af783b732047ae4735445a2cedf3cdf633cb71c6181c6cd45"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/te/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/te/firefox-140.0b5.tar.xz"; locale = "te"; arch = "linux-i686"; - sha256 = "e9d5dcf1e96a856e72911d6d236d05defc9f8a0a9c6681846bd3fa7dec7ed0e6"; + sha256 = "245e23da711630d327092b23bedc30bb43abbab850a02e7d794ee871212200c2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tg/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/tg/firefox-140.0b5.tar.xz"; locale = "tg"; arch = "linux-i686"; - sha256 = "73f95036c7f4582ab186f759580217094ae41a25bbd73b04114665ba62743414"; + sha256 = "562caf3ad16817c9fab7031d6eb95cbab162e937577a1b7b3adcd25556e5e83e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/th/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/th/firefox-140.0b5.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "de64c2f0db63b483c120fd86628e7a1de36f291944d5496a94d76cd62605bf1b"; + sha256 = "09b77a463e1d587e90f0761ceedaff1dbfa9618b3615da9c1c217a968b1a099a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/tl/firefox-140.0b5.tar.xz"; locale = "tl"; arch = "linux-i686"; - sha256 = "8d6d26d45c5daaeea7f7997d066bee1d8bf543fe16364c19d12430ce53b8d47c"; + sha256 = "2a7edc4e6f8437564817e07bf6a70360c0cb13cba796f1e5f5d75e9a9a2ada03"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/tr/firefox-140.0b5.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "a0334ec1f4e48340e43e9a7440a59df4977f6794b354ee1b9eee76a89c48171d"; + sha256 = "b756378920ca14c37469d61c63f34a9466f59f40a82b472ea28d61899bb895f7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/trs/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/trs/firefox-140.0b5.tar.xz"; locale = "trs"; arch = "linux-i686"; - sha256 = "42d65c749b7fedda87b79b2f29c30e603b6971e42f909ae43aa3d59d2210a162"; + sha256 = "0ae49d1e6bda868036ec0c414d5bbc5ff74be0732bb6e4805a2e2e828f72b24c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/uk/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/uk/firefox-140.0b5.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "6b9aca59b26d720fe0aafb8d5ae8be6c1c16985ace64c4e795b6b85f4cc6fb24"; + sha256 = "aa70f392172d975aa5041b023b9b80a21f5f718d4ca4bdf109d3bfde49088ade"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ur/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ur/firefox-140.0b5.tar.xz"; locale = "ur"; arch = "linux-i686"; - sha256 = "3a30933f5c7e041bf47dea561c20456c47324b1abfbf21f57c1d07c7df7617ca"; + sha256 = "91fddeb7716b46bb8777edb7267e60aaabec997aa42d7e2df71e6487e569c7da"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/uz/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/uz/firefox-140.0b5.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "6b22217611fcd94531655d79f0f75ce39ab8e7165dea079d82e5f396102db1d2"; + sha256 = "e638a03300432737035c8ec16c9436ad3774ca47b2046a86148293b293fda3e6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/vi/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/vi/firefox-140.0b5.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "528d077a9927444f97f9038dfc189b1ce8c5c1df9fca970c6fc7cfa821398cac"; + sha256 = "9bd9044f192512c9ea151e78363695e4b6b3b983818c86192f73ffe9513d9b01"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/xh/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/xh/firefox-140.0b5.tar.xz"; locale = "xh"; arch = "linux-i686"; - sha256 = "265dd3d23420ec4769c5922bbe385cec8c44ea282673fcfe772292523befa44e"; + sha256 = "5705c42926c38b630f6c9fc5fb04cf09ecafb589dadba19e2e6cd91600141085"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/zh-CN/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/zh-CN/firefox-140.0b5.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "71acb38bd43c8f8bde7dad6b9a23d34559f7a7d0c369f7e85b3cd32d13b44a71"; + sha256 = "ddcd5d6ae6274b4f341fa1a1a92b738ddbb2851701482e52b014f282c7d1774e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/zh-TW/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/zh-TW/firefox-140.0b5.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "879603c78d95d245b4efe4cfb1362c57042a1fd56aeda5be0b3af15a28f788c6"; + sha256 = "aead8a1998fe6f5364c1c1a57477361b3c23b63e6c73ded903b2e0ad341b363e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ach/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ach/firefox-140.0b5.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "a7e501acd0069fb355d5bc55e0d60e578122e8f08d90b064ace8d13bf4127ea1"; + sha256 = "1e011638061ce47193502f1244c48b2ba954e7e665c7ddcd8d7fe338cc9e61ce"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/af/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/af/firefox-140.0b5.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "3edc1c94431ab99d9e9f9e6380fbf29523bfc560bdc398d40e0bb84436167db2"; + sha256 = "b7eff363385cad3a3cf1e6e4afb704b203f5a7becbff73729411355199105ff8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/an/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/an/firefox-140.0b5.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "bf641e4e3fcb50a2720828c68dd823ce804cb8ba1a19197b153c7b243aa73c10"; + sha256 = "2bc588b60e77e62063ec8c6b7fa7b05bb68100953b58e82335644135f1406ebc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ar/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ar/firefox-140.0b5.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "ec1c54d5165736d52fc882c22f04df0b9a82a3d5cb005d39a970f94dc352a6fe"; + sha256 = "6f4edbedf96574f929eac18e8c727f0de149ee37ee73fc6c48df52dc2ef4f49b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ast/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ast/firefox-140.0b5.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "074fe462785332a3c2e2f3d8a5d0ce22d13a640b9e8d0acc98d3ee1647c44240"; + sha256 = "3495d176546a734f7f187559418fe2d7f3c76c9e83da587c1fb4edcda4dbfb8f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/az/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/az/firefox-140.0b5.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "b3ebe88576c6d0c609a7a42783f5e90f9e3961ecc21e6bf0eee1244490111791"; + sha256 = "550d5cf64ee2c75daa38a6cda871bec1f61ca0e563e0d5b1962880f80e70c160"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/be/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/be/firefox-140.0b5.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "645a471bc45c54f63be87d6a1a3ea5ae5f424bf32b7f9b472437464240c21ec5"; + sha256 = "330e775dca339e3a6945d23eeb03aa752eeb9e8491a35eaba36601610f5ea122"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bg/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/bg/firefox-140.0b5.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "c8f85a2504587fd939057432ed8e7735a1ba0371894624a54c6d6fa8b2fc8788"; + sha256 = "8faa665c4a0b31b933a7408f116eafceb88a62ac35ad5e4e168763d9a191c5b7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bn/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/bn/firefox-140.0b5.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "53832bb8bb533abdff06a5465aa932a0abe4241b7bc9cdbaaf6ca4f21b320240"; + sha256 = "8c72162a644877585db295686598bc7e5dc8d620ac5bb266b7781ad44dc7a248"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/br/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/br/firefox-140.0b5.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "f419664ce76ee1caf1ad5d6e4c3c469c3647a5b649a729db98535dd25d614aee"; + sha256 = "a18b9133a16206f1d67bc9d5e627cfc9fb721619c5ac01da1546da98147e735a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bs/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/bs/firefox-140.0b5.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "ed84c36ab94648dcbe89993fde2ebb9a5f888d9cb83da3912a60ef7c68f676fe"; + sha256 = "58777ac3d69a8855e2b0a951cedd3f4f953de54b70420083b78dbd19275448a8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ca-valencia/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ca-valencia/firefox-140.0b5.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "f51810d7120309d7907ce365a3ca7889ccd2cca40078fdf339c723bf00cc9cc6"; + sha256 = "449002fe40db46803bcf5bd6a52eee835480a72c9c59df4496ed68e4b56832a6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ca/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ca/firefox-140.0b5.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "a6b2ec151b6e56d010635b3edb5fd23659ee5eac7b14caf4e7a9107a05049cf1"; + sha256 = "59474c67b320c3e9e8ab08d47b2b0277265ec09e1b5f12c7532bd223c3f8f3dc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cak/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/cak/firefox-140.0b5.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "f281b21314debf2f7911a55f1a03a7d18d15800e598dd0d227d51fbc0686bb1c"; + sha256 = "60dabdd0cdf32ea8dfa74a8e867e93846dcbdba1fed03063caf70781df141b83"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cs/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/cs/firefox-140.0b5.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "df68b5f0652248f01854a273564a97009e5323107be4f0643af0d1e274d01ca7"; + sha256 = "45ae87dfcfebf1fb2912b5644d162162d8a98455e9229c06d5f23a5644a91db1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cy/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/cy/firefox-140.0b5.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "4b8eb5be13009cc0f26f6145d6a424e6063f21cfcc70c58fc0ad0e3b29113846"; + sha256 = "40108a63e30314a5aa599b09ac6f0ca87b5f7dbd08de0fa09038bfcf291e951b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/da/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/da/firefox-140.0b5.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "a43ef915b3c408f6072266f3b97ac02b3f27bd10b8ba1e2ec27e43a3a3d480e8"; + sha256 = "19627a6e38683435e26c184139d9fef0c85d354fe34b406ac16be4de09e7d783"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/de/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/de/firefox-140.0b5.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "c9dca2e0fae1bb033049ced050256a63a90158a60c8b42609dbd11081bfe8ec3"; + sha256 = "f64faf6d852a31a0e833215789c49f2d58ac4f2f293a68ad1ff6e81ebdbf0bef"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/dsb/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/dsb/firefox-140.0b5.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "07cea557c54f2033f36f5f084d06575b6f55e8cf2f8af9ec333ec2487b96fcf5"; + sha256 = "184d700e189dcbc21d40d3f5db54c2837356321b027608b330e1cd76268a8650"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/el/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/el/firefox-140.0b5.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "1dcd0eba988414a72a17218a05bf2fe6f5ab1af26dd1ae07bac72d9af2f4f502"; + sha256 = "9a8ca4f1f802229d9cc0f560488186245a82405aa938cdba20d7ef760314a262"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-CA/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/en-CA/firefox-140.0b5.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "aade344b8c7db7a3fafaa67245d7d38d7470c7b9d0c94978b7bd3c36a2127571"; + sha256 = "4886557b6a6ab5db4c71cc6440b60cdbd43bfc432f122de2194ca059766919f6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-GB/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/en-GB/firefox-140.0b5.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "e45fda7738885e6aeb3141e8b1eda1e8c962dcc6cb9c5254d0e20921f066e4ed"; + sha256 = "45050e91de2864cffc6dd4300d44f389922d8dd572ec257ec72171ce8c09143a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-US/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/en-US/firefox-140.0b5.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "314382f39fa55784648cc1dd0daca9e1f0a650f8d598591c8a54172d016f9945"; + sha256 = "a0ee52348165433189bc72678a3e62899b7f63dfc0b26a5533df43af98f11f9c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/eo/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/eo/firefox-140.0b5.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "d6539e43fe59d660b33ed528d093379123e00ac0d90c2eab8da087cdd594eb53"; + sha256 = "2f283c0c08a403861b015d003bb2cbbb989f960a4cf5071dbfd076b2b8311c75"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-AR/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-AR/firefox-140.0b5.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "0cc4e43a4b4158a381856a1bfa861e062a273ef408e2c8083331ec4bb902b97e"; + sha256 = "6161b9e86c35efcd3528f37c0075b18c718fbc143075f2580ee5e297479b9cd8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-CL/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-CL/firefox-140.0b5.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "4aa6e06b29aa104b47a7bb7216035ede7b686850b7cdfe12ad9dea0df40daa01"; + sha256 = "997bdb4cf544482f75456a95435f3e21aab8ab62b84bd095d673f7f289eac774"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-ES/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-ES/firefox-140.0b5.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "0e2d72cdf607a7db275a1b19b42a0fec0192fb5ca0fd6d46a0a433d009f64c0f"; + sha256 = "90f601277721de0bc1f7f443e1078c662ee999856f5810e58efc999bc9ead114"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-MX/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-MX/firefox-140.0b5.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "a79ee5bdd66012e6d6fff63303ff62279befe9d363f97a93e0e65b2b1689ac61"; + sha256 = "653916d1c61dcf53fdb1346e78b7c6c7054ace4ad09304316c3b81fdf71957da"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/et/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/et/firefox-140.0b5.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "8f571465035cf972bfc0f2527ef62fd6f7bab7642208f52fa48c49b53c2597b0"; + sha256 = "7dd4dab421af15474b0417753c5df7b422014ad85c62954518b78589d28ff143"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/eu/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/eu/firefox-140.0b5.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "c345cbe1a1756e0f77a4ad911852f48a225e963ee7594925c89d4b3c8cc8ecf1"; + sha256 = "60d186881b7694813433badc2e8ff787ff6f5ebb4a868197831b8e38abca7870"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fa/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fa/firefox-140.0b5.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "40da9c11b36069fa939b531d9de251e511ef3745e94c23031de3741cd447daab"; + sha256 = "ff5b4003af3d4be4041517216e94a8ccdf7370cec16000df01cb30a238a07a75"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ff/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ff/firefox-140.0b5.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "7716c5668458c2f39fb90816dd1f7eec3f54b9774567d4743e9e1f1364870388"; + sha256 = "ca08ec6ac6a77cad1e0e24dc29f29a7857eebcd8abcb6614b40045a2ecae699f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fi/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fi/firefox-140.0b5.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "41ae7a385cd6ffc6fa05d4088b9ee9b956e5485810d165a5f1001c2ffaeca01a"; + sha256 = "762d4cb09ecb00e5a51f6f9eef51805f9613716717a52ef107725c5466e81bfb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fr/firefox-140.0b5.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "1ea2ee87f0d0c94f8868b119d2d424bb3b830565875e48ccfc1e91e4973f9eb5"; + sha256 = "6db714ca2523ba57e70e625be0281bf65065b4b3a928671f3bc8286c3a60d1b2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fur/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fur/firefox-140.0b5.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "d43424b5efe10b2b0e65c0feb5239bd647af086605d918f91d3b2dee7c13adc1"; + sha256 = "886b97c7d720d5bcf0cb083da7c8c9272c354116ae9a6174a135f024ece89a7f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fy-NL/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fy-NL/firefox-140.0b5.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "6d024e0bf0dc906e6cbf93391ad26824947a90c084243ec77c305366755ae76b"; + sha256 = "35af23cfc3b24562fd897163a3e128bf75eb155c591c8aa39faaa25e83acde3b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ga-IE/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ga-IE/firefox-140.0b5.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "87d7b52ab1ac75fb33de8e13a3df94ddd9231645179070900f16107934b2b6ea"; + sha256 = "f3b13118476e1c27cec0cc5a6953a0ff9a937c3840d4356af0dbc346943e0cd7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gd/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gd/firefox-140.0b5.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "956d2b67600153073c8d20bab2cd4b2b0ce954a33923a86ba6b48c186e0741b0"; + sha256 = "eb9cb4cc1d142a50b19f43325f455620cf8c88924d8688f2a4706e81cd0f67f1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gl/firefox-140.0b5.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "27e6131bcfe6325ec8d058063dff15f75f7c66f79d15013628684a914a9e49ec"; + sha256 = "033e8e3693b8cf68066435d85490db69e615688f0b29a3c55c5cea97f867abeb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gn/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gn/firefox-140.0b5.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "ef710f084aae6cf3b2fda3a9e0d017a0bf959960337d4ddee5097d3dd406debe"; + sha256 = "4c224925a326b8f8d9a1fd95bf5033a5be1e2bae657be6decc329f39d57275ea"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gu-IN/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gu-IN/firefox-140.0b5.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "28ccc4ca0e116dc69ee73dd76da61d32fbf8b67042896f6776ee156cf05e6e86"; + sha256 = "85f1222a1cd7175d03cf8a8d2985ec8e26cb3eb6ce9b995ef001cb7d2669caa1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/he/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/he/firefox-140.0b5.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "ab26a9a8bcd33bcce2a3347c034b49bac859747b6d2bd51f3ed9ac5206e6fef3"; + sha256 = "3c16de5fff4b745cf82331d1ca61e26d3470828f7a0780923825193fbd7a77c9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hi-IN/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hi-IN/firefox-140.0b5.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "cd45abdfd476d38451a97677654ef53f5d987d1acc1225cfff18fe4d8d600b8e"; + sha256 = "5bd8778a884af045280bebb3dad18c3713596f2f4bc28866a174aa905a8033c5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hr/firefox-140.0b5.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "4951c793afba243271ba640eec8b7351e16b04e9fc49975f3f97844447e21e27"; + sha256 = "090c4785527ff5060af5ec61ed257a79fe09f48355fdace3748557b66644545e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hsb/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hsb/firefox-140.0b5.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "26881be6be8d8502b8a3cfe2889172bb7b06dcc86cb822805a09fa2e8d839217"; + sha256 = "a4e024dc461e043c80752b615f81040d963313c6a7d846535520e51f644d2f50"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hu/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hu/firefox-140.0b5.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "af29ec58b423ddcf5ece496b28a11f014619a0e091066bda01495db3c63e88a3"; + sha256 = "4e782f584f846064a7cbf5765c3be5b204ff2979447c98a84efafe0f6ec96da2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hy-AM/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hy-AM/firefox-140.0b5.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "1d202708d4a46499ea91fcb225514966b5c4f099549e014874a93969eae96048"; + sha256 = "d72106a177b9cdd4202e28d9ae687185acae2e2057a47628249b7b814dd79512"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ia/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ia/firefox-140.0b5.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "8569d38bc4ce56749462b7db17b82b8059a6efca1744b8295439735f4825951d"; + sha256 = "037217e499e38a3db7589c73092d49dcab2de8e98f2bb09e9c243397573c4fe3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/id/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/id/firefox-140.0b5.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "2718544968fb71d1e7645d8c353e9b909ae7caf0768ae9efae6202681d378026"; + sha256 = "e49cc487d68df6e4f3c5e829e67ba9b66f6becab4956d7d37818b00d93adf096"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/is/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/is/firefox-140.0b5.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "3048c7a981a59ed35530e882704ca28e57545f63036fa0500309872cb90041f8"; + sha256 = "935810f00a7742c48a80559b8e387c77781664a202be6f014375ca9b50f0c14e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/it/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/it/firefox-140.0b5.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "47a2136e5d24befe2d7250fc917d838294d3d3d0ce67bbdfc12ed52cb13c5820"; + sha256 = "3f28d9eebaa24d21583110e062177b2e709a8b20558de73df1d8852ef1fb4095"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ja/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ja/firefox-140.0b5.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "c691c79991add05818169ec0762c71e83704aa26d518fa960d6760e1c4935630"; + sha256 = "bbb9ff9c320061e98e54a93930c63944cb6cc4f921e89c00a5d5295d4770f59a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ka/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ka/firefox-140.0b5.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "5d5e32cd2dbca632b2af119af427b15c1e0ff201b945b6cacb961ae2092f2b88"; + sha256 = "8bbe2d76336c916920a74bbff6a80ad53bec9f282849a6ffed4f2c54deef0c2b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kab/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/kab/firefox-140.0b5.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "04564d398f617497e6503cd81095c3d9994f1decea0e99a86347dbdea3ec8373"; + sha256 = "d2a9cd1f96f1dce323ec228e361ef056b648402011c34c9fcc506d76a7cb775c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kk/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/kk/firefox-140.0b5.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "4c0ee1b602a71b6c2edb5b4d2cc7dee2c92f5cf2100c3211a1cd4747dfbc3cf9"; + sha256 = "2ff4750434a085bcc6967355ad60895faa9b0f66aebb1df9e77a2b4ad5ec05d7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/km/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/km/firefox-140.0b5.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "3f4f5c974a2f82a8eb24eacc80dd43dd6888687d7b33b709a75dfa028ca0ab61"; + sha256 = "3821c7e71d387596c042b231a046c4e1737beb59fc4869f2731aef7bbba0f61a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kn/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/kn/firefox-140.0b5.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "b2831008cf28a63f2ef589f6eb9af55b796deffecdb7d5b6ba283820fb303eed"; + sha256 = "38f9731050ce577db8e657bf817d7e049d75fec65a5a46d3b4092146264fcf56"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ko/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ko/firefox-140.0b5.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "e2a06611817017184cb75cbb999cd51ca4854e14585b5be643afa6fbd976391f"; + sha256 = "81bbc9a2dfd74aab21573a0d914992be67cafd07b3c9340575a4e2e15d8800d5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lij/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/lij/firefox-140.0b5.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "dd60b5542bc5ad651fe6c9113f1379e34773a57e85306bb98bdda2738cf4fac1"; + sha256 = "c310e302c58b8c051879cfe416930b686662cb13d57e416f8d4fcc03a8c10cf9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lt/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/lt/firefox-140.0b5.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "d9dbf35f5982441c0f46af3ab76523d1012d117fb6dd23e45437c23ba30ea196"; + sha256 = "380ceac202194db26a7c04d718542be4d7ed53d12b90431a80c729fb6a314d0d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lv/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/lv/firefox-140.0b5.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "c24ddb01ca378672832eb5cf8e95bb78f6d5cab3266fa67070441e808db98439"; + sha256 = "966c9fd50281bb33eeb194bc4725e1c7f090fa73de4b525d417f05427cdf809a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/mk/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/mk/firefox-140.0b5.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "d97f6661efd9f853c0a0e33b8a3c346866594bea9490bbfc4d0506aad919b62c"; + sha256 = "627744979950de4aa672aefddba71aefeb600175b53146601ab8d2afa41e014c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/mr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/mr/firefox-140.0b5.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "35a07a397fb9daef535f2f8753261ed318f4a775f8e15e266af0942761acf2fc"; + sha256 = "8c747e56063119607db5c2aab161bd52c4e7a13967c54144fccee5862231766b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ms/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ms/firefox-140.0b5.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "72d8acaf044201716007c6c189222020002d9a4016f4a3d253a91d64ca798783"; + sha256 = "e33f0ceb939e05283d62de4f07098d40da5895c6ac9cc3394e357d5d66e17e08"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/my/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/my/firefox-140.0b5.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "07a733a01b0825331ef5c8d107f194345e0afd157ae123f4e2e234029ce03903"; + sha256 = "9f4fa6be9d82941e39c7c8290b9d1c81db93b5e14e8762164b7fb51dc79f9a29"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nb-NO/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/nb-NO/firefox-140.0b5.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "23fd5336cf74966635ee1bb595d10766751251e018039fe97062f92dd28701f1"; + sha256 = "b933144efd2c94924acbdc023b6e970ec86dcb3af66992f5b8adbd7c6196c07f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ne-NP/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ne-NP/firefox-140.0b5.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "225de7dede580be0c8ddfbe8a497af052c424b464ba606e11effb2a0258aaafa"; + sha256 = "a1538cb554c8e0cdd7aa3cae99b42c8f873b53d8a66f68a1c771792fdcc9ad66"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/nl/firefox-140.0b5.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "caeed5870902eabacc4b44398dbc9d8f1e7a94af15de1988d7d269004806559d"; + sha256 = "c8a4a788a71971d188c684168569fb65180681e34dd0c40068cdf74e577ce031"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nn-NO/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/nn-NO/firefox-140.0b5.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "878938c66ba82f4b8598e3aa74b6dc9a8285e16d6287bbe760425dff2e6aee33"; + sha256 = "5fbaab1173ee8b8dfd283641a6dcb2f5d70138045bd0c794a75b5ba09fbe98d0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/oc/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/oc/firefox-140.0b5.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "1213e2a2226aedad71b543e1914151cf085c3186c447e6001c9ebf9b5644da35"; + sha256 = "fcfda166f46d99afb40654d1a7028b395f91f50ec22ea873fb2a20b2358866c6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pa-IN/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pa-IN/firefox-140.0b5.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "7141be31170e77c199c7e88a85b640a0aa9fbf3a87a6502bffdd7b95975e3fa3"; + sha256 = "4a7f826caf0bac406b5c0025f64e04e0f40cd74c12251f2541dba3e2125b1018"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pl/firefox-140.0b5.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "f6128d1579be2067e2547f8eb1828a56e6dd6f29258b87e363d5105b7cebc4ce"; + sha256 = "7be0dc3d878ff5b3b0089dbdd6124fb736f1ae6e43aefdc30e17fa7095fc7eec"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pt-BR/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pt-BR/firefox-140.0b5.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "9ef2b8cd01242d32f2cb0adf5a7bc310be21f4ba1cae3529cb64da75531d9792"; + sha256 = "21f9f3142584c0798e88331cf8d961ad66f2d0ff3796d978ba1b7bc7bbb810dc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pt-PT/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pt-PT/firefox-140.0b5.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "24b50d061bd46d7cccc128b562491e878e67e929f45fc986071d7e8c75585fd6"; + sha256 = "7b54964662af7c975d64a56178d3a0bcb63fa4f4d7f3022e85384ab2ac194016"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/rm/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/rm/firefox-140.0b5.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "5f138469c44a462d84ecdf70f4d76b9bf09509c0888588cd74240d93a0a65ddf"; + sha256 = "4f084efd1dbe4424aecf726b9bf78e3e832c79930d366017acc32c3f6bad1969"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ro/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ro/firefox-140.0b5.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "34770ca741c4dc609deb69f606cf227b8abe1c5559c30b4743b03d1fd6bd4e88"; + sha256 = "a544b6aec82ea94e87d76907ffa295f22f8cafe76b47cdad117437a5ce626733"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ru/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ru/firefox-140.0b5.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "bf0dc41307da0ae66fa013d17e619776ce796301e7c1c3e16adcdf5290d43ce9"; + sha256 = "ac918191cd19b1cefdbaa34a83aa9e343323f75cedea255ab1caf0119116f826"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sat/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sat/firefox-140.0b5.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "f26a609c8e2dddec77a8d3cddc09fbf03abb9a6f8ff282a155fd0e35778e52f0"; + sha256 = "ec11b2475fca2aeae9550b2647492227def51ed21ea349586227bbbae2e5362e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sc/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sc/firefox-140.0b5.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "b2535743683e89e58aa9aaed48621553afadd994f6ee1edd020e829abe7a1efe"; + sha256 = "a6e14ccd27f4b6f57c3464069a194dda3da1b079dd451667fe45f2709b29ab49"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sco/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sco/firefox-140.0b5.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "2731fbe959da7f15a27e3a675fe80b0d54bcae316672035c415376660f8c60f5"; + sha256 = "78c90f950c950766a633f358920e06da279069f33c37322a1638ac0bf6c2dd59"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/si/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/si/firefox-140.0b5.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "c75fe5891b84c8fcffa4d43093d6c71092741bb60ce3bbb0875067ccb08801d5"; + sha256 = "5b2155b0e7f61b4bb008dac5a91cfbc373ecf72c8bced76773bcc78bb75e6f1c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sk/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sk/firefox-140.0b5.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "c4862d30d0cf9450be66cc38213d90c300196bf98b361bfb39fc9d1c4748b2b3"; + sha256 = "8e5217e5796f746ac6fd99c9b87982e20c70910a15f2e05531d0093ece37da6d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/skr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/skr/firefox-140.0b5.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "1702eda3a78cffb1df602d1443fa885a575382b5f5b27fbde44fe26b4b3ca7c5"; + sha256 = "1fae131ac8dcf6aff16717e0f681cec5621a1952d0d13928ec4ec1f4a923af02"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sl/firefox-140.0b5.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "57dac174f3a82d01f4ddabc28ab47d063f6cff823bf96394aa15b84acc026f03"; + sha256 = "44e9aeeb682f91ce60571732aaad6e94a2231c2660029ca741707d49f4d2d41d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/son/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/son/firefox-140.0b5.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "02aa9292bc7bb008ce7b3a4c71b7418578c58b45a86397375263ae004c6bdc3c"; + sha256 = "0e4fe06cbb4e9678d59ab2568d4e1fb7d6dfb388c7dfc55c918405d975c45a68"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sq/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sq/firefox-140.0b5.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "bda64253568603f6bc9edea913748bcee053ff0ff95ea0e7b1fe52960e234f24"; + sha256 = "21d94ec8f62ff82e72c5b249506f9d2cf735f96ef9ba92575630353d14edc0da"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sr/firefox-140.0b5.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "92fbca93a60dc3f35da2427b2a89185efe0090306df4cace4c025683e13ab7ad"; + sha256 = "7bcb3e71959b65fb29974cce8169f2ad151475d7f9788c9e22c0b32f7e012c5f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sv-SE/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sv-SE/firefox-140.0b5.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "ee6be5ad07e13e990c448e19b43a244a15bdd7ea59375ff4ad894ec75dd639bd"; + sha256 = "9a8b15f4813305901df5482b7873dd9f6e6cb6377aafbcc3186a769f7ed8383b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/szl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/szl/firefox-140.0b5.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "fc481f234c13d42a06dcb6d32a7d092e12113ba15535844a781bf49ed7149781"; + sha256 = "16c007db8ae7cf01f08fbab1f8f8fc974a65aa5d85dba39eed0c2170e0ad1411"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ta/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ta/firefox-140.0b5.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "082bb72187b9ecd8911051c27a0357ad83fc859a351bc6f48fec4d61961e9b68"; + sha256 = "924fe10a4ec038dfac1f10a445f88bb16d13d2d9e572e34a454654b622a11ac7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/te/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/te/firefox-140.0b5.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "13303d06a49825000e7368e8416e38fcbc41f8c9f795b2af6bf836b4f7c65915"; + sha256 = "fe73e00623af2142be1986748602ffd4b4a809285d6b36131be723dff691067f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tg/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/tg/firefox-140.0b5.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "351c468bb51665019393083c834ffb5903b1fbebdbda2560fa233db179bee441"; + sha256 = "557792ef8ed1e0ecd81fdaaf21c176f5b8a1b2c90d7ed0bc322792020e2d6898"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/th/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/th/firefox-140.0b5.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "f1b2dd8e921d8eebc6bd10b22aca1ce4a48818dba830cae131cf8fe7704e7c6c"; + sha256 = "0fbe64c99655b66c8b6c17bbc63c6e3a4ed3e44bbd635077a641fa0e05eb4c3c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tl/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/tl/firefox-140.0b5.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "8e5dacac1a85e5d6aaccd9939aec63143d1688a657e5dc5f0f4ebfe1094acbe5"; + sha256 = "ebbf21cbea61c110f81ad452989691b81ed2bf830ad7946e51f3f39c2b43df0f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tr/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/tr/firefox-140.0b5.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "14ea2292bc55272d784a0f7d8dc8827502f352665c8652d4251f83cd3e2a6fbc"; + sha256 = "3649d99ec7c366e1fbde17ad18282ebe05486cf178a3e59f57caa58dde6ef0bc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/trs/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/trs/firefox-140.0b5.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "3e834c1967efc38e6377fb6e91a40e258b4d3e99561e7d06e7239da0b6db0e6d"; + sha256 = "ca03e8b17cd5fb3b52d0de8b80c83299d0d90497c758442d60914cf1dd7661fe"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/uk/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/uk/firefox-140.0b5.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "0cc79f9b74dc4b8bc52a004e6a299dc7c3067edf51af894a9ef93ff865375daf"; + sha256 = "5c18f39c0ba60ba060213f8b72266663d97258dffa0453a071c7810954adc320"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ur/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ur/firefox-140.0b5.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "ff89b979a9bb6e97b71386c492d0e3ae05097cd21ca4388f6db28ba441bee705"; + sha256 = "011b35f3ddae4f2dee8424731d41157008409cf3c19184429ef6a83a198975f4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/uz/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/uz/firefox-140.0b5.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "69943a4fdb5137baa73fd3c884cc7d2c4c8d3d3c42103fdb4590aec34206df15"; + sha256 = "ef25f008c7ab6bb046a46d57e93c0015a7189e7fd72684c218a0992f806005a0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/vi/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/vi/firefox-140.0b5.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "0c6b0bb20622e3e181148deecd505c22ce7d3eb70cb3bf89fc234ccdd84384bb"; + sha256 = "81978010063f3d9bf9cef6719592f5fbb41c64826bb68f658547826e92c9d1d4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/xh/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/xh/firefox-140.0b5.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "fb13b9888715720ceca991f449e47ed05154f29f080bfe4c99ee494ac92cf86d"; + sha256 = "7409e9898935f78bb6762f76a68662ac64086868b89f5e52940e2e3a963e9637"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/zh-CN/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/zh-CN/firefox-140.0b5.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "fa37aa2739232658cb0d947f15ba2839c8b28debb0d3bafae1805a8fc065580a"; + sha256 = "91172a1bd8722fc67e12f968a51f5d383f9a0bd3d40b4ad56c63e1316d5156fd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/zh-TW/firefox-140.0b4.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/zh-TW/firefox-140.0b5.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "7d300dfc2bf2effa515b05c7e8f51c9c3388024a311c6da9fed1d463bd1946f7"; + sha256 = "804adf3d4db86537174d2c680daff8df249909d8254e1e5583ac1c0d7a3a5d61"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ach/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ach/Firefox%20140.0b5.dmg"; locale = "ach"; arch = "mac"; - sha256 = "fcc7f8310a689c595c387709685af98b4acc71d02ebf83b4b88a5747d15e7bec"; + sha256 = "9cb867c92c058f81bb6b7777740f0904cf8610cfe48640b4ba788bec42712cf9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/af/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/af/Firefox%20140.0b5.dmg"; locale = "af"; arch = "mac"; - sha256 = "92b2731ca8e8590d7f5c69e48ee196f4a0a34dceaac8eafc3773c15f7fee1d77"; + sha256 = "5713bf29a1dae788af6a2308548c0a617841a338262b901d2d7e8e6c906a2a1d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/an/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/an/Firefox%20140.0b5.dmg"; locale = "an"; arch = "mac"; - sha256 = "ca7e1a463cd090e64e798b6f6563e9751b1aa2d4b1227c500bb111c53b3fdee9"; + sha256 = "24eb57bbd9af5800d8141f61db2b7abcd67afc40b35cebe9d6a606bac1170d01"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ar/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ar/Firefox%20140.0b5.dmg"; locale = "ar"; arch = "mac"; - sha256 = "f6944b6bd4b086efa5b60a0605709adc737ba1a4ecfa4e689e124331465eff76"; + sha256 = "c256d4b3f0658d3d2534a2f99df78a9c8de4c6d9159052aff6d138220c2909a4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ast/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ast/Firefox%20140.0b5.dmg"; locale = "ast"; arch = "mac"; - sha256 = "e834ba503dc7fdbdbdf69a516126cb16cdb089eddd1b2773e00c5cc0ff4d7658"; + sha256 = "9d7008c2ba0142f14ba330a4561e5ba66a9729dffd094a56c0688eb0545d42f4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/az/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/az/Firefox%20140.0b5.dmg"; locale = "az"; arch = "mac"; - sha256 = "dd4a9c7d87b2e1af7f87b083910682967cafac68aa1c4c87f6b6dcc69bd0836c"; + sha256 = "b999fc3eab4d3306607f916d7d19b8b380ffd62128b9eb70f8f184a0fe01932d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/be/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/be/Firefox%20140.0b5.dmg"; locale = "be"; arch = "mac"; - sha256 = "e6c157e53ef0eabe645ede759f83bcb1e55d3d7da09fb29044edd7e1fd139de0"; + sha256 = "9b295b314b77c345e91972574b3563cf85b020876abf0825b404b7840057d046"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bg/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/bg/Firefox%20140.0b5.dmg"; locale = "bg"; arch = "mac"; - sha256 = "28d50138cca863ee4716f7be693950e468f5442b770dce389081caadb4e86fad"; + sha256 = "3157128ca5cd17a0e1e38baa2bdf90322595751cdf51fc70201d9ce51a30c91c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bn/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/bn/Firefox%20140.0b5.dmg"; locale = "bn"; arch = "mac"; - sha256 = "d16a2cfd1bf7602c22153b7de4b7f74485aaf78b09526985390f4d35783134cc"; + sha256 = "a2493281741e7338b3e58294aa72a9b39afa0976c6f5db01a0077d95ec781f8e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/br/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/br/Firefox%20140.0b5.dmg"; locale = "br"; arch = "mac"; - sha256 = "2e9649b9ea8d6da502ce86fcb6a9ed70a4472b58ec7f7a85ea7116c455b8744f"; + sha256 = "9bbbb53e059cfb4fa06f60ea7c60cc2af7e4fc61579812f8fa9aec3474096f88"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bs/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/bs/Firefox%20140.0b5.dmg"; locale = "bs"; arch = "mac"; - sha256 = "c566fa2adbbfacdb9779a99a7f925e5a6aa8be78afee2fcc9d082806a7a2998f"; + sha256 = "539dcf035d240f794074b5fa7968d12c819d044f3bb8299aacf12dc0013ef34b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ca-valencia/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ca-valencia/Firefox%20140.0b5.dmg"; locale = "ca-valencia"; arch = "mac"; - sha256 = "c082e76a703f1d228f45199c0d37f17334720affdf83b9860b538b4fe0381f11"; + sha256 = "97d6d7866c8d1fb14a57f926e322a9d4f3addb37fde7977a26dc882d1ac44a5b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ca/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ca/Firefox%20140.0b5.dmg"; locale = "ca"; arch = "mac"; - sha256 = "ffe9b9bfa9742d259b1da9675005c21a1018d865fc33eb3006a9757b7af9d9cf"; + sha256 = "d21d03e2e4c44e5d0ac8d3b685232c1bf21ba52cdbbccad13016834bb735b306"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cak/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/cak/Firefox%20140.0b5.dmg"; locale = "cak"; arch = "mac"; - sha256 = "d6b872285b7db3d977d06e37926250a0d142869c95d60673da38caaadafe6626"; + sha256 = "a6bbbb0815a0e0a1a9e2ac65ff4847f8be81973a5f333e0130e412cf1f20dd75"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cs/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/cs/Firefox%20140.0b5.dmg"; locale = "cs"; arch = "mac"; - sha256 = "e37322b24fe1d3248871314095726a8ee53616b102ddb12be11857fb9fb0c72a"; + sha256 = "3363713cfe06c13a43a9682cb4ba4b5af198474122d0cb1e35c4979c29a6865c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cy/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/cy/Firefox%20140.0b5.dmg"; locale = "cy"; arch = "mac"; - sha256 = "7859f61b331dd65d9f1e3b10919a9d442cdf8f1edf5419944a5a9ef92428e133"; + sha256 = "18354d7d9de625afcb1c210903a18d06d35ab393f5bba56b2601cca90e1a19c3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/da/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/da/Firefox%20140.0b5.dmg"; locale = "da"; arch = "mac"; - sha256 = "7b50efe8bbafe360ceab31db923c61d196402f499bc86d2f402c11b879580581"; + sha256 = "09f68ef5a82abba5a0d5c26bd42efb9811a4c8e8b05e3a2e68881f86114dd681"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/de/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/de/Firefox%20140.0b5.dmg"; locale = "de"; arch = "mac"; - sha256 = "29f7864de3051dc8c63458a4291a03f5cab7c4f1cfcd038cd4cc097300d3fa32"; + sha256 = "55207c58022b9de2580800ae7f7dcf8885d4e500196bec60ae7c3895650b8be2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/dsb/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/dsb/Firefox%20140.0b5.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "5487cbd69515dde8e0205aaa6a8439e13e330ca55869a45f4d3b781d2d4b04f4"; + sha256 = "f4e7f6644f58ed9dd5bd368be6c493542baf429d04694a41be716008b1e1cbdc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/el/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/el/Firefox%20140.0b5.dmg"; locale = "el"; arch = "mac"; - sha256 = "f7c76d6d24897905a6578d58f19645b197d9d646bea1c9bcb499bbbeddd8e965"; + sha256 = "56868683851c6f9acc8aaaa68db7d27aa37d8bd3897f765105ed4b834852c605"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-CA/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/en-CA/Firefox%20140.0b5.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "abf69c3363150980bd1c1a84cd3bdf2d39e4715805f11256a1db38e99e431bcd"; + sha256 = "1cd3a2bee71bfd98480dbb185a83fad901654f5d2cbbc8b82451916123d5a477"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-GB/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/en-GB/Firefox%20140.0b5.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "cb9c91e78b00589aa06286af20540e0fb7fd99e045a602aa49353db5de84ae07"; + sha256 = "0b52e0534c313ccb0b8ab92235a31d6a02e3d93ea0ed16d2226d6225f6c2e29c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-US/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/en-US/Firefox%20140.0b5.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "41074b15a8244ec003bde022c29f8bdfd9cc07b7761af8840380c5cd8deb07ab"; + sha256 = "0e18a2d29400dec3e9285e69d40a6fcd68df1fa59b15aa1e838d97ee95b633e1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/eo/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/eo/Firefox%20140.0b5.dmg"; locale = "eo"; arch = "mac"; - sha256 = "2b92b43fd83c02243e91d4be7a0a4f32b1ce5ab3f43d2eb98a177ea3fa8c0bde"; + sha256 = "bffc32a0b380178016dccf7b737c7ac9a4b7eb92cd16105a0b3b18dffae63ad3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-AR/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-AR/Firefox%20140.0b5.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "5b4f1f32ed3ad38bc47b04faf68944b9c2eb04f85ac3b6f3653b526fb59dfdfb"; + sha256 = "99dd4c2524cea56eb5a01d11f180a3e491878ceb4b4b85e2bdd5c351e3eed52c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-CL/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-CL/Firefox%20140.0b5.dmg"; locale = "es-CL"; arch = "mac"; - sha256 = "603f2ea427bfdfe79bc7087ea3774a4a1deeb8e446f53ea5483e3180e452d59a"; + sha256 = "4eaf81cc55445d10bf5d6afe7060c7f673ceed66d26350104f7aef497621447d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-ES/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-ES/Firefox%20140.0b5.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "6364d2a4b7ea39d89f654abaae3a291577e74c8b0b764fbaabcbe0992f583159"; + sha256 = "d2ba722e1a28cac2c99a8573364b264545777cac53839859218bd5d64400d568"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-MX/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-MX/Firefox%20140.0b5.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "b1690c817759405a79cbc6a50d616fbccde39cc0d99779ee4753603917c1e37e"; + sha256 = "0674f00814c54795d93a362cb15f7d3037da3fae78098a1bcf569d10625f166d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/et/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/et/Firefox%20140.0b5.dmg"; locale = "et"; arch = "mac"; - sha256 = "30b75291e563af62919b75273f442884c9a262fb2a4de542d53027de223f720c"; + sha256 = "05e738277b188119d318de64b473a08a144253eb7f373d2a8c9519c546c327fe"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/eu/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/eu/Firefox%20140.0b5.dmg"; locale = "eu"; arch = "mac"; - sha256 = "2b338cf87087b7a4cd172b72a62a52507076088c0dcae1a9f63fe6c4722a6d11"; + sha256 = "d1a098bccfac6bad61085d4d6e3ef07decef5665edc590a216b85d46d36f6380"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fa/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fa/Firefox%20140.0b5.dmg"; locale = "fa"; arch = "mac"; - sha256 = "5b1a5509577f307b24065b7f4e88c103306b9937c4d98e49cb9aba97abf2d3a8"; + sha256 = "8443c7db3237c5a30ab9aeeb2084358a71a030a6d4dda51b4b3b274d8050bf09"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ff/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ff/Firefox%20140.0b5.dmg"; locale = "ff"; arch = "mac"; - sha256 = "cd5b37a95f414be5af6217ab5dcf983a7ffdcfa78e013b9216ed57f3f9d2a224"; + sha256 = "3f6f2af196e3ea13d21b20739ad8d4afea28753e4a6f6911efd2889c3861ffb1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fi/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fi/Firefox%20140.0b5.dmg"; locale = "fi"; arch = "mac"; - sha256 = "866b567cb5471d434dddbcb58260291b99a322f67b6e203086762083f1967e7d"; + sha256 = "404209bea1e3d2915445212b5f2ca2e448dec7adedfb4a9901eee0b175b0adb5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fr/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fr/Firefox%20140.0b5.dmg"; locale = "fr"; arch = "mac"; - sha256 = "f5393dcdbdb367bfaf0e1e47ce2a445add9fa265abb87a0c324daceec3a1d0fb"; + sha256 = "2530f98106899fcb75ef098929d07cb467c8c89c497205874d2285e88f23945f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fur/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fur/Firefox%20140.0b5.dmg"; locale = "fur"; arch = "mac"; - sha256 = "e4ef81af4c352ac12a5a3fb3dd5a34dad3c9acf3ac639e20141694da8fbe8ec6"; + sha256 = "c895f27121dc816cc26f849de1fa1a89221ef5df7d617f39b69d552afd08987a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fy-NL/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fy-NL/Firefox%20140.0b5.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "54be4106d429b1df2ef2d5e3861712f69ec348b47f9bb2565c191762beab8945"; + sha256 = "e03b79439c2f497a0e8d87eea16ff659417d435454095e050f68f738e091644d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ga-IE/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ga-IE/Firefox%20140.0b5.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "ee229ef6fa1fe743d5364914c990172e39a9500c2968afc646bacf14a3eb8742"; + sha256 = "1717510309b0dfed21485023db01b4f8531807f63ce6c14fc6c6342100fd6981"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gd/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gd/Firefox%20140.0b5.dmg"; locale = "gd"; arch = "mac"; - sha256 = "1164bff45a4c75283d70a1dfebf12dd0729275a1135be9710830f7a8eb28521b"; + sha256 = "f555688aff2a86f6859be7f5ad862107b270e733b54bc6ab8de012628c232550"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gl/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gl/Firefox%20140.0b5.dmg"; locale = "gl"; arch = "mac"; - sha256 = "1317610e3c18cdbd81c9712cf7e6c3ae589952911347c027d3d3a271ff9b9f97"; + sha256 = "98eb52e363b2bdaf4be579df53d5fcda9f61ba6fe0ea021be00e3ae4eef24924"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gn/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gn/Firefox%20140.0b5.dmg"; locale = "gn"; arch = "mac"; - sha256 = "5ed49bb2afa8c6e8197a20576e97957f0688c144605a5f1c35ebed14f7a1fc41"; + sha256 = "ad81d8310d57e9f871eecc27943ed1130642c9621b7ddc1b1800bef8db084175"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gu-IN/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gu-IN/Firefox%20140.0b5.dmg"; locale = "gu-IN"; arch = "mac"; - sha256 = "3e4ac33879e91fa422d741f477e7c66f947041999732c5d7b7740f2abdc5bb86"; + sha256 = "ef2567ffef364b7a90d69549ebaee0bdc1791db0f236492b41ee2a9ccbd8d70f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/he/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/he/Firefox%20140.0b5.dmg"; locale = "he"; arch = "mac"; - sha256 = "94f832c1a5a952823ed1571ea3deaf3a9d115b837114a60e13732de0b8211f5d"; + sha256 = "8720ef790fc80a8508996adb56cc4d0ca6ea86c098d3dd6a0e3dfe8309f0b3b3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hi-IN/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hi-IN/Firefox%20140.0b5.dmg"; locale = "hi-IN"; arch = "mac"; - sha256 = "8e2cfbf7c7e015886592a9983390c56fd251ace396bba5f34b3a2593255b1161"; + sha256 = "2918bbc9d199cb74938f54f5009def557fdfdcadec03ba7048ede47edb04f4a9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hr/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hr/Firefox%20140.0b5.dmg"; locale = "hr"; arch = "mac"; - sha256 = "e48b5b93adf00da2e4a3ce0b4ec9afa2db03e962287d346de188df2c0d6133b8"; + sha256 = "883da09b8860a1340691fcfb04f5b8665c4f497489cd4b0670e93288317472fc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hsb/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hsb/Firefox%20140.0b5.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "7ab6ff54701b53b258bdb5bd1ab9679cf9acca9c987830d17246dae5d9f141fb"; + sha256 = "9691f64a2cca90f19c0de44ffa92d897ab79cc9435dbe3fbb7ad8fa831b1b7b0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hu/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hu/Firefox%20140.0b5.dmg"; locale = "hu"; arch = "mac"; - sha256 = "eec1b7f5d3274267d5c25b7aa3b774bf1b44d15801568c60cfe082064d7372b6"; + sha256 = "3283f61dddd81f508dc58fe594f37bae973be39bbb6eb783dd19a644e8dc88ea"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hy-AM/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hy-AM/Firefox%20140.0b5.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "6347058b34660f414784b5f2782bcef72dbd6349461c4a2f0988cce9b9af6793"; + sha256 = "e871812379227c2c06db83ab082cbc8b4f75b67a4676176f127628272bfc5f35"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ia/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ia/Firefox%20140.0b5.dmg"; locale = "ia"; arch = "mac"; - sha256 = "6772fdc20c9a174d0e411c57ae3a383fcc840225e6c3c65b052ca54ac2369621"; + sha256 = "a829991bdb4c990daae07037d6047daecc7e3277a1122f1f983a8812990b9648"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/id/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/id/Firefox%20140.0b5.dmg"; locale = "id"; arch = "mac"; - sha256 = "a4a4e7a132bddc604ea0b9b323339a730b58fdaa2a1c0c7f06f610149c9a4c58"; + sha256 = "67d899f44ad9306ab978c00eb885df149ebbf6dd326a34075611980a2e25c81c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/is/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/is/Firefox%20140.0b5.dmg"; locale = "is"; arch = "mac"; - sha256 = "e6e3f759fa1aa68736b851ae6438ca4eeb7513e7a0e993cb2774c52ed1f2e294"; + sha256 = "b8498494c0b4de37276de5c75a43c846bc25c2fe8f69f59d4d36d55ae7b5eff4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/it/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/it/Firefox%20140.0b5.dmg"; locale = "it"; arch = "mac"; - sha256 = "a0f8f2af64f04e6ba51a082860eb699902e5f5bc27dd995b9b97501d5bc7e0c0"; + sha256 = "78db18219d6be4ea2edf84b8e2ede39140385c069a088291703c256da38ed7c9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ja-JP-mac/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ja-JP-mac/Firefox%20140.0b5.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "3c248f77a15e06c4222760c2dc89d6a8b3f5d2e39772fbd503f35d6fd05aecaf"; + sha256 = "1ffc9a14b28e03415157d31078f798ee9c65a89040c5e97fa1997fc2ee5352be"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ka/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ka/Firefox%20140.0b5.dmg"; locale = "ka"; arch = "mac"; - sha256 = "81a45186f076deb52152488cf38b4852b2e0b69e0e6838dc63345587d8d61e88"; + sha256 = "f0da37860137d3ac987d0b736c0c9c50f4e937df1e4e0bc3d0966982332f76c4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kab/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/kab/Firefox%20140.0b5.dmg"; locale = "kab"; arch = "mac"; - sha256 = "84163f185798fc4975e974b3abc617cb04de4e0fcd0494536a9a51efbf8dba23"; + sha256 = "a81e1d4dd438a1765e201c2dfe2da494f0c5212ee122041bb9f93348b9b6dedc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kk/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/kk/Firefox%20140.0b5.dmg"; locale = "kk"; arch = "mac"; - sha256 = "66dc5ac5244e54c22f4ad71bc4653dd416f087008657f16d60d13ef031f96bcb"; + sha256 = "ab6d96b83912e227644c01854b938df703fa6743fb7f9baae997ab80ca065ac5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/km/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/km/Firefox%20140.0b5.dmg"; locale = "km"; arch = "mac"; - sha256 = "93436870b3cde5355505738fe2ff850d28632223eb4a872c4767961a422c8e3d"; + sha256 = "42b8255377a61f1fb6967ded391204bea51c86554fefab9138b7848fcadd1ed6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kn/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/kn/Firefox%20140.0b5.dmg"; locale = "kn"; arch = "mac"; - sha256 = "955cec843ecc4360288a573888b15a257f75f39459157dd844208b012cbf8699"; + sha256 = "77775d78528c08d22ce54fcd00dc977b7debc6f0b315a220bef7876d1da78eb7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ko/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ko/Firefox%20140.0b5.dmg"; locale = "ko"; arch = "mac"; - sha256 = "c42535a9c379574d411cce6d4fd5830ccd77ac7b6c849aeba68436bdf82c1186"; + sha256 = "70d12fe85b89d9834f9c7d0fd28959cbd839e5dc7ad0f2c07c794263fb0803bf"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lij/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/lij/Firefox%20140.0b5.dmg"; locale = "lij"; arch = "mac"; - sha256 = "470bd5f04da762cf04914613dd6eec4c13c08fa47ad066ab7f078ae4867a2de1"; + sha256 = "a61c7c1e3a4437817a97a82f8892cea11ed3cc2bde412b5a64b0966261d17b0a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lt/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/lt/Firefox%20140.0b5.dmg"; locale = "lt"; arch = "mac"; - sha256 = "47ddaf3acc3f3f19479f59d5fa10493376a53d00543fbbaa9822388ad99740e3"; + sha256 = "41b77702aa68ca11f0a52a4baf60de49f9668f5cb0706802337591acd3406fdc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lv/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/lv/Firefox%20140.0b5.dmg"; locale = "lv"; arch = "mac"; - sha256 = "2bdb8c87690c79515d28433f8a740bef9c6b65cdade4d34d6614bcb37c50b743"; + sha256 = "bebeabd65c432b401191bacda6f939aab6c00e837a3233b369196db16a5f72cc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/mk/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/mk/Firefox%20140.0b5.dmg"; locale = "mk"; arch = "mac"; - sha256 = "eaa7cf469fe18e1af5f2ee1556f91061986bf78a86ba90b6c7b7ccbb65c6b419"; + sha256 = "291213929ba1950abbdcbab35eb59e53aace3a60b3fbe634815c3ce24af22562"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/mr/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/mr/Firefox%20140.0b5.dmg"; locale = "mr"; arch = "mac"; - sha256 = "2732019664cc9a05c401f690ee8b719dceac32d6ed9266d7ba325d9fe52fb85a"; + sha256 = "e03bdf951d82b0962500171f0b232b1d3578f9a84e1eba78b41be19ff232e19b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ms/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ms/Firefox%20140.0b5.dmg"; locale = "ms"; arch = "mac"; - sha256 = "7e91bb6d012fd9536dd78297686a4812dfd9c4f74b6ba2c4c97311d479b76509"; + sha256 = "011d7de785d36d20bb77bb5757399a062abfc1339de5dfb5611a029b3870601d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/my/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/my/Firefox%20140.0b5.dmg"; locale = "my"; arch = "mac"; - sha256 = "83d5c8477be5836b515e0b535c29f7e47a1633ed3464deb57eb882d167d6732a"; + sha256 = "438f8a5a989d17655ad7b71d38aa624659e90cdb6178e7094f1e27057362d104"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nb-NO/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/nb-NO/Firefox%20140.0b5.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "4760c1beef65c7eac0af3722d9f57ab285d7e61c9313683a8c658fbdcc8db359"; + sha256 = "0a964cbb07466468fa9d948c4dd2049f2cd3a5af268c38d27329f0b86ca1b9a2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ne-NP/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ne-NP/Firefox%20140.0b5.dmg"; locale = "ne-NP"; arch = "mac"; - sha256 = "85b109d9732666dccd91e987409f50832cddaf2e26d56adc9a8abb50fb086b33"; + sha256 = "b4f2ecc4062c00c8af8e158f1c0eabc2f3a249b8ce411907cca3f32ed7259e9a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nl/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/nl/Firefox%20140.0b5.dmg"; locale = "nl"; arch = "mac"; - sha256 = "26626d2859d869ad67b8a99f9d0143a307a2998f941b0d8ffbc1b2c10c5d3aec"; + sha256 = "1ba0773d4d0871dc1cef8c43195f0b0a409cd65d60cd52bdfb2be343310ef8dd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nn-NO/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/nn-NO/Firefox%20140.0b5.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "51b8a1f43bc4fbf15a5723094f7f7b328da5a015751ec0691c98d4d2ce9f16ee"; + sha256 = "ec1b194966c8b9131dec53e4886449ebaef57cc5a74b4c07f3f1300be45d89e2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/oc/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/oc/Firefox%20140.0b5.dmg"; locale = "oc"; arch = "mac"; - sha256 = "a5a71e4caf90caa0d06bc4e25e1871165c9ebe8e710fabb2d52090cb823e5ead"; + sha256 = "64db50d7cf8110fb07a52a051f679de87431e20a9e8b9cc7d70216392da864e2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pa-IN/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pa-IN/Firefox%20140.0b5.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "99c12506e095e94890dd10e684d0ca942809a3a37e2650efa72ae87e65e7b45c"; + sha256 = "3aef49944cbcf028418aa2d00728f6234fb097943a92613de7cbd44f1fd00763"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pl/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pl/Firefox%20140.0b5.dmg"; locale = "pl"; arch = "mac"; - sha256 = "212018c48731d2ca8668642d2c050300a41c08d2a7abf5cdaa2b185dd9c3dcec"; + sha256 = "11dcb8d1920b878241e0288d0bf5ab948d4e6715f614538aa37428809c45fe61"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pt-BR/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pt-BR/Firefox%20140.0b5.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "a25b7e77f2d00bbf1d09cf3b70e8117de7a7ca8f561fe4baf15efa699a5c3d52"; + sha256 = "b3be4818299c53c21bdc5f969ef1ef25f63184d3d2f6b64818ed0953b133e48d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pt-PT/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pt-PT/Firefox%20140.0b5.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "e10958a717fa15b696221f011ca5bfe9b6e18d6956ef82fa0ed6bc760cb18ec8"; + sha256 = "00e15c805509c1581807f30824b724886822f0ae3374c7915df02df7cf1b3103"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/rm/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/rm/Firefox%20140.0b5.dmg"; locale = "rm"; arch = "mac"; - sha256 = "8d7639036da625e60f72e51fce640bd2a447059f8fbf6a6b7209cf1d3a74e63f"; + sha256 = "fcec910fe50b4048026300de226efb24102ba3b5f49414e3aeb654a53dd92021"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ro/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ro/Firefox%20140.0b5.dmg"; locale = "ro"; arch = "mac"; - sha256 = "498405a39a28c87cb46f2012b09124e51a3f99e25fe9498c1241594ecbfbf302"; + sha256 = "190cec36a92228f5a378f27c06a13318436da437b5ea9aa7e952bae31a874495"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ru/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ru/Firefox%20140.0b5.dmg"; locale = "ru"; arch = "mac"; - sha256 = "29e979cd4639b9bbe6e9e44b79b5173a8f488286382533bb8cb815e4182af549"; + sha256 = "44324c4801ee925644ea48529b303abda5bf1af1b0bafaa05b219bee85dd968e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sat/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sat/Firefox%20140.0b5.dmg"; locale = "sat"; arch = "mac"; - sha256 = "7e8f046e1b7446b15cba2e35a03b978b7308436176babd5ae284e318ee5367ef"; + sha256 = "bd75841f7cc401cbde05c186ed05acb0cc0054def01a93746ef5635544d563d1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sc/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sc/Firefox%20140.0b5.dmg"; locale = "sc"; arch = "mac"; - sha256 = "7ed54fe5b147236c4be842c04a8341bbcfce15d21b457b516c4ae7f5f36aa34c"; + sha256 = "7a33465f018f499feb6d923c78a706d6a7b91a185142cde2888cd7f3c7bc0f91"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sco/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sco/Firefox%20140.0b5.dmg"; locale = "sco"; arch = "mac"; - sha256 = "5d4ee58fda8829d630ed0e6f4db3a45d0d45c26043d7899110939ecb00646a05"; + sha256 = "6b375e9a10242a14962d3a32eacce685024604d1d01b94d34552836ede00dee1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/si/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/si/Firefox%20140.0b5.dmg"; locale = "si"; arch = "mac"; - sha256 = "596172e11688ca78f9fe5da998723cd63f9772262457db36a2f5fddc0ee614f4"; + sha256 = "00d743162f57c98c4d1dfb0d9dad8b054d396b837e904bf08769052efc5bd001"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sk/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sk/Firefox%20140.0b5.dmg"; locale = "sk"; arch = "mac"; - sha256 = "9830062f46a64e15681d39a5432a63cbc3175947df962e90f58d8c97d410e9fa"; + sha256 = "e42ed7d1e3c27e0a0b9eda60cb62f8f80ca6efff1eb5bc760dc54ef332bc7dde"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/skr/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/skr/Firefox%20140.0b5.dmg"; locale = "skr"; arch = "mac"; - sha256 = "99f5c37cf3fb9a2918e760ebbc77e5423903479cc77a869c600320a365e877f1"; + sha256 = "8b8f25f4fca29cc8cdee2dc1b115dd61fbbba2b4e34182a44034237ce837883c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sl/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sl/Firefox%20140.0b5.dmg"; locale = "sl"; arch = "mac"; - sha256 = "1b3a3b8456a571948a6b0c15860b9931d66cc04740f653db136331b8ab0d8cdc"; + sha256 = "33bc92c84f8898cfb651e3dbaa6e44d0d36cf25bcd18590709b6ebce20fe16ea"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/son/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/son/Firefox%20140.0b5.dmg"; locale = "son"; arch = "mac"; - sha256 = "82ecd81aefd3a2e3ad39fa20bb733f4547fc32673e030456e31a28e6329365b4"; + sha256 = "5ec0e3c5e1245ced15371f8004bb49c9347bcbeafec752bd9ec057a6e4fa80fc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sq/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sq/Firefox%20140.0b5.dmg"; locale = "sq"; arch = "mac"; - sha256 = "125a5c6aa708de9b9c709860c2ea74dab9ba51f40f87faff801f7cb217151a29"; + sha256 = "84c9d9c34363870bdfc7f6a6a5416cf5c533d785618c9d098782378c156474ef"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sr/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sr/Firefox%20140.0b5.dmg"; locale = "sr"; arch = "mac"; - sha256 = "35b4afe46484cb8ca9093d38fc155948474c80538c3b1721ce67eff9518c3993"; + sha256 = "346f1cc1d9c66b339ea555d97965a32ba18e45e4991e08f098cd4ec848a60a87"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sv-SE/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sv-SE/Firefox%20140.0b5.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "d84dfbef368b9b990726e5ee5fc8ad3437696d11747f74f5301d5a52fe2ebb5f"; + sha256 = "54284aed0d3dfd716c0a709a5407b5a4de149da36e28d22dccd744f5a1386f3b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/szl/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/szl/Firefox%20140.0b5.dmg"; locale = "szl"; arch = "mac"; - sha256 = "74a2a1162ce5703807114d2c3a727db10d74367f22a97866b084e23293ea116d"; + sha256 = "2f8c6f6a7b4ff6a4ae10cc8e613077ed44ed20686f4d774fd7b98902e9259c33"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ta/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ta/Firefox%20140.0b5.dmg"; locale = "ta"; arch = "mac"; - sha256 = "fbe97f24739b24899b666a04b6e5513a1b03358bdf9d3622947da78013d39b80"; + sha256 = "f9e32144bbb38db0e22affc83e57413dfbe95ae0227421a9957a28a4d5bd2ca2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/te/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/te/Firefox%20140.0b5.dmg"; locale = "te"; arch = "mac"; - sha256 = "66516cc17b46140a59e08dec29b65a2c7abc3812279edb25f0f88b94740fae16"; + sha256 = "8617d545a09b95120344c5e60a6e4819189a273a9f5607a781d5922cf83ad023"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tg/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/tg/Firefox%20140.0b5.dmg"; locale = "tg"; arch = "mac"; - sha256 = "27143f96bc4a02a09b2b86d46b4322d1dd76cfea719c65e81f19666baf239210"; + sha256 = "254bf6df96997dc2fe6bbb655bd6f46657d9a213a24829e446658ea9946ba463"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/th/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/th/Firefox%20140.0b5.dmg"; locale = "th"; arch = "mac"; - sha256 = "8179a2e47faaba8943871443550f2d562a1e409c2af660f4adc93d3bf85ee810"; + sha256 = "4cf71048da6a518b6cbeab880ec83d8c25f1ca46768c6f6804ec186964ea11e4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tl/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/tl/Firefox%20140.0b5.dmg"; locale = "tl"; arch = "mac"; - sha256 = "11a536ccb269258bfdf6810d86135cb8d5802071eb659886a2aff7e63ba2f5f1"; + sha256 = "04b080f4db8874455ce062da8344a0197224d132ac9e548d1de491a76f27adb3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tr/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/tr/Firefox%20140.0b5.dmg"; locale = "tr"; arch = "mac"; - sha256 = "46f88c04e1e7f2eb41344aae1f7d2ef6f0d49385c8c6a9aacf370a4f32632e6b"; + sha256 = "3d168f13fb87266ff10a1f982cc98f40dbbacf9bead6193c5909941307964182"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/trs/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/trs/Firefox%20140.0b5.dmg"; locale = "trs"; arch = "mac"; - sha256 = "07fd992c396199a92b09c93f7478411b788fb132bd2df4446a38ec6e0cf1960f"; + sha256 = "16eccfd086ee2cffa37bf3851eb9422264276d6fb75eb3b095701f041820456b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/uk/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/uk/Firefox%20140.0b5.dmg"; locale = "uk"; arch = "mac"; - sha256 = "e19dda81f715feaf6011d7f59033df2565db0ec623b7ceccd75538cb3dd7098f"; + sha256 = "c8dc6ff629b92cec90cd81664135988b89cda7e92885b206ffb36be6af97a5cc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ur/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ur/Firefox%20140.0b5.dmg"; locale = "ur"; arch = "mac"; - sha256 = "3fbf0c116482cb641b30db94ecba745df05a419f85eeb0c09180582baf5bb072"; + sha256 = "d55d1df00cb1a89e256088d871f046e2c79b25d4f6c221e55072d8a52551aea2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/uz/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/uz/Firefox%20140.0b5.dmg"; locale = "uz"; arch = "mac"; - sha256 = "0e906f32a4ad896f80bdafc28a4cf86579de2ddb5c19dc7dc5a430f58ba68d2b"; + sha256 = "f97a5bc25b935296e6f41a04e4ed33776f86a95767ccebbe184ac0491cd31f27"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/vi/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/vi/Firefox%20140.0b5.dmg"; locale = "vi"; arch = "mac"; - sha256 = "491126108cebab75a43eeb1fcf8e6a4659960055798488c469b2167956f4d6d4"; + sha256 = "dfd48c9cdfe3aa8291a83c2cb174f098076168d76340e1c787cb1a2f6254c330"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/xh/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/xh/Firefox%20140.0b5.dmg"; locale = "xh"; arch = "mac"; - sha256 = "67f143f0d7d62772815a7554e74baff5f5fcbe51a58f1f095ec248ee3971cf97"; + sha256 = "b4dde818b1b2587b9057e96771a205ce691609934ddc4fe3f293a1f4f92598f8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/zh-CN/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/zh-CN/Firefox%20140.0b5.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "cd905f3ceff4c7894aa299562fbf495051760af5b600ff35f0d1ef88fdbe2187"; + sha256 = "c7a7cc8c0f059f44053b712aede9f86e9ebff927dc001dc89e78e844030bdf79"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/zh-TW/Firefox%20140.0b4.dmg"; + url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/zh-TW/Firefox%20140.0b5.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "8b50ad669970fa040a3c12156c24903c3b6a885ad7cc886ef7a25507ac27f202"; + sha256 = "728aac576c19521a5cb35e1cf7eb8e82a5055a9dbd4cc31eaa1b0110db10846c"; } ]; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5b73a0df83c4..b639f5767dc8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -36,13 +36,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-XZXyeWSgJ5h+dkxYNqb49BrdlmpbfMIxY7UgP2yAtoI=", + "hash": "sha256-XIBaAzQWuKbLIkjSqBS3hVOtXlZzt9AonSgE+qTmU8Q=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.40.0", + "rev": "v4.41.0", "spdx": "MIT", - "vendorHash": "sha256-T2yIUO8DAuUC5s/bBxgsn99fCjJO1y6TzmPTuhT08FY=" + "vendorHash": "sha256-lzih59OW98HRfl8ENCdGDeocNZjnWvHjNWmd0djPoEM=" }, "akamai": { "hash": "sha256-JALEVzmBVmHtCG4B1jNeNdSWb+SGZWDSZgUQ5voMQPg=", @@ -399,13 +399,13 @@ "vendorHash": "sha256-0axKIqF1t4AW1PPi+fHfsFQLRrjhpsloQIZ9clR+8Gc=" }, "docker": { - "hash": "sha256-sPeX1bupACBSmt8ppyxQKyD+FXIPdCBWn8cnOAvNHwQ=", + "hash": "sha256-A2XFSVWpEZs6vmJb5i9dDqkIIlwoGLgbFxXUnFKgtMo=", "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker", "owner": "kreuzwerker", "repo": "terraform-provider-docker", - "rev": "v3.6.0", + "rev": "v3.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-bQM6bAtTqAzrIqvCnpfxYefiTmTKaJq8okAgOVls5jk=" + "vendorHash": "sha256-duHOqjy8AthXuDX63GO3myJ9TJmV0Ts1a8OsbSOGZWI=" }, "doppler": { "hash": "sha256-TPWHqRpvyk1dtSbQySMOecq0AhN2VlSB+2naPIbvMHI=", @@ -543,13 +543,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-Nz+6l/sJog7Snzady4qQCooBwv6IZ+12RkFZ55Hka9w=", + "hash": "sha256-nKapC8Pcg/HF/xXP8fOzMQV0NSJarAym6TIb+7l0g+c=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v3.25.1", + "rev": "v3.25.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-G5CiuQ0GPsJ7D+wlWQUAktT3DSgb2X7NL66c6U+9APU=" + "vendorHash": "sha256-QTcWJlwE6s4nEPSg6svzIhsJo9p9rk1gQiSr4qSTfns=" }, "gridscale": { "hash": "sha256-Ygt3L/dzwycccQZmuwbcaLHp9FBGNHgU19wSNmY8PzQ=", @@ -687,13 +687,13 @@ "vendorHash": null }, "jetstream": { - "hash": "sha256-N/cKiMwPHo8581PFg06RjgOGpGB02/CCARTIFu9kH3s=", + "hash": "sha256-I9T5PTNiZfCyPnNiqL8yDhJxpLRQpK7ynZmlr682BnY=", "homepage": "https://registry.terraform.io/providers/nats-io/jetstream", "owner": "nats-io", "repo": "terraform-provider-jetstream", - "rev": "v0.2.0", + "rev": "v0.2.1", "spdx": "Apache-2.0", - "vendorHash": "sha256-Dd02Ikt51eh/FBEtswe8Qr6P5tgQFZJTKgO01gxPX3s=" + "vendorHash": "sha256-ctd9V5EXL0c9b4aJ47nfjhqCMTewL55IkjkQ39ShoUk=" }, "kafka": { "hash": "sha256-RZwag424lXwI1GR/kFOcpv+huaYMyG4jcFjkhvA0Nlc=", diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index 52a9e7dd61a6..a5b3be131c47 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -30,18 +30,28 @@ let in rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2025.3"; + version = "2025.6"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; tag = version; fetchSubmodules = true; - hash = "sha256-IpGTqi0gSE2yXXou5fp+CryHfIKx0n3y/V4K2+ZO3k8="; + hash = "sha256-WWJcfnp1v1LhEElJQdLx6Gz+bj7MdgbefD6BQ4nihMs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EJ8yk11H1QB+7CGjJYY5BjBAFTDK4d02/DJOQTVGFho="; + cargoHash = "sha256-r6WogC25hpzw2pHa8RQOhr9SWks9RKKatpVHblfs+Nc="; + + cargoBuildFlags = [ + "-p mullvad-daemon --bin mullvad-daemon" + "-p mullvad-cli --bin mullvad" + "-p mullvad-setup --bin mullvad-setup" + "-p mullvad-problem-report --bin mullvad-problem-report" + "-p mullvad-exclude --bin mullvad-exclude" + "-p tunnel-obfuscation --bin tunnel-obfuscation" + "-p talpid-openvpn-plugin --lib" + ]; checkFlags = [ "--skip=version_check" @@ -79,22 +89,14 @@ rustPlatform.buildRustPackage rec { ''; postFixup = - # Place all binaries in the 'mullvad-' namespace, even though these - # specific binaries aren't used in the lifetime of the program. + # Files necessary for OpenVPN tunnels to work. + lib.optionalString enableOpenvpn '' + mkdir -p $out/share/mullvad + cp dist-assets/ca.crt $out/share/mullvad + ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad + ln -s ${shadowsocks-rust}/bin/sslocal $out/share/mullvad + ln -s $out/lib/libtalpid_openvpn_plugin.so $out/share/mullvad '' - for bin in relay_list translations-converter tunnel-obfuscation; do - mv "$out/bin/$bin" "$out/bin/mullvad-$bin" - done - '' - + - # Files necessary for OpenVPN tunnels to work. - lib.optionalString enableOpenvpn '' - mkdir -p $out/share/mullvad - cp dist-assets/ca.crt $out/share/mullvad - ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad - ln -s ${shadowsocks-rust}/bin/sslocal $out/share/mullvad - ln -s $out/lib/libtalpid_openvpn_plugin.so $out/share/mullvad - '' + # Set the directory where Mullvad will look for its resources by default to # `$out/share`, so that we can avoid putting the files in `$out/bin` -- @@ -121,7 +123,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Mullvad VPN command-line client tools"; homepage = "https://github.com/mullvad/mullvadvpn-app"; - changelog = "https://github.com/mullvad/mullvadvpn-app/blob/2025.2/CHANGELOG.md"; + changelog = "https://github.com/mullvad/mullvadvpn-app/blob/2025.6/CHANGELOG.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ cole-h ]; mainProgram = "mullvad"; diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 6ce5ee7a4eb0..278d92a49a4e 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -72,7 +72,7 @@ callPackage ./generic.nix { ); meta = with lib; { description = "Wolfram Mathematica computational software system"; - homepage = "http://www.wolfram.com/mathematica/"; + homepage = "https://www.wolfram.com/mathematica/"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ diff --git a/pkgs/applications/version-management/bitbucket-server-cli/Gemfile b/pkgs/applications/version-management/bitbucket-server-cli/Gemfile deleted file mode 100644 index 8ed325154711..000000000000 --- a/pkgs/applications/version-management/bitbucket-server-cli/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'https://rubygems.org' -gem 'atlassian-stash' diff --git a/pkgs/applications/version-management/bitbucket-server-cli/Gemfile.lock b/pkgs/applications/version-management/bitbucket-server-cli/Gemfile.lock deleted file mode 100644 index 27a6e2c8dd03..000000000000 --- a/pkgs/applications/version-management/bitbucket-server-cli/Gemfile.lock +++ /dev/null @@ -1,27 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) - atlassian-stash (0.7.0) - commander (~> 4.1.2) - git (>= 1.2.5) - json (>= 1.7.5) - launchy (~> 2.4.2) - commander (4.1.6) - highline (~> 1.6.11) - git (1.3.0) - highline (1.6.21) - json (2.0.2) - launchy (2.4.3) - addressable (~> 2.3) - public_suffix (2.0.5) - -PLATFORMS - ruby - -DEPENDENCIES - atlassian-stash - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/applications/version-management/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/bitbucket-server-cli/default.nix deleted file mode 100644 index ae722fd47f4e..000000000000 --- a/pkgs/applications/version-management/bitbucket-server-cli/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - bundlerEnv, - ruby, - bundlerUpdateScript, -}: - -bundlerEnv rec { - name = "bitbucket-server-cli-${version}"; - - version = (import ./gemset.nix).atlassian-stash.version; - inherit ruby; - gemdir = ./.; - - pname = "atlassian-stash"; - - passthru.updateScript = bundlerUpdateScript "bitbucket-server-cli"; - - meta = with lib; { - description = "Command line interface to interact with BitBucket Server (formerly Atlassian Stash)"; - homepage = "https://bitbucket.org/atlassian/bitbucket-server-cli"; - license = licenses.mit; - maintainers = with maintainers; [ - jgertm - nicknovitski - ]; - mainProgram = "stash"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/version-management/bitbucket-server-cli/gemset.nix b/pkgs/applications/version-management/bitbucket-server-cli/gemset.nix deleted file mode 100644 index 0384c22326e6..000000000000 --- a/pkgs/applications/version-management/bitbucket-server-cli/gemset.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - addressable = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw"; - type = "gem"; - }; - version = "2.5.0"; - }; - atlassian-stash = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1rsf9h5w5wiglwv0fqwp45fq06fxbg68cqkc3bpqvps1i1qm0p6i"; - type = "gem"; - }; - version = "0.7.0"; - }; - commander = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0x9i8hf083wjlgj09nl1p9j8sr5g7amq0fdmxjqs4cxdbg3wpmsb"; - type = "gem"; - }; - version = "4.1.6"; - }; - git = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3"; - type = "gem"; - }; - version = "1.3.0"; - }; - highline = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1"; - type = "gem"; - }; - version = "1.6.21"; - }; - json = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1lhinj9vj7mw59jqid0bjn2hlfcnq02bnvsx9iv81nl2han603s0"; - type = "gem"; - }; - version = "2.0.2"; - }; - launchy = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; - type = "gem"; - }; - version = "2.4.3"; - }; - public_suffix = { - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; - type = "gem"; - }; - version = "2.0.5"; - }; -} diff --git a/pkgs/applications/video/kodi/addons/six/default.nix b/pkgs/applications/video/kodi/addons/six/default.nix index 3a7a7ee500a7..1df3cddcadf9 100644 --- a/pkgs/applications/video/kodi/addons/six/default.nix +++ b/pkgs/applications/video/kodi/addons/six/default.nix @@ -16,8 +16,11 @@ buildKodiAddon rec { sha256 = "sha256-d6BNpnTg6K7NPX3uWp5X0rog33C+B7YoAtLH/CrUYno="; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.six"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.six"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix b/pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix index 9527ed2c651f..a0a3dc97e7cd 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix @@ -18,7 +18,7 @@ let hash = "sha256-VwIL1529CW9MLK4N9jHHddSSZD5RsJ5bWGWqGJ751C0="; }; - sourceRoot = "source/scripts"; + sourceRoot = "${self.src.name}/scripts"; passthru = { updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 0b80ad8186b2..9d776fd67047 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://www.tvdr.de/"; + homepage = "https://www.tvdr.de/"; description = "Video Disc Recorder"; maintainers = [ maintainers.ck3d ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3c9ba2e744cb..b36afd4bdc7f 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -16,7 +16,6 @@ libXcursor, libXfixes, libXmu, - libIDL, SDL2, libcap, libGL, @@ -74,9 +73,9 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - virtualboxVersion = "7.1.8"; + virtualboxVersion = "7.1.10"; virtualboxSubVersion = ""; - virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d"; + virtualboxSha256 = "7d60010a4c9102613554b46f61d17b825c30ee59d8be071e52d8aac664ca9869"; kvmPatchVersion = "20250207"; kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y="; @@ -148,7 +147,6 @@ stdenv.mkDerivation (finalAttrs: { libX11 libXext libXcursor - libIDL libcap glib lvm2 @@ -249,8 +247,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optional enableKvm ( let patchVboxVersion = - # There is no updated patch for 7.1.8 yet, but the older one still applies. - if finalAttrs.virtualboxVersion == "7.1.8" then "7.1.6" else finalAttrs.virtualboxVersion; + # There is no updated patch for 7.1.10 yet, but the older one still applies. + if finalAttrs.virtualboxVersion == "7.1.10" then "7.1.6" else finalAttrs.virtualboxVersion; in fetchpatch { name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch"; @@ -320,7 +318,7 @@ stdenv.mkDerivation (finalAttrs: { ${optionalString (enableKvm) "--with-kvm"} \ ${extraConfigureFlags} \ --disable-kmods - sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ + sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${glib.dev}/lib/pkgconfig@' \ -i AutoConfig.kmk sed -e 's@arch/x86/@@' \ -i Config.kmk diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index a26f3a0cac3f..3d771d975798 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -4,7 +4,7 @@ virtualbox, }: let - virtualboxExtPackVersion = "7.1.8"; + virtualboxExtPackVersion = "7.1.10"; in fetchurl rec { name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack"; @@ -14,7 +14,7 @@ fetchurl rec { # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS let - value = "912586a3a1e9285f9df264f7999e6fffc0b8a42f2e013dd898a86f7ed3975d37"; + value = "e020755711849fa0ee23d3bc47bc90cb0ea595da7dda804499568a0dc2387989"; in assert (builtins.stringLength value) == 64; value; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index 008a41353afe..d78248dbb752 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -5,7 +5,7 @@ }: fetchurl { url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso"; - sha256 = "0001ed19cc389f04723c9b911338559b9b74bea0d24edf794d8d2ce5b5cb14e0"; + sha256 = "59c92f7f5fd7e081211e989f5117fc53ad8d8800ad74a01b21e97bb66fe62972"; meta = { description = "Guest additions ISO for VirtualBox"; longDescription = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 6de71ef33067..3d8cbf6fe5f3 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,9 +12,9 @@ libX11, }: let - virtualboxVersion = "7.1.8"; + virtualboxVersion = "7.1.10"; virtualboxSubVersion = ""; - virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d"; + virtualboxSha256 = "7d60010a4c9102613554b46f61d17b825c30ee59d8be071e52d8aac664ca9869"; virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { inherit virtualboxVersion virtualboxSubVersion virtualboxSha256; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 9d72bfe6ed98..2faf818d24ea 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -149,7 +149,6 @@ rec { xorg.libpciaccess glib - gtk2 bzip2 zlib gdk-pixbuf @@ -218,7 +217,6 @@ rec { speex SDL2_ttf SDL2_mixer - libappindicator-gtk2 libcaca libcanberra libgcrypt diff --git a/pkgs/build-support/fetchurl/boot.nix b/pkgs/build-support/fetchurl/boot.nix index 4aa76094a843..a950b9983329 100644 --- a/pkgs/build-support/fetchurl/boot.nix +++ b/pkgs/build-support/fetchurl/boot.nix @@ -2,7 +2,10 @@ let mirrors = import ./mirrors.nix; in -{ system }: +{ + rewriteURL, + system, +}: { url ? builtins.head urls, @@ -28,7 +31,15 @@ import { # Handle mirror:// URIs. Since currently # supports only one URI, use the first listed mirror. let - m = builtins.match "mirror://([a-z]+)/(.*)" url; + url_ = + let + u = rewriteURL url; + in + if builtins.isString u then + u + else + throw "rewriteURL deleted the only URL passed to fetchurlBoot (was ${url})"; + m = builtins.match "mirror://([a-z]+)/(.*)" url_; in - if m == null then url else builtins.head (mirrors.${builtins.elemAt m 0}) + (builtins.elemAt m 1); + if m == null then url_ else builtins.head (mirrors.${builtins.elemAt m 0}) + (builtins.elemAt m 1); } diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index c0e53ba637a7..f948b9ee88aa 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -6,6 +6,7 @@ stdenvNoCC, curl, # Note that `curl' may be `null', in case of the native stdenvNoCC. cacert ? null, + rewriteURL, }: let @@ -122,7 +123,7 @@ in }@args: let - urls_ = + preRewriteUrls = if urls != [ ] && url == "" then ( if lib.isList urls then urls else throw "`urls` is not a list: ${lib.generators.toPretty { } urls}" @@ -137,6 +138,12 @@ let else throw "fetchurl requires either `url` or `urls` to be set: ${lib.generators.toPretty { } args}"; + urls_ = + let + u = lib.lists.filter (url: lib.isString url) (map rewriteURL preRewriteUrls); + in + if u == [ ] then throw "urls is empty after rewriteURL (was ${toString preRewriteUrls})" else u; + hash_ = if with lib.lists; diff --git a/pkgs/by-name/_0/_0xpropo/package.nix b/pkgs/by-name/_0/_0xpropo/package.nix index 704d8e0fdc05..66840e21f966 100644 --- a/pkgs/by-name/_0/_0xpropo/package.nix +++ b/pkgs/by-name/_0/_0xpropo/package.nix @@ -23,12 +23,12 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Proportional version of the 0xProto font"; homepage = "https://github.com/0xType/0xPropo"; changelog = "https://github.com/0xType/0xPropo/releases/tag/${version}"; - license = licenses.ofl; - maintainers = with maintainers; [ vinnymeller ]; - platforms = platforms.all; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ vinnymeller ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix index 2dfd5476c152..1c9a9675ee5d 100644 --- a/pkgs/by-name/_1/_1oom/package.nix +++ b/pkgs/by-name/_1/_1oom/package.nix @@ -6,36 +6,34 @@ autoreconfHook, allegro, libsamplerate, - libGLU, libX11, - libXext, - SDL, - SDL_mixer, SDL2, SDL2_mixer, readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "1oom"; - version = "1.11.2"; + version = "1.11.6"; src = fetchFromGitHub { owner = "1oom-fork"; repo = "1oom"; - tag = "v${version}"; - hash = "sha256-xvVl/XzOnItIvW0T3RpQ4tswqANHGWFvwnoY0+uHhx8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-w67BjS5CrQviMXOeKNWGR1SzDeJHZrIpY7FDGt86CPA="; }; - nativeBuildInputs = [ autoreconfHook ]; + strictDeps = true; + enableParallelBuilding = true; + + nativeBuildInputs = [ + autoreconfHook + SDL2 + ]; buildInputs = [ allegro libsamplerate - libGLU libX11 - libXext - SDL - SDL_mixer SDL2 SDL2_mixer readline @@ -47,19 +45,19 @@ stdenv.mkDerivation rec { ]; postInstall = '' - install -d $doc/share/doc/${pname} - install -t $doc/share/doc/${pname} \ + install -d $doc/share/doc/1oom + install -t $doc/share/doc/1oom \ HACKING NEWS PHILOSOPHY README.md doc/*.txt ''; - passthru.updateScript = gitUpdater { rev-prefix = "f"; }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = with lib; { + meta = { homepage = "https://github.com/1oom-fork/1oom"; - changelog = "https://github.com/1oom-fork/1oom/releases/tag/v${version}"; + changelog = "https://github.com/1oom-fork/1oom/releases/tag/v${finalAttrs.version}"; description = "Master of Orion (1993) game engine recreation; a more updated fork"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = [ ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ marcin-serwin ]; }; -} +}) diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix index dc3fc2e45384..59bddcc473a5 100644 --- a/pkgs/by-name/_2/_2ship2harkinian/package.nix +++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix @@ -199,7 +199,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/HarbourMasters/2ship2harkinian"; - description = "A PC port of Majora's Mask with modern controls, widescreen, high-resolution, and more"; + description = "PC port of Majora's Mask with modern controls, widescreen, high-resolution, and more"; mainProgram = "2s2h"; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ qubitnano ]; diff --git a/pkgs/by-name/_3/_3270font/package.nix b/pkgs/by-name/_3/_3270font/package.nix index 3df18ecf8743..bfa7ee538508 100644 --- a/pkgs/by-name/_3/_3270font/package.nix +++ b/pkgs/by-name/_3/_3270font/package.nix @@ -29,15 +29,15 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Monospaced font based on IBM 3270 terminals"; homepage = "https://github.com/rbanffy/3270font"; changelog = "https://github.com/rbanffy/3270font/blob/v${version}/CHANGELOG.md"; license = [ - licenses.bsd3 - licenses.ofl + lib.licenses.bsd3 + lib.licenses.ofl ]; - maintainers = [ ]; - platforms = platforms.all; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/_6/_6tunnel/package.nix b/pkgs/by-name/_6/_6tunnel/package.nix index b0f025ea297c..d852dcb47a94 100644 --- a/pkgs/by-name/_6/_6tunnel/package.nix +++ b/pkgs/by-name/_6/_6tunnel/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with lib; { + meta = { description = "Tunnelling for application that don't speak IPv6"; mainProgram = "6tunnel"; homepage = "https://github.com/wojtekka/6tunnel"; changelog = "https://github.com/wojtekka/6tunnel/blob/${version}/ChangeLog"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ Br1ght0ne ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/a5/a52dec/package.nix b/pkgs/by-name/a5/a52dec/package.nix index c9223b7061fa..ca0987619bcc 100644 --- a/pkgs/by-name/a5/a52dec/package.nix +++ b/pkgs/by-name/a5/a52dec/package.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { # but it's better to disable tests than loose ASLR on i686 doCheck = !stdenv.hostPlatform.isi686; - meta = with lib; { + meta = { description = "ATSC A/52 stream decoder"; homepage = "https://liba52.sourceforge.io/"; changelog = "https://git.adelielinux.org/community/a52dec/-/blob/v${version}/ChangeLog?ref_type=tags"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ wegank ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ wegank ]; mainProgram = "a52dec"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ab/abaddon/package.nix b/pkgs/by-name/ab/abaddon/package.nix index 7df9c694be08..93edf9ca9363 100644 --- a/pkgs/by-name/ab/abaddon/package.nix +++ b/pkgs/by-name/ab/abaddon/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A discord client reimplementation, written in C++"; + description = "Discord client reimplementation, written in C++"; mainProgram = "abaddon"; homepage = "https://github.com/uowuo/abaddon"; license = licenses.gpl3Plus; diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix index 863fcbcc0ae8..84ac993e3ce9 100644 --- a/pkgs/by-name/ad/adios2/package.nix +++ b/pkgs/by-name/ad/adios2/package.nix @@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://adios2.readthedocs.io/en/latest/"; - description = "The Adaptable Input/Output System version 2"; + description = "Adaptable Input/Output System version 2"; license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qbisi ]; diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix index 7511b95242c7..274e21c3af28 100644 --- a/pkgs/by-name/ad/adw-gtk3/package.nix +++ b/pkgs/by-name/ad/adw-gtk3/package.nix @@ -5,40 +5,37 @@ nix-update-script, meson, ninja, - sassc, + dart-sass, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "adw-gtk3"; - version = "5.10"; + version = "6.2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "adw-gtk3"; tag = "v${finalAttrs.version}"; - hash = "sha256-0OZk27b0kujzWtRX5uvelTMivL19g6sNB1IY6BsrO10="; + hash = "sha256-YYaqSEnIYHHkY4L3UhFBkR3DehoB6QADhSGOP/9NKx8="; }; nativeBuildInputs = [ meson ninja - sassc + dart-sass ]; - postPatch = '' - chmod +x gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh - patchShebangs gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh - ''; - - passthru = { - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = { - description = "Theme from libadwaita ported to GTK-3"; + description = "Unofficial GTK 3 port of libadwaita"; homepage = "https://github.com/lassekongo83/adw-gtk3"; license = lib.licenses.lgpl21Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ciferkey ]; + maintainers = with lib.maintainers; [ + ciferkey + Gliczy + normalcea + ]; }; }) diff --git a/pkgs/by-name/ae/aeacus/package.nix b/pkgs/by-name/ae/aeacus/package.nix index b1264a51eb4b..13cee9f292c6 100644 --- a/pkgs/by-name/ae/aeacus/package.nix +++ b/pkgs/by-name/ae/aeacus/package.nix @@ -25,13 +25,13 @@ buildGoModule rec { # Tests require network access doCheck = false; - meta = with lib; { + meta = { description = "Vulnerability remediation scoring system"; homepage = "https://github.com/elysium-suite/aeacus"; changelog = "https://github.com/elysium-suite/aeacus/releases/tag/v${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "aeacus"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch b/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch new file mode 100644 index 000000000000..07bec5bffbd8 --- /dev/null +++ b/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch @@ -0,0 +1,34 @@ +From 2bbe75fe0bc87ab4c1e16c5a18c6200224391629 Mon Sep 17 00:00:00 2001 +From: Nicole Patricia Mazzuca +Date: Fri, 9 May 2025 09:32:21 +0200 +Subject: [PATCH] open: fix opening text/html messages + +This fixes a bug introduced in 93bec0de8ed5ab3d6b1f01026fe2ef20fa154329: +aerc started using `path.Base()`, which returns `"."` on an empty +path, but still checked for `""` two lines later. + +On macOS, the result is that aerc attempts to open the directory: + +``` +open /var/folders/vn/hs0zvdsx3vq6svvry8s1bnym0000gn/T/aerc-4229266673: is a directory +``` + +Signed-off-by: Nicole Patricia Mazzuca +Acked-by: Robin Jarry +--- + commands/msgview/open.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/commands/msgview/open.go b/commands/msgview/open.go +index a6e43cb8da5fd49d2aa562d4c25ee2d597deefc3..7c770d4a90b771e3a18dfcb327f5e9306d5b5fa7 100644 +--- a/commands/msgview/open.go ++++ b/commands/msgview/open.go +@@ -59,7 +59,7 @@ func (o Open) Execute(args []string) error { + } + filename := path.Base(part.FileName()) + var tmpFile *os.File +- if filename == "" { ++ if filename == "." { + extension := "" + if exts, _ := mime.ExtensionsByType(mimeType); len(exts) > 0 { + extension = exts[0] diff --git a/pkgs/by-name/ae/aerc/basename-temp-file.patch b/pkgs/by-name/ae/aerc/basename-temp-file.patch new file mode 100644 index 000000000000..8ca81c21db95 --- /dev/null +++ b/pkgs/by-name/ae/aerc/basename-temp-file.patch @@ -0,0 +1,41 @@ +From 93bec0de8ed5ab3d6b1f01026fe2ef20fa154329 Mon Sep 17 00:00:00 2001 +From: Robin Jarry +Date: Wed, 9 Apr 2025 10:49:24 +0200 +Subject: [PATCH] open: only use part basename for temp file + +When an attachment part has a name such as "/tmp/55208186_AllDocs.pdf", +aerc creates a temp folder and tries to store the file by blindly +concatenating the path as follows: + + /tmp/aerc-3444057757/tmp/55208186_AllDocs.pdf + +And when writing to this path, it gets a "No such file or directory" +error because the intermediate "tmp" subfolder isn't created. + +Reported-by: Erik Colson +Signed-off-by: Robin Jarry +--- + commands/msgview/open.go | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/commands/msgview/open.go b/commands/msgview/open.go +index 4293b7e4892c137a7f3fbbe79245ffb6733b2671..a6e43cb8da5fd49d2aa562d4c25ee2d597deefc3 100644 +--- a/commands/msgview/open.go ++++ b/commands/msgview/open.go +@@ -5,6 +5,7 @@ import ( + "io" + "mime" + "os" ++ "path" + "path/filepath" + + "git.sr.ht/~rjarry/aerc/app" +@@ -56,7 +57,7 @@ func (o Open) Execute(args []string) error { + app.PushError(err.Error()) + return + } +- filename := part.FileName() ++ filename := path.Base(part.FileName()) + var tmpFile *os.File + if filename == "" { + extension := "" diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index b05f3b97c395..906c9a39f7f6 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -33,7 +33,14 @@ buildGoModule (finalAttrs: { python3Packages.wrapPython ]; - patches = [ ./runtime-libexec.patch ]; + patches = [ + ./runtime-libexec.patch + + # TODO remove these with the next release + # they resolve a path injection vulnerability when saving attachments (CVE-2025-49466) + ./basename-temp-file.patch + ./basename-temp-file-fixup.patch + ]; postPatch = '' substituteAllInPlace config/aerc.conf diff --git a/pkgs/by-name/ag/agebox/package.nix b/pkgs/by-name/ag/agebox/package.nix index 5e71b011056a..e664739e82d9 100644 --- a/pkgs/by-name/ag/agebox/package.nix +++ b/pkgs/by-name/ag/agebox/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-X main.Version=${version}" ]; - meta = with lib; { + meta = { homepage = "https://github.com/slok/agebox"; changelog = "https://github.com/slok/agebox/releases/tag/v${version}"; description = "Age based repository file encryption gitops tool"; - license = licenses.asl20; - maintainers = with maintainers; [ lesuisse ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lesuisse ]; mainProgram = "agebox"; }; } diff --git a/pkgs/by-name/ag/agi/package.nix b/pkgs/by-name/ag/agi/package.nix index 7287cd9eba10..2b4f1c180195 100644 --- a/pkgs/by-name/ag/agi/package.nix +++ b/pkgs/by-name/ag/agi/package.nix @@ -68,14 +68,14 @@ stdenvNoCC.mkDerivation rec { ]; }); - meta = with lib; { + meta = { description = "Android GPU Inspector"; homepage = "https://gpuinspector.dev"; changelog = "https://github.com/google/agi/releases/tag/v${version}"; platforms = [ "x86_64-linux" ]; - license = licenses.asl20; - maintainers = with maintainers; [ kashw2 ]; - sourceProvenance = with sourceTypes; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kashw2 ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; diff --git a/pkgs/by-name/ah/aha/package.nix b/pkgs/by-name/ah/aha/package.nix index 279f148e1359..ebbdd7ca7348 100644 --- a/pkgs/by-name/ah/aha/package.nix +++ b/pkgs/by-name/ah/aha/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "ANSI HTML Adapter"; mainProgram = "aha"; longDescription = '' @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/theZiz/aha"; changelog = "https://github.com/theZiz/aha/blob/${version}/CHANGELOG"; - license = with licenses; [ + license = with lib.licenses; [ lgpl2Plus mpl11 ]; - maintainers = with maintainers; [ pSub ]; - platforms = platforms.all; + maintainers = with lib.maintainers; [ pSub ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix index 4e6e75f250aa..82a0f0cb5f57 100644 --- a/pkgs/by-name/ai/air-formatter/package.nix +++ b/pkgs/by-name/ai/air-formatter/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { }; meta = { - description = "An extremely fast R code formatter"; + description = "Extremely fast R code formatter"; homepage = "https://posit-dev.github.io/air"; changelog = "https://github.com/posit-dev/air/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index 1141b6ee14aa..cb57b10a43f0 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -23,6 +23,7 @@ xdg-utils, nix-update-script, + withGraphics ? false, }: let rpathLibs = @@ -44,17 +45,32 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.15.1"; + version = "0.15.1" + lib.optionalString withGraphics "-graphics"; - src = fetchFromGitHub { - owner = "alacritty"; - repo = "alacritty"; - tag = "v${version}"; - hash = "sha256-/yERMNfCFLPb1S17Y9OacVH8UobDIIZDhM2qPzf5Vds="; - }; + src = + # by default we want the official package + if !withGraphics then + fetchFromGitHub { + owner = "alacritty"; + repo = "alacritty"; + tag = "v${version}"; + hash = "sha256-/yERMNfCFLPb1S17Y9OacVH8UobDIIZDhM2qPzf5Vds="; + } + # optionally we want to build the sixels feature fork + else + fetchFromGitHub { + owner = "ayosec"; + repo = "alacritty"; + tag = "v${version}"; + hash = "sha256-n8vO6Q4bzWLaOqg8YhZ+aLOtBBTQ9plKIEJHXq+hhnM="; + }; useFetchCargoVendor = true; - cargoHash = "sha256-uXwefUV1NAKqwwPIWj4Slkx0c5b+RfLR3caTb42fc4M="; + cargoHash = + if !withGraphics then + "sha256-uXwefUV1NAKqwwPIWj4Slkx0c5b+RfLR3caTb42fc4M=" + else + "sha256-UtxZFqU974N+YcHoEHifBjNSyaVuMvuc1clTDgUPuoQ="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index 78b1263c3610..df884863e4f5 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -20,14 +20,14 @@ python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "6.0.5"; + version = "6.1.5"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; tag = version; - hash = "sha256-faxqSUYqf3vRZYeuXAzv+n1inMVwl5KmnndABF77Sus="; + hash = "sha256-4QN88KOCtVFNoqAKpjW/MSvPJFsLoXZixiGN5JNRDvs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/am/amphetype/package.nix b/pkgs/by-name/am/amphetype/package.nix index 26d990224685..053b6153d2b5 100644 --- a/pkgs/by-name/am/amphetype/package.nix +++ b/pkgs/by-name/am/amphetype/package.nix @@ -10,7 +10,7 @@ let pname = "amphetype"; version = "1.0.0"; - description = "An advanced typing practice program"; + description = "Advanced typing practice program"; in python3Packages.buildPythonApplication { inherit pname version; diff --git a/pkgs/by-name/an/animeko/deps.json b/pkgs/by-name/an/animeko/deps.json index 4e2cb0c59590..1b0b7a189c81 100644 --- a/pkgs/by-name/an/animeko/deps.json +++ b/pkgs/by-name/an/animeko/deps.json @@ -13,7 +13,6 @@ "pom": "sha256-2fkI7m1IgSSs7VVv2Ka6nf5kf+AUuFrXIhRhEQ0DI2E=" }, "androidx/annotation#annotation-jvm/1.8.1": { - "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=", "module": "sha256-yVnjsM3HXBXv4BYF+laqefAz45I44VBji4+r3mqhIaA=", "pom": "sha256-1JIDczqm+uBGw6PeTnlu7TR1lXVUhqZCc5iYRHWXULQ=" }, @@ -57,35 +56,34 @@ "module": "sha256-0kq0tJY72cP4nhwA15eqeV6wK6/HGNzf0mYhH5k/KyM=", "pom": "sha256-0eYk/dD1wygCSsORVHJkScQzfZ5WoFR/sLsW1Dn6FlY=" }, - "androidx/collection#collection-jvm/1.5.0-beta01": { + "androidx/collection#collection-jvm/1.5.0": { "jar": "sha256-cLNZJOS6vN/6N9Dlde4DnFai2XEjNCYkxItgMjNwQ0E=", + "module": "sha256-3eheKSUJIxtUcbsJG1dQmdT0MWHrKB6HOFA4oBYQcuY=", + "pom": "sha256-EcQVhk00AvYdQm5nIQFY3OGwRoBBJSaplPGCPs08s4g=" + }, + "androidx/collection#collection-jvm/1.5.0-beta01": { "module": "sha256-m9Z90440sDcxxzEBAPpp2VYEY7WO82jiTplq39WylHk=", "pom": "sha256-/TNZM8LOdQe4YcQsRrKMlLKMFVxsFh69V8vgrcZjE+Q=" }, - "androidx/collection#collection-jvm/1.5.0-beta02": { - "jar": "sha256-cLNZJOS6vN/6N9Dlde4DnFai2XEjNCYkxItgMjNwQ0E=", - "module": "sha256-yWJG1TMsMZqFSrXS9FSuxp7B+OxCE8y9w8Jveoqq4Rg=", - "pom": "sha256-DHhItMroK4NUQVzDv8UOSBU38sDsOHLDdyi2AJNawAw=" - }, "androidx/collection#collection/1.4.5": { "module": "sha256-I34e/Faj4lqOpM7sJlWMKZhEv8U6rQb/P1PKHINeKMg=", "pom": "sha256-DA39zlfaULfpyifTsZv/vjuY8x3cfgPNWEz3eAmns0k=" }, + "androidx/collection#collection/1.5.0": { + "module": "sha256-v+t72E8/fdp71ztnCdSh9h9aN/hDcouuCKBn49+aCu8=", + "pom": "sha256-LWXI0LNtS0+q3ESv+breI9hx1xWe7fKz8C2AKzS3elc=" + }, "androidx/collection#collection/1.5.0-beta01": { "module": "sha256-zTV6fk5naCWsI4CaFLSw0HOExeNoUc58UVC3JnqLbxs=", "pom": "sha256-ZpkVL++tCxICWB6bwx1hXuVwby1ukelKc84D/MZuNHw=" }, - "androidx/collection#collection/1.5.0-beta02": { - "module": "sha256-XRtuakhubfGGt+zxG0YZ9qnNJjWzMoP+7vVCC7jK4lc=", - "pom": "sha256-dYjYKThPGuEmvP8qMD3kIZH43XcHuMyNv/NHNyGhC+A=" - }, - "androidx/databinding#databinding-common/8.6.1": { + "androidx/databinding#databinding-common/8.9.2": { "jar": "sha256-Zsq4JjnawPbCQzRkwJOwdNYIxLuIfsOKm4vErJgSZzI=", - "pom": "sha256-HVKzfmoakn9cRdrzpUt3qvP+ghuVaBfYMgrZeM9HObI=" + "pom": "sha256-73R0N4INYwD/f7BCNPJ9/EOkkxt28cYect0GvXsPrW8=" }, - "androidx/databinding#databinding-compiler-common/8.6.1": { - "jar": "sha256-9ht4WRdSaUuWDV/o+X/eSaL7ORFkf/q9bX1Wkjf8c2I=", - "pom": "sha256-0KpDvv3NKTdFk5QCJ0aw0l0Hq5S4njiMxd51jjbZsxs=" + "androidx/databinding#databinding-compiler-common/8.9.2": { + "jar": "sha256-Gg5WpebKaOJSXYmtDJB84nhjJR5ttLmcwqIlz5WFDAU=", + "pom": "sha256-SiuhKeVFJWnubBpIh2qjnLiohRqbbQ5lyC8NPI0EoBo=" }, "androidx/datastore#datastore-core-jvm/1.1.3": { "jar": "sha256-Niy60fE4dKIsc2ChjrmVylKjYDeboOpa8bHPDfAxmi8=", @@ -133,32 +131,50 @@ "module": "sha256-LX9tVQQimfnE+EeKoJS8QJmjRpAnef8wkf7R38K2L1M=", "pom": "sha256-drUM5mT6RKSxZUIIHgiJkc8xaubnI6pM0BpicZ8aiic=" }, - "androidx/lifecycle#lifecycle-common-jvm/2.9.0-alpha08": { - "jar": "sha256-rLRTlzoTYO0Y2EBYDm+Ncdyr+lJ6oehZvtSE20xTNbE=", - "module": "sha256-9Xd8ppZxVmGZ3jhyrBFGQCR4uHe+k6CWCncnL4Y0dI4=", - "pom": "sha256-UJ/gyGH21JJu5935B3V2mExTRb7B/6tMBAEs5agCgGY=" + "androidx/lifecycle#lifecycle-common-jvm/2.8.5": { + "jar": "sha256-YchzpzJ8lG7AM8MQu5jz+S7qvO3g4aUgCrihiWSDx78=", + "module": "sha256-BWg9kQ3FQdBsTJekmSs+KXGueMK1zDX2vx2OB94Olw4=", + "pom": "sha256-q5cbvWNFWm6QTCC8Ub19oVOMDAglIx5SvDA94KsenuA=" }, - "androidx/lifecycle#lifecycle-common/2.9.0-alpha08": { - "module": "sha256-awUTjQm0RClnOOsshSgBycz8ZB3jUWX8wIZRw9/BlvY=", - "pom": "sha256-gTBpAMV+VZ2TFs75W3MFH2ek74p8vxSjsLTWuN46WX4=" + "androidx/lifecycle#lifecycle-common-jvm/2.9.0-beta01": { + "jar": "sha256-N9ibIQHwdKxsJgkX2rsYVgdkXuIAqjAYx8W95w7c8YQ=", + "module": "sha256-kirziYbvAsOhMw91T/ZSvgJm1DQI5TvUOWtp9xuknyA=", + "pom": "sha256-YCk+UL9I6rsOpBjfzu8CQBJtJR0EARD2FHs+UP1Gpbw=" }, - "androidx/lifecycle#lifecycle-runtime-desktop/2.9.0-alpha08": { - "jar": "sha256-c54I5HdGbNhxhLvRfEkLPrgdBN0X/otowLVJpFnlg+o=", - "module": "sha256-/U2AQwWz+ccQ3pZgTDaaWJzpBWzvPBLXLfCvxgBooCQ=", - "pom": "sha256-/uDg3D+qBrx2tDRs5B5sGGSdgxib5STv7oEbrnlJfOk=" + "androidx/lifecycle#lifecycle-common/2.8.5": { + "module": "sha256-AwuN8Z5JeKwb6WnCopoBv8LMVihPUSY5oK00wi2mxPE=", + "pom": "sha256-KCYLDQ/KghpeL0Ug1DKLt94SYCGz3c1Hgt1WQRLsn2E=" }, - "androidx/lifecycle#lifecycle-runtime/2.9.0-alpha08": { - "module": "sha256-ihhLC+ff0o4yvI11d31N1fezUgOgWY3BEiNJTpvDmE4=", - "pom": "sha256-K1NQSadO4zEFGDp3frk/K8Pc4eZyLVPtU1tzT2qwgLY=" + "androidx/lifecycle#lifecycle-common/2.9.0-beta01": { + "module": "sha256-qga0PKCIqzWdZ5Gk1JGQlGyOSic2WyT7NA0/8YGRsLg=", + "pom": "sha256-RPmLIhBroE0Rk5VcIsnUL5xUj53JN6ako0feStjkt0c=" }, - "androidx/lifecycle#lifecycle-viewmodel-desktop/2.9.0-alpha08": { - "jar": "sha256-XRIKJZL12D4c15kar6/dlGq9d4aM0i52mqmmAn60sjA=", - "module": "sha256-+eIYGqxXK8p0PmLn4PpC11zD/T0OvROUZ2gB8BcBxcs=", - "pom": "sha256-RSaPE7q3ZjmOeYOGRqUY4NwFic6bUlajze30+d7Wais=" + "androidx/lifecycle#lifecycle-runtime-desktop/2.9.0-beta01": { + "jar": "sha256-zdh7lJZK950FTH6iti2JGGVAfTMV2Z+oOoXQm6k4XOs=", + "module": "sha256-AWDUDY2iOTkAGknrwZTyt+Ao7KR+5wkKqfwJMUGYp/U=", + "pom": "sha256-0JT1QYT6YyqFioyicSlPxqbaF4+ICpSk51zPVUx1mh8=" }, - "androidx/lifecycle#lifecycle-viewmodel/2.9.0-alpha08": { - "module": "sha256-xq8B7ZVLEyTGUB6TGRvOuBgPI4kabPhV6LwOcoZ4n7s=", - "pom": "sha256-Id6ZA7OFAESafBIVSnPS9KZUS8A9rKsH9sv61IdDlSg=" + "androidx/lifecycle#lifecycle-runtime/2.9.0-beta01": { + "module": "sha256-O2BoUD9hEgLJXxx1nV+wbUaVxmcnLZpffTeU7q8RBkE=", + "pom": "sha256-BjbpF3E7BXG5NmO9Ju0+9SYv0X6uJP/SMBGbt/U0q5Y=" + }, + "androidx/lifecycle#lifecycle-viewmodel-desktop/2.9.0-beta01": { + "jar": "sha256-PnnbKgO/W0qQ2O0kHxXp4jEdkQ55oVF8XDFCAiKCHmI=", + "module": "sha256-3TV5B8sJeZNkfmQBWojivFLkkMtR5IJmFjtyVF+yhAY=", + "pom": "sha256-yb8bvSW+Ou7xB2KO76QrWjl6k13Fnn+XXC/3oxM8jng=" + }, + "androidx/lifecycle#lifecycle-viewmodel-savedstate-desktop/2.9.0-beta01": { + "jar": "sha256-H5fTzXwqsci5VcD631kpVMatL3rnZnox/j7hF2mXagY=", + "module": "sha256-LlU5G6xEJ9ZiKb5Y+/maP5bvKS4xXXPiQoJjHPGkg+o=", + "pom": "sha256-vuCLJmcQWN5gFwAX3/XgswxUOnZfqwhwjSLlwS+8BMo=" + }, + "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.9.0-beta01": { + "module": "sha256-hJXtyNsN75ECpGeymNFuvdI5uT3MDE2mCR7qNW29brU=", + "pom": "sha256-PAVrjm1zIJqR1Vx3QcRnj/33CvitbGkogUCUjrIib8o=" + }, + "androidx/lifecycle#lifecycle-viewmodel/2.9.0-beta01": { + "module": "sha256-Q8vXSiVzDlkAL2njOJPxF6y93bVDKAml6QHo4kwFc5A=", + "pom": "sha256-UldouzIXu78J0hXqprnFo6sKgWZjAEnhJ3TxYh6+1QQ=" }, "androidx/paging#paging-common-jvm/3.3.6": { "jar": "sha256-m6OQ1JxJCDe+xyT+9mBGVJWnMY3oG2kdRjNOvk2Dqio=", @@ -169,73 +185,73 @@ "module": "sha256-laMPLlShL85R6fLzDMER+rayFuBB29jCbYZinBi1fHY=", "pom": "sha256-QqEut6WreMa24QK2w0SLzhmCfeFj3fwvT6PT9sCjd0A=" }, - "androidx/performance#performance-annotation-jvm/1.0.0-alpha01": { - "jar": "sha256-jQDt0rDtNUMQF6pZlzl+HdFA1FR/VUYs0YoMYsgX6Ec=", - "module": "sha256-lUXtqn9grdo4UabgVusT23S30C7mkk/Ec9cYtcTlSvI=", - "pom": "sha256-OUJQciGu1ry4UH6wtx4t4AbCapD6Pwz1Xvk/c5/OQAQ=" + "androidx/room#androidx.room.gradle.plugin/2.7.1": { + "pom": "sha256-VQn08ZPaGZgSM1HuAUHq85m0iIgcFefRauWMZKUo6l8=" }, - "androidx/performance#performance-annotation/1.0.0-alpha01": { - "module": "sha256-p+/urPLRetxNBttusv/ZkRf/UllUPqjH1vLzbWLawTw=", - "pom": "sha256-2iS/vOWDd2juWR/jxTs3X9GFbeXMYPX9OTDffLANuWM=" - }, - "androidx/room#androidx.room.gradle.plugin/2.7.0": { - "pom": "sha256-jO03tXX2KgGYh6AvgkEd9plwN+69ODbdJRNCh6kjpZw=" - }, - "androidx/room#room-common-jvm/2.7.0": { + "androidx/room#room-common-jvm/2.7.1": { "jar": "sha256-sqALiMi42BDQfsvfkv3/R9t/DqiE7+XDHNp6UmybGuU=", - "module": "sha256-spo0zB4zdf2SApU2qych9SCnOxwAAAc5935I684GnrM=", - "pom": "sha256-jqAbXXin7uVpeXWrXQ71uKrR+VZtyRWxgHhY9rknC+g=" + "module": "sha256-jM7UOynWvF0IWZxT1/R9hK3HV3oRc0m4/epGID2IhHk=", + "pom": "sha256-u8cvVVmRlceXcXKp3fGZ/d5OwxslhQITrCnutUMm4dw=" }, - "androidx/room#room-common/2.7.0": { - "module": "sha256-7HbDv4WtRYn9CMNSIAGv+niXDrd3IQfLXgbvYON6dOs=", - "pom": "sha256-/NHMaEUFNJFmGFvnQAFSeTMc+tb8gbp6Dwqc5bHYvjM=" + "androidx/room#room-common/2.7.1": { + "module": "sha256-VYuFMAMujgA+oIldJ5ISHmdrGp46DDOu5GDQD5J1eNk=", + "pom": "sha256-Fv46v9l2e++3L1HU28+xWAMYpu1z8OMYQCoCP26KFQI=" }, - "androidx/room#room-compiler-processing/2.7.0": { + "androidx/room#room-compiler-processing/2.7.1": { "jar": "sha256-uWCePhQVdZWKAhfe54YQqx5xVwm3XvOD6Fn7lu+wDfA=", - "module": "sha256-r+YNX3hAYJyB8/eNj+iJmkdUfZbSh4S9Don0d3WIM3U=", - "pom": "sha256-re9BpiiLw/dND2YQ/kaZzO8QCpCk85Xbcm6kke6mDRI=" + "module": "sha256-z8zl8HUBhDKr5WCdT/b0B1c+iSdgwnToVpUqVvPy2Ok=", + "pom": "sha256-IPQQ8ZNy2BVuzo7k8hdyEPw1dMTA1wkbXlBGY6uH6zk=" }, - "androidx/room#room-compiler/2.7.0": { + "androidx/room#room-compiler/2.7.1": { "jar": "sha256-2QjokrEGOdKTIOpNZL6hxAPgVYKhY1mFVtXqI+sEsM0=", - "module": "sha256-GdNDFFyug3uwErJLIjLamd/3c/3txYWIpofScOA6HWM=", - "pom": "sha256-I0WACHZFgR4KU5COgKdbp5rRq+SHuAx2LfUAv59sCis=" + "module": "sha256-Q0Sz/PIKLq41DDfhDzHybhQodcbhZLT28NIHkPTo88M=", + "pom": "sha256-RM4J0BIcbgHYt0txvFuv4xT93SZzmBKeapCbby3P3ec=" }, - "androidx/room#room-external-antlr/2.7.0": { + "androidx/room#room-external-antlr/2.7.1": { "jar": "sha256-a/eUv/6N4mOCZQJRG0x98FcDErbMmTEsp/xr2wiAyh4=", - "module": "sha256-MWfDNMTvWzrm9Hz/Xc1gFBGoeZwNkF/go7ajUoxhfSE=", - "pom": "sha256-32NsPDSZkkgDFp8ogHawWP1sDwcFsIdXYvu5K9FtTkA=" + "module": "sha256-t4QQjwQnT3Xuxx+dfcOKDEHxC1sX74/JfMgcFEeFB4M=", + "pom": "sha256-rl3F23kBLamXUURQJ1bU3f3qAm8umTQk9JT6kickIfw=" }, - "androidx/room#room-gradle-plugin/2.7.0": { + "androidx/room#room-gradle-plugin/2.7.1": { "jar": "sha256-WGQDSy8Jp8aqbeKTYYpbO89705g9eSwWZRTeR6hKGo0=", - "module": "sha256-SJ6pyGRF5MjsvLSN6d/pU07e2ssp07IkuDg6+PvfDb4=", - "pom": "sha256-gtTxMUDD52vJq3mo+8RpY24RGCLZL+T+dA3WjZSoYkQ=" + "module": "sha256-leIK2JvhtWRv3fLW4V61lJ0AzMoxOvH2Nt/mh68xoj4=", + "pom": "sha256-PGqFy/xKroEXHosM8L4ynEMnXUV5aka5P1Tt6BKLBRc=" }, - "androidx/room#room-migration-jvm/2.7.0": { + "androidx/room#room-migration-jvm/2.7.1": { "jar": "sha256-jFzsjy1docuf3pYP3SJTu/xr50+aSgPs24LaF2YiMaw=", - "module": "sha256-I8rhKFYmQ1YmBrTgdWsM3JJWSyp7tYQvf9BOsJsQgcA=", - "pom": "sha256-BxT33w6jjXRHmxSpQr/08kYsR8jxixPJZa8VX8+rmic=" + "module": "sha256-HFixuNcIlfhh/ZExlI25r3T7ia22gpQFEjxLC/CWjyQ=", + "pom": "sha256-xvpy82Dlfp3a5HdNs3QcZoazY/21DjXyY8c8ZVAgKdc=" }, - "androidx/room#room-migration/2.7.0": { - "module": "sha256-DE8cr5FSvrgFxHMbHsKc+0kdPlA881uSPR1S1XSmjUg=", - "pom": "sha256-9p246bQJHRqqYz8+kT5YNiBL2n34v3kFZH527U8g2C8=" + "androidx/room#room-migration/2.7.1": { + "module": "sha256-mZtTP3SbkiCaIsyUMkR8IKPPJj/VAfyzoxoCAWohSwA=", + "pom": "sha256-mGi65DJz9Y/GgzxrhmvkTt7VpSGRFFqiGIxABeV0F80=" }, - "androidx/room#room-paging-jvm/2.7.0": { + "androidx/room#room-paging-jvm/2.7.1": { "jar": "sha256-sk4d9SMJ87PYtjte4pRxJKSBwNeRneu9A04eH+2PoTg=", - "module": "sha256-rEo8iiqO6QHutUnCYUydLpFEqb4MBDcdYn3ENOv5nek=", - "pom": "sha256-2TdAJljNPTJti6QlulPwX+gQcqZsH+NbKmvXCHth3fA=" + "module": "sha256-HSMuv2r2H+FV6Yo+fdbkTXgmRwiYB0GGOHvrlsaY/hE=", + "pom": "sha256-u28aknn8NEaXKJL6/rV+i11nw9hsFbhCfEGd6l8t5ZQ=" }, - "androidx/room#room-paging/2.7.0": { - "module": "sha256-rtb2GsbL168Mo1ojygUDCrc9S04ezPXWrp03gLHRkf0=", - "pom": "sha256-G7J547FpfmE4KmYFc34hvstU0xDHClTpuPaqd0ZkhQ0=" + "androidx/room#room-paging/2.7.1": { + "module": "sha256-dwHhMiNJjty0jIZ9SksJ0MzVARbv4g8OIapIxLRQn20=", + "pom": "sha256-18mRHcU5+4Ot0Z/u7EaPs4F8qtvnwnxSbnHItGY/xb4=" }, - "androidx/room#room-runtime-jvm/2.7.0": { - "jar": "sha256-REhdvgDmROk7ZMVw7zuAhOJqJezyPTBUcglZlN0SOCw=", - "module": "sha256-nEzKxPSjcjzMYYFO6b33cDuWDXx9QFbLIkI0TZhqnVc=", - "pom": "sha256-inWvKB1RJ5Er9JyRUbHG8V/HhI8+kvO4U2Q9/itqJKY=" + "androidx/room#room-runtime-jvm/2.7.1": { + "jar": "sha256-y9E2e9/UC8Gauq5kjIoAu2pK/d4GMFa0uoK6F4g3r88=", + "module": "sha256-qh6r3l9Y25ZFggqcPXWhSV+B1XaEJfm9L3upeV3+BBI=", + "pom": "sha256-7lg8DP2n9J7QGed4pcViPUGRfra5tTZaCTIqPkkTlo0=" }, - "androidx/room#room-runtime/2.7.0": { - "module": "sha256-hFvOPtZrDS3j59zXLIWeCw7+KV7+DStX6f4ptheteWQ=", - "pom": "sha256-n/HDkKw80IGMI6ARZ2ubg+Pi3b0bZKRXYfBdABPxGvA=" + "androidx/room#room-runtime/2.7.1": { + "module": "sha256-t22KSPR2jqefWMhPLgIFjGzsgYFTjujHcswd7zpwWzA=", + "pom": "sha256-O/BknKjAsoPd3Z4glG8Cr8IZWoUkW31AdCC3ADhztrE=" + }, + "androidx/savedstate#savedstate-desktop/1.3.0-beta01": { + "jar": "sha256-5420fy2C4PnfkNyagjo3Y2hKS4dpsw18U2Wtz1w36I8=", + "module": "sha256-XLg7G6NxNU+NSGiSNRsYbbDcQ1DoEVnMmT0OO3YrfMI=", + "pom": "sha256-c9NNJVYsYyHaYBcVizfLwQGM3KQi/cT4SrnfwWt5OeU=" + }, + "androidx/savedstate#savedstate/1.3.0-beta01": { + "module": "sha256-cSXarKYzWh7ecm8TpMkpqTdKar88PLgUMk3/kBomPuM=", + "pom": "sha256-Ef9nMkmCADvCHHui44422EwMWI1R2wF3VjQvOL5G3gk=" }, "androidx/sqlite#sqlite-bundled-jvm/2.5.0": { "jar": "sha256-vXvOYFl1Dj/2KpKNi7z3y2Jwqu8eI5V6reZXcH4a22M=", @@ -255,120 +271,120 @@ "module": "sha256-NplIHJ/Fh59CvG9fIv/8tuXSP3WGLmbwB+/2MdcWl3k=", "pom": "sha256-rT9uj0qsJCjS/sbcmYdgBKmLeI0EEKj0sWmrV4JtVj8=" }, - "com/android#signflinger/8.6.1": { + "com/android#signflinger/8.9.2": { "jar": "sha256-wdyixoNjTuGilCmPnHF5V4r2qG4IC9xA+WGRW8XIFC8=", - "pom": "sha256-HxZNAt/iuj4BXQLj8kgg3iRlktkX8eAPkaGnaTYa+Z0=" + "pom": "sha256-YDBz00i1K7CgQ9HI9pStLNP6xryJJlciTJ534ZYK3ck=" }, - "com/android#zipflinger/8.6.1": { - "jar": "sha256-gd1IVhilCaMjWSm56xMJHYhEUmYd5s5aRcw4scVVQhw=", - "pom": "sha256-5R3NgXBmVPdF4UHUUxw3lY3xrEfunNdWISvWGndYx0U=" + "com/android#zipflinger/8.9.2": { + "jar": "sha256-uh8yqiVavk2rZlcd2RlTBdMCfyYfn09GWJizDN/9CbM=", + "pom": "sha256-PPYmubFe7pb+fqzI9ZsEFqwKZHzRT2uaC9bAHRH643I=" }, - "com/android/application#com.android.application.gradle.plugin/8.6.1": { - "pom": "sha256-NnATbXn6gs8BrM3gQBObBgLTl+nwo3RVm6lvLtWW2Ws=" + "com/android/application#com.android.application.gradle.plugin/8.9.2": { + "pom": "sha256-0If9g+lc06ETaKo39Me3+Liw/EjNxRyErjZlcWRjAQw=" }, - "com/android/databinding#baseLibrary/8.6.1": { + "com/android/databinding#baseLibrary/8.9.2": { "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=", - "pom": "sha256-Lek/tvpLtdFPC53HpfcM+MJxM7aJ31tHyf5K+ZcC/sI=" + "pom": "sha256-UaC2oKbIY06J9g11nEhTmIQPGP0fh5Jz3MGgUr/AsQo=" }, - "com/android/library#com.android.library.gradle.plugin/8.6.1": { - "pom": "sha256-bfpZ48HmjapL4RvLUNueWbh1ikieqUa38d3FscST17o=" + "com/android/library#com.android.library.gradle.plugin/8.9.2": { + "pom": "sha256-Po1T0r5IrxZq4zoD2JUHZqiagK13cHzHNDMUT2M5AdY=" }, - "com/android/tools#annotations/31.6.1": { + "com/android/tools#annotations/31.9.2": { "jar": "sha256-slmV+nsiDTX7uOMl3wcfgpFpG/uv+XNMmOOPRewqc+4=", - "pom": "sha256-IWRj0T6tv+FyrXle/98/hWYWFLvK0xWyIBs4z9h8650=" + "pom": "sha256-onUUfoStHjVjh0Qrt5pp8z6YuyTx2o0y+P5sYb3is0c=" }, - "com/android/tools#common/31.6.1": { - "jar": "sha256-SSGmYQvyjwKRHrfW4bpJjbmIhOXyM+VScmGaCEG9THk=", - "pom": "sha256-bc+djIuiKoCXnRZ3UceVp790AgJ5J+DQAVS2SVQGcY4=" + "com/android/tools#common/31.9.2": { + "jar": "sha256-Krr2/FWQVA3lmHGcRwe/GuBM5/7wsYDEpOc3jOXugyQ=", + "pom": "sha256-pYPoeaqmTv06BsYG+a7/RJcEfby67krwbGTvL+13msg=" }, - "com/android/tools#dvlib/31.6.1": { - "jar": "sha256-XMxJAlggKFBjDFnuy50ppshJuxfxD0ypAX22SfcuSB8=", - "pom": "sha256-za6RmOnCv5LJRoOwCdaq2DENFPYlB+XtUrWPkzaaFdA=" + "com/android/tools#dvlib/31.9.2": { + "jar": "sha256-488/3JR3iN7o1bqnbLcqZlcRdLxHQe3w47q5enypDhs=", + "pom": "sha256-JMVv4BDhcjGTX8gbnp94PahptlXUh4wQhyZ8/C5jHBU=" }, - "com/android/tools#repository/31.6.1": { - "jar": "sha256-FpwueneqMJeIedv4swQ2ZxFlhy/L392mxzWq3bZxA0A=", - "pom": "sha256-Wy1SZioiTKSQkY2NBO11pwKijjKk3M059fQHjDuAvmc=" + "com/android/tools#repository/31.9.2": { + "jar": "sha256-7nMxExttgNyD6n14+2YAhHMAcz8pZNGIYXCcTSMHXgg=", + "pom": "sha256-sIKbRfpt3NhN33+AKlXCPuLfvSfeOEkF2q7WABn0+Ww=" }, - "com/android/tools#sdk-common/31.6.1": { - "jar": "sha256-rWbuxoXuvi5q5DA+cMifcjF/p9jMKznjb9+oZFoiYP0=", - "pom": "sha256-jGPiQ8FUZMUpy8d0RExbQLCvEBhvI6wLYJxdH5LxU5k=" + "com/android/tools#sdk-common/31.9.2": { + "jar": "sha256-iUOli2esf7GgMh56Uqh8+q7CSNORJTbD1yio3Acf/yQ=", + "pom": "sha256-rF33kRmIa8ypyJOxB01tfS40q79eJ/lLSmRpjsM24Y4=" }, - "com/android/tools#sdklib/31.6.1": { - "jar": "sha256-MaLhQQus1+ikZH45fM+RS2hrMjIpbkIpEo47rZZwbiQ=", - "pom": "sha256-t811xH6Y3EkY4FmdmhQgL2ymw1jQwhRTL7syF2cVBGg=" + "com/android/tools#sdklib/31.9.2": { + "jar": "sha256-7p2BGH2rl5AGQMQeKuMMDrr0Vy3Van1+NER8k9eUwv0=", + "pom": "sha256-thqvhTgkAS5UphseDLVdNpSl94gyPLj0xu2gLAINo3A=" }, - "com/android/tools/analytics-library#crash/31.6.1": { - "jar": "sha256-LFwmQglnZ1wHS8cUCDH+O/9burx/u8CLop/cPq3MlRA=", - "pom": "sha256-NvqCjh3SQRZx/J6x0GEMMnsuvnMEkHDq4TTa/B6Es+Y=" + "com/android/tools/analytics-library#crash/31.9.2": { + "jar": "sha256-zKl6wpoTKb0xCj6DK25X9GIn5QGqUpwApj3yF8XX30E=", + "pom": "sha256-y9YGOtZEHJ+tkwRxs1sMONvx6Q4/6s14r5ssoMep2VY=" }, - "com/android/tools/analytics-library#protos/31.6.1": { - "jar": "sha256-DNE93twi3+NTWkxq3FZNH8OA9pXdH9dM8CEwxRDPtXM=", - "pom": "sha256-+Yz/nvLEIr1Qwd8C/LAqFpUrZSpq5dyxKUTM71DBwLA=" + "com/android/tools/analytics-library#protos/31.9.2": { + "jar": "sha256-3SDU5HyokLfDUvb3PIfCLxTCGAg/Hl662cAT6Lp+SvA=", + "pom": "sha256-lX+kPaYmjfl+W0pfe20R9VWi8cYp4f1fu28YKq7+430=" }, - "com/android/tools/analytics-library#shared/31.6.1": { - "jar": "sha256-GI7Dy4ge1lXfkxHMWHAdyzKZc2UAToqmhUrPtg9uNeE=", - "pom": "sha256-jSxpFb90fFudanGXtCcFXXnMACySZqkOvMLeIyt8F64=" + "com/android/tools/analytics-library#shared/31.9.2": { + "jar": "sha256-ONP9oaxMsPiXSkho2hNhoDz6uTDlLlcp2Zut5AOCRZw=", + "pom": "sha256-RMCeR+YqYU0h3rLdzbVUzck07LR0zi9mwhfu4eo6pSg=" }, - "com/android/tools/analytics-library#tracker/31.6.1": { - "jar": "sha256-fo9FqtqL7accKXbBXxoxbqoA/UqWgyITEc7SvbwCZAg=", - "pom": "sha256-ZG+eNf6Hg+tmaOcON9/3yNQWLu0ZGXzeLKQZXyp32f0=" + "com/android/tools/analytics-library#tracker/31.9.2": { + "jar": "sha256-D8VeTSFfSwIdiBFyrO+CRkBh2WLf67EToFQNxwRZKOU=", + "pom": "sha256-ataFwxA9RS72RDWL5tuN7Rxo6XOAf1Q27nVbqnrFyI0=" }, - "com/android/tools/build#aapt2-proto/8.6.1-11315950": { - "jar": "sha256-95NZqIrRc08kmq3KiGgHshXyYFVUnCLzTc6pojE9FOo=", - "module": "sha256-lJIZIVzqn+pESWzhbsPEczrj8Wp5dT7swK3SSxG8i0M=", - "pom": "sha256-1CRPdNhw+GpIBkVdAW+5IVtIKJH4omliEBG908ttgyU=" + "com/android/tools/build#aapt2-proto/8.9.2-12782657": { + "jar": "sha256-z7r7m17Us65mbPCFldT8tXhP9bLzEtmCyjeLfw5Hva8=", + "module": "sha256-CWtyT8l42WZnqecMu6+VS3+w1UZJ4MmujBbDqE5ZRaI=", + "pom": "sha256-+MizTLAiuLMMs161PV7d8dOLhNQqNWKEy3hTy+zYIZ4=" }, - "com/android/tools/build#aaptcompiler/8.6.1": { - "jar": "sha256-fhn/PUfDvZs5JZbXFSKvckBT7ypf/iazn1sw6B6Ig6E=", - "module": "sha256-0iUxrbUzYh8DC4UMxyzgGBbF4qEcKfEPr0hiFwFLOO0=", - "pom": "sha256-Dt08VAlDjvWKPt31D6OygjTLLLdat/ththA2I3qdhhY=" + "com/android/tools/build#aaptcompiler/8.9.2": { + "jar": "sha256-ILh6uQSK6T/V7rhRVjMzvGEt/JqBm4HGsRaL1gDV4WA=", + "module": "sha256-EOk1LZ5TvpiHfkYLt0jY9i2OXa6dGzPqbYuwp9qw5a0=", + "pom": "sha256-UOP2bTQp0q4aHyKnXPW2vZVCmPFgHHXEtDvS6u1iZqY=" }, - "com/android/tools/build#apksig/8.6.1": { + "com/android/tools/build#apksig/8.9.2": { "jar": "sha256-wHDtE5RinXRkGqCQb2Cy/6Hud+Y2ah+TQ39ZcXsa64k=", - "pom": "sha256-Y2IgqwyxLrjpsO9Y9Hje/wQ6+1rI+pwOfjCIxaNFtzc=" + "pom": "sha256-vtJW6u3CA6srY0zwpIxMnc/x/br5n6hfUfgYrEqN+/M=" }, - "com/android/tools/build#apkzlib/8.6.1": { + "com/android/tools/build#apkzlib/8.9.2": { "jar": "sha256-HBpn1vTxhkJ6wWbrqg3YZ/WV1RRPySUlKwX/udGhVrc=", - "pom": "sha256-+A/Fp631hgvcxti+aqP1Wk+HkwmZGFYN02l6sWjxbTY=" + "pom": "sha256-FesZP5vGCf2/co4u81Sgo0wKBEOSwy6YMNcpA/s5xdw=" }, - "com/android/tools/build#builder-model/8.6.1": { - "jar": "sha256-UW4P83gUFTJoP7OxbLDnFRe/izU4jCeXb6kGhyiahFg=", - "module": "sha256-oeBqW8yyM+dvrU838ONRwEtvnOs+PRiNwMWSaYJBtOo=", - "pom": "sha256-CwbNfNpMYeDszj94IZgV1bdHSb3fVnab/yNFAim9Fa8=" + "com/android/tools/build#builder-model/8.9.2": { + "jar": "sha256-TJ0UyS4ltee/Ikhb+86zD/Fdhf4x/um3727TmhcieZ0=", + "module": "sha256-Q4lzbHT5LI8gt2MdP2ufxrB/4PhkzhXrFNnTS6plftU=", + "pom": "sha256-vXDdwEm3RxsMtfhXf7LdZEi5xuM/zeOdKqF2W/erZRw=" }, - "com/android/tools/build#builder-test-api/8.6.1": { - "jar": "sha256-joChV9NorfAWKfWjBseP7R+x3M7uYcRXla4gfZG9q0w=", - "module": "sha256-dCvKxrVZ0bXunzxiNmtEJXoFDMd/OSUrh1769zww9ks=", - "pom": "sha256-PaWDrQnaoX+K8N90eIrkO7FBfEAqAKELcjEbsIEWs58=" + "com/android/tools/build#builder-test-api/8.9.2": { + "jar": "sha256-zIsDponVnA3MmYxRauZicM86V3f0QdcbjFJyxyCQc2M=", + "module": "sha256-Fi6Q4O3VBMMozoCNOV1S2ClmEsxNvmqP2kaYoul7JFI=", + "pom": "sha256-chAmm1dmJm9eCxwdPFrszeddDT/vZGki4feYnusfjvM=" }, - "com/android/tools/build#builder/8.6.1": { - "jar": "sha256-vE7pSfTulTgcg1SH67axlkiJ1hBLAyOXln2ItPIG5I0=", - "module": "sha256-RYhYJQ9RO//baGrO0ACo2s3vkSvQkXlbQF13TpuZSfo=", - "pom": "sha256-Q5TYmYx2pslZaYSNasSzBOaunYwdy6dJ+wuiODezZFQ=" + "com/android/tools/build#builder/8.9.2": { + "jar": "sha256-fcHTbRLugTAMWxZyqq4zbRw8/pCnsmsrVROJYEFQ5Ts=", + "module": "sha256-scTasNhSK8A0SjE+s1xq8WTjGsjDyP1H8AvezL/8Lq4=", + "pom": "sha256-fGit2zzfoN0kcpa1sM29GvD9PqtXdahpl3aEXUk9Ssg=" }, - "com/android/tools/build#bundletool/1.16.0": { - "jar": "sha256-HqK/UnS7rHo7tWGFIdL6EfsE6QDjOopkYCnsYzL8CMg=", - "pom": "sha256-8uiq1EVaQjckYtXhiiaXPWdXEXmmdX84JfIn6Rry8ts=" + "com/android/tools/build#bundletool/1.17.2": { + "jar": "sha256-FmhVy4HhDyMoopMQBvSAH0Itj03l1xfsD38W/CBJoIk=", + "pom": "sha256-80LQa1GA5uq6B2oqGKjn/Waum18EiWSvtu9CoCP6N1I=" }, - "com/android/tools/build#gradle-api/8.6.1": { - "jar": "sha256-B/dr8vj3svN2zIbqvU+KgnkYK2Vw9EDnhD0GbwLF9VY=", - "module": "sha256-KZXYqt4hXuoOQg5PM9v2RKC4pHxkaT5AfCzFdFra7LM=", - "pom": "sha256-GdPcq6tb3TEhEcywDXVL8U0rtG+5xe34fuEor8awjuY=" + "com/android/tools/build#gradle-api/8.9.2": { + "jar": "sha256-tjYiEQ8jmwLJFVoyxnqnv3x6/lSVfvLJYeOjJ3xNso8=", + "module": "sha256-im+ZKdf1J1f8KP89GXNZ8zn5F8wY0rFehzCzc0C3M54=", + "pom": "sha256-ZPReltmRGhJLeaUYErLVS0L8PYTS4+JikmVBpxjygTI=" }, - "com/android/tools/build#gradle-settings-api/8.6.1": { - "jar": "sha256-fKfb0L6RIEeJkOJfuDzwg6P8ebypZE4kfMVUY1jOKYI=", - "module": "sha256-qzNDgysjM4ATShFTOlRaKo+3GLboSDxtkmMEETNZB74=", - "pom": "sha256-NOp/ZQ+mdHYwCvsxWAIFF4fOfztRDY082faDycpqc8I=" + "com/android/tools/build#gradle-settings-api/8.9.2": { + "jar": "sha256-qUVLXR2xngBJB6FtJsCCt39XfK3Dyof9PkP2g0tngqU=", + "module": "sha256-0OHNJ4mu+7ee3amVXnrm3bMcBHEIdPlidGpRbk5kv2s=", + "pom": "sha256-a4JTPPiCxXGWT53cN4b9Lid3ZDF13zTeayOvPwhMzlM=" }, - "com/android/tools/build#gradle/8.6.1": { - "jar": "sha256-lpdzOiFfLtQuWy/EBTSE7IMuqylYTrztlNkskQkAUcE=", - "module": "sha256-KYi7+h3QeXxNVkLISB5RMAMNuTKahKacPoVKmpmUBQU=", - "pom": "sha256-N4nZdy0Ai/FRwZ9rgaRCwv/NZUpXq0k/n664frPY0Eg=" + "com/android/tools/build#gradle/8.9.2": { + "jar": "sha256-bDE9JNB6w5PPx9tdY8UCnn0gsnh4HEKy0irfm8x9ujA=", + "module": "sha256-BI8yjPHVbx5S1xvn0BFcXJqQCt1QyTkCnIYnXgvKOLk=", + "pom": "sha256-l3GRhK76k9PF6ClsOYYFMiJ7iAGjTHM3bA2dDbeqVYA=" }, - "com/android/tools/build#manifest-merger/31.6.1": { - "jar": "sha256-qpY9SvRasDHFcHg86ShtIRHusLjDvfROSMqQcUzMt1Q=", - "module": "sha256-WrgUxcYq6ApgHpOLUxOcEPFKicMKVWPFCsRSeHNxsPY=", - "pom": "sha256-yTK9b/FjMsbpwsLtTK/2+/aUBxhTCpByB/t4KV38qLo=" + "com/android/tools/build#manifest-merger/31.9.2": { + "jar": "sha256-ZmN0mzQYIyfBX6XYiPhotGd2XRlzBil4n+3T/4xARJI=", + "module": "sha256-Cd90HLOZJYfhT/DPqU29/XIYneLO9747iYlhj04TUgo=", + "pom": "sha256-kzqfKUVx5T8XTgVqHfO458CthwZIIHKRDwHhebl48yY=" }, "com/android/tools/build/jetifier#jetifier-core/1.0.0-beta10": { "jar": "sha256-Jqu0oTkn2QYhacUEyelP6A6a46T3tauIdasAdTapH14=", @@ -380,61 +396,65 @@ "module": "sha256-NsJVdrGZk982AXBSjMYrckbDd3bWFYFUpnzfj8LVjhM=", "pom": "sha256-M7F/OWmJQEpJF0dIVpvI7fTjmmKkKjXOk9ylwOS6CEI=" }, - "com/android/tools/ddms#ddmlib/31.6.1": { - "jar": "sha256-xXHAIk/j5+ZgcZbZXMMUL9wZ8BPo8VEPaMe0pobFOAk=", - "pom": "sha256-NhGKNIRO8zU7wHiko/RwiEI0KK1q0ejNStAVV6Ka6Ok=" + "com/android/tools/ddms#ddmlib/31.9.2": { + "jar": "sha256-nNyiBuCPvB8B2qGg1k6tKmK4zMWUFWn1GB4n5Kb1+6A=", + "pom": "sha256-ehSXY9SGGg8ZQJxxS54S6xv52CiKtkIMghTs8WAnNzk=" }, - "com/android/tools/layoutlib#layoutlib-api/31.6.1": { - "jar": "sha256-mLrjb/BR4RTdTu9e/6gPvl5VKUT0IzzokhYNos2e6u0=", - "pom": "sha256-7NQxU4aAO6nUO2e4+myS8EkERQHgRdMvQmDZP5yaajA=" + "com/android/tools/layoutlib#layoutlib-api/31.9.2": { + "jar": "sha256-KSMuYAdiW1aegnmNLY9VnYlB7OYw/iduhCzYGOv5Sxc=", + "pom": "sha256-atABzvfVis+rA851PdRal8KGwwdcCf1D39RCXh5m/uQ=" }, - "com/android/tools/lint#lint-model/31.6.1": { - "jar": "sha256-O7YYb3ddznoQY5HiS8w8jScLzN8vVRuSFhxq3AvC7N4=", - "pom": "sha256-1YuNHgi4YrbKf3M/pbGQszNZViI+ZGV9SoxCw1PRVdY=" + "com/android/tools/lint#lint-model/31.9.2": { + "jar": "sha256-/Vx9Zgnqot9h3uIN/tRkByg44G0vsugvQ0qOC5eGM3Q=", + "pom": "sha256-iVi1l72YliYSm40EHp3DXtRI5EnIjAbQXzOjsEhJVH8=" }, - "com/android/tools/lint#lint-typedef-remover/31.6.1": { - "jar": "sha256-W09IUhXKTYbvIxn8OYtfIlHmL1RGvF/Q4AZTZI3d4xg=", - "pom": "sha256-dk7anwlKi4/gldYIdZl6hhwiekbfspnUdJ9ook3e4MM=" + "com/android/tools/lint#lint-typedef-remover/31.9.2": { + "jar": "sha256-Sjujur/Xnm/Ge872R/tOz+r1m0gbEI98LrpNHFxt6o4=", + "pom": "sha256-cIoYgUcGxofG2pG4g5n4uwF1fT456+3onsAbcLjJOCM=" }, - "com/android/tools/utp#android-device-provider-ddmlib-proto/31.6.1": { - "jar": "sha256-2p8/Pa4mVEyQZoVJWEdl1YVKh8Ql0s/ld80002AOoJc=", - "pom": "sha256-eOOwDF+DPBf3rKWULwBsorkVu9lg9k1TSo1AoDm62aI=" + "com/android/tools/utp#android-device-provider-ddmlib-proto/31.9.2": { + "jar": "sha256-BHrs3WbhBhN/d6UsRC8bg9t9boSWiZgAJR8gbH853mU=", + "pom": "sha256-YjaKOSTVNIuMTMsPcWPRJKxNz31PpCJeTlFRi/ziYG0=" }, - "com/android/tools/utp#android-device-provider-gradle-proto/31.6.1": { - "jar": "sha256-rSNCux1vlVY0AKMiST6hwinLk985RPEmG3OZ9xhJQEk=", - "pom": "sha256-da7iacXcaVBY4hK/6bQGXlNPfbVdb+IprrQ62VFU51o=" + "com/android/tools/utp#android-device-provider-gradle-proto/31.9.2": { + "jar": "sha256-ZagpFgS/3h9vdcqFMqOBQ57IH9lY8yeCqwBH+2HZp6E=", + "pom": "sha256-5yyONF6PV/scLXhH8O29O0aLUsaGE9Ullb7XyWyjoEI=" }, - "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.6.1": { - "jar": "sha256-OEUGlN5jKMLEy6aW+cBOzdXOaVI1X2jDoi+VQdHWVG8=", - "pom": "sha256-cP+V6yxSgoI6jJjvssM+5tLyGWS4he9IXxkhF0ODIMY=" + "com/android/tools/utp#android-device-provider-profile-proto/31.9.2": { + "jar": "sha256-PnsJj24+yuMbb3kJw0O07AmqGNion0G/kgd7pLBW9FM=", + "pom": "sha256-Brw2CcYYGzLOmC0HU7Oe25ziGxZZVAspJ5Z842Vadho=" }, - "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.6.1": { - "jar": "sha256-VD62yNcrLtdFH46TnV2AiQVm8UvCa335yDR1BrJY164=", - "pom": "sha256-771HKHgCPhXZzZNlIth03F/Um+MUIScA9rF6BYFxF8E=" + "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.9.2": { + "jar": "sha256-a6fmrCII10wbtfHRRkq6/GpF2HELIEVaLcAq34cmvIM=", + "pom": "sha256-NgKKzEuuabgX/PsJTYQUL8IRWgTK+ZUroUKs5Kx03OI=" }, - "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.6.1": { - "jar": "sha256-77TXAUqqc1UkagfC5DeiIx+yUlQP8bzmhyyI3I2onRI=", - "pom": "sha256-orxwsWG8GzB3crqSXOMlRKR1Of3gSnCbMgiFYKvpvtY=" + "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.9.2": { + "jar": "sha256-RXBdYbIQBuhTPmz4q3lYp95t7KzmjtbAnbit4SFthZw=", + "pom": "sha256-AkcBSZOYuYAd6UznOdyr6bwoRVWGmCnsPYyj9zdl35M=" }, - "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.6.1": { - "jar": "sha256-rt7F7EYn2JjMzfQtgDjbIOukSVdTxT0bCzeHNEkcr18=", - "pom": "sha256-tApCizomm6Ik+1p6DQ0swY5TEgFVDuR1Wx1wR4k6mQs=" + "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.9.2": { + "jar": "sha256-+oZxmj3F3kZffgwCMYRBTCf4/VOjT9VXKJwL9t80AkQ=", + "pom": "sha256-TM43f6I9hQgO9mSaATpgjYVKU5Psj5C2CzGQ0vY0XbA=" }, - "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.6.1": { - "jar": "sha256-kSkCS9jjg1O8o+sm39jjYo4FjVfW6dhFH/w18BZ1HmM=", - "pom": "sha256-OysKImsUosDlrWKdEGL7sppvGVQsXxT+D4mP/wEh5Io=" + "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.9.2": { + "jar": "sha256-pPNKrg+f+gJtv3FRQ23XrlO+y3JiK0DyxHnKyJQ9kxk=", + "pom": "sha256-SikflqCvaRCs1vt3LJLZffVnk3+qW8pNmJSSofS1uUw=" }, - "com/android/tools/utp#android-test-plugin-host-retention-proto/31.6.1": { - "jar": "sha256-PbjtOO9JtpTK6kZq4i47Ns7clVezWJ0OB8DN2DKUWRw=", - "pom": "sha256-ZnblwB6LjiWcJJEqrXEx6rC+D+/kBeUZzs6o4+kBoMg=" + "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.9.2": { + "jar": "sha256-wfbrus2tVZtu/k6qKVYVUrMxVjlfBpzZcD/aCcRi3qY=", + "pom": "sha256-mxv94aFi9Ni9/RWLVUPHDAGp9V8GakPWtaiutlsn0As=" }, - "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.6.1": { - "jar": "sha256-y99xvKYOFMMOeyz0uQ8PCj6ME498rdh0sNnArgguAnQ=", - "pom": "sha256-j1FzWv7i9yDS70ZCGHoppH7u2uTuNVyS/X3R9K526rQ=" + "com/android/tools/utp#android-test-plugin-host-retention-proto/31.9.2": { + "jar": "sha256-CPGvlhFbK9As1LaE4ZT1xcJ2PwHI9Z4BHZrsyz/vGGM=", + "pom": "sha256-vG8p1Uz5KQGatASJx1yygpyNkVgp/uRlgrMpyaE1IsQ=" }, - "com/google/testing/platform#core-proto/0.0.9-alpha02": { - "jar": "sha256-bYqJBndBUPQ6j60IymTiXGBww5vYpvwTslk/KJJC/pU=", - "pom": "sha256-J855WUJ6L/7kjQ/rRRKKPzbMQX7YqCKvoigiyPWliyU=" + "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.9.2": { + "jar": "sha256-1Cm5MS3/oFAzgdHuGxipmb2QHnRWYSsvtIxqXVosr4g=", + "pom": "sha256-YJFSnIGoI/3PHZ8PwWMQxdf37wYGQNdaYHBGduWJN5U=" + }, + "com/google/testing/platform#core-proto/0.0.9-alpha03": { + "jar": "sha256-0AHrDMu/yMueqhk6NY5jcSl0Y5d1ZHvpSasjLCsptAc=", + "pom": "sha256-O7RSgN8d0clrmgFySmFFZrfWDTNFP81SwsdB+ZmcOk4=" } }, "https://plugins.gradle.org/m2": { @@ -595,23 +615,23 @@ "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" }, - "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.1.20-1.0.31": { - "pom": "sha256-lrP34a55nJ9OmB1DIOe/SzsXFWRF1s2MvXXH1/1Cv/s=" + "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.1.21-2.0.1": { + "pom": "sha256-uhlRo9qxiovCyTnXojCw2VO8auNi3VIKR3zfXLFHGOE=" }, - "com/google/devtools/ksp#symbol-processing-api/2.1.20-1.0.31": { - "jar": "sha256-dy+FxyWzgCE9grQ9abQImS/U2sr50zJo4kJpQQ6gl5g=", - "module": "sha256-4GCAUjhnrw8wK83PqhzRT0jXO0EG852X7TvKh6yL8Lk=", - "pom": "sha256-uqoBWau+KpclCzYnONSk6a+seGjjZ5uD4jOeOKVWYHo=" + "com/google/devtools/ksp#symbol-processing-api/2.1.21-2.0.1": { + "jar": "sha256-ayE0FIw7yenPnPI51FAxohzXiZVqIVktGjIx/orjCa8=", + "module": "sha256-FOy0d2qAcehhKYMzGUMTmbKmnm6b/tyymSU4vaymz8A=", + "pom": "sha256-ITlIj5MwvlkbT6pX4bgdH7qDaWi1HwBx8JRJ4+0J8sE=" }, - "com/google/devtools/ksp#symbol-processing-common-deps/2.1.20-1.0.31": { - "jar": "sha256-qiyLzpH11PQt9VjLY6CXZMYHmKIcyvsue2Iwjdzc2TY=", - "module": "sha256-lSn8quFQ0UpsBgHuv2mBUEnzv2asHlnOaO57fU2XnUE=", - "pom": "sha256-eeve5b/kHDHPi1u83bvZftu8JhyYbuv+DeZf1WEQ7q4=" + "com/google/devtools/ksp#symbol-processing-common-deps/2.1.21-2.0.1": { + "jar": "sha256-Ac31K1nT4gaqT6YngdFQWly9mHQ8BbBy+cjLnmqi4AM=", + "module": "sha256-m2jwFBX8A9ZB+C4uSzfemenf30pYX7gltGAbtyyqWUw=", + "pom": "sha256-342+OK5yUR4F6fUuqhYaBU/Q01S1SfVI4AiPL8cp1j0=" }, - "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.1.20-1.0.31": { - "jar": "sha256-2ewkT6M+FXQk8eA2jNAWxKI4adwsUftrk6+aUuxIIVI=", - "module": "sha256-7q8aYoisLJi7sZRlqpfuLHWSSv1dK+/KO3w7hQP+P/w=", - "pom": "sha256-nQnbav/D80/FQo57fXmATVEROP3h0WIeKtEc9mQhXbY=" + "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.1.21-2.0.1": { + "jar": "sha256-nkVMuS/UrcL/6tWaCaiDH+Bmpk3Z5IPaVdjRrzAHGCE=", + "module": "sha256-Ilxdo/6zKViDaPfOQs89ZeXfInXx79tucXTQNv/lZyk=", + "pom": "sha256-werAp7M/MlLNFpH01DQo2PFDUVsisahkBqTFaJOSFjg=" }, "com/google/errorprone#error_prone_annotations/2.21.1": { "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=", @@ -698,13 +718,13 @@ "jar": "sha256-okR19sz+HMek/p404Fzmh7DODG6Mt4Hg7O07GGSCxh4=", "pom": "sha256-N1e360Vz2a4E37ViqPa9WqtKZbiD31RKTzYJTXz+I78=" }, - "io/sentry#sentry-kotlin-multiplatform-gradle-plugin/0.11.0": { - "jar": "sha256-oF79yaoh0yoN/JzCh34jdSMHhBQ1HAhvng6H/WnigfA=", - "module": "sha256-BAVFTRMLVMv0d3rlOiVcJRDpnjGMhw5hwD+xYCxhDGk=", - "pom": "sha256-lsnWBhj/V6ICwjZdCW1tN5C5jhcTTzEMfPySFO/dius=" + "io/sentry#sentry-kotlin-multiplatform-gradle-plugin/0.12.0": { + "jar": "sha256-fNWyQ/wl4q5Yu2Z5949zRNSKFn2bwkPY62K6/gohNfc=", + "module": "sha256-2SanANsKdiFM/8djX4XR4cKignE1dYiR61vaHTRCNLc=", + "pom": "sha256-hMx9AcxMCi+9wW3PuhojMcosp5tvk01+G8FYTR95fCo=" }, - "io/sentry/kotlin/multiplatform/gradle#io.sentry.kotlin.multiplatform.gradle.gradle.plugin/0.11.0": { - "pom": "sha256-Wx8+RUj2DLyVZUVk+Xk+cbuU1STNcmfaPjL5xTFExP4=" + "io/sentry/kotlin/multiplatform/gradle#io.sentry.kotlin.multiplatform.gradle.gradle.plugin/0.12.0": { + "pom": "sha256-dWlEf6xFV/F5LqZfMmDGp/HXhYB66H+rGHOLYjr+nkA=" }, "io/swagger#swagger-annotations/1.6.14": { "jar": "sha256-J22F3CEgy8MLCL40t7rlQYRnymmDgUsNHgcYKeu1xQA=", @@ -992,9 +1012,9 @@ "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.20": { - "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=", - "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.21": { + "jar": "sha256-BrtrNnHUvDunTA4O+rvc1VXMwtTMLvZ80wnFc4yNHlQ=", + "pom": "sha256-U5ag0mBsMOA66ZSnl8b5FoTG47LZ6aRf1pLl6T7sDJM=" }, "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", @@ -1016,9 +1036,9 @@ "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=", "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.20": { - "jar": "sha256-sk9SbQ3++wKWrg9Ks2L51soCV3JcwnMIOprjN+ooJn0=", - "pom": "sha256-wKs06ffQCv3LIv0D5S6PhZpGR9lY4Lh7fQzSY0QWOlo=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.21": { + "jar": "sha256-eEu/b4g00ez2XsUf57RLQW8zBS6CGWKlm55/dOCU9pY=", + "pom": "sha256-QxApK3Qc26Bu6iaC8YU5U4i+OvPLATzIo+gei5NokQA=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": { "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=", @@ -1028,12 +1048,12 @@ "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": { "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20": { - "module": "sha256-AsJsJlASRw1yrc3buCTSOOayieEAzUu/moJ1Cj1Jv8A=", - "pom": "sha256-t02/6klcg6xWRwS6qDmk56W3kRiMj3llbJwZ3XfeLxg=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.21": { + "module": "sha256-q9fHAOmpTF3zzNlek9LuqwwZJkXXB+rZXFzqR+gcwns=", + "pom": "sha256-QG8P2ImjHfVX+txkaouXADreDCRrX7N6YTYZFWMgUfc=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20/gradle85": { - "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.21/gradle85": { + "jar": "sha256-VY+KMrr1qH6WlMi7OVVwqeduCuqrqmg/msH83oujqsw=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": { "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=", @@ -1060,9 +1080,9 @@ "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=", "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.20": { - "module": "sha256-IF4RacYovsBfHVnkTTIJFSiun9U6fjPsVDvO/bEojeY=", - "pom": "sha256-Y5ymx2U+Gp2pXfKjuuJsy3AcA6/VjHl6tr9vJV9kwwE=" + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.21": { + "module": "sha256-avSUrGVuckg0HOukOePWJhFtARfJ+9+Xq+5lcOEaCHc=", + "pom": "sha256-eTmPhH1rfKipak5GOf+iLhaRJIr+tOgQGeEdG9C7IFI=" }, "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": { "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=", @@ -1072,9 +1092,9 @@ "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=", "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0=" }, - "org/jetbrains/kotlin#kotlin-native-utils/2.1.20": { - "jar": "sha256-pyVic6u53yI1kk2A/dNtZ4tFhGfDB2xmhRxCQ3vdPGY=", - "pom": "sha256-1Gec6AsERY5fzL1pteMUvxwMFnmH4EOVRv3+z7U+M0Y=" + "org/jetbrains/kotlin#kotlin-native-utils/2.1.21": { + "jar": "sha256-3ECUhclc04pfMNWHjr6ai/Lm5vJUtv6eRcygmZkF4HA=", + "pom": "sha256-2RW7ZEMRhfvbhlxNKxLmuniqaME0fFnfrieaMqIyhPk=" }, "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21": { "module": "sha256-kJCVCx7oa4b+KWmV2AKG6opPN5+yshjoVvzt0ErS1Hk=", @@ -1083,12 +1103,12 @@ "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21/gradle85": { "jar": "sha256-HSNuNiIzuaJx5QsiOlDI2+rdA1C2OiRkYIJWhS2jaKM=" }, - "org/jetbrains/kotlin#kotlin-serialization/2.1.20": { - "module": "sha256-OMZPybedsk2Y415NutDvDjOxdsKXSTE8c7k6D5bCIgs=", - "pom": "sha256-Ffv0qiQBTCr6vmXjwzrY39LYocR8z5dsBbqKNqGou0I=" + "org/jetbrains/kotlin#kotlin-serialization/2.1.21": { + "module": "sha256-slOwL1BlFSW4AeKUXZr9RVUrRCC/FPzhxQDKX4lHyc8=", + "pom": "sha256-+oVjLbzKF7IlJM0ldKyFsgzE+u5oLIGeWDe+0Sncy4w=" }, - "org/jetbrains/kotlin#kotlin-serialization/2.1.20/gradle85": { - "jar": "sha256-rNawwcN18ocop1LMbI0itREnbFT1DZcb7UM957K9qjI=" + "org/jetbrains/kotlin#kotlin-serialization/2.1.21/gradle85": { + "jar": "sha256-G6Oulwq5Idk694SifQQ4wPjeXTIxqKX8lo7V+INk5d4=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.25": { "jar": "sha256-+1Nz3XYbTpPj9TjF6FO7o4pxFDoYFTbo8ZPtbk7ds7g=", @@ -1107,24 +1127,24 @@ "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo=" }, - "org/jetbrains/kotlin#kotlin-tooling-core/2.1.20": { + "org/jetbrains/kotlin#kotlin-tooling-core/2.1.21": { "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=", - "pom": "sha256-PO8cS3yC7KjMAcMMrt0VSQWeZfL51BYsjJ13+6JBMXY=" + "pom": "sha256-RdzNNvsgz0B28XOMmbzt98rdd3Xti8cWopgr0VzpaDA=" }, "org/jetbrains/kotlin#kotlin-util-io/2.0.21": { "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=", "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA=" }, - "org/jetbrains/kotlin#kotlin-util-io/2.1.20": { - "jar": "sha256-gqOymmEdR85jSuLmxQnN4qhvlLI7hr4whk6z1Lj+jn4=", - "pom": "sha256-eSQnftICC4UQ1F8N0QgREmVoEDAH2D+ZcfwYRmC9hKM=" + "org/jetbrains/kotlin#kotlin-util-io/2.1.21": { + "jar": "sha256-43JJKisFVtYv0Djj7fxFMbVQZUhs4o0E9HBj0rwDDBw=", + "pom": "sha256-XzfSWuJDprEFAHoH18j0Wd4zep84fMiz63VPmNZCoA4=" }, "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": { "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=", "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU=" }, - "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.1.20": { - "pom": "sha256-YjXePQABYjdcj3IvCO2hU/CQ4RoDW0qbi+fqxO8UX+Y=" + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.1.21": { + "pom": "sha256-X5lVwimv4qtP70Bnu1qdZdRHStTwBcqDk481HfSPCTY=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" @@ -1402,26 +1422,32 @@ "jar": "sha256-8d0j+K40qOkTZnI5kerQ1kmdGj6RY85VDCALAtdqhys=", "pom": "sha256-JlupWajhPDoGEz8EtTkWnBAY2v/U0z9TxFOrTLOG9XA=" }, + "com/google/devtools/ksp#symbol-processing-aa-embeddable/2.1.21-2.0.1": { + "jar": "sha256-SpNovAbJIUydH8EqHYQre1d9usBKuvFN53j7V1Gv/CM=", + "pom": "sha256-OtZIlhwvEESzL19qR/Jt8NSucbykDwD1zG12aJU8F8M=" + }, "com/google/devtools/ksp#symbol-processing-api/2.0.10-1.0.24": { "jar": "sha256-3X3eBwvlTeZse91N4ExD+0KeDGK7EypkSM+jNlOvsik=", "module": "sha256-v8OiFHE2oHw5IP2mGeugc8uTgcVlf++xYc/ViZSPmVI=", "pom": "sha256-RSj+eY/v7sCVpz6GHBIG+oJUlqDntlInL0D/yWCBTmI=" }, - "com/google/devtools/ksp#symbol-processing-api/2.1.20-1.0.31": { - "jar": "sha256-dy+FxyWzgCE9grQ9abQImS/U2sr50zJo4kJpQQ6gl5g=", - "module": "sha256-4GCAUjhnrw8wK83PqhzRT0jXO0EG852X7TvKh6yL8Lk=", - "pom": "sha256-uqoBWau+KpclCzYnONSk6a+seGjjZ5uD4jOeOKVWYHo=" + "com/google/devtools/ksp#symbol-processing-api/2.1.21-2.0.1": { + "jar": "sha256-ayE0FIw7yenPnPI51FAxohzXiZVqIVktGjIx/orjCa8=", + "module": "sha256-FOy0d2qAcehhKYMzGUMTmbKmnm6b/tyymSU4vaymz8A=", + "pom": "sha256-ITlIj5MwvlkbT6pX4bgdH7qDaWi1HwBx8JRJ4+0J8sE=" }, - "com/google/devtools/ksp#symbol-processing/2.1.20-1.0.31": { - "jar": "sha256-Ur1VHTVEWTntuCsPTlKCLHVH+Qa8gellmZ5nqSHlQp4=", - "pom": "sha256-hMXtNZ96txDxZjUS7NMqc3khjyaZA05mT9lLc/XJV4E=" + "com/google/devtools/ksp#symbol-processing-common-deps/2.1.21-2.0.1": { + "jar": "sha256-Ac31K1nT4gaqT6YngdFQWly9mHQ8BbBy+cjLnmqi4AM=", + "module": "sha256-m2jwFBX8A9ZB+C4uSzfemenf30pYX7gltGAbtyyqWUw=", + "pom": "sha256-342+OK5yUR4F6fUuqhYaBU/Q01S1SfVI4AiPL8cp1j0=" + }, + "com/google/devtools/ksp#symbol-processing/2.1.21-2.0.1": { + "jar": "sha256-nCAksg9sUsk+NoUfHHcKMg0EEsrqzu83wo1A5uP8KZA=", + "pom": "sha256-Xj39efqTlcfwIhJfrW4QJM7Nqsq/p65ecgAn3+hpHZ0=" }, "com/google/errorprone#error_prone_annotations/2.11.0": { "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" }, - "com/google/errorprone#error_prone_annotations/2.18.0": { - "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw=" - }, "com/google/errorprone#error_prone_annotations/2.26.1": { "jar": "sha256-3iXy2aIVZSm9dl9R2O/fwN+nMB4E77nMdbfxDPXQ4Ps=", "pom": "sha256-rqfpkeLf3LR/X71QhYdTX3gCvLni/C1Ou1C+QbaE2p8=" @@ -1440,9 +1466,6 @@ "com/google/errorprone#error_prone_parent/2.11.0": { "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" }, - "com/google/errorprone#error_prone_parent/2.18.0": { - "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60=" - }, "com/google/errorprone#error_prone_parent/2.26.1": { "pom": "sha256-SmrQDTGwpa3Nmk9gUGXVtEX65KBMv4J+XRrBB34vgU0=" }, @@ -1514,17 +1537,26 @@ "com/google/protobuf#protobuf-bom/3.22.3": { "pom": "sha256-E6Mt+53m/Bw8P3r1Pk1cd/130rR2uuOLdLdYHN7i5lU=" }, + "com/google/protobuf#protobuf-bom/3.24.4": { + "pom": "sha256-BOz9UsUN8Hp1VR+bCeDvMGMO5CN9CRyg7KceW/t4zOU=" + }, "com/google/protobuf#protobuf-java-util/3.22.3": { "jar": "sha256-xhX3aHncXDA+TfW5Smr6OVNAWMdUXbLUg/2V2fY8i/4=", "pom": "sha256-tEcBsGoGSGXsm1YUqT6eKPrdfU38S0YPIcgZ71Pb4tY=" }, "com/google/protobuf#protobuf-java/3.22.3": { - "jar": "sha256-WdOI6motLXaujv/3/U0MYMbw9GTD06ub6OWt0JKXVwg=", "pom": "sha256-GG6nlBUPW0Kup+xgQd83PR2KioMWJPWKVd67YEPscxI=" }, + "com/google/protobuf#protobuf-java/3.24.4": { + "jar": "sha256-5WVVIr4apcwfLwkqoDawRFFX8pSSju3xMyrJOMe2loY=", + "pom": "sha256-OUEiHKZXgZ3evZX+i3QPRwr3q/MEYLE+ocmrefEPq5E=" + }, "com/google/protobuf#protobuf-parent/3.22.3": { "pom": "sha256-OZEz1/b1eTTddsSxjoY0j0JFMhCNr0oByPgguGZfCSk=" }, + "com/google/protobuf#protobuf-parent/3.24.4": { + "pom": "sha256-+37AUFh2/bnseVEKztLR6wTDuM/GkLWJBJdXypgcrbM=" + }, "com/google/truth#truth-parent/1.0.1": { "pom": "sha256-HH/IY4Mu2YCOQ9jBdpH/Fn0xPxETTvx1Yf9R0UIZbX4=" }, @@ -1540,20 +1572,20 @@ "jar": "sha256-dXv+kGGTuLZR553CbNZ9a1XQdwos37A4FZFQT3edSnY=", "pom": "sha256-eEY5mzXHzWQqmzoADD4tYtBOs3pFR7aTPMixi8wvCGs=" }, - "com/guardsquare#proguard-base/7.6.1": { - "jar": "sha256-wmUOZmw0Q3gdxenq7l3ochWT8AvkTp2HzsdhQGNXx3A=", - "module": "sha256-JdmBh6U8Iv9cCQfhdTWgK0Q4Wk3FSISxJ5uhKQg6Zys=", - "pom": "sha256-O3Fie597ZAogi4a7LLfEgUItx6e3izXZny0Y50dSH/0=" + "com/guardsquare#proguard-base/7.7.0": { + "jar": "sha256-Qt/52lNIJaXmlHUjWOAre41dqTm+m50H+Zh0SEkubnk=", + "module": "sha256-mfDPLg56BcGCyaRwa4WU/Xp60uP7EvIs0ScMyphKspM=", + "pom": "sha256-fRxMbEcM4UY59Ls3tn+l+EeffxVn85pETtBHhLS4544=" }, - "com/guardsquare#proguard-core/9.1.7": { - "jar": "sha256-2wb6n2tDu304ZCD4VPQapVoRAj3ja61o4EPDrD8zuNU=", - "module": "sha256-CUllErGoVDVOUdGan6XEEjVKLTlZYczHasOIL5WlTgs=", - "pom": "sha256-m+fvKU0pm6gP/ZzKEa0wl+N+QTcbZGSYElqADUqO0qg=" + "com/guardsquare#proguard-core/9.1.10": { + "jar": "sha256-5v9XISTgrysj0kM8W3JVfx+QXmgMthl5NCy5Fe6TgZg=", + "module": "sha256-ejuRDXtS4yOBDnAaJrxJ/nycq3jxOtW1i43GAeJ84oE=", + "pom": "sha256-m3dB6tjNAZt47jNV6D9ECJy56Xt6EhBdXLWMzgTUoM0=" }, - "com/guardsquare#proguard-gradle/7.6.1": { - "jar": "sha256-ScjoQGfRVpIV8WK59EEiVEIvX4A5eu04C8yyBZeH7xk=", - "module": "sha256-fND7x+oT+8EkO9lAeq2kpBe8HuLXEHcCTcmwn2SsGAc=", - "pom": "sha256-q/PvEB1bM2lv5Ytjm4FzrVAOqQf72Yp4JZV5+s+kkng=" + "com/guardsquare#proguard-gradle/7.7.0": { + "jar": "sha256-DM48bBo11BqFqyWZXB7PUELuwUibNjwM/cjgvNhebUA=", + "module": "sha256-yzzOVMh0LhKMfokR8CU4cnxUtI2QqvxIMPTlyeBMdss=", + "pom": "sha256-TFcJ7uYXjL1kpw5T0Lpp55qim7wB+r7hkHQ8v2qkjgM=" }, "com/intellij#annotations/12.0": { "jar": "sha256-+KsTsUvggP4vYX+Q5VWZdg5KG03u6lxZXfY9DWN17W0=", @@ -1679,9 +1711,6 @@ "com/sun/xml/fastinfoset#fastinfoset-project/1.2.16": { "pom": "sha256-kFgkJa3B9AtBNi2vuVFzkxIlrKpeeWINXmvVL2Rikro=" }, - "commons-codec#commons-codec/1.10": { - "pom": "sha256-vbjbcBLREqbj6o/bfFELMA2Z7/CBnSfd26nEM5fqTPs=" - }, "commons-codec#commons-codec/1.11": { "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" @@ -1690,9 +1719,9 @@ "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" }, - "commons-io#commons-io/2.13.0": { - "jar": "sha256-Zx6qOWiNrC/6pGRbPJmAri0OokceSual2hmc0VriNmY=", - "pom": "sha256-2z/tZMLhd06/1rGnSQN3MrFJuREd1+a5hfCN2lVHBDk=" + "commons-io#commons-io/2.16.1": { + "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", + "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" }, "commons-logging#commons-logging/1.2": { "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", @@ -1786,34 +1815,46 @@ "module": "sha256-qopIGqRvCjIgtHbyjRoKHtsyoMtFmfmTeae1PI5nYfk=", "pom": "sha256-m9MD9XiEXZB17a+NhYhDXjkeNmT/IVefaYUJ2unnElY=" }, - "io/grpc#grpc-api/1.57.0": { - "jar": "sha256-jSw4Qpn4Tuiqf2cPAOfLJrh+IxzzCRR0MHsyt2kQ9xw=", - "pom": "sha256-w/BUp8iGFkfQpVglsKlJ9E/PycZPR5CD2WgTgUxQJhI=" + "io/grpc#grpc-api/1.57.2": { + "jar": "sha256-QrcuZXLAhAVaw84D5u/kM+sF72ILPa9RNqQ1n8csw+E=", + "pom": "sha256-x99FUaZPAoKnZugJUU1COEUKdCkFX5x3GIgdFqMQoCY=" }, - "io/grpc#grpc-context/1.57.0": { - "jar": "sha256-lT/KzYL1MeabduODT1gwutTCKuhBROBY1x3ICnQwJ10=", - "pom": "sha256-qyZOgr+2q4lfYBavizzERJWryB52nDD6WprgrRa+bMY=" + "io/grpc#grpc-context/1.57.2": { + "jar": "sha256-m4rIjZzvKBna/+1729LyJoAjfUgsbGcf4C022j8IzwA=", + "pom": "sha256-iSf3fWOB4kSHaCcIGWpspyg2i4/XzrsQT9kyS2sSSRc=" }, "io/grpc#grpc-core/1.57.0": { - "jar": "sha256-O+5IxzvExbVb7Xm+DkhK3ya6Vr675XmN2/NHFO8eHOo=", "pom": "sha256-gYQEX1eR4Azyzbz16IRq/Uj1z35aTzj7W4MDx7Lv5Vs=" }, + "io/grpc#grpc-core/1.57.2": { + "jar": "sha256-WhAHCr/rSWbsTVgJYdzE5/afqDqyUkL5LBdl77B7hgY=", + "pom": "sha256-CpcgGv4Xh08DX4ol/7lwZ45Jqt8pksfZfG/5+x1dohE=" + }, "io/grpc#grpc-netty/1.57.0": { - "jar": "sha256-gdQ/LU7Rj6NBvYQKNzXxQDpwB0oEbhV+J/Z5tyG0ya0=", "pom": "sha256-7Z3917HtQ1avs8XRQH3ttjTIYC+0EEebSArYwROe4Xs=" }, - "io/grpc#grpc-protobuf-lite/1.57.0": { - "jar": "sha256-LFB8AtmBuEohdj1E4Jr08nmIHdPiW+MID2NhJYYH8Zg=", - "pom": "sha256-sCO+cAiElIn2Uu7/df0P4aqckF9nHTROFtqv3fkhgZ0=" + "io/grpc#grpc-netty/1.57.2": { + "jar": "sha256-mAnUwQyU0R57KUbN61sohL4goJUQKJVE83Vp8CyHeiE=", + "pom": "sha256-ixIWHPKqz785j7Wvw7DXOiGvIGulDD2Pe/T2xLN16/g=" + }, + "io/grpc#grpc-protobuf-lite/1.57.2": { + "jar": "sha256-/EkX3F1BmsgQ+z8nUjwU514f5QNyFU+rKTJCFe5qlVo=", + "pom": "sha256-YHeMHqQHo7oKfw8J3wmegnInjoq8KYIsnPUOGgUvG3U=" }, "io/grpc#grpc-protobuf/1.57.0": { - "jar": "sha256-SfmG1OqxJhD9ukpokPylLV62U1mJFv24Y6Nm1eKO7Pc=", "pom": "sha256-wNy4xn/QHapjJW8Pi2jTcHzrfKhc2qt6PGw/9GDhPdE=" }, + "io/grpc#grpc-protobuf/1.57.2": { + "jar": "sha256-MWMNip6fCKlZhiAV4wpIY5CL42gMOmhvTB8I0v/q9wY=", + "pom": "sha256-xeIpKAIFOXfwRhCxcEhKmh6mrxVBwUSyfRiECsVE+p0=" + }, "io/grpc#grpc-stub/1.57.0": { - "jar": "sha256-bm7hQVOfoU2fpHn39RFgVUREPH4BHnjic8+UaKoYMGA=", "pom": "sha256-bURZSHxiHf8xUQqIgpBjYx6RXS3Md01xkoQYEW5ZqI0=" }, + "io/grpc#grpc-stub/1.57.2": { + "jar": "sha256-hNKvEnGRaPdjdfKv39brUTOoZe26kkTUDmuWjjrd4dM=", + "pom": "sha256-IVnmFKh5R3XrmOLhyFg0q05ZEb4cSnXHFjqZPpyJK6w=" + }, "io/insert-koin#koin-core-jvm/3.5.6": { "jar": "sha256-gjubMViP+QIVwfzq4w36FB0lKOPU5CwoQ+pAyDUr32k=", "module": "sha256-IiurmbCubv5NKYHgt8fLYFRc6AGHTBVZkVBlZgYm6yE=", @@ -2044,19 +2085,19 @@ "module": "sha256-MdgyMyR0zkgVD1uuADNDMZE28zav0QdqKJApMZ4+qXo=", "pom": "sha256-ft7khhbhe2Epfq46gutIOoXlbSVnkpN4qkbzCpUDIto=" }, - "io/sentry#sentry-kotlin-multiplatform-jvm/0.11.0": { - "jar": "sha256-EMJ6bRCkZK7LXZhhvjqlcnl6Cx/nipa87zUg4F4vZ1A=", - "module": "sha256-jf0/tfj/kN+g0T8Yr1K5nwYCY4Q3kMHHSIVNvpYY74Y=", - "pom": "sha256-XCpFSbIjGBj6v/vivnBZ2k2TC5yb+bsfyPG3rh/owz0=" + "io/sentry#sentry-kotlin-multiplatform-jvm/0.12.0": { + "jar": "sha256-O/z/1CG6XIIYrvjz/x+KBMBa3kaTt+8Yc7zWp8wOl8Y=", + "module": "sha256-uqQCJ82hcAuab1EtwgrXBDB7lVnptXtvu24CWL2W1jg=", + "pom": "sha256-/hEp7FMvE2lCHQnAWQtgdU8cUy3ycmFEfyfmxYNmSas=" }, - "io/sentry#sentry-kotlin-multiplatform/0.11.0": { - "module": "sha256-4dzObB02wWfDljIlMAzF9qTVRHotFmHEuFoIF18YpgM=", - "pom": "sha256-9WZj83fjsVpNX5RQeEAzvJxGVzf665CSme6Ohp/LEDU=" + "io/sentry#sentry-kotlin-multiplatform/0.12.0": { + "module": "sha256-N+fdfmhXBDIGLklwjxmDvWN8TOiyW1Gga8V6Tfwguss=", + "pom": "sha256-wkjtJf07NMXNPuk1ELsVVhgCcD+rjBZ+Chn0NBmttko=" }, - "io/sentry#sentry/7.18.1": { - "jar": "sha256-npO59Q7db27VOBDSXewyg6CNnS3TEnwq9JMLsqh5qQM=", - "module": "sha256-bgQgjWchfoLi85Wn4N1t18viJc/iIn/RDwaTjOMsQuw=", - "pom": "sha256-DCOMY/KBAE6hfzTIUhqEETJFWFO4JGnUhj9wLY0wvuA=" + "io/sentry#sentry/8.8.0": { + "jar": "sha256-FP6T2JRlBMFXy+haPC5QY77c7Jvq04TJP3mlFxTC0TI=", + "module": "sha256-upAHAYOH8B8RjPHCy0xgN+FKx1FR2sb7nSfG0akrwZw=", + "pom": "sha256-n5H3T5E9NMhWuml/lZ5cerZa2W7AjW1TY0688Irn4pc=" }, "jakarta/activation#jakarta.activation-api/1.2.1": { "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=", @@ -2153,9 +2194,6 @@ "org/apache#apache/13": { "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" }, - "org/apache#apache/15": { - "pom": "sha256-NsLy+XmsZ7RQwMtIDk6br2tA86aB8iupaSKH0ROa1JQ=" - }, "org/apache#apache/18": { "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" }, @@ -2168,8 +2206,8 @@ "org/apache#apache/27": { "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" }, - "org/apache#apache/29": { - "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" }, "org/apache#apache/33": { "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" @@ -2181,17 +2219,14 @@ "org/apache/commons#commons-parent/34": { "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" }, - "org/apache/commons#commons-parent/35": { - "pom": "sha256-cJihq4M27NTJ3CHLvKyGn4LGb2S4rE95iNQbT8tE5Jo=" - }, "org/apache/commons#commons-parent/42": { "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" }, "org/apache/commons#commons-parent/52": { "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" }, - "org/apache/commons#commons-parent/58": { - "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" }, "org/apache/groovy#groovy-bom/4.0.22": { "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", @@ -2266,17 +2301,17 @@ "jar": "sha256-gI+zFm8+Z9rZgRwzECmrFoEkL9Urc1vD8z8oEWf8xy4=", "pom": "sha256-utAkGAobRpy9lOXy2xKEG8rFRD2VRWB/Zzz95nfB2HI=" }, - "org/bouncycastle#bcpkix-jdk18on/1.77": { - "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=", - "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0=" + "org/bouncycastle#bcpkix-jdk18on/1.79": { + "jar": "sha256-NjmiTd+bpLfroGWbRHcOkeuoFkIYiOVx8oWq3v5TLNY=", + "pom": "sha256-NeSfQTTeKsMmw6UKJXYsu021bzgC+j9zDMhbZTrQmHs=" }, - "org/bouncycastle#bcprov-jdk18on/1.77": { - "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", - "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" + "org/bouncycastle#bcprov-jdk18on/1.79": { + "jar": "sha256-DYHswxJFNrU5vOmqP+liG3+Eyc7jcbY1pbMceLeasdo=", + "pom": "sha256-2PGgaxSddG6dmN5U4veqmy62E/s1ymfYrjls6qxmHuQ=" }, - "org/bouncycastle#bcutil-jdk18on/1.77": { - "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=", - "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug=" + "org/bouncycastle#bcutil-jdk18on/1.79": { + "jar": "sha256-xwuIraWJOMvC8AXUAykFQHi8+hFJ5v/APpJC62qyGDY=", + "pom": "sha256-4kwftM8WBUBaaYjp5NbksuH0OT/HOompRSrmJe4xHQI=" }, "org/checkerframework#checker-compat-qual/2.5.5": { "jar": "sha256-EdE0skXpysxHRRTS1mtbhhj4A5oUZc3FW7wLNOAAi3o=", @@ -2375,84 +2410,91 @@ "module": "sha256-6Q8fmUKy7j76WxfzVB5BKVZaQEmIAA2KM1fOYkXADQY=", "pom": "sha256-IfsRREjUl71+KtFsG8xpYId4BzWlJTKW5b1sV1PQqLs=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-common/2.9.0-alpha04": { - "module": "sha256-aqFPy1x7azOaQkXjSCA2jWL2o4Wahb9eU4e0Vf1VTK0=", - "pom": "sha256-y0+U9WGyH0BMf7zIZeF5+hHKJTf4sZjQ0IRnNrajdnA=" + "org/jetbrains/androidx/lifecycle#lifecycle-common/2.8.4": { + "module": "sha256-o7yb3i/+/IFT1Sr8WAQms4rWV2yuE0a7jIPbzFBvAPQ=", + "pom": "sha256-BjXG8hQBtELWxoStOF6vEfzeJDv7dZbGk62+tZPwobM=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.9.0-alpha04": { - "jar": "sha256-0oShPRDCm4/pPqXDlBPLjXQGUyug8Tdg98XOOq6Xe4Q=", - "module": "sha256-esWuBXS3RpwQThCsq1fLSNIWLv+HqKzXVnssnlboViU=", - "pom": "sha256-uegv/vs3HDMYEeBv/sb9ZXxGU4NJllBoU6tYlfZaXpE=" + "org/jetbrains/androidx/lifecycle#lifecycle-common/2.9.0-beta01": { + "module": "sha256-ZLmuzdwnt+qpRzolk2c1cBBXIl221XogCWuc/eAhlLU=", + "pom": "sha256-uBHnNujra8qzTsj56rfJ7y5OBRja+mYilPuwNXcciOs=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.9.0-alpha04": { - "module": "sha256-zKUN2P4iFsvYiFY9EYeH/MIsJdtDK75DUTVCXEblUhw=", - "pom": "sha256-5Hd36RAmo6FWG6DQRaXA4qAP3U27+vSG6sSV5k4lfHY=" + "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.9.0-beta01": { + "jar": "sha256-Un+IWVJCklMxmsMPiwfrDB6xFhJxUB7hMz/9D63aSFE=", + "module": "sha256-GJbs9dXwXbm/8wBLirLq+eop3Qrq2mrs8068ocnWFtI=", + "pom": "sha256-ZmiocEG8g/WJusRxx80s4j8TL/lwv52WBAq6mQDzr4s=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.9.0-alpha04": { - "module": "sha256-bknNPW5DPJhx0PwTQb6lYTv/qA6zDdl3a1t8zFJHuas=", - "pom": "sha256-IbBAlrekoKrDY3mx/9kntqdMo2p7qnXpVeKDCDGooEo=" + "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.9.0-beta01": { + "module": "sha256-jcpLfTCKtF4FOzjXWyuVHFXXnLrVy1Tnr4IFdJkonhU=", + "pom": "sha256-k8WMxAtltXEj6RRb8Us/qmxpUh6o4+GzWtXVKCvrPVk=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose-desktop/2.9.0-alpha04": { - "jar": "sha256-3f7rkmLQZaY8VAvnMqDmILZ3rHrvLCE6WEViehKSmSE=", - "module": "sha256-GexRNKE1HoJkB7/BdOirRTKG1eeQD116YiGwmDpnb7g=", - "pom": "sha256-48MWNEKfaaHQJ26ICLbpl7QDjCbfXVWTGeMTqe3DYLI=" + "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.8.4": { + "module": "sha256-t/5oq5S4ncDF1wWltk3LDDyDpITimPNfA2x5cRZgHqQ=", + "pom": "sha256-DQ7wsV76yiXtdgT6FB0OjT+6iU0wl511DVBpZrZg0Dk=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose/2.9.0-alpha04": { - "module": "sha256-+9ayBiK9qNkZRCxpdHOYde6oLKsJaLOnPge4W1IGQ1Q=", - "pom": "sha256-fbPEU9dzg315i1FjOYEM8BJVysWTiBWNFgR+c5Be2gs=" + "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.9.0-beta01": { + "module": "sha256-cWwsA/MF++hhSDQ9JohKhimsBFyoIFN/0Z1YPCvzjQs=", + "pom": "sha256-fo5B0Yi/cBXNVb0JAe6dLsR/az7eAVivtzi9tqpdO2c=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-savedstate-desktop/2.9.0-alpha04": { - "jar": "sha256-FvZbSHgaFMaUIlbxNBVMBUBTKqpCF3t3++WbI+jRs9Y=", - "module": "sha256-sNV0hf7suQu9XH6cEl3m4MjMoggyRlZXUvruc0FviWU=", - "pom": "sha256-HwUIvK17WzGQ0hUOFF4uWjNOnngubx7+0xj7ROm6dwQ=" + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose-desktop/2.9.0-beta01": { + "jar": "sha256-vkeGqLdCblmyj1KvZPQ6diQpTVnLFYoM4t6DCxz5w2U=", + "module": "sha256-2bf33ULscIs0ipCZGIJiPPe/KtcdV1M9VD9Qy6z4Un4=", + "pom": "sha256-DAKhJosUOQC7IgGUe8TA+7IyhS0JWIibP85vNaiXLrA=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-savedstate/2.9.0-alpha04": { - "module": "sha256-gKcAIcYGY/cR5VNPT0yjp00OJRlAeBuYhTF2bK4UQzs=", - "pom": "sha256-y/uF18Nt6BJq+dMSSopge12enEwOhoG+TbsYGpIkYTQ=" + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose/2.9.0-beta01": { + "module": "sha256-yhsjvflcvr4hVzAqxK9OU82+C8GlBDrl4QDYKbBU4b4=", + "pom": "sha256-eBfT+NqhT4JXqMeIAvFVBjd0Cabo1NsnjQgXKvusjQ4=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.9.0-alpha04": { - "module": "sha256-CFQVo5KYYbwCv5xCBLcAn3nq0287BA6wYGECflIfyjQ=", - "pom": "sha256-giBGHdXfQbn0Sf4U+c2i9eoSI2gGbsx9HHa+gbNj+Tg=" + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-savedstate/2.9.0-beta01": { + "module": "sha256-Ei5ZUR0skw5pCrgzu0jeiz91FuhtdXzpiWXOhzZQpos=", + "pom": "sha256-BTgUyvfv+6KNCy96AUXNUceYJunaXQt5vd+OQO7SG9I=" }, - "org/jetbrains/androidx/navigation#navigation-common-desktop/2.9.0-alpha14": { - "jar": "sha256-lQvnQVnErCjzcuGoNdn43Na7/PwhRDXZZXYYknvbKWw=", - "module": "sha256-iv67qHpYcLSEfCMAzWy4v9MN1UsyuyYAMDtos6DAcqY=", - "pom": "sha256-5MbcH3rekEXjNnczStuluQxWGjJi5PZoDcPe/E9F1DA=" + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.8.4": { + "module": "sha256-YdkxJsnivTyFp0+XrYFbxhi5A52bFIOz9OXp6Ayc+Bw=", + "pom": "sha256-7VnmgyoqJ4xsYcgDMqFxWJmewWE90Cvir6DZ/PMbvfY=" }, - "org/jetbrains/androidx/navigation#navigation-common/2.9.0-alpha14": { - "module": "sha256-P+Epqwk2Z3VEJoKGM1A+rthoAaK8U3Rkt1zEehv+wzI=", - "pom": "sha256-nTK4Sfn/CvXOS8vbr73cVQQL+xYqQdkRGO7HrOyc8JQ=" + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.9.0-beta01": { + "module": "sha256-oM/i3heZ/iUMbO41knhWaBMeqoEuUGCsNhHnajXveSY=", + "pom": "sha256-lLcArsaFKLT/q+cNW1YprbF30z5jNz5GOnjYXLtxMK4=" }, - "org/jetbrains/androidx/navigation#navigation-compose-desktop/2.9.0-alpha14": { - "jar": "sha256-2fTNWGnlYiKAiO847s/4e1zSUVxXSSA4B/vYO+pTwq0=", - "module": "sha256-XDYB5RxltcvX+zXaQNBYf6Q60lTVaGV/xCZPvmI65Ls=", - "pom": "sha256-RwX+glV/+QAjKDxQ85PncaqNInRtAflZiST+zQz1b3E=" + "org/jetbrains/androidx/navigation#navigation-common-desktop/2.9.0-beta01": { + "jar": "sha256-M6NE+IJwz9Ytz+bRC5qJoANQZYbFMRPrYz1BjCTzw80=", + "module": "sha256-X+daTls+i55kOG0szFMtoI/J5FkL8P3JQdjKQ4URLQw=", + "pom": "sha256-iPweKXKC5wfVzv+1k7KA6rCojzoi2WZI+Dx+vunpJFE=" }, - "org/jetbrains/androidx/navigation#navigation-compose/2.9.0-alpha14": { - "module": "sha256-qcO91XvDZpKz2kv1/bk70d8fstKt3fl3i9+u4gGOSVs=", - "pom": "sha256-mapb841feXzWuyMYMnGi5qzLMVaIP0cNcwREmMsHufw=" + "org/jetbrains/androidx/navigation#navigation-common/2.9.0-beta01": { + "module": "sha256-JDoBviunsq1nl6VJkFcTz82ZNMCWbryalCA+giPGdz4=", + "pom": "sha256-WzOCSOVSKoWZhU5s6lXvz+TYjVQLTZJLEKpJSGJNj8E=" }, - "org/jetbrains/androidx/navigation#navigation-runtime-desktop/2.9.0-alpha14": { - "jar": "sha256-kcV34HYpS8w/d/Uak8aHcTsWHp/UEi4JQ93kL748wY8=", - "module": "sha256-ctyeUp5q13fCG0tGGMFR9xlhxGBXFHLCTiqzc40KzTg=", - "pom": "sha256-rwYCidS9nQbH6aSqZIQ81jvGQJc4R6DGEjtJnuYWVcA=" + "org/jetbrains/androidx/navigation#navigation-compose-desktop/2.9.0-beta01": { + "jar": "sha256-5ZvQ507b/2dzjfBaL3kXVriiaQmnj1S4ZFtYzp5wJk8=", + "module": "sha256-+qRZvNZG42K7i46x5TU3Po2ITmHSP/BKkoO22YqmGPo=", + "pom": "sha256-eVmIq3RgJXNxZQmzZHe224A+qCBtcf/PyieLc39iwGI=" }, - "org/jetbrains/androidx/navigation#navigation-runtime/2.9.0-alpha14": { - "module": "sha256-2UTxuyQaMEQPaM1yLJkSv06Sp36qL44OBuq2dxC+7mA=", - "pom": "sha256-kTzW+l0TI2YOAzxJJwoqOybSBomTbqKu82RMxU5oSmw=" + "org/jetbrains/androidx/navigation#navigation-compose/2.9.0-beta01": { + "module": "sha256-CkQSpwXQnd9xRDhKArbbkC+fci7Et9j/AH3UR1kfYbI=", + "pom": "sha256-RyQ9KSwd00rDTBrqeECqFiSRlOddqcr/7A59oTfv3zw=" }, - "org/jetbrains/androidx/performance#performance-annotation/1.0.0-alpha02": { - "module": "sha256-y892B/wsGu+lmgMT6hWE6gEIdc8Xnnu0TEYPVZnNc+I=", - "pom": "sha256-tFBttAnpLok73PB36S16gG1UTSN/7gb6JIPrjCFdBcM=" + "org/jetbrains/androidx/navigation#navigation-runtime-desktop/2.9.0-beta01": { + "jar": "sha256-GN5zqUv5TtVZjrvmJeB93vbOD9f71piowakS8hQGVDU=", + "module": "sha256-edcCcy0prYG8Zot21OSGBFuqGFkxFMfSw4FU2SImzoc=", + "pom": "sha256-BSpQlfGIeaiC+tUpphjqwEJEf5hyu/ZGfRQNZu+fiow=" }, - "org/jetbrains/androidx/savedstate#savedstate-desktop/1.3.0-alpha04": { - "jar": "sha256-41987aa7a73hycDhjM16ps4bdeNGCfgH6ihIBgrY4bc=", - "module": "sha256-rqMsjfibFAKUunDY5cM6DD4s8DH2IEJjJQ312mzVU0A=", - "pom": "sha256-cYUyHCtb5DXgXMQpVT47ML5BykjpBjpALGaPv9S+iWY=" + "org/jetbrains/androidx/navigation#navigation-runtime/2.9.0-beta01": { + "module": "sha256-Z4Dp9626PvGI68qPOQptNVw9dXChFEm/X8QoX5JwCKc=", + "pom": "sha256-dupghtMADJIHyQjzNvNF24RXU3vFULTSLoAEGp7beg8=" }, - "org/jetbrains/androidx/savedstate#savedstate/1.3.0-alpha04": { - "module": "sha256-i2FTZNeMO3Ki3XPl5dLnqG9H2K1/dP+1TjERVYhN2Eo=", - "pom": "sha256-ncPtVEigP556xWa9fJkp+RdYrNclUtttMuTum55Ox/4=" + "org/jetbrains/androidx/savedstate#savedstate-compose-desktop/1.3.0-beta01": { + "jar": "sha256-zd0rFznOPGXKigQft74f78XDnWvbNXy6Th4Jd7ZNHuE=", + "module": "sha256-kIPisn4nLZItcz1y0S8OMF5rOY4Rfet3xwV2NTUXfyE=", + "pom": "sha256-P5zq2UQ6VpFHvz/iLg3xBBk0kLCH/q3rymtr+OdG95g=" + }, + "org/jetbrains/androidx/savedstate#savedstate-compose/1.3.0-beta01": { + "module": "sha256-kZ23fpxTkmCqzRq4eOsOTfpxSjLsUInkzt9/IrG7TXg=", + "pom": "sha256-ypq0MP7e4nrSX1zhOv8UmAFpxeyTjqjPyE2ls8fU0m0=" + }, + "org/jetbrains/androidx/savedstate#savedstate/1.3.0-beta01": { + "module": "sha256-M9qSImBQ1pVYZUg9UskDPhkxqPe6NuUJBrOjLlT6cG8=", + "pom": "sha256-3Gkal5kYzQqtfztZhD5qDsZXHOG0CdvGkBxqs0gnQrI=" }, "org/jetbrains/androidx/window#window-core-desktop/1.4.0-alpha03": { "jar": "sha256-TxK74lqFammMZ5aUQvQZcu3/qS0QfscnRSqs3FV1tg4=", @@ -2463,99 +2505,132 @@ "module": "sha256-Uv5LQSghWM8m3ufAnN9Wd1i2IDoUk8gs6XTEM7VVdTQ=", "pom": "sha256-KzAGtHCQliab2Q5wp683r5UmmqKs1YMeHG4mwsi+P8Y=" }, - "org/jetbrains/compose#compose-gradle-plugin/1.8.0-alpha04": { - "jar": "sha256-2WBK5Um8q507w3WtQW2ji06xPpYvX5Hb7TIoofXWgxg=", - "module": "sha256-Gth21E1Ko0iLdc4WCDX9MNfJ5zjtIQzUQhYLtpOI9WM=", - "pom": "sha256-u9FEofPKM25kpi+2F1lo1yhlCmIzgzQoJBZqvrZbQf8=" + "org/jetbrains/compose#compose-gradle-plugin/1.8.0": { + "jar": "sha256-aSL7ZWSnNrgXACCREU6pe6qV1xt/cBySFn4ye7yKw80=", + "module": "sha256-LULcWegTIYH/ViDJeXjDz6gPSGnSWFbDwSOcHKZYKlI=", + "pom": "sha256-+N2AXpOZFg2IR76ZbTLqq/E3QHJH56C6BumhPnd9J8s=" }, - "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.8.0-alpha04": { - "jar": "sha256-P5gb/7uA9FJx5DwcSTBKZkaPA111MCkA2Km70SPPUM0=", - "module": "sha256-btmw3t87doChrQ5ax3+br5laTF0TQjXEAyiEFrpSxq4=", - "pom": "sha256-vozzwcRUa5YqICnukSMGH951SdvXNmil91k2CQ68Vos=" + "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.8.0": { + "jar": "sha256-rLxhCUpV2YYgKWT2/THl2BGAiy0hoQpg3Adklf7DHoY=", + "module": "sha256-4LIRGuHu7TDa8hjvh3JuAA5snMC8Pz5IOPOWplK0SwE=", + "pom": "sha256-dg/9F9wiphxCGeRGUN0ps8Fbs0CHb20XZJVhOaRHWbA=" }, - "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.8.0-alpha04": { - "pom": "sha256-LloUKySgGL+p98Vv1ABrhlOUxEvzHVDCOfQRT3hLxQc=" + "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.8.0": { + "pom": "sha256-x93pQCg2ArLRTHCEbLIVTQxyzwsHFWY/wzkqjM/h/BY=" }, - "org/jetbrains/compose/animation#animation-core-desktop/1.8.0-alpha04": { - "jar": "sha256-KRrqHKb+qzsKwxzBZG7i5jQVLigruiY2/dfht+DFtQw=", - "module": "sha256-S/W/S2PMtco+xOpNtVE0LB7OUdiMvrhbsZHph6T5Xyk=", - "pom": "sha256-Pi27qd9WDdTiM94hqVBN0NwjcHgwDLxFc4QEHtTecCg=" + "org/jetbrains/compose/animation#animation-core-desktop/1.7.1": { + "jar": "sha256-KzR6v2xIYmFToCtw7va74dPJUnUV1vn37OrqPDmFM7s=", + "module": "sha256-c7rYgJkZ/IbsKE5mCKv603DsBjPtbHWV9ptYNh9SAD8=", + "pom": "sha256-xqopawWzH+UZ3cIswgrd989vsdtV+anMYJ1TL/h/81w=" }, - "org/jetbrains/compose/animation#animation-core/1.8.0-alpha04": { - "module": "sha256-fDflvEiuq6jUGjBXSWbJ6DS3k9Exhq+gWWCiRYZzhnM=", - "pom": "sha256-Gx5oYdORxl/GM/eKaNj8oxGjE84p2LfslxlHCy286UY=" + "org/jetbrains/compose/animation#animation-core-desktop/1.8.0": { + "jar": "sha256-2j8nJnMX+ofR1II8nBJXHsfkVDtPylQ+RTXgDQ159pY=", + "module": "sha256-hFifYJt6D2LfyxkTnDmBKEshWe0VAFP3LfM1lSDjVlY=", + "pom": "sha256-RchxHspESqUreP+bwhucfANFJlSMPQVlV5JxzfIF3JM=" }, - "org/jetbrains/compose/animation#animation-desktop/1.8.0-alpha04": { - "jar": "sha256-cunpgaebbblw+8dwFjiSt3PinbG33L8Khlxew07T+aw=", - "module": "sha256-0oaNiCNmM4ZFs6s1u7vO3g6DzCNYVzn1P/tB9yjVS74=", - "pom": "sha256-EXEmubeGcJmLLT77p77E7PYB93degR1AaVqTgoHzfGM=" + "org/jetbrains/compose/animation#animation-core/1.7.1": { + "module": "sha256-v4u73LKXNY9tN9inJOif8+kLp+VkA26ZA5X3OwxEjMo=", + "pom": "sha256-VdE9LN1WVa+tasG8Ou5rMU2ILf6Nj/UVVmsHj4AuKbw=" }, - "org/jetbrains/compose/animation#animation/1.8.0-alpha04": { - "module": "sha256-CKEQLW2XTTeC9vPTqP2xxwabAfvt+xOoPrJQvpuj2iA=", - "pom": "sha256-xj9AG9d+sLiw6+6JyJAlHBmR48lyHHfzaG0db6ADX6I=" + "org/jetbrains/compose/animation#animation-core/1.8.0": { + "module": "sha256-wnbpIfCcOS/H5HKfAMsjkbWhHAikGqQyGjd+4HKfHGM=", + "pom": "sha256-cbxoH0utJETNmIRasmldO+0TossumHOz5dUkXxZpGWs=" + }, + "org/jetbrains/compose/animation#animation-desktop/1.7.1": { + "jar": "sha256-R05r0qasI2Ll2r14D5O4UnaGQKoWQDsPxQXaiBd/l7M=", + "module": "sha256-kw0qlickr+L6z9eYIQfYCmkGh4hHCl1VrcDZj3ijuwY=", + "pom": "sha256-j1SyEA/7lX0HPry7gxTwvEne5FWIH9eLvhKnBHnjFwU=" + }, + "org/jetbrains/compose/animation#animation-desktop/1.8.0": { + "jar": "sha256-d+pgLVlMokOK62MF5PMmZBBXHr2ATbw9ITD1kvVmLiQ=", + "module": "sha256-lxLKBCKOJdVu1mJViL2NC7BsOqwbl4kcZNZqrEMvq10=", + "pom": "sha256-IBL/4ngEVK5s++GbOhuhVUFtxQeQBxLrQl6C/QiQV/g=" + }, + "org/jetbrains/compose/animation#animation/1.7.1": { + "module": "sha256-leqNJuQAkoHcPo60WyBfj2ZrQmZmtRisSaapUwKiicM=", + "pom": "sha256-Q9zVYfPQZrMbAQsujbu8xvzr5dF61PBt1NR93+hF3SU=" + }, + "org/jetbrains/compose/animation#animation/1.8.0": { + "module": "sha256-nIi46Jjj4U/ezOhqAc++Yt+2kl4c9QfZS5gABy61ZhY=", + "pom": "sha256-bVTqkvkFLAPOI8hUuxgwQv2tGAfI9sfnPJaYpPXjs8E=" }, "org/jetbrains/compose/annotation-internal#annotation/1.7.1": { "module": "sha256-OBY3qiWg10JF0HpLhxPDjcUBtU+yWvnWHdwzMR9AFhk=", "pom": "sha256-exANVYBe1I3wrGACFGbx1YcGM0wXJ9DQhRrNt302Ptk=" }, - "org/jetbrains/compose/annotation-internal#annotation/1.8.0-alpha04": { - "module": "sha256-IPD+KWwOHKwUt3lpz+YNjrqOhgRFq/pJaP6G8zW1Kmk=", - "pom": "sha256-y+VVh6dkRxbLCSwF7tnKzkcDmzzWqMvbBcDT2kOfKx8=" + "org/jetbrains/compose/annotation-internal#annotation/1.8.0": { + "module": "sha256-JVyVeH8E7aWagHjrCzbuD/vxTBOcqD9wLSfkV8tBp3Y=", + "pom": "sha256-gfC88mZWJitqfVKp9wf0iJICL88O489YW7XCx+HJ5Qs=" }, - "org/jetbrains/compose/collection-internal#collection/1.8.0-alpha04": { - "module": "sha256-vaFu6aIimSDvb3uPClwDQpd/ULoPX9c26t0Ex/cVS6c=", - "pom": "sha256-tdLR02XqaOZqtCrrGsKIOlEEhXKyCQr8Wtj4vciX4vU=" + "org/jetbrains/compose/collection-internal#collection/1.8.0": { + "module": "sha256-ywOV+BE1yWpiJ7Tqvd3TZ1F+JXiu9F+7AOlRtFkToCs=", + "pom": "sha256-Cx4ZY/TpVLIx3/lNnvdpkUsDRcjPLZbQ3tOEMENlNWE=" }, - "org/jetbrains/compose/components#components-resources-desktop/1.8.0-alpha04": { - "jar": "sha256-G1jfMsZ/+08PPbwV/am5WeLsP0PgvFbdsIi+NRI3uaA=", - "module": "sha256-eBTk/GIdZEvVU2yX0kEX5zj7ca1PX9K0gwvkDzRyST4=", - "pom": "sha256-nNjAAz37WdYh2qf3/uMGjmX6WxXFzOQjhUc1ZRf6pZs=" + "org/jetbrains/compose/components#components-resources-desktop/1.8.0": { + "jar": "sha256-yzw74W1057pEfF4MXve7piZKmkF47jw3L486T/cIbPo=", + "module": "sha256-HZLCYddlCxManhDnWdHvFKg0P9qaiO86I7TeuHHHHM0=", + "pom": "sha256-dhsFXT1M9jqDqB9+rswsjz3qJJzBJ5Khzi544XaAb+g=" }, - "org/jetbrains/compose/components#components-resources/1.8.0-alpha04": { - "module": "sha256-QaapFBtuLRStUe2FSWfscImfxAxlzgr9py7+VOqUviM=", - "pom": "sha256-4YEBL4X+jda6rRYB1/ADf4bL168vEtcu7AXg5ucLwuY=" + "org/jetbrains/compose/components#components-resources/1.8.0": { + "module": "sha256-z2Znv/bNeF/ih9cNRhCFrP5GLDVbi3ght4NYOlnKIM8=", + "pom": "sha256-AjY8sK/YwwTYkbCYiWhIpGXjxu/JGSbdrU6gJ45Lgrk=" }, - "org/jetbrains/compose/components#components-ui-tooling-preview-desktop/1.8.0-alpha04": { + "org/jetbrains/compose/components#components-ui-tooling-preview-desktop/1.8.0": { "jar": "sha256-AgAr0hEQXk6BQOfXeonP6SGBToYuj314vM/ej+Gyl9A=", - "module": "sha256-5ZNliGoYZ4baEJQFRAwiybLJ7i8j0aqcyiVYfydyY/k=", - "pom": "sha256-JpKpRqmhhwNK+etHaGNO8mfl2XM9cDL84YJ9qN3sdRo=" + "module": "sha256-vksrZ9lzXKJFvB1F+0N/jgvvIaf5OlD5/RLn7xM88tc=", + "pom": "sha256-iMEszobdK8hdFv0zIMzMIUJ1xjSN72yFabOjHCrtnl4=" }, - "org/jetbrains/compose/components#components-ui-tooling-preview/1.8.0-alpha04": { - "module": "sha256-4AO3yPVIehqTsA0DnKEAKIUiMYgTWk/jG6/wZkTyKpE=", - "pom": "sha256-biX6hgQI0jdlIhg5rrl7pEkRh0Ac3kdAGKgCnfbdeOc=" + "org/jetbrains/compose/components#components-ui-tooling-preview/1.8.0": { + "module": "sha256-vl8m7Z2We4Iw/WkBUIIiUfWiEA4jDMnBIJTlyyEEZXI=", + "pom": "sha256-g0jJHAR0fsxpJXxAcqCjUJTDBW7oQ+nWOTG2spghkXw=" }, - "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.8.0-alpha04": { - "pom": "sha256-dIPgJCP4kd0RMgMVhp4Buyyrg3GKAbOyg3zWdIYb8iM=" + "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.8.0": { + "pom": "sha256-EMmZuRJK6U9YNfb3cygd0h2PCbywt2mMjX7dn1B5CLs=" }, - "org/jetbrains/compose/desktop#desktop-jvm-macos-x64/1.7.1": { - "pom": "sha256-wmVpVQhvtQIR33ifcfL5M44Tqr+tbRPC8C0Qu4iPmic=" + "org/jetbrains/compose/desktop#desktop-jvm/1.8.0": { + "jar": "sha256-Wm8xHTJrwA6Tvgr79cp7lZCzSDeOc7whAzRlZPSAc48=", + "module": "sha256-CtP/+k+q2WVEHOCsUonmBq0FKbjfgJFic72NjgvaQUk=", + "pom": "sha256-jpo8rUlmfB4gGXKtjTSkTUV0LWIxTAVctQjsffpGiH8=" }, - "org/jetbrains/compose/desktop#desktop-jvm/1.8.0-alpha04": { - "jar": "sha256-IZE7EA1GFlcHsrZW7Vs4vI7aD2Bj9VMnh+nRv3+UPv4=", - "module": "sha256-px3tHKJpOpZPpS18KyGDEaJqeL8iAzkBnkHYFdZGYU8=", - "pom": "sha256-gsz84p4fqrIpVYptzzg9R3aFi2aud5LPxIgrR79+knc=" + "org/jetbrains/compose/desktop#desktop/1.8.0": { + "module": "sha256-yzAkUD1V7sJb9YUnIRq9Cv4weMjOs+0ygDdr/3vjERk=", + "pom": "sha256-6y0XbrT2FJJjy85gfdj5W9Q0Td2eUElILcqzz3sUiJI=" }, - "org/jetbrains/compose/desktop#desktop/1.8.0-alpha04": { - "module": "sha256-bsLHN/jwn0KVOFMJFeOZJxXRmQQX1cmAYt2XH+G5CwQ=", - "pom": "sha256-A5sexl6DYuM28keotN4oELcIKFKvMNjz8OxFBvpWZQ0=" + "org/jetbrains/compose/foundation#foundation-desktop/1.7.1": { + "jar": "sha256-UN84WzKKCtekeeaQz+WT+84IrTntV5FnR5MpVt7gfws=", + "module": "sha256-e0RnxpVJc6cG2nTOLI7Te4RlXSxSGWWXHWgCb5iBTJI=", + "pom": "sha256-aAvQ++JHgzK+3kUTK1VmVNpsK063CPiqVp0bvV3AZ9A=" }, - "org/jetbrains/compose/foundation#foundation-desktop/1.8.0-alpha04": { - "jar": "sha256-UsZBh9YVrTi/PfQQaLKgGA2BiND4dfeaRpOPMHP9r7s=", - "module": "sha256-okLMq8ahtwADXCyTAFnyKsMC13Cz1KWk8sTEJncsGgM=", - "pom": "sha256-Jla3YP+wk7QTcc08ppcQM7lGAw6X1Ti4ux0z6YLfeM8=" + "org/jetbrains/compose/foundation#foundation-desktop/1.8.0": { + "jar": "sha256-+J3Onwy/VBxH3dYWzDIpNR4GNMYFUbZSv+m5I0xNfJw=", + "module": "sha256-bD/+rRaCdURwqxjq4sObxR1yTtS+QF5u6a4hz844Ds8=", + "pom": "sha256-eSZSXsbAjXxqgEFi0fwnSsUySVd8/3wrjjKs3EfCeUE=" }, - "org/jetbrains/compose/foundation#foundation-layout-desktop/1.8.0-alpha04": { - "jar": "sha256-OCl8mANYZ4ojg1m10ru5DhE2tJuADGsvAnboR1q+SMI=", - "module": "sha256-HHEXynrYkcMxjqbl2Yi5xJHJipaCJDOFCOcGrhi2X9U=", - "pom": "sha256-K4qgsUplVMBjD8rpIjDAQae2np2tNs15ILqj66+ZtrE=" + "org/jetbrains/compose/foundation#foundation-layout-desktop/1.7.1": { + "jar": "sha256-0shnwT/2Yy+YgOZ9q6sukwAHsAi5silQ/CzAdQCOzrY=", + "module": "sha256-aeRUgNLR3M8Hdzyq5gwdkvTu9PxF3K7luOg2KFlzsBc=", + "pom": "sha256-G8KiSCB1lID95NL6BswigNBCOpXAohpoUdjOfoaxnN4=" }, - "org/jetbrains/compose/foundation#foundation-layout/1.8.0-alpha04": { - "module": "sha256-3j0zb44v6qd5Brs7Mt3WQN8W3Ci5+SAKcSZDtKT0mU4=", - "pom": "sha256-8F0/i7DVy4p5OtG8OD7D0IElawLjdAPCxanSqncqoEY=" + "org/jetbrains/compose/foundation#foundation-layout-desktop/1.8.0": { + "jar": "sha256-Cb8kfmXy0+KuMJB6AdRtyRqKahQS0aXrYQlYE876Q9Q=", + "module": "sha256-e/WLBp5H0rT8HF5jQP+/B6xv49JpsfDMfZZgglgtAsk=", + "pom": "sha256-VbDLQsqY32XlYQw3NXM0Ril7rKaoURtsJzI4AD/t/xk=" }, - "org/jetbrains/compose/foundation#foundation/1.8.0-alpha04": { - "module": "sha256-9oLYatpLCjX0kvltrnryeLTkVQRoj6CWOi+F9UmmsCo=", - "pom": "sha256-YdA6m9aCwFJtOkRsur7DUUKl0W+N9aG9zTpa4d6f6OU=" + "org/jetbrains/compose/foundation#foundation-layout/1.7.1": { + "module": "sha256-U7+p+nvaWJ4NsTtyjjpWFPKMLJ5fvw8I862PKxT1hNE=", + "pom": "sha256-9+spSlpczBUbO2H9ot/tBcOpmErsNK3xp1VUS/2BN6s=" + }, + "org/jetbrains/compose/foundation#foundation-layout/1.8.0": { + "module": "sha256-kZ2+V0N3+oPDT+EarskULhuFLkvKSKGUgo45RHSE+U4=", + "pom": "sha256-TIKvGCN5+0QxtdSGXwBGCAW2UKZ5mASgGWJxAWWME20=" + }, + "org/jetbrains/compose/foundation#foundation/1.7.1": { + "module": "sha256-TudcyFcJEkmZZlCgo+Ag0MOoaHZtnB5ZdqySFMioscI=", + "pom": "sha256-js5Yc65fY4YFqEdPVZITMFGSkOcohMk6yJXSIN7/34Y=" + }, + "org/jetbrains/compose/foundation#foundation/1.8.0": { + "module": "sha256-oB7rvq5HQlt2qf87ag6zygwXijA/BbnTQ0Vf3L0TWMs=", + "pom": "sha256-eUpLO7pJFPEzY+j0dJRoV3Va4PHJg7ctweuu5y0pyeo=" }, "org/jetbrains/compose/hot-reload#runtime-api-jvm/1.0.0-alpha05": { "jar": "sha256-+2p7PMWZNC8rUApqQ17M8vue1B2pcsfUgCzbSn4DFGI=", @@ -2571,10 +2646,15 @@ "module": "sha256-LBG1MeaMgYj7+H0QTIumK3trdF5wPNaCvqLcdiG8YXg=", "pom": "sha256-Qx1LGtWuX0mxy0TAYzZR6WmPpzDjcKR/iziowomZt1Q=" }, - "org/jetbrains/compose/material#material-desktop/1.8.0-alpha04": { - "jar": "sha256-Jigh7AXNWziN0f9Z2e9q/aE1jUyewBXzjOMf90J7Ngg=", - "module": "sha256-R096AAjrxZC/DOA6pAcxDy6Qep2M9ZWOpfZnZbZ4Ftk=", - "pom": "sha256-AaGiVgwez3+fFyDjdjKGa+OiMDTs9LWGhVKWsVpuC6Q=" + "org/jetbrains/compose/material#material-desktop/1.8.0": { + "jar": "sha256-ktEOLNLJUFGKUWVSWH0ri+cDBrP724Sa8ajhCppAhiA=", + "module": "sha256-vgNb8TfUbWNZ9WplSP/x0ILkpzEd5uuN0zKFkqi/Rqs=", + "pom": "sha256-wU1/lp3yeY5RGillUC1TwUI44EI6+womYfiAOheMCDk=" + }, + "org/jetbrains/compose/material#material-icons-core-desktop/1.7.1": { + "jar": "sha256-vPbIU7bbL/FI0tOq07en6lTZP8e0Lgr9hA622vGhxoE=", + "module": "sha256-dpqLgvJ7j5oIElPV7o/UittRBgrNnC6HsozvYMG28kQ=", + "pom": "sha256-AzQzIbHALCbkTVxBLTW1r1hIapEJ/YiUheHWf6+cdIc=" }, "org/jetbrains/compose/material#material-icons-core-desktop/1.7.3": { "jar": "sha256-vPbIU7bbL/FI0tOq07en6lTZP8e0Lgr9hA622vGhxoE=", @@ -2585,211 +2665,314 @@ "module": "sha256-VcHqxOfrTOt14Cav0FTk+LgZBVPgJ2zuvR/HdXisYcE=", "pom": "sha256-964wavWzWSCtqddmkygHpwQ7vFLBD8DBVp+BohfGoV0=" }, + "org/jetbrains/compose/material#material-icons-core/1.7.1": { + "module": "sha256-B5vF4xG7NUubyRRi8TaEinU/3LQaox8NqNsYl657rOE=", + "pom": "sha256-4Y+gqZINr+qVp9YsZKGcgSLS1Bo9+JitPVSsMds9aqg=" + }, "org/jetbrains/compose/material#material-icons-core/1.7.3": { "module": "sha256-bzMObQpiopITWjDBxT6lGWrXrrBIZ5r2Hk/JKmYukHY=", "pom": "sha256-wDviSkFlDR3YN/+tAA7Mf8y+y2EAoOj0gDmEcMQqhGo=" }, + "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.1": { + "jar": "sha256-3FXTg9yoJ541ORflxak9GSqV58pPkm7lXuC0Yn+Z2GA=", + "module": "sha256-ysKEishpAGbgJfbrPNMsDWqjBVLL8KTedb6NFo7TGY0=", + "pom": "sha256-Oncw3anS5QyIDaNSeoXSu/UZTjl52gtZakxq4BUWxCY=" + }, "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.3": { "jar": "sha256-3FXTg9yoJ541ORflxak9GSqV58pPkm7lXuC0Yn+Z2GA=", "module": "sha256-PYIoDQjwjMPjN58f/jiHBUovuDfknStj1JIumjf6ecU=", "pom": "sha256-cD/QmE10zp88WXPXTsyyxD26VBml9VT91Ux0URHkfzY=" }, + "org/jetbrains/compose/material#material-icons-extended/1.7.1": { + "module": "sha256-3kM5Kc+XUZJrJ72xEbkNs2X4ZWozURLx0Tn5+sU+vyg=", + "pom": "sha256-fBBibxuyLO7dQpV6fheDlD4uYEIfWUTOJrnNCq6wYBg=" + }, "org/jetbrains/compose/material#material-icons-extended/1.7.3": { "module": "sha256-sfqa12veAdmGn5uwxxKc0rByeU8jfgTRXj73yKZqSHI=", "pom": "sha256-3NyiJy7t6vlAZmO5s4zMl8cXnoWqHKeJMuxhIuVZlYw=" }, + "org/jetbrains/compose/material#material-ripple-desktop/1.7.1": { + "jar": "sha256-xfa9+yKaF5SoOO0fMfcpmjtRYAS+/+GovMp1OqJovgk=", + "module": "sha256-476a8k7pZ20fYnKKt4BhaTS0Rqe4Z9wVVKqBaGpQE8g=", + "pom": "sha256-J3joa5k5b8ZfhR1C/BJ5Ku0hWYw4i8PCFlAIpRlOpfU=" + }, + "org/jetbrains/compose/material#material-ripple-desktop/1.8.0": { + "jar": "sha256-VRZAECR5rIOkGqSp6X2aMtbS9G5xvXvBG9VdIZVNqv0=", + "module": "sha256-Q2Cggw5aZXar80BtGFiHL/lUAZOMKiCKuX5jXGYz5qs=", + "pom": "sha256-WMcEcfjk/p863JAHkHaT5ahQpjSZ/Df6Y1d/J5FurAE=" + }, "org/jetbrains/compose/material#material-ripple-desktop/1.8.0-alpha03": { "jar": "sha256-vW+Je+w5CQLiVd0+HXLXY5jV6C3r1PDAbDCltfCsSVU=", "module": "sha256-EtHZWUpaT43b+JNnLr0UNH+46uVvUsDso09uxw205gM=", "pom": "sha256-0bQRtiT+S+VGZx57wM/MON424kPVd6XK7jGg5DhVDp4=" }, - "org/jetbrains/compose/material#material-ripple-desktop/1.8.0-alpha04": { - "jar": "sha256-vW+Je+w5CQLiVd0+HXLXY5jV6C3r1PDAbDCltfCsSVU=", - "module": "sha256-oM3vSNacD0JZtYIvq4B2Z4QIYiHfaFioE2o3SpNdA34=", - "pom": "sha256-nLydR64foEZCAi/Z8Rkt4ozRgPFZ2k2SZj6cshQIiHo=" + "org/jetbrains/compose/material#material-ripple/1.7.1": { + "module": "sha256-0a8hV2+VfuVB6qCEckE116Sr0nNXTBJFUpWsXCFntBU=", + "pom": "sha256-8WQUEqPikyViaWeNGM41NQFS1fRNm4S0Dl64W/TvSdA=" + }, + "org/jetbrains/compose/material#material-ripple/1.8.0": { + "module": "sha256-93ghI7Ew1ukpYGyR9PQjJjCo37cAn8FKR0rv4msrllk=", + "pom": "sha256-9DNlRyFU6GzD6NwoPycABB1BFQdC1NS2euHTfvniC0Q=" }, "org/jetbrains/compose/material#material-ripple/1.8.0-alpha03": { "module": "sha256-RsSmhJ+KpLqDYBhJAqEx9A6kNmzAa/7eHwLOozoq88I=", "pom": "sha256-dfywyKynZatgupUyaZC2o3BaMTs7JMefGvPEGfsLAjg=" }, - "org/jetbrains/compose/material#material-ripple/1.8.0-alpha04": { - "module": "sha256-iTZr4vBCDfaIQuwAb7nKj2FbhbQzXgSOplOAHXazhho=", - "pom": "sha256-HDkzxtQw3cr4HRaHNZF5Xi2EL1bI6LK3+Bn9rhaFmoo=" + "org/jetbrains/compose/material#material/1.8.0": { + "module": "sha256-lnnDZXWONebllUyL0aHBmyjiHdOOWzkjdEFwyAGFVx8=", + "pom": "sha256-Ux86K/vY/Xr39bzXF+vLxaIT8XFPefcpm667fjg0d2M=" }, - "org/jetbrains/compose/material#material/1.8.0-alpha04": { - "module": "sha256-Nw5J10UtSt7rZIbZyjV0xEIBoMfBbEbe7VyLW7xHWus=", - "pom": "sha256-FcN5SQtW5NvA/ziosiKCm00iyQJj5J41CPaiRqdwkbY=" + "org/jetbrains/compose/material3#material3-adaptive-navigation-suite-desktop/1.8.0": { + "jar": "sha256-E1debVxaFkCwB301AFZ5aB0BfypHFgaLCwMTjqWfWwI=", + "module": "sha256-L80XCd220VjiaqC0ggndmjeX0DYrQyrCj+oOV8HPTbM=", + "pom": "sha256-h+LOAWqiS/f6FP5Tyicy9PQnBmofe4LzLmrnDMUZOno=" }, - "org/jetbrains/compose/material3#material3-adaptive-navigation-suite-desktop/1.8.0-alpha04": { - "jar": "sha256-9Uj8r2rhipDxUf74oa4gtk3ajY6pXEtRmkKriHx+lBg=", - "module": "sha256-02VF4O1EUxBsJWEDq0s//c1ITJvBIQXp2/CGDZEqe+s=", - "pom": "sha256-lfSxzo6ZXZ8nO85Wj9aTZcb45iJE4JDbAuXngeaOaXE=" + "org/jetbrains/compose/material3#material3-adaptive-navigation-suite/1.8.0": { + "module": "sha256-mTzhPkO51y5NLorojIrnN4ZR1z105kvWSY6cPaR+hNM=", + "pom": "sha256-8MfR4F0vSIhNeMU5SLjy9dkmQq4ObBkSIpBosI2X5i4=" }, - "org/jetbrains/compose/material3#material3-adaptive-navigation-suite/1.8.0-alpha04": { - "module": "sha256-ZKQWCdUc8i6K/Qt9+ECWl0O7PeWnB29ESj8rOzGOv5g=", - "pom": "sha256-5kU73LVJ/0daXUsa3zSy1KN/529FESSUwdngxXrvg/U=" + "org/jetbrains/compose/material3#material3-desktop/1.7.1": { + "jar": "sha256-dkJDTX15vxSIby8NFzngouRCjv+opp5XyCsVQMGazhI=", + "module": "sha256-D7pIndXI/3UzMZZyGeKsH4smH3OQSr2MbxPS8la0yR4=", + "pom": "sha256-arivxNupMK+rpxWYkiOWE6LFoXelWo4oWCEn6Nv1mGk=" }, "org/jetbrains/compose/material3#material3-desktop/1.8.0-alpha03": { "jar": "sha256-JURxLAyB9oXJh91EBvN4VambiTVbXP2R+c9V15F94Vc=", "module": "sha256-fLSR87OVtlX5bqGfSRT6nQJV4aeIE9xXmCUx0a8O0Is=", "pom": "sha256-Gs17XElZ84eFPvucYiPDkD66znWSRH55vnwKqkNV9K0=" }, + "org/jetbrains/compose/material3#material3/1.7.1": { + "module": "sha256-qvFQNGGrB7ehjYXFXdQEaSsRKu3l1XgOwYyDsPYNXUQ=", + "pom": "sha256-7I2Sz9gexvi8u5VGZiuphrZ5x1EwUjkCI4x1IVFfOBw=" + }, "org/jetbrains/compose/material3#material3/1.8.0-alpha03": { "module": "sha256-/AykMQ/v1zUjdyjas194djHfq2fW59SyJ5Ti5ngAb8o=", "pom": "sha256-mkJqqoq807D8Ab0Gn5jBGs5Dzu5T3W6zmKaBmGccqIE=" }, - "org/jetbrains/compose/material3/adaptive#adaptive-desktop/1.1.0-alpha04": { - "jar": "sha256-faTVrekedntUkmvz+K6IqQUUq6HFgAtgFoE2GOe/Bxk=", - "module": "sha256-9ZsRYQmNkBDivhHHAhUGb/KrEm4S8AjpjnwtFZA5oWc=", - "pom": "sha256-RijD+D95uC1ctRTiSfuJngonVjxnzjyXl5ovI+9H78M=" + "org/jetbrains/compose/material3/adaptive#adaptive-desktop/1.1.0": { + "jar": "sha256-w31A75QUyqau5AfIrhE19yd2Riy4Y/rbfH40I3TBhos=", + "module": "sha256-b4LGOwHi8DxcPlW+Xe3U2g+RlalRUgf3XxYAjJMcSrU=", + "pom": "sha256-Q/Vsgi+P9KzlfabIifsVs3Ng3RbIIDmAuYUNQaw/iZ4=" }, - "org/jetbrains/compose/material3/adaptive#adaptive-layout-desktop/1.1.0-alpha04": { - "jar": "sha256-MUflmNxPziKVzbNQh7P9LwVRYwOoK53PftAr6Rva+1I=", - "module": "sha256-SKnOGlvVTbdsdJ+si7fQ6kg2uFurgGGX8OCuk+yHQN0=", - "pom": "sha256-quacszVe3boTYfiNrvs0fy1sFRmM8RUsnQqL5/nNumA=" + "org/jetbrains/compose/material3/adaptive#adaptive-layout-desktop/1.1.0": { + "jar": "sha256-2Jmnz9e72H6V1lFB4L9n379S3pyI4jvbUclfLB3biQE=", + "module": "sha256-vONgsyh5BqiR81rgp2xQtnnWjqIT0AnXeY89khLhix4=", + "pom": "sha256-PwnsftztMVa/DXluTMLV4yZfUoGwLq33wIi6M517rl4=" }, - "org/jetbrains/compose/material3/adaptive#adaptive-layout/1.1.0-alpha04": { - "module": "sha256-jIaOoEfIH3Q1gcc4e2rE708ZepvtLfGrp0er3ndroyg=", - "pom": "sha256-lWqjI6SbV9FQocBVgJ/4Y1PYt4VAYEi087exf5JwKmM=" + "org/jetbrains/compose/material3/adaptive#adaptive-layout/1.1.0": { + "module": "sha256-iFYuJcWE5Ep7aPuITuJqhrsS+6uFLYJlllHtCMxScCU=", + "pom": "sha256-8k0eRAFpo1g8lRA6wj5KgJDcgIAG54W9TK/RukHwoks=" }, - "org/jetbrains/compose/material3/adaptive#adaptive-navigation-desktop/1.1.0-alpha04": { - "jar": "sha256-GLbT0U/iQwJoWJAT7cLu8c+VkF7HZY4vcmBSlFroEc4=", - "module": "sha256-Gj73jQ5kwX/WoMHEdPOkUuy2yyH0WvfDxkJIis5RTus=", - "pom": "sha256-zTTtJpfBL7bdrZ3z9DQRl8EH3Fx2aSbZB8NCDu4BGzw=" + "org/jetbrains/compose/material3/adaptive#adaptive-navigation-desktop/1.1.0": { + "jar": "sha256-dGQ1hMjmRRByar4g4eOI6cK7A5vKgZR049OOvtknOAc=", + "module": "sha256-AVQBfw7P+gpKjttiF6EMq8LxKgUULcHf+OvX0AfxbYo=", + "pom": "sha256-S5xXPuHSaln7nchmXGBrFZl8I4UUWvdm5EEYPfUDfsk=" }, - "org/jetbrains/compose/material3/adaptive#adaptive-navigation/1.1.0-alpha04": { - "module": "sha256-VHtOiubu1uUUPILo7b8QVrxejL81ho2TzJFkYJJ5PQw=", - "pom": "sha256-U/JpeqLcjSltxij3HQAOpIJKQeiKE3jYInkNJWCjNos=" + "org/jetbrains/compose/material3/adaptive#adaptive-navigation/1.1.0": { + "module": "sha256-aGVHRihDaRF9EP2xVJFmQfLNHLFT2x8mqMt4yYFkcMQ=", + "pom": "sha256-AXEI1KstsiW6SkRRZqSEVn5Wx3J2DaBe3pNMnEuM+eU=" }, - "org/jetbrains/compose/material3/adaptive#adaptive/1.1.0-alpha04": { - "module": "sha256-Vc4jWNA93TUofKnlRJcPlY+nHA9bJjP2htfZci32s8Y=", - "pom": "sha256-DwakDtwakDR3JatlKtuWyGoRzBdJ/thKi3FWMptr6js=" + "org/jetbrains/compose/material3/adaptive#adaptive/1.1.0": { + "module": "sha256-p0sWSpGXOY3qeSeA8+pse06Q5ndNsToGsjVDCGRL+Bw=", + "pom": "sha256-oK00sMpKpxquGVgSUj0azKnJZ8geY7QLTdarvUAOU2s=" }, - "org/jetbrains/compose/runtime#runtime-desktop/1.8.0-alpha04": { - "jar": "sha256-dYqLRtj3TT3WoY7PUNssBl2hcU1Tker6jPwNSuAFYyc=", - "module": "sha256-7mwXTJw3AUDwHL8cuOXAbD1j0sK5OcFbgwUuySJtVPc=", - "pom": "sha256-2iWE6NCe5JBcpmt6axdlodHESV7suZzNu9dpE5Yyykw=" + "org/jetbrains/compose/runtime#runtime-desktop/1.7.1": { + "jar": "sha256-duMlBUe5yjyxpJwnKTOyXLO8y8m6Endd1hYaY9mqfPE=", + "module": "sha256-My6v5fATPpwP8mn+rhAMeJX+IkYo0FUZRYgfzKBhFsE=", + "pom": "sha256-01d42i+5MOce1u1rym8//gdcZOF24fuB1mMH1HHEseU=" }, - "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.8.0-alpha04": { - "jar": "sha256-M5d4mfkEp+5caZLXkWOvWdIUzYmLCvPTfglOw32O9Zs=", - "module": "sha256-9AfZmTsolCClY7HzhsBtLEMoyeSs5BQe0QdOEvBqL/U=", - "pom": "sha256-A9rVWm5bnC5fR7+lYsyrTFPBbF1H9+lUrYVxUpptCJU=" + "org/jetbrains/compose/runtime#runtime-desktop/1.8.0": { + "jar": "sha256-koj4pOb5UWioNkj+cn8y266w74BtGDAm3KhTcljlZeg=", + "module": "sha256-RZddB+4Yr6W6JcbK8tAEL2i6DSoKUOKzpxSv72vI42A=", + "pom": "sha256-FFtNhLs7RXpNuAjHr/vwkP8m0ZPlXt0j4YCtUo49knQ=" }, - "org/jetbrains/compose/runtime#runtime-saveable/1.8.0-alpha04": { - "module": "sha256-QEvySeBkdYZXuELg6Y3C45n5VMs+2Uc+c9iANW5FVLM=", - "pom": "sha256-L3/5oiP1pQLRj25jhd0032jKDPuBZoGO0+iLX5DUOYk=" + "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.7.1": { + "jar": "sha256-QwY2O+kOqr50uQDbTDLtHxXHVI5bMKcJPE7kDENrm4w=", + "module": "sha256-lbODl+J/sf4du5MfHL5qCZZReoWTQzLNRLT7OQ+PXLk=", + "pom": "sha256-YPjvLYLG1V2/Pn4LqLb41II06TEMpm8d+b9voLHoyLw=" }, - "org/jetbrains/compose/runtime#runtime/1.8.0-alpha04": { - "module": "sha256-Ke4vccjmeAhP1xXn6TGv8ODjUAKICzdLy91O4IVO5pk=", - "pom": "sha256-2+tAHC7YOJC8P+S9gbOVRhT+IlcbpCA3NadhlFXROx0=" + "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.8.0": { + "jar": "sha256-IR6bMX3jLuu70pPqhkjbEKVYafc74lj+WfX704u2X1o=", + "module": "sha256-JxvoF9OJol4mLqc3zFuZroKN8uf7bvrmZxEcF++lSxs=", + "pom": "sha256-Punve01+HfuOWQesPyhjbGjMhLfBX+bpK2jOeCgGIkI=" }, - "org/jetbrains/compose/ui#ui-backhandler-desktop/1.8.0-alpha04": { - "jar": "sha256-2TtvBgXT16ftfFyheCy/yRlMpKB0zoz75bYBhhgEXvs=", - "module": "sha256-EYbwhN8UwlowXz6W70caow2VZsnKHL6iVU+lPbLlscM=", - "pom": "sha256-BaEAFwP5tXZnw+UKaNMLr+gs4r3q33KyTf2Tsk6rn44=" + "org/jetbrains/compose/runtime#runtime-saveable/1.7.1": { + "module": "sha256-yDUM3lAXvSoW+gL6d/sNpV0RcUyDqhGGy6NWcmrjq20=", + "pom": "sha256-to73YWrUYT9AYAPPCia71isXBq6XZ3uhM60QN9YGiyM=" }, - "org/jetbrains/compose/ui#ui-backhandler/1.8.0-alpha04": { - "module": "sha256-TBDY0Hn3KGaXliBWYe8TZabnDmpDGKn1QFyWQnxpbxc=", - "pom": "sha256-feZmFnksgkPDl9/stOR/3Dpq8QAOC1EVTxusUEsV7ZQ=" + "org/jetbrains/compose/runtime#runtime-saveable/1.8.0": { + "module": "sha256-2bJV+Fu0qqWkqjhLznkN9XtOF+0vFDvPdUXN1icYajY=", + "pom": "sha256-FjOQ5pFgMv/ZLkGszznBvYIje+lc6e3SjYsrdoQVbrk=" }, - "org/jetbrains/compose/ui#ui-desktop/1.8.0-alpha04": { - "jar": "sha256-Job8jQ7qgLdf+L7mQ4wW59jYwINBvNTVdIw4nGdJL7k=", - "module": "sha256-Ff5YZ+Jq4s4GcEPEBC+zYPXDXHX/KNruZft5gCHwfEs=", - "pom": "sha256-UeXawNBzLJWDDnmg+CNyua/P1UbA9ieLV/HDVgAjVZk=" + "org/jetbrains/compose/runtime#runtime/1.7.1": { + "module": "sha256-xSKUczzpqMZYOfVWCw4APbgWK37T2MqN6b+mLPAzTk8=", + "pom": "sha256-SBR/02A24kzaP9JYsYNJVAMA8ipOHXTeA9hWpMEakm4=" }, - "org/jetbrains/compose/ui#ui-geometry-desktop/1.8.0-alpha04": { - "jar": "sha256-wi1EyFpdVX9holthBwT3BQfHrU/RYa9xK+Ot9cZhRCk=", - "module": "sha256-L68iLOl2A2eWUu7zXtBOjUKJVOq/2VrkpTTmAVzmtv0=", - "pom": "sha256-QD9xIa1KSkSVA70YjcW8WCZpbWDAFz+iv88dBbmmHps=" + "org/jetbrains/compose/runtime#runtime/1.8.0": { + "module": "sha256-OwaEIcIxC6e2I6AMXWwsn6jWVjmouhclvy6+BF4ugVE=", + "pom": "sha256-ty8WUzuta+9sJutSksxGTvuUPZPfQJpQU/EzFcwHvIA=" }, - "org/jetbrains/compose/ui#ui-geometry/1.8.0-alpha04": { - "module": "sha256-iLjBZ8Ca8KHrRhwwCAeGyIykpkXz4IRDoYerbEmmaho=", - "pom": "sha256-a8eClm810GAi2FmaPhBF61JjLWtxeZUIHh0eHES/Wbc=" + "org/jetbrains/compose/ui#ui-backhandler-desktop/1.8.0": { + "jar": "sha256-4rwc2e7jbHLYv+ko7TKWA+957AAKoTaIjvfNgAgWkqY=", + "module": "sha256-kJ8mS4FdZ8nm853dTOLcg5Ua+J8Dmu6Z3y1Iok8BjII=", + "pom": "sha256-3lSMlllWFP4ekOG1dbxRPnAk5y+6RCa/tgq8w3p/2qc=" }, - "org/jetbrains/compose/ui#ui-graphics-desktop/1.8.0-alpha04": { - "jar": "sha256-dgUyDYIUnaO3j7g+l6AGw2zuQcnm32vs6eZ6njvSeCc=", - "module": "sha256-RWpENQKtypekjfWFEN2BrpU1GDn7eidYbdEQmls2m9M=", - "pom": "sha256-1Ejf64hTl7MM5v3kHeTMAxM8tuzCyNI1vNrgOt7+has=" + "org/jetbrains/compose/ui#ui-backhandler/1.8.0": { + "module": "sha256-6i80cJJiHuklI1d3SVgcgErTHT6l3mv6w8+ox30y5uQ=", + "pom": "sha256-rlpGWdjbdTYdf2vNIDUd/KpMmFfETp9In86lfIHEKno=" }, - "org/jetbrains/compose/ui#ui-graphics/1.8.0-alpha04": { - "module": "sha256-dgasC7Sv2UrXEFPfZfZmndoWJQLAac0DbYWGlQIpR3o=", - "pom": "sha256-8r5b6KfndcPCq3x3x0oztRK6VQJSnVGUn3UCpVoOY1g=" + "org/jetbrains/compose/ui#ui-desktop/1.7.1": { + "jar": "sha256-QHKbljfqyR/Zup0QxM0usyi7MRb4CXpbnT8HGXHOoCI=", + "module": "sha256-pCdx2/0i3G4BxGwkWo4ZU0YwV7/tm2xzefgmcdxE/FQ=", + "pom": "sha256-/ZOsNR7uXLtUTfcLf3D+y1RhR2CW1uJG1gNklcXRiWE=" }, - "org/jetbrains/compose/ui#ui-test-desktop/1.8.0-alpha04": { - "jar": "sha256-8gwMPdg/+P73LRMdnYbd29Qyqg8TPFaq9Uh4MgKnwPM=", - "module": "sha256-R0xVp9dK9/nca2YPVz53s2biaHPwQh8YTzdMUh4mCSI=", - "pom": "sha256-/5DjfJFuZ9MYZEbybZJDJB6C/umgKs2Qk9h8otDrqbU=" + "org/jetbrains/compose/ui#ui-desktop/1.8.0": { + "jar": "sha256-BFJFqgdPrz++lWPEVXHDiVaXT0yckhPSkBBSUcRUQwM=", + "module": "sha256-DbXEiqaZF1Z9XElTPwAjaQt3oF/fUC+DBUd2VS/ZJv8=", + "pom": "sha256-VjAlgYpJZ/2Lg7kkiF1MJndmBH8oz+Ev+LH7ymCiF0s=" }, - "org/jetbrains/compose/ui#ui-test-junit4-desktop/1.8.0-alpha04": { - "jar": "sha256-3KpvbErFEDM8mZGRUaXaN+xZWZBWNBQ8410jLV30Mqg=", - "module": "sha256-4mfNKVC5Nrr+2dieyE9yLu2wlvwsyYcYNTouIO4yM4g=", - "pom": "sha256-xOPEs9/VKdwlCqHQzKmdZaNE1jL+Vq6WEEgxTBybseo=" + "org/jetbrains/compose/ui#ui-geometry-desktop/1.7.1": { + "jar": "sha256-S4bJYcC0vOeZUyn9V9Qznt4Ry3XX7JC8G5kTOWrdsw8=", + "module": "sha256-rxTJcKcEtuCHAB9jnE1r7dvuad5+FXKlunNjGV5e2+I=", + "pom": "sha256-3iEzIvQwizn+X73RZMCg+ApylT0E/AozXNqjsygGS84=" }, - "org/jetbrains/compose/ui#ui-test-junit4/1.8.0-alpha04": { - "module": "sha256-9BnCIqNd12DsgLydKk5BPHJNLsV7LicVSNR8bBUbEAI=", - "pom": "sha256-Dvgz+9We2mi46oNrGpp3zQLMrkCt6FUQu41TLa8uOg8=" + "org/jetbrains/compose/ui#ui-geometry-desktop/1.8.0": { + "jar": "sha256-Wq+LeL7W5Wt07okxcszi4xaBO2HYoizdwFh6Unxcqic=", + "module": "sha256-R371HP2IozSYUcQiJx+WEP5kJJBs+GOe37OC5sTkgE4=", + "pom": "sha256-Oe5obv6MiqCGsK4HnThWaE+EUNnDO6YyCZhUgdNhYdw=" }, - "org/jetbrains/compose/ui#ui-test/1.8.0-alpha04": { - "module": "sha256-W2m3RxNmKdS5oYN0lMtnkm1aqNz2dSh8ECxUVSwvNTY=", - "pom": "sha256-Dzod4EqSklAgLdCF8GRcNWQqri+ZXDYsRvYKhEiv3Tk=" + "org/jetbrains/compose/ui#ui-geometry/1.7.1": { + "module": "sha256-mkt+df1LWaMy2SRUTWUB9eDaVbIDwsxhs4fg14yTXJU=", + "pom": "sha256-93UQwBXgPlnocFWPdBdPZSRo9vhJOJaKxTjBKiGO3I8=" }, - "org/jetbrains/compose/ui#ui-text-desktop/1.8.0-alpha04": { - "jar": "sha256-647zK5XWCZCYBUzUlLAPHJ492qSeFkwpbdA4ZscbxF0=", - "module": "sha256-HGLf8eMvWtn0jXhqzIAqjLsomvK8DGCQaH/qoykTm6U=", - "pom": "sha256-RxihxZRXxaJjOirKneQzRgjf7bodUJYF6B9KQfi5BmA=" + "org/jetbrains/compose/ui#ui-geometry/1.8.0": { + "module": "sha256-rR9Lou1GECrXXF94pe1Ku+oPXVI5Xb3dtkxaHGJ9EEI=", + "pom": "sha256-qhofotjSE0Y9Yr5tlomTV/N5ZPwYCIoZVtShaCc2VPY=" }, - "org/jetbrains/compose/ui#ui-text/1.8.0-alpha04": { - "module": "sha256-xWcKB6ER/XjY6lXCrrEX5cB9mxHyOGwKYmFIhuz2TuM=", - "pom": "sha256-hlzfNRHDmpaFFYFgzyTOpd5MZpL2XlQl5Zj8PUH5Fk8=" + "org/jetbrains/compose/ui#ui-graphics-desktop/1.7.1": { + "jar": "sha256-kQnXfMJi+QQIFpscoLotFRNbYDTjd6gLvz7AI0lU6FI=", + "module": "sha256-DPP8FuwoupMp0UfnR54Rmyvbjr+lLyMn4yDlGQEUapE=", + "pom": "sha256-cIA44a4DMFFG1A/NcUNHlHGQ/yd8ZpysiH836iQ/M+Y=" }, - "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.8.0-alpha04": { - "jar": "sha256-SXgjEEYpWRoL9Au5lUam/EP84Ku7O/ysdGdI1g6NuoA=", - "module": "sha256-JsNUPNwLW1E66x5Sf2RjGBGUoSXJpuyIMFHa4Ztuym8=", - "pom": "sha256-Fcvhcf1/dQcU/T1Y3w6aL3SuB9axqtArgXWLsVS7Zls=" + "org/jetbrains/compose/ui#ui-graphics-desktop/1.8.0": { + "jar": "sha256-sxoU+OAbhlO/N3iKkwCM04/9bYcZIVBj6mGmWm/Zdr8=", + "module": "sha256-vjPfV/XWmU5uqTauUdC3ChQyC0MUKs4dW5BJnAWtNNM=", + "pom": "sha256-Vew5To2ooD7esv2QvNPp7MpFFHGo96vI73yooXVGStI=" }, - "org/jetbrains/compose/ui#ui-tooling-preview/1.8.0-alpha04": { - "module": "sha256-MC3ACIOclhJmen+O2UquZf4Oh3sFSihf9qV4RFmoZbs=", - "pom": "sha256-+lu0KDtKzkAq41dHCKlXcgcw2Bm9bS5DOR7IhzBCHjU=" + "org/jetbrains/compose/ui#ui-graphics/1.7.1": { + "module": "sha256-Bpgc3L5OyqzDVxnptAOykEHl54Rps8L1zcfMUHX8DXs=", + "pom": "sha256-Sj2MCO2FYVWHeAGrzgWU3BxpiOVq7H0kSsfGwxpqX9I=" }, - "org/jetbrains/compose/ui#ui-unit-desktop/1.8.0-alpha04": { - "jar": "sha256-UFp3/NVE2OFY461bhSre/Nlh64+9NB/rjiGmk5UtuQY=", - "module": "sha256-0bxWb7mqdrA9KB4EzxNvi8Khs3BDLyVGeHYovegjr1s=", - "pom": "sha256-ljirfotctywtFIZ9A7V1MtIdIf6tjArzi5RCzcP7b/g=" + "org/jetbrains/compose/ui#ui-graphics/1.8.0": { + "module": "sha256-txgPMy3enTXaqmW+iY/B/YNvQ6lTRqaPGmJQsBOu778=", + "pom": "sha256-/DNzmQiWbbCBLQvUSP15u/b2mmGVQSyZ6RDVSArDPhI=" }, - "org/jetbrains/compose/ui#ui-unit/1.8.0-alpha04": { - "module": "sha256-pApTFo4xoFjFBPVZPjwrg1D/bA4w+CQ4wl3ukRuWPcc=", - "pom": "sha256-jBPwgwt41ln/tQHBHTNh8E3BelJzimXhJznwxXRLj7w=" + "org/jetbrains/compose/ui#ui-test-desktop/1.8.0": { + "jar": "sha256-CdthtR9ovXwtxZbdCe2+vfnxPoBRe+oANG+qJ5hkg+0=", + "module": "sha256-hMtcU01/ex171Jp8gFH+Tv0caBB5T2bI7uCRtz3AS40=", + "pom": "sha256-gaZC9Wi3tlhi78zSnROwCbd73/JE/QyeRc0NaP5XXfU=" }, - "org/jetbrains/compose/ui#ui-util-desktop/1.8.0-alpha04": { - "jar": "sha256-zdnzOHJxDBTfdVDa2/yR1VrZo7cTRDHCr460L3V+F68=", - "module": "sha256-6iji9UjrDLhJ9cMEfL07jA8ThL7zN75zei3Y93rWMJ8=", - "pom": "sha256-8pQJk9w30k59Y44xX2ItT0kS1Ob8gOkQ+oqQe5z21eA=" + "org/jetbrains/compose/ui#ui-test-junit4-desktop/1.8.0": { + "jar": "sha256-8n2pyADiUb+hnaqSCmim1ZUa/Hr7aSBKMG2WdYv17Lc=", + "module": "sha256-ka3xlCSSb82/+xwq5oL2Tpr4WYviLEJmNKuhzZXF3YU=", + "pom": "sha256-Y+vNJMaYGvzVh81zOv79gMGhbuiaN16Rz/y0r5nk5d0=" }, - "org/jetbrains/compose/ui#ui-util/1.8.0-alpha04": { - "module": "sha256-38CfOmAhhkWdmFrU8dCngZjXKMatWV44uimDAHZ+prY=", - "pom": "sha256-B2zeSirC6CxianbCa2ob+PmrGCHve//5qbpbPTxAxl0=" + "org/jetbrains/compose/ui#ui-test-junit4/1.8.0": { + "module": "sha256-GZTUW/XSGzpwNKvHkCL6qoVS7I9VbEz4PQoYemo+PhU=", + "pom": "sha256-G5cVUGdWqK+IrBZHxBuDo2YeAPVzbylwjZqZO5aO/Gs=" }, - "org/jetbrains/compose/ui#ui/1.8.0-alpha04": { - "module": "sha256-k/S+3me2wuxyXAXSPgvXBXmlp9NLMla+L6taIH5LnOg=", - "pom": "sha256-2sOUh4F9TSH5g7gA7c+GLhHghZP++mLLqwxgdksIedY=" + "org/jetbrains/compose/ui#ui-test/1.8.0": { + "module": "sha256-7dc+BTZZj9I8Uv/iYVqwuJ91K3mnnMQi3HJf4ymnP2w=", + "pom": "sha256-JJEExV3asWlR8qj4W1Ja9RZrYyrgCdt438gU+Nr/g6U=" + }, + "org/jetbrains/compose/ui#ui-text-desktop/1.7.1": { + "jar": "sha256-gOB+TKc597YSL2PpoX5oU7lHIg7LEYD43K9BnQ5GiZY=", + "module": "sha256-PR7CKTU76v2v0awhS/VEkPv2nojwZ7/LgBaB07K2bqU=", + "pom": "sha256-UiwW5ZbJMrHloPPN+xqTRADodlj42JjBzery0Bgphoo=" + }, + "org/jetbrains/compose/ui#ui-text-desktop/1.8.0": { + "jar": "sha256-W2TgVApMqu6zwTXV0T9B/s0v9DxB6QN07UIv74q9kp0=", + "module": "sha256-2JZjyhzb2wsiONN6VPSYSe2owLPPWub2PkCzCKeX324=", + "pom": "sha256-RD7cJpDXb1YgkUzPFmJvoQIjPlRzUBWoiDG4ADfT7qc=" + }, + "org/jetbrains/compose/ui#ui-text/1.7.1": { + "module": "sha256-nYij0rkMF+a4Hs///a6dfEzsVMfWVXWYJbpJZ90vyGM=", + "pom": "sha256-huwdGGauW1x/4AUsJqB/8aphkz9Vf41PuePda2L8Jb4=" + }, + "org/jetbrains/compose/ui#ui-text/1.8.0": { + "module": "sha256-u6ko+CsxtaQ/HJr7/67JcHYLC8459K/YKKGgIsWuIC8=", + "pom": "sha256-A84HC7srEsZveTlCWXR20E9p97CxVAls46EA7NzUiMk=" + }, + "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.8.0": { + "jar": "sha256-eohirZEZhP91HQSZwyI+agxxqCG8t1qZ9mlk7tqmfXg=", + "module": "sha256-N/3cLF26/SPzQTUGICee0H8VNd6AGnm3D9geU3rpxMY=", + "pom": "sha256-Dms0B4lXGS+pNYcHbbpSTGu2Q2xgxKmg8iB/fM1PR30=" + }, + "org/jetbrains/compose/ui#ui-tooling-preview/1.8.0": { + "module": "sha256-QliJHsyIWeC8fSdh6lDAx5Ol2Vp1JskthlDsa0/cCZk=", + "pom": "sha256-I0sBM8CU3DoL9htZcy3igJ+0gyJEiQlROexuDpzhMZw=" + }, + "org/jetbrains/compose/ui#ui-unit-desktop/1.7.1": { + "jar": "sha256-WYtS4lftZ0FFaUuXkKc4OpD+0uxxVLoJrOSqmDxlsaI=", + "module": "sha256-BacNXRO5Fhrn9YUkbrk97ly6K1XD8Ilf1mRekKPCPaU=", + "pom": "sha256-9R34TA7eKtHgHgf6R+9tSLoSy3ShfoXK6Nblz/Kc0Fk=" + }, + "org/jetbrains/compose/ui#ui-unit-desktop/1.8.0": { + "jar": "sha256-KW0j3qp4tQjPldFM9b2lik861bQthfzIvs9uEv+9A34=", + "module": "sha256-qj02WHAtKOOYudU/JN1K9XD7JN4ZY9YTSaOC3Bo08vA=", + "pom": "sha256-3OLKuYaq6wf0VaTKVzPnP3UWntEuJwee+4x/IJyMyUo=" + }, + "org/jetbrains/compose/ui#ui-unit/1.7.1": { + "module": "sha256-kDxEm48iI7uggivMWUuZLiqCv6rlwE/FCNKNq4hxfaA=", + "pom": "sha256-tq8XC59ySXOr8jPPEJFoqJIGqbFF1whpFbxlQOpdaHI=" + }, + "org/jetbrains/compose/ui#ui-unit/1.8.0": { + "module": "sha256-cZYqeI5O/64E6eZjz5kgHps6sm1iUPdPB17qaE7ClgY=", + "pom": "sha256-qK28UifDne3Sphw2x/iMLJuWVpMV+J69TzxRvr9TLEE=" + }, + "org/jetbrains/compose/ui#ui-util-desktop/1.7.1": { + "jar": "sha256-Fh3Mc7kp2mHO5QBF6W+wLxYzw28You84tcLETDhga1I=", + "module": "sha256-35JU30uqHS7Q+ctR/BxgrUlqNqzEiYEUPF1PqHRpEXs=", + "pom": "sha256-AeJZ6hTRKWyvCAmzP5dAcXRDNJvrCJ7ketEOaEBYDvQ=" + }, + "org/jetbrains/compose/ui#ui-util-desktop/1.8.0": { + "jar": "sha256-47HEObTqgChb6Q6u2OcFZDf2cc+v5LGKOpy1OHyAvko=", + "module": "sha256-kUQZhBnePBaJUtO2bhxzGjA/E0Eo/8kmz2VkfVbDYaQ=", + "pom": "sha256-FsnlfquLuBCBR4vcwhar80saQF2+cPmhVHkX0SILkYU=" + }, + "org/jetbrains/compose/ui#ui-util/1.7.1": { + "module": "sha256-razSdpfzafjF00aNb8ZySDHTP95e+5tvg9hdw6AXCw8=", + "pom": "sha256-7bcYbOSnYd3l8xMC3BRdWLw7/j5OT7x4YiiCP4zVSMw=" + }, + "org/jetbrains/compose/ui#ui-util/1.8.0": { + "module": "sha256-tfE3oBS4Z0aULDoy56i5BdXsXwWXw8Bq69YrIoJ6U6w=", + "pom": "sha256-v9ly8eQXV6lfYS9lAxCvJAicu3Uz2X0RlGG/TTdhEhE=" + }, + "org/jetbrains/compose/ui#ui/1.7.1": { + "module": "sha256-LpKRDBxZrLBjrmhWz5VWwlH9qMCtRsg6Tka/flenza4=", + "pom": "sha256-RWT33DQr7tal9G+RaxkLMe0rEgcK/ZfXXmNjSkQt9lc=" + }, + "org/jetbrains/compose/ui#ui/1.8.0": { + "module": "sha256-FOM6PYxigEyzFHWZ7gpjSmTA9xsN7i4hRUm+j9eCk0U=", + "pom": "sha256-pkQCj9i//MRRv+3nDZDPZhTFVIVvaKjiQZu5UvM+fGM=" }, "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" }, - "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.20": { - "module": "sha256-LBPSZp00NWUMcd8t8VDbTl8QAZKj6B6XnnUrTeCVcxA=", - "pom": "sha256-AudGCweKYIs9brqmIBbZi5cSPtITgU7QorGL2r2+UzU=" + "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.21": { + "module": "sha256-sYdQC4zfyNLBw6F7lhzEO3tOGFQS/NsEsDvrkPEz+70=", + "pom": "sha256-zBwgchGRVLwYQXGzQmk/99LF+dwhLR5aTMCZOGL81ec=" }, - "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.20/gradle85": { - "jar": "sha256-CpCRRspmOsVVe9Gcwyum7Cbk6Wf11fDpU8iImxe3n3g=" + "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.21/gradle85": { + "jar": "sha256-uGEv2xhdzZiXGlG8H0K+k2e8vK7lE+NywkoU9O2xm4Y=" }, - "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20": { - "module": "sha256-6NVkojvCA3s++xxbAP+3SuRPmXJFd+L8jYf/u8nLn7U=", - "pom": "sha256-oRA6cKb4/8EITdwIGyS6smpWRJcvnM0UG4mU2fUFRHg=" + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.21": { + "module": "sha256-dqMj2vtYjg+u6OMUi5EPtuw+tCL8EGQBBr5bfwapx/M=", + "pom": "sha256-v7ZAATVL2BgCx0mRTMLPWOWsXQWtnB9JrEZbdxbQUiU=" }, - "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20/gradle85": { - "jar": "sha256-ZnTyl1XTJq3cdWov3Kvyu2AvAABKDtLbZp2j306EgAY=" + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.21/gradle85": { + "jar": "sha256-/AkFgQMJpa0+oV37vhKaR+kNsRIVIyNkhBtyBEEk57A=" }, "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.0.21": { "jar": "sha256-VNSBSyF3IXiP2GU5gSMImi/P91FQ17NdjnMKI34my9E=", @@ -2799,106 +2982,102 @@ "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" }, - "org/jetbrains/kotlin#kotlin-build-statistics/2.1.20": { - "jar": "sha256-TSjxg6dsMKjKwg56P6hwVMLdHbiGSzyc04nhjdmX0x4=", - "pom": "sha256-OR9tc0uDTJG3qAHiI638c2tYDb3ODxOafkvUdknATKM=" + "org/jetbrains/kotlin#kotlin-build-statistics/2.1.21": { + "jar": "sha256-OnYsHlWFWUR9r0IX/eK5grJQh1brECplcRlPEt1BrPo=", + "pom": "sha256-HSDrHKwGm5iFdxccNOBABfpcbmk1mR1ve6mGKl6uGng=" }, "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.20": { - "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=", - "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.21": { + "jar": "sha256-BrtrNnHUvDunTA4O+rvc1VXMwtTMLvZ80wnFc4yNHlQ=", + "pom": "sha256-U5ag0mBsMOA66ZSnl8b5FoTG47LZ6aRf1pLl6T7sDJM=" }, "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": { "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=", "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE=" }, - "org/jetbrains/kotlin#kotlin-build-tools-impl/2.1.20": { - "jar": "sha256-bpSJbjIWA+O/6J/vAkeORNHWSj0l1J0GlIkv/AHGCs8=", - "pom": "sha256-EPseNeDocGdH6Og+ro+LQ0BrpmTkIB7J38ua99prQro=" + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.1.21": { + "jar": "sha256-5sfxijIo9WypFAClTdrSHh14mp+aByY7VgyMlTR8Y80=", + "pom": "sha256-Wtkc/mCCSH5t8hdVjUcnCDB4vHVjy0zZBEt6e00sBY4=" }, "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.20": { - "jar": "sha256-xUoAcYyMDj7oWL9Cdxx/QBxePBc4hh4Y6VNjcQQvobM=", - "pom": "sha256-InQE6sbYCbwNlN74kzbf332afVOHkqI01Svbr8Kuha8=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.21": { + "jar": "sha256-Z6LjZzdl8JdyVgjMfIQ7DY/dlL2a9BMnIRNhYUqlfUk=", + "pom": "sha256-27+KwlUNWxripifyBPKLFvknHjbETYmUqjsTnL9w5Fo=" }, "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.20": { - "jar": "sha256-3jtUI9j7+G6ivRM01AG8SqhOKOxIlFlS0RwAsQsUArY=", - "pom": "sha256-xgNdI3KARTSALDfOVU6MjLqq6EUUp7rWzAlkJNjySUU=" + "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.21": { + "jar": "sha256-cKiXK7e+GyuwmMml2nC+wd1EyxBNTaGqbjPcVRAo1Jo=", + "pom": "sha256-/BmETtKRd+x6tsN5jR0DnaRroncb+HEuKcLyRFncW44=" }, - "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.1.20": { - "jar": "sha256-z4dQOryWkU8WnJ7WHTCgl1eMJrDaJmb90XLsfP8vrF0=", - "pom": "sha256-9CTFzFuaSpzOgM4GY2kMA4jf9yPI8fQ4vdk0q2F5JYA=" + "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.1.21": { + "jar": "sha256-ZxnS3XYgroz9FRtW0tPAyuV+ZC0ucosnKg6G0YQjJ28=", + "pom": "sha256-qeKk6p5W0S7L/pXHZPq2q+hg/eEN7c/LvT5X9W2qNng=" }, "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/2.1.20": { - "jar": "sha256-NjCjAYLGNXDrUZrmWqqUGSF9utCBT+3kLI3ecERlpMY=", - "pom": "sha256-+qpgvkJw6RSbWUOSZjlhkr60f/XjpAmF3u3FTlkXItI=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.1.21": { + "jar": "sha256-MHDdA1nv5KE0jAzpuVsDJHmXZVmLt7aHbxVJq1NH6U8=", + "pom": "sha256-TVeT9Xm3mUDoeCxYvWgbnxZL2yvvAbcq2b5pqR6uq+4=" }, "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.20": { - "jar": "sha256-2eg98dhHogG6PAFqeGztCRvpUDmX0J9qnPF5buSJ83Q=", - "pom": "sha256-sdOMCv1uHRXEjBxdFWzmBXj0MxNr7FI/TrGZ968/gik=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.21": { + "jar": "sha256-lAHv/YLehgbfMokwiidcwdNXN2hmXKXt0J3DGccXFfQ=", + "pom": "sha256-GbJjDusajsrIz3ClF2JBCiAXUvAxHrG2+RwB1B350dw=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.20": { - "jar": "sha256-sk9SbQ3++wKWrg9Ks2L51soCV3JcwnMIOprjN+ooJn0=", - "pom": "sha256-wKs06ffQCv3LIv0D5S6PhZpGR9lY4Lh7fQzSY0QWOlo=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.21": { + "jar": "sha256-eEu/b4g00ez2XsUf57RLQW8zBS6CGWKlm55/dOCU9pY=", + "pom": "sha256-QxApK3Qc26Bu6iaC8YU5U4i+OvPLATzIo+gei5NokQA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20": { - "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=", - "module": "sha256-AsJsJlASRw1yrc3buCTSOOayieEAzUu/moJ1Cj1Jv8A=", - "pom": "sha256-t02/6klcg6xWRwS6qDmk56W3kRiMj3llbJwZ3XfeLxg=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.21": { + "jar": "sha256-VY+KMrr1qH6WlMi7OVVwqeduCuqrqmg/msH83oujqsw=", + "module": "sha256-q9fHAOmpTF3zzNlek9LuqwwZJkXXB+rZXFzqR+gcwns=", + "pom": "sha256-QG8P2ImjHfVX+txkaouXADreDCRrX7N6YTYZFWMgUfc=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20/gradle85": { - "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.21/gradle85": { + "jar": "sha256-VY+KMrr1qH6WlMi7OVVwqeduCuqrqmg/msH83oujqsw=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.1.20": { - "jar": "sha256-6vELILujkjoH+PsYL7jNVlaZ4Vfuc9Elma8fXKuiUEA=", - "pom": "sha256-PdYeaTbcUQBs5MN+/+Q+/hQAuEHgnsSx7kqU9rkZOCo=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.1.21": { + "jar": "sha256-BYO5l57dTI9f78CNWRGCHpw7Bakbg5+hqgcPkm7ny6A=", + "pom": "sha256-FLbl3/I/lNzTMmw9JXv2JeRVsVCVJiBcILNAtCw1f6M=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.1.20": { + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.1.21": { "jar": "sha256-APb4Q6vJMNDGGrtOPjAsjRd2EpH5srwlhv4SsMuXXq0=", - "module": "sha256-td7wBfIpohsq1pJt9wjPhLqe+8TsGcY16/5baTcx2wg=", - "pom": "sha256-CjCxRdSY1H2yVdDUzWp3hMXx+QyL+YgsupWCKjvzMHA=" + "module": "sha256-gIWGw896zkzfCLEYX7yv0PVcUhNIUPNmUlr7rlC7xTo=", + "pom": "sha256-N0agkbc65RnLtbszwftDNKYyR8W/kOgidFL9wgZ9+k8=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.1.20": { - "jar": "sha256-1jf7pHCzv3E7CmXmcXrV3QOocl/MlFMCiUc6smtC6Cs=", - "module": "sha256-WJm5fnqbFx5sBeVJziqbo8ddJZMVnUsrAVZkFLVoUWo=", - "pom": "sha256-18CRV8ehutuNrk6Jv54N9FRbBM0DqqQJZqJm87hG0sM=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.1.21": { + "jar": "sha256-aATNXwXXf6lUrHt6kw57V/rgjK8CTiKRiAo8KKSfwHU=", + "module": "sha256-Ifoqg7FTeAa7x+1lVrmVIqXhbziR6CiKG8/ozf0mQrg=", + "pom": "sha256-G8Rcq/W6A2rdAmkEVCOxH0pXv0tPylnjGzxCspFmAcI=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20": { - "module": "sha256-6Ue1RPTNCcFQr9h5G70yoxN92uMEWn1TlL6lCaq5bFc=", - "pom": "sha256-H2OowlwTZmlled2VLz639CoKSns/avaRpIIjEwb82sk=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.21": { + "module": "sha256-fhIOTfygjt1IkK/gtou6WqifJ/uhHY/mj2ttoLISk1g=", + "pom": "sha256-wMnxGQvSSKV9G3U26ahPw/6d8YCwJMPlblGi7iwLz80=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20/gradle85": { - "jar": "sha256-+wFuZDtY4Koq7IkRDq8U54s3aMFX8lQ0V5X9aqEEk+s=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.21/gradle85": { + "jar": "sha256-6sBIdsGrZgNvYBb9kIM/IEsCNsJ2R1nK0GknbgLLQ+Y=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.20": { - "module": "sha256-IF4RacYovsBfHVnkTTIJFSiun9U6fjPsVDvO/bEojeY=", - "pom": "sha256-Y5ymx2U+Gp2pXfKjuuJsy3AcA6/VjHl6tr9vJV9kwwE=" + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.21": { + "module": "sha256-avSUrGVuckg0HOukOePWJhFtARfJ+9+Xq+5lcOEaCHc=", + "pom": "sha256-eTmPhH1rfKipak5GOf+iLhaRJIr+tOgQGeEdG9C7IFI=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.1.20": { - "jar": "sha256-EyGYEVmGCVkEsMsB76rh2BJJZB75FJ4Fs0T4ZKrpdfQ=", - "pom": "sha256-LZayVvD8kesSvOtuR2HhPXAf8TU/BZL8VymI2uai0Zs=" - }, - "org/jetbrains/kotlin#kotlin-metadata-jvm/2.0.0": { - "jar": "sha256-rY8cfbxaxG9cvS0uXeOcVsnbZd195xaoTgHOIIdYruY=", - "pom": "sha256-PyOxTvYPHkQ9bUHzmYPiOKpkiVjOHYmLarOcx8kYIGY=" + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.1.21": { + "jar": "sha256-Q+CkDB33nDOjBJkUvJ5mbkT7yyDwfUVo7qBZXpcqLHE=", + "pom": "sha256-3F+A6RGCz54qBN/XKdcOfTFOHt+NZGJLFm5o90lSw9Q=" }, "org/jetbrains/kotlin#kotlin-metadata-jvm/2.1.0": { "jar": "sha256-uNOpJXS6HfxJvfIFJW0e3gZkFIyxUKti+qhyteG7RjI=", @@ -2908,18 +3087,14 @@ "jar": "sha256-2obtTzqMiIVZLWuKppH7hge0nzdzyLvQjDsUoxsU0v0=", "pom": "sha256-OZxrMFNXrzLnNKHaSNydMR73ZhVSBR9IHHJPBeTNwBw=" }, - "org/jetbrains/kotlin#kotlin-native-utils/2.1.20": { - "jar": "sha256-pyVic6u53yI1kk2A/dNtZ4tFhGfDB2xmhRxCQ3vdPGY=", - "pom": "sha256-1Gec6AsERY5fzL1pteMUvxwMFnmH4EOVRv3+z7U+M0Y=" + "org/jetbrains/kotlin#kotlin-native-utils/2.1.21": { + "jar": "sha256-3ECUhclc04pfMNWHjr6ai/Lm5vJUtv6eRcygmZkF4HA=", + "pom": "sha256-2RW7ZEMRhfvbhlxNKxLmuniqaME0fFnfrieaMqIyhPk=" }, "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" }, - "org/jetbrains/kotlin#kotlin-reflect/1.9.20": { - "jar": "sha256-SbZvmonVD9KVTC6K6sgOT0iLCgkyKiXvrWJhV2cT3A8=", - "pom": "sha256-lCtehgLTF+wTZS8cAiIFK7kIF/KM9v6dRxEvCbPo5n0=" - }, "org/jetbrains/kotlin#kotlin-reflect/1.9.24": { "jar": "sha256-plFmRFu4XvgWzeEnJ5/gAX0rfMQ5s7lyOQ4bc21k6Uw=", "pom": "sha256-CghcMAUb1tSrdlrVoMUXnEE7NfdBjyiDFy+9m6GrzMk=" @@ -2928,6 +3103,10 @@ "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" }, + "org/jetbrains/kotlin#kotlin-reflect/2.1.0": { + "jar": "sha256-tfYI7fqYqM+iNyzBLRitqXS+HFbBCT7/BswGH0/AiLI=", + "pom": "sha256-nNhLPU9xfJYjXkujtydolcz/1V3kEcfOCz97q1Yu/kI=" + }, "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.0.21": { "jar": "sha256-x88d6VXfIqFihyImvQZ3yaDItmMKLi1z0R0UfNDFO3M=", "pom": "sha256-cWKsEOFFTpJ2c7FcrQMp2jgvt1jmVPWfy0AHRZ2eyEE=" @@ -2936,45 +3115,45 @@ "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=", "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/2.1.20": { - "jar": "sha256-rkOX+7OqKhraCSkOdTu6maQRRUiXfDEVUmuZWPTLGgQ=", - "pom": "sha256-D4O1qQFWxhpv8QlVey2YjicQ7j++n0pCV6bqDYdIw9Y=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.1.21": { + "jar": "sha256-2CIfRFhU8wrJLCSNVDYJ4Oy12Fu1ujTAQ2hLATy1uJc=", + "pom": "sha256-/RCT8ncp9uYMG6xjkFYkDMXvP16zQUT/LqgahFeBFJQ=" }, "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": { "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=", "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/2.1.20": { - "jar": "sha256-X9v2rnIjfOM11gPrEsSbCbycGjPAwB8dYud/8zZjzvs=", - "pom": "sha256-H3dwkEXdkF63UFqUKA037HV/CHCc/p86dKunO7+Z95s=" + "org/jetbrains/kotlin#kotlin-scripting-common/2.1.21": { + "jar": "sha256-RYLip8B/lTOptKZAijKl9Xll37FF1kaGCthn1GMIQ/E=", + "pom": "sha256-O04w8DuW7euw0ThjDCIwSN5w6MQILJDQaUPsok1B7tU=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": { "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=", "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.1.20": { - "jar": "sha256-PU93KyOEFGUAF+l0YiVrfE1e36EBPL9Ud1c+sawuKIQ=", - "pom": "sha256-D/9/8dO/qczj77tNs4mJwmilHrZ/ge/QMRuKZGGLhak=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.1.21": { + "jar": "sha256-tbHg9AYvkc/iFtcGF+ivl3S1KI/YGeDOX2BQ+Nhukvo=", + "pom": "sha256-SCLW9orULZzZRP1zUpClvbXN8Psd1dpszG6F/AjtXfk=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": { "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=", "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.1.20": { - "jar": "sha256-9mXXCxoIN/86Dve+xPxdn+1n6nXkaX3hWOtR8epQHD8=", - "pom": "sha256-tjmuINh6gV4wTd0goOTEk34Ttfx6Qme14VwOWQIphmU=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.1.21": { + "jar": "sha256-oSlfKCsHDAzv25aGFPb2SqcfG9vnRvHt9jUnQH1dlrE=", + "pom": "sha256-WM84eKRG1G8/YECYa5wrU9f3pNneB+0mQzNdWAuDdgQ=" }, "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": { "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=", "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/2.1.20": { - "jar": "sha256-afRXrKuYNkwOtXjEl+DDypMLjPuCvndASdoEzeOAh/c=", - "pom": "sha256-PERTORE37EVcdL5Jb3HZpJhpbSVJvmT1mmBkfO7iVT0=" + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.1.21": { + "jar": "sha256-s/4fcumtSC1yb4nhOfRcSv57P4Ct/kzckdzAoiY3l40=", + "pom": "sha256-ghqPEByspjga2jbyM7nJH8wIhrNYT16qXPMESEm6tqI=" }, - "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.1.20": { - "jar": "sha256-5pZQZxDSxI0BfMiczB6kkQF5lXcJK3Ah/q2pX/Yv1X8=", - "pom": "sha256-Al1rBx59fPPsennw0/5He9Ydveir9ZbYn41DL3wBmCU=" + "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.1.21": { + "jar": "sha256-0hSA7OwU4CLaICr7xAkWfFPGT/ZAv7IZAiMP7cYoXeE=", + "pom": "sha256-chwbOMaiiJdBO7rhel3WMPRMBPlGiXNgTP4fYy42Z4s=" }, "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" @@ -2987,9 +3166,9 @@ "module": "sha256-fgul3UlZnOJ2woa+M0hY8lEoSiD3bbm8D12g+8mbtfU=", "pom": "sha256-u8xfrT9+3ktGnUnbpsA+GZMTNlW16BcTteahvt0c60I=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.20": { - "module": "sha256-lNCtKyMZuFxANRz57nB32hLdOFA5LmzxCj/oFZ+8c/c=", - "pom": "sha256-1iLjAAVmBil0Qmj6iRKPt97U1C4XTOsIH2f3BWrJqLs=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.21": { + "module": "sha256-pNj8FM7bN3mEOkf7zlIv0XPph1CRlk26wbjdeIT2wfk=", + "pom": "sha256-kk6Exb2AM5n2nFspYmsTKpSwBAL1X53lugGNyBHfo5M=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=", @@ -2999,14 +3178,14 @@ "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.20": { - "jar": "sha256-xUUdZ6J/M6/QmRPGfhzro4l65wiEsk7w/3EVflW2CGU=", - "pom": "sha256-AS4cVe1q3kF7y4JBEuvqaCrWJd++4WCFw3nM+hT68DM=" - }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.24": { "jar": "sha256-tmmbhQugeJ8ukEJ5zYvce+qRMP/RV826AB/HQl2KR7c=", "pom": "sha256-RYapN9W8vDqzBCwECaHHKWFLy6PHpylvJS1ibuNzh9Q=" }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.1.0": { + "jar": "sha256-/epsQgNyT0Lo5kvvLwv3kSnM0d8e3xzP/cIt599JjHY=", + "pom": "sha256-BvvBTssUoK9HtaP400dj9JM9XLpaPSRQRb/i8r25Gx4=" + }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.1.10": { "jar": "sha256-L4dvs1tz2YBuyFAHAyZavL1ap8PIH0GiylSoVahkmzQ=", "pom": "sha256-6yvOL/52LUQE2Or+lYF3XLxbkLsfl/0xZLpyJRfTvsY=" @@ -3019,26 +3198,18 @@ "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.20": { - "jar": "sha256-+DP8yU8LscMbnni9S9p+oj9Xn/NAiuGpTi61dHCGoqs=", - "pom": "sha256-o7B96wkfKu1Z1lWYhPRPmc/135ufo1okvNa4sGnP9I0=" - }, "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.24": { "jar": "sha256-W1u/s+EYS14TMXw9QiN/okrdRDsud4GWHuozTbE2rbE=", "pom": "sha256-BuBt70n5aq9uXD7EKDauWdbi2mJUcAkUKBZ1Z53J8qU=" }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.1.0": { + "jar": "sha256-I408fkkvEZtQ2hwiVG3XYkYuVfIkCWEfXlPdd2Jc1UQ=", + "pom": "sha256-52K4xFaQropqNd9YT1S+nJ2mWIXmGpBUJq6vylk34c4=" + }, "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.1.10": { "jar": "sha256-sJJg6kgo3Gz8Z9JhJ9rOOK4ru+ilZdLQKXJegcLSWOw=", "pom": "sha256-YGyBfFx/1hFnDVWVK1dz+lxo8OPNJyelXe07GzzKLYc=" }, - "org/jetbrains/kotlin#kotlin-stdlib/1.9.20": { - "module": "sha256-3Mql0xVHD6s5IFAohru4Xy2myGECxl2cBEEFRO7bIBk=", - "pom": "sha256-43IWpzLI6Bqf0FtN2JLDDKwMrXtOP9ovlmP0jogHQcA=" - }, - "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { - "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=", - "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4=" - }, "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", @@ -3054,29 +3225,29 @@ "module": "sha256-jSwdcXxzVG1WOC0TbIZQtZpxWZQBciY4GJNKzkTLBI0=", "pom": "sha256-SSISHT8LxgzkB/Ny3kLQKgt+lOddDD0VCLaDVyHySe8=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.1.20": { - "jar": "sha256-G8x06M6E4sJeqv3hDxJINJzOMGK242l4y+7GENsekwo=", - "module": "sha256-VdKW5FRF9siGmbCJZwbqlVCvh62Uhz3BO2W+u9VmCm8=", - "pom": "sha256-Z1DheZ7lAgd9rlw9WZeW9mdgb2DTXpXLeQRI3HkStAs=" + "org/jetbrains/kotlin#kotlin-stdlib/2.1.21": { + "jar": "sha256-JjvcZ54fYgEtt7CReWJ5ttcc829Hl6mP8azgWDXyAcg=", + "module": "sha256-DTc1BD1ot6WvtE0n3mX4Cp0rIIRicJwu27SP1bOVrYo=", + "pom": "sha256-xVJAhso+SaZ5ht+P3M1mA3uvXzxaNYt2+d1gm+57tjg=" }, - "org/jetbrains/kotlin#kotlin-tooling-core/2.1.20": { + "org/jetbrains/kotlin#kotlin-tooling-core/2.1.21": { "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=", - "pom": "sha256-PO8cS3yC7KjMAcMMrt0VSQWeZfL51BYsjJ13+6JBMXY=" + "pom": "sha256-RdzNNvsgz0B28XOMmbzt98rdd3Xti8cWopgr0VzpaDA=" }, - "org/jetbrains/kotlin#kotlin-util-io/2.1.20": { - "jar": "sha256-gqOymmEdR85jSuLmxQnN4qhvlLI7hr4whk6z1Lj+jn4=", - "pom": "sha256-eSQnftICC4UQ1F8N0QgREmVoEDAH2D+ZcfwYRmC9hKM=" + "org/jetbrains/kotlin#kotlin-util-io/2.1.21": { + "jar": "sha256-43JJKisFVtYv0Djj7fxFMbVQZUhs4o0E9HBj0rwDDBw=", + "pom": "sha256-XzfSWuJDprEFAHoH18j0Wd4zep84fMiz63VPmNZCoA4=" }, - "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.1.20": { - "jar": "sha256-8tXmhHFbkgtghJaObDPIuwWwtrl5GYAOLyIdlBgkDH0=", - "pom": "sha256-hCdVuVwx20vbks9tQshUGhcB+ivc8lIahwa8sDKgoZc=" + "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.1.21": { + "jar": "sha256-lMf8tAQF9WSCQAuqI1yW6BAQweBDv/YwC3CzTl6o2bs=", + "pom": "sha256-eoezrWbdJ6gKAzWv3R9Hij3SrldqmpQ7sfN2ORv435E=" }, - "org/jetbrains/kotlin#kotlin-util-klib/2.1.20": { - "jar": "sha256-/3nFsObkLZIOuxx2uhDMLdvyJOgFZFqO6sreSRbiqs4=", - "pom": "sha256-ps3TjXdd/QfQe9FZ00LPegqWg4qH50guIgxjrtluEoA=" + "org/jetbrains/kotlin#kotlin-util-klib/2.1.21": { + "jar": "sha256-pSSDHpeV0+dW1N5Uy9WyEN6Al9rXxHiryVeuP2DgpxY=", + "pom": "sha256-CzeIoSSkcVMm+oZ3iFz7KYkf73jLKxbOBhP/JBCZ9Rg=" }, - "org/jetbrains/kotlin/native/cocoapods#org.jetbrains.kotlin.native.cocoapods.gradle.plugin/2.1.20": { - "pom": "sha256-Ud4AgMpY7sAcC9faZsz6yM6cDwasE2UJDIAuZ1j9hTg=" + "org/jetbrains/kotlin/native/cocoapods#org.jetbrains.kotlin.native.cocoapods.gradle.plugin/2.1.21": { + "pom": "sha256-W3YfMyOOHJGrslM/z1sgHbSWwYmGNFs55wlJAvid+JA=" }, "org/jetbrains/kotlinx#atomicfu-gradle-plugin/0.27.0": { "jar": "sha256-Ol911FKwg/txpx9fTjcvZH5kIguP1fXyk4pBDj4ESXc=", @@ -3109,6 +3280,9 @@ "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.1": { "pom": "sha256-nL0EumPnOZhWdFcT4xLS8hYaHUTtpQbe1HyNVtr4Rh8=" }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.2": { + "pom": "sha256-+vDGU45T3cBJmmNmTY52PCFlgLLhjnIsy98bQxpq/iY=" + }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" }, @@ -3120,6 +3294,11 @@ "module": "sha256-GN1lRl7IDQ5uXXGBi/EZLvSBfPXSASgrW5sbcTrHlpo=", "pom": "sha256-f5AURlw6uheoNXqJZcqcnKjJ4aBEfHrqEXxkB4CKUtY=" }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.10.2": { + "jar": "sha256-XKF1s43zMf1kFVs1zYyuElH6nuNpcJs21C4KKIzM4/0=", + "module": "sha256-6eSnS02/4PXr7tiNSfNUbD7DCJQZsg5SUEAxNcLGTFM=", + "pom": "sha256-ZY9Xa5bIMuc4JAatsZfWTY4ul94Q6W36NwDez6KmDe8=" + }, "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", @@ -3134,6 +3313,10 @@ "module": "sha256-y/1tFz4KXCmGr5U/ixzPKYAqrQnqympOkRQQj4rKyLE=", "pom": "sha256-Ip7SIxgcPK8nt6wwHIFp3KLYYxkbcQ5hNVGlh5XANlU=" }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.2": { + "module": "sha256-j+JUF35xGnzRijwG2CQvzpRfQcLMoT3BmzOuQqVDUBY=", + "pom": "sha256-UZ2lQACW80YqTa6AeDrQUEE9S8gex65T+udq7wzL7Uw=" + }, "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.8.0": { "module": "sha256-FE7s1TZd4+MNe0YibAWAUeOZVbXBieMfpMfP+5nWILo=", "pom": "sha256-yglaS/iLR0+trOgzLBCXC3nLgBu/XfBHo5Ov4Ql28yE=" @@ -3143,24 +3326,29 @@ "module": "sha256-Z53VZCkanbzH7lbmZCzzqdB7BXGWj9lN5BachzJ/i8U=", "pom": "sha256-UqJfb2ZMxFkJQmTVEDOeVYOqyQJ/DqqqPXA1XHVQkkY=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-swing/1.10.1": { - "jar": "sha256-qOh6sO902a8KkWo3y3UtfCrrYhHyXWI3mYI1nJZWHdo=", - "module": "sha256-P8dvci/OUdZsWememwHmFMozLBpiW1j1/7H/ZvoBGgA=", - "pom": "sha256-pxygooWV1T8YLSaT9FWC0KsuhQYYe4azqQWNMUR4Y2c=" + "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.10.2": { + "jar": "sha256-1l3uPK+m97+u/ttJP8aLXGOr51BzT7ivkvrHoNMQFFc=", + "module": "sha256-B7xJACLGWAQpQfUrFxwPXOBkvWxjUikEMDmS5BegRbs=", + "pom": "sha256-xHdj+siNuwlDhJ0W4RucBdReYDhMfNExBe5xD7TdX7M=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.10.1": { - "jar": "sha256-rD9FbJ4lw/wBVC3CCGVdBYPNN7X3LDWFYme3S9FmSrY=", - "module": "sha256-1Vy3uqS9VxhXovsAlq2pCDkpDPbzlw3hyGo3SusjhYI=", - "pom": "sha256-TvSo5xgZYDxXlcn4ejrRwLktoq61ANQ7TdfkHn6EoYk=" + "org/jetbrains/kotlinx#kotlinx-coroutines-swing/1.10.2": { + "jar": "sha256-Ar24XyDsCABEKav2iH6NDkDzq2N9dGL4F/D4q759HrU=", + "module": "sha256-kFK7SUS5FqUGX2GNfUb+EqTAxonQIbyYQ1v4l3WIsWQ=", + "pom": "sha256-zt+0Miu5cVkXrmmCCeoS3ziKuliVy7rRxWcith6EQ8A=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.10.2": { + "jar": "sha256-WQpUn4wdtZDJ2YqKIEJKH1gaNBYqNp5qa9iEzn0209c=", + "module": "sha256-VrIIF8xRrYi9tZwBIWsJiXzU+mmNUXu0d9kqlyp6Gq8=", + "pom": "sha256-Y96yqGiry+JIjrzrqnXnMbLvIQQQO4FzjnY3/JolpfM=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.8.0": { "jar": "sha256-FTXMH0MjXYVm+NW8bRwR8HBBF+TlY/Ls5+aqPmhpXyA=", "module": "sha256-HS0Zc6L0GowMEmPmCyXneS9ji4xV18ocbQZztkvlfac=", "pom": "sha256-BtHlPqNm5to7FxkwV1+RYnzxnkUqTnqfDeMNLwQdZFE=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.10.1": { - "module": "sha256-AkvK55oMK20YsLqRTJ9d4UW7+8nckZ8nD4lbLj34cVU=", - "pom": "sha256-ZpLE67CEkFdBfJclBfYjCNOoV62m66JGnTM40HX6JXM=" + "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.10.2": { + "module": "sha256-QiByzuO2n2jVsVA7tmUb54lGsEw5KEocwCbM6L3x+AY=", + "pom": "sha256-vyXI3w7J8+rHu+5Tm2AbYBm36Z9fPzAR4ugXixQHUNs=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.8.0": { "module": "sha256-DsPHX/2ZpqLfto8wfy8vcxQckz5Yt3sQTxyMrDr9U5Q=", @@ -3217,6 +3405,9 @@ "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.0": { "pom": "sha256-xD5IdSnM/RIJ66hlOrjolZggNGSq+/5fBEje2ZKHFQk=" }, + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.1": { + "pom": "sha256-APNVWudiSFHGfbEsMIvJziauMnzw1yR2akAeW6AGCMc=" + }, "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.6.3": { "jar": "sha256-KcghqNTiXL/k8s6WzdRSb2H49OaaE1+WEqNKgdk7ZfE=", "module": "sha256-MpEE29NOS96QVhHUJ8dYTlPD+MQRg2+59pmsnbpbqmw=", @@ -3227,6 +3418,11 @@ "module": "sha256-NzH80jhWGpCpdSs0hfHWNeAbRF5Kd4F9ewd/S50vQi0=", "pom": "sha256-QVKRtvWbeTemcau136BLJyl811jLUQLNzHWUFJj5wDw=" }, + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.8.1": { + "jar": "sha256-NWW21NeJv3BoPEVWaUQof8HY3HXCPZi9h9AQWcx28rM=", + "module": "sha256-++GdWIrX1fZGZmaCA0/0Tglo0iBx/mzPn5ngPHpe+lc=", + "pom": "sha256-RGZV6NQ4KL+7OHzp0VGpNxowkrSLkJ6AYGtT/FiXnig=" + }, "org/jetbrains/kotlinx#kotlinx-serialization-core/1.6.3": { "module": "sha256-Nh6eMetylhdLdAhaxJ7dhKTzkAupQxpOQM0cI952oyg=", "pom": "sha256-0tv2/BU2TIlp1qq24+zMdROZU/LMBXtzDjUmdGWztX4=" @@ -3235,24 +3431,36 @@ "module": "sha256-mE2aqabpvMONfoNuqNAAsThyCH/GZY0NjWIldjPzlfE=", "pom": "sha256-nVbnQWLOQn4MSetsuXUSR0Mq3PwukTw4KWY+27qr7hM=" }, + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.1": { + "module": "sha256-eL3oMFSUrxs445ZrUleskINAFkk/i60hm4iGx/vbJdU=", + "pom": "sha256-Rz8Ko+Sheqt4YNykkNxC6rthJPHSlT5qmVoIcX5QxxQ=" + }, "org/jetbrains/kotlinx#kotlinx-serialization-json-io-jvm/1.8.0": { - "jar": "sha256-q17I6kiBUZfEan359BimJ5H+kc2lAjuUHOTehy2BDME=", "module": "sha256-/pQ5hti3/I7HoytonItHbDDM9KNbcKLEWxtffZ00BkM=", "pom": "sha256-PbZlvwY1l3Inc9mKLQpqSps0FpeEFOnTYfICjTUc0yg=" }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-io-jvm/1.8.1": { + "jar": "sha256-q17I6kiBUZfEan359BimJ5H+kc2lAjuUHOTehy2BDME=", + "module": "sha256-vz47hoSxN/py0pZVZ1/c4xRGewh5JikYMm2vedE+Afo=", + "pom": "sha256-27ETuPvVUEVZjiTmATIGrrzKkSr+Vjnr2VJjC579kjw=" + }, "org/jetbrains/kotlinx#kotlinx-serialization-json-io/1.8.0": { "module": "sha256-+3LQaky980DBOnBPywfUsWJ66NnDCtZnEwb6x1UnB7Q=", "pom": "sha256-xgC76woBPRA7cbGCa+t0Sbnv/5x4Knl0JKoOdV+Cw0Q=" }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-io/1.8.1": { + "module": "sha256-WTtZ8otvvbjsNRD4+ZQksTTlv8Qe2GS82LAiDv4APnM=", + "pom": "sha256-2e2KSEKd687/Z05u1OdgPR1K5Ao3lWT9BlPQ3V9gJb8=" + }, "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.6.3": { "jar": "sha256-0yNBebz/GIbVPWfBHspH9/PPe2PDSdFpZfbbUbfz3Zo=", "module": "sha256-InoqmtOMAQsQe8gFjNYVF32lqqhts399WNSdnJt/l9A=", "pom": "sha256-eN9n0GTTuq8a9Ohi6YFGl3YpfGyHi7e/G0Ljky9vr48=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.8.0": { - "jar": "sha256-e3xEWIDO+U3EZPRzPaGzO5S+54gFBB6giuBuhQfkYg4=", - "module": "sha256-l+NZl/6prZY63lv0wDko/lOXS4JlIdSwP7+zyrAgiqo=", - "pom": "sha256-4CSBj4YiByqIM8DTmVd3Uet3ZJymO9DA/AYATWaRd6Q=" + "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.8.1": { + "jar": "sha256-h2nlZHVX43AJGcMtUI9cXa1TxdgjTNEIRjVPvP8UqiQ=", + "module": "sha256-uZHLSTQAwdlgut+oYhcVjGN+XsqIgbIM0BJbtOz8+DE=", + "pom": "sha256-1mXWtB/gWPZmpvOGrS5JzBAe+P0u7+/vy8ER6R7oJDY=" }, "org/jetbrains/kotlinx#kotlinx-serialization-json/1.6.3": { "module": "sha256-gNHYf6CmO/+Dleo5EL2oDQnw9YNQTd6o7QB7x6hrTNQ=", @@ -3262,31 +3470,40 @@ "module": "sha256-lK/eU8GRw+Hge5+AiqF3f4YryKlbxQtGYozQkhnVaFg=", "pom": "sha256-WAgq+Zc0Ah1bjbKcQ1sR1FyhGxwP14bHhFIsnSxxeVg=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-protobuf-jvm/1.8.0": { - "jar": "sha256-hWHBft8F4n6AKDDzuOnQrEoBhIxcM6eQMpMjgttxzjQ=", - "module": "sha256-wfxTEVd7TXf5mSZWiG2ZqcI6JfmoL8Ka1GkTai1e4fg=", - "pom": "sha256-c5L1fbU2xPK4BkfZQD9mho6mdHuoBFa9+0S/UNTdMY0=" + "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.1": { + "module": "sha256-f33wBUM932BPUqq9avsh65YJMZfLS90Hk8SEydPEtnU=", + "pom": "sha256-x3AMmcg94CtGVBo9fktps4h0m3wPV9zrRU0UPyzYens=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-protobuf/1.8.0": { - "module": "sha256-C2UuSc1eykX730eSf6dH4dgsU8l8IcBSaozSeSAvyLY=", - "pom": "sha256-FGqb0rgoDpxfshb2oI9pSq4OYaroqFVB9leDfqf7QcA=" + "org/jetbrains/kotlinx#kotlinx-serialization-protobuf-jvm/1.8.1": { + "jar": "sha256-+9F09y6oI2S6oRIGny17NhdY9raL2B0qxRsCxmpI6SQ=", + "module": "sha256-klXX5uXZzp3bV2f6KNPGmShYhGZ+kaph4bE12YjuCJM=", + "pom": "sha256-pYV9XmD4gWHKeEQUai/jfyiV+B5SMJCbFRtKPY7AMpw=" }, - "org/jetbrains/skiko#skiko-awt-runtime-linux-x64/0.9.2": { - "jar": "sha256-1bqEsjiWPQTCXG6mfgbqhfjxIPY38iI7Jx/xmyCHago=", - "pom": "sha256-dgQjvLzTxvtYTM38ZmbILq0cjCePzc0hBw3drAh0WMg=" + "org/jetbrains/kotlinx#kotlinx-serialization-protobuf/1.8.1": { + "module": "sha256-LZ+TjZbK4twphqfvbyy9Fnan+HVLLVH8vk04Y92rfD0=", + "pom": "sha256-YTuFlIYGTe0T+YpQCtBJ284ZpY/DO/d3ajgSx9Cg/RA=" }, - "org/jetbrains/skiko#skiko-awt-runtime-macos-x64/0.8.18": { - "jar": "sha256-czu+FuSlNbp4+zYYaaM20jfZXipSidJWnSlZudWeeGE=", - "pom": "sha256-yyEZbtoYT2eJZvn/23cBJe0POPoqYIBS7ObM+fLDjtw=" + "org/jetbrains/skiko#skiko-awt-runtime-linux-x64/0.9.4": { + "jar": "sha256-K/JrgqV/rbUG6YHu97n9OESGzce5P8hBo+cvTD//q48=", + "pom": "sha256-x87oAckGYo48fc3MdHyDBENGgG4SkFuK3U0vwkIXpec=" }, - "org/jetbrains/skiko#skiko-awt/0.9.2": { - "jar": "sha256-4fgV9E9dr88S9nPNozVa5Zw5dUv5nzsR9tAP1wAVYUg=", - "module": "sha256-cRS/M68lkIkGDdO3c/8ew/0ZhGFmN1AXDR+ArDc7/D0=", - "pom": "sha256-u/8yFQDlUOusYZRHz8OFwTW3aYV6Jy+Wh8rdXnyBuXk=" + "org/jetbrains/skiko#skiko-awt/0.8.18": { + "jar": "sha256-Y39d4aII8TaKxRtaKGpIJ87IKM1i3aMy3DQAuFQ+JD0=", + "module": "sha256-x9JON+j/js4Y7OdEg0Fxcnor1L7z6/hZBlN1in0Bbmo=", + "pom": "sha256-yrIp0lDLlzYK12MgQfCHFksKR+d75huz9VRaLWtAlJ8=" }, - "org/jetbrains/skiko#skiko/0.9.2": { - "module": "sha256-9bO/I9+wmkJel8IVGQUAdw5PvNU3BMSVHJQzhkibmYc=", - "pom": "sha256-gDnIMi9XqGWuacIkOKLhw8qTahFfCuPbLJYYoK79bxs=" + "org/jetbrains/skiko#skiko-awt/0.9.4": { + "jar": "sha256-jiarGudfZXhva5c6ZuiaKDbRmaVWHEwu28Hz9nrSGX8=", + "module": "sha256-6WvCmRgCYinm3hVXvLdC77ge6ocR/8thzINEmp6h/FY=", + "pom": "sha256-lQozgiK9sdX7ttlxbC2l9UtB05NgMwp3eJcaukCK/CE=" + }, + "org/jetbrains/skiko#skiko/0.8.18": { + "module": "sha256-qbGDSU+EVPtX7B//+UyyqL7u3aG3PSjbbrS4+NwKU8s=", + "pom": "sha256-ac1xXT+/dr0QV571/D69q1RfiwxFm6iWzcbeoMETzAw=" + }, + "org/jetbrains/skiko#skiko/0.9.4": { + "module": "sha256-XHG00ajc2rFNpgCC5BSxKvXw+y40aDkBn3+kG+eGW0c=", + "pom": "sha256-jGpkAr2GskEIWA/3Ho3wKSmhzCad6arvccqVNxfQC68=" }, "org/json#json/20231013": { "jar": "sha256-DxgZLfKJEU4XqhoNCn+DcsyfXH5Pfjmtz4kG/nFPp9M=", @@ -3301,6 +3518,10 @@ "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=", "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y=" }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, "org/junit#junit-bom/5.10.3": { "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" @@ -3313,10 +3534,6 @@ "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" }, - "org/junit#junit-bom/5.9.3": { - "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", - "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" - }, "org/jvnet/staxex#stax-ex/1.8.1": { "jar": "sha256-IFIlSQVunlCqNe8LRFouR6U9Br4LCpRn1wTiSD/7BJo=", "pom": "sha256-j8hPNs5tps6MiTtlOBmaf2mmmgcG2bF6PuajoJRS7tY=" @@ -3357,85 +3574,55 @@ "module": "sha256-tNPURyLcLU+zp0XR3bPrI2KkCTxbwyQFXPR2947iSbs=", "pom": "sha256-A9Q+KKmVsrk+45mKFLodgLiJsyAbdvV5ZlKhNzhDIBk=" }, - "org/openani/mediamp#catalog/0.0.26": { - "module": "sha256-I16xb6VSWCPEXR00K6Pqe+1Ord4hoVegIdFJCjiw70I=", - "pom": "sha256-itzCsDj32fyeFUTVTKskJnG7J9I1ketiWnzmCOCjNfc=" + "org/openani/mediamp#catalog/0.0.29": { + "module": "sha256-s6r4l6CUxAxXNrk0x4papHn7CT9Agn+VGhA5gde45/8=", + "pom": "sha256-E5GiqnTrK4imwFM7QBmAAhhxDKijBAIi/mwyH3FUuk4=" }, - "org/openani/mediamp#mediamp-api-desktop/0.0.26": { - "jar": "sha256-wq88zxU6os+DET2GQqnWf7IFQisk8nQfuOMm7yaRhxg=", - "module": "sha256-Robr2Hjhc9Mucq0MlPX9uDbPTGU37OM+EQMyCuyGCFM=", - "pom": "sha256-rYSUUSwrno45hElP5s65pi+HpfySFdniNZAgLsxFs5Y=" + "org/openani/mediamp#mediamp-api-desktop/0.0.29": { + "jar": "sha256-k4Qsb20oECKLw2ZQ+QH7rCuKl9W3kM9nfJRWF0cTAlE=", + "module": "sha256-InxhvamLA6cAcu7JPORsd+NoK+eeTjlmg+kXHgUL8J8=", + "pom": "sha256-4yVSYeA9sIcF7x0W9IOSNEtURY10iC9gvsC00JZ6GmU=" }, - "org/openani/mediamp#mediamp-api/0.0.26": { - "module": "sha256-67z9qC1RG4iuQ4LkN3hZX8nU/RlqJdB5kgR4WZfdAV4=", - "pom": "sha256-/YHwjj6d4vOu5v9yr9ctEAV7J7aIQPtF+Nc5Zy5Z7MI=" + "org/openani/mediamp#mediamp-api/0.0.29": { + "module": "sha256-5BiLU2hqMh9twBjyMkZymeltSP5Lvhqm+Ebram4FJxk=", + "pom": "sha256-bxPAiiGEC3XucMnl+KwnQfP1Q96RlQBpHw459rTU9os=" }, - "org/openani/mediamp#mediamp-compose-desktop/0.0.26": { - "jar": "sha256-oC7g3ItyOR0dT7B8L1ncqpQcYYmkC5CbbgKfmXBbCxQ=", - "module": "sha256-KUPXp03ZHWwJoFW9Yv3G7qZ6KVnzu9kXaHko0sCwa1M=", - "pom": "sha256-gCRVtSffFrskMft9QoPlP00xAkx5fO0RufLK6F+XDPQ=" - }, - "org/openani/mediamp#mediamp-compose/0.0.26": { - "module": "sha256-GourAD3L6fbG/2vk6sAcWFbAixi8JMT8VS4hLM5vKGg=", - "pom": "sha256-kDFj3l1wpEcOGnBM5+auo4ir1muIHfb9NW9PaZ8exG8=" - }, - "org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.26": { + "org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.29": { "jar": "sha256-CmvsMdXJcrr1UcbNQVI8OyPqwxo9pLKYoa1ye5k0764=", - "module": "sha256-5IKmn1mlfajGIvv66eSr8SBOU+V5dcndh+FlU8gf5nw=", - "pom": "sha256-rWfE+eWilDOkDWU2xLzA+qv2x8/dF+Qwhet7lGVTnd0=" + "module": "sha256-3ZMls4s+OGQgPoXLFBqB7WbyE1Qn2f84XoXw0pOdtUQ=", + "pom": "sha256-nN9HUn/RfKtPCOSNiD2URA+IBpkSwWWt0HZO8CZjtEE=" }, - "org/openani/mediamp#mediamp-source-ktxio/0.0.26": { - "module": "sha256-YT7EHwxB69StjLsu3EmPYhb4MWHJLxLfJ7CSy+X7INk=", - "pom": "sha256-Fd7cpjCUJnGnofv2uq3DqePrH00ahYT+f96hVi3Grlc=" + "org/openani/mediamp#mediamp-source-ktxio/0.0.29": { + "module": "sha256-As/GVZGSN4hAfby3KRxBzyMMUpuNmy24wVPlSQ4ABww=", + "pom": "sha256-Zd+xibJweb9/tUsvBKtkQm8REPIRs9JI/q6D4uGBDag=" }, - "org/openani/mediamp#mediamp-vlc-compose/0.0.26": { - "jar": "sha256-FpRyBToA2qz5SNOQPmTDKr+RO/AZuco60pGvUHueTLQ=", - "module": "sha256-0RYTOM3zHsvu9VY9GIaIUYXyZhIWJGh+qVbt/QuSoLY=", - "pom": "sha256-i1WxsUV+u/uKjTURro7eR08gU55kI2G+v31g48BCTpc=" + "org/openani/mediamp#mediamp-vlc/0.0.29": { + "jar": "sha256-IipT5VaRSsRsF0+DOLb4ZEAVSVIVuSVMbydWzTgjN6I=", + "module": "sha256-3iXzV+GUgG26i6JGs+KuifxMAqw6n91hvFBnY4PhGH0=", + "pom": "sha256-hyzw9+4O0IBKsOBpmMYXFbYOFfhxlAXtvx5Zb2I2bU4=" }, - "org/openani/mediamp#mediamp-vlc/0.0.26": { - "jar": "sha256-6kpP5IZcVMPP+YlO5zSgYaMhi0LpbLGSarofI17Qviw=", - "module": "sha256-19aWYPuBD+jGAxH+vYjlUUmqGnl+XGs+jguNlO3724M=", - "pom": "sha256-gO7O6O/LGGPEvgOCoQzgcrqAdSWesJqc223ZVlC2yXg=" - }, - "org/openani/mediamp/catalog/0.0.26/catalog-0.0.26": { - "toml": "sha256-OuAXWWvPwKdSS1Xx4zrv4tcOkzYl5BpsbwQb5+gX88g=" + "org/openani/mediamp/catalog/0.0.29/catalog-0.0.29": { + "toml": "sha256-wNPEmb14ugDo4NPEcf8lY0hRcCOGDFmsDGcHJqUSq5E=" }, "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" }, - "org/ow2/asm#asm-analysis/9.6": { - "pom": "sha256-+j+ZUCHP9PQTkwbmz/7uoHU5EGRA0psZzAanpjahOFA=" - }, "org/ow2/asm#asm-analysis/9.7": { "jar": "sha256-e8a8vCE3mUigyMRn+w+GQgbluBj2vAtUaHL1yflBVW8=", "pom": "sha256-nDMIDry2Ma5Pd+ti7We/xAy4cujP0Fishj5EXB3Zc98=" }, - "org/ow2/asm#asm-commons/9.6": { - "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w=" - }, "org/ow2/asm#asm-commons/9.7": { "jar": "sha256-OJvCR5WOBJ/JoECNOYySxtNwwYA1EgOV1Muh2dkwS3o=", "pom": "sha256-Ws7j7nJS7ZC4B0x1XQInh0malfr/+YrEpoUQfE2kCbQ=" }, - "org/ow2/asm#asm-tree/9.6": { - "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" - }, "org/ow2/asm#asm-tree/9.7": { "jar": "sha256-YvSzvENgRcGstcO6LY7FVuwzaQk9f10Gx0frBLVtUrE=", "pom": "sha256-o06h4+QSjAEDjbQ8aXbojHec9a+EsFBdombf5pZWaOw=" }, - "org/ow2/asm#asm-util/9.6": { - "pom": "sha256-UsXB01dAR3nRqZtJqFv506CFAluFFstz2+93yK40AF4=" - }, "org/ow2/asm#asm-util/9.7": { "jar": "sha256-N6ZBTTZkGXPxrxBJN8ldbZIbLdtNYSxmxanysT/BQhE=", "pom": "sha256-XQFNjIcNSHGCW9LdtVZ7Ie9trI7Ei7uNu0ZbCzor9FI=" }, - "org/ow2/asm#asm/9.6": { - "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", - "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" - }, "org/ow2/asm#asm/9.7": { "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=", "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA=" @@ -3480,9 +3667,9 @@ "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" }, - "org/tensorflow#tensorflow-lite-metadata/0.1.0-rc2": { - "jar": "sha256-LComT4QkmMNtNNKnuRNCSQ2alihiyFuqwazVTsL8ptk=", - "pom": "sha256-mk9eVnQ2bBVskDkWYvA+18WXHWqmODLfdKJx2m/4LpY=" + "org/tensorflow#tensorflow-lite-metadata/0.2.0": { + "jar": "sha256-6fGLikHwF+kDPLDthciiuiMHKSzf4l6uNlkj56MdKnA=", + "pom": "sha256-D+MTJug7diLLzZx11GeykfAf/jzG4+dmUawFocHHo2A=" }, "org/xerial#sqlite-jdbc/3.41.2.2": { "jar": "sha256-DNq0EJR+BLZ0Pfmc8VQyZ93RBzV9b3aUjRRb5ZD9SX0=", diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix index 0998722307b0..6e82bdb631b8 100644 --- a/pkgs/by-name/an/animeko/package.nix +++ b/pkgs/by-name/an/animeko/package.nix @@ -79,13 +79,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "animeko"; - version = "4.10.1"; + version = "4.11.1"; src = fetchFromGitHub { owner = "open-ani"; repo = "animeko"; tag = "v${finalAttrs.version}"; - hash = "sha256-sFEq6tJfADH5x8+wdQ9T89awT7/Qx2RV5r+cND3J0iw="; + hash = "sha256-JLOwWJvBfwqvAfaFn5qr8lsHL7/u97qYjZsckBjAu6I="; fetchSubmodules = true; }; @@ -207,6 +207,8 @@ stdenv.mkDerivation (finalAttrs: { "libdca.so.0" "liba52-0.7.4.so" "libFLAC.so.12" + "libtheoradec.so.1" + "libtheoraenc.so.1" ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index 7f73118ba3db..40ca46b861da 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -53,12 +53,12 @@ python3.pkgs.buildPythonApplication rec { "ansibledoctor" ]; - meta = with lib; { + meta = { description = "Annotation based documentation for your Ansible roles"; mainProgram = "ansible-doctor"; homepage = "https://github.com/thegeeklab/ansible-doctor"; changelog = "https://github.com/thegeeklab/ansible-doctor/releases/tag/v${version}"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ tboerger ]; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ tboerger ]; }; } diff --git a/pkgs/by-name/an/ansible-language-server/package.nix b/pkgs/by-name/an/ansible-language-server/package.nix index 5a474fa7070a..4ddf84b6e39d 100644 --- a/pkgs/by-name/an/ansible-language-server/package.nix +++ b/pkgs/by-name/an/ansible-language-server/package.nix @@ -34,12 +34,12 @@ buildNpmPackage rec { npmPackFlags = [ "--ignore-scripts" ]; passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { changelog = "https://github.com/ansible/ansible-language-server/releases/tag/v${version}"; description = "Ansible Language Server"; mainProgram = "ansible-language-server"; homepage = "https://github.com/ansible/ansible-language-server"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; }; } diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix index b64b6683c2b1..8f26bb14b51a 100644 --- a/pkgs/by-name/ap/apache-orc/package.nix +++ b/pkgs/by-name/ap/apache-orc/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/apache/orc/releases/tag/v${finalAttrs.version}"; - description = "The smallest, fastest columnar storage for Hadoop workloads"; + description = "Smallest, fastest columnar storage for Hadoop workloads"; homepage = "https://github.com/apache/orc/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ drupol ]; diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix index 5eef97b1fa68..a3f807a83a1b 100644 --- a/pkgs/by-name/ap/appflowy/package.nix +++ b/pkgs/by-name/ap/appflowy/package.nix @@ -101,7 +101,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "An open-source alternative to Notion"; + description = "Open-source alternative to Notion"; homepage = "https://www.appflowy.io/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index 26af9529aa98..c11f2ffb4ae5 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/hyprwm/aquamarine/releases/tag/v${finalAttrs.version}"; - description = "A very light linux rendering backend library"; + description = "Very light linux rendering backend library"; homepage = "https://github.com/hyprwm/aquamarine"; license = lib.licenses.bsd3; teams = [ lib.teams.hyprland ]; diff --git a/pkgs/by-name/ar/ares-cli/package.nix b/pkgs/by-name/ar/ares-cli/package.nix index 88e67f7e22fc..8c5be1fea7eb 100644 --- a/pkgs/by-name/ar/ares-cli/package.nix +++ b/pkgs/by-name/ar/ares-cli/package.nix @@ -25,7 +25,7 @@ buildNpmPackage rec { meta = { homepage = "https://webostv.developer.lge.com/develop/tools/cli-introduction"; - description = "A collection of commands used for creating, packaging, installing, and launching web apps for LG webOS TV."; + description = "Collection of commands used for creating, packaging, installing, and launching web apps for LG webOS TV"; longDescription = '' webOS CLI (Command Line Interface) provides a collection of commands used for creating, packaging, installing, and launching web apps in the command line environment. The CLI allows you to develop and test your app without using diff --git a/pkgs/by-name/ar/argo-rollouts/package.nix b/pkgs/by-name/ar/argo-rollouts/package.nix index f4e1f3419e04..9a91e8bce35e 100644 --- a/pkgs/by-name/ar/argo-rollouts/package.nix +++ b/pkgs/by-name/ar/argo-rollouts/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-C2Ha3Sdq5IOHEc9S4jb4g6do6a4Gkm4E0BVFq5TnJDM="; + sha256 = "sha256-OCFbnBSFSXcbXHT48sS8REAt6CtNFPCNTIfKRBj19DM="; }; - vendorHash = "sha256-1YtRc2xLP8QAIK+vO690zHb9tXCkR7na/zwwlIdAxgQ="; + vendorHash = "sha256-2zarm9ZvPJ5uwEYvYI60uaN5MONKE8gd+i6TPHdD3PU="; # Disable tests since some test fail because of missing test data doCheck = false; diff --git a/pkgs/by-name/ar/arkenfox-userjs/package.nix b/pkgs/by-name/ar/arkenfox-userjs/package.nix index 3e3f9795ecdd..185f56af5b0b 100644 --- a/pkgs/by-name/ar/arkenfox-userjs/package.nix +++ b/pkgs/by-name/ar/arkenfox-userjs/package.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "A comprehensive user.js template for configuration and hardening"; + description = "Comprehensive user.js template for configuration and hardening"; homepage = "https://github.com/arkenfox/user.js"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index 0d30d9ccdb64..4f96e607fc1b 100644 --- a/pkgs/by-name/as/astro-language-server/package.nix +++ b/pkgs/by-name/as/astro-language-server/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "The Astro language server"; + description = "Astro language server"; homepage = "https://github.com/withastro/language-tools"; changelog = "https://github.com/withastro/language-tools/blob/@astrojs/language-server@${finalAttrs.version}/packages/language-server/CHANGELOG.md"; license = lib.licenses.mit; diff --git a/pkgs/by-name/at/atasm/package.nix b/pkgs/by-name/at/atasm/package.nix index 5021f93eaf2b..d7483ec4cd2a 100644 --- a/pkgs/by-name/at/atasm/package.nix +++ b/pkgs/by-name/at/atasm/package.nix @@ -55,12 +55,12 @@ stdenv.mkDerivation rec { mv docs/* $out/share/doc/${pname} ''; - meta = with lib; { + meta = { homepage = "https://github.com/CycoPH/atasm"; description = "Commandline 6502 assembler compatible with Mac/65"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; changelog = "https://github.com/CycoPH/atasm/releases/tag/V${version}"; - maintainers = with maintainers; [ ]; - platforms = with platforms; unix; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/by-name/at/atftp/package.nix b/pkgs/by-name/at/atftp/package.nix index 5bcdff69e44d..38ab992f8fc1 100644 --- a/pkgs/by-name/at/atftp/package.nix +++ b/pkgs/by-name/at/atftp/package.nix @@ -48,12 +48,12 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { description = "Advanced tftp tools"; changelog = "https://sourceforge.net/p/atftp/code/ci/v${version}/tree/Changelog"; homepage = "https://sourceforge.net/projects/atftp/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix index 8fbfa6f1b90a..55ab92826851 100644 --- a/pkgs/by-name/at/athens/package.nix +++ b/pkgs/by-name/at/athens/package.nix @@ -35,16 +35,16 @@ buildGoModule (finalAttrs: { tests.version = testers.testVersion { package = athens; }; }; - meta = with lib; { + meta = { description = "Go module datastore and proxy"; homepage = "https://github.com/gomods/athens"; - changelog = "https://github.com/gomods/athens/releases/tag/v${version}"; - license = licenses.mit; + changelog = "https://github.com/gomods/athens/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; mainProgram = "athens"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ katexochen malt3 ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/at/atomic-swap/package.nix b/pkgs/by-name/at/atomic-swap/package.nix index 5267433fcf69..0d3d52c2f62d 100644 --- a/pkgs/by-name/at/atomic-swap/package.nix +++ b/pkgs/by-name/at/atomic-swap/package.nix @@ -40,12 +40,12 @@ buildGoModule { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { homepage = "https://github.com/AthanorLabs/atomic-swap"; changelog = "https://github.com/AthanorLabs/atomic-swap/releases/tag/v${version}"; description = "ETH-XMR atomic swap implementation"; - license = with licenses; [ lgpl3Only ]; - maintainers = with maintainers; [ + license = with lib.licenses; [ lgpl3Only ]; + maintainers = with lib.maintainers; [ happysalada lord-valen ]; diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index 3b8a97074e52..f97093594ff0 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -17,13 +17,13 @@ let in rustPlatform.buildRustPackage { pname = "attic"; - version = "0-unstable-2025-02-02"; + version = "0-unstable-2025-05-29"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "attic"; - rev = "ff8a897d1f4408ebbf4d45fa9049c06b3e1e3f4e"; - hash = "sha256-hPYEJ4juK3ph7kbjbvv7PlU1D9pAkkhl+pwx8fZY53U="; + rev = "ce9373715fe3fac7a174a65a7e6d6baeba8cb4f9"; + hash = "sha256-CvaKOUq8G10sghKpZhEB2UYjJoWhEkrDFggDgi7piUI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix index dd4235aac3a0..2a221ae10257 100644 --- a/pkgs/by-name/au/audiness/package.nix +++ b/pkgs/by-name/au/audiness/package.nix @@ -31,12 +31,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "audiness" ]; - meta = with lib; { + meta = { description = "CLI tool to interact with Nessus"; homepage = "https://github.com/audiusGmbH/audiness"; changelog = "https://github.com/audiusGmbH/audiness/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "audiness"; }; } diff --git a/pkgs/by-name/au/audion/package.nix b/pkgs/by-name/au/audion/package.nix index 6edf94d93dc9..9a44a37e7f40 100644 --- a/pkgs/by-name/au/audion/package.nix +++ b/pkgs/by-name/au/audion/package.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-kIrbHt6aAUgdF4Jx/aUOYpiBj1+pyFLCVak6R+JN2Ug="; - meta = with lib; { + meta = { description = "Ping the host continuously and write results to a file"; homepage = "https://github.com/audiusGmbH/audion"; changelog = "https://github.com/audiusGmbH/audion/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "audion"; }; } diff --git a/pkgs/by-name/au/audiowaveform/package.nix b/pkgs/by-name/au/audiowaveform/package.nix index ba34af45f68f..d133507c374e 100644 --- a/pkgs/by-name/au/audiowaveform/package.nix +++ b/pkgs/by-name/au/audiowaveform/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # One test is failing, see PR #101947 doCheck = false; - meta = with lib; { + meta = { description = "C++ program to generate waveform data and render waveform images from audio files"; longDescription = '' audiowaveform is a C++ command-line application that generates waveform data from either MP3, WAV, FLAC, or Ogg Vorbis format audio files. @@ -55,9 +55,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/bbc/audiowaveform"; changelog = "https://github.com/bbc/audiowaveform/blob/${version}/ChangeLog"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ edbentley ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ edbentley ]; mainProgram = "audiowaveform"; }; } diff --git a/pkgs/by-name/au/augeas/package.nix b/pkgs/by-name/au/augeas/package.nix index 7f1dc2d14381..92bb4e031468 100644 --- a/pkgs/by-name/au/augeas/package.nix +++ b/pkgs/by-name/au/augeas/package.nix @@ -62,13 +62,13 @@ stdenv.mkDerivation rec { "dev" ]; - meta = with lib; { + meta = { description = "Configuration editing tool"; - license = licenses.lgpl21Only; + license = lib.licenses.lgpl21Only; homepage = "https://augeas.net/"; changelog = "https://github.com/hercules-team/augeas/releases/tag/release-${version}"; mainProgram = "augtool"; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ offline ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index 641488703fb9..146739a8a563 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -47,12 +47,12 @@ buildGoModule rec { subPackages = [ "cmd/auth0" ]; - meta = with lib; { + meta = { description = "Supercharge your developer workflow"; homepage = "https://auth0.github.io/auth0-cli"; changelog = "https://github.com/auth0/auth0-cli/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ matthewcroughan ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ matthewcroughan ]; mainProgram = "auth0"; }; } diff --git a/pkgs/by-name/au/authentik/ldap.nix b/pkgs/by-name/au/authentik/ldap.nix index e3b1bfab8174..db076910082d 100644 --- a/pkgs/by-name/au/authentik/ldap.nix +++ b/pkgs/by-name/au/authentik/ldap.nix @@ -14,7 +14,7 @@ buildGoModule { subPackages = [ "cmd/ldap" ]; meta = authentik.meta // { - description = "The authentik ldap outpost. Needed for the external ldap API."; + description = "Authentik ldap outpost. Needed for the external ldap API"; homepage = "https://goauthentik.io/docs/providers/ldap/"; mainProgram = "ldap"; }; diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 1d7420598522..771cbbedf885 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -25,14 +25,14 @@ let hash = "sha256-idShMSYIrf3ViG9VFNGNu6TSjBz3Q+GJMMeCzcJwfG4="; }; - meta = with lib; { + meta = { description = "Authentication glue you need"; changelog = "https://github.com/goauthentik/authentik/releases/tag/version%2F${version}"; homepage = "https://goauthentik.io/"; - license = licenses.mit; - platforms = platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; broken = stdenvNoCC.buildPlatform != stdenvNoCC.hostPlatform; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ jvanbruegge risson ]; @@ -43,7 +43,7 @@ let pname = "authentik-website-deps"; inherit src version meta; - sourceRoot = "source/website"; + sourceRoot = "${src.name}/website"; outputHash = "sha256-AnQpjCoCTzm28Wl/t3YHx0Kl0CuMHL2OgRjRB1Trrsw="; outputHashMode = "recursive"; @@ -75,7 +75,7 @@ let substituteInPlace package.json --replace-fail 'cross-env ' "" ''; - sourceRoot = "source/website"; + sourceRoot = "${src.name}/website"; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/au/auto-multiple-choice/package.nix b/pkgs/by-name/au/auto-multiple-choice/package.nix index 85820918503f..bb3c234b8d0c 100644 --- a/pkgs/by-name/au/auto-multiple-choice/package.nix +++ b/pkgs/by-name/au/auto-multiple-choice/package.nix @@ -23,12 +23,12 @@ pkg-config, poppler, }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "auto-multiple-choice"; version = "1.7.0"; src = fetchurl { - url = "https://download.auto-multiple-choice.net/${pname}_${version}_dist.tar.gz"; - # before 1.7.0, the URL pattern used "precomp" instead of "dist". ^^^^ + url = "https://download.auto-multiple-choice.net/auto-multiple-choice_${finalAttrs.version}_dist.tar.gz"; + # before 1.7.0, the URL pattern used "precomp" instead of "dist". sha256 = "sha256-37kWqgdvZopvNSU6LA/FmY2wfSJz3rRSlaQF2HSbdmA="; }; diff --git a/pkgs/by-name/au/autobloody/package.nix b/pkgs/by-name/au/autobloody/package.nix index a07870e2c239..d2f0da7a43f4 100644 --- a/pkgs/by-name/au/autobloody/package.nix +++ b/pkgs/by-name/au/autobloody/package.nix @@ -36,12 +36,12 @@ python3.pkgs.buildPythonApplication rec { "autobloody" ]; - meta = with lib; { + meta = { description = "Tool to automatically exploit Active Directory privilege escalation paths"; homepage = "https://github.com/CravateRouge/autobloody"; changelog = "https://github.com/CravateRouge/autobloody/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "autobloody"; }; } diff --git a/pkgs/by-name/au/autocorrect/package.nix b/pkgs/by-name/au/autocorrect/package.nix index 24c50e0e5f54..13c8c0c6c78a 100644 --- a/pkgs/by-name/au/autocorrect/package.nix +++ b/pkgs/by-name/au/autocorrect/package.nix @@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { description = "Linter and formatter for help you improve copywriting, to correct spaces, punctuations between CJK (Chinese, Japanese, Korean)"; mainProgram = "autocorrect"; homepage = "https://huacnlee.github.io/autocorrect"; changelog = "https://github.com/huacnlee/autocorrect/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 9229f6a43161..a09130b6596c 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-H4bFSqt8hOH6tF2WO1mQqqmbK9U2qlFC+7swz/xj1I8="; - meta = with lib; { + meta = { description = "Automatically update system timezone based on location"; homepage = "https://github.com/maxbrunet/automatic-timezoned"; changelog = "https://github.com/maxbrunet/automatic-timezoned/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl3; - maintainers = with maintainers; [ maxbrunet ]; - platforms = platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ maxbrunet ]; + platforms = lib.platforms.linux; mainProgram = "automatic-timezoned"; }; } diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 3bea156c1c91..59cd85fc612a 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -189,7 +189,7 @@ stdenvNoCC.mkDerivation ( homepage = "https://avaloniaui.net/"; license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ corngood ]; - description = "A cross-platform UI framework for dotnet"; + description = "Cross-platform UI framework for dotnet"; sourceProvenance = with lib.sourceTypes; [ fromSource binaryNativeCode # npm dependencies contain binaries diff --git a/pkgs/by-name/av/avml/package.nix b/pkgs/by-name/av/avml/package.nix index 26ee2bfc8468..4e6047b9e5df 100644 --- a/pkgs/by-name/av/avml/package.nix +++ b/pkgs/by-name/av/avml/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; meta = { - description = "A portable volatile memory acquisition tool for Linux"; + description = "Portable volatile memory acquisition tool for Linux"; homepage = "https://github.com/microsoft/avml"; license = lib.licenses.mit; maintainers = [ lib.maintainers.lesuisse ]; diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index b868b140f2d8..4a84309316c6 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -53,7 +53,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "A vault for securely storing and accessing AWS credentials in development environments"; + description = "Vault for securely storing and accessing AWS credentials in development environments"; mainProgram = "aws-vault"; homepage = "https://github.com/99designs/aws-vault"; license = licenses.mit; diff --git a/pkgs/by-name/ay/ayatana-ido/package.nix b/pkgs/by-name/ay/ayatana-ido/package.nix index 904788c65c51..6d50bbecd4f4 100644 --- a/pkgs/by-name/ay/ayatana-ido/package.nix +++ b/pkgs/by-name/ay/ayatana-ido/package.nix @@ -29,15 +29,15 @@ stdenv.mkDerivation rec { strictDeps = true; - meta = with lib; { + meta = { description = "Ayatana Display Indicator Objects"; homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog"; license = [ - licenses.lgpl3Plus - licenses.lgpl21Plus + lib.licenses.lgpl3Plus + lib.licenses.lgpl21Plus ]; - maintainers = [ maintainers.nickhu ]; - platforms = platforms.linux; + maintainers = [ lib.maintainers.nickhu ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index a107f48f4799..fbf7a0b5c97b 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "An open-source 3DS emulator project based on Citra"; + description = "Open-source 3DS emulator project based on Citra"; homepage = "https://github.com/azahar-emu/azahar"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ arthsmn ]; diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 1efbd6c658a9..17a13455115a 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -50,9 +50,9 @@ }, "aks-preview": { "pname": "aks-preview", - "version": "17.0.0b4", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-17.0.0b4-py2.py3-none-any.whl", - "hash": "sha256-KZ4j1OvY/ziVZnv1nAnowWD+ujYrOYMxfOmH6krHDjI=", + "version": "18.0.0b7", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-18.0.0b7-py2.py3-none-any.whl", + "hash": "sha256-5xRE/WGe/PbTavC/b9MrrXMwXVsBoEEog44A8YJu9cY=", "description": "Provides a preview for upcoming AKS features" }, "akshybrid": { @@ -113,9 +113,9 @@ }, "astronomer": { "pname": "astronomer", - "version": "1.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/astronomer-1.0.0-py3-none-any.whl", - "hash": "sha256-tMpBtdnLd67StGLe1KOSrjzols6NnLlKCGcdDLaBds0=", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/astronomer-1.0.1-py3-none-any.whl", + "hash": "sha256-71tmCfbCGCyOIQjP3QvdcpEnHC00tw9MIXqmGfcBCno=", "description": "Microsoft Azure Command-Line Tools Astronomer Extension" }, "authV2": { @@ -183,11 +183,18 @@ }, "blueprint": { "pname": "blueprint", - "version": "0.3.2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-0.3.2-py3-none-any.whl", - "hash": "sha256-WNODVEbdk+WFsPa1IKLbZVG4qSfjXiXaR0fUz4pMAJs=", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-1.0.0b1-py3-none-any.whl", + "hash": "sha256-WVBTayQ3Asbs5Q8sE8d4q68xIJN6i0cZiNHV+8szmlQ=", "description": "Microsoft Azure Command-Line Tools Blueprint Extension" }, + "carbon": { + "pname": "carbon", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/carbon-1.0.0b1-py3-none-any.whl", + "hash": "sha256-w+HDLtCIAIhlFTpR4iUMEKPC2vInPWWmMTX0VT9q1lg=", + "description": "Microsoft Azure Command-Line Tools Carbon Extension" + }, "change-analysis": { "pname": "change-analysis", "version": "0.1.0", @@ -225,9 +232,9 @@ }, "connectedmachine": { "pname": "connectedmachine", - "version": "1.1.1b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.1.1b1-py3-none-any.whl", - "hash": "sha256-IFX8KBG4QrgEIdsPzhlHQ1/q+0sFgQBlMUeF+wgTzGA=", + "version": "2.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-2.0.0b1-py3-none-any.whl", + "hash": "sha256-TNewwps4rNSx/O+GIhdFMsLJC8Z0pxD2VIlGsujOPVs=", "description": "Microsoft Azure Command-Line Tools ConnectedMachine Extension" }, "connectedvmware": { @@ -239,9 +246,9 @@ }, "cosmosdb-preview": { "pname": "cosmosdb-preview", - "version": "1.4.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.4.0-py2.py3-none-any.whl", - "hash": "sha256-u8wSLjuIyy6aC4tPKou9dSk1nKeb19Tx8JhpUYVGH34=", + "version": "1.6.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.6.0-py2.py3-none-any.whl", + "hash": "sha256-OO8IjVRhGOfsCb/Oot7Dc7PmfNsDmaXiCuG0at8Hb44=", "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension" }, "costmanagement": { @@ -274,9 +281,9 @@ }, "databox": { "pname": "databox", - "version": "1.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/databox-1.1.0-py3-none-any.whl", - "hash": "sha256-e0GmBSHXz2UtTNygUvydLsY3Hz14hOwKdLqafVAB17s=", + "version": "1.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/databox-1.2.0-py3-none-any.whl", + "hash": "sha256-bFHiTEUKirHc90iJUkqcPfKRrJlBonekcEMzVeReQfc=", "description": "Microsoft Azure Command-Line Tools Databox Extension" }, "databricks": { @@ -288,16 +295,16 @@ }, "datadog": { "pname": "datadog", - "version": "0.1.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datadog-0.1.1-py3-none-any.whl", - "hash": "sha256-mjj9XW0BZG8pnue19o6CrXCIicfQvXLgtraxPlRV6Tc=", - "description": "Microsoft Azure Command-Line Tools MicrosoftDatadogClient Extension" + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datadog-1.0.0-py3-none-any.whl", + "hash": "sha256-VCcoKbYC+F8EbEMRzCMBX3a6LvdkkYKfM5OuC7WhUQI=", + "description": "Microsoft Azure Command-Line Tools Datadog Extension" }, "datafactory": { "pname": "datafactory", - "version": "1.0.3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datafactory-1.0.3-py3-none-any.whl", - "hash": "sha256-ZvQWykXTiKMvuzc4ByUecOIFNH+j6HBWaW7xaTCa6vs=", + "version": "1.0.4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datafactory-1.0.4-py3-none-any.whl", + "hash": "sha256-mn2ogckgs4gnsOUpavOHVsV+zOxXzosTAW98z4W063Y=", "description": "Microsoft Azure Command-Line Tools DataFactoryManagementClient Extension" }, "datamigration": { @@ -386,9 +393,9 @@ }, "dynatrace": { "pname": "dynatrace", - "version": "1.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-1.1.0-py3-none-any.whl", - "hash": "sha256-CR9A2HZCRby5Zn5CLU3TchFMnwCnKggPnI75K0PFGNY=", + "version": "1.1.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-1.1.1-py3-none-any.whl", + "hash": "sha256-uDqTcLrHCSrShT7CMl3GrMWLXjGGqvB2ofaLCrnyhvg=", "description": "Microsoft Azure Command-Line Tools Dynatrace Extension" }, "edgeorder": { @@ -561,9 +568,9 @@ }, "informatica": { "pname": "informatica", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/informatica-1.0.0b1-py3-none-any.whl", - "hash": "sha256-YWaukceOdMAa870erS1igycH4XbqD31dMKXdSF9IJGI=", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/informatica-1.0.0b2-py3-none-any.whl", + "hash": "sha256-TGbjP7LsW7SgdBawNYMvFe8kAAdFzbzMCcJp+s0wy0w=", "description": "Microsoft Azure Command-Line Tools Informatica Extension" }, "init": { @@ -589,9 +596,9 @@ }, "k8s-extension": { "pname": "k8s-extension", - "version": "1.6.4", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.4-py3-none-any.whl", - "hash": "sha256-O11I5IFPdUDFWcMwgucurugl+zHzkvAL5Idj5UCHkwY=", + "version": "1.6.5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.5-py3-none-any.whl", + "hash": "sha256-MZJr6cLtg9m1TD5aYHw2ynfI1Rin5UvaAS7k0QsmZ7k=", "description": "Microsoft Azure Command-Line Tools K8s-extension Extension" }, "k8s-runtime": { @@ -699,6 +706,13 @@ "hash": "sha256-LZVypO1wbfj2JsYgNq0i9GoVsRMnP4/5sGMTo4Cif1Y=", "description": "Microsoft Azure Command-Line Tools MobileNetwork Extension" }, + "mongo-db": { + "pname": "mongo-db", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mongo_db-1.0.0b1-py3-none-any.whl", + "hash": "sha256-z/i+P/kx4MT8XskhqjohRL3Xpne9teLe6jmfCv6iv+0=", + "description": "Microsoft Azure Command-Line Tools MongoDb Extension" + }, "monitor-control-service": { "pname": "monitor-control-service", "version": "1.2.0", @@ -811,13 +825,6 @@ "hash": "sha256-/k47qFwfZZZqBZKR5G6+t8lW8o2isVtUGwSSdltiOZI=", "description": "Microsoft Azure Command-Line Tools PeeringManagementClient Extension" }, - "pinecone": { - "pname": "pinecone", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/pinecone-1.0.0b1-py3-none-any.whl", - "hash": "sha256-5WXKpClTweNCLz/wW/PcKLbpFOdJagp1l7FOD3Ou/WM=", - "description": "Microsoft Azure Command-Line Tools Pinecone Extension" - }, "playwright-cli-extension": { "pname": "playwright-cli-extension", "version": "1.0.0b1", @@ -1084,6 +1091,13 @@ "hash": "sha256-LbbCU9Q4YtBqRSUHPWe2Hx00t8iDIWK9Owv//SS5raY=", "description": "Manage virtual WAN, hubs, VPN gateways and VPN sites" }, + "vme": { + "pname": "vme", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/vme-1.0.0b1-py3-none-any.whl", + "hash": "sha256-cCAZh8ytxz5sEtyNuV/EqZ9KqOifBXr1W8PBJWctz/8=", + "description": "Microsoft Azure Command-Line Tools Vme Extension" + }, "vmware": { "pname": "vmware", "version": "7.2.0", @@ -1098,13 +1112,6 @@ "hash": "sha256-kIsN8HzvZSF2oPK/D9z1i10W+0kD7jwG9z8Ls5E6XA8=", "description": "Additional commands for Azure AppService" }, - "weights-and-biases": { - "pname": "weights-and-biases", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/weights_and_biases-1.0.0b1-py3-none-any.whl", - "hash": "sha256-p961+8YG/7LsyS8b+xfEPq2hZeiwlwqBvnyXnkxoz3o=", - "description": "Microsoft Azure Command-Line Tools WeightsAndBiases Extension" - }, "workloads": { "pname": "workloads", "version": "1.1.0", @@ -1114,9 +1121,9 @@ }, "zones": { "pname": "zones", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/zones-1.0.0b1-py3-none-any.whl", - "hash": "sha256-/CPMEVqdxeyzt2l3K8+eqv5Hs+EWjXJeKdWtD4xxGG0=", + "version": "1.0.0b3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/zones-1.0.0b3-py3-none-any.whl", + "hash": "sha256-O9gcKKvWDFmlnZabIioDGNIxqn8XDaE4xeOt3/q+7Rk=", "description": "Microsoft Azure Command-Line Tools Zones Extension" } } diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 609acd44a90e..74ace5a4e00b 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -36,7 +36,7 @@ azure-iot = mkAzExtension rec { pname = "azure-iot"; - description = "The Azure IoT extension for Azure CLI."; + description = "Azure IoT extension for Azure CLI"; version = "0.25.0"; url = "https://github.com/Azure/azure-iot-cli-extension/releases/download/v${version}/azure_iot-${version}-py3-none-any.whl"; hash = "sha256-fbS8B2Z++oRyUT2eEh+yVR/K6uaCVce8B2itQXfBscY="; @@ -156,5 +156,7 @@ connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194 deidservice = throw "The 'deidservice' extension for azure-cli was moved under healthcareapis"; # Added 2024-11-19, https://github.com/Azure/azure-cli-extensions/pull/8224 logz = throw "The 'logz' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8459 + pinecone = throw "The 'pinecone' extension for azure-cli was removed upstream"; # Added 2025-06-03, https://github.com/Azure/azure-cli-extensions/pull/8763 spring = throw "The 'spring' extension for azure-cli was deprecated upstream"; # Added 2025-05-07, https://github.com/Azure/azure-cli-extensions/pull/8652 + weights-and-biases = throw "The 'weights-and-biases' was removed upstream"; # Added 2025-06-03, https://github.com/Azure/azure-cli-extensions/pull/8764 } diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 1cc1ffc07535..be490aa33876 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -26,14 +26,14 @@ }: let - version = "2.73.0"; + version = "2.74.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; tag = "azure-cli-${version}"; - hash = "sha256-MLmTV/tg5fM3XFEMtBLPdvsiUS5Gj8CH/zvdehDoka0="; + hash = "sha256-wX1XKC3snnKEQeqlW+btshjdcMR/5m2Z69QtcJe2Opc="; }; # put packages that needs to be overridden in the py package scope @@ -168,6 +168,7 @@ py.pkgs.toPythonApplication ( azure-keyvault-certificates azure-keyvault-keys azure-keyvault-secrets + azure-keyvault-securitydomain azure-mgmt-advisor azure-mgmt-apimanagement azure-mgmt-appconfiguration diff --git a/pkgs/by-name/az/azure-storage-azcopy/package.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix index 412976e8a9b1..fd6b6246a65a 100644 --- a/pkgs/by-name/az/azure-storage-azcopy/package.nix +++ b/pkgs/by-name/az/azure-storage-azcopy/package.nix @@ -25,11 +25,11 @@ buildGoModule rec { ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy" ''; - meta = with lib; { + meta = { description = "New Azure Storage data transfer utility - AzCopy v10"; homepage = "https://github.com/Azure/azure-storage-azcopy"; changelog = "https://github.com/Azure/azure-storage-azcopy/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ kashw2 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kashw2 ]; }; } diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix index 24fb96652f95..ec273e15187c 100644 --- a/pkgs/by-name/az/azurite/package.nix +++ b/pkgs/by-name/az/azurite/package.nix @@ -30,7 +30,7 @@ buildNpmPackage rec { ]; meta = { - description = "An open source Azure Storage API compatible server"; + description = "Open source Azure Storage API compatible server"; homepage = "https://github.com/Azure/Azurite"; changelog = "https://github.com/Azure/Azurite/releases/tag/v${version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/ba/bakoma_ttf/package.nix b/pkgs/by-name/ba/bakoma_ttf/package.nix index fa3e0e40f773..f941343fb170 100644 --- a/pkgs/by-name/ba/bakoma_ttf/package.nix +++ b/pkgs/by-name/ba/bakoma_ttf/package.nix @@ -21,6 +21,6 @@ stdenvNoCC.mkDerivation rec { meta = { description = "TrueType versions of the Computer Modern and AMS TeX Fonts"; - homepage = "http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/"; + homepage = "https://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/"; }; } diff --git a/pkgs/by-name/ba/balls/package.nix b/pkgs/by-name/ba/balls/package.nix index 04f6d701bb0f..60474f602224 100644 --- a/pkgs/by-name/ba/balls/package.nix +++ b/pkgs/by-name/ba/balls/package.nix @@ -46,7 +46,7 @@ buildNimPackage (finalAttrs: { ''; meta = finalAttrs.src.meta // { - description = "The testing framework with balls"; + description = "Testing framework with balls"; homepage = "https://github.com/disruptek/balls"; mainProgram = "balls"; license = lib.licenses.mit; diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix index cc031c9aa7b5..c7dedf44679d 100644 --- a/pkgs/by-name/ba/basalt-monado/package.nix +++ b/pkgs/by-name/ba/basalt-monado/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation { passthru.updateScript = nix-update-script { }; meta = { - description = "A fork of Basalt improved for tracking XR devices with Monado"; + description = "Fork of Basalt improved for tracking XR devices with Monado"; homepage = "https://gitlab.freedesktop.org/mateosss/basalt"; license = lib.licenses.bsd3; mainProgram = "basalt_vio"; diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix index f625b702df30..d1b787529e21 100644 --- a/pkgs/by-name/ba/bash-language-server/package.nix +++ b/pkgs/by-name/ba/bash-language-server/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; meta = with lib; { - description = "A language server for Bash"; + description = "Language server for Bash"; homepage = "https://github.com/bash-lsp/bash-language-server"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; diff --git a/pkgs/by-name/bc/bcg729/package.nix b/pkgs/by-name/bc/bcg729/package.nix index 4a34980a72d6..f21ffa6b0533 100644 --- a/pkgs/by-name/bc/bcg729/package.nix +++ b/pkgs/by-name/bc/bcg729/package.nix @@ -25,12 +25,12 @@ stdenv.mkDerivation rec { --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} ''; - meta = with lib; { + meta = { description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec"; homepage = "https://linphone.org/technical-corner/bcg729"; changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${version}/NEWS"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ c0bw3b ]; - platforms = platforms.all; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ c0bw3b ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 2988a0cf9728..e0743a65c5f2 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: let pname = "beeper"; - version = "4.0.732"; + version = "4.0.747"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage"; - hash = "sha256-8HcWEMrMpq+QCnkCf7Yn79fADy98KFqL/m1erXtM8XU="; + hash = "sha256-eLNxuBCm3vzG/90mZsQCVInGu8lMPrr+/UBAHj+vGJ4="; }; appimageContents = appimageTools.extract { inherit pname version src; diff --git a/pkgs/by-name/be/besu/package.nix b/pkgs/by-name/be/besu/package.nix index 208377db95a8..e0e2675f2937 100644 --- a/pkgs/by-name/be/besu/package.nix +++ b/pkgs/by-name/be/besu/package.nix @@ -9,12 +9,12 @@ testers, }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "besu"; version = "24.1.2"; src = fetchurl { - url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; + url = "https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/${finalAttrs.version}/besu-${finalAttrs.version}.tar.gz"; sha256 = "sha256-CC24z0+2dSeqDddX5dJUs7SX9QJ8Iyh/nAp0pqdDvwg="; }; @@ -26,20 +26,20 @@ stdenv.mkDerivation (finalAttrs: rec { cp -r bin $out/ mkdir -p $out/lib cp -r lib $out/ - wrapProgram $out/bin/${pname} \ + wrapProgram $out/bin/besu \ --set JAVA_HOME "${jre}" \ --suffix ${ if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH" - } : ${lib.makeLibraryPath buildInputs} + } : ${lib.makeLibraryPath finalAttrs.buildInputs} ''; passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; jemalloc = - runCommand "${pname}-test-jemalloc" + runCommand "besu-test-jemalloc" { nativeBuildInputs = [ finalAttrs.finalPackage ]; meta.platforms = with lib.platforms; linux; diff --git a/pkgs/by-name/be/better-control/package.nix b/pkgs/by-name/be/better-control/package.nix index f56c7ec724e2..0fdd29c4c0c4 100644 --- a/pkgs/by-name/be/better-control/package.nix +++ b/pkgs/by-name/be/better-control/package.nix @@ -9,7 +9,7 @@ brightnessctl, power-profiles-daemon, gammastep, - libpulseaudio, + pulseaudio, desktop-file-utils, wrapGAppsHook3, gobject-introspection, @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication rec { pname = "better-control"; - version = "6.11.9"; + version = "6.12.1"; pyproject = false; src = fetchFromGitHub { - owner = "quantumvoid0"; + owner = "better-ecosystem"; repo = "better-control"; tag = "v${version}"; - hash = "sha256-74ZcHiQLIYzPnk25NAJzxsdVMYs2fiPDOJHUTLY4LuE="; + hash = "sha256-Dt+se8eOmF8Nzm+/bnYBSIyX0XHSXV9iCPF82qXhzug="; }; build-system = with python3Packages; [ @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { # Check src/utils/dependencies.py runtimeDeps = [ - libpulseaudio + pulseaudio networkmanager bluez brightnessctl @@ -95,7 +95,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Simple control panel for linux based on GTK"; - homepage = "https://github.com/quantumvoid0/better-control"; + homepage = "https://github.com/better-ecosystem/better-control"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ Rishabh5321 ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/bi/bigpemu/package.nix b/pkgs/by-name/bi/bigpemu/package.nix index 580328557216..6832de3b5d58 100644 --- a/pkgs/by-name/bi/bigpemu/package.nix +++ b/pkgs/by-name/bi/bigpemu/package.nix @@ -11,12 +11,12 @@ let bigpemu-unwrapped = stdenv.mkDerivation rec { pname = "BigPEmu"; - version = "1.18"; + version = "1.19"; src = fetchurl { url = "https://www.richwhitehouse.com/jaguar/builds/BigPEmu_Linux64_v${ builtins.replaceStrings [ "." ] [ "" ] version }.tar.gz"; - hash = "sha256-fYzC1gYi6/6/Ouxd1reRXRGHshLwLFK4N/Md7GiiU9Y="; + hash = "sha256-kiZ9yzDRkDLzd5EtjIn32TL27Y2GG8ysG0zTM1JRyTU="; }; installPhase = '' diff --git a/pkgs/by-name/bi/bitbox-bridge/package.nix b/pkgs/by-name/bi/bitbox-bridge/package.nix index 2d1cec1e76c1..35bb936fe2be 100644 --- a/pkgs/by-name/bi/bitbox-bridge/package.nix +++ b/pkgs/by-name/bi/bitbox-bridge/package.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { }; meta = { - description = "A bridge service that connects web wallets like Rabby to BitBox02"; + description = "Bridge service that connects web wallets like Rabby to BitBox02"; homepage = "https://github.com/BitBoxSwiss/bitbox-bridge"; downloadPage = "https://bitbox.swiss/download/"; changelog = "https://github.com/BitBoxSwiss/bitbox-bridge/blob/v${finalAttrs.version}/CHANGELOG.md"; diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix index 77f40c4bce9e..7e7212b46ee6 100644 --- a/pkgs/by-name/bi/bitbox/package.nix +++ b/pkgs/by-name/bi/bitbox/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { pname = "bitbox-web"; inherit version; inherit src; - sourceRoot = "source/frontends/web"; + sourceRoot = "${src.name}/frontends/web"; npmDepsHash = "sha256-eazc3OIusY8cbaF8RJOrVcyWPQexcz6lZYLLCpB1mHc="; installPhase = "cp -r build $out"; }; diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index ec936f6a3a8b..773a788ed663 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -13,13 +13,13 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2025.4.0"; + version = "2025.5.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; tag = "cli-v${version}"; - hash = "sha256-sWphSdxh07GS7GPlNVxK7zoXMTGLjT7qTLfH1nsIiQQ="; + hash = "sha256-8jVKwqKhTfhur226SER4sb1i4dY+TjJRYmOY8YtO6CY="; }; postPatch = '' @@ -29,7 +29,7 @@ buildNpmPackage rec { nodejs = nodejs_20; - npmDepsHash = "sha256-/BOzDt+wgnWedWfShPkAhaeujBBQTDlZdtiKl3wrOqE="; + npmDepsHash = "sha256-0IoBPRGdtkMeTrT5cqZLHB/WrUCONtsJ6YHh0y4K5Ls="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools @@ -98,6 +98,8 @@ buildNpmPackage rec { }; meta = { + # https://github.com/NixOS/nixpkgs/issues/339576 + broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/bitwarden/clients/releases/tag/${src.tag}"; description = "Secure and free password manager for all of your devices"; homepage = "https://bitwarden.com"; diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix index aa133ac2653f..d319d6574404 100644 --- a/pkgs/by-name/bl/blackfire/php-probe.nix +++ b/pkgs/by-name/bl/blackfire/php-probe.nix @@ -16,50 +16,50 @@ let phpMajor = lib.versions.majorMinor php.version; inherit (stdenv.hostPlatform) system; - version = "1.92.36"; + version = "1.92.37"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-Fn+6aZi8UuyF0f94t09SwhUwvHqjvN6m2HBq2mbr/CA="; - "8.2" = "sha256-b8YyT9P+KQonwHqXSn17EDRTdTw9CuvIX0PzjvGlmCo="; - "8.3" = "sha256-YLQi530JkoQfAx/ZBR9w2dthK6IsDSyqq3U+rGugUPw="; - "8.4" = "sha256-zpXYElris1fjMlwpTwuRDkCdO3MNHCLp3D24x5X/S88="; + "8.1" = "sha256-NuWxVeVueKz64jDIE1KPzLEco+MoUyuc/9/hsTaRrAI="; + "8.2" = "sha256-NJlrEwSY55INO7q5GAvPojnLdkAYJ4eCIjxFH55Pdmg="; + "8.3" = "sha256-KGpNPp2bOAmY/GUPnUxTJ4z6X8AdvZAG6YC3pLTjbGI="; + "8.4" = "sha256-3HrbezGcdVMtdPrfRpLEhY/1AXlGUIMraeie7LEmiC8="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-3mNgyfrkgiZBkLE8ppans7R72lOeXFup2nwLoP6Gve0="; - "8.2" = "sha256-PT7virnfH8Ujkol/fK84TmVTc4jK4xGfaDL1kb9bj/4="; - "8.3" = "sha256-h4Gf4YR2I+R9dMDiFpAN1WB2o6BNP3C80fX7vKEN6Gs="; - "8.4" = "sha256-lRunm8coAkwiLvPELWquAsoNQEZv0LvL13Hdg+9dOfA="; + "8.1" = "sha256-Z9D6yoDSTdvzAQw+LhCk37J+LPMLEthUzbB1YQdr7AY="; + "8.2" = "sha256-ES2Y2RewFSP0R5wuYF2sm7NAVlCRvRPSpfPt7X2uYqs="; + "8.3" = "sha256-jqcS97JcHU/LzdU08MwNXDepH7OzIa4Fo7s3hg+x6hA="; + "8.4" = "sha256-xel7bbb4S16YddLuw0sDINbKQ0zoJeeRSI4g+tpqYz0="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-DDco6F8cD/D4J3KM1B111bjcJkRxd++CLR+x0azcR0g="; - "8.2" = "sha256-AQPQQM5Q5wlhvkXOnVNgPLcQpZ5xda/CYFqvm5J7e0c="; - "8.3" = "sha256-Yae7UVRrIdShIVZDSza9IrukYHgfX5CrVIpuH4rEAek="; - "8.4" = "sha256-l0+DN5zEqGJLg8Ig5U4PvZGms1O0eZ/PqjXgSw4bCA4="; + "8.1" = "sha256-l3mz8n1PjBUTcLN4Kyjg573Ip20dFV85yNT2krYq6Z0="; + "8.2" = "sha256-EyxrVMitvupQzAwhFDwMO56PUhyLb35aqWgJeH+211E="; + "8.3" = "sha256-T6UkTtQl1Ce95tA4/J9mSk/pBWAZJJz0pHb3xMIGYvc="; + "8.4" = "sha256-udvqUMbbVcFOocu1F0rSgi0+bg5VPq2Qw2LrRqNRQHw="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-xb28nloEKKfJfddrDShBFuLHPOIyBo74erHWB9H5im4="; - "8.2" = "sha256-vmjjmGem7SdEkBWIjDfxgLQhmO9B/x1gIP5GSlAPPDs="; - "8.3" = "sha256-l6XrHQIigav6gMpgg7HEwm+2PeuU76AX3je8UVrcPEQ="; + "8.1" = "sha256-PoXihk7e+xT6fat48dnD/3lZqQKpgBHs4Eao08J4dMs="; + "8.2" = "sha256-lLham3VjXvszjOU8NvxZsjz5vfEK58QG1tE4X06luzQ="; + "8.3" = "sha256-rAsJ71P+yM939JqhhwDbxfL0EwB4q7SNqvSdN0n6ES0="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-xY/5UQuLM/UrdDvA1WUF117m+Coj3ElEgV3cbelfKvM="; - "8.2" = "sha256-bGpijGg++VJNZFHN9K6Gx1R+jBn3o+Qeh/RpmPC8NPE="; - "8.3" = "sha256-3uiTuEmEsp3sKOOR0WxH72pVPCs5ogR1yi3VQ7+/fw8="; + "8.1" = "sha256-6RoANqMjuyaLcMzg5R0unhTwOSbsQhEXCkjQ2kjnnCg="; + "8.2" = "sha256-PjvLjRsnhHgXOEj7J7ekWM0fFuaOuiYJhXbINClaFtU="; + "8.3" = "sha256-NoY788iBgeVMrQp3tm6vbAnwBZB7yMjCVmH7jr32HWU="; }; }; }; diff --git a/pkgs/by-name/bl/blackvoxel/package.nix b/pkgs/by-name/bl/blackvoxel/package.nix index f5d23abf41bd..7b2b938a5c61 100644 --- a/pkgs/by-name/bl/blackvoxel/package.nix +++ b/pkgs/by-name/bl/blackvoxel/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "A Sci-Fi game with industry and automation"; + description = "Sci-Fi game with industry and automation"; homepage = "https://www.blackvoxel.com"; changelog = "https://github.com/Blackvoxel/Blackvoxel/releases/tag/${finalAttrs.version}"; license = with lib.licenses; [ diff --git a/pkgs/by-name/bl/blastem/package.nix b/pkgs/by-name/bl/blastem/package.nix index 2bdd9ed5f477..2881fe114b73 100644 --- a/pkgs/by-name/bl/blastem/package.nix +++ b/pkgs/by-name/bl/blastem/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "The fast and accurate Genesis emulator"; + description = "Fast and accurate Genesis emulator"; homepage = "https://www.retrodev.com/blastem/"; license = lib.licenses.gpl3Plus; mainProgram = "blastem"; diff --git a/pkgs/by-name/bl/bleachbit/package.nix b/pkgs/by-name/bl/bleachbit/package.nix index 44290eb6c51f..83fe2c62eb06 100644 --- a/pkgs/by-name/bl/bleachbit/package.nix +++ b/pkgs/by-name/bl/bleachbit/package.nix @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { strictDeps = false; meta = with lib; { - homepage = "http://bleachbit.sourceforge.net"; + homepage = "https://bleachbit.sourceforge.net"; description = "Program to clean your computer"; longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy."; license = licenses.gpl3; diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix index ca4e9e144231..50b22274ece4 100644 --- a/pkgs/by-name/bl/blendfarm/package.nix +++ b/pkgs/by-name/bl/blendfarm/package.nix @@ -131,7 +131,7 @@ buildDotnetModule rec { ''; meta = with lib; { - description = "A open-source, cross-platform, stand-alone, Network Renderer for Blender"; + description = "Open-source, cross-platform, stand-alone, Network Renderer for Blender"; homepage = "https://github.com/LogicReinc/LogicReinc.BlendFarm"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ gador ]; diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix index f2c01aceb329..64ca0f2f81f6 100644 --- a/pkgs/by-name/bo/bolt-launcher/package.nix +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -146,7 +146,7 @@ buildFHSEnv { meta = { homepage = "https://github.com/Adamcake/Bolt"; - description = "An alternative launcher for RuneScape."; + description = "Alternative launcher for RuneScape"; longDescription = '' Bolt Launcher supports HDOS/RuneLite by default with an optional feature flag for RS3 (enableRS3). ''; diff --git a/pkgs/by-name/bp/bpfmon/package.nix b/pkgs/by-name/bp/bpfmon/package.nix index 3671c9bf705b..1f539d04050a 100644 --- a/pkgs/by-name/bp/bpfmon/package.nix +++ b/pkgs/by-name/bp/bpfmon/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; - meta = with lib; { + meta = { description = "BPF based visual packet rate monitor"; mainProgram = "bpfmon"; homepage = "https://github.com/bbonev/bpfmon"; changelog = "https://github.com/bbonev/bpfmon/releases/tag/v${version}"; - maintainers = with maintainers; [ arezvov ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ arezvov ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 521ea29a4073..37c1061e7358 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -75,19 +75,19 @@ stdenv.mkDerivation rec { bpf = nixosTests.bpf; }; - meta = with lib; { + meta = { description = "High-level tracing language for Linux eBPF"; homepage = "https://github.com/bpftrace/bpftrace"; changelog = "https://github.com/bpftrace/bpftrace/releases/tag/v${version}"; mainProgram = "bpftrace"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ rvl thoughtpolice martinetd mfrw illustris ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index 3aae78ec39ec..8adad4cc3700 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "A library to obtain, parse and analyze data (EEG, EMG, ECG) from biosensors"; + description = "Library to obtain, parse and analyze data (EEG, EMG, ECG) from biosensors"; homepage = "https://brainflow.org/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/bs/bsky-cli/package.nix b/pkgs/by-name/bs/bsky-cli/package.nix index e4fbfb6b9ab4..df9abc7157d9 100644 --- a/pkgs/by-name/bs/bsky-cli/package.nix +++ b/pkgs/by-name/bs/bsky-cli/package.nix @@ -36,7 +36,7 @@ buildGoModule (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "A cli application for bluesky social"; + description = "Cli application for bluesky social"; homepage = "https://github.com/mattn/bsky"; changelog = "https://github.com/mattn/bsky/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/bt/btcd/package.nix b/pkgs/by-name/bt/btcd/package.nix index 97655efad17b..78fb2fef94e2 100644 --- a/pkgs/by-name/bt/btcd/package.nix +++ b/pkgs/by-name/bt/btcd/package.nix @@ -29,11 +29,11 @@ buildGoModule rec { cp sample-btcd.conf $DIR ''; - meta = with lib; { + meta = { description = "Alternative full node bitcoin implementation written in Go (golang)"; homepage = "https://github.com/btcsuite/btcd"; changelog = "https://github.com/btcsuite/btcd/releases/tag/v${version}"; - license = licenses.isc; - maintainers = with maintainers; [ _0xB10C ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ _0xB10C ]; }; } diff --git a/pkgs/by-name/bt/btcpayserver/package.nix b/pkgs/by-name/bt/btcpayserver/package.nix index 6c1eeff9b5c6..51c60db7e47b 100644 --- a/pkgs/by-name/bt/btcpayserver/package.nix +++ b/pkgs/by-name/bt/btcpayserver/package.nix @@ -30,15 +30,15 @@ buildDotnetModule rec { mv $out/bin/{BTCPayServer,btcpayserver} || : ''; - meta = with lib; { + meta = { description = "Self-hosted, open-source cryptocurrency payment processor"; homepage = "https://btcpayserver.org"; changelog = "https://github.com/btcpayserver/btcpayserver/blob/v${version}/Changelog.md"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ kcalvinalvin erikarvstedt ]; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.mit; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix index aa6a0d40ecbf..4fbf5980367b 100644 --- a/pkgs/by-name/bt/btop/package.nix +++ b/pkgs/by-name/bt/btop/package.nix @@ -51,13 +51,13 @@ stdenv.mkDerivation rec { versionCheckProgramArg = "--version"; doInstallCheck = true; - meta = with lib; { + meta = { description = "Monitor of resources"; homepage = "https://github.com/aristocratos/btop"; changelog = "https://github.com/aristocratos/btop/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ khaneliman rmcgibbo ]; diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix index dead16e648bf..225d6038e37e 100644 --- a/pkgs/by-name/bt/btrfs-progs/package.nix +++ b/pkgs/by-name/bt/btrfs-progs/package.nix @@ -91,13 +91,13 @@ stdenv.mkDerivation rec { rev-prefix = "v"; }; - meta = with lib; { + meta = { description = "Utilities for the btrfs filesystem"; homepage = "https://btrfs.readthedocs.io/en/latest/"; changelog = "https://github.com/kdave/btrfs-progs/raw/v${version}/CHANGES"; - license = licenses.gpl2Only; + license = lib.licenses.gpl2Only; mainProgram = "btrfs"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/bu/buck2/package.nix b/pkgs/by-name/bu/buck2/package.nix index 9ce373f75736..d4890b3460e4 100644 --- a/pkgs/by-name/bu/buck2/package.nix +++ b/pkgs/by-name/bu/buck2/package.nix @@ -140,16 +140,16 @@ stdenv.mkDerivation { }; }; - meta = with lib; { + meta = { description = "Fast, hermetic, multi-language build system"; homepage = "https://buck2.build"; changelog = "https://github.com/facebook/buck2/releases/tag/${version}"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or mit ]; mainProgram = "buck2"; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/bu/buffer/package.nix b/pkgs/by-name/bu/buffer/package.nix index c3c04a12a985..6dd991fa261b 100644 --- a/pkgs/by-name/bu/buffer/package.nix +++ b/pkgs/by-name/bu/buffer/package.nix @@ -1,8 +1,8 @@ { lib, + cargo, desktop-file-utils, fetchFromGitLab, - gobject-introspection, gtk4, gtksourceview5, libadwaita, @@ -10,29 +10,37 @@ meson, ninja, pkg-config, - python3, + rustPlatform, + rustc, stdenv, wrapGAppsHook4, }: stdenv.mkDerivation (finalAttrs: { pname = "buffer"; - version = "0.9.10"; + version = "0.10.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "cheywood"; repo = "buffer"; tag = finalAttrs.version; - hash = "sha256-amWfrZX1b1OmLhL7w8j/+iEwYRnO1DVR580pLkjtS/g="; + hash = "sha256-81riamRKzV4wXVTXkp1ngO/5mG7leRJMw/r2DDHl8LU="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src pname version; + hash = "sha256-fwXeXaoC/Uh9eMEkRjhpAouxOrlRWX2n2r4pgIe83S0="; }; nativeBuildInputs = [ + cargo desktop-file-utils - gobject-introspection meson ninja pkg-config + rustPlatform.cargoSetupHook + rustc wrapGAppsHook4 ]; @@ -41,19 +49,8 @@ stdenv.mkDerivation (finalAttrs: { gtksourceview5 libadwaita libspelling - (python3.withPackages ( - ps: with ps; [ - pygobject3 - ] - )) ]; - preFixup = '' - gappsWrapperArgs+=( - --prefix PYTHONPATH : "$out/${python3.sitePackages}" - ) - ''; - meta = { description = "Minimal editing space for all those things that don't need keeping"; homepage = "https://gitlab.gnome.org/cheywood/buffer"; diff --git a/pkgs/by-name/bu/buffybox/package.nix b/pkgs/by-name/bu/buffybox/package.nix index 3e6af13bacf8..9e07c3591857 100644 --- a/pkgs/by-name/bu/buffybox/package.nix +++ b/pkgs/by-name/bu/buffybox/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { }; meta = with lib; { - description = "A suite of graphical applications for the terminal"; + description = "Suite of graphical applications for the terminal"; homepage = "https://gitlab.postmarketos.org/postmarketOS/buffybox"; license = licenses.gpl3Plus; maintainers = with lib.maintainers; [ colinsane ]; diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index 7f2af2db0733..86523a3946a1 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -120,20 +120,20 @@ stdenvNoCC.mkDerivation rec { done ''; }; - meta = with lib; { + meta = { homepage = "https://bun.sh"; changelog = "https://bun.sh/blog/bun-v${version}"; description = "Incredibly fast JavaScript runtime, bundler, transpiler and package manager – all in one"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; longDescription = '' All in one fast & easy-to-use tool. Instead of 1,000 node_modules for development, you only need bun. ''; - license = with licenses; [ + license = with lib.licenses; [ mit # bun core lgpl21Only # javascriptcore and webkit ]; mainProgram = "bun"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ DAlperin jk thilobillerbeck diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index 5f45e0746bad..6ef5e96180b6 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -36,7 +36,7 @@ let }; pname = "burpsuite"; - description = "An integrated platform for performing security testing of web applications"; + description = "Integrated platform for performing security testing of web applications"; desktopItem = makeDesktopItem { name = "burpsuite"; exec = pname; diff --git a/pkgs/by-name/ca/cabinpkg/package.nix b/pkgs/by-name/ca/cabinpkg/package.nix index 8c7b9e7542cb..011049884d71 100644 --- a/pkgs/by-name/ca/cabinpkg/package.nix +++ b/pkgs/by-name/ca/cabinpkg/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); homepage = "https://cabinpkg.com"; - description = "A package manager and build system for C++"; + description = "Package manager and build system for C++"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.qwqawawow ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ca/cadvisor/package.nix b/pkgs/by-name/ca/cadvisor/package.nix index 450bb669c9d2..ba27a158b009 100644 --- a/pkgs/by-name/ca/cadvisor/package.nix +++ b/pkgs/by-name/ca/cadvisor/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "cadvisor"; - version = "0.52.1"; + version = "0.53.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - hash = "sha256-EXhKX4Za+fdJcSrrbH1te533jyEVLmhgd3I9LcOCz2Q="; + hash = "sha256-caGzjv7XhIst3JZA0ri97XqQOO3mI+hwS8WJmLk9f7g="; }; modRoot = "./cmd"; - vendorHash = "sha256-DkJLWFhYElN7BYb5Jn6PDYzgndJKbEI5U08WbRqSMdw="; + vendorHash = "sha256-xUhHo/kDnjAQLuaeFG1EouC2FWBnFhj1RawlQX7ggVs="; ldflags = [ "-s" diff --git a/pkgs/by-name/ca/camunda-modeler/package.nix b/pkgs/by-name/ca/camunda-modeler/package.nix index e1a0ffa1bfe5..3805652e44fd 100644 --- a/pkgs/by-name/ca/camunda-modeler/package.nix +++ b/pkgs/by-name/ca/camunda-modeler/package.nix @@ -75,7 +75,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/camunda/camunda-modeler"; - description = "An integrated modeling solution for BPMN, DMN and Forms based on bpmn.io"; + description = "Integrated modeling solution for BPMN, DMN and Forms based on bpmn.io"; teams = [ teams.wdz ]; license = licenses.mit; inherit (electron.meta) platforms; diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix index f97aa1bdf8a7..e63d46c3b8d3 100644 --- a/pkgs/by-name/ca/cargo-mutants/package.nix +++ b/pkgs/by-name/ca/cargo-mutants/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "25.0.1"; + version = "25.1.0"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-aTGuCkPk1GYUlRXCdNIy94d5zHxUPpNNFN4aapf8s0U="; + hash = "sha256-boT8jptZSGTITBQzFBHIcZnQMlRKctCFoGllcZZ0Onw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Vrh8N29EWIwVgAR6aEQcnkbrs/+llCx+GfiV0WlZOqw="; + cargoHash = "sha256-iKK5sZKUSWB5+FfbGXaZndzGT023fU+0f6/g9YRJszA="; # too many tests require internet access doCheck = false; diff --git a/pkgs/by-name/ca/catamaran/package.nix b/pkgs/by-name/ca/catamaran/package.nix index b13116b6ee22..a7157cc71d38 100644 --- a/pkgs/by-name/ca/catamaran/package.nix +++ b/pkgs/by-name/ca/catamaran/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { meta = with lib; { homepage = "https://fonts.google.com/specimen/Catamaran"; - description = "A stylish sans-serif Tamil and Latin typeface"; + description = "Stylish sans-serif Tamil and Latin typeface"; longDescription = '' Catamaran is a Unicode-compliant Latin and Tamil text type family designed for the digital age. The Tamil is monolinear and was designed alongside the sans serif Latin and Devanagari family Palanquin. diff --git a/pkgs/by-name/ca/catdvi/package.nix b/pkgs/by-name/ca/catdvi/package.nix index f6c3becb41fd..cdbe3bddc5b5 100644 --- a/pkgs/by-name/ca/catdvi/package.nix +++ b/pkgs/by-name/ca/catdvi/package.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - homepage = "http://catdvi.sourceforge.net"; + homepage = "https://catdvi.sourceforge.net"; description = "DVI to plain text translator"; license = licenses.gpl2Plus; maintainers = [ ]; diff --git a/pkgs/by-name/ca/catppuccin-whiskers/package.nix b/pkgs/by-name/ca/catppuccin-whiskers/package.nix index f98af0a263a7..808a4ac3f2ad 100644 --- a/pkgs/by-name/ca/catppuccin-whiskers/package.nix +++ b/pkgs/by-name/ca/catppuccin-whiskers/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage { meta = { homepage = "https://github.com/catppuccin/whiskers"; - description = "A templating tool to simplify the creation of Catppuccin ports"; + description = "Templating tool to simplify the creation of Catppuccin ports"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Name ]; mainProgram = "whiskers"; diff --git a/pkgs/by-name/cc/cctools/package.nix b/pkgs/by-name/cc/cctools/package.nix index 6350540065ed..cc6e8f2ab2d1 100644 --- a/pkgs/by-name/cc/cctools/package.nix +++ b/pkgs/by-name/cc/cctools/package.nix @@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "The classic linker for Darwin"; + description = "Classic linker for Darwin"; homepage = "https://opensource.apple.com/releases/"; license = with lib.licenses; [ apple-psl20 diff --git a/pkgs/by-name/cf/cfonts/package.nix b/pkgs/by-name/cf/cfonts/package.nix index f709db09280f..18eecafe4faa 100644 --- a/pkgs/by-name/cf/cfonts/package.nix +++ b/pkgs/by-name/cf/cfonts/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/dominikwilkowski/cfonts"; - description = "A silly little command line tool for sexy ANSI fonts in the console"; + description = "Silly little command line tool for sexy ANSI fonts in the console"; license = licenses.gpl3Plus; maintainers = with maintainers; [ leifhelm ]; mainProgram = "cfonts"; diff --git a/pkgs/by-name/ch/chamber/package.nix b/pkgs/by-name/ch/chamber/package.nix index a4bf2c1fdd53..9d61fd5a038a 100644 --- a/pkgs/by-name/ch/chamber/package.nix +++ b/pkgs/by-name/ch/chamber/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { ]; meta = with lib; { - description = "A tool for managing secrets by storing them in AWS SSM Parameter Store"; + description = "Tool for managing secrets by storing them in AWS SSM Parameter Store"; homepage = "https://github.com/segmentio/chamber"; license = licenses.mit; maintainers = with maintainers; [ kalekseev ]; diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index 612e33636346..46cfb239cd66 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { homepage = "https://sr.ht/~bptato/chawan/"; license = lib.licenses.publicDomain; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ jtbx ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "cha"; }; } diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 0a4e982acc8f..0cd5b7deac27 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,14 +25,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.436"; + version = "3.2.437"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-QI7gJjk7TtafSqGJ8vX+bTgajeRjBUHQnNJxhDiVUDI="; + hash = "sha256-AXqrqAtwGKdzgPwWEpqScFcsP62tvMpNxVn+K75aHUo="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix index 4eba309ae90a..bd8c68623eaf 100644 --- a/pkgs/by-name/ch/checkstyle/package.nix +++ b/pkgs/by-name/ch/checkstyle/package.nix @@ -7,12 +7,12 @@ }: stdenvNoCC.mkDerivation rec { - version = "10.24.0"; + version = "10.25.0"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-sREZA1/H9S3rXXW6qjyVwpLY75JQCqBooMEATUssvYM="; + sha256 = "sha256-CnzGj5jVQIzv5BZ5h0cDLJZrB0DgdRXWIYdKbzWtOA0="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/cj/cjose/package.nix b/pkgs/by-name/cj/cjose/package.nix index 53785ab7cec0..38f042660a37 100644 --- a/pkgs/by-name/cj/cjose/package.nix +++ b/pkgs/by-name/cj/cjose/package.nix @@ -46,12 +46,12 @@ stdenv.mkDerivation rec { "--with-openssl=${openssl.dev}" ]; - meta = with lib; { + meta = { homepage = "https://github.com/zmartzone/cjose"; changelog = "https://github.com/zmartzone/cjose/blob/${version}/CHANGELOG.md"; description = "C library for Javascript Object Signing and Encryption. This is a maintained fork of the original project"; - license = licenses.mit; - maintainers = with maintainers; [ midchildan ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ midchildan ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix index c90de82444f5..c2874cdf2b78 100644 --- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix +++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { }; meta = { - description = "A CLI tool to convert clang-tidy diagnostics into SARIF"; + description = "CLI tool to convert clang-tidy diagnostics into SARIF"; homepage = "https://psastras.github.io/sarif-rs"; maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "clang-tidy-sarif"; diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 4435b1946964..fe46c0b39863 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,17 +1,18 @@ { "name": "claude-code", + "version": "1.0.17", "lockfileVersion": 3, "requires": true, "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^1.0.6" + "@anthropic-ai/claude-code": "^1.0.17" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.6.tgz", - "integrity": "sha512-QqPZZ4IXbUaSLqXEx4z68Stjc7NlGh/b4woyYyMks+cMUJ5ZYDEkAe09cRZQ6tjubZNgBaGTOqfTaT8NgnkioQ==", + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.17.tgz", + "integrity": "sha512-+MX/pKOKXG2HLSh7WJIgiILdumqRgcORUX0iSQmAfn+UEoHSYSuFWZWuWBpixaa8W4tiTCC06uN4pgzinCU6jw==", "hasInstallScript": true, "license": "SEE LICENSE IN README.md", "bin": { @@ -22,7 +23,9 @@ }, "optionalDependencies": { "@img/sharp-darwin-arm64": "^0.33.5", + "@img/sharp-darwin-x64": "^0.33.5", "@img/sharp-linux-arm": "^0.33.5", + "@img/sharp-linux-arm64": "^0.33.5", "@img/sharp-linux-x64": "^0.33.5", "@img/sharp-win32-x64": "^0.33.5" } @@ -49,6 +52,28 @@ "@img/sharp-libvips-darwin-arm64": "1.0.4" } }, + "node_modules/@img/sharp-darwin-x64": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz", + "integrity": "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-darwin-x64": "1.0.4" + } + }, "node_modules/@img/sharp-libvips-darwin-arm64": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz", @@ -65,6 +90,22 @@ "url": "https://opencollective.com/libvips" } }, + "node_modules/@img/sharp-libvips-darwin-x64": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz", + "integrity": "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==", + "cpu": [ + "x64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "darwin" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, "node_modules/@img/sharp-libvips-linux-arm": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz", @@ -81,6 +122,22 @@ "url": "https://opencollective.com/libvips" } }, + "node_modules/@img/sharp-libvips-linux-arm64": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz", + "integrity": "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==", + "cpu": [ + "arm64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, "node_modules/@img/sharp-libvips-linux-x64": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz", @@ -119,6 +176,28 @@ "@img/sharp-libvips-linux-arm": "1.0.5" } }, + "node_modules/@img/sharp-linux-arm64": { + "version": "0.33.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz", + "integrity": "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-arm64": "1.0.4" + } + }, "node_modules/@img/sharp-linux-x64": { "version": "0.33.5", "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz", diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 344b6f5f6f79..dcf7ccb88b46 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "1.0.6"; + version = "1.0.17"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-yMvx543OOClV/BSkM4/bzrbytL+98HAfp14Qk1m2le0="; + hash = "sha256-RxbsAehJ4zIt86ppmMB1MPg/XFrGWuumNdQbT+ytg8A="; }; - npmDepsHash = "sha256-5QP6WQ2tXGADOID9QHq/m7sDQeQsoMGQWxORvQhVROg="; + npmDepsHash = "sha256-tC0OyJ3t4i/CdqKUGIw5Wd9UiLYJECcbDi/suxim0/A="; postPatch = '' cp ${./package-lock.json} package-lock.json @@ -36,7 +36,7 @@ buildNpmPackage rec { passthru.updateScript = ./update.sh; meta = { - description = "An agentic coding tool that lives in your terminal, understands your codebase, and helps you code faster"; + description = "Agentic coding tool that lives in your terminal, understands your codebase, and helps you code faster"; homepage = "https://github.com/anthropics/claude-code"; downloadPage = "https://www.npmjs.com/package/@anthropic-ai/claude-code"; license = lib.licenses.unfree; diff --git a/pkgs/by-name/cl/clifm/package.nix b/pkgs/by-name/cl/clifm/package.nix index 61398c22a792..9376fa31f1e0 100644 --- a/pkgs/by-name/cl/clifm/package.nix +++ b/pkgs/by-name/cl/clifm/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/leo-arch/clifm"; changelog = "https://github.com/leo-arch/clifm/releases/tag/v${finalAttrs.version}"; - description = "A CLI-based, shell-like, and non-curses terminal file manager"; + description = "CLI-based, shell-like, and non-curses terminal file manager"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ nadir-ishiguro ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix index eed513ff09b2..72d72b616f0a 100644 --- a/pkgs/by-name/cl/clippy-sarif/package.nix +++ b/pkgs/by-name/cl/clippy-sarif/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { }; meta = { - description = "A CLI tool to convert clippy diagnostics into SARIF"; + description = "CLI tool to convert clippy diagnostics into SARIF"; homepage = "https://psastras.github.io/sarif-rs"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ getchoo ]; diff --git a/pkgs/by-name/cl/clj-kondo/package.nix b/pkgs/by-name/cl/clj-kondo/package.nix index ab5303e5d991..f2d772b9fd66 100644 --- a/pkgs/by-name/cl/clj-kondo/package.nix +++ b/pkgs/by-name/cl/clj-kondo/package.nix @@ -7,11 +7,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2025.04.07"; + version = "2025.06.05"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-yJyRqQglJUiHotB70zga5NhFquHsKgmwT9sryZHEFRU="; + sha256 = "sha256-jmQFiL8MFIuMrHPSxW27E7yZIGf+k8J5nFVXgNGIKoM="; }; graalvmDrv = graalvmPackages.graalvm-ce; diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/by-name/cn/cnspec/package.nix similarity index 81% rename from pkgs/tools/security/cnspec/default.nix rename to pkgs/by-name/cn/cnspec/package.nix index a8ac0d309e96..94a1d36b6a89 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.53.2"; + version = "11.57.2"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-SYgtdIyqK3T5N6XcpjazdphwALOcReeNswVgR4K6/Pg="; + hash = "sha256-cmqOlfoVMHlX5E55Fboo7zBVy+MDZFj3PBS/mvZQw0c="; }; proxyVendor = true; - vendorHash = "sha256-sxAyJsVcBrwUX1w3Kr8Z451RINUPTwJPlmY/yeXSofk="; + vendorHash = "sha256-uehEZCj/U+xmdLt7E/Tsbog5GT78CcgxO8ZOB9QFqis="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 118866891f9b..f0c63faeff39 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -49,26 +49,26 @@ }: let pname = "cursor"; - version = "0.50.5"; + version = "1.0.0"; inherit (stdenvNoCC) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/linux/x64/Cursor-0.50.5-x86_64.AppImage"; - hash = "sha256-DUWIgQYD3Wj6hF7NBb00OGRynKmXcFldWFUA6W8CZeM="; + url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/linux/x64/Cursor-1.0.0-x86_64.AppImage"; + hash = "sha256-HJiT3aDB66K2slcGJDC21+WhK/kv4KCKVZgupbfmLG0="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/linux/arm64/Cursor-0.50.5-aarch64.AppImage"; - hash = "sha256-51zTYg4A+4ZUbGZ6/Qp3d5aL8IafewGOUYbXWGG8ILY="; + url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/linux/arm64/Cursor-1.0.0-aarch64.AppImage"; + hash = "sha256-/F+OUD+sjnIt2ishusi7F/W1kK/n7hwL7Bz1cO3u+x4="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/darwin/x64/Cursor-darwin-x64.dmg"; - hash = "sha256-C2+z3WXi3Ma3PzlU8BrcuJFGMx8YosNdxuSqR5tJdBE="; + url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/darwin/x64/Cursor-darwin-x64.dmg"; + hash = "sha256-7JTgauy+vdoaPOtbYjhSCR+ZtVwzRYKHVelpnvS5oKw="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/darwin/arm64/Cursor-darwin-arm64.dmg"; - hash = "sha256-Gz+aYDaDMDx46R7HA8u5vZwkXx9q//uu4hNyyRmrq9s="; + url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/darwin/arm64/Cursor-darwin-arm64.dmg"; + hash = "sha256-kbSN4+ozVGVAGLqEuaDnWBNfzmFHYdAvbOsCb/KTpe8="; }; }; diff --git a/pkgs/by-name/co/code2prompt/package.nix b/pkgs/by-name/co/code2prompt/package.nix index 4170d25e5e63..b2793a687ca8 100644 --- a/pkgs/by-name/co/code2prompt/package.nix +++ b/pkgs/by-name/co/code2prompt/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; meta = { - description = "A CLI tool that converts your codebase into a single LLM prompt with a source tree, prompt templating, and token counting"; + description = "CLI tool that converts your codebase into a single LLM prompt with a source tree, prompt templating, and token counting"; homepage = "https://github.com/mufeedvh/code2prompt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ heisfer ]; diff --git a/pkgs/by-name/co/consul-template/package.nix b/pkgs/by-name/co/consul-template/package.nix index ca14013c21b2..cee277012203 100644 --- a/pkgs/by-name/co/consul-template/package.nix +++ b/pkgs/by-name/co/consul-template/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - hash = "sha256-iqBcY7FYCO4qqQRAHxA2sxTnyL5c0vLVWKuhqvX0oJE="; + hash = "sha256-rPr69/U7+TZ7snzK8dvyd+5/O9/sqKMY/sIPOGkORs4="; }; - vendorHash = "sha256-Slp+x+cYYIC/XgICb9qDdqq1gTDxLNwXyClaWZt1fs8="; + vendorHash = "sha256-VUqRNK6OwSVydVbmxDe75JnI16JpnGT+wyAItqz781Q="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/pkgs/by-name/co/cope/package.nix b/pkgs/by-name/co/cope/package.nix index d1aed0b02c5b..2605bbc626f9 100644 --- a/pkgs/by-name/co/cope/package.nix +++ b/pkgs/by-name/co/cope/package.nix @@ -33,7 +33,7 @@ perlPackages.buildPerlPackage { ''; meta = { - description = "A colourful wrapper for terminal programs"; + description = "Colourful wrapper for terminal programs"; homepage = "https://github.com/deftdawg/cope"; license = with lib.licenses; [ artistic1 diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index bb328afce10d..20230ef65b76 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -45,11 +45,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.322.0"; + version = "1.330.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-native-${finalAttrs.version}.zip"; - hash = "sha256-3AJTC4TI+sqTi1/B1XQZght7CClplWwIxjGmrt1E2ME="; + hash = "sha256-/Em00UVEg46gEI52fG7aQo2rqKwqrF3V1tAVx2hpyMc="; stripRoot = false; }; diff --git a/pkgs/by-name/co/courier-unicode/package.nix b/pkgs/by-name/co/courier-unicode/package.nix index d8ae055f7b32..e8c757e1a395 100644 --- a/pkgs/by-name/co/courier-unicode/package.nix +++ b/pkgs/by-name/co/courier-unicode/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.courier-mta.org/unicode/"; - description = "The Courier Unicode Library is used by most other Courier packages"; + description = "Courier Unicode Library is used by most other Courier packages"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/co/cozette/default-codepoints.nix b/pkgs/by-name/co/cozette/default-codepoints.nix new file mode 100644 index 000000000000..01ddb5f29d56 --- /dev/null +++ b/pkgs/by-name/co/cozette/default-codepoints.nix @@ -0,0 +1,712 @@ +[ + # ISO-8859-1 + "U+0000" + "U+0001" + "U+0002" + "U+0003" + "U+0004" + "U+0005" + "U+0006" + "U+0007" + "U+0008" + "U+0009" + "U+000A" + "U+000B" + "U+000C" + "U+000D" + "U+000E" + "U+000F" + "U+0010" + "U+0011" + "U+0012" + "U+0013" + "U+0014" + "U+0015" + "U+0016" + "U+0017" + "U+0018" + "U+0019" + "U+001A" + "U+001B" + "U+001C" + "U+001D" + "U+001E" + "U+001F" + "U+0020" + "U+0021" + "U+0022" + "U+0023" + "U+0024" + "U+0025" + "U+0026" + "U+0027" + "U+0028" + "U+0029" + "U+002A" + "U+002B" + "U+002C" + "U+002D" + "U+002E" + "U+002F" + "U+0030" + "U+0031" + "U+0032" + "U+0033" + "U+0034" + "U+0035" + "U+0036" + "U+0037" + "U+0038" + "U+0039" + "U+003A" + "U+003B" + "U+003C" + "U+003D" + "U+003E" + "U+003F" + "U+0040" + "U+0041" + "U+0042" + "U+0043" + "U+0044" + "U+0045" + "U+0046" + "U+0047" + "U+0048" + "U+0049" + "U+004A" + "U+004B" + "U+004C" + "U+004D" + "U+004E" + "U+004F" + "U+0050" + "U+0051" + "U+0052" + "U+0053" + "U+0054" + "U+0055" + "U+0056" + "U+0057" + "U+0058" + "U+0059" + "U+005A" + "U+005B" + "U+005C" + "U+005D" + "U+005E" + "U+005F" + "U+0060" + "U+0061" + "U+0062" + "U+0063" + "U+0064" + "U+0065" + "U+0066" + "U+0067" + "U+0068" + "U+0069" + "U+006A" + "U+006B" + "U+006C" + "U+006D" + "U+006E" + "U+006F" + "U+0070" + "U+0071" + "U+0072" + "U+0073" + "U+0074" + "U+0075" + "U+0076" + "U+0077" + "U+0078" + "U+0079" + "U+007A" + "U+007B" + "U+007C" + "U+007D" + "U+007E" + "U+007F" + "U+0080" + "U+0081" + "U+0082" + "U+0083" + "U+0084" + "U+0085" + "U+0086" + "U+0087" + "U+0088" + "U+0089" + "U+008A" + "U+008B" + "U+008C" + "U+008D" + "U+008E" + "U+008F" + "U+0090" + "U+0091" + "U+0092" + "U+0093" + "U+0094" + "U+0095" + "U+0096" + "U+0097" + "U+0098" + "U+0099" + "U+009A" + "U+009B" + "U+009C" + "U+009D" + "U+009E" + "U+009F" + "U+00A0" + "U+00A1" + "U+00A2" + "U+00A3" + "U+00A4" + "U+00A5" + "U+00A6" + "U+00A7" + "U+00A8" + "U+00A9" + "U+00AA" + "U+00AB" + "U+00AC" + "U+00AD" + "U+00AE" + "U+00AF" + "U+00B0" + "U+00B1" + "U+00B2" + "U+00B3" + "U+00B4" + "U+00B5" + "U+00B6" + "U+00B7" + "U+00B8" + "U+00B9" + "U+00BA" + "U+00BB" + "U+00BC" + "U+00BD" + "U+00BE" + "U+00BF" + "U+00C0" + "U+00C1" + "U+00C2" + "U+00C3" + "U+00C4" + "U+00C5" + "U+00C6" + "U+00C7" + "U+00C8" + "U+00C9" + "U+00CA" + "U+00CB" + "U+00CC" + "U+00CD" + "U+00CE" + "U+00CF" + "U+00D0" + "U+00D1" + "U+00D2" + "U+00D3" + "U+00D4" + "U+00D5" + "U+00D6" + "U+00D7" + "U+00D8" + "U+00D9" + "U+00DA" + "U+00DB" + "U+00DC" + "U+00DD" + "U+00DE" + "U+00DF" + "U+00E0" + "U+00E1" + "U+00E2" + "U+00E3" + "U+00E4" + "U+00E5" + "U+00E6" + "U+00E7" + "U+00E8" + "U+00E9" + "U+00EA" + "U+00EB" + "U+00EC" + "U+00ED" + "U+00EE" + "U+00EF" + "U+00F0" + "U+00F1" + "U+00F2" + "U+00F3" + "U+00F4" + "U+00F5" + "U+00F6" + "U+00F7" + "U+00F8" + "U+00F9" + "U+00FA" + "U+00FB" + "U+00FC" + "U+00FD" + "U+00FE" + "U+00FF" + + # Box Drawing and Block Elements + "U+2500" + "U+2501" + "U+2502" + "U+2503" + "U+2504" + "U+2505" + "U+2506" + "U+2507" + "U+2508" + "U+2509" + "U+250A" + "U+250B" + "U+250C" + "U+250D" + "U+250E" + "U+250F" + "U+2510" + "U+2511" + "U+2512" + "U+2513" + "U+2514" + "U+2515" + "U+2516" + "U+2517" + "U+2518" + "U+2519" + "U+251A" + "U+251B" + "U+251C" + "U+251D" + "U+251E" + "U+251F" + "U+2520" + "U+2521" + "U+2522" + "U+2523" + "U+2524" + "U+2525" + "U+2526" + "U+2527" + "U+2528" + "U+2529" + "U+252A" + "U+252B" + "U+252C" + "U+252D" + "U+252E" + "U+252F" + "U+2530" + "U+2531" + "U+2532" + "U+2533" + "U+2534" + "U+2535" + "U+2536" + "U+2537" + "U+2538" + "U+2539" + "U+253A" + "U+253B" + "U+253C" + "U+253D" + "U+253E" + "U+253F" + "U+2540" + "U+2541" + "U+2542" + "U+2543" + "U+2544" + "U+2545" + "U+2546" + "U+2547" + "U+2548" + "U+2549" + "U+254A" + "U+254B" + "U+254C" + "U+254D" + "U+254E" + "U+254F" + "U+2550" + "U+2551" + "U+2552" + "U+2553" + "U+2554" + "U+2555" + "U+2556" + "U+2557" + "U+2558" + "U+2559" + "U+255A" + "U+255B" + "U+255C" + "U+255D" + "U+255E" + "U+255F" + "U+2560" + "U+2561" + "U+2562" + "U+2563" + "U+2564" + "U+2565" + "U+2566" + "U+2567" + "U+2568" + "U+2569" + "U+256A" + "U+256B" + "U+256C" + "U+256D" + "U+256E" + "U+256F" + "U+2570" + "U+2571" + "U+2572" + "U+2573" + "U+2574" + "U+2575" + "U+2576" + "U+2577" + "U+2578" + "U+2579" + "U+257A" + "U+257B" + "U+257C" + "U+257D" + "U+257E" + "U+257F" + "U+2580" + "U+2581" + "U+2582" + "U+2583" + "U+2584" + "U+2585" + "U+2586" + "U+2587" + "U+2588" + "U+2589" + "U+258A" + "U+258B" + "U+258C" + "U+258D" + "U+258E" + "U+258F" + "U+2590" + "U+2591" + "U+2592" + "U+2593" + #"U+2594" + #"U+2595" + "U+2596" + "U+2597" + "U+2598" + "U+2599" + "U+259A" + "U+259B" + "U+259C" + "U+259D" + "U+259E" + "U+259F" + + # Braille Patterns + #"U+2800" + "U+2801" + "U+2802" + "U+2803" + "U+2804" + "U+2805" + "U+2806" + "U+2807" + "U+2808" + "U+2809" + "U+280A" + "U+280B" + "U+280C" + "U+280D" + "U+280E" + "U+280F" + "U+2810" + "U+2811" + "U+2812" + "U+2813" + "U+2814" + "U+2815" + "U+2816" + "U+2817" + "U+2818" + "U+2819" + "U+281A" + "U+281B" + "U+281C" + "U+281D" + "U+281E" + "U+281F" + "U+2820" + "U+2821" + "U+2822" + "U+2823" + "U+2824" + "U+2825" + "U+2826" + "U+2827" + "U+2828" + "U+2829" + "U+282A" + "U+282B" + "U+282C" + "U+282D" + "U+282E" + "U+282F" + "U+2830" + "U+2831" + "U+2832" + "U+2833" + "U+2834" + "U+2835" + "U+2836" + "U+2837" + "U+2838" + "U+2839" + "U+283A" + "U+283B" + "U+283C" + "U+283D" + "U+283E" + "U+283F" + "U+2840" + "U+2841" + "U+2842" + "U+2843" + "U+2844" + "U+2845" + "U+2846" + "U+2847" + "U+2848" + "U+2849" + "U+284A" + "U+284B" + "U+284C" + "U+284D" + "U+284E" + "U+284F" + "U+2850" + "U+2851" + "U+2852" + "U+2853" + "U+2854" + "U+2855" + "U+2856" + "U+2857" + "U+2858" + "U+2859" + "U+285A" + "U+285B" + "U+285C" + "U+285D" + "U+285E" + "U+285F" + "U+2860" + "U+2861" + "U+2862" + "U+2863" + "U+2864" + "U+2865" + "U+2866" + "U+2867" + "U+2868" + "U+2869" + "U+286A" + "U+286B" + "U+286C" + "U+286D" + "U+286E" + "U+286F" + "U+2870" + "U+2871" + "U+2872" + "U+2873" + "U+2874" + "U+2875" + "U+2876" + "U+2877" + "U+2878" + "U+2879" + "U+287A" + "U+287B" + "U+287C" + "U+287D" + "U+287E" + "U+287F" + "U+2880" + "U+2881" + "U+2882" + "U+2883" + "U+2884" + "U+2885" + "U+2886" + "U+2887" + "U+2888" + "U+2889" + "U+288A" + "U+288B" + "U+288C" + "U+288D" + "U+288E" + "U+288F" + "U+2890" + "U+2891" + "U+2892" + "U+2893" + "U+2894" + "U+2895" + "U+2896" + "U+2897" + "U+2898" + "U+2899" + "U+289A" + "U+289B" + "U+289C" + "U+289D" + "U+289E" + "U+289F" + "U+28A0" + "U+28A1" + "U+28A2" + "U+28A3" + "U+28A4" + "U+28A5" + "U+28A6" + "U+28A7" + "U+28A8" + "U+28A9" + "U+28AA" + "U+28AB" + "U+28AC" + "U+28AD" + "U+28AE" + "U+28AF" + "U+28B0" + "U+28B1" + "U+28B2" + "U+28B3" + "U+28B4" + "U+28B5" + "U+28B6" + "U+28B7" + "U+28B8" + "U+28B9" + "U+28BA" + "U+28BB" + "U+28BC" + "U+28BD" + "U+28BE" + "U+28BF" + "U+28C0" + "U+28C1" + "U+28C2" + "U+28C3" + "U+28C4" + "U+28C5" + "U+28C6" + "U+28C7" + "U+28C8" + "U+28C9" + "U+28CA" + "U+28CB" + "U+28CC" + "U+28CD" + "U+28CE" + "U+28CF" + "U+28D0" + "U+28D1" + "U+28D2" + "U+28D3" + "U+28D4" + "U+28D5" + "U+28D6" + "U+28D7" + "U+28D8" + "U+28D9" + "U+28DA" + "U+28DB" + "U+28DC" + "U+28DD" + "U+28DE" + "U+28DF" + "U+28E0" + "U+28E1" + "U+28E2" + "U+28E3" + "U+28E4" + "U+28E5" + "U+28E6" + "U+28E7" + "U+28E8" + "U+28E9" + "U+28EA" + "U+28EB" + "U+28EC" + "U+28ED" + "U+28EE" + "U+28EF" + "U+28F0" + "U+28F1" + "U+28F2" + "U+28F3" + "U+28F4" + "U+28F5" + "U+28F6" + "U+28F7" + "U+28F8" + "U+28F9" + "U+28FA" + "U+28FB" + "U+28FC" + "U+28FD" + "U+28FE" + "U+28FF" + + # Superscripts and Subscripts + "U+2070" + "U+2074" + "U+2075" + "U+2076" + "U+2077" + "U+2078" + "U+2079" + + "U+2080" + "U+2081" + "U+2082" + "U+2083" + "U+2084" + "U+2085" + "U+2086" + "U+2087" + "U+2088" + "U+2089" + + # Powerline and Extra Symbols + "U+E0A0" + "U+E0A1" + "U+E0A2" + "U+E0B0" + "U+E0B1" + "U+E0B2" + "U+E0B3" + + "U+E0A3" # column number + "U+E0B4" # right half circle + "U+E0B6" # left half circle } +] diff --git a/pkgs/by-name/co/cozette/package.nix b/pkgs/by-name/co/cozette/package.nix index ad852eb5ed1d..f3c7b14c2545 100644 --- a/pkgs/by-name/co/cozette/package.nix +++ b/pkgs/by-name/co/cozette/package.nix @@ -2,8 +2,14 @@ lib, stdenvNoCC, fetchzip, + writeText, + bdf2psf, + codepoints ? (import ./default-codepoints.nix), }: +let + codepoints_set = writeText "codepoints.set" (builtins.concatStringsSep "\n" codepoints); +in stdenvNoCC.mkDerivation rec { pname = "cozette"; version = "1.29.0"; @@ -15,6 +21,20 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-DHUnCzp6c3d57cfkO2kH+czXRiqRWn6DBTo9NVTghQ0="; }; + nativeBuildInputs = [ bdf2psf ]; + + postBuild = '' + # Confine Powerline left divider symbols to strictly 6 pixels wide + awk -i inplace 'BEGIN { l=-128 } $1=="ENCODING"&&($2==57520||$2==57521||$2==57524) { l=FNR } l+4 -Date: Mon, 19 May 2025 22:36:53 +0200 -Subject: [PATCH] cmake: add pkg-config file generation - -Signed-off-by: Marcin Serwin ---- - CMakeLists.txt | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ - libcubeb.pc.in | 12 ++++++++++++ - 2 files changed, 62 insertions(+) - create mode 100644 libcubeb.pc.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 07618fa..6470837 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -23,6 +23,17 @@ if(NOT CMAKE_BUILD_TYPE) - "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) - endif() - -+set(private_requires) -+set(private_libs) -+set(private_libs_flags) -+if(UNIX AND NOT APPLE) -+ if(BSD OR ANDROID) -+ list(APPEND private_libs c++) -+ else() -+ list(APPEND private_libs stdc++) -+ endif() -+endif() -+ - set(CMAKE_C_STANDARD 99) - set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) -@@ -141,6 +152,7 @@ if(NOT BUNDLE_SPEEX) - pkg_check_modules(speexdsp IMPORTED_TARGET speexdsp) - if(speexdsp_FOUND) - add_library(speex ALIAS PkgConfig::speexdsp) -+ list(APPEND private_requires speexdsp) - endif() - endif() - endif() -@@ -155,6 +167,7 @@ if(NOT TARGET speex) - EXPORT= - RANDOM_PREFIX=speex - ) -+ list(APPEND private_libs speex) - endif() - - # $ required because of https://gitlab.kitware.com/cmake/cmake/-/issues/15415 -@@ -166,6 +179,7 @@ include(CheckIncludeFiles) - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads) - target_link_libraries(cubeb PRIVATE Threads::Threads) -+list(APPEND private_libs ${CMAKE_THREAD_LIBS_INIT}) - - if(LAZY_LOAD_LIBS) - check_include_files(pulse/pulseaudio.h USE_PULSE) -@@ -176,6 +190,7 @@ if(LAZY_LOAD_LIBS) - - if(USE_PULSE OR USE_ALSA OR USE_JACK OR USE_SNDIO OR USE_AAUDIO) - target_link_libraries(cubeb PRIVATE ${CMAKE_DL_LIBS}) -+ list(APPEND private_libs ${CMAKE_DL_LIBS}) - - if(ANDROID) - target_compile_definitions(cubeb PRIVATE __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) -@@ -191,6 +206,7 @@ else() - set(USE_PULSE ON) - target_compile_definitions(cubeb PRIVATE DISABLE_LIBPULSE_DLOPEN) - target_link_libraries(cubeb PRIVATE PkgConfig::libpulse) -+ list(APPEND private_requires libpulse) - endif() - - pkg_check_modules(alsa IMPORTED_TARGET alsa) -@@ -198,6 +214,7 @@ else() - set(USE_ALSA ON) - target_compile_definitions(cubeb PRIVATE DISABLE_LIBASOUND_DLOPEN) - target_link_libraries(cubeb PRIVATE PkgConfig::alsa) -+ list(APPEND private_requires alsa) - endif() - - pkg_check_modules(jack IMPORTED_TARGET jack) -@@ -205,18 +222,21 @@ else() - set(USE_JACK ON) - target_compile_definitions(cubeb PRIVATE DISABLE_LIBJACK_DLOPEN) - target_link_libraries(cubeb PRIVATE PkgConfig::jack) -+ list(APPEND private_requires jack) - endif() - - check_include_files(sndio.h USE_SNDIO) - if(USE_SNDIO) - target_compile_definitions(cubeb PRIVATE DISABLE_LIBSNDIO_DLOPEN) - target_link_libraries(cubeb PRIVATE sndio) -+ list(APPEND private_libs sndio) - endif() - - check_include_files(aaudio/AAudio.h USE_AAUDIO) - if(USE_AAUDIO) - target_compile_definitions(cubeb PRIVATE DISABLE_LIBAAUDIO_DLOPEN) - target_link_libraries(cubeb PRIVATE aaudio) -+ list(APPEND private_libs aaudio) - endif() - endif() - -@@ -263,6 +283,7 @@ if(USE_AUDIOUNIT) - src/cubeb_osx_run_loop.cpp) - target_compile_definitions(cubeb PRIVATE USE_AUDIOUNIT) - target_link_libraries(cubeb PRIVATE "-framework AudioUnit" "-framework CoreAudio" "-framework CoreServices") -+ list(APPEND private_libs_flags "-framework AudioUnit" "-framework CoreAudio" "-framework CoreServices") - endif() - - check_include_files(audioclient.h USE_WASAPI) -@@ -271,6 +292,7 @@ if(USE_WASAPI) - src/cubeb_wasapi.cpp) - target_compile_definitions(cubeb PRIVATE USE_WASAPI) - target_link_libraries(cubeb PRIVATE avrt ole32 ksuser) -+ list(APPEND private_libs avrt ole32 ksuser) - endif() - - check_include_files("windows.h;mmsystem.h" USE_WINMM) -@@ -279,6 +301,7 @@ if(USE_WINMM) - src/cubeb_winmm.c) - target_compile_definitions(cubeb PRIVATE USE_WINMM) - target_link_libraries(cubeb PRIVATE winmm) -+ list(APPEND private_libs winmm) - endif() - - check_include_files(SLES/OpenSLES.h USE_OPENSL) -@@ -288,6 +311,7 @@ if(USE_OPENSL) - src/cubeb-jni.cpp) - target_compile_definitions(cubeb PRIVATE USE_OPENSL) - target_link_libraries(cubeb PRIVATE OpenSLES) -+ list(APPEND private_libs OpenSLES) - endif() - - check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H) -@@ -303,6 +327,7 @@ if(HAVE_SYS_SOUNDCARD_H) - pkg_check_modules(libbsd-overlay IMPORTED_TARGET libbsd-overlay) - if(libbsd-overlay_FOUND) - target_link_libraries(cubeb PRIVATE PkgConfig::libbsd-overlay) -+ list(APPEND private_requires libbsd-overlay) - set(HAVE_STRLCPY true) - endif() - endif() -@@ -320,6 +345,7 @@ if(USE_AUDIOTRACK) - src/cubeb_audiotrack.c) - target_compile_definitions(cubeb PRIVATE USE_AUDIOTRACK) - target_link_libraries(cubeb PRIVATE log) -+ list(APPEND private_libs log) - endif() - - check_include_files(sys/audioio.h USE_SUN) -@@ -335,6 +361,7 @@ if(USE_KAI) - src/cubeb_kai.c) - target_compile_definitions(cubeb PRIVATE USE_KAI) - target_link_libraries(cubeb PRIVATE kai) -+ list(APPEND private_libs kai) - endif() - - if(USE_PULSE AND USE_PULSE_RUST) -@@ -452,3 +479,26 @@ add_custom_target(clang-format-check - | xargs -0 ${CLANG_FORMAT_BINARY} -Werror -n - COMMENT "Check formatting with clang-format" - VERBATIM) -+ -+ -+list(TRANSFORM private_libs PREPEND "-l") -+string(JOIN " " CUBEB_PC_PRIVATE_LIBS ${private_libs} ${private_libs_flags}) -+ -+string(JOIN " " CUBEB_PC_PRIVATE_REQUIRES ${private_requires}) -+ -+if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}") -+ set(CUBEB_PC_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}") -+else() -+ set(CUBEB_PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") -+endif() -+if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}") -+ set(CUBEB_PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}") -+else() -+ set(CUBEB_PC_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}") -+endif() -+ -+configure_file(libcubeb.pc.in libcubeb.pc @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libcubeb.pc" -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig -+) -+ -diff --git a/libcubeb.pc.in b/libcubeb.pc.in -new file mode 100644 -index 0000000..2310ae6 ---- /dev/null -+++ b/libcubeb.pc.in -@@ -0,0 +1,12 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=@CUBEB_PC_LIBDIR@ -+includedir=@CUBEB_PC_INCLUDEDIR@ -+ -+Name: libcubeb -+Description: Cross platform audio library -+Version: @PROJECT_VERSION@ -+Requires.private: @CUBEB_PC_PRIVATE_REQUIRES@ -+Libs: -L${libdir} -lcubeb -+Libs.private: @CUBEB_PC_PRIVATE_LIBS@ -+Cflags: -I${includedir} --- -2.49.0 - diff --git a/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch b/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch deleted file mode 100644 index 9309495a4a93..000000000000 --- a/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4f8dff52e99bdd70d07d7cb47d357bb91dc5f1a9 Mon Sep 17 00:00:00 2001 -From: Marcin Serwin -Date: Sat, 24 May 2025 16:20:51 +0200 -Subject: [PATCH] cmake: don't hardcode "include" as the includedir - -When the default CMAKE_INSTALL_INCLUDEDIR is changed -headers are installed to a different location, however, the -INTERFACE_INCLUDE_DIRECTORIES in exported cmake configuration still -point to /include. - -Signed-off-by: Marcin Serwin ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 07618fa..bdf2212 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -91,7 +91,7 @@ add_library(cubeb - src/cubeb_utils.cpp - ) - target_include_directories(cubeb -- PUBLIC $ $ -+ PUBLIC $ $ - ) - set_target_properties(cubeb PROPERTIES - VERSION ${cubeb_VERSION} --- -2.49.0 - diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix index 764e763ee220..f399ddd06a8b 100644 --- a/pkgs/by-name/cu/cubeb/package.nix +++ b/pkgs/by-name/cu/cubeb/package.nix @@ -14,8 +14,6 @@ # passthru.tests testers, - pcsx2, - duckstation, alsaSupport ? !stdenv.hostPlatform.isDarwin, pulseSupport ? !stdenv.hostPlatform.isDarwin, @@ -26,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cubeb"; - version = "0-unstable-2025-04-02"; + version = "0-unstable-2025-05-29"; src = fetchFromGitHub { owner = "mozilla"; repo = "cubeb"; - rev = "975a727e5e308a04cfb9ecdf7ddaf1150ea3f733"; - hash = "sha256-3IP++tdiJUwXR6t5mf/MkPd524K/LYESNMkQ8vy10jo="; + rev = "78ee5f0efaaa395e3e1806e8ef85dcb15c7c063d"; + hash = "sha256-PsBlZQTPiBt8Y3okFOZYhiFn58adxVlaf/hLA0doX0o="; }; outputs = [ @@ -56,14 +54,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional pulseSupport libpulseaudio ++ lib.optional sndioSupport sndio; - patches = [ - # https://github.com/mozilla/cubeb/pull/813 - ./0001-cmake-add-pkg-config-file-generation.patch - - # https://github.com/mozilla/cubeb/pull/814 - ./0001-cmake-don-t-hardcode-include-as-the-includedir.patch - ]; - cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) (lib.cmakeBool "BUILD_TESTS" false) # tests require an audio server @@ -76,12 +66,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; - - tests = { - # These packages depend on a patched version of cubeb - inherit pcsx2 duckstation; - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = { diff --git a/pkgs/by-name/cu/culvert/package.nix b/pkgs/by-name/cu/culvert/package.nix index 96c05663d21c..b0fc54b3afeb 100644 --- a/pkgs/by-name/cu/culvert/package.nix +++ b/pkgs/by-name/cu/culvert/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/amboar/culvert"; - description = "A Test and Debug Tool for BMC AHB Interfaces "; + description = "Test and Debug Tool for BMC AHB Interfaces "; mainProgram = "culvert"; license = licenses.asl20; maintainers = [ maintainers.baloo ]; diff --git a/pkgs/by-name/cu/cups-printers/package.nix b/pkgs/by-name/cu/cups-printers/package.nix index 754a8ee4b9c2..4cbc1a7dbb40 100644 --- a/pkgs/by-name/cu/cups-printers/package.nix +++ b/pkgs/by-name/cu/cups-printers/package.nix @@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "cups_printers" ]; - meta = with lib; { + meta = { description = "Tool for interacting with a CUPS server"; homepage = "https://github.com/audiusGmbH/cups-printers"; changelog = "https://github.com/audiusGmbH/cups-printers/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "cups-printers"; }; } diff --git a/pkgs/by-name/cu/cutentr/package.nix b/pkgs/by-name/cu/cutentr/package.nix index bea06e6c05e3..b16f7ec41fac 100644 --- a/pkgs/by-name/cu/cutentr/package.nix +++ b/pkgs/by-name/cu/cutentr/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { ''; meta = { - description = "A 3DS streaming client for Linux"; + description = "3DS streaming client for Linux"; homepage = "https://gitlab.com/BoltsJ/cuteNTR"; license = lib.licenses.gpl3Plus; mainProgram = "cutentr"; diff --git a/pkgs/by-name/cv/cvemap/package.nix b/pkgs/by-name/cv/cvemap/package.nix index 1e56aad3321c..df210bc5c701 100644 --- a/pkgs/by-name/cv/cvemap/package.nix +++ b/pkgs/by-name/cv/cvemap/package.nix @@ -26,12 +26,12 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Tool to work with CVEs"; homepage = "https://github.com/projectdiscovery/cvemap"; changelog = "https://github.com/projectdiscovery/cvemap/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "cvemap"; }; } diff --git a/pkgs/by-name/cw/cwltool/package.nix b/pkgs/by-name/cw/cwltool/package.nix index 6cde031522fc..df62af94dcd7 100644 --- a/pkgs/by-name/cw/cwltool/package.nix +++ b/pkgs/by-name/cw/cwltool/package.nix @@ -99,12 +99,12 @@ py.pkgs.buildPythonApplication rec { "cwltool" ]; - meta = with lib; { + meta = { description = "Common Workflow Language reference implementation"; homepage = "https://www.commonwl.org"; changelog = "https://github.com/common-workflow-language/cwltool/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ veprbl ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ veprbl ]; mainProgram = "cwltool"; }; } diff --git a/pkgs/by-name/cz/cz-cli/package.nix b/pkgs/by-name/cz/cz-cli/package.nix index 5a40f248b350..30f2b41bbffa 100644 --- a/pkgs/by-name/cz/cz-cli/package.nix +++ b/pkgs/by-name/cz/cz-cli/package.nix @@ -17,14 +17,14 @@ buildNpmPackage rec { npmDepsHash = "sha256-zQ0T/1khnn+CXm/3yc9nANL0ROEEE03U5fV57btEmPg="; - meta = with lib; { + meta = { description = "Commitizen command line utility"; homepage = "https://commitizen.github.io/cz-cli"; changelog = "https://github.com/commitizen/cz-cli/releases/tag/v${version}"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ freezeboy natsukium ]; - license = licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/by-name/d2/d2/package.nix b/pkgs/by-name/d2/d2/package.nix index 8a60df382f4d..fc4e2bbb31c3 100644 --- a/pkgs/by-name/d2/d2/package.nix +++ b/pkgs/by-name/d2/d2/package.nix @@ -47,13 +47,13 @@ buildGo123Module rec { version = "v${version}"; }; - meta = with lib; { + meta = { description = "Modern diagram scripting language that turns text to diagrams"; mainProgram = "d2"; homepage = "https://d2lang.com"; changelog = "https://github.com/terrastruct/d2/releases/tag/v${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ dit7ya kashw2 ]; diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix index b8945655f42a..d8862fd64f5f 100644 --- a/pkgs/by-name/da/dart-sass/package.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -4,6 +4,7 @@ buildDartApplication, buf, protoc-gen-dart, + writableTmpDirAsHomeHook, testers, dart-sass, runCommand, @@ -16,19 +17,19 @@ let embedded-protocol = fetchFromGitHub { owner = "sass"; repo = "sass"; - rev = "refs/tags/embedded-protocol-${embedded-protocol-version}"; + tag = "embedded-protocol-${embedded-protocol-version}"; hash = "sha256-yX30i1gbVZalVhefj9c37mpFOIDaQlsLeAh7UnY56ro="; }; in buildDartApplication rec { pname = "dart-sass"; - version = "1.89.0"; + version = "1.89.1"; src = fetchFromGitHub { owner = "sass"; repo = "dart-sass"; - rev = version; - hash = "sha256-ydKkZlpjshIf8/Q1ufUFHWmJGonYPtzMiXn4VxDgHDo="; + tag = version; + hash = "sha256-G9uiG7fTDTx9wVH0bV7BeY2TpTEtTHDd0+z/+kLZiwU="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -36,12 +37,13 @@ buildDartApplication rec { nativeBuildInputs = [ buf protoc-gen-dart + writableTmpDirAsHomeHook ]; preConfigure = '' mkdir -p build ln -s ${embedded-protocol} build/language - HOME="$TMPDIR" buf generate + buf generate ''; dartCompileFlags = [ "--define=version=${version}" ]; diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json index bbe061c58e4d..f2093583f6d9 100644 --- a/pkgs/by-name/da/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -144,11 +144,11 @@ "dependency": "transitive", "description": { "name": "coverage", - "sha256": "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d", + "sha256": "4b8701e48a58f7712492c9b1f7ba0bb9d525644dd66d023b62e1fc8cdb560c8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.13.1" + "version": "1.14.0" }, "crypto": { "dependency": "direct dev", @@ -184,11 +184,11 @@ "dependency": "direct dev", "description": { "name": "dartdoc", - "sha256": "eb152ab07c585adb11cc24b7b93280a02f6ac5ff724cca4e6cabb24e8be88c82", + "sha256": "f978526530e42dbb831295af743c057d94533e89c27ce1f4023b252f3d85b8be", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.3" + "version": "8.3.4" }, "ffi": { "dependency": "transitive", @@ -474,21 +474,21 @@ "dependency": "direct main", "description": { "name": "protobuf", - "sha256": "fbb0c37d435641d0b84813c1dad41e6fa61ddc880a320bce16b3063ecec35aa6", + "sha256": "579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.1.0" }, "protoc_plugin": { "dependency": "direct dev", "description": { "name": "protoc_plugin", - "sha256": "cb2c7ec4ca331a8b1b3042200d1fe329f989450c8d380b45565b21ae3f7f5ce9", + "sha256": "32fbf4ac1b1a7263440898c9011209c3a13c9063f326ef78da83734e6f992ff3", "url": "https://pub.dev" }, "source": "hosted", - "version": "22.1.0" + "version": "22.3.0" }, "pub_api_client": { "dependency": "direct dev", @@ -654,31 +654,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "f1665eeffe3b6b193548b5f515e8d1b54ccd9a6e0e7721a417e134e7ed7f06a1", + "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.26.0" + "version": "1.26.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "6c7653816b1c938e121b69ff63a33c9dc68102b65a5fb0a5c0f9786256ed33e6", + "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.5" + "version": "0.7.6" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "3caa7c3956b366643b2dedecff764cc32030317b2a15252aed845570df6bcc0f", + "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.9" + "version": "0.6.11" }, "test_descriptor": { "dependency": "direct dev", @@ -724,11 +724,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", + "sha256": "6f82e9ee8e7339f5d8b699317f6f3afc17c80a68ebef1bc0d6f52a678c14b1e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.0.0" + "version": "15.0.1" }, "watcher": { "dependency": "direct main", diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index ee7ec2c69559..d41db8966365 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "25.0.5"; + version = "25.1.0"; src = let @@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-8JkvI6OZGP1Ot2TEP2n4hj3s9As7holT+thVf0BvOMQ="; - aarch64-linux = "sha256-cZQFEbogSxuIaS/z/tFQcvs08J0Omi21zLqb0eFQNw0="; - x86_64-darwin = "sha256-LueOQZIKB/r6gtlj0+xwoJXMRTFvbSY+RTwAB74KiYo="; - aarch64-darwin = "sha256-L6bOyvhlsT4sXL1QDhlJtb8DFfDVw21ixyRenOVdCxU="; + x86_64-linux = "sha256-Bpc4p6WNFdc6nwVeZI4THETzODfNUj2SouEgOhDFTkk="; + aarch64-linux = "sha256-mqeG/Vzn/5qsBoD7U6i/6GxXBUvP+55pC1U1wBKF1T0="; + x86_64-darwin = "sha256-3RoJGvOafuKRo9dn+m8J274O06F8YUWx1YAcRMQb/Qs="; + aarch64-darwin = "sha256-11VbGnZz2fDtG5LRQZWnQdXCT7qrIia22aO+5nA/LQE="; }; in fetchurl { diff --git a/pkgs/by-name/db/dbus-broker/package.nix b/pkgs/by-name/db/dbus-broker/package.nix index 510810f90e28..20a3fd102b02 100644 --- a/pkgs/by-name/db/dbus-broker/package.nix +++ b/pkgs/by-name/db/dbus-broker/package.nix @@ -39,7 +39,7 @@ let ]; inherit buildInputs; meta = meta // { - description = "The C-Util Project is a collection of utility libraries for the C11 language."; + description = "C-Util Project is a collection of utility libraries for the C11 language"; homepage = "https://c-util.github.io/"; license = [ lib.licenses.asl20 diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix index 522c615e18bd..49eb2b4f121c 100644 --- a/pkgs/by-name/dc/dconf-editor/package.nix +++ b/pkgs/by-name/dc/dconf-editor/package.nix @@ -69,13 +69,13 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { description = "GSettings editor for GNOME"; mainProgram = "dconf-editor"; homepage = "https://apps.gnome.org/DconfEditor/"; changelog = "https://gitlab.gnome.org/GNOME/dconf-editor/-/blob/${version}/NEWS?ref_type=tags"; - license = licenses.gpl3Plus; - teams = [ teams.gnome ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + teams = [ lib.teams.gnome ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/dd/ddcutil/package.nix b/pkgs/by-name/dd/ddcutil/package.nix index 12754468dea7..a0241abe6cc5 100644 --- a/pkgs/by-name/dd/ddcutil/package.nix +++ b/pkgs/by-name/dd/ddcutil/package.nix @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "http://www.ddcutil.com/"; description = "Query and change Linux monitor settings using DDC/CI and USB"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ rnhmjoj ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ rnhmjoj ]; changelog = "https://github.com/rockowitz/ddcutil/blob/v${version}/CHANGELOG.md"; mainProgram = "ddcutil"; }; diff --git a/pkgs/by-name/de/detach/package.nix b/pkgs/by-name/de/detach/package.nix new file mode 100644 index 000000000000..a9025beaee11 --- /dev/null +++ b/pkgs/by-name/de/detach/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchzip, + installShellFiles, +}: + +stdenv.mkDerivation rec { + pname = "detach"; + version = "0.2.3"; + + src = fetchzip { + url = "http://inglorion.net/download/detach-${version}.tar.bz2"; + hash = "sha256-nnhJGtmPlTeqM20FAKRyhhSMViTXFpQT0A1ol4lhsoc="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + dontConfigure = true; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + installShellCompletion --cmd detach \ + --zsh contrib/zsh-completer/_detach + ''; + + doCheck = false; + + meta = { + description = "Utility for running a command detached from the current terminal"; + homepage = "https://inglorion.net/software/detach/"; + license = lib.licenses.mit; + mainProgram = "detach"; + maintainers = with lib.maintainers; [ pbsds ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/df/dfl-ipc/package.nix b/pkgs/by-name/df/dfl-ipc/package.nix index b1e09c6871c5..f11a0c72d508 100644 --- a/pkgs/by-name/df/dfl-ipc/package.nix +++ b/pkgs/by-name/df/dfl-ipc/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "A very simple set of IPC classes for inter-process communication"; + description = "Very simple set of IPC classes for inter-process communication"; homepage = "https://gitlab.com/desktop-frameworks/ipc"; changelog = "https://gitlab.com/desktop-frameworks/ipc/-/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/dg/dgoss/package.nix b/pkgs/by-name/dg/dgoss/package.nix index 090946d89f96..e267ed5cf799 100644 --- a/pkgs/by-name/dg/dgoss/package.nix +++ b/pkgs/by-name/dg/dgoss/package.nix @@ -36,13 +36,13 @@ resholve.mkDerivation rec { }; }; - meta = with lib; { + meta = { homepage = "https://github.com/goss-org/goss/blob/v${version}/extras/dgoss/README.md"; changelog = "https://github.com/goss-org/goss/releases/tag/v${version}"; description = "Convenience wrapper around goss that aims to bring the simplicity of goss to docker containers"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ hyzual anthonyroussel ]; diff --git a/pkgs/by-name/dh/dhcpdump/package.nix b/pkgs/by-name/dh/dhcpdump/package.nix index 02f611df8e56..9505f5d74631 100644 --- a/pkgs/by-name/dh/dhcpdump/package.nix +++ b/pkgs/by-name/dh/dhcpdump/package.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { runHook postBuild ''; - meta = with lib; { + meta = { description = "Tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; homepage = "https://github.com/bbonev/dhcpdump"; changelog = "https://github.com/bbonev/dhcpdump/releases/tag/v${version}"; - platforms = platforms.linux; - maintainers = with maintainers; [ nickcao ]; - license = licenses.bsd2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ nickcao ]; + license = lib.licenses.bsd2; mainProgram = "dhcpdump"; }; } diff --git a/pkgs/by-name/di/di-tui/package.nix b/pkgs/by-name/di/di-tui/package.nix index 439237d27497..60a8cbfc8c0e 100644 --- a/pkgs/by-name/di/di-tui/package.nix +++ b/pkgs/by-name/di/di-tui/package.nix @@ -20,7 +20,7 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; meta = { - description = "A simple terminal UI player for di.fm"; + description = "Simple terminal UI player for di.fm"; homepage = "https://github.com/acaloiaro/di-tui"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.acaloiaro ]; diff --git a/pkgs/by-name/di/didder/package.nix b/pkgs/by-name/di/didder/package.nix index 8cee20b76693..011fd3d662ab 100644 --- a/pkgs/by-name/di/didder/package.nix +++ b/pkgs/by-name/di/didder/package.nix @@ -30,7 +30,7 @@ buildGoModule rec { ''; meta = src.meta // { - description = "An extensive, fast, and accurate command-line image dithering tool"; + description = "Extensive, fast, and accurate command-line image dithering tool"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ehmry ]; mainProgram = "didder"; diff --git a/pkgs/by-name/di/dinit/package.nix b/pkgs/by-name/di/dinit/package.nix index 394d370bfb88..93ef3172bc74 100644 --- a/pkgs/by-name/di/dinit/package.nix +++ b/pkgs/by-name/di/dinit/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A service manager / supervision system, which can (on Linux) also function as a system manager and init"; + description = "Service manager / supervision system, which can (on Linux) also function as a system manager and init"; homepage = "https://davmac.org/projects/dinit"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aanderse ]; diff --git a/pkgs/by-name/di/discrete-scroll/package.nix b/pkgs/by-name/di/discrete-scroll/package.nix index f3b0f1c98109..937a5d5b19d1 100644 --- a/pkgs/by-name/di/discrete-scroll/package.nix +++ b/pkgs/by-name/di/discrete-scroll/package.nix @@ -23,15 +23,15 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm755 a.out $out/bin/discretescroll + install -Dm555 a.out $out/bin/discretescroll runHook postInstall ''; meta = { - description = "Fix for OS X's scroll wheel problem"; + description = "Fix for macOS's unnecessary scroll wheel acceleration"; homepage = "https://github.com/emreyolcu/discrete-scroll"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ bb2020 ]; platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ bb2020 ]; }; }) diff --git a/pkgs/by-name/di/distrobox-tui/package.nix b/pkgs/by-name/di/distrobox-tui/package.nix index e61cd34e9fd5..f52ad5c742e4 100644 --- a/pkgs/by-name/di/distrobox-tui/package.nix +++ b/pkgs/by-name/di/distrobox-tui/package.nix @@ -21,7 +21,7 @@ buildGoModule rec { meta = { changelog = "https://github.com/phanirithvij/distrobox-tui/releases/tag/v${version}"; - description = "A TUI for DistroBox"; + description = "TUI for DistroBox"; homepage = "https://github.com/phanirithvij/distrobox-tui"; license = lib.licenses.gpl3Plus; mainProgram = "distrobox-tui"; diff --git a/pkgs/by-name/di/dita-ot/package.nix b/pkgs/by-name/di/dita-ot/package.nix index 3568bd8c50fc..85ac70fb909c 100644 --- a/pkgs/by-name/di/dita-ot/package.nix +++ b/pkgs/by-name/di/dita-ot/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "dita-ot"; - version = "4.3.1"; + version = "4.3.2"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ openjdk17 ]; src = fetchzip { url = "https://github.com/dita-ot/dita-ot/releases/download/${finalAttrs.version}/dita-ot-${finalAttrs.version}.zip"; - hash = "sha256-MwE6HnOrVtoT23wF0Tyje8T52au8kD6waY9tsrLQVck="; + hash = "sha256-LmXkFuejnWQh0i1L0/GcD/NBNBCMKE5+7M7bUC0DLIg="; }; installPhase = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://dita-ot.org"; changelog = "https://www.dita-ot.org/dev/release-notes/#v${finalAttrs.version}"; - description = "The open-source publishing engine for content authored in the Darwin Information Typing Architecture"; + description = "Open-source publishing engine for content authored in the Darwin Information Typing Architecture"; license = lib.licenses.asl20; mainProgram = "dita"; platforms = openjdk17.meta.platforms; diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index c20f49edb89d..6811e0df0e7f 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -48,12 +48,12 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "Synchronize your DNS to multiple providers from a simple DSL"; homepage = "https://dnscontrol.org/"; changelog = "https://github.com/StackExchange/dnscontrol/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "dnscontrol"; }; } diff --git a/pkgs/by-name/dn/dnsmonster/package.nix b/pkgs/by-name/dn/dnsmonster/package.nix index 566998865506..64c40c4d9f54 100644 --- a/pkgs/by-name/dn/dnsmonster/package.nix +++ b/pkgs/by-name/dn/dnsmonster/package.nix @@ -27,12 +27,12 @@ buildGoModule rec { "-X=github.com/mosajjal/dnsmonster/util.releaseVersion=${version}" ]; - meta = with lib; { + meta = { description = "Passive DNS Capture and Monitoring Toolkit"; homepage = "https://github.com/mosajjal/dnsmonster"; changelog = "https://github.com/mosajjal/dnsmonster/releases/tag/v${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fab ]; broken = stdenv.hostPlatform.isDarwin; mainProgram = "dnsmonster"; }; diff --git a/pkgs/by-name/dn/dnsperf/package.nix b/pkgs/by-name/dn/dnsperf/package.nix index 6c6abd4db0b7..a69b594b7348 100644 --- a/pkgs/by-name/dn/dnsperf/package.nix +++ b/pkgs/by-name/dn/dnsperf/package.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { description = "Tools for DNS benchmaring"; homepage = "https://www.dns-oarc.net/tools/dnsperf"; changelog = "https://github.com/DNS-OARC/dnsperf/releases/tag/v${version}"; - license = licenses.isc; - platforms = platforms.unix; + license = lib.licenses.isc; + platforms = lib.platforms.unix; mainProgram = "dnsperf"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ vcunat mfrw ]; diff --git a/pkgs/by-name/dn/dnsrecon/package.nix b/pkgs/by-name/dn/dnsrecon/package.nix index 5e51dc1b2fc6..d8841ce7c0b7 100644 --- a/pkgs/by-name/dn/dnsrecon/package.nix +++ b/pkgs/by-name/dn/dnsrecon/package.nix @@ -32,12 +32,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "dnsrecon" ]; - meta = with lib; { + meta = { description = "DNS Enumeration script"; homepage = "https://github.com/darkoperator/dnsrecon"; changelog = "https://github.com/darkoperator/dnsrecon/releases/tag/${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ c0bw3b fab ]; diff --git a/pkgs/by-name/dn/dnss/package.nix b/pkgs/by-name/dn/dnss/package.nix index 72a8907a301a..d9ae1a34334a 100644 --- a/pkgs/by-name/dn/dnss/package.nix +++ b/pkgs/by-name/dn/dnss/package.nix @@ -17,7 +17,7 @@ buildGoModule { vendorHash = "sha256-d9aGSBRblkvH5Ixw3jpbgC8lMW/qEYNJfLTVeUlos7A="; meta = with lib; { - description = "A daemon for using DNS over HTTPS"; + description = "Daemon for using DNS over HTTPS"; homepage = "https://blitiri.com.ar/git/r/dnss/"; license = licenses.asl20; mainProgram = "dnss"; diff --git a/pkgs/by-name/dn/dnstwist/package.nix b/pkgs/by-name/dn/dnstwist/package.nix index 22162241e6b3..98b0eb4514d7 100644 --- a/pkgs/by-name/dn/dnstwist/package.nix +++ b/pkgs/by-name/dn/dnstwist/package.nix @@ -36,12 +36,12 @@ python3.pkgs.buildPythonApplication rec { "dnstwist" ]; - meta = with lib; { + meta = { description = "Domain name permutation engine for detecting homograph phishing attacks"; homepage = "https://github.com/elceef/dnstwist"; changelog = "https://github.com/elceef/dnstwist/releases/tag/${version}"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ gpl3Only ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "dnstwist"; }; } diff --git a/pkgs/by-name/dn/dnsx/package.nix b/pkgs/by-name/dn/dnsx/package.nix index e7c8e68e77de..e2e6b6dd29f7 100644 --- a/pkgs/by-name/dn/dnsx/package.nix +++ b/pkgs/by-name/dn/dnsx/package.nix @@ -34,7 +34,7 @@ buildGoModule rec { versionCheckProgramArg = "-version"; - meta = with lib; { + meta = { description = "Fast and multi-purpose DNS toolkit"; longDescription = '' dnsx is a fast and multi-purpose DNS toolkit allow to run multiple @@ -44,8 +44,8 @@ buildGoModule rec { ''; homepage = "https://github.com/projectdiscovery/dnsx"; changelog = "https://github.com/projectdiscovery/dnsx/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "dnsx"; }; } diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix index 79e343544514..4b0b68131eda 100644 --- a/pkgs/by-name/do/dolphin-emu/package.nix +++ b/pkgs/by-name/do/dolphin-emu/package.nix @@ -53,13 +53,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu"; - version = "2503a"; + version = "2506"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; tag = finalAttrs.version; - hash = "sha256-1IqrQi2aBUFpa3n/WI7nF1wqBPyyfpv02YIFfX/911w="; + hash = "sha256-JEp1rc5nNJY4GfNCR2Vi4ctQ14p+LZWuFPFirv6foUM="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/pkgs/by-name/do/dooit-extras/package.nix b/pkgs/by-name/do/dooit-extras/package.nix index 5cd863f26376..f9a77d08bb44 100644 --- a/pkgs/by-name/do/dooit-extras/package.nix +++ b/pkgs/by-name/do/dooit-extras/package.nix @@ -1,13 +1,10 @@ { lib, fetchFromGitHub, - python311, + python3, dooit, nix-update-script, }: -let - python3 = python311; -in python3.pkgs.buildPythonPackage rec { pname = "dooit-extras"; version = "0.2.1"; diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix index 98d95c51098a..361729775ae1 100644 --- a/pkgs/by-name/do/dooit/package.nix +++ b/pkgs/by-name/do/dooit/package.nix @@ -2,14 +2,11 @@ lib, fetchFromGitHub, dooit, - python311, + python3, testers, nix-update-script, extraPackages ? [ ], }: -let - python3 = python311; -in python3.pkgs.buildPythonApplication rec { pname = "dooit"; version = "3.2.2"; diff --git a/pkgs/by-name/do/dorion/no-cargo-patch.patch b/pkgs/by-name/do/dorion/no-cargo-patch.patch new file mode 100644 index 000000000000..1906d417b517 --- /dev/null +++ b/pkgs/by-name/do/dorion/no-cargo-patch.patch @@ -0,0 +1,31 @@ +diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock +index 13a6b54..f6bd9d6 100644 +--- a/src-tauri/Cargo.lock ++++ b/src-tauri/Cargo.lock +@@ -5049,6 +5049,8 @@ dependencies = [ + [[package]] + name = "tauri-plugin-shell" + version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69d5eb3368b959937ad2aeaf6ef9a8f5d11e01ffe03629d3530707bbcb27ff5d" + dependencies = [ + "encoding_rs", + "log", +diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml +index 4dcaa86..daef086 100644 +--- a/src-tauri/Cargo.toml ++++ b/src-tauri/Cargo.toml +@@ -12,13 +12,6 @@ rust-version = "1.84.1" + strip = "debuginfo" + lto = false + +-# Patches +-[package.metadata.patch] +-crates = ["tauri-plugin-shell"] +- +-[patch.crates-io] +-tauri-plugin-shell = { path="./target/patch/tauri-plugin-shell-2.2.1" } +- + [build-dependencies] + tauri-build = { version = "2.0.0", features = [] } + diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index c5e95fa6748b..a7b804dfe9bf 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -1,66 +1,193 @@ { lib, - stdenv, + fetchFromGitHub, fetchurl, - autoPatchelfHook, - dpkg, + rustPlatform, + cmake, + ninja, + wrapGAppsHook4, glib-networking, gst_all_1, - libappindicator, + libsysprof-capture, libayatana-appindicator, - webkitgtk_4_0, - wrapGAppsHook3, + nodejs, + openssl, + pkg-config, + yq-go, + pnpm_9, + webkitgtk_4_1, + cargo-tauri, + desktop-file-utils, }: -stdenv.mkDerivation (finalAttrs: { - pname = "dorion"; - version = "5.0.1"; - - src = fetchurl { - url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version}/Dorion_${finalAttrs.version}_amd64.deb"; - hash = "sha256-cCZikTZ+IU3mq/FkJfeggXLyWIsWG+a2qu1GbgW93WQ="; +let + webkitgtk_4_1' = webkitgtk_4_1.override { + enableExperimental = true; }; - unpackCmd = '' - dpkg -X $curSrc . - ''; + shelter = fetchurl { + url = "https://raw.githubusercontent.com/uwu/shelter-builds/fab6f100bd0ab8583d67f792f66722a7d2a14bd1/shelter.js"; + hash = "sha256-d9vaKLrl8RYNcHnE1iGN49ov6U/Y+9XpEsio+c1Sguc="; + meta = { + homepage = "https://github.com/uwu/shelter"; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; # actually, minified JS + license = lib.licenses.cc0; + }; + }; +in - runtimeDependencies = [ - glib-networking - libappindicator - libayatana-appindicator +rustPlatform.buildRustPackage (finalAttrs: { + pname = "dorion"; + version = "6.7.1"; + + src = fetchFromGitHub { + owner = "SpikeHD"; + repo = "Dorion"; + tag = "v${finalAttrs.version}"; + hash = "sha256-d4G3royqhz+te5wPWVLNqqG/w0qOvTd7dKcWSzxUMUo="; + }; + + cargoPatches = [ + ./no-cargo-patch.patch + ]; + + cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; + + useFetchCargoVendor = true; + cargoHash = "sha256-1xpAJkS31DjrZCY5WJ4/Z1t1ALED5gz7xYLhVR1Qzww="; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-xBonUzA4+1zbViEsKap6CaG6ZRldW1LjNYIB+FmVRFs="; + }; + + # CMake (webkit extension) + cmakeDir = "."; + cmakeBuildDir = "src-tauri/extension_webkit"; + dontUseCmakeConfigure = true; + dontUseNinjaBuild = true; + dontUseNinjaCheck = true; + dontUseNinjaInstall = true; + # cmake's supposed to set this automatically + # ... but the detection is based on the presence of ninja build hook + cmakeFlags = [ + "-GNinja" ]; nativeBuildInputs = [ - autoPatchelfHook - dpkg - wrapGAppsHook3 + pnpm_9.configHook + cargo-tauri.hook + nodejs + pkg-config + wrapGAppsHook4 + yq-go + desktop-file-utils + cmake + ninja ]; buildInputs = [ - glib-networking - gst_all_1.gst-plugins-bad + openssl + webkitgtk_4_1' gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-good - webkitgtk_4_0 + gst_all_1.gst-plugins-rs + glib-networking + libsysprof-capture + libayatana-appindicator ]; - installPhase = '' - runHook preInstall + postPatch = '' + # remove updater + rm -rf updater - mkdir -pv $out - mv -v {bin,lib,share} $out + # patch cargo-deps + pushd $cargoDepsCopy/tauri-plugin-shell-* + patch -p1 < /build/source/src-tauri/patches/tauri-plugin-shell+*.patch + popd - runHook postInstall + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + + # disable pre-build script and disable auto-updater + yq -iPo=json ' + .bundle.resources = (.bundle.resources | map(select(. != "updater*"))) + ' src-tauri/tauri.conf.json + + # link shelter injection + ln -s ${shelter} src-tauri/injection/shelter.js + + # link html/frontend data + ln -s /build/source/src /build/source/src-tauri/html ''; + configurePhase = '' + cmakeConfigurePhase + pnpmConfigHook + ''; + + buildPhase = '' + ninjaBuildPhase + cd /build/source + tauriBuildHook + ''; + + postInstall = '' + # Set up the resource directories + mkdir -p $out/lib/Dorion + ln -s $out/lib/Dorion $out/lib/dorion + rm -rf $out/lib/Dorion/injection + cp -r src-tauri/injection $out/lib/Dorion + cp -r src $out/lib/Dorion + + # Modify the desktop file + desktop-file-edit \ + --set-comment "Tiny alternative Discord client" \ + --set-key="Exec" --set-value="Dorion %U" \ + --set-key="TryExec" --set-value="Dorion" \ + --set-key="StartupWMClass" --set-value="Dorion" \ + --set-key="StartupNotify" --set-value="true" \ + --set-key="Categories" --set-value="Network;InstantMessaging;Chat;" \ + --set-key="Keywords" --set-value="dorion;discord;vencord;chat;im;vc;ds;dc;dsc;tauri;" \ + --set-key="Terminal" --set-value="false" \ + --set-key="MimeType" --set-value="x-scheme-handler/discord" \ + $out/share/applications/Dorion.desktop + ''; + + # error: failed to run custom build command for `Dorion v6.5.3 (/build/source/src-tauri)` + # Permission denied (os error 13) + doCheck = false; + + env = { + TAURI_RESOURCE_DIR = "${placeholder "out"}/lib"; + }; + meta = { - homepage = "https://github.com/SpikeHD/Dorion"; + homepage = "https://spikehd.github.io/projects/dorion/"; description = "Tiny alternative Discord client"; - license = lib.licenses.gpl3Only; - mainProgram = "dorion"; - maintainers = with lib.maintainers; [ aleksana ]; - platforms = lib.intersectLists (lib.platforms.linux) (lib.platforms.x86_64); - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + longDescription = '' + Dorion is an alternative Discord client aimed towards lower-spec or + storage-sensitive PCs that supports themes, plugins, and more! + ''; + changelog = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}"; + downloadPage = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ + gpl3Only + cc0 # Shelter + ]; + mainProgram = "Dorion"; + maintainers = with lib.maintainers; [ + nyabinary + aleksana + griffi-gh + getchoo + ]; + platforms = lib.platforms.linux; + sourceProvenance = [ + lib.sourceTypes.binaryBytecode # actually, minified JS + lib.sourceTypes.fromSource + ]; }; }) diff --git a/pkgs/by-name/do/dotnet-ef/package.nix b/pkgs/by-name/do/dotnet-ef/package.nix index 9fe2edac1f2c..2d7a01bd194e 100644 --- a/pkgs/by-name/do/dotnet-ef/package.nix +++ b/pkgs/by-name/do/dotnet-ef/package.nix @@ -7,7 +7,7 @@ buildDotnetGlobalTool { nugetHash = "sha256-Mu+MlsjH/qa4kMb7z/TuG1lSVSKPX9j9S4mJLVRZ2+E="; meta = { - description = "The Entity Framework Core tools help with design-time development tasks."; + description = "Tools to help with design-time development tasks"; longDescription = '' The Entity Framework Core tools help with design-time development tasks. They're primarily used to manage Migrations and to scaffold a DbContext and entity types by reverse engineering the schema of a database. diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix index 9fbc2e62e9b9..2b1bf4742def 100644 --- a/pkgs/by-name/dr/draupnir/package.nix +++ b/pkgs/by-name/dr/draupnir/package.nix @@ -12,6 +12,7 @@ fetchYarnDeps, stdenv, cctools, + nixosTests, }: # docs: https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/javascript.section.md#yarn2nix-javascript-yarn2nix @@ -95,10 +96,13 @@ mkYarnPackage rec { distPhase = "true"; - passthru.updateScript = ./update.sh; + passthru = { + tests = { inherit (nixosTests) draupnir; }; + updateScript = ./update.sh; + }; meta = with lib; { - description = "A moderation tool for Matrix"; + description = "Moderation tool for Matrix"; homepage = "https://github.com/the-draupnir-project/Draupnir"; longDescription = '' As an all-in-one moderation tool, it can protect your server from diff --git a/pkgs/by-name/dr/drawing/package.nix b/pkgs/by-name/dr/drawing/package.nix index ae4ef226c1ef..86e6b711add7 100644 --- a/pkgs/by-name/dr/drawing/package.nix +++ b/pkgs/by-name/dr/drawing/package.nix @@ -62,13 +62,13 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; - meta = with lib; { + meta = { description = "Free basic image editor, similar to Microsoft Paint, but aiming at the GNOME desktop"; mainProgram = "drawing"; homepage = "https://maoschanz.github.io/drawing/"; changelog = "https://github.com/maoschanz/drawing/releases/tag/${version}"; - maintainers = with maintainers; [ mothsart ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ mothsart ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/dr/driftctl/package.nix b/pkgs/by-name/dr/driftctl/package.nix index 9a95d19f4e4f..715ffa1c8adf 100644 --- a/pkgs/by-name/dr/driftctl/package.nix +++ b/pkgs/by-name/dr/driftctl/package.nix @@ -47,7 +47,7 @@ buildGoModule rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { homepage = "https://driftctl.com/"; changelog = "https://github.com/snyk/driftctl/releases/tag/v${version}"; description = "Detect, track and alert on infrastructure drift"; @@ -56,8 +56,8 @@ buildGoModule rec { driftctl is a free and open-source CLI that warns of infrastructure drift and fills in the missing piece in your DevSecOps toolbox. ''; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kaction jk qjoly diff --git a/pkgs/by-name/dr/driftnet/package.nix b/pkgs/by-name/dr/driftnet/package.nix index b0bff18b2955..5d5d3c54c250 100644 --- a/pkgs/by-name/dr/driftnet/package.nix +++ b/pkgs/by-name/dr/driftnet/package.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { openssl ]; - meta = with lib; { + meta = { description = "Watches network traffic, and picks out and displays JPEG and GIF images for display"; homepage = "https://github.com/deiv/driftnet"; changelog = "https://github.com/deiv/driftnet/releases/tag/v${version}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ offline ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ offline ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "driftnet"; }; } diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix index 06c2117bf19f..19fdfbb43c88 100644 --- a/pkgs/by-name/dr/dropbear/package.nix +++ b/pkgs/by-name/dr/dropbear/package.nix @@ -65,12 +65,12 @@ stdenv.mkDerivation rec { libxcrypt ]; - meta = with lib; { + meta = { description = "Small footprint implementation of the SSH 2 protocol"; homepage = "https://matt.ucc.asn.au/dropbear/dropbear.html"; changelog = "https://github.com/mkj/dropbear/raw/DROPBEAR_${version}/CHANGES"; - license = licenses.mit; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ abbradar ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix index e4c39a397c6a..a94fc06e1161 100644 --- a/pkgs/by-name/du/duckstation/package.nix +++ b/pkgs/by-name/du/duckstation/package.nix @@ -6,6 +6,7 @@ callPackage, cmake, cpuinfo, + cubeb, curl, extra-cmake-modules, libXrandr, @@ -56,7 +57,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 cpuinfo - sources.cubeb + cubeb curl libXrandr libbacktrace diff --git a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch b/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch index b28d522cbd50..e740b0619338 100644 --- a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch +++ b/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch @@ -15,15 +15,19 @@ index af35687..8347825 100644 disable_compiler_warnings_for_target(kissfft) diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp -index 85579c4..526d168 100644 +index 85579c4..339190a 100644 --- a/src/util/cubeb_audio_stream.cpp +++ b/src/util/cubeb_audio_stream.cpp -@@ -261,7 +261,7 @@ std::vector> AudioStream::GetCubebDriverName +@@ -261,9 +261,9 @@ std::vector> AudioStream::GetCubebDriverName std::vector> names; names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default")); - const char** cubeb_names = cubeb_get_backend_names(); -+ const char*const * cubeb_names = cubeb_get_backend_names(); - for (u32 i = 0; cubeb_names[i] != nullptr; i++) - names.emplace_back(cubeb_names[i], cubeb_names[i]); +- for (u32 i = 0; cubeb_names[i] != nullptr; i++) +- names.emplace_back(cubeb_names[i], cubeb_names[i]); ++ cubeb_backend_names backends = cubeb_get_backend_names(); ++ for (u32 i = 0; i < backends.count; i++) ++ names.emplace_back(backends.names[i], backends.names[i]); return names; + } + diff --git a/pkgs/by-name/du/duckstation/sources.nix b/pkgs/by-name/du/duckstation/sources.nix index 42a24ede16c5..228bcbc2aaba 100644 --- a/pkgs/by-name/du/duckstation/sources.nix +++ b/pkgs/by-name/du/duckstation/sources.nix @@ -9,7 +9,6 @@ stdenv, cmake, ninja, - cubeb, }: { @@ -164,15 +163,4 @@ platforms = lib.platforms.linux; }; }); - - cubeb = cubeb.overrideAttrs (old: { - pname = "cubeb-patched-for-duckstation"; - patches = (old.patches or [ ]) ++ [ - (fetchpatch { - url = "https://github.com/PCSX2/pcsx2/commit/430e31abe4a9e09567cb542f1416b011bb9b6ef9.patch"; - stripLen = 2; - hash = "sha256-bbH0c1X3lMeX6hfNKObhcq5xraFpicFV3mODQGYudvQ="; - }) - ]; - }); } diff --git a/pkgs/by-name/du/dum/package.nix b/pkgs/by-name/du/dum/package.nix index 928ccc53afe6..038699d17cd7 100644 --- a/pkgs/by-name/du/dum/package.nix +++ b/pkgs/by-name/du/dum/package.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-CpVci0nw/6Y6uyQX6iRV9E7uXzdZ2fzYIelYxsc+tI0="; - meta = with lib; { + meta = { description = "Npm scripts runner written in Rust"; mainProgram = "dum"; homepage = "https://github.com/egoist/dum"; changelog = "https://github.com/egoist/dum/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/du/dump_syms/package.nix b/pkgs/by-name/du/dump_syms/package.nix index 9c1c9d5a2607..67a96a2f85ce 100644 --- a/pkgs/by-name/du/dump_syms/package.nix +++ b/pkgs/by-name/du/dump_syms/package.nix @@ -48,12 +48,12 @@ rustPlatform.buildRustPackage { inherit firefox-esr-unwrapped firefox-unwrapped thunderbird-unwrapped; }; - meta = with lib; { + meta = { changelog = "https://github.com/mozilla/dump_syms/blob/v${version}/CHANGELOG.md"; description = "Command-line utility for parsing the debugging information the compiler provides in ELF or stand-alone PDB files"; mainProgram = "dump_syms"; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://github.com/mozilla/dump_syms/"; - maintainers = with maintainers; [ hexa ]; + maintainers = with lib.maintainers; [ hexa ]; }; } diff --git a/pkgs/by-name/du/dut/package.nix b/pkgs/by-name/du/dut/package.nix index a1e08751a0d4..3185cbc763ea 100644 --- a/pkgs/by-name/du/dut/package.nix +++ b/pkgs/by-name/du/dut/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; - description = "A disk usage calculator for Linux"; + description = "Disk usage calculator for Linux"; homepage = "https://codeberg.org/201984/dut"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ errnoh ]; diff --git a/pkgs/by-name/dw/dwl/package.nix b/pkgs/by-name/dw/dwl/package.nix index e30827a71774..ac4845a42ee3 100644 --- a/pkgs/by-name/dw/dwl/package.nix +++ b/pkgs/by-name/dw/dwl/package.nix @@ -10,6 +10,7 @@ pkg-config, stdenv, testers, + nixosTests, wayland, wayland-protocols, wayland-scanner, @@ -103,10 +104,13 @@ stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; passthru = { - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - # `dwl -v` emits its version string to stderr and returns 1 - command = "dwl -v 2>&1; return 0"; + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + # `dwl -v` emits its version string to stderr and returns 1 + command = "dwl -v 2>&1; return 0"; + }; + basic = nixosTests.dwl; }; }; diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix index aacc410d5a07..ee88691c0b06 100644 --- a/pkgs/by-name/e1/e1s/package.nix +++ b/pkgs/by-name/e1/e1s/package.nix @@ -19,13 +19,13 @@ buildGoModule { vendorHash = "sha256-1lise/u40Q8W9STsuyrWIbhf2HY+SFCytUL1PTSWvfY="; - meta = with lib; { + meta = { description = "Easily Manage AWS ECS Resources in Terminal 🐱"; homepage = "https://github.com/keidarcy/e1s"; changelog = "https://github.com/keidarcy/e1s/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "e1s"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ zelkourban carlossless ]; diff --git a/pkgs/by-name/e2/e2fsprogs/package.nix b/pkgs/by-name/e2/e2fsprogs/package.nix index 590938068d85..241f664111bf 100644 --- a/pkgs/by-name/e2/e2fsprogs/package.nix +++ b/pkgs/by-name/e2/e2fsprogs/package.nix @@ -88,17 +88,17 @@ stdenv.mkDerivation rec { [ -e $out/success ] ''; }; - meta = with lib; { + meta = { homepage = "https://e2fsprogs.sourceforge.net/"; changelog = "https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#${version}"; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; - license = with licenses; [ + license = with lib.licenses; [ gpl2Plus lgpl2Plus # lib/ext2fs, lib/e2p bsd3 # lib/uuid mit # lib/et, lib/ss ]; - platforms = platforms.unix; - maintainers = [ ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/ea/earlybird/package.nix b/pkgs/by-name/ea/earlybird/package.nix index 336082800ba4..4ffa598fbdd5 100644 --- a/pkgs/by-name/ea/earlybird/package.nix +++ b/pkgs/by-name/ea/earlybird/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Sensitive data detection tool capable of scanning source code repositories for passwords, key files, and more"; mainProgram = "earlybird"; homepage = "https://github.com/americanexpress/earlybird"; changelog = "https://github.com/americanexpress/earlybird/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/ea/earthly/package.nix b/pkgs/by-name/ea/earthly/package.nix index 193cf4991cc9..02337e2e9421 100644 --- a/pkgs/by-name/ea/earthly/package.nix +++ b/pkgs/by-name/ea/earthly/package.nix @@ -58,12 +58,12 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "Build automation for the container era"; homepage = "https://earthly.dev/"; changelog = "https://github.com/earthly/earthly/releases/tag/v${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ zoedsoupe konradmalik ]; diff --git a/pkgs/by-name/ea/easyeasm/package.nix b/pkgs/by-name/ea/easyeasm/package.nix index 6a91e82846f6..d172ece3e536 100644 --- a/pkgs/by-name/ea/easyeasm/package.nix +++ b/pkgs/by-name/ea/easyeasm/package.nix @@ -43,12 +43,12 @@ buildGoModule rec { }" ''; - meta = with lib; { + meta = { description = "Attack surface management tool"; homepage = "https://github.com/g0ldencybersec/EasyEASM"; changelog = "https://github.com/g0ldencybersec/EasyEASM/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "easyeasm"; }; } diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index f785d9816fde..e58685562df4 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -22,13 +22,13 @@ buildGoModule rec { pname = "ecapture"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "gojue"; repo = "ecapture"; tag = "v${version}"; - hash = "sha256-JqFb58JAepyNuxR3YVUX0tB+V66JrLVPUIVrnZn1aHw="; + hash = "sha256-mYnAa4zh7MqTTS2iU97YOhRbrCLd8C7D5furHNSO0F8="; fetchSubmodules = true; }; @@ -113,7 +113,7 @@ buildGoModule rec { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-KRW5Gf9LYwo5AZ9bYPht+4staiYVyWGkbX/sXDNDppc="; + vendorHash = "sha256-B2Jq6v1PibZ1P9OylFsVp/ULZa/ne5T+vCsBWWrjW/4="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ed/edido/package.nix b/pkgs/by-name/ed/edido/package.nix index f060b9602574..7a7732a81ca0 100644 --- a/pkgs/by-name/ed/edido/package.nix +++ b/pkgs/by-name/ed/edido/package.nix @@ -10,7 +10,7 @@ }: writeShellApplication { name = "edido"; - meta.description = "A tool to apply display configuration from `boot.kernelParams`."; + meta.description = "Tool to apply display configuration from `boot.kernelParams`"; runtimeInputs = [ diffutils findutils diff --git a/pkgs/by-name/ed/edukai/package.nix b/pkgs/by-name/ed/edukai/package.nix index a1d6eb5c728a..2e46cd0a0bdf 100644 --- a/pkgs/by-name/ed/edukai/package.nix +++ b/pkgs/by-name/ed/edukai/package.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = { - description = "The MOE Standard Kai Font, a Chinese font by the Ministry of Education, ROC (Taiwan)"; + description = "MOE Standard Kai Font, a Chinese font by the Ministry of Education, ROC (Taiwan)"; longDescription = '' The MOE Standard Kai Font is a kai (regular srcipt) font provided by diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix index bcafef63bade..3033001f6545 100644 --- a/pkgs/by-name/ed/eduke32/package.nix +++ b/pkgs/by-name/ed/eduke32/package.nix @@ -9,13 +9,14 @@ copyDesktopItems, alsa-lib, flac, - gtk2, libvorbis, libvpx, libGL, SDL2, SDL2_mixer, + xorg, graphicsmagick, + unstableGitUpdater, }: let @@ -33,7 +34,14 @@ stdenv.mkDerivation (finalAttrs: { owner = "terminx"; repo = "eduke32"; rev = "b8759847124c2c53a165a02efef4a0c778674baf"; - hash = "sha256-PudO6EKCh6UpoY6GT/J0hkVteKNIAO4Q454jIzaegMg="; + hash = "sha256-+XaIoCP6TA5QMzs/VxXIv1NP8X4i9rIm6iw+pFH8Q6Q="; + deepClone = true; + leaveDotGit = true; + postFetch = '' + cd $out + git rev-list --count HEAD > VC_REV + rm -rf .git + ''; }; patches = [ @@ -52,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - gtk2 libGL + xorg.libX11 ]; nativeBuildInputs = @@ -83,10 +91,9 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "SDLCONFIG=${SDL2}/bin/sdl2-config" - # git rev-list --count HEAD - "VC_REV=10619" "VC_HASH=${lib.substring 0 9 finalAttrs.src.rev}" "VC_BRANCH=master" + "HAVE_GTK2=0" ]; buildFlags = [ @@ -94,6 +101,10 @@ stdenv.mkDerivation (finalAttrs: { "sw" ]; + preConfigure = '' + appendToVar makeFlags "VC_REV=$(cat VC_REV)" + ''; + desktopItems = [ (makeDesktopItem { name = "eduke32"; @@ -169,6 +180,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + meta = { description = "Enhanched port of Duke Nukem 3D for various platforms"; homepage = "http://eduke32.com"; diff --git a/pkgs/by-name/ed/eduli/package.nix b/pkgs/by-name/ed/eduli/package.nix index e30cb785ba3a..05d8325df41a 100644 --- a/pkgs/by-name/ed/eduli/package.nix +++ b/pkgs/by-name/ed/eduli/package.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = { - description = "The MOE Li Font, a clerical Chinese font by the Ministry of Education, ROC (Taiwan)"; + description = "MOE Li Font, a clerical Chinese font by the Ministry of Education, ROC (Taiwan)"; longDescription = '' The MOE Li Font is a li (clerical srcipt) font provided by diff --git a/pkgs/by-name/ed/edusong/package.nix b/pkgs/by-name/ed/edusong/package.nix index dec473ccf5f0..1a0df4d68f35 100644 --- a/pkgs/by-name/ed/edusong/package.nix +++ b/pkgs/by-name/ed/edusong/package.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = { - description = "The MOE Song font, a Song-style Chinese character typeface"; + description = "MOE Song font, a Song-style Chinese character typeface"; longDescription = '' A Song-style Chinese character typeface published by the Ministry of Education of the Republic of China (Taiwan). The Song style is also referred to as 宋體, 宋体, sòngtǐ, 明體, 明体, or míngtǐ, in Chinese; 명조체, 明朝體, or myeongjo in Korean; 明朝体, みんちょうたい, or minchōtai in Japanese. ''; diff --git a/pkgs/by-name/ed/eduvpn-client/package.nix b/pkgs/by-name/ed/eduvpn-client/package.nix index 6286d6e841fd..447e8a16d169 100644 --- a/pkgs/by-name/ed/eduvpn-client/package.nix +++ b/pkgs/by-name/ed/eduvpn-client/package.nix @@ -51,16 +51,16 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - meta = with lib; { + meta = { changelog = "https://codeberg.org/eduVPN/linux-app/raw/tag/${version}/CHANGES.md"; description = "Linux client for eduVPN"; homepage = "https://codeberg.org/eduVPN/linux-app"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; mainProgram = "eduvpn-gui"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ benneti jwijenbergh ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ej/ejs/package.nix b/pkgs/by-name/ej/ejs/package.nix index 90934f9002ec..60737a1dbf6f 100644 --- a/pkgs/by-name/ej/ejs/package.nix +++ b/pkgs/by-name/ej/ejs/package.nix @@ -29,7 +29,7 @@ buildNpmPackage { meta = { description = "Embedded JavaScript templates"; - homepage = "http://ejs.co"; + homepage = "https://ejs.co"; license = lib.licenses.asl20; mainProgram = "ejs"; maintainers = with lib.maintainers; [ momeemt ]; diff --git a/pkgs/by-name/ek/ekho/package.nix b/pkgs/by-name/ek/ekho/package.nix index 13f62d3fe065..5eb0b9662ec7 100644 --- a/pkgs/by-name/ek/ekho/package.nix +++ b/pkgs/by-name/ek/ekho/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Chinese text-to-speech software"; - homepage = "http://www.eguidedog.net/ekho.php"; + homepage = "https://www.eguidedog.net/ekho.php"; longDescription = '' Ekho (余音) is a free, open source and multilingual text-to-speech (TTS) software. It supports Cantonese (Chinese dialect spoken in Hong Kong and diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 3515d43f81a0..32643f1bf2eb 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.208.0"; + version = "0.209.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "eksctl"; rev = version; - hash = "sha256-lRRB6yAELCNzXWiuxaEHTwlTG7/x3AC97ZnaEtJ3AVs="; + hash = "sha256-iyxO/KMVxSbf/1WijVg0+56BKdyG7gBsfNouyVNMDIA="; }; - vendorHash = "sha256-7aV+BJDudRpqpNk0ve2u7/GHCswMvw07yKrdnnvfO6M="; + vendorHash = "sha256-vhYexIdkn8Y5U5YZewj/O8sJCt/VimZU4E4kn0/1lU4="; doCheck = false; diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 0f8aac729c08..84a743771187 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -150,7 +150,7 @@ stdenv.mkDerivation ( }; meta = with lib; { - description = "A feature-rich client for Matrix.org"; + description = "Feature-rich client for Matrix.org"; homepage = "https://element.io/"; changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/by-name/el/elm-land/package.nix b/pkgs/by-name/el/elm-land/package.nix index efd66003ec97..fbdce8928623 100644 --- a/pkgs/by-name/el/elm-land/package.nix +++ b/pkgs/by-name/el/elm-land/package.nix @@ -59,7 +59,7 @@ buildNpmPackage rec { ''; meta = { - description = "A production-ready framework for building Elm applications"; + description = "Production-ready framework for building Elm applications"; homepage = "https://github.com/elm-land/elm-land"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/el/elvis/package.nix b/pkgs/by-name/el/elvis/package.nix index ce4c70ee3085..6804167f09a3 100644 --- a/pkgs/by-name/el/elvis/package.nix +++ b/pkgs/by-name/el/elvis/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "http://elvis.the-little-red-haired-girl.org/"; + homepage = "https://elvis.the-little-red-haired-girl.org/"; description = "Vi clone for Unix and other operating systems"; license = lib.licenses.free; mainProgram = "elvis"; diff --git a/pkgs/by-name/em/ember-cli/package.nix b/pkgs/by-name/em/ember-cli/package.nix index c7954fb558b3..7dbe7d0d16fe 100644 --- a/pkgs/by-name/em/ember-cli/package.nix +++ b/pkgs/by-name/em/ember-cli/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/ember-cli/ember-cli"; - description = "The Ember.js command line utility"; + description = "Ember.js command line utility"; license = licenses.mit; maintainers = with maintainers; [ jfvillablanca ]; platforms = platforms.all; diff --git a/pkgs/by-name/em/emmet-ls/package.nix b/pkgs/by-name/em/emmet-ls/package.nix index fa988b483e71..8bda81c23310 100644 --- a/pkgs/by-name/em/emmet-ls/package.nix +++ b/pkgs/by-name/em/emmet-ls/package.nix @@ -27,12 +27,12 @@ buildNpmPackage rec { }) ]; - meta = with lib; { + meta = { description = "Emmet support based on LSP"; homepage = "https://github.com/aca/emmet-ls"; changelog = "https://github.com/aca/emmet-ls/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "emmet-ls"; }; } diff --git a/pkgs/by-name/en/encrypted-dns-server/package.nix b/pkgs/by-name/en/encrypted-dns-server/package.nix index 57e42e80ce33..a9ecc66bd25c 100644 --- a/pkgs/by-name/en/encrypted-dns-server/package.nix +++ b/pkgs/by-name/en/encrypted-dns-server/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { meta = { changelog = "https://github.com/DNSCrypt/encrypted-dns-server/releases/tag/${version}"; - description = "An easy to install, high-performance, zero maintenance proxy to run an encrypted DNS server"; + description = "Easy to install, high-performance, zero maintenance proxy to run an encrypted DNS server"; homepage = "https://github.com/DNSCrypt/encrypted-dns-server"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ paepcke ]; diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix index a14ac0beaf40..09ce3ade221a 100644 --- a/pkgs/by-name/eo/eog/package.nix +++ b/pkgs/by-name/eo/eog/package.nix @@ -122,13 +122,13 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { description = "GNOME image viewer"; homepage = "https://gitlab.gnome.org/GNOME/eog"; changelog = "https://gitlab.gnome.org/GNOME/eog/-/blob/${version}/NEWS?ref_type=tags"; - license = licenses.gpl2Plus; - teams = [ teams.gnome ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.gnome ]; + platforms = lib.platforms.unix; mainProgram = "eog"; }; } diff --git a/pkgs/by-name/ep/epick/package.nix b/pkgs/by-name/ep/epick/package.nix index 73b8b1b3297f..5858e1bfe01f 100644 --- a/pkgs/by-name/ep/epick/package.nix +++ b/pkgs/by-name/ep/epick/package.nix @@ -50,12 +50,12 @@ rustPlatform.buildRustPackage rec { patchelf $out/bin/epick --add-rpath ${lib.makeLibraryPath [ libGL ]} ''; - meta = with lib; { + meta = { description = "Simple color picker that lets the user create harmonic palettes with ease"; homepage = "https://github.com/vv9k/epick"; changelog = "https://github.com/vv9k/epick/blob/${version}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "epick"; }; } diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix index e8f6b97529d7..3bd00c4f1962 100644 --- a/pkgs/by-name/eq/equicord/package.nix +++ b/pkgs/by-name/eq/equicord/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "The other cutest Discord client mod"; + description = "Other cutest Discord client mod"; homepage = "https://github.com/Equicord/Equicord"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/er/er-patcher/package.nix b/pkgs/by-name/er/er-patcher/package.nix index e9d3c56a1c04..6f17a814ca33 100644 --- a/pkgs/by-name/er/er-patcher/package.nix +++ b/pkgs/by-name/er/er-patcher/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { patchShebangs $out/bin/er-patcher ''; - meta = with lib; { + meta = { homepage = "https://github.com/gurrgur/er-patcher"; changelog = "https://github.com/gurrgur/er-patcher/releases/tag/v${version}"; description = "Enhancement patches for Elden Ring adding ultrawide support, custom frame rate limits and more"; @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec { This tool is based on patching the game executable through hex-edits. However it is done in a safe and non-destructive way, that ensures the patched executable is never run with EAC enabled (unless explicity told to do so). Use at your own risk! ''; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sigmasquadron ]; mainProgram = "er-patcher"; }; diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix index da80e66bec07..907de09e3d18 100644 --- a/pkgs/by-name/er/erlang-language-platform/package.nix +++ b/pkgs/by-name/er/erlang-language-platform/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "An IDE-first library for the semantic analysis of Erlang code, including LSP server, linting and refactoring tools."; + description = "IDE-first library for the semantic analysis of Erlang code, including LSP server, linting and refactoring tools"; homepage = "https://github.com/WhatsApp/erlang-language-platform/"; license = with lib.licenses; [ mit diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix index 849325513b88..12c7369ddd67 100644 --- a/pkgs/by-name/er/erofs-utils/package.nix +++ b/pkgs/by-name/er/erofs-utils/package.nix @@ -59,16 +59,16 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional fuseSupport "--enable-fuse" ++ lib.optional selinuxSupport "--with-selinux"; - meta = with lib; { + meta = { homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/"; description = "Userspace utilities for linux-erofs file system"; - changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${version}"; - license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ + changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${finalAttrs.version}"; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ ehmry nikstur jmbaur ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/er/erosmb/package.nix b/pkgs/by-name/er/erosmb/package.nix index cc5952fa60c3..03a4f63eeb0d 100644 --- a/pkgs/by-name/er/erosmb/package.nix +++ b/pkgs/by-name/er/erosmb/package.nix @@ -39,12 +39,12 @@ python3.pkgs.buildPythonApplication rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { description = "SMB network scanner"; homepage = "https://github.com/viktor02/EroSmb"; changelog = "https://github.com/viktor02/EroSmb/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "erosmb"; }; } diff --git a/pkgs/by-name/et/etebase-server/package.nix b/pkgs/by-name/et/etebase-server/package.nix index 407bf12fbdb8..e4d8cf1c36a5 100644 --- a/pkgs/by-name/et/etebase-server/package.nix +++ b/pkgs/by-name/et/etebase-server/package.nix @@ -59,13 +59,13 @@ python3.pkgs.buildPythonApplication rec { nixosTest = nixosTests.etebase-server; }; - meta = with lib; { + meta = { homepage = "https://github.com/etesync/server"; description = "Etebase (EteSync 2.0) server so you can run your own"; mainProgram = "etebase-server"; changelog = "https://github.com/etesync/server/blob/${version}/ChangeLog.md"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ felschr phaer ]; diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix index d60842ae2133..e3229eebd90b 100644 --- a/pkgs/by-name/et/eternal-terminal/package.nix +++ b/pkgs/by-name/et/eternal-terminal/package.nix @@ -51,15 +51,15 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { description = "Remote shell that automatically reconnects without interrupting the session"; homepage = "https://eternalterminal.dev/"; changelog = "https://github.com/MisterTea/EternalTerminal/releases/tag/et-v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dezgeg jshort ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/eu/eukleides/package.nix b/pkgs/by-name/eu/eukleides/package.nix index fed332af0999..039c43921bfb 100644 --- a/pkgs/by-name/eu/eukleides/package.nix +++ b/pkgs/by-name/eu/eukleides/package.nix @@ -11,12 +11,12 @@ texlive, }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "eukleides"; version = "1.5.4"; src = fetchurl { - url = "http://www.eukleides.org/files/${pname}-${version}.tar.bz2"; + url = "http://www.eukleides.org/files/eukleides-${finalAttrs.version}.tar.bz2"; sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q"; }; diff --git a/pkgs/by-name/ev/everest-mons/package.nix b/pkgs/by-name/ev/everest-mons/package.nix index 40867013870d..30ce4ac2dacd 100644 --- a/pkgs/by-name/ev/everest-mons/package.nix +++ b/pkgs/by-name/ev/everest-mons/package.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://mons.coloursofnoise.ca/"; - description = "A commandline Everest installer and mod manager for Celeste"; + description = "Commandline Everest installer and mod manager for Celeste"; license = licenses.mit; maintainers = with lib.maintainers; [ ulysseszhan ]; mainProgram = "mons"; diff --git a/pkgs/by-name/ev/evil-winrm/package.nix b/pkgs/by-name/ev/evil-winrm/package.nix index c8116eaf5780..e243c55a2e44 100644 --- a/pkgs/by-name/ev/evil-winrm/package.nix +++ b/pkgs/by-name/ev/evil-winrm/package.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { passthru.updateScript = bundlerUpdateScript "evil-winrm"; - meta = with lib; { + meta = { description = "WinRM shell for hacking/pentesting"; mainProgram = "evil-winrm"; homepage = "https://github.com/Hackplayers/evil-winrm"; changelog = "https://github.com/Hackplayers/evil-winrm/blob/v${version}/CHANGELOG.md"; - license = licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; }; } diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index ef177c079ded..f64006f7c529 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -197,12 +197,12 @@ stdenv.mkDerivation rec { ]; }; - meta = with lib; { + meta = { description = "Unified backend for programs that work with contacts, tasks, and calendar information"; homepage = "https://gitlab.gnome.org/GNOME/evolution-data-server"; changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${version}/NEWS?ref_type=tags"; - license = licenses.lgpl2Plus; - teams = [ teams.gnome ]; - platforms = platforms.linux; # requires libuuid + license = lib.licenses.lgpl2Plus; + teams = [ lib.teams.gnome ]; + platforms = lib.platforms.linux; # requires libuuid }; } diff --git a/pkgs/by-name/ev/evtx/package.nix b/pkgs/by-name/ev/evtx/package.nix index d4c94cc94f75..27eceff4c130 100644 --- a/pkgs/by-name/ev/evtx/package.nix +++ b/pkgs/by-name/ev/evtx/package.nix @@ -23,15 +23,15 @@ rustPlatform.buildRustPackage rec { rm tests/test_cli_interactive.rs ''; - meta = with lib; { + meta = { description = "Parser for the Windows XML Event Log (EVTX) format"; homepage = "https://github.com/omerbenamram/evtx"; changelog = "https://github.com/omerbenamram/evtx/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ fab ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "evtx_dump"; }; } diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix index 30c19cb1ab85..c6fceb771a10 100644 --- a/pkgs/by-name/ex/exegol/package.nix +++ b/pkgs/by-name/ex/exegol/package.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "exegol" ]; - meta = with lib; { + meta = { description = "Fully featured and community-driven hacking environment"; longDescription = '' Exegol is a community-driven hacking environment, powerful and yet diff --git a/pkgs/by-name/ex/exercise-timer/package.nix b/pkgs/by-name/ex/exercise-timer/package.nix index e13af3153f58..13b3b1baf32b 100644 --- a/pkgs/by-name/ex/exercise-timer/package.nix +++ b/pkgs/by-name/ex/exercise-timer/package.nix @@ -20,18 +20,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "exercise-timer"; - version = "1.8.1"; + version = "1.8.4"; src = fetchFromGitHub { owner = "mfep"; repo = "exercise-timer"; tag = "v${finalAttrs.version}"; - hash = "sha256-6MBSUYFZ8nMZX7acam8T0uJWb9E2/L9vnKzJq14p4BY="; + hash = "sha256-KiKTZUlcgQcVJwjCZRi1spjJjAT/aH0PUOB+Qt1jKTc="; + fetchLFS = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-fmY89VGv9tSMaILFnAVTAyp9PWGsvSCZ/9DfF5LI3xM="; + hash = "sha256-Z02tnOavpfv+dNk9p1h/+A0TlBtB0BVxLsEKvhFpkbc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ex/exiflooter/package.nix b/pkgs/by-name/ex/exiflooter/package.nix index 68eb8d9cab4f..f58ebd93f5ba 100644 --- a/pkgs/by-name/ex/exiflooter/package.nix +++ b/pkgs/by-name/ex/exiflooter/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Finds geolocation on all image urls and directories"; homepage = "https://github.com/aydinnyunus/exiflooter"; changelog = "https://github.com/aydinnyunus/exifLooter/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ octodi ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ octodi ]; mainProgram = "exiflooter"; }; } diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix index 5d850645b82c..6068aad78bda 100644 --- a/pkgs/by-name/ex/exim/package.nix +++ b/pkgs/by-name/ex/exim/package.nix @@ -192,17 +192,17 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://exim.org/"; description = "Mail transfer agent (MTA)"; - license = with licenses; [ + license = with lib.licenses; [ gpl2Plus bsd3 ]; mainProgram = "exim"; - platforms = platforms.linux; - maintainers = with maintainers; [ tv ]; - teams = [ teams.helsinki-systems ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ tv ]; + teams = [ lib.teams.helsinki-systems ]; changelog = "https://github.com/Exim/exim/blob/exim-${version}/doc/doc-txt/ChangeLog"; }; } diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 67585f1d7c39..069a9f644a54 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-05-30"; + version = "2025-06-06"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-X90stp4BiHOHoh030eqGeUGiWytF5ryY08/VYEsbnIw="; + hash = "sha256-DOzhxZZ66p49tECn0z1lGSNHq3GEpEbayhwsiJ6IGG4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ex/extra-container/package.nix b/pkgs/by-name/ex/extra-container/package.nix index b38cd67ee42c..721d9d9e0312 100644 --- a/pkgs/by-name/ex/extra-container/package.nix +++ b/pkgs/by-name/ex/extra-container/package.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { " $out/bin/extra-container ''; - meta = with lib; { + meta = { description = "Run declarative containers without full system rebuilds"; homepage = "https://github.com/erikarvstedt/extra-container"; changelog = "https://github.com/erikarvstedt/extra-container/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.erikarvstedt ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.erikarvstedt ]; mainProgram = "extra-container"; }; } diff --git a/pkgs/by-name/f1/f1viewer/package.nix b/pkgs/by-name/f1/f1viewer/package.nix index 8ff7b9a58711..baa1949673a5 100644 --- a/pkgs/by-name/f1/f1viewer/package.nix +++ b/pkgs/by-name/f1/f1viewer/package.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorHash = "sha256-UNeH3zxgssXxFpJws6nAL8EgXt0DRyAQfmlJWz/qyDg="; meta = with lib; { - description = "A TUI to view Formula 1 footage using VLC or another media player"; + description = "TUI to view Formula 1 footage using VLC or another media player"; homepage = "https://github.com/SoMuchForSubtlety/f1viewer"; license = licenses.gpl3Only; maintainers = with maintainers; [ michzappa ]; diff --git a/pkgs/by-name/f3/f3d/package.nix b/pkgs/by-name/f3/f3d/package.nix index 24636fa72fd3..99cfc4f31119 100644 --- a/pkgs/by-name/f3/f3d/package.nix +++ b/pkgs/by-name/f3/f3d/package.nix @@ -98,16 +98,16 @@ stdenv.mkDerivation rec { "-DF3D_PLUGIN_BUILD_USD=ON" ]; - meta = with lib; { + meta = { description = "Fast and minimalist 3D viewer using VTK"; homepage = "https://f3d-app.github.io/f3d"; changelog = "https://github.com/f3d-app/f3d/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bcdarwin pbsds ]; - platforms = with platforms; unix; + platforms = with lib.platforms; unix; mainProgram = "f3d"; }; } diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 11e3670eb7cc..d770b96376b8 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -59,13 +59,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.44.0"; + version = "2.45.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-cLN1G/Rp1Euc6pp0V/Xd4qmo3x0b+rnNU8PDP5j/PTE="; + hash = "sha256-HDr4goUvAKeMk2UGmF2ON72ETQQipNwLfsvyB+f74LE="; }; outputs = [ @@ -265,7 +265,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "An actively maintained, feature-rich and performance oriented, neofetch like system information tool"; + description = "Actively maintained, feature-rich and performance oriented, neofetch like system information tool"; homepage = "https://github.com/fastfetch-cli/fastfetch"; changelog = "https://github.com/fastfetch-cli/fastfetch/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/fa/fastqc/package.nix b/pkgs/by-name/fa/fastqc/package.nix index 13c76f5b3bfe..5cd4a557e3b4 100644 --- a/pkgs/by-name/fa/fastqc/package.nix +++ b/pkgs/by-name/fa/fastqc/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "A quality control application for high throughput sequence data"; + description = "Quality control application for high throughput sequence data"; longDescription = '' FastQC aims to provide a simple way to do some quality control checks on raw sequence data coming from high throughput sequencing pipelines. It provides a modular set of analyses which you can use to give a quick impression of whether your data has any problems of which you should be aware before doing any further analysis. diff --git a/pkgs/by-name/fa/faust2/package.nix b/pkgs/by-name/fa/faust2/package.nix index d8b9aefceee0..6c3f5bac9fa4 100644 --- a/pkgs/by-name/fa/faust2/package.nix +++ b/pkgs/by-name/fa/faust2/package.nix @@ -126,7 +126,7 @@ let ''; meta = meta // { - description = "A functional programming language for realtime audio signal processing"; + description = "Functional programming language for realtime audio signal processing"; longDescription = '' FAUST (Functional Audio Stream) is a functional programming language specifically designed for real-time signal processing diff --git a/pkgs/by-name/fc/fcitx5-fluent/package.nix b/pkgs/by-name/fc/fcitx5-fluent/package.nix index ab1c46e10f0b..10d3cd7f11ca 100644 --- a/pkgs/by-name/fc/fcitx5-fluent/package.nix +++ b/pkgs/by-name/fc/fcitx5-fluent/package.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation { ''; meta = with lib; { - description = "A fluent-design theme with blur effect and shadow"; + description = "Fluent-design theme with blur effect and shadow"; homepage = "https://github.com/Reverier-Xu/Fluent-fcitx5"; license = licenses.mpl20; platforms = platforms.all; diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix index 13c16bcff36a..e556c04e0770 100644 --- a/pkgs/by-name/fd/fd/package.nix +++ b/pkgs/by-name/fd/fd/package.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { package = fd; }; - meta = with lib; { + meta = { description = "Simple, fast and user-friendly alternative to find"; longDescription = '' `fd` is a simple, fast and user-friendly alternative to `find`. @@ -60,11 +60,11 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/sharkdp/fd"; changelog = "https://github.com/sharkdp/fd/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ dywedir figsoda globin diff --git a/pkgs/by-name/fe/ferron/package.nix b/pkgs/by-name/fe/ferron/package.nix index f2d56a9a7f35..51a1eece0960 100644 --- a/pkgs/by-name/fe/ferron/package.nix +++ b/pkgs/by-name/fe/ferron/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ferron"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "ferronweb"; repo = "ferron"; tag = finalAttrs.version; - hash = "sha256-Ckz4+B4CxS2S+YbImdqkNGBONTMetxXxZb/J84dB4c0="; + hash = "sha256-DD9mv2tMGLtnBU1YAb/CDTt+OcDVRzEfW3kUmePT+y4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ZK78ftnVb6k19Pv84HMeM5rGit/KxHJRG8JP8mrjCnY="; + cargoHash = "sha256-ezH8Oraog7XmD4zcrT5eiqS4zQ54m0SXNWlBRx0mJgo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index 1d7c20707fe1..fb4c4ece16f1 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -15,14 +15,14 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "fex"; - version = "2505"; + version = "2506"; src = fetchFromGitHub { owner = "FEX-Emu"; repo = "FEX"; tag = "FEX-${finalAttrs.version}"; - hash = "sha256-H/BE+x/lwpED10UrbukWHiKJo0L75/KDV2T5q/J0NiM="; + hash = "sha256-wzUAyNCfMlABBd3yzFZkPUiy7spuHrekTqVoyUB9jxI="; leaveDotGit = true; postFetch = '' diff --git a/pkgs/by-name/ff/ffts/package.nix b/pkgs/by-name/ff/ffts/package.nix index edb468c2e8fd..25b371610fe5 100644 --- a/pkgs/by-name/ff/ffts/package.nix +++ b/pkgs/by-name/ff/ffts/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DENABLE_SHARED=ON" ]; meta = { - description = "The Fastest Fourier Transform in the South"; + description = "Fastest Fourier Transform in the South"; homepage = "https://github.com/linkotec/ffts"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bgamari ]; diff --git a/pkgs/by-name/ff/ffuf/package.nix b/pkgs/by-name/ff/ffuf/package.nix index dcd519cc9a71..eea0cfb1e3e3 100644 --- a/pkgs/by-name/ff/ffuf/package.nix +++ b/pkgs/by-name/ff/ffuf/package.nix @@ -32,7 +32,7 @@ buildGoModule rec { "-s" ]; - meta = with lib; { + meta = { description = "Tool for web fuzzing"; mainProgram = "ffuf"; longDescription = '' @@ -42,7 +42,7 @@ buildGoModule rec { ''; homepage = "https://github.com/ffuf/ffuf"; changelog = "https://github.com/ffuf/ffuf/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix index 1fd36a8edffb..52f6af662810 100644 --- a/pkgs/by-name/fi/fish-lsp/package.nix +++ b/pkgs/by-name/fi/fish-lsp/package.nix @@ -13,20 +13,20 @@ yarnBuildHook, yarnConfigHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fish-lsp"; - version = "1.0.8-4"; + version = "1.0.9-1"; src = fetchFromGitHub { owner = "ndonfris"; repo = "fish-lsp"; - tag = "v${version}"; - hash = "sha256-rtogxbcnmOEFT1v7aK+pzt9Z4B2O4rFwH3pTNVLTxiA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-NyEhvW5NMqvESdbauxur7xWAzQiQdTVklGMYhckNAnw="; }; yarnOfflineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - hash = "sha256-83QhVDG/zyMbHJbV48m84eimXejLKdeVrdk1uZjI8bk="; + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-xB4kWpPQbA1OkXNr5sozPIP96dLJhwoDUpesE6DORzg="; }; nativeBuildInputs = [ @@ -82,7 +82,10 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ndonfris/fish-lsp"; license = lib.licenses.mit; mainProgram = "fish-lsp"; - maintainers = with lib.maintainers; [ petertriho ]; + maintainers = with lib.maintainers; [ + llakala + petertriho + ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fl/flamegraph/package.nix b/pkgs/by-name/fl/flamegraph/package.nix index 762cfb68c8d1..520f6c286657 100644 --- a/pkgs/by-name/fl/flamegraph/package.nix +++ b/pkgs/by-name/fl/flamegraph/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { cddl gpl2Plus ]; - homepage = "http://www.brendangregg.com/flamegraphs.html"; + homepage = "https://www.brendangregg.com/flamegraphs.html"; description = "Visualization for profiled code"; mainProgram = "flamegraph.pl"; platforms = platforms.unix; diff --git a/pkgs/by-name/fl/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix index 41feaac20101..d466f032dd8c 100644 --- a/pkgs/by-name/fl/flare/engine.nix +++ b/pkgs/by-name/fl/flare/engine.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "flareteam"; - repo = pname; - rev = "v${version}"; + repo = "flare-engine"; + tag = "v${version}"; hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc="; }; @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { SDL2_ttf ]; - meta = with lib; { + meta = { description = "Free/Libre Action Roleplaying Engine"; homepage = "https://github.com/flareteam/flare-engine"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ aanderse McSinyx ]; - license = [ licenses.gpl3 ]; - platforms = platforms.unix; + license = [ lib.licenses.gpl3Plus ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/fl/flare/game.nix b/pkgs/by-name/fl/flare/game.nix index 74dbcaaaae31..e726d3a290e0 100644 --- a/pkgs/by-name/fl/flare/game.nix +++ b/pkgs/by-name/fl/flare/game.nix @@ -11,21 +11,21 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "flareteam"; - repo = pname; - rev = "v${version}"; + repo = "flare-game"; + tag = "v${version}"; hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo="; }; nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { description = "Fantasy action RPG using the FLARE engine"; homepage = "https://github.com/flareteam/flare-game"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ aanderse McSinyx ]; - license = [ licenses.cc-by-sa-30 ]; - platforms = platforms.unix; + license = [ lib.licenses.cc-by-sa-30 ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index 3dc3eda4c780..9a20815265e6 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.16.1"; + version = "3.16.3"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${version}"; - hash = "sha256-IqkzMbWc8GiSo00sMrTugE+G552769WFz+GJbYIPOvs="; + hash = "sha256-07dCSwRLIf/cmNsFuNHs9XXFGuJvwUNWgLuxRsMOXo4="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/fl/fluxbox/package.nix b/pkgs/by-name/fl/fluxbox/package.nix index 791e05b57669..a65978083289 100644 --- a/pkgs/by-name/fl/fluxbox/package.nix +++ b/pkgs/by-name/fl/fluxbox/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { fast, desktop experience. It is written in C++ and licensed under MIT license. ''; - homepage = "http://fluxbox.org/"; + homepage = "https://fluxbox.org/"; license = licenses.mit; maintainers = [ ]; platforms = platforms.linux; diff --git a/pkgs/by-name/fn/fnlfmt/package.nix b/pkgs/by-name/fn/fnlfmt/package.nix index 052068710cf3..f5455d32e54d 100644 --- a/pkgs/by-name/fn/fnlfmt/package.nix +++ b/pkgs/by-name/fn/fnlfmt/package.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { description = "Formatter for Fennel"; homepage = src.meta.homepage; changelog = "${src.meta.homepage}/tree/${version}/changelog.md"; - license = licenses.mit; + license = lib.licenses.mit; platforms = lua.meta.platforms; - maintainers = with maintainers; [ chiroptical ]; + maintainers = with lib.maintainers; [ chiroptical ]; mainProgram = "fnlfmt"; }; } diff --git a/pkgs/by-name/fp/fping/package.nix b/pkgs/by-name/fp/fping/package.nix index f38c77f38cb8..43d41b940dc9 100644 --- a/pkgs/by-name/fp/fping/package.nix +++ b/pkgs/by-name/fp/fping/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { "--enable-ipv4" ]; - meta = with lib; { + meta = { description = "Send ICMP echo probes to network hosts"; homepage = "http://fping.org/"; changelog = "https://github.com/schweikert/fping/releases/tag/v${version}"; - license = licenses.bsd0; + license = lib.licenses.bsd0; mainProgram = "fping"; - maintainers = with maintainers; [ fab ]; - platforms = platforms.all; + maintainers = with lib.maintainers; [ fab ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix index b05fc3fffe45..c90e1025f4cc 100644 --- a/pkgs/by-name/fr/framework-tool/package.nix +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "framework-tool"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "FrameworkComputer"; repo = "framework-system"; tag = "v${version}"; - hash = "sha256-eH6EUpdITFX3FDV0LbeOnqvDmbriDT5R02jhM2DVqtA="; + hash = "sha256-gO7ieyVQzK3BkNsy451WNtrx51jlzd6vhwJX8RDoj/o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-qS65k/cqP9t71TxuqP1/0xIPkhe56WEEbzDzV6JfKrs="; + cargoHash = "sha256-fgDZgWQGQEN2dLJjghngqeOLDX+0joSiI6OigGC57Hc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { nickcao leona kloenk + johnazoidberg ]; mainProgram = "framework_tool"; }; diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 844285ba5bbc..42227a525e01 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -23,7 +23,7 @@ opencascade-occt_7_6, opencascade-occt, pkg-config, - python311Packages, + python3Packages, spaceNavSupport ? stdenv.hostPlatform.isLinux, ifcSupport ? false, stdenv, @@ -40,7 +40,7 @@ nix-update-script, }: let - inherit (python311Packages) + inherit (python3Packages) boost gitpython ifcopenshell diff --git a/pkgs/by-name/fr/frescobaldi/package.nix b/pkgs/by-name/fr/frescobaldi/package.nix index d9a63a5fe2fc..3de32e28a752 100644 --- a/pkgs/by-name/fr/frescobaldi/package.nix +++ b/pkgs/by-name/fr/frescobaldi/package.nix @@ -2,11 +2,11 @@ lib, stdenv, fetchFromGitHub, - python311Packages, + python3Packages, lilypond, }: -python311Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "frescobaldi"; version = "3.3.0"; @@ -17,7 +17,7 @@ python311Packages.buildPythonApplication rec { sha256 = "sha256-Q6ruthNcpjLlYydUetkuTECiCIzu055bw40O8BPGq/A="; }; - propagatedBuildInputs = with python311Packages; [ + propagatedBuildInputs = with python3Packages; [ qpageview lilypond pygame @@ -28,7 +28,7 @@ python311Packages.buildPythonApplication rec { pyqtwebengine ]; - nativeBuildInputs = [ python311Packages.pyqtwebengine.wrapQtAppsHook ]; + nativeBuildInputs = [ python3Packages.pyqtwebengine.wrapQtAppsHook ]; # Needed because source is fetched from git preBuild = '' diff --git a/pkgs/by-name/fs/fsautocomplete/deps.json b/pkgs/by-name/fs/fsautocomplete/deps.json index f3083695459f..bc3a9e23a5c2 100644 --- a/pkgs/by-name/fs/fsautocomplete/deps.json +++ b/pkgs/by-name/fs/fsautocomplete/deps.json @@ -221,18 +221,18 @@ }, { "pname": "Ionide.ProjInfo", - "version": "0.71.1", - "hash": "sha256-54LnHaowj5xpUdkI3UgIzNVdxNmVqNCNMiJo8k1LMGI=" + "version": "0.71.2", + "hash": "sha256-mQM7nVZL/rwFKlt+esfygistjilIDfySMnZmHS5IFv0=" }, { "pname": "Ionide.ProjInfo.FCS", - "version": "0.71.1", - "hash": "sha256-UtAh4f6ee+c0cMkomP0ayo1mOUqWdFwMtBxK/DWioFE=" + "version": "0.71.2", + "hash": "sha256-TJCBJpv6OEsT/3enqjsW7JaSd0P+idlqJR5UR3jhaSI=" }, { "pname": "Ionide.ProjInfo.ProjectSystem", - "version": "0.71.1", - "hash": "sha256-zSVY/uRc4HoEEB9YDSJtDlDDHdZD+zBca3RrXJaRoBM=" + "version": "0.71.2", + "hash": "sha256-Agja7VwF/MbOOieLVJWv42z+l6hWhVw1V0dNrVAJ0Ks=" }, { "pname": "LinkDotNet.StringBuilder", diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix index a10fa0a66ed0..1729a1388f1c 100644 --- a/pkgs/by-name/fs/fsautocomplete/package.nix +++ b/pkgs/by-name/fs/fsautocomplete/package.nix @@ -9,13 +9,13 @@ buildDotnetModule (finalAttrs: { pname = "fsautocomplete"; - version = "0.78.1"; + version = "0.78.3"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; tag = "v${finalAttrs.version}"; - hash = "sha256-l+xC7OXOEE3gSfbsqcTF26/29dsr/cin8moRoaDSKBM="; + hash = "sha256-ZY0sRRGTazaesHyqUe5C/l8xmo+teTS34KVXd0DnO84="; }; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/fs/fscrypt-experimental/package.nix b/pkgs/by-name/fs/fscrypt-experimental/package.nix index 71f1f63a0773..af44287c4ac1 100644 --- a/pkgs/by-name/fs/fscrypt-experimental/package.nix +++ b/pkgs/by-name/fs/fscrypt-experimental/package.nix @@ -45,8 +45,8 @@ buildGoModule rec { runHook postInstall ''; - meta = with lib; { - description = "A high-level tool for the management of Linux filesystem encryption"; + meta = { + description = "High-level tool for the management of Linux filesystem encryption"; mainProgram = "fscrypt"; longDescription = '' This tool manages metadata, key generation, key wrapping, PAM integration, @@ -55,8 +55,8 @@ buildGoModule rec { ''; inherit (src.meta) homepage; changelog = "https://github.com/google/fscrypt/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ primeos ]; }; } diff --git a/pkgs/by-name/fs/fsmon/package.nix b/pkgs/by-name/fs/fsmon/package.nix index a7f8c0683103..4e55fc183e50 100644 --- a/pkgs/by-name/fs/fsmon/package.nix +++ b/pkgs/by-name/fs/fsmon/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { make install PREFIX=$out ''; - meta = with lib; { + meta = { description = "FileSystem Monitor utility"; homepage = "https://github.com/nowsecure/fsmon"; changelog = "https://github.com/nowsecure/fsmon/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ dezgeg ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dezgeg ]; + platforms = lib.platforms.linux; mainProgram = "fsmon"; }; } diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix index 5d2561fbb7e7..c5851589257c 100644 --- a/pkgs/by-name/fs/fstar/package.nix +++ b/pkgs/by-name/fs/fstar/package.nix @@ -107,15 +107,15 @@ ocamlPackages.buildDunePackage rec { z3 = fstarZ3; }; - meta = with lib; { + meta = { description = "ML-like functional programming language aimed at program verification"; homepage = "https://www.fstar-lang.org"; changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ numinit ]; mainProgram = "fstar.exe"; - platforms = with platforms; darwin ++ linux; + platforms = with lib.platforms; darwin ++ linux; }; } diff --git a/pkgs/by-name/fu/fujprog/package.nix b/pkgs/by-name/fu/fujprog/package.nix index 6366042848a3..0d6428a70c0e 100644 --- a/pkgs/by-name/fu/fujprog/package.nix +++ b/pkgs/by-name/fu/fujprog/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { libusb-compat-0_1 ]; - meta = with lib; { + meta = { description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards"; mainProgram = "fujprog"; homepage = "https://github.com/kost/fujprog"; - license = licenses.bsd2; - maintainers = with maintainers; [ trepetti ]; - platforms = platforms.all; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ trepetti ]; + platforms = lib.platforms.all; changelog = "https://github.com/kost/fujprog/releases/tag/v${version}"; }; } diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix index 2cb09b1c94ef..ceb54c442d7e 100644 --- a/pkgs/by-name/fu/fulcio/package.nix +++ b/pkgs/by-name/fu/fulcio/package.nix @@ -82,7 +82,7 @@ buildGoModule rec { version = "v${version}"; }; - meta = with lib; { + meta = { homepage = "https://github.com/sigstore/fulcio"; changelog = "https://github.com/sigstore/fulcio/releases/tag/v${version}"; description = "Root-CA for code signing certs - issuing certificates based on an OIDC email address"; @@ -97,8 +97,8 @@ buildGoModule rec { different delegation models, and to deploy and run Fulcio as a disconnected instance. ''; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lesuisse jk ]; diff --git a/pkgs/by-name/fu/fusionInventory/package.nix b/pkgs/by-name/fu/fusionInventory/package.nix index 4c73b269217c..f07e449bab80 100644 --- a/pkgs/by-name/fu/fusionInventory/package.nix +++ b/pkgs/by-name/fu/fusionInventory/package.nix @@ -97,7 +97,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; meta = with lib; { - homepage = "http://www.fusioninventory.org"; + homepage = "https://www.fusioninventory.org"; description = "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX"; license = lib.licenses.gpl2Only; maintainers = [ maintainers.phile314 ]; diff --git a/pkgs/by-name/ga/galculator/package.nix b/pkgs/by-name/ga/galculator/package.nix index 4f86d789a1aa..08458baca22d 100644 --- a/pkgs/by-name/ga/galculator/package.nix +++ b/pkgs/by-name/ga/galculator/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = false; meta = { - homepage = "http://galculator.sourceforge.net/"; + homepage = "https://galculator.sourceforge.net/"; description = "GTK algebraic and RPN calculator"; longDescription = '' galculator is a GTK-based calculator. Its main features include: diff --git a/pkgs/by-name/ga/galen/package.nix b/pkgs/by-name/ga/galen/package.nix index 863f8a77636d..4f604e82418f 100644 --- a/pkgs/by-name/ga/galen/package.nix +++ b/pkgs/by-name/ga/galen/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://galenframework.com"; + homepage = "https://galenframework.com"; description = "Automated layout testing for websites"; mainProgram = "galen"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; diff --git a/pkgs/by-name/ga/gambit-project/package.nix b/pkgs/by-name/ga/gambit-project/package.nix index cb3d63379136..72e5d77136c3 100644 --- a/pkgs/by-name/ga/gambit-project/package.nix +++ b/pkgs/by-name/ga/gambit-project/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Open-source collection of tools for doing computation in game theory"; - homepage = "http://www.gambit-project.org"; + homepage = "https://www.gambit-project.org"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ t4ccer ]; platforms = with lib.platforms; unix ++ windows; diff --git a/pkgs/by-name/gd/gdmap/package.nix b/pkgs/by-name/gd/gdmap/package.nix index 0704b6ae8dc9..8ee3c5342a04 100644 --- a/pkgs/by-name/gd/gdmap/package.nix +++ b/pkgs/by-name/gd/gdmap/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://gitlab.com/sjohannes/gdmap"; - description = "A tool to visualize disk space (GTK 3 port of Original)"; + description = "Tool to visualize disk space (GTK 3 port of Original)"; license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix index ff1f3c878f3c..c8625f889714 100644 --- a/pkgs/by-name/gd/gdu/package.nix +++ b/pkgs/by-name/gd/gdu/package.nix @@ -47,7 +47,7 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = gdu; }; - meta = with lib; { + meta = { description = "Disk usage analyzer with console interface"; longDescription = '' Gdu is intended primarily for SSD disks where it can fully @@ -56,8 +56,8 @@ buildGoModule rec { ''; homepage = "https://github.com/dundee/gdu"; changelog = "https://github.com/dundee/gdu/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fab zowoq ]; diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix index d06e2b8e39f3..8f0ad718f4e7 100644 --- a/pkgs/by-name/ge/geant4/package.nix +++ b/pkgs/by-name/ge/geant4/package.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science. The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278. ''; - homepage = "http://www.geant4.org"; + homepage = "https://www.geant4.org"; license = licenses.g4sl; maintainers = with maintainers; [ omnipotententity diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index 0cee73f25f50..0822e0f42b29 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -8,12 +8,12 @@ jre, unzip, }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "geoserver"; version = "2.27.0"; src = fetchurl { - url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; + url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip"; hash = "sha256-bhL+u+BoKgW2cwOXEzaq0h07dKFz9u9WB2jW8nAF0vI="; }; diff --git a/pkgs/by-name/ge/geteduroam/package.nix b/pkgs/by-name/ge/geteduroam/package.nix index 38a34a0ef224..fd4c0218b897 100644 --- a/pkgs/by-name/ge/geteduroam/package.nix +++ b/pkgs/by-name/ge/geteduroam/package.nix @@ -17,16 +17,16 @@ buildGoModule (finalAttrs: { pname = "geteduroam"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "geteduroam"; repo = "linux-app"; tag = finalAttrs.version; - hash = "sha256-CbgQn6mf1125DYKBDId+BmFMcfdWNW2M4/iLoiELOAY="; + hash = "sha256-+3mluLby3R0xVU9fIG+1B1A4yM1IfyUvw4wclwnV5s8="; }; - vendorHash = "sha256-b06wnqT88J7etNTFJ6nE9Uo0gOQOGvvs0vPNnJr6r4Q="; + vendorHash = "sha256-l9hge1TS+7ix9/6LKWq+lTMjNM4/Lnw8gNrWB6hWCTk="; subPackages = [ "cmd/geteduroam-gui" diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix index 0ecba4acd1e0..d0422f2b142c 100644 --- a/pkgs/by-name/ge/gex/package.nix +++ b/pkgs/by-name/ge/gex/package.nix @@ -5,6 +5,8 @@ pkg-config, libgit2, nix-update-script, + zlib, + stdenv, }: rustPlatform.buildRustPackage rec { @@ -24,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zlib ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/by-name/gf/gfie/package.nix b/pkgs/by-name/gf/gfie/package.nix index acd0a99a4de4..efd8202a761e 100644 --- a/pkgs/by-name/gf/gfie/package.nix +++ b/pkgs/by-name/gf/gfie/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Powerful open source image editor, especially suitable for creating icons, cursors, animations and icon libraries"; - homepage = "http://greenfishsoftware.org/gfie.php"; + homepage = "https://greenfishsoftware.org/gfie.php"; license = with lib.licenses; [ gpl3 ]; maintainers = with lib.maintainers; [ pluiedev ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/gf/gfxreconstruct/package.nix b/pkgs/by-name/gf/gfxreconstruct/package.nix index 5c52ad7f60e4..573d6529632d 100644 --- a/pkgs/by-name/gf/gfxreconstruct/package.nix +++ b/pkgs/by-name/gf/gfxreconstruct/package.nix @@ -66,12 +66,12 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} ''; - meta = with lib; { + meta = { description = "Graphics API Capture and Replay Tools"; homepage = "https://github.com/LunarG/gfxreconstruct/"; changelog = "https://github.com/LunarG/gfxreconstruct/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ Flakebi ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Flakebi ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/gg/gg-scm/package.nix b/pkgs/by-name/gg/gg-scm/package.nix index e3794f8bd258..7d590d01ac6b 100644 --- a/pkgs/by-name/gg/gg-scm/package.nix +++ b/pkgs/by-name/gg/gg-scm/package.nix @@ -64,7 +64,7 @@ buildGoModule { --zsh misc/_gg.zsh ''; - meta = with lib; { + meta = { mainProgram = "gg"; description = "Git with less typing"; longDescription = '' @@ -74,6 +74,6 @@ buildGoModule { ''; homepage = "https://gg-scm.io/"; changelog = "https://github.com/gg-scm/gg/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; + license = lib.licenses.asl20; }; } diff --git a/pkgs/by-name/gi/gimx/conf.patch b/pkgs/by-name/gi/gimx/conf.patch index 1040a6192f38..c690a33805e3 100644 --- a/pkgs/by-name/gi/gimx/conf.patch +++ b/pkgs/by-name/gi/gimx/conf.patch @@ -1,8 +1,15 @@ -diff --git a/core/config_reader.c b/core/config_reader.c -index 451fc48..ed45f4d 100644 --- a/core/config_reader.c +++ b/core/config_reader.c -@@ -1355,7 +1355,7 @@ int read_config_file(const char* file) +@@ -17,7 +17,7 @@ + #include "../directories.h" + #include "macros.h" + #include +- ++#include + /* + * These variables are used to read the configuration. + */ +@@ -1355,7 +1355,7 @@ char file_path[PATH_MAX]; snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file); @@ -11,11 +18,18 @@ index 451fc48..ed45f4d 100644 if(read_file(file_path) == -1) { gerror("read_file failed\n"); -diff --git a/core/gimx.c b/core/gimx.c -index 700cae9..9143d8b 100755 --- a/core/gimx.c +++ b/core/gimx.c -@@ -192,7 +192,7 @@ void show_config() +@@ -8,7 +8,7 @@ + #include //to print errors + #include //to print errors + #include //PATH_MAX +- ++#include + #ifndef WIN32 + #include //to disable/enable echo + #include +@@ -192,7 +192,7 @@ char file_path[PATH_MAX]; snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file); @@ -24,3 +38,14 @@ index 700cae9..9143d8b 100755 FILE * fp = gfile_fopen(file_path, "r"); if (fp == NULL) { +--- a/core/connectors/bluetooth/linux/bt_mgmt.c ++++ b/core/connectors/bluetooth/linux/bt_mgmt.c +@@ -322,7 +322,7 @@ static int read_link_keys(uint16_t index, uint16_t nb_keys, bdaddr_t bdaddrs[nb_ + bdaddr_t ba; + char dongle_bdaddr[18]; + +- if(bt_device_abs_get(bt_abs_value)->get_bdaddr(index, &ba) < 0) ++ if(bt_device_abs_get()->get_bdaddr(index, &ba) < 0) + { + fprintf(stderr, "can't read device bdaddr\n"); + return -1; diff --git a/pkgs/by-name/gi/gimx/gcc14.patch b/pkgs/by-name/gi/gimx/gcc14.patch deleted file mode 100644 index b736891f07ea..000000000000 --- a/pkgs/by-name/gi/gimx/gcc14.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/core/config_reader.c b/core/config_reader.c -index 451fc48..737d27c 100644 ---- a/core/config_reader.c -+++ b/core/config_reader.c -@@ -17,7 +17,7 @@ - #include "../directories.h" - #include "macros.h" - #include -- -+#include - /* - * These variables are used to read the configuration. - */ -diff --git a/core/gimx.c b/core/gimx.c -index 700cae9..693f72f 100755 ---- a/core/gimx.c -+++ b/core/gimx.c -@@ -8,7 +8,7 @@ - #include //to print errors - #include //to print errors - #include //PATH_MAX -- -+#include - #ifndef WIN32 - #include //to disable/enable echo - #include diff --git a/pkgs/by-name/gi/gimx/package.nix b/pkgs/by-name/gi/gimx/package.nix index b2e1372fc35f..ed6a382e0298 100644 --- a/pkgs/by-name/gi/gimx/package.nix +++ b/pkgs/by-name/gi/gimx/package.nix @@ -34,10 +34,8 @@ stdenv.mkDerivation rec { }; env.NIX_CFLAGS_COMPILE = "-Wno-error"; - patches = [ - ./conf.patch - ./gcc14.patch - ]; + patches = [ ./conf.patch ]; + makeFlags = [ "build-core" ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ @@ -50,7 +48,6 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXi ]; - makeFlags = [ "build-core" ]; installPhase = '' runHook preInstall @@ -70,10 +67,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/matlo/GIMX"; description = "Game Input Multiplexer"; - license = licenses.gpl3Only; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/gi/git-jump/package.nix b/pkgs/by-name/gi/git-jump/package.nix new file mode 100644 index 000000000000..f62d865f8573 --- /dev/null +++ b/pkgs/by-name/gi/git-jump/package.nix @@ -0,0 +1,34 @@ +{ + fetchFromGitHub, + lib, + buildNpmPackage, +}: +buildNpmPackage (finalAttrs: { + pname = "git-jump"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "mykolaharmash"; + repo = "git-jump"; + tag = "v${finalAttrs.version}"; + hash = "sha256-0jX7IiYWLgzjZDEc4lXylqkHqawgnOKI4I9ShzlC+8U="; + }; + + npmDepsHash = "sha256-9f3Ws2V6li+u6qVMD3J6IHSNvG5TGvj0XfAZArgIi1w="; + + postInstall = '' + installManPage git-jump.1 + ''; + + preFixup = '' + rm $out/lib/node_modules/git-jump/node_modules/.bin/{tsc,tsserver} + ''; + + meta = { + description = "Improved navigation between Git branches"; + homepage = "https://github.com/mykolaharmash/git-jump"; + license = lib.licenses.mit; + mainProgram = "git-jump"; + maintainers = with lib.maintainers; [ juliusfreudenberger ]; + }; +}) diff --git a/pkgs/by-name/gi/git-repo/package.nix b/pkgs/by-name/gi/git-repo/package.nix index 41b7a06a50c5..d0bc4e416468 100644 --- a/pkgs/by-name/gi/git-repo/package.nix +++ b/pkgs/by-name/gi/git-repo/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.54"; + version = "2.55.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-rZCpuJ4TpbVbTxq7qHfhokoj7qCj9/YcA9PGgd9ROCg="; + hash = "sha256-hXImDtTwb5Ie/My610g9SYKNFXPf4SxNFcJwEqHEd4Q="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/by-name/gi/git-toolbelt/package.nix b/pkgs/by-name/gi/git-toolbelt/package.nix index 647bde81c5ee..c288fd484899 100644 --- a/pkgs/by-name/gi/git-toolbelt/package.nix +++ b/pkgs/by-name/gi/git-toolbelt/package.nix @@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/nvie/git-toolbelt/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - description = "A suite of useful Git commands that aid with scripting or every day command line usage"; + description = "Suite of useful Git commands that aid with scripting or every day command line usage"; homepage = "https://github.com/nvie/git-toolbelt"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ tomasajt ]; diff --git a/pkgs/by-name/gi/git-wait/package.nix b/pkgs/by-name/gi/git-wait/package.nix index f5417c49b36c..29c562fcab20 100644 --- a/pkgs/by-name/gi/git-wait/package.nix +++ b/pkgs/by-name/gi/git-wait/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage { ''; meta = { - description = "A simple git wrapper that waits until index.lock file is removed when present before running the command"; + description = "Simple git wrapper that waits until index.lock file is removed when present before running the command"; homepage = "https://github.com/darshanparajuli/git-wait"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pbsds ]; diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix index 654c710d0da8..4d3cc70d938e 100644 --- a/pkgs/by-name/gi/gitaly/git.nix +++ b/pkgs/by-name/gi/gitaly/git.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { echo -n 'v${version} DEVELOPER=1 DEVOPTS=no-error USE_LIBPCRE=YesPlease NO_PERL=YesPlease NO_EXPAT=YesPlease NO_TCLTK=YesPlease NO_GETTEXT=YesPlease NO_PYTHON=YesPlease' > source/_build/deps/git-distribution.version echo -n 'v${version}' > source/_build/deps/git-distribution/version ''; - sourceRoot = "source"; + sourceRoot = src.name; buildFlags = [ "git" ]; diff --git a/pkgs/by-name/gi/gitnuro/package.nix b/pkgs/by-name/gi/gitnuro/package.nix index fcdee63e3fdc..b57d50a74af0 100644 --- a/pkgs/by-name/gi/gitnuro/package.nix +++ b/pkgs/by-name/gi/gitnuro/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A FOSS Git multiplatform client based on Compose and JGit"; + description = "FOSS Git multiplatform client based on Compose and JGit"; homepage = "https://gitnuro.com/"; license = licenses.gpl3Plus; platforms = [ diff --git a/pkgs/by-name/gk/gkrellm/package.nix b/pkgs/by-name/gk/gkrellm/package.nix index aada0333d9d8..99bdbe267416 100644 --- a/pkgs/by-name/gk/gkrellm/package.nix +++ b/pkgs/by-name/gk/gkrellm/package.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { supports applying themes to match its appearance to your window manager, Gtk, or any other theme. ''; - homepage = "http://gkrellm.srcbox.net"; + homepage = "https://gkrellm.srcbox.net"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index 94debf50ed1f..cb611aa4f22a 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -1,9 +1,11 @@ { lib, stdenv, + fetchurl, fetchzip, wrapGAppsHook3, cairo, + copyDesktopItems, dbus, fontconfig, freetype, @@ -19,12 +21,18 @@ libglvnd, libuuid, libxcb, + makeDesktopItem, harfbuzz, libsoup_3, webkitgtk_4_1, zenity, }: - +let + gkIcon = fetchurl { + url = "https://gist.githubusercontent.com/qbit/cb52e6cd193c410e0b0aee8a216f6574/raw/2b042bde1dc4cbd30457f14c9d18c889444bf3d0/glamoroustoolkit.svg"; + sha256 = "sha256-Trfo8P01anLq9yTFzwqIfsyidLGyuZDg48YQPrGBkgs="; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; version = "1.1.24"; @@ -37,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ wrapGAppsHook3 + copyDesktopItems ]; sourceRoot = "."; @@ -46,10 +55,21 @@ stdenv.mkDerivation (finalAttrs: { dontPatchELF = true; dontStrip = true; + desktopItems = with finalAttrs; [ + (makeDesktopItem { + name = pname; + desktopName = "GlamorousToolkit"; + exec = "GlamorousToolkit"; + icon = "GlamorousToolkit"; + }) + ]; + installPhase = '' runHook preInstall - install -d $out/bin $out/lib + install -d $out/bin $out/lib $out/share/icons/hicolor/scalable/apps + + cp ${gkIcon} $out/share/icons/hicolor/scalable/apps/GlamorousToolkit.svg cp -r $src/bin $src/lib $out/ cp ${./GlamorousToolkit-GetImage} $out/bin/GlamorousToolkit-GetImage diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix index 215314695487..73d9b3d4275c 100644 --- a/pkgs/by-name/gl/glasskube/package.nix +++ b/pkgs/by-name/gl/glasskube/package.nix @@ -78,7 +78,7 @@ buildGo123Module rec { passthru.updateScript = nix-update-script { }; meta = { - description = "The missing Package Manager for Kubernetes featuring a GUI and a CLI"; + description = "Missing Package Manager for Kubernetes featuring a GUI and a CLI"; homepage = "https://github.com/glasskube/glasskube"; changelog = "https://github.com/glasskube/glasskube/releases/tag/v${version}"; maintainers = with lib.maintainers; [ jakuzure ]; diff --git a/pkgs/by-name/gl/glog/package.nix b/pkgs/by-name/gl/glog/package.nix index 58246c2f059f..af0e1c877259 100644 --- a/pkgs/by-name/gl/glog/package.nix +++ b/pkgs/by-name/gl/glog/package.nix @@ -9,14 +9,14 @@ pkgsBuildHost, }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "glog"; version = "0.7.1"; src = fetchFromGitHub { owner = "google"; repo = "glog"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-+nwWP6VBmhgU7GCPSEGUzvUSCc48wXME181WpJ5ABP4="; }; diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix index b727b46f8cb2..3704cac926f3 100644 --- a/pkgs/by-name/gn/gnome-backgrounds/package.nix +++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix @@ -32,12 +32,12 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; }; }; - meta = with lib; { + meta = { description = "Default wallpaper set for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/gnome-backgrounds"; changelog = "https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/blob/${version}/NEWS?ref_type=tags"; - license = licenses.cc-by-sa-30; - platforms = platforms.unix; - teams = [ teams.gnome ]; + license = lib.licenses.cc-by-sa-30; + platforms = lib.platforms.unix; + teams = [ lib.teams.gnome ]; }; } diff --git a/pkgs/by-name/gn/gnome-clocks/package.nix b/pkgs/by-name/gn/gnome-clocks/package.nix index f27bdc255fbd..21ee134bd933 100644 --- a/pkgs/by-name/gn/gnome-clocks/package.nix +++ b/pkgs/by-name/gn/gnome-clocks/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://apps.gnome.org/Clocks/"; - description = "A simple and elegant clock application for GNOME"; + description = "Simple and elegant clock application for GNOME"; longDescription = '' A simple and elegant clock application. It includes world clocks, alarms, a stopwatch, and timers. diff --git a/pkgs/by-name/gn/gnome-keyring/package.nix b/pkgs/by-name/gn/gnome-keyring/package.nix index 1a100db5fc94..2a62bc340bf8 100644 --- a/pkgs/by-name/gn/gnome-keyring/package.nix +++ b/pkgs/by-name/gn/gnome-keyring/package.nix @@ -117,17 +117,17 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; homepage = "https://gitlab.gnome.org/GNOME/gnome-keyring"; changelog = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/blob/${version}/NEWS?ref_type=tags"; license = [ # Most of the code (some is 2Plus) - licenses.lgpl21Plus + lib.licenses.lgpl21Plus # Some stragglers - licenses.gpl2Plus + lib.licenses.gpl2Plus ]; - teams = [ teams.gnome ]; - platforms = platforms.linux; + teams = [ lib.teams.gnome ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/gn/gnome-klotski/package.nix b/pkgs/by-name/gn/gnome-klotski/package.nix index 5d56a8e0f00a..cb2cf22b3647 100644 --- a/pkgs/by-name/gn/gnome-klotski/package.nix +++ b/pkgs/by-name/gn/gnome-klotski/package.nix @@ -63,13 +63,13 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gnome-klotski"; }; }; - meta = with lib; { + meta = { homepage = "https://gitlab.gnome.org/GNOME/gnome-klotski"; changelog = "https://gitlab.gnome.org/GNOME/gnome-klotski/-/blob/${version}/NEWS?ref_type=tags"; description = "Slide blocks to solve the puzzle"; mainProgram = "gnome-klotski"; - teams = [ teams.gnome ]; - license = licenses.gpl2; - platforms = platforms.unix; + teams = [ lib.teams.gnome ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix index b34c9e6eae5b..7c2c8b80db4f 100644 --- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -89,13 +89,13 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gnome-remote-desktop"; }; }; - meta = with lib; { + meta = { homepage = "https://gitlab.gnome.org/GNOME/gnome-remote-desktop"; changelog = "https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/blob/${version}/NEWS?ref_type=tags"; description = "GNOME Remote Desktop server"; mainProgram = "grdctl"; - teams = [ teams.gnome ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; + teams = [ lib.teams.gnome ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/gn/gnome-sound-recorder/package.nix b/pkgs/by-name/gn/gnome-sound-recorder/package.nix index d7141deddaae..8d0d97461c18 100644 --- a/pkgs/by-name/gn/gnome-sound-recorder/package.nix +++ b/pkgs/by-name/gn/gnome-sound-recorder/package.nix @@ -65,13 +65,13 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gnome-sound-recorder"; }; }; - meta = with lib; { + meta = { description = "Simple and modern sound recorder"; mainProgram = "gnome-sound-recorder"; homepage = "https://gitlab.gnome.org/World/vocalis"; changelog = "https://gitlab.gnome.org/World/vocalis/-/blob/${version}/NEWS?ref_type=tags"; - license = licenses.gpl2Plus; - teams = [ teams.gnome ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.gnome ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix index e7c934d7a60a..d2fa96c74b52 100644 --- a/pkgs/by-name/gn/gnome-sudoku/package.nix +++ b/pkgs/by-name/gn/gnome-sudoku/package.nix @@ -56,13 +56,13 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gnome-sudoku"; }; }; - meta = with lib; { + meta = { homepage = "https://gitlab.gnome.org/GNOME/gnome-sudoku"; changelog = "https://gitlab.gnome.org/GNOME/gnome-sudoku/-/blob/${version}/NEWS?ref_type=tags"; description = "Test your logic skills in this number grid puzzle"; mainProgram = "gnome-sudoku"; - teams = [ teams.gnome ]; - license = licenses.gpl3Plus; - platforms = platforms.unix; + teams = [ lib.teams.gnome ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/gn/gnostic/package.nix b/pkgs/by-name/gn/gnostic/package.nix index 5296fbb0e107..407c5dedcbd7 100644 --- a/pkgs/by-name/gn/gnostic/package.nix +++ b/pkgs/by-name/gn/gnostic/package.nix @@ -20,11 +20,11 @@ buildGoModule rec { # some tests are broken and others require network access doCheck = false; - meta = with lib; { + meta = { homepage = "https://github.com/google/gnostic"; description = "Compiler for APIs described by the OpenAPI Specification with plugins for code generation and other API support tasks"; changelog = "https://github.com/google/gnostic/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ urandom ]; }; } diff --git a/pkgs/by-name/gn/gnuastro/package.nix b/pkgs/by-name/gn/gnuastro/package.nix index 50215965fe1e..09a744d5661f 100644 --- a/pkgs/by-name/gn/gnuastro/package.nix +++ b/pkgs/by-name/gn/gnuastro/package.nix @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "GNU astronomy utilities and library"; homepage = "https://www.gnu.org/software/gnuastro/"; changelog = "https://git.savannah.gnu.org/cgit/gnuastro.git/plain/NEWS?id=gnuastro_v${version}"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ sikmir ]; }; } diff --git a/pkgs/by-name/gn/gnucap/modelgen-verilog.nix b/pkgs/by-name/gn/gnucap/modelgen-verilog.nix index 9d6da894018f..d0537e3e10fc 100644 --- a/pkgs/by-name/gn/gnucap/modelgen-verilog.nix +++ b/pkgs/by-name/gn/gnucap/modelgen-verilog.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { installManPage man/*.* ''; - meta = with lib; { + meta = { description = "gnucap modelgen to preprocess, parse and dump vams files"; homepage = "http://www.gnucap.org/"; - changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}"; + changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${finalAttrs.version}"; mainProgram = "gnucap-mg-vams"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = [ maintainers.raboof ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.raboof ]; }; }) diff --git a/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix b/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix index d4423c3c2f54..2c1243aef61e 100644 --- a/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix +++ b/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "--with-libgcrypt-prefix=${libgcrypt.dev}" ]; - meta = with lib; { + meta = { changelog = "https://github.com/alonbl/gnupg-pkcs11-scd/blob/gnupg-pkcs11-scd-${version}/ChangeLog"; description = "Smart-card daemon to enable the use of PKCS#11 tokens with GnuPG"; mainProgram = "gnupg-pkcs11-scd"; @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { daemon to enable the use of PKCS#11 tokens with GnuPG. ''; homepage = "https://gnupg-pkcs11.sourceforge.net/"; - license = licenses.bsd3; - maintainers = with maintainers; [ + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ matthiasbeyer philandstuff ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/go/gocatcli/package.nix b/pkgs/by-name/go/gocatcli/package.nix index a95949a11023..e10a2e9b4c96 100644 --- a/pkgs/by-name/go/gocatcli/package.nix +++ b/pkgs/by-name/go/gocatcli/package.nix @@ -38,7 +38,7 @@ buildGoModule rec { meta = { homepage = "https://github.com/deadc0de6/gocatcli"; changelog = "https://github.com/deadc0de6/gocatcli/releases/tag/v${version}"; - description = "The command line catalog tool for your offline data"; + description = "Command line catalog tool for your offline data"; longDescription = '' gocatcli is a catalog tool for your offline data. It indexes external media in a catalog file and allows to quickly find specific files or even diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix index b9bf7fc535c6..a10a406755ff 100644 --- a/pkgs/by-name/go/goeland/package.nix +++ b/pkgs/by-name/go/goeland/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "goeland"; - version = "0.18.3"; + version = "0.20.1"; src = fetchFromGitHub { owner = "slurdge"; repo = "goeland"; rev = "v${version}"; - sha256 = "sha256-4xhw6L6CuwW2MepwGvpVLVafMcU/g0bn/2M/8ZSRF/U="; + sha256 = "sha256-5MKkjUOAXz6R7PdChuJA4ybc07gHdO9BF68CpI7OExA="; }; - vendorHash = "sha256-TZIHYFE4kJu5EOQ9oT8S0Tp/r38d5RhoLdmIrus8Ibc="; + vendorHash = "sha256-Jnui1toAV4VvPs6T7UqgAUarFjuik/OnLUrF5VqI+EU="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/gomuks/package.nix b/pkgs/by-name/go/gomuks/package.nix index 1dfb2545f52b..148b995cbc79 100644 --- a/pkgs/by-name/go/gomuks/package.nix +++ b/pkgs/by-name/go/gomuks/package.nix @@ -60,7 +60,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://maunium.net/go/gomuks/"; - description = "A terminal based Matrix client written in Go"; + description = "Terminal based Matrix client written in Go"; mainProgram = "gomuks"; license = licenses.agpl3Plus; maintainers = with maintainers; [ chvp ]; diff --git a/pkgs/by-name/go/google-play/package.nix b/pkgs/by-name/go/google-play/package.nix index 1077cb5bfda4..ea2d659147b4 100644 --- a/pkgs/by-name/go/google-play/package.nix +++ b/pkgs/by-name/go/google-play/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "google-play"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "UlyssesZh"; repo = "google-play"; tag = "v${version}"; - hash = "sha256-Qv79fM59AQ+Y0OfWXKW1Jub07J5net3pP8ANm7CtB6A="; + hash = "sha256-CmNBE3SJhDyY77mjC56pl0aiyt4ZW6pEYTtOK3FXGhE="; }; subPackages = [ @@ -21,7 +21,7 @@ buildGoModule rec { "internal/badging" ]; - vendorHash = "sha256-+n08a22VEHjKUyk/XxTXBu9yYggSgIxCFx8PFtA2OCc="; + vendorHash = "sha256-q0p9+74qUSY2AAnagtM6d6PPEhM1HHF019QWxTemiIo="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/go/gopro-tool/package.nix b/pkgs/by-name/go/gopro-tool/package.nix index e282bb0f9e07..a5b848d28b5d 100644 --- a/pkgs/by-name/go/gopro-tool/package.nix +++ b/pkgs/by-name/go/gopro-tool/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = { - description = "A tool to control GoPro webcam mode in Linux (requires v4l2loopback kernel module and a firewall rule)"; + description = "Tool to control GoPro webcam mode in Linux (requires v4l2loopback kernel module and a firewall rule)"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ZMon3y ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/go/gose/package.nix b/pkgs/by-name/go/gose/package.nix index 2a5cec699716..450c3ba88c1d 100644 --- a/pkgs/by-name/go/gose/package.nix +++ b/pkgs/by-name/go/gose/package.nix @@ -7,13 +7,13 @@ lib, }: let - version = "0.10.6"; + version = "0.11.1"; src = fetchFromGitHub { repo = "gose"; owner = "stv0g"; tag = "v${version}"; - hash = "sha256-H+15d0wCfL+jd+xjKSOrimLIAG1Mh8vO+5MaHaVocJg="; + hash = "sha256-Wz3gcx9/wrSfiHkOGnjAoUFfN0tiA1C+31GlnHqL3M0="; }; frontend = buildNpmPackage { diff --git a/pkgs/by-name/gp/gpa/package.nix b/pkgs/by-name/gp/gpa/package.nix index ac4678022c3d..349d37ba3ac7 100644 --- a/pkgs/by-name/gp/gpa/package.nix +++ b/pkgs/by-name/gp/gpa/package.nix @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - meta = with lib; { + meta = { changelog = "https://dev.gnupg.org/source/gpa/browse/master/NEWS;gpa-${version}?view=raw"; description = "Graphical user interface for the GnuPG"; homepage = "https://www.gnupg.org/related_software/gpa/"; - license = licenses.gpl3Plus; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; mainProgram = "gpa"; }; } diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index a504f94d7693..13f408806c77 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { changelog = "https://github.com/${src.owner}/${src.repo}/blob/${src.rev}/changelog.md"; - description = "A CLI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method"; + description = "CLI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method"; longDescription = '' A CLI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method. Inspired by gp-saml-gui. diff --git a/pkgs/by-name/gp/gpodder/package.nix b/pkgs/by-name/gp/gpodder/package.nix index 5a6a3c4d55fc..a508c85c7d57 100644 --- a/pkgs/by-name/gp/gpodder/package.nix +++ b/pkgs/by-name/gp/gpodder/package.nix @@ -6,12 +6,12 @@ gobject-introspection, gtk3, intltool, - python311Packages, + python3Packages, wrapGAppsHook3, xdg-utils, }: -python311Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "gpodder"; version = "3.11.4"; format = "other"; @@ -35,6 +35,7 @@ python311Packages.buildPythonApplication rec { intltool wrapGAppsHook3 gobject-introspection + python3Packages.distutils ]; buildInputs = [ @@ -42,7 +43,7 @@ python311Packages.buildPythonApplication rec { adwaita-icon-theme ]; - nativeCheckInputs = with python311Packages; [ + nativeCheckInputs = with python3Packages; [ minimock pytest pytest-httpserver @@ -51,7 +52,7 @@ python311Packages.buildPythonApplication rec { doCheck = true; - propagatedBuildInputs = with python311Packages; [ + propagatedBuildInputs = with python3Packages; [ feedparser dbus-python mygpoclient diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix index 553f2780c448..821671a9553d 100644 --- a/pkgs/by-name/gp/gpsd/package.nix +++ b/pkgs/by-name/gp/gpsd/package.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn $out/bin "$out $pythonPath" ''; - meta = with lib; { + meta = { description = "GPS service daemon"; longDescription = '' gpsd is a service daemon that monitors one or more GPSes or AIS @@ -153,9 +153,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://gpsd.gitlab.io/gpsd/index.html"; changelog = "https://gitlab.com/gpsd/gpsd/-/blob/release-${version}/NEWS"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bjornfor rasendubi ]; diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix index 384cd441c78d..723b4967daf9 100644 --- a/pkgs/by-name/gp/gptscript/package.nix +++ b/pkgs/by-name/gp/gptscript/package.nix @@ -25,12 +25,12 @@ buildGoModule rec { # Requires network access doCheck = false; - meta = with lib; { + meta = { homepage = "https://github.com/gptscript-ai/gptscript"; changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v${version}"; description = "Build AI assistants that interact with your systems"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ jamiemagee ]; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ jamiemagee ]; mainProgram = "gptscript"; }; } diff --git a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix similarity index 80% rename from pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix rename to pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix index fe4b4a391135..c887c7e01fbb 100644 --- a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix +++ b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchurl, + fetchgit, pkg-config, addDriverRunpath, desktop-file-utils, @@ -19,19 +19,19 @@ wayland, wrapGAppsHook3, wrapperDir ? "/run/wrappers/bin", + gitUpdater, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation rec { pname = "gpu-screen-recorder-gtk"; - version = "5.1.6"; + version = "5.7.0"; - src = fetchurl { - url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.${finalAttrs.version}.tar.gz"; - hash = "sha256-op5cDILQglVAW/oajc0rdrMC02JZZ8bdER1B1qWPkSk="; + src = fetchgit { + url = "https://repo.dec05eba.com/${pname}"; + tag = version; + hash = "sha256-/s8FCV3hE7Gq1Ad6EhRNTZJwyskV+uRYvjJ43298AOw="; }; - sourceRoot = "."; - nativeBuildInputs = [ desktop-file-utils pkg-config @@ -68,13 +68,18 @@ stdenv.mkDerivation (finalAttrs: { }) ''; + passthru.updateScript = gitUpdater { }; + meta = { changelog = "https://git.dec05eba.com/gpu-screen-recorder-gtk/tree/com.dec05eba.gpu_screen_recorder.appdata.xml#n82"; description = "GTK frontend for gpu-screen-recorder."; homepage = "https://git.dec05eba.com/gpu-screen-recorder-gtk/about/"; license = lib.licenses.gpl3Only; mainProgram = "gpu-screen-recorder-gtk"; - maintainers = with lib.maintainers; [ babbaj ]; + maintainers = with lib.maintainers; [ + babbaj + js6pak + ]; platforms = [ "x86_64-linux" ]; }; -}) +} diff --git a/pkgs/applications/video/gpu-screen-recorder/default.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix similarity index 81% rename from pkgs/applications/video/gpu-screen-recorder/default.nix rename to pkgs/by-name/gp/gpu-screen-recorder/package.nix index a508f27f8c48..538d9d32a7c8 100644 --- a/pkgs/applications/video/gpu-screen-recorder/default.nix +++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchurl, + fetchgit, makeWrapper, meson, ninja, @@ -12,6 +12,7 @@ dbus, ffmpeg, wayland, + wayland-scanner, vulkan-headers, pipewire, libdrm, @@ -22,19 +23,19 @@ libXrandr, libXfixes, wrapperDir ? "/run/wrappers/bin", + gitUpdater, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation rec { pname = "gpu-screen-recorder"; - version = "5.2.0"; + version = "5.5.3"; - src = fetchurl { - url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.${finalAttrs.version}.tar.gz"; - hash = "sha256-7aUW0WhoTpkJhj9WjjI2lnq+vOCG53vl/4DckHmLPBo="; + src = fetchgit { + url = "https://repo.dec05eba.com/${pname}"; + tag = version; + hash = "sha256-XXSHTS/WWqGblbBLuzHSYCY5FVTDSHBHfBWubmoNSy0="; }; - sourceRoot = "."; - nativeBuildInputs = [ pkg-config makeWrapper @@ -49,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg pipewire wayland + wayland-scanner vulkan-headers libdrm libva @@ -82,12 +84,17 @@ stdenv.mkDerivation (finalAttrs: { --suffix PATH : "$out/bin" ''; + passthru.updateScript = gitUpdater { }; + meta = { description = "Screen recorder that has minimal impact on system performance by recording a window using the GPU only"; homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/"; license = lib.licenses.gpl3Only; mainProgram = "gpu-screen-recorder"; - maintainers = [ lib.maintainers.babbaj ]; + maintainers = with lib.maintainers; [ + babbaj + js6pak + ]; platforms = [ "x86_64-linux" ]; }; -}) +} diff --git a/pkgs/by-name/gr/graphene/package.nix b/pkgs/by-name/gr/graphene/package.nix index 534c8d24fb9b..0cdf6d7c83ab 100644 --- a/pkgs/by-name/gr/graphene/package.nix +++ b/pkgs/by-name/gr/graphene/package.nix @@ -13,8 +13,11 @@ nixosTests, glib, withDocumentation ? - stdenv.buildPlatform.canExecute stdenv.hostPlatform - || stdenv.hostPlatform.emulatorAvailable buildPackages, + ( + stdenv.buildPlatform.canExecute stdenv.hostPlatform + || stdenv.hostPlatform.emulatorAvailable buildPackages + ) + && !stdenv.hostPlatform.isStatic, gtk-doc, docbook_xsl, docbook_xml_dtd_43, diff --git a/pkgs/by-name/gr/graphhopper/package.nix b/pkgs/by-name/gr/graphhopper/package.nix index 95d3e7e3b4ff..b4dd2b989b11 100644 --- a/pkgs/by-name/gr/graphhopper/package.nix +++ b/pkgs/by-name/gr/graphhopper/package.nix @@ -68,11 +68,13 @@ stdenv.mkDerivation (finalAttrs: { version = version.patch; - buildInputs = [ + nativeBuildInputs = [ makeWrapper maven ]; + strictDeps = true; + configurePhase = '' runHook preConfigure diff --git a/pkgs/by-name/gr/grayjay/deps.json b/pkgs/by-name/gr/grayjay/deps.json index d525290b1b91..37e2160290d4 100644 --- a/pkgs/by-name/gr/grayjay/deps.json +++ b/pkgs/by-name/gr/grayjay/deps.json @@ -34,15 +34,25 @@ "version": "1.11.58", "hash": "sha256-VCrBPH6Waw3LmZEKStBSd5uSH2vicndwYazYX6IdnYE=" }, + { + "pname": "HtmlAgilityPack", + "version": "1.5.1", + "hash": "sha256-Jr+DOYzDaJrGRYUZ13zrz/6I2cCh6B+0etWPvPYkJU8=" + }, { "pname": "libsodium", "version": "1.0.20", "hash": "sha256-BsitQQnUSm1YupzI5N/LFx0kPFdk1FP8VdM1S3uttvs=" }, { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "9.0.0", - "hash": "sha256-BsXNOWEgfFq3Yz7VTtK6m/ov4/erRqyBzieWSIpmc1U=" + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "8.0.16", + "hash": "sha256-nV9G5UWIh4A/4vsgmARABY9lM2nzpWevsETKuHfhz9o=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "8.0.16", + "hash": "sha256-QcnhPjQNVZGAyh5O74sV94u3DHCQDHjg5U2CXrTykw4=" }, { "pname": "Microsoft.ClearScript.Core", @@ -104,11 +114,6 @@ "version": "4.3.0", "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8=" }, - { - "pname": "Microsoft.CSharp", - "version": "4.7.0", - "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" - }, { "pname": "Microsoft.Data.Sqlite", "version": "8.0.1", @@ -130,20 +135,25 @@ "hash": "sha256-pogseJyMGIikTZORsDXKwyAhRPTkxiOAAV+ceR6/3K4=" }, { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.0.1", - "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "8.0.16", + "hash": "sha256-j1xxV7RXTrmmqHEaEXtPAz2FQoQiK7RO7a7GRwKCW90=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "8.0.16", + "hash": "sha256-ARNf4NsLtYpChsiMv015znXluW7EDWnnw+32I1lu7zU=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "8.0.16", + "hash": "sha256-rDkCCwXkHMDQAQj33BDPitTucHYPx3V85kE9L+CwSRA=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.0.1", - "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" - }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", @@ -174,11 +184,6 @@ "version": "4.3.0", "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" }, - { - "pname": "Microsoft.Win32.Registry", - "version": "5.0.0", - "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" - }, { "pname": "MSTest.TestAdapter", "version": "2.2.10", @@ -229,26 +234,11 @@ "version": "4.3.0", "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" }, - { - "pname": "runtime.any.System.Diagnostics.Tools", - "version": "4.3.0", - "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" - }, - { - "pname": "runtime.any.System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" - }, { "pname": "runtime.any.System.Globalization", "version": "4.3.0", "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" }, - { - "pname": "runtime.any.System.Globalization.Calendars", - "version": "4.3.0", - "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" - }, { "pname": "runtime.any.System.IO", "version": "4.3.0", @@ -259,11 +249,6 @@ "version": "4.3.0", "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" }, - { - "pname": "runtime.any.System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" - }, { "pname": "runtime.any.System.Reflection.Primitives", "version": "4.3.0", @@ -279,36 +264,16 @@ "version": "4.3.0", "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" - }, { "pname": "runtime.any.System.Text.Encoding", "version": "4.3.0", "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" - }, { "pname": "runtime.any.System.Threading.Tasks", "version": "4.3.0", "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" }, - { - "pname": "runtime.any.System.Threading.Timer", - "version": "4.3.0", - "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" - }, { "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", @@ -329,21 +294,6 @@ "version": "4.3.0", "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, - { - "pname": "runtime.native.System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" - }, - { - "pname": "runtime.native.System.Net.Http", - "version": "4.3.0", - "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" - }, { "pname": "runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", @@ -359,11 +309,6 @@ "version": "4.3.0", "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" - }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", @@ -389,36 +334,11 @@ "version": "4.3.0", "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" }, - { - "pname": "runtime.unix.Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" - }, - { - "pname": "runtime.unix.System.Console", - "version": "4.3.0", - "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" - }, { "pname": "runtime.unix.System.Diagnostics.Debug", "version": "4.3.0", "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" }, - { - "pname": "runtime.unix.System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" - }, - { - "pname": "runtime.unix.System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" - }, - { - "pname": "runtime.unix.System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" - }, { "pname": "runtime.unix.System.Private.Uri", "version": "4.3.0", @@ -454,16 +374,6 @@ "version": "4.3.0", "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" }, - { - "pname": "System.Buffers", - "version": "4.3.0", - "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" - }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" - }, { "pname": "System.Collections", "version": "4.0.11", @@ -519,21 +429,11 @@ "version": "4.3.0", "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.3.0", - "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" - }, { "pname": "System.Diagnostics.TextWriterTraceListener", "version": "4.3.0", "hash": "sha256-gx3IHPvPNRmwpLwtswu12U/ow4f/7OPAeHxyMxw5qyU=" }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.0.1", - "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" - }, { "pname": "System.Diagnostics.Tools", "version": "4.3.0", @@ -574,11 +474,6 @@ "version": "4.3.0", "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" }, - { - "pname": "System.Globalization.Extensions", - "version": "4.3.0", - "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" - }, { "pname": "System.IO", "version": "4.1.0", @@ -599,21 +494,11 @@ "version": "4.3.0", "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" }, - { - "pname": "System.IO.FileSystem", - "version": "4.0.1", - "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" - }, { "pname": "System.IO.FileSystem", "version": "4.3.0", "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.0.1", - "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" - }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.3.0", @@ -649,26 +534,11 @@ "version": "4.5.3", "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" }, - { - "pname": "System.Memory", - "version": "4.5.4", - "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" - }, - { - "pname": "System.Memory", - "version": "4.5.5", - "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" - }, { "pname": "System.Net.Http", "version": "4.3.0", "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" }, - { - "pname": "System.Net.NameResolution", - "version": "4.3.0", - "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" - }, { "pname": "System.Net.Primitives", "version": "4.3.0", @@ -679,11 +549,6 @@ "version": "4.3.0", "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" }, - { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" - }, { "pname": "System.ObjectModel", "version": "4.0.12", @@ -709,36 +574,6 @@ "version": "4.3.0", "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, - { - "pname": "System.Reflection.Emit", - "version": "4.0.1", - "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.3.0", - "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.0.1", - "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.3.0", - "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.0.1", - "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.3.0", - "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" - }, { "pname": "System.Reflection.Extensions", "version": "4.0.1", @@ -754,21 +589,11 @@ "version": "1.6.0", "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" }, - { - "pname": "System.Reflection.Primitives", - "version": "4.0.1", - "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" - }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.1.0", - "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" - }, { "pname": "System.Reflection.TypeExtensions", "version": "4.3.0", @@ -794,16 +619,6 @@ "version": "4.3.0", "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.3", - "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, { "pname": "System.Runtime.Extensions", "version": "4.1.0", @@ -814,21 +629,11 @@ "version": "4.3.0", "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, - { - "pname": "System.Runtime.Handles", - "version": "4.0.1", - "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" - }, { "pname": "System.Runtime.Handles", "version": "4.3.0", "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.1.0", - "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" - }, { "pname": "System.Runtime.InteropServices", "version": "4.3.0", @@ -859,41 +664,16 @@ "version": "4.3.0", "hash": "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc=" }, - { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" - }, - { - "pname": "System.Security.Claims", - "version": "4.3.0", - "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" - }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.3.0", "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.3.0", - "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" - }, - { - "pname": "System.Security.Cryptography.Csp", - "version": "4.3.0", - "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" - }, { "pname": "System.Security.Cryptography.Encoding", "version": "4.3.0", "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" }, - { - "pname": "System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" - }, { "pname": "System.Security.Cryptography.Primitives", "version": "4.3.0", @@ -904,21 +684,6 @@ "version": "4.3.0", "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" }, - { - "pname": "System.Security.Principal", - "version": "4.3.0", - "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.3.0", - "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" - }, { "pname": "System.Text.Encoding", "version": "4.0.11", @@ -979,26 +744,6 @@ "version": "4.3.0", "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.0.0", - "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.3.0", - "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" - }, - { - "pname": "System.Threading.ThreadPool", - "version": "4.3.0", - "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" - }, { "pname": "System.Threading.Timer", "version": "4.3.0", diff --git a/pkgs/by-name/gr/grayjay/package.nix b/pkgs/by-name/gr/grayjay/package.nix index 52ee039d8c9a..c29973c50aa1 100644 --- a/pkgs/by-name/gr/grayjay/package.nix +++ b/pkgs/by-name/gr/grayjay/package.nix @@ -32,15 +32,16 @@ libgcc, krb5, wrapGAppsHook3, + _experimental-update-script-combinators, }: let - version = "5"; + version = "7"; src = fetchFromGitLab { domain = "gitlab.futo.org"; owner = "videostreaming"; repo = "Grayjay.Desktop"; tag = version; - hash = "sha256-xrbYghNymny6MQrvFn++GaI+kUoOphPQMWcqH47U1Yg="; + hash = "sha256-EaAMkYbQwj0IXDraRZHqvdK19SlyKtXfqkIOGzkiY7Q="; fetchSubmodules = true; fetchLFS = true; }; @@ -60,7 +61,7 @@ let ''; }; in -buildDotnetModule { +buildDotnetModule (finalAttrs: { pname = "grayjay"; inherit version src frontend; @@ -113,7 +114,8 @@ buildDotnetModule { nugetDeps = ./deps.json; - dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; executables = [ "Grayjay" ]; @@ -164,14 +166,17 @@ buildDotnetModule { libsecret ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--subpackage" - "frontend" - "--url" - "https://github.com/futo-org/Grayjay.Desktop" - ]; - }; + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { + extraArgs = [ + "--subpackage" + "frontend" + "--url" + "https://github.com/futo-org/Grayjay.Desktop" + ]; + }) + (finalAttrs.passthru.fetch-deps) + ]; meta = { description = "Cross-platform application to stream and download content from various sources"; @@ -188,4 +193,4 @@ buildDotnetModule { platforms = [ "x86_64-linux" ]; mainProgram = "Grayjay"; }; -} +}) diff --git a/pkgs/by-name/gr/gren/generated-package.nix b/pkgs/by-name/gr/gren/generated-package.nix index 6906bbb6b636..375c447948bd 100644 --- a/pkgs/by-name/gr/gren/generated-package.nix +++ b/pkgs/by-name/gr/gren/generated-package.nix @@ -95,7 +95,7 @@ mkDerivation { testToolDepends = [ hspec-discover ]; jailbreak = true; homepage = "https://gren-lang.org"; - description = "The `gren` command line interface"; + description = "`gren` command line interface"; license = lib.licenses.bsd3; mainProgram = "gren"; } diff --git a/pkgs/by-name/gr/grpc-gateway/package.nix b/pkgs/by-name/gr/grpc-gateway/package.nix index 8c3ac3447bf3..253cf66661af 100644 --- a/pkgs/by-name/gr/grpc-gateway/package.nix +++ b/pkgs/by-name/gr/grpc-gateway/package.nix @@ -39,7 +39,7 @@ buildGoModule rec { }; meta = with lib; { - description = "A gRPC to JSON proxy generator plugin for Google Protocol Buffers"; + description = "GRPC to JSON proxy generator plugin for Google Protocol Buffers"; longDescription = '' This is a plugin for the Google Protocol Buffers compiler (protoc). It reads protobuf service definitions and generates a reverse-proxy server which diff --git a/pkgs/by-name/gt/gtfocli/package.nix b/pkgs/by-name/gt/gtfocli/package.nix index 6579ba0ba645..914f968cab36 100644 --- a/pkgs/by-name/gt/gtfocli/package.nix +++ b/pkgs/by-name/gt/gtfocli/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "GTFO Command Line Interface for search binaries commands to bypass local security restrictions"; homepage = "https://github.com/cmd-tools/gtfocli"; changelog = "https://github.com/cmd-tools/gtfocli/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "gtfocli"; }; } diff --git a/pkgs/by-name/gt/gtrash/package.nix b/pkgs/by-name/gt/gtrash/package.nix index c1e1bd8d9297..9934836d3c94 100644 --- a/pkgs/by-name/gt/gtrash/package.nix +++ b/pkgs/by-name/gt/gtrash/package.nix @@ -40,12 +40,12 @@ buildGoModule rec { --zsh <($out/bin/gtrash completion zsh) ''; - meta = with lib; { + meta = { description = "Trash CLI manager written in Go"; homepage = "https://github.com/umlx5h/gtrash"; changelog = "https://github.com/umlx5h/gtrash/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ umlx5h ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ umlx5h ]; mainProgram = "gtrash"; }; } diff --git a/pkgs/by-name/gu/guile-json-rpc/package.nix b/pkgs/by-name/gu/guile-json-rpc/package.nix index 3879ef48e371..608377ed231e 100644 --- a/pkgs/by-name/gu/guile-json-rpc/package.nix +++ b/pkgs/by-name/gu/guile-json-rpc/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "A JSON-RPC implementation for Scheme"; + description = "JSON-RPC implementation for Scheme"; homepage = "https://codeberg.org/rgherdt/scheme-json-rpc"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ knightpp ]; diff --git a/pkgs/by-name/gu/guile-lsp-server/package.nix b/pkgs/by-name/gu/guile-lsp-server/package.nix index 26a2258ffcc6..31484912af86 100644 --- a/pkgs/by-name/gu/guile-lsp-server/package.nix +++ b/pkgs/by-name/gu/guile-lsp-server/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://codeberg.org/rgherdt/scheme-lsp-server"; - description = "An LSP server for Guile"; + description = "LSP server for Guile"; mainProgram = "guile-lsp-server"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ knightpp ]; diff --git a/pkgs/by-name/gu/guile-semver/package.nix b/pkgs/by-name/gu/guile-semver/package.nix index aad799d81798..5f6f977695e2 100644 --- a/pkgs/by-name/gu/guile-semver/package.nix +++ b/pkgs/by-name/gu/guile-semver/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A GNU Guile library implementing Semantic Versioning 2.0.0"; + description = "GNU Guile library implementing Semantic Versioning 2.0.0"; homepage = "https://ngyro.com/software/guile-semver.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ foo-dogsquared ]; diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix index 5f38df5e096d..982db26458f1 100644 --- a/pkgs/by-name/gv/gvm-libs/package.nix +++ b/pkgs/by-name/gv/gvm-libs/package.nix @@ -68,12 +68,12 @@ stdenv.mkDerivation rec { # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; - meta = with lib; { + meta = { description = "Libraries module for the Greenbone Vulnerability Management Solution"; homepage = "https://github.com/greenbone/gvm-libs"; changelog = "https://github.com/greenbone/gvm-libs/releases/tag/v${version}"; - license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ fab ]; - platforms = platforms.linux; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ fab ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/gw/gwc/package.nix b/pkgs/by-name/gw/gwc/package.nix index ee0c97523fcd..602986105379 100644 --- a/pkgs/by-name/gw/gwc/package.nix +++ b/pkgs/by-name/gw/gwc/package.nix @@ -37,14 +37,20 @@ stdenv.mkDerivation rec { fftw ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=int-conversion" + "-Wno-error=incompatible-pointer-types" + ]; + enableParallelBuilding = false; # Fails to generate machine.h in time. - meta = with lib; { + meta = { description = "GUI application for removing noise (hiss, pops and clicks) from audio files"; homepage = "https://github.com/AlisterH/gwc/"; changelog = "https://github.com/AlisterH/gwc/blob/${version}/Changelog"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ magnetophon ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/h8/h8mail/package.nix b/pkgs/by-name/h8/h8mail/package.nix index ce9578865938..0b20d6327164 100644 --- a/pkgs/by-name/h8/h8mail/package.nix +++ b/pkgs/by-name/h8/h8mail/package.nix @@ -27,12 +27,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "h8mail" ]; - meta = with lib; { + meta = { description = "Email OSINT & Password breach hunting tool"; homepage = "https://github.com/khast3x/h8mail"; changelog = "https://github.com/khast3x/h8mail/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ octodi ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ octodi ]; mainProgram = "h8mail"; }; } diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix index 031005fc54c3..937d996eae83 100644 --- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix +++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ha-mqtt-discoverable-cli"; - version = "0.18.0"; + version = "0.19.2.1"; pyproject = true; src = fetchFromGitHub { owner = "unixorn"; repo = "ha-mqtt-discoverable-cli"; tag = "v${version}"; - hash = "sha256-bPgVPj/ZfHznY0cY1ac0TlhCCdw3ZssL/E8yo0gACgQ="; + hash = "sha256-SPCbBqdhC+pgV3mQ+e3jkg2hWYegl1wE38Ac06R5uAA="; }; pythonRelaxDeps = [ "ha-mqtt-discoverable" ]; @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "CLI for creating Home Assistant compatible MQTT entities that will be automatically discovered"; homepage = "https://github.com/unixorn/ha-mqtt-discoverable-cli"; - changelog = "https://github.com/unixorn/ha-mqtt-discoverable-cli/releases/tag/v${version}"; + changelog = "https://github.com/unixorn/ha-mqtt-discoverable-cli/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "hmd"; diff --git a/pkgs/by-name/ha/hackneyed/package.nix b/pkgs/by-name/ha/hackneyed/package.nix index 6e63869b6077..d52b123f6480 100644 --- a/pkgs/by-name/ha/hackneyed/package.nix +++ b/pkgs/by-name/ha/hackneyed/package.nix @@ -4,23 +4,25 @@ fetchFromGitLab, imagemagick, inkscape, + jq, xcursorgen, }: stdenvNoCC.mkDerivation rec { pname = "hackneyed"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitLab { owner = "Enthymeme"; repo = "hackneyed-x11-cursors"; rev = version; - hash = "sha256-+7QtHgBuhJtQejiHeZ+QoedJo24LqSY51XRVLv9Ho2g="; + hash = "sha256-gq+qBYm15satH/XXK1QYDVu2L2DvZ+2aYg/wDqncwmA="; }; nativeBuildInputs = [ imagemagick inkscape + jq xcursorgen ]; @@ -33,6 +35,7 @@ stdenvNoCC.mkDerivation rec { makeFlags = [ "INKSCAPE=inkscape" "INSTALL=install" + "JQ=jq" "PREFIX=$(out)" "VERBOSE=1" "XCURSORGEN=xcursorgen" @@ -50,11 +53,11 @@ stdenvNoCC.mkDerivation rec { --replace 'inkscape-version: $(INKSCAPE)' 'inkscape-version:' ''; - meta = with lib; { + meta = { homepage = "https://gitlab.com/Enthymeme/hackneyed-x11-cursors"; description = "Scalable cursor theme that resembles Windows 3.x/NT 3.x cursors"; - platforms = platforms.all; - license = licenses.mit; - maintainers = with maintainers; [ somasis ]; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ somasis ]; }; } diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix index 3ec435ccb785..19bbdc492b31 100644 --- a/pkgs/by-name/ha/hadolint-sarif/package.nix +++ b/pkgs/by-name/ha/hadolint-sarif/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { }; meta = { - description = "A CLI tool to convert hadolint diagnostics into SARIF"; + description = "CLI tool to convert hadolint diagnostics into SARIF"; homepage = "https://psastras.github.io/sarif-rs"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ getchoo ]; diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index 6005946cc340..fccaaac2c7ec 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -90,7 +90,7 @@ python3Packages.buildPythonApplication rec { ]; meta = { - description = "The SQL IDE for Your Terminal"; + description = "SQL IDE for Your Terminal"; homepage = "https://harlequin.sh"; changelog = "https://github.com/tconbeer/harlequin/releases/tag/v${version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/ha/has/package.nix b/pkgs/by-name/ha/has/package.nix index 8f629a440a72..47c9dd21f648 100644 --- a/pkgs/by-name/ha/has/package.nix +++ b/pkgs/by-name/ha/has/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenvNoCC.mkDerivation (finalAttrs: rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "has"; version = "1.5.0"; @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: rec { installPhase = '' runHook preInstall - install -Dm0555 ${pname} -t $out/bin + install -Dm0555 has -t $out/bin runHook postInstall ''; diff --git a/pkgs/by-name/hc/hck/package.nix b/pkgs/by-name/hc/hck/package.nix index 906370d04b4b..388ce768a913 100644 --- a/pkgs/by-name/hc/hck/package.nix +++ b/pkgs/by-name/hc/hck/package.nix @@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { description = "Close to drop in replacement for cut that can use a regex delimiter instead of a fixed string"; homepage = "https://github.com/sstadick/hck"; changelog = "https://github.com/sstadick/hck/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ mit # or unlicense ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ figsoda gepbird ]; diff --git a/pkgs/by-name/hc/hcloud/package.nix b/pkgs/by-name/hc/hcloud/package.nix index 544516d13f5a..4a11032a8507 100644 --- a/pkgs/by-name/hc/hcloud/package.nix +++ b/pkgs/by-name/hc/hcloud/package.nix @@ -35,13 +35,13 @@ buildGoModule rec { done ''; - meta = with lib; { + meta = { changelog = "https://github.com/hetznercloud/cli/releases/tag/v${version}"; description = "Command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; mainProgram = "hcloud"; homepage = "https://github.com/hetznercloud/cli"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ zauberpony techknowlogick ]; diff --git a/pkgs/by-name/hd/hdfview/package.nix b/pkgs/by-name/hd/hdfview/package.nix index f3d9049485fe..a74bd1274479 100644 --- a/pkgs/by-name/hd/hdfview/package.nix +++ b/pkgs/by-name/hd/hdfview/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "A visual tool for browsing and editing HDF4 and HDF5 files"; + description = "Visual tool for browsing and editing HDF4 and HDF5 files"; license = lib.licenses.free; # BSD-like homepage = "https://www.hdfgroup.org/downloads/hdfview"; downloadPage = "https://github.com/HDFGroup/hdfview"; diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix index 9de71c9ec74f..a7aaf315e818 100644 --- a/pkgs/by-name/hd/hdrop/package.nix +++ b/pkgs/by-name/hd/hdrop/package.nix @@ -47,13 +47,13 @@ stdenvNoCC.mkDerivation rec { }" ''; - meta = with lib; { + meta = { description = "Emulate 'tdrop' in Hyprland (run, show and hide specific programs per keybind)"; homepage = "https://github.com/Schweber/hdrop"; changelog = "https://github.com/Schweber/hdrop/releases/tag/v${version}"; - license = licenses.agpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ Schweber ]; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ Schweber ]; mainProgram = "hdrop"; }; } diff --git a/pkgs/by-name/he/headset-charge-indicator/package.nix b/pkgs/by-name/he/headset-charge-indicator/package.nix index f5df4146a645..9c63c644d319 100644 --- a/pkgs/by-name/he/headset-charge-indicator/package.nix +++ b/pkgs/by-name/he/headset-charge-indicator/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/centic9/headset-charge-indicator"; - description = "A app-indicator for GNOME desktops for controlling some features of various wireless headsets"; + description = "App-indicator for GNOME desktops for controlling some features of various wireless headsets"; longDescription = "A simple app-indicator for GNOME desktops to display the battery charge of some wireless headsets which also allows to control some functions like LEDs, sidetone and others."; platforms = platforms.linux; maintainers = with maintainers; [ zebreus ]; diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix index 11f0e6664d7f..04d0b0faa4f9 100644 --- a/pkgs/by-name/he/heimdall-proxy/package.nix +++ b/pkgs/by-name/he/heimdall-proxy/package.nix @@ -34,7 +34,7 @@ buildGoModule { ]; meta = { - description = "A cloud native Identity Aware Proxy and Access Control Decision service"; + description = "Cloud native Identity Aware Proxy and Access Control Decision service"; homepage = "https://dadrus.github.io/heimdall"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ albertilagan ]; diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index 758119ba8839..c82bde882e7c 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -28,7 +28,7 @@ appimageTools.wrapType2 { meta = { changelog = "https://github.com/heptameta/project-meta/releases/tag/v${version}"; - description = "A visual note-taking tool for learning complex topics"; + description = "Visual note-taking tool for learning complex topics"; homepage = "https://heptabase.com/"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix index 90cce11b353d..944936fbe444 100644 --- a/pkgs/by-name/he/heroic-unwrapped/package.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -22,18 +22,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "heroic-unwrapped"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; tag = "v${finalAttrs.version}"; - hash = "sha256-Tjme43vw+aIjyXBIsaNE8+bWrLKpIDJZpQaKb/bJYFQ="; + hash = "sha256-8vmFgLtFvS9JtbQbUNdSHr9zZaTZnQ2ntSueLcCICaE="; }; pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-cV0+HZb6g65kGu1zOBueY954ol1bLGW8ddCniwAVWcw="; + hash = "sha256-9WCIdQ91IU8pfq6kpbmmn6APBTNwpCi9ovgRuWYUad8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/hex-a-hop/package.nix b/pkgs/by-name/he/hex-a-hop/package.nix index 8cb03266da08..8581262f850f 100644 --- a/pkgs/by-name/he/hex-a-hop/package.nix +++ b/pkgs/by-name/he/hex-a-hop/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { description = "Puzzle game based on hexagonal tiles"; mainProgram = "hex-a-hop"; - homepage = "http://hexahop.sourceforge.net"; + homepage = "https://hexahop.sourceforge.net"; license = with lib.licenses; [ gpl2Plus # Main code cc-by-30 # Assets diff --git a/pkgs/by-name/he/hexxy/package.nix b/pkgs/by-name/he/hexxy/package.nix index fadbfc446831..aebefe9285eb 100644 --- a/pkgs/by-name/he/hexxy/package.nix +++ b/pkgs/by-name/he/hexxy/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "A modern and beautiful alternative to xxd and hexdump"; + description = "Modern and beautiful alternative to xxd and hexdump"; homepage = "https://github.com/sweetbbak/hexxy"; license = lib.licenses.mit; maintainers = [ lib.maintainers.NotAShelf ]; diff --git a/pkgs/by-name/hf/hfinger/package.nix b/pkgs/by-name/hf/hfinger/package.nix index 0f5a2c124fed..9e992f1da767 100644 --- a/pkgs/by-name/hf/hfinger/package.nix +++ b/pkgs/by-name/hf/hfinger/package.nix @@ -38,12 +38,12 @@ python3.pkgs.buildPythonApplication rec { "hfinger" ]; - meta = with lib; { + meta = { description = "Fingerprinting tool for HTTP requests"; mainProgram = "hfinger"; homepage = "https://github.com/CERT-Polska/hfinger"; changelog = "https://github.com/CERT-Polska/hfinger/releases/tag/v${version}"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ gpl3Only ]; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix index ff68daa49623..7e87e49f879b 100644 --- a/pkgs/by-name/hi/high-tide/package.nix +++ b/pkgs/by-name/hi/high-tide/package.nix @@ -1,6 +1,6 @@ { lib, - python3Packages, + python313Packages, fetchFromGitHub, wrapGAppsHook4, meson, @@ -11,18 +11,20 @@ libadwaita, gst_all_1, libsecret, + libportal, + nix-update-script, }: -python3Packages.buildPythonApplication { +python313Packages.buildPythonApplication rec { pname = "high-tide"; - version = "0-unstable-2025-05-01"; + version = "0.1.5"; pyproject = false; src = fetchFromGitHub { owner = "Nokse22"; repo = "high-tide"; - rev = "6278ff9471b7481cf0291ab2a9f6d06322506dfc"; - hash = "sha256-4pVRVXEwz0ngjS1Vpt/o00lLYsZ6SvTCk4ivyGoQ4lQ="; + tag = "v${version}"; + hash = "sha256-HoPyqsLPLfqyQbrhoPzr3n81yX1MHZVUVmq5RKDN5pI="; }; nativeBuildInputs = [ @@ -35,7 +37,10 @@ python3Packages.buildPythonApplication { ]; buildInputs = - [ libadwaita ] + [ + libadwaita + libportal + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base @@ -45,7 +50,7 @@ python3Packages.buildPythonApplication { libsecret ]); - dependencies = with python3Packages; [ + dependencies = with python313Packages; [ pygobject3 tidalapi requests @@ -56,12 +61,15 @@ python3Packages.buildPythonApplication { makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Libadwaita TIDAL client for Linux"; homepage = "https://github.com/Nokse22/high-tide"; license = with lib.licenses; [ gpl3Plus ]; - mainProgram = "HighTide"; + mainProgram = "high-tide"; maintainers = with lib.maintainers; [ + nilathedragon nyabinary griffi-gh ]; diff --git a/pkgs/by-name/hj/hjson-go/package.nix b/pkgs/by-name/hj/hjson-go/package.nix index 1cac54405c34..5c76699faba8 100644 --- a/pkgs/by-name/hj/hjson-go/package.nix +++ b/pkgs/by-name/hj/hjson-go/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Utility to convert JSON to and from HJSON"; homepage = "https://hjson.github.io/"; changelog = "https://github.com/hjson/hjson-go/releases/tag/v${version}"; - maintainers = with maintainers; [ ehmry ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ ehmry ]; + license = lib.licenses.mit; mainProgram = "hjson-cli"; }; } diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 165d09db6700..4a1b9a9b1c0c 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://hmcl.huangyuhui.net"; - description = "A Minecraft Launcher which is multi-functional, cross-platform and popular"; + description = "Minecraft Launcher which is multi-functional, cross-platform and popular"; mainProgram = "hmcl"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Only; diff --git a/pkgs/by-name/hm/hmm/package.nix b/pkgs/by-name/hm/hmm/package.nix index 270227b33aea..89f3577368e5 100644 --- a/pkgs/by-name/hm/hmm/package.nix +++ b/pkgs/by-name/hm/hmm/package.nix @@ -27,11 +27,11 @@ rustPlatform.buildRustPackage rec { # https://github.com/NixOS/nixpkgs/pull/310673 cargoPatches = [ ./rustc-serialize-fix.patch ]; - meta = with lib; { + meta = { description = "Small command-line note-taking app"; homepage = "https://github.com/samwho/hmm"; changelog = "https://github.com/samwho/hmm/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix index 5af7e16e7eb0..7b402cff2828 100644 --- a/pkgs/by-name/ho/homebank/package.nix +++ b/pkgs/by-name/ho/homebank/package.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-s1Dtw6bjIUFObCb4VQ4rLBMNwftFlmlVa2H/1+jy44A="; + hash = "sha256-63WHr9yUuNx3s2pNvTSPTLwQ2M+757Mr++Yfocb6G8c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix index 0579e37fbd94..b25aa33f9143 100644 --- a/pkgs/by-name/ho/homer/package.nix +++ b/pkgs/by-name/ho/homer/package.nix @@ -63,7 +63,7 @@ stdenvNoCC.mkDerivation rec { }; meta = with lib; { - description = "A very simple static homepage for your server."; + description = "Very simple static homepage for your server"; homepage = "https://homer-demo.netlify.app/"; changelog = "https://github.com/bastienwirtz/homer/releases"; license = licenses.asl20; diff --git a/pkgs/by-name/ho/honggfuzz/package.nix b/pkgs/by-name/ho/honggfuzz/package.nix index 5b4b50b8d0a4..06f40e8b8a5d 100644 --- a/pkgs/by-name/ho/honggfuzz/package.nix +++ b/pkgs/by-name/ho/honggfuzz/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A security oriented, feedback-driven, evolutionary, easy-to-use fuzzer"; + description = "Security oriented, feedback-driven, evolutionary, easy-to-use fuzzer"; longDescription = '' Honggfuzz is a security oriented, feedback-driven, evolutionary, easy-to-use fuzzer with interesting analysis options. It is diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index 11fed297344e..1f6767fca16b 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -8,22 +8,22 @@ let pname = "hoppscotch"; - version = "25.4.2-0"; + version = "25.5.1-0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-f3Ar5QUm1MJ/kfLRsjxAU1mudpJhU63uxEdu17Y2rmo="; + hash = "sha256-03WSc4/udaShc9te7Xv09gCgMv9i2/WvK55mpj4AK5k="; }; x86_64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-Q21XD+LWx6b/2e4qUabDpjxaJ7h1yz2T4ZbyIDWAljE="; + hash = "sha256-1D/ZW+KxbmJtt62uQOdZZwiKk+6r1hhviwe7CZxaXns="; }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-Y+zvpTfsVwvM8clyTeE8bFCJfsOTJkkGOWzzVQtZrYI="; + hash = "sha256-REj9VtAggS6PcGSh3K+GByxhUk6elKoHsSck42U9IdA="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/by-name/ho/hotspot/package.nix similarity index 58% rename from pkgs/development/tools/analysis/hotspot/default.nix rename to pkgs/by-name/ho/hotspot/package.nix index 96a114698a64..cf6c26885172 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/by-name/ho/hotspot/package.nix @@ -3,27 +3,16 @@ stdenv, binutils, cmake, - extra-cmake-modules, patchelfUnstable, - wrapQtAppsHook, elfutils, fetchFromGitHub, - kconfigwidgets, + fetchpatch, kddockwidgets, - ki18n, - kio, - kitemmodels, - kitemviews, - konsole, - kparts, - kwindowsystem, + kdePackages, libelf, linuxPackages, - qtbase, - qtsvg, + qt6, rustc-demangle, - syntax-highlighting, - threadweaver, zstd, }: @@ -41,32 +30,48 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules # stable patchelf corrupts the binary patchelfUnstable - wrapQtAppsHook + qt6.wrapQtAppsHook ]; - buildInputs = [ - (elfutils.override { enableDebuginfod = true; }) # perfparser needs to find debuginfod.h - kconfigwidgets - kddockwidgets - ki18n - kio - kitemmodels - kitemviews - konsole - kparts - kwindowsystem - libelf - qtbase - qtsvg - rustc-demangle - syntax-highlighting - threadweaver - zstd + patches = [ + # Fix build issue with Qt 6.9, can be removed in next release + (fetchpatch { + url = "https://github.com/KDAB/hotspot/pull/694/commits/5ef04c1dd60846b0d1746132e7e63289ee25f259.patch"; + hash = "sha256-WYMM1/CY05fztSiRNZQ2Q16n5erjY+AE6gSQgSlb3HA="; + }) ]; + cmakeFlags = [ (lib.strings.cmakeBool "QT6_BUILD" true) ]; + + buildInputs = + [ + (elfutils.override { enableDebuginfod = true; }) # perfparser needs to find debuginfod.h + kddockwidgets + libelf + qt6.qtbase + qt6.qtsvg + rustc-demangle + zstd + ] + ++ (with kdePackages; [ + kconfig + kconfigwidgets + kgraphviewer + ki18n + kio + kitemmodels + kitemviews + konsole + kparts + kwindowsystem + qcustomplot + syntax-highlighting + threadweaver + ]); + qtWrapperArgs = [ "--suffix PATH : ${ lib.makeBinPath [ @@ -98,6 +103,9 @@ stdenv.mkDerivation rec { gpl3Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ nh2 ]; + maintainers = with maintainers; [ + nh2 + tmarkus + ]; }; } diff --git a/pkgs/by-name/hs/hstsparser/package.nix b/pkgs/by-name/hs/hstsparser/package.nix index 47b9565c5e0b..40378556ee6b 100644 --- a/pkgs/by-name/hs/hstsparser/package.nix +++ b/pkgs/by-name/hs/hstsparser/package.nix @@ -28,12 +28,12 @@ python3.pkgs.buildPythonApplication rec { "hstsparser" ]; - meta = with lib; { + meta = { description = "Tool to parse Firefox and Chrome HSTS databases into forensic artifacts"; mainProgram = "hstsparser"; homepage = "https://github.com/thebeanogamer/hstsparser"; changelog = "https://github.com/thebeanogamer/hstsparser/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ht/hterm/package.nix b/pkgs/by-name/ht/hterm/package.nix index 22acf86af892..7b66584be0fd 100644 --- a/pkgs/by-name/ht/hterm/package.nix +++ b/pkgs/by-name/ht/hterm/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.der-hammer.info/pages/terminal.html"; changelog = "https://www.der-hammer.info/terminal/CHANGELOG.txt"; - description = "A terminal program for serial communication"; + description = "Terminal program for serial communication"; # See https://www.der-hammer.info/terminal/LICENSE.txt license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/ht/html5validator/package.nix b/pkgs/by-name/ht/html5validator/package.nix index 8692e4ad735b..7cf3e20c339f 100644 --- a/pkgs/by-name/ht/html5validator/package.nix +++ b/pkgs/by-name/ht/html5validator/package.nix @@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec { export PATH="$PATH:$out/bin"; ''; - meta = with lib; { + meta = { description = "Command line tool that tests files for HTML5 validity"; mainProgram = "html5validator"; homepage = "https://github.com/svenkreiss/html5validator"; changelog = "https://github.com/svenkreiss/html5validator/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ phunehehe ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ phunehehe ]; }; } diff --git a/pkgs/by-name/ht/htmldoc/package.nix b/pkgs/by-name/ht/htmldoc/package.nix index 6f5e643826c2..a2652191a926 100644 --- a/pkgs/by-name/ht/htmldoc/package.nix +++ b/pkgs/by-name/ht/htmldoc/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { command = "htmldoc --version"; }; - meta = with lib; { + meta = { description = "Converts HTML files to PostScript and PDF"; homepage = "https://michaelrsweet.github.io/htmldoc"; changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}"; - license = licenses.gpl2Only; - maintainers = [ ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.unix; longDescription = '' HTMLDOC is a program that reads HTML source files or web pages and diff --git a/pkgs/by-name/ht/htop/package.nix b/pkgs/by-name/ht/htop/package.nix index c36ca5ffad5c..f57a645ced6e 100644 --- a/pkgs/by-name/ht/htop/package.nix +++ b/pkgs/by-name/ht/htop/package.nix @@ -71,12 +71,12 @@ stdenv.mkDerivation rec { ${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"} ''; - meta = with lib; { + meta = { description = "Interactive process viewer"; homepage = "https://htop.dev"; - license = licenses.gpl2Only; - platforms = platforms.all; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ rob relrod SuperSandro2000 diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix index 84d1931015e7..80c4f386db76 100644 --- a/pkgs/by-name/ht/httm/package.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -39,12 +39,12 @@ rustPlatform.buildRustPackage rec { install -Dm644 README.md $out/share/doc/README.md ''; - meta = with lib; { + meta = { description = "Interactive, file-level Time Machine-like tool for ZFS/btrfs"; homepage = "https://github.com/kimono-koans/httm"; changelog = "https://github.com/kimono-koans/httm/releases/tag/${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ wyndon ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ wyndon ]; mainProgram = "httm"; }; } diff --git a/pkgs/by-name/ht/httplz/package.nix b/pkgs/by-name/ht/httplz/package.nix index 695d17726b38..db7f69072bec 100644 --- a/pkgs/by-name/ht/httplz/package.nix +++ b/pkgs/by-name/ht/httplz/package.nix @@ -44,12 +44,12 @@ rustPlatform.buildRustPackage rec { --prefix PATH : "${openssl}/bin" ''; - meta = with lib; { + meta = { description = "Basic http server for hosting a folder fast and simply"; mainProgram = "httplz"; homepage = "https://github.com/thecoshman/http"; changelog = "https://github.com/thecoshman/http/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/ht/httpx/package.nix b/pkgs/by-name/ht/httpx/package.nix index 4c8b7761c8c4..4fcea02b4f22 100644 --- a/pkgs/by-name/ht/httpx/package.nix +++ b/pkgs/by-name/ht/httpx/package.nix @@ -34,7 +34,7 @@ buildGoModule rec { versionCheckProgramArg = "-version"; - meta = with lib; { + meta = { description = "Fast and multi-purpose HTTP toolkit"; longDescription = '' httpx is a fast and multi-purpose HTTP toolkit allow to run multiple @@ -43,8 +43,8 @@ buildGoModule rec { ''; homepage = "https://github.com/projectdiscovery/httpx"; changelog = "https://github.com/projectdiscovery/httpx/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "httpx"; }; } diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix index 833c3cb3942b..b1afe82a5f02 100644 --- a/pkgs/by-name/hu/hurl/package.nix +++ b/pkgs/by-name/hu/hurl/package.nix @@ -52,15 +52,15 @@ rustPlatform.buildRustPackage rec { --zsh completions/_hurlfmt ''; - meta = with lib; { + meta = { description = "Command line tool that performs HTTP requests defined in a simple plain text format"; homepage = "https://hurl.dev/"; changelog = "https://github.com/Orange-OpenSource/hurl/blob/${version}/CHANGELOG.md"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ eonpatapon figsoda ]; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "hurl"; }; } diff --git a/pkgs/by-name/hu/husky/package.nix b/pkgs/by-name/hu/husky/package.nix index e749644bc33c..7ba0dd68e715 100644 --- a/pkgs/by-name/hu/husky/package.nix +++ b/pkgs/by-name/hu/husky/package.nix @@ -17,12 +17,12 @@ buildNpmPackage rec { npmDepsHash = "sha256-u1dndTKvInobva+71yI2vPiwrW9vqzAJ2sDAqT9YJsg="; - meta = with lib; { + meta = { description = "Git hooks made easy 🐶 woof!"; mainProgram = "husky"; homepage = "https://github.com/typicode/husky"; changelog = "https://github.com/typicode/husky/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dit7ya ]; }; } diff --git a/pkgs/by-name/hy/hyprland-qt-support/package.nix b/pkgs/by-name/hy/hyprland-qt-support/package.nix index 914946eacd23..e160e7561c2b 100644 --- a/pkgs/by-name/hy/hyprland-qt-support/package.nix +++ b/pkgs/by-name/hy/hyprland-qt-support/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "A Qt6 QML provider for hypr* apps"; + description = "Qt6 QML provider for hypr* apps"; homepage = "https://github.com/hyprwm/hyprland-qt-support"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix index ba9e1be21d2d..8e4daab9e84b 100644 --- a/pkgs/by-name/hy/hyprprop/package.nix +++ b/pkgs/by-name/hy/hyprprop/package.nix @@ -62,7 +62,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { - description = "An xprop replacement for Hyprland"; + description = "Xprop replacement for Hyprland"; license = lib.licenses.mit; platforms = lib.platforms.unix; teams = [ lib.teams.hyprland ]; diff --git a/pkgs/by-name/hy/hyprsysteminfo/package.nix b/pkgs/by-name/hy/hyprsysteminfo/package.nix index d3a405514f26..e5b54b5e5bcd 100644 --- a/pkgs/by-name/hy/hyprsysteminfo/package.nix +++ b/pkgs/by-name/hy/hyprsysteminfo/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "A tiny qt6/qml application to display information about the running system"; + description = "Tiny qt6/qml application to display information about the running system"; homepage = "https://github.com/hyprwm/hyprsysteminfo"; license = lib.licenses.bsd3; teams = [ lib.teams.hyprland ]; diff --git a/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix index de7cbe480958..d94101db77ae 100644 --- a/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix +++ b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix @@ -17,11 +17,11 @@ buildGoModule rec { vendorHash = "sha256-6EtOMs+Vba39hOQ029dHpHCJ9ke35PZ/em9Xye3dmvg="; - meta = with lib; { + meta = { description = "Small tool to convert an IAM Policy in JSON format into a Terraform aws_iam_policy_document"; homepage = "https://github.com/flosell/iam-policy-json-to-terraform"; changelog = "https://github.com/flosell/iam-policy-json-to-terraform/releases/tag/${version}"; - license = licenses.asl20; - maintainers = [ maintainers.ivankovnatsky ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.ivankovnatsky ]; }; } diff --git a/pkgs/by-name/ib/ibm-plex/package.nix b/pkgs/by-name/ib/ibm-plex/package.nix index 734d5344c6d8..ac07709c7b95 100644 --- a/pkgs/by-name/ib/ibm-plex/package.nix +++ b/pkgs/by-name/ib/ibm-plex/package.nix @@ -37,13 +37,13 @@ stdenvNoCC.mkDerivation { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { description = "IBM Plex Typeface"; homepage = "https://www.ibm.com/plex/"; changelog = "https://github.com/IBM/plex/raw/v${version}/CHANGELOG.md"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ romildo ryanccn ]; diff --git a/pkgs/by-name/ig/igmpproxy/package.nix b/pkgs/by-name/ig/igmpproxy/package.nix index b3c6b196f617..a510dd42e5b1 100644 --- a/pkgs/by-name/ig/igmpproxy/package.nix +++ b/pkgs/by-name/ig/igmpproxy/package.nix @@ -18,15 +18,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = with lib; { + meta = { description = "Daemon that routes multicast using IGMP forwarding"; homepage = "https://github.com/pali/igmpproxy/"; changelog = "https://github.com/pali/igmpproxy/releases/tag/${version}"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.sdier ]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.sdier ]; # The maintainer is using this on linux, but if you test it on other platforms # please add them here! - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "igmpproxy"; }; } diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix index e968ec050628..3c870f6691f7 100644 --- a/pkgs/by-name/ig/ignite-cli/package.nix +++ b/pkgs/by-name/ig/ignite-cli/package.nix @@ -38,12 +38,12 @@ buildGoModule rec { } ''; - meta = with lib; { + meta = { homepage = "https://ignite.com/"; changelog = "https://github.com/ignite/cli/releases/tag/v${version}"; description = "All-in-one platform to build, launch, and maintain any crypto application on a sovereign and secured blockchain"; - license = licenses.asl20; - maintainers = with maintainers; [ kashw2 ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kashw2 ]; mainProgram = "ignite"; }; } diff --git a/pkgs/by-name/ig/igrep/package.nix b/pkgs/by-name/ig/igrep/package.nix index fd36e112b38b..0c12b51e0731 100644 --- a/pkgs/by-name/ig/igrep/package.nix +++ b/pkgs/by-name/ig/igrep/package.nix @@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec { }; }; - meta = with lib; { + meta = { description = "Interactive Grep"; homepage = "https://github.com/konradsz/igrep"; changelog = "https://github.com/konradsz/igrep/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ _0x4A6F ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ _0x4A6F ]; mainProgram = "ig"; }; } diff --git a/pkgs/by-name/im/imsprog/package.nix b/pkgs/by-name/im/imsprog/package.nix index 3dd88cf74766..cc34d8ad7219 100644 --- a/pkgs/by-name/im/imsprog/package.nix +++ b/pkgs/by-name/im/imsprog/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/bigbigmdm/IMSProg/releases/tag/v${finalAttrs.version}"; - description = "A free I2C EEPROM programmer tool for CH341A device"; + description = "Free I2C EEPROM programmer tool for CH341A device"; homepage = "https://github.com/bigbigmdm/IMSProg"; license = with lib.licenses; [ gpl3Plus diff --git a/pkgs/by-name/ip/ipam/package.nix b/pkgs/by-name/ip/ipam/package.nix index 1d9223ecb78d..fea8e5c867da 100644 --- a/pkgs/by-name/ip/ipam/package.nix +++ b/pkgs/by-name/ip/ipam/package.nix @@ -35,12 +35,12 @@ buildGoModule rec { --zsh <($out/bin/ipam completion zsh) ''; - meta = with lib; { + meta = { description = "Cli based IPAM written in Go with PowerDNS support"; homepage = "https://ipam.lauka.net/"; changelog = "https://codeberg.org/lauralani/ipam/releases/tag/v${version}"; - license = licenses.gpl3Plus; - maintainers = [ ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ]; mainProgram = "ipam"; }; } diff --git a/pkgs/by-name/ip/ipinfo/package.nix b/pkgs/by-name/ip/ipinfo/package.nix index 4adcd6b5e7f7..88ffd1d860a4 100644 --- a/pkgs/by-name/ip/ipinfo/package.nix +++ b/pkgs/by-name/ip/ipinfo/package.nix @@ -20,11 +20,11 @@ buildGoModule rec { # Tests require network access doCheck = false; - meta = with lib; { + meta = { description = "Command Line Interface for the IPinfo API"; homepage = "https://github.com/ipinfo/cli"; changelog = "https://github.com/ipinfo/cli/releases/tag/ipinfo-${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ip/ipscan/package.nix b/pkgs/by-name/ip/ipscan/package.nix index 47dd511afca9..d53918f86823 100644 --- a/pkgs/by-name/ip/ipscan/package.nix +++ b/pkgs/by-name/ip/ipscan/package.nix @@ -51,16 +51,16 @@ stdenv.mkDerivation rec { cp usr/share/pixmaps/ipscan.png $out/share/pixmaps/ipscan.png ''; - meta = with lib; { + meta = { description = "Angry IP Scanner - fast and friendly network scanner"; mainProgram = "ipscan"; homepage = "https://angryip.org"; downloadPage = "https://github.com/angryip/ipscan/releases/tag/${version}"; changelog = "https://github.com/angryip/ipscan/blob/${version}/CHANGELOG"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl2Only; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.gpl2Only; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ kylesferrazza totoroot ]; diff --git a/pkgs/by-name/ip/iptsd/package.nix b/pkgs/by-name/ip/iptsd/package.nix index 82fbed29652a..2081b92d4b98 100644 --- a/pkgs/by-name/ip/iptsd/package.nix +++ b/pkgs/by-name/ip/iptsd/package.nix @@ -63,16 +63,16 @@ stdenv.mkDerivation rec { "-Db_lto=false" # plugin needed to handle lto object -> undefined reference to ... ]; - meta = with lib; { + meta = { changelog = "https://github.com/linux-surface/iptsd/releases/tag/v${version}"; description = "Userspace daemon for Intel Precise Touch & Stylus"; homepage = "https://github.com/linux-surface/iptsd"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; mainProgram = "iptsd"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ tomberek dotlambda ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index 363bf860b8c9..82dae0ed306a 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -52,27 +52,28 @@ let cp libsha1.so $out/lib/ ''; }; + in -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "isabelle"; version = "2025"; - dirname = "Isabelle${version}"; + dirname = "Isabelle${finalAttrs.version}"; src = if stdenv.hostPlatform.isDarwin then fetchurl { - url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; + url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_macos.tar.gz"; hash = "sha256-6ldUwiiFf12dOuJU7JgUeX8kU+opDfILL23LLvDi5/g="; } else if stdenv.hostPlatform.isx86 then fetchurl { - url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; + url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_linux.tar.gz"; hash = "sha256-PR1m3jcYI/4xqormZjj3NXW6wkTwCzGu4dy2LzgUfFY="; } else fetchurl { - url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux_arm.tar.gz"; + url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_linux_arm.tar.gz"; hash = "sha256-p/Hp+7J5gJy5s6BVD5Ma1Mu2OS53I8BS7gKSOYYB0PE="; }; @@ -88,14 +89,14 @@ stdenv.mkDerivation (finalAttrs: rec { propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ procps ]; - sourceRoot = "${dirname}${lib.optionalString stdenv.hostPlatform.isDarwin ".app"}"; + sourceRoot = "${finalAttrs.dirname}${lib.optionalString stdenv.hostPlatform.isDarwin ".app"}"; doCheck = stdenv.hostPlatform.system != "aarch64-linux"; checkPhase = "bin/isabelle build -v HOL-SMT_Examples"; postUnpack = lib.optionalString stdenv.hostPlatform.isDarwin '' - mv $sourceRoot ${dirname} - sourceRoot=${dirname} + mv $sourceRoot ${finalAttrs.dirname} + sourceRoot=${finalAttrs.dirname} ''; postPatch = @@ -208,11 +209,11 @@ stdenv.mkDerivation (finalAttrs: rec { # icon mkdir -p "$out/share/icons/hicolor/isabelle/apps" - cp "$out/Isabelle${version}/lib/icons/isabelle.xpm" "$out/share/icons/hicolor/isabelle/apps/" + cp "$out/Isabelle${finalAttrs.version}/lib/icons/isabelle.xpm" "$out/share/icons/hicolor/isabelle/apps/" # desktop item mkdir -p "$out/share" - cp -r "${desktopItem}/share/applications" "$out/share/applications" + cp -r "${finalAttrs.desktopItem}/share/applications" "$out/share/applications" ''; desktopItem = makeDesktopItem { @@ -220,7 +221,7 @@ stdenv.mkDerivation (finalAttrs: rec { exec = "isabelle jedit"; icon = "isabelle"; desktopName = "Isabelle"; - comment = meta.description; + comment = finalAttrs.meta.description; categories = [ "Education" "Science" @@ -229,7 +230,7 @@ stdenv.mkDerivation (finalAttrs: rec { }; meta = with lib; { - description = "A generic proof assistant"; + description = "Generic proof assistant"; longDescription = '' Isabelle is a generic proof assistant. It allows mathematical formulas diff --git a/pkgs/by-name/iw/iwgtk/package.nix b/pkgs/by-name/iw/iwgtk/package.nix index c665a6488bb0..537d4af0c72a 100644 --- a/pkgs/by-name/iw/iwgtk/package.nix +++ b/pkgs/by-name/iw/iwgtk/package.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/user/iwgtk.service --subst-var out ''; - meta = with lib; { + meta = { description = "Lightweight, graphical wifi management utility for Linux"; homepage = "https://github.com/j-lentz/iwgtk"; changelog = "https://github.com/j-lentz/iwgtk/blob/v${version}/CHANGELOG"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ figsoda ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ figsoda ]; + platforms = lib.platforms.linux; mainProgram = "iwgtk"; }; } diff --git a/pkgs/by-name/ja/ja2-stracciatella/package.nix b/pkgs/by-name/ja/ja2-stracciatella/package.nix index 3fb6f4dea863..5ced41656169 100644 --- a/pkgs/by-name/ja/ja2-stracciatella/package.nix +++ b/pkgs/by-name/ja/ja2-stracciatella/package.nix @@ -101,6 +101,8 @@ stdenv.mkDerivation rec { ''; meta = { + # Fails to build on x86_64-linux as of 2025-03-16 and potentially earlier + broken = true; description = "Jagged Alliance 2, with community fixes"; license = "SFI Source Code license agreement"; homepage = "https://ja2-stracciatella.github.io/"; diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index a5e97f26f2d5..d7781911b0f5 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -1,34 +1,37 @@ { - lib, - stdenv, - fetchFromGitHub, cmake, + curl, + fetchFromGitHub, + gitUpdater, jazz2-content, + lib, + libGL, libopenmpt, libvorbis, openal, SDL2, - libGL, - zlib, + stdenv, versionCheckHook, - gitUpdater, + zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "jazz2"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "deathkiller"; repo = "jazz2-native"; tag = finalAttrs.version; - hash = "sha256-9Fsm4hiNIEi5OVZLOLccSUkFmHnQ+ZUoBor+DZ9edVo="; + hash = "sha256-dj+BEAx626vSPy26+Ip3uaj3SBE1SWkfbh5P8U0iXsg="; }; patches = [ ./nocontent.patch ]; + strictDeps = true; nativeBuildInputs = [ cmake ]; buildInputs = [ + curl libGL libopenmpt libvorbis @@ -38,8 +41,8 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeFeature "LIBOPENMPT_INCLUDE_DIR" "${lib.getDev libopenmpt}/include/libopenmpt") (lib.cmakeBool "NCINE_DOWNLOAD_DEPENDENCIES" false) + (lib.cmakeFeature "LIBOPENMPT_INCLUDE_DIR" "${lib.getDev libopenmpt}/include/libopenmpt") (lib.cmakeFeature "NCINE_OVERRIDE_CONTENT_PATH" "${jazz2-content}") ]; diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index c692d25eda70..d316adda27ca 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "jenkins"; - version = "2.504.1"; + version = "2.504.2"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war"; - hash = "sha256-gQJtsYsMSq1rYs9AjkxC5Xl2YbQcUXs332BiOOibnfE="; + hash = "sha256-5SNHwB3TkRbDZPt+ureNFWvOj2rdKEhP9XH+DQ+uq/Y="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/je/jetbrains-mono/package.nix b/pkgs/by-name/je/jetbrains-mono/package.nix index 7cd572f94316..f7179b460a09 100644 --- a/pkgs/by-name/je/jetbrains-mono/package.nix +++ b/pkgs/by-name/je/jetbrains-mono/package.nix @@ -27,12 +27,12 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Typeface made for developers"; homepage = "https://jetbrains.com/mono/"; changelog = "https://github.com/JetBrains/JetBrainsMono/blob/v${version}/Changelog.md"; - license = licenses.ofl; - maintainers = with maintainers; [ vinnymeller ]; - platforms = platforms.all; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ vinnymeller ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/jf/jfmt/package.nix b/pkgs/by-name/jf/jfmt/package.nix index e440594a62cb..cb3145ffc125 100644 --- a/pkgs/by-name/jf/jfmt/package.nix +++ b/pkgs/by-name/jf/jfmt/package.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-skLK+jYeR0FPxD1fVswiOWyKpzu5/qL5mk69bLEmxic="; - meta = with lib; { + meta = { description = "CLI utility to format json files"; mainProgram = "jfmt"; homepage = "https://github.com/scruffystuffs/jfmt.rs"; changelog = "https://github.com/scruffystuffs/jfmt.rs/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = [ maintainers.psibi ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.psibi ]; }; } diff --git a/pkgs/by-name/jf/jfrog-cli/package.nix b/pkgs/by-name/jf/jfrog-cli/package.nix index cce46dd1b58e..172b8b5b1434 100644 --- a/pkgs/by-name/jf/jfrog-cli/package.nix +++ b/pkgs/by-name/jf/jfrog-cli/package.nix @@ -34,13 +34,13 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { homepage = "https://github.com/jfrog/jfrog-cli"; description = "Client for accessing to JFrog's Artifactory and Mission Control through their respective REST APIs"; changelog = "https://github.com/jfrog/jfrog-cli/releases/tag/v${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "jf"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ detegr aidalgol ]; diff --git a/pkgs/by-name/jj/jj/package.nix b/pkgs/by-name/jj/jj/package.nix index 045338e45112..a4251102a237 100644 --- a/pkgs/by-name/jj/jj/package.nix +++ b/pkgs/by-name/jj/jj/package.nix @@ -57,7 +57,7 @@ buildGoModule (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "JSON Stream Editor (command line utility)"; longDescription = '' JJ is a command line utility that provides a fast and simple way to retrieve @@ -66,9 +66,9 @@ buildGoModule (finalAttrs: { that do not apply, and aborts as soon as the target value has been found or updated. ''; homepage = "https://github.com/tidwall/jj"; - changelog = "https://github.com/tidwall/jj/releases/tag/v${version}"; - license = licenses.mit; + changelog = "https://github.com/tidwall/jj/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; mainProgram = "jj"; - maintainers = with maintainers; [ katexochen ]; + maintainers = with lib.maintainers; [ katexochen ]; }; }) diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 71da7705ebd3..0da332f659bb 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "A TUI for Jujutsu VCS"; + description = "TUI for Jujutsu VCS"; homepage = "https://github.com/idursun/jjui"; changelog = "https://github.com/idursun/jjui/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/jo/jobber/package.nix b/pkgs/by-name/jo/jobber/package.nix index 42a79db01ba4..1f31f86b43f9 100644 --- a/pkgs/by-name/jo/jobber/package.nix +++ b/pkgs/by-name/jo/jobber/package.nix @@ -35,12 +35,12 @@ buildGoModule rec { mv $out/bin/jobber{master,runner} $out/libexec/ ''; - meta = with lib; { + meta = { homepage = "https://dshearer.github.io/jobber"; changelog = "https://github.com/dshearer/jobber/releases/tag/v${version}"; description = "Alternative to cron, with sophisticated status-reporting and error-handling"; - license = licenses.mit; - maintainers = with maintainers; [ urandom ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ urandom ]; mainProgram = "jobber"; }; } diff --git a/pkgs/by-name/jo/joincap/package.nix b/pkgs/by-name/jo/joincap/package.nix index 01a9a67bb985..b8d207ada2a6 100644 --- a/pkgs/by-name/jo/joincap/package.nix +++ b/pkgs/by-name/jo/joincap/package.nix @@ -25,12 +25,12 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Merge multiple pcap files together, gracefully"; homepage = "https://github.com/assafmo/joincap"; changelog = "https://github.com/assafmo/joincap/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "joincap"; }; } diff --git a/pkgs/by-name/jr/jrnl/package.nix b/pkgs/by-name/jr/jrnl/package.nix index 3d0113ed4aa1..61e8e125b430 100644 --- a/pkgs/by-name/jr/jrnl/package.nix +++ b/pkgs/by-name/jr/jrnl/package.nix @@ -61,12 +61,12 @@ python3.pkgs.buildPythonApplication rec { version = "v${version}"; }; - meta = with lib; { + meta = { description = "Command line journal application that stores your journal in a plain text file"; homepage = "https://jrnl.sh/"; changelog = "https://github.com/jrnl-org/jrnl/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ bryanasdev000 zalakain ]; diff --git a/pkgs/by-name/js/jsonnet-language-server/package.nix b/pkgs/by-name/js/jsonnet-language-server/package.nix index 20a4a38df15f..d00290464177 100644 --- a/pkgs/by-name/js/jsonnet-language-server/package.nix +++ b/pkgs/by-name/js/jsonnet-language-server/package.nix @@ -23,12 +23,12 @@ buildGoModule rec { "-X 'main.version=${version}'" ]; - meta = with lib; { + meta = { description = "Language Server Protocol server for Jsonnet"; mainProgram = "jsonnet-language-server"; homepage = "https://github.com/grafana/jsonnet-language-server"; changelog = "https://github.com/grafana/jsonnet-language-server/releases/tag/v${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ hardselius ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ hardselius ]; }; } diff --git a/pkgs/by-name/jw/jwt-hack/package.nix b/pkgs/by-name/jw/jwt-hack/package.nix index dee3dcaacd1e..19f6c347292b 100644 --- a/pkgs/by-name/jw/jwt-hack/package.nix +++ b/pkgs/by-name/jw/jwt-hack/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-s" ]; - meta = with lib; { + meta = { description = "Tool for attacking JWT"; homepage = "https://github.com/hahwul/jwt-hack"; changelog = "https://github.com/hahwul/jwt-hack/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "jwt-hack"; }; } diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix index 86f3c87e2687..050758180eb0 100644 --- a/pkgs/by-name/jx/jx/package.nix +++ b/pkgs/by-name/jx/jx/package.nix @@ -39,7 +39,7 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Command line tool for installing and using Jenkins X"; mainProgram = "jx"; @@ -50,8 +50,8 @@ buildGoModule rec { Environments on Pull Requests using using Cloud Native pipelines from Tekton. ''; - license = licenses.asl20; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kalbasit ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix index 8e7f667fd1fc..17095c43edbc 100644 --- a/pkgs/by-name/k0/k0sctl/package.nix +++ b/pkgs/by-name/k0/k0sctl/package.nix @@ -44,13 +44,13 @@ buildGoModule rec { version = "version: (devel)\ncommit: v${version}\n"; }; - meta = with lib; { + meta = { description = "Bootstrapping and management tool for k0s clusters"; homepage = "https://k0sproject.io/"; changelog = "https://github.com/k0sproject/k0sctl/releases/tag/v${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "k0sctl"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ nickcao qjoly ]; diff --git a/pkgs/by-name/k3/k3d/package.nix b/pkgs/by-name/k3/k3d/package.nix index 722ecebf6470..ca6cc1a20c28 100644 --- a/pkgs/by-name/k3/k3d/package.nix +++ b/pkgs/by-name/k3/k3d/package.nix @@ -69,7 +69,7 @@ buildGoModule rec { env.GOWORK = "off"; - meta = with lib; { + meta = { homepage = "https://github.com/k3d-io/k3d/"; changelog = "https://github.com/k3d-io/k3d/blob/v${version}/CHANGELOG.md"; description = "Helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container"; @@ -80,14 +80,14 @@ buildGoModule rec { k3d creates containerized k3s clusters. This means, that you can spin up a multi-node k3s cluster on a single machine using docker. ''; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kuznero jlesquembre ngerstle jk ricochet ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix index 0a5f47cea9fe..438916386118 100644 --- a/pkgs/by-name/k6/k6/package.nix +++ b/pkgs/by-name/k6/k6/package.nix @@ -35,13 +35,13 @@ buildGoModule rec { --zsh <($out/bin/k6 completion zsh) ''; - meta = with lib; { + meta = { description = "Modern load testing tool, using Go and JavaScript"; mainProgram = "k6"; homepage = "https://k6.io/"; changelog = "https://github.com/grafana/k6/releases/tag/v${version}"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ offline bryanasdev000 kashw2 diff --git a/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix b/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix index 1427093e9429..7977fe094bde 100644 --- a/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix +++ b/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix @@ -55,12 +55,12 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { homepage = "https://github.com/sigstore/k8s-manifest-sigstore"; changelog = "https://github.com/sigstore/k8s-manifest-sigstore/releases/tag/v${version}"; description = "Kubectl plugin for signing Kubernetes manifest YAML files with sigstore"; mainProgram = "kubectl-sigstore"; - license = licenses.asl20; - maintainers = with maintainers; [ bbigras ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bbigras ]; }; } diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix index 65fe7bbd0b97..6160f1db8478 100644 --- a/pkgs/by-name/k9/k9s/package.nix +++ b/pkgs/by-name/k9/k9s/package.nix @@ -64,13 +64,13 @@ buildGoModule rec { nativeCheckInputs = [ writableTmpDirAsHomeHook ]; - meta = with lib; { + meta = { description = "Kubernetes CLI To Manage Your Clusters In Style"; homepage = "https://github.com/derailed/k9s"; changelog = "https://github.com/derailed/k9s/releases/tag/v${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "k9s"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ Gonzih markus1189 bryanasdev000 diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix index f7a603dba55c..a96a6d5add71 100644 --- a/pkgs/by-name/ka/kanidm-provision/package.nix +++ b/pkgs/by-name/ka/kanidm-provision/package.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { }; meta = { - description = "A small utility to help with kanidm provisioning"; + description = "Small utility to help with kanidm provisioning"; homepage = "https://github.com/oddlama/kanidm-provision"; license = with lib.licenses; [ asl20 diff --git a/pkgs/by-name/kb/kb/package.nix b/pkgs/by-name/kb/kb/package.nix index 0496ebc96c76..58c502af23a2 100644 --- a/pkgs/by-name/kb/kb/package.nix +++ b/pkgs/by-name/kb/kb/package.nix @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; - meta = with lib; { + meta = { description = "Minimalist command line knowledge base manager"; longDescription = '' kb is a text-oriented minimalist command line knowledge base manager. kb @@ -49,8 +49,8 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://github.com/gnebbia/kb"; changelog = "https://github.com/gnebbia/kb/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ wesleyjrz ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ wesleyjrz ]; mainProgram = "kb"; }; } diff --git a/pkgs/by-name/kb/kbs2/package.nix b/pkgs/by-name/kb/kbs2/package.nix index dd0724da5c2c..649db2a3f5da 100644 --- a/pkgs/by-name/kb/kbs2/package.nix +++ b/pkgs/by-name/kb/kbs2/package.nix @@ -46,12 +46,12 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/kbs2 --completions zsh) ''; - meta = with lib; { + meta = { description = "Secret manager backed by age"; mainProgram = "kbs2"; homepage = "https://github.com/woodruffw/kbs2"; changelog = "https://github.com/woodruffw/kbs2/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/kc/kchmviewer/package.nix b/pkgs/by-name/kc/kchmviewer/package.nix new file mode 100644 index 000000000000..3e84705d0992 --- /dev/null +++ b/pkgs/by-name/kc/kchmviewer/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + qt5, + chmlib, + libzip, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kchmviewer"; + version = "8.0"; + + src = fetchFromGitHub { + owner = "gyunaev"; + repo = "kchmviewer"; + tag = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; + hash = "sha256-YNpiBf6AFBCRbAZRPODvqGbQQedJJJrZFQIQyzIeBlw="; + }; + + patches = [ + # remove unused webkit + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/a4a3984465cb635822953350c571950ae726b539.patch"; + hash = "sha256-nHW18a4SrTG4fETJmKS4ojHXwnX1d1uN1m4H0GIuI28="; + }) + # QtWebengine fixes + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/9ac73e7ad15de08aab6b1198115be2eb44da7afe.patch"; + hash = "sha256-qg2ytqA2On7jg19WZmHIOU7vLQI2hoyqItySLEA64SY="; + }) + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/99a6d94bdfce9c4578cce82707e71863a71d1453.patch"; + hash = "sha256-o8JkaMmcJObmMt+o/6ooCAPCi+yRAWDAgxV+tR5eHfY="; + }) + # Fix build on macOS + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/pull/35/commits/b68ed6fe72eaf9ee4e7e42925f5071fbd02dc6b3.patch"; + hash = "sha256-sJA0RE0Z83tYv0S42yQYWKKeLhW+YDsrxLkY5aMKKT4="; + }) + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/pull/35/commits/d307e4e829c5a6f57ab0040f786c3da7fd2f0a99.patch"; + hash = "sha256-FWYfqG8heL6AnhevueCWHQc+c6Yj4+DuIdjIwXVZ+O4="; + }) + ]; + + buildInputs = [ + chmlib + libzip + qt5.qtwebengine + ]; + + nativeBuildInputs = [ + qt5.qmake + qt5.wrapQtAppsHook + ]; + + postInstall = + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p $out/{Applications,bin} + mv bin/kchmviewer.app $out/Applications + ln -s $out/Applications/kchmviewer.app/Contents/MacOS/kchmviewer $out/bin/kchmviewer + '' + else + '' + install -Dm755 bin/kchmviewer -t $out/bin + install -Dm644 packages/kchmviewer.png -t $out/share/pixmaps + install -Dm644 packages/kchmviewer.desktop -t $out/share/applications + ''; + + meta = { + description = "CHM (Winhelp) files viewer"; + mainProgram = "kchmviewer"; + homepage = "http://www.ulduzsoft.com/linux/kchmviewer/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/kc/kcl-language-server/package.nix b/pkgs/by-name/kc/kcl-language-server/package.nix index 22108ca4195e..36586717f0ff 100644 --- a/pkgs/by-name/kc/kcl-language-server/package.nix +++ b/pkgs/by-name/kc/kcl-language-server/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { meta = { changelog = "https://github.com/kcl-lang/kcl/releases/tag/v${version}"; - description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; + description = "High-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; downloadPage = "https://github.com/kcl-lang/kcl/tree/v${version}/kclvm/tools/src/LSP"; homepage = "https://www.kcl-lang.io/"; license = lib.licenses.asl20; diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index b99a85421cc8..5973fa7de973 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -63,7 +63,7 @@ buildGoModule rec { updateScript = nix-update-script { }; meta = { - description = "A command line interface for KCL programming language"; + description = "Command line interface for KCL programming language"; changelog = "https://github.com/kcl-lang/cli/releases/tag/v${version}"; homepage = "https://github.com/kcl-lang/cli"; license = lib.licenses.asl20; diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix index dbe6b3bf8d79..dea0cb9cc654 100644 --- a/pkgs/by-name/kc/kclvm/package.nix +++ b/pkgs/by-name/kc/kclvm/package.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; meta = with lib; { - description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; + description = "High-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; homepage = "https://github.com/kcl-lang/kcl"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index b205e1484df0..35eea846e8d0 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; + description = "High-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; homepage = "https://github.com/kcl-lang/kcl"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/kddockwidgets/default.nix b/pkgs/by-name/kd/kddockwidgets/package.nix similarity index 78% rename from pkgs/development/libraries/kddockwidgets/default.nix rename to pkgs/by-name/kd/kddockwidgets/package.nix index a9c2e8cd44d5..6b3afa39ad12 100644 --- a/pkgs/development/libraries/kddockwidgets/default.nix +++ b/pkgs/by-name/kd/kddockwidgets/package.nix @@ -3,10 +3,7 @@ stdenv, fetchFromGitHub, cmake, - qtbase, - qtdeclarative, - qtquickcontrols2, - qtx11extras, + qt6, spdlog, fmt, nlohmann_json, @@ -29,13 +26,13 @@ stdenv.mkDerivation rec { fmt nlohmann_json ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with qt6; [ qtbase qtdeclarative - qtquickcontrols2 - qtx11extras ]; + cmakeFlags = [ (lib.strings.cmakeBool "KDDockWidgets_QT6" true) ]; + dontWrapQtApps = true; meta = with lib; { @@ -45,6 +42,9 @@ stdenv.mkDerivation rec { gpl2Only gpl3Only ]; - maintainers = with maintainers; [ _1000teslas ]; + maintainers = with maintainers; [ + _1000teslas + tmarkus + ]; }; } diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index 2ed6a8fb79a5..1e6cf769bbb3 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "kew"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "ravachol"; repo = "kew"; tag = "v${finalAttrs.version}"; - hash = "sha256-DcQs9saw4DeEiPUo/pGaP5MMNfIuzOZPQW1FgQKQ20w="; + hash = "sha256-1PUvUFlRhGrZLjLwQrNb0kE695m5poSqrAIOBAnm3xk="; }; postPatch = '' diff --git a/pkgs/by-name/kh/khoj/package.nix b/pkgs/by-name/kh/khoj/package.nix index bb462f08c2b2..ec9e03b13835 100644 --- a/pkgs/by-name/kh/khoj/package.nix +++ b/pkgs/by-name/kh/khoj/package.nix @@ -134,12 +134,12 @@ python3.pkgs.buildPythonApplication rec { "tests/test_conversation_utils.py" ]; - meta = with lib; { + meta = { description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos"; homepage = "https://github.com/debanjum/khoj"; changelog = "https://github.com/debanjum/khoj/releases/tag/${version}"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ dit7ya ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ dit7ya ]; broken = true; # last successful build 2024-01-10 }; } diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index a5eb7fd6948b..51181a031333 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -7,13 +7,13 @@ php.buildComposerProject2 (finalAttrs: { pname = "kimai"; - version = "2.33.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "kimai"; repo = "kimai"; tag = finalAttrs.version; - hash = "sha256-YkACx0xl+6yN8pgH56WPdEoNAZxAxHIPLay28V1S5WQ="; + hash = "sha256-LxbECvOukhCA93jBvs/yOeBoGXmXgPGbKZrGppAWrYM="; }; php = php.buildEnv { @@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: { ''; }; - vendorHash = "sha256-smDAz4RnVEgPcGjsQmN0NC8kWgLw78YFuef9gbajAeQ="; + vendorHash = "sha256-wCrj4HfqLj9gljkOGw8lNG9qsFHN9oXI1FjgRzPtwfI="; composerNoPlugins = false; composerNoScripts = false; diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix index 4eeb2099de2a..739623518f3d 100644 --- a/pkgs/by-name/ki/kitex/package.nix +++ b/pkgs/by-name/ki/kitex/package.nix @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { }; meta = { - description = "A high-performance and strong-extensibility Golang RPC framework"; + description = "High-performance and strong-extensibility Golang RPC framework"; homepage = "https://github.com/cloudwego/kitex"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aaronjheng ]; diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index afffc52f51db..b3c795d14947 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -312,7 +312,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/kovidgoyal/kitty"; - description = "The fast, feature-rich, GPU based terminal emulator"; + description = "Fast, feature-rich, GPU based terminal emulator"; license = licenses.gpl3Only; changelog = [ "https://sw.kovidgoyal.net/kitty/changelog/" diff --git a/pkgs/by-name/kl/klipper-estimator/package.nix b/pkgs/by-name/kl/klipper-estimator/package.nix index 0e863c58be61..33282e64f9ac 100644 --- a/pkgs/by-name/kl/klipper-estimator/package.nix +++ b/pkgs/by-name/kl/klipper-estimator/package.nix @@ -32,12 +32,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - meta = with lib; { + meta = { description = "Tool for determining the time a print will take using the Klipper firmware"; homepage = "https://github.com/Annex-Engineering/klipper_estimator"; changelog = "https://github.com/Annex-Engineering/klipper_estimator/releases/tag/v${version}"; mainProgram = "klipper_estimator"; - license = licenses.mit; - maintainers = with maintainers; [ tmarkus ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tmarkus ]; }; } diff --git a/pkgs/by-name/kn/knit/package.nix b/pkgs/by-name/kn/knit/package.nix index 82d1a2fe8982..574dffb8799f 100644 --- a/pkgs/by-name/kn/knit/package.nix +++ b/pkgs/by-name/kn/knit/package.nix @@ -27,12 +27,12 @@ buildGoModule rec { "-X github.com/zyedidia/knit/info.Version=${version}" ]; - meta = with lib; { + meta = { description = "Simple and flexible build tool using Lua, similar to make/mk"; mainProgram = "knit"; homepage = "https://github.com/zyedidia/knit"; changelog = "https://github.com/zyedidia/knit/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ DrSensor ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ DrSensor ]; }; } diff --git a/pkgs/by-name/kn/knockpy/package.nix b/pkgs/by-name/kn/knockpy/package.nix index 3642043bbb43..5a3403b76d8e 100644 --- a/pkgs/by-name/kn/knockpy/package.nix +++ b/pkgs/by-name/kn/knockpy/package.nix @@ -41,12 +41,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "knock" ]; - meta = with lib; { + meta = { description = "Tool to scan subdomains"; homepage = "https://github.com/guelfoweb/knock"; changelog = "https://github.com/guelfoweb/knock/releases/tag/${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "knockpy"; }; } diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index a415cb289709..16da2ead4b7f 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -131,13 +131,13 @@ stdenv.mkDerivation rec { ''; }; - meta = with lib; { + meta = { description = "Authoritative-only DNS server from .cz domain registry"; homepage = "https://knot-dns.cz"; changelog = "https://gitlab.nic.cz/knot/knot-dns/-/releases/v${version}"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = [ maintainers.vcunat ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.vcunat ]; mainProgram = "knotd"; }; } diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix index d8fee487a22a..a8d0d7f7d25b 100644 --- a/pkgs/by-name/ko/koreader/package.nix +++ b/pkgs/by-name/ko/koreader/package.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/koreader/koreader"; changelog = "https://github.com/koreader/koreader/releases/tag/v${version}"; - description = "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; + description = "Ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; mainProgram = "koreader"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ diff --git a/pkgs/by-name/kr/krabby/package.nix b/pkgs/by-name/kr/krabby/package.nix index c347a934aee5..11ea4a97ccbd 100644 --- a/pkgs/by-name/kr/krabby/package.nix +++ b/pkgs/by-name/kr/krabby/package.nix @@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-aJBZtRs83KwnxlgNn/5zEGCw4YUl4mRcs1dFi2uaIrc="; - meta = with lib; { + meta = { description = "Print pokemon sprites in your terminal"; homepage = "https://github.com/yannjor/krabby"; changelog = "https://github.com/yannjor/krabby/releases/tag/v${version}"; - license = licenses.gpl3; - maintainers = with maintainers; [ ruby0b ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ruby0b ]; mainProgram = "krabby"; }; } diff --git a/pkgs/by-name/kr/krbjack/package.nix b/pkgs/by-name/kr/krbjack/package.nix index 762aae312096..c916c72b7613 100644 --- a/pkgs/by-name/kr/krbjack/package.nix +++ b/pkgs/by-name/kr/krbjack/package.nix @@ -38,12 +38,12 @@ python3.pkgs.buildPythonApplication rec { "krbjack" ]; - meta = with lib; { + meta = { description = "Kerberos AP-REQ hijacking tool with DNS unsecure updates abuse"; homepage = "https://github.com/almandin/krbjack"; changelog = "https://github.com/almandin/krbjack/releases/tag/${version}}"; - license = licenses.beerware; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.beerware; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "krbjack"; }; } diff --git a/pkgs/by-name/kr/krelay/package.nix b/pkgs/by-name/kr/krelay/package.nix index f5eea3642d8d..aa307041b81a 100644 --- a/pkgs/by-name/kr/krelay/package.nix +++ b/pkgs/by-name/kr/krelay/package.nix @@ -29,12 +29,12 @@ buildGoModule rec { mv $out/bin/client $out/bin/kubectl-relay ''; - meta = with lib; { + meta = { description = "Drop-in replacement for `kubectl port-forward` with some enhanced features"; homepage = "https://github.com/knight42/krelay"; changelog = "https://github.com/knight42/krelay/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ ivankovnatsky ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ivankovnatsky ]; mainProgram = "kubectl-relay"; }; } diff --git a/pkgs/by-name/kr/krill/package.nix b/pkgs/by-name/kr/krill/package.nix index dd0a41318895..c5330e51cc71 100644 --- a/pkgs/by-name/kr/krill/package.nix +++ b/pkgs/by-name/kr/krill/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { # disable failing tests on darwin doCheck = !stdenv.hostPlatform.isDarwin; - meta = with lib; { + meta = { description = "RPKI Certificate Authority and Publication Server written in Rust"; longDescription = '' Krill is a free, open source RPKI Certificate Authority that lets you run @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/NLnetLabs/krill"; changelog = "https://github.com/NLnetLabs/krill/releases/tag/v${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ steamwalker ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ steamwalker ]; }; } diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix index 331295e9d383..d7b6b371184e 100644 --- a/pkgs/by-name/ku/kube-bench/package.nix +++ b/pkgs/by-name/ku/kube-bench/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "kube-bench"; tag = "v${version}"; - hash = "sha256-+4OSqFU9IoVN9lsw6CwVL60OU4e/yCBZfnD8qqNLTtk="; + hash = "sha256-5QY7rDFv6UV5qIdgKUGkb1DYZYid3POgEzPwSPKtHDU="; }; - vendorHash = "sha256-BB7DHACKELwvquOwmBSXl1kwKw43mNnpp5yY33wwdVo="; + vendorHash = "sha256-fmhlqPizAIVVzJAIHfY2gtCpJZY5Sx1Uih/7m7YEM98="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ku/kube-capacity/package.nix b/pkgs/by-name/ku/kube-capacity/package.nix index b5f969cb7929..bf35827a8565 100644 --- a/pkgs/by-name/ku/kube-capacity/package.nix +++ b/pkgs/by-name/ku/kube-capacity/package.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorHash = "sha256-YME4AXpHvr1bNuc/HoHxam+7ZkwLzjhIvFSfD4hga1A="; meta = { - description = "A simple CLI that provides an overview of the resource requests, limits, and utilization in a Kubernetes cluster"; + description = "Simple CLI that provides an overview of the resource requests, limits, and utilization in a Kubernetes cluster"; mainProgram = "kube-capacity"; homepage = "https://github.com/robscott/kube-capacity"; changelog = "https://github.com/robscott/kube-capacity/releases/tag/v${version}"; diff --git a/pkgs/by-name/ku/kubefetch/package.nix b/pkgs/by-name/ku/kubefetch/package.nix index 4a771efc824a..aed03eae6ee1 100644 --- a/pkgs/by-name/ku/kubefetch/package.nix +++ b/pkgs/by-name/ku/kubefetch/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorHash = "sha256-qsncOsCxepySJI+rJnzbIGxSWlxMzqShtzcEoJD2UPw="; meta = { - description = "A neofetch-like tool to show info about your Kubernetes Cluster."; + description = "Neofetch-like tool to show info about your Kubernetes Cluster"; homepage = "https://github.com/jkulzer/kubefetch"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ wrmilling ]; diff --git a/pkgs/by-name/ku/kubie/package.nix b/pkgs/by-name/ku/kubie/package.nix index cf25e473476a..0b305dfe42eb 100644 --- a/pkgs/by-name/ku/kubie/package.nix +++ b/pkgs/by-name/ku/kubie/package.nix @@ -1,8 +1,10 @@ { lib, + kubectl, rustPlatform, fetchFromGitHub, installShellFiles, + makeWrapper, }: rustPlatform.buildRustPackage rec { @@ -20,10 +22,20 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Yf8fAW65K7SLaRpvegjWBLVDV33sMGV+I1rqlWvx5Ss="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; postInstall = '' - installShellCompletion completion/kubie.bash + installShellCompletion completion/kubie.{bash,fish} + + wrapProgram "$out/bin/kubie" \ + --prefix PATH : "${ + lib.makeBinPath [ + kubectl + ] + }" ''; meta = with lib; { diff --git a/pkgs/by-name/ku/kuro/package.nix b/pkgs/by-name/ku/kuro/package.nix index 5fb26933e51e..e03de7344c6e 100644 --- a/pkgs/by-name/ku/kuro/package.nix +++ b/pkgs/by-name/ku/kuro/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { changelog = "https://github.com/davidsmorais/kuro/releases/tag/${src.rev}"; - description = "An unofficial, featureful, open source, community-driven, free Microsoft To-Do app"; + description = "Unofficial, featureful, open source, community-driven, free Microsoft To-Do app"; homepage = "https://github.com/davidsmorais/kuro"; license = licenses.mit; mainProgram = "kuro"; diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix index 2d6d062173b2..ec80f38bb04d 100644 --- a/pkgs/by-name/ky/kyverno/package.nix +++ b/pkgs/by-name/ky/kyverno/package.nix @@ -47,12 +47,12 @@ buildGoModule rec { version = "v${version}"; # needed because testVersion uses grep -Fw }; - meta = with lib; { + meta = { description = "Kubernetes Native Policy Management"; mainProgram = "kyverno"; homepage = "https://kyverno.io/"; changelog = "https://github.com/kyverno/kyverno/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ bryanasdev000 ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bryanasdev000 ]; }; } diff --git a/pkgs/by-name/la/labelife-label-printer/package.nix b/pkgs/by-name/la/labelife-label-printer/package.nix index 2efe47654dc9..13ab4a9603a2 100644 --- a/pkgs/by-name/la/labelife-label-printer/package.nix +++ b/pkgs/by-name/la/labelife-label-printer/package.nix @@ -1,33 +1,49 @@ { lib, stdenv, - fetchurl, + fetchzip, cups, autoPatchelfHook, + detox, }: stdenv.mkDerivation (finalAttrs: { pname = "labelife-label-printer"; - version = "1.2.1"; + version = "2.0.0"; arch = - if stdenv.hostPlatform.system == "x86_64-linux" then - "x86_64" - else if stdenv.hostPlatform.system == "i686-linux" then - "i386" - else - throw "Unsupported system: ${stdenv.hostPlatform.system}"; + { + aarch64-linux = "aarch64"; + armv7l-linux = "armhf"; + i686-linux = "i386"; + x86_64-linux = "x86_64"; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - src = fetchurl { - url = "https://oss.saas.aimocloud.com/saas/Lablife/bag/LabelPrinter-${finalAttrs.version}.tar.gz"; - hash = "sha256-twnIFMBMyEM3xGlsuk3763C3emz3mgpEnlfvnL0XRWw="; + src = fetchzip { + url = "https://oss.qu-in.ltd/Labelife/Label_Printer_Driver_Linux.zip"; + hash = "sha256-0ESZ0EqPh9Wz6ogQ6vTsAogujbn4zINtMh62sEpNRs4="; }; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ + autoPatchelfHook + detox + ]; buildInputs = [ cups ]; + unpackPhase = '' + runHook preUnpack + + tar -xzf ${finalAttrs.src}/LabelPrinter-${finalAttrs.version}.001.tar.gz --strip-components=1 + + runHook postUnpack + ''; + installPhase = '' runHook preInstall + # Remove spaces from PPD filenames + detox ppds + # Install the CUPS filter with executable permissions install -Dm755 ./${finalAttrs.arch}/rastertolabeltspl $out/lib/cups/filter/rastertolabeltspl @@ -46,9 +62,7 @@ stdenv.mkDerivation (finalAttrs: { longDescription = '' Supported printer models include: - D520 & D520BT - - PM-201 - PM-241 & PM-241-BT - - PM-246 & PM-246S Brands using Labelife drivers include: - Phomemo @@ -58,6 +72,8 @@ stdenv.mkDerivation (finalAttrs: { ''; maintainers = with lib.maintainers; [ daniel-fahey ]; platforms = [ + "aarch64-linux" + "armv7l-linux" "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix index a32cc9cc4956..529c4f98dbf0 100644 --- a/pkgs/by-name/la/lan-mouse/package.nix +++ b/pkgs/by-name/la/lan-mouse/package.nix @@ -50,6 +50,11 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-+UXRBYfbkb114mwDGj36oG5ZT3TQtcEzsbyZvtWTMxM="; + postInstall = '' + install -Dm444 de.feschber.LanMouse.desktop -t $out/share/applications + install -Dm444 lan-mouse-gtk/resources/de.feschber.LanMouse.svg -t $out/share/icons/hicolor/scalable/apps + ''; + meta = { description = "Software KVM switch for sharing a mouse and keyboard with multiple hosts through the network"; homepage = "https://github.com/feschber/lan-mouse"; diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix index 1173bc7e8247..8b2b13e974b4 100644 --- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix +++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline"; + description = "Collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline"; homepage = "https://github.com/suitenumerique/docs"; changelog = "https://github.com/suitenumerique/docs/blob/${src.tag}/CHANGELOG.md"; mainProgram = "docs-collaboration-server"; diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix index af557cd9e2f7..f88cb44a379b 100644 --- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline"; + description = "Collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline"; homepage = "https://github.com/suitenumerique/docs"; changelog = "https://github.com/suitenumerique/docs/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix index 9ccb81cfe890..7a0a5c675af2 100644 --- a/pkgs/by-name/la/lasuite-docs/package.nix +++ b/pkgs/by-name/la/lasuite-docs/package.nix @@ -108,7 +108,7 @@ python.pkgs.buildPythonApplication rec { }; meta = { - description = "A collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline"; + description = "Collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline"; homepage = "https://github.com/suitenumerique/docs"; changelog = "https://github.com/suitenumerique/docs/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; diff --git a/pkgs/by-name/la/lauti/package.nix b/pkgs/by-name/la/lauti/package.nix index f53397b39b8a..95a8dc739cc9 100644 --- a/pkgs/by-name/la/lauti/package.nix +++ b/pkgs/by-name/la/lauti/package.nix @@ -46,7 +46,7 @@ buildGoModule rec { }; meta = { - description = "An open source calendar for events, groups and places"; + description = "Open source calendar for events, groups and places"; homepage = "https://lauti.org"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ onny ]; diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 606212d479e2..7fe7f52e89a9 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "lazygit"; - version = "0.51.1"; + version = "0.52.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazygit"; tag = "v${version}"; - hash = "sha256-PktxVf+2xOpkZBHlm9oLV4WXoz9bNaXa+cvnI9RCcRA="; + hash = "sha256-tbFRovaB0f+0VyX34DEXvWYjV3fipc5kbRNhm7rVMlo="; }; vendorHash = null; diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix index 2586ade74e3f..a729926ae9d6 100644 --- a/pkgs/by-name/la/lazyjournal/package.nix +++ b/pkgs/by-name/la/lazyjournal/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let - version = "0.7.8"; + version = "0.7.9"; in buildGoModule { pname = "lazyjournal"; @@ -15,7 +15,7 @@ buildGoModule { owner = "Lifailon"; repo = "lazyjournal"; tag = version; - hash = "sha256-d+wiq6q5lxE17nCKZvl75xBsLMKz1AjxhLFH6GYX7Y0="; + hash = "sha256-ohMcTu4sK5M11FY2QkJcHnNxx6pmscdH3S2MbWorUVM="; }; vendorHash = "sha256-faMGgTJuD/6CqR+OfGknE0dGdDOSwoODySNcb3kBLv8="; diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index 82dabbcd3fff..922928c162c1 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -34,7 +34,7 @@ buildGoModule rec { }; meta = with lib; { - description = "A cross-platform TUI database management tool written in Go"; + description = "Cross-platform TUI database management tool written in Go"; homepage = "https://github.com/jorgerojas26/lazysql"; license = licenses.mit; maintainers = with maintainers; [ kanielrkirby ]; diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index c3cdaabec73c..54355735828e 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; meta = { - description = "The classic linker for Darwin"; + description = "Classic linker for Darwin"; homepage = "https://opensource.apple.com/releases/"; license = lib.licenses.apple-psl20; mainProgram = "ld"; diff --git a/pkgs/by-name/ld/ldapmonitor/package.nix b/pkgs/by-name/ld/ldapmonitor/package.nix index 52ded0dc99dc..1aec07adfad4 100644 --- a/pkgs/by-name/ld/ldapmonitor/package.nix +++ b/pkgs/by-name/ld/ldapmonitor/package.nix @@ -32,12 +32,12 @@ python3.pkgs.buildPythonApplication rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Tool to monitor creation, deletion and changes to LDAP objects"; mainProgram = "ldapmonitor"; homepage = "https://github.com/p0dalirius/LDAPmonitor"; changelog = "https://github.com/p0dalirius/LDAPmonitor/releases/tag/${version}"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ gpl3Only ]; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ld/ldapnomnom/package.nix b/pkgs/by-name/ld/ldapnomnom/package.nix index 2d9557ed0ceb..7fc161682d1f 100644 --- a/pkgs/by-name/ld/ldapnomnom/package.nix +++ b/pkgs/by-name/ld/ldapnomnom/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-s" ]; - meta = with lib; { + meta = { description = "Tool to anonymously bruteforce usernames from Domain controllers"; homepage = "https://github.com/lkarlslund/ldapnomnom"; changelog = "https://github.com/lkarlslund/ldapnomnom/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "ldapnomnom"; }; } diff --git a/pkgs/by-name/ld/ldmud/package.nix b/pkgs/by-name/ld/ldmud/package.nix index 71ba320bd654..fa85bacb6c23 100644 --- a/pkgs/by-name/ld/ldmud/package.nix +++ b/pkgs/by-name/ld/ldmud/package.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { cp -v ../COPYRIGHT $out/share/ ''; - meta = with lib; { + meta = { description = "Gamedriver for LPMuds including a LPC compiler, interpreter and runtime"; homepage = "https://ldmud.eu"; changelog = "https://github.com/ldmud/ldmud/blob/${version}/HISTORY"; @@ -116,8 +116,8 @@ stdenv.mkDerivation rec { a driver in its own right. ''; # See https://github.com/ldmud/ldmud/blob/master/COPYRIGHT - license = licenses.unfreeRedistributable; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ cpu ]; + license = lib.licenses.unfreeRedistributable; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ cpu ]; }; } diff --git a/pkgs/by-name/ld/ldproxy/package.nix b/pkgs/by-name/ld/ldproxy/package.nix index a1816eccef18..db31f5254b19 100644 --- a/pkgs/by-name/ld/ldproxy/package.nix +++ b/pkgs/by-name/ld/ldproxy/package.nix @@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec { # cf: https://github.com/esp-rs/embuild/tree/v0.31.4/ldproxy buildAndTestSubdir = "ldproxy"; - meta = with lib; { + meta = { description = "Linker Proxy: a simple tool to forward linker arguments to the actual linker executable"; homepage = "https://github.com/esp-rs/embuild"; changelog = "https://github.com/esp-rs/embuild/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ mit # or asl20 ]; - maintainers = with maintainers; [ vpochapuis ]; + maintainers = with lib.maintainers; [ vpochapuis ]; }; } diff --git a/pkgs/by-name/le/leetgo/package.nix b/pkgs/by-name/le/leetgo/package.nix index ebd872598035..9d5250d93ba3 100644 --- a/pkgs/by-name/le/leetgo/package.nix +++ b/pkgs/by-name/le/leetgo/package.nix @@ -36,7 +36,7 @@ buildGoModule rec { ''; meta = { - description = "A command-line tool for LeetCode"; + description = "Command-line tool for LeetCode"; homepage = "https://github.com/j178/leetgo"; changelog = "https://github.com/j178/leetgo/releases/tag/v${version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/lf/lf/package.nix b/pkgs/by-name/lf/lf/package.nix index 10c678e7604d..114415680312 100644 --- a/pkgs/by-name/lf/lf/package.nix +++ b/pkgs/by-name/lf/lf/package.nix @@ -37,7 +37,7 @@ buildGoModule rec { installShellCompletion etc/lf.{bash,zsh,fish} ''; - meta = with lib; { + meta = { description = "Terminal file manager written in Go and heavily inspired by ranger"; longDescription = '' lf (as in "list files") is a terminal file manager written in Go. It is @@ -47,8 +47,8 @@ buildGoModule rec { ''; homepage = "https://godoc.org/github.com/gokcehan/lf"; changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; mainProgram = "lf"; }; } diff --git a/pkgs/by-name/li/liana/package.nix b/pkgs/by-name/li/liana/package.nix index f67131878a62..6f04130cc54d 100644 --- a/pkgs/by-name/li/liana/package.nix +++ b/pkgs/by-name/li/liana/package.nix @@ -84,7 +84,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { mainProgram = "liana-gui"; - description = "A Bitcoin wallet leveraging on-chain timelocks for safety and recovery"; + description = "Bitcoin wallet leveraging on-chain timelocks for safety and recovery"; homepage = "https://wizardsardine.com/liana"; changelog = "https://github.com/wizardsardine/liana/releases/tag/${src.rev}"; license = licenses.bsd3; diff --git a/pkgs/by-name/li/lib25519/package.nix b/pkgs/by-name/li/lib25519/package.nix index 515ef90967fa..bf21ad06ca95 100644 --- a/pkgs/by-name/li/lib25519/package.nix +++ b/pkgs/by-name/li/lib25519/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://randombytes.cr.yp.to/"; - description = "A simple API for applications generating fresh randomness"; + description = "Simple API for applications generating fresh randomness"; changelog = "https://randombytes.cr.yp.to/download.html"; license = with lib.licenses; [ # Upstream specifies the public domain licenses with the terms here https://cr.yp.to/spdx.html diff --git a/pkgs/by-name/li/libde265/package.nix b/pkgs/by-name/li/libde265/package.nix index 13842a96aca6..286f8c37df2e 100644 --- a/pkgs/by-name/li/libde265/package.nix +++ b/pkgs/by-name/li/libde265/package.nix @@ -14,14 +14,14 @@ gst_all_1, }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { version = "1.0.15"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-guiLM4RNe5O0qpeCoQUbs1Z7j0wp8iK9za2+6NIB8yY="; }; diff --git a/pkgs/by-name/li/libdivecomputer/package.nix b/pkgs/by-name/li/libdivecomputer/package.nix index e2ac2746af6a..e81111f4a800 100644 --- a/pkgs/by-name/li/libdivecomputer/package.nix +++ b/pkgs/by-name/li/libdivecomputer/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.libdivecomputer.org"; + homepage = "https://www.libdivecomputer.org"; description = "Cross-platform and open source library for communication with dive computers from various manufacturers"; mainProgram = "dctool"; maintainers = [ maintainers.mguentner ]; diff --git a/pkgs/by-name/li/libetebase/package.nix b/pkgs/by-name/li/libetebase/package.nix index c10169135e4e..f91727100143 100644 --- a/pkgs/by-name/li/libetebase/package.nix +++ b/pkgs/by-name/li/libetebase/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { passthru.tests.pkgs-config = testers.testMetaPkgConfig libetebase; meta = with lib; { - description = "A C library for Etebase"; + description = "C library for Etebase"; homepage = "https://www.etebase.com/"; license = licenses.bsd3; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch b/pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch new file mode 100644 index 000000000000..7dfad4978005 --- /dev/null +++ b/pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile b/src/Makefile +index 2af4804..bcff809 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -80,7 +80,7 @@ PREFIX ?= /usr/local + LIBDIRNAME ?= /lib/faketime + PLATFORM ?=$(shell uname) + +-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) ++CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) + ifeq ($(PLATFORM),SunOS) + CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 + endif diff --git a/pkgs/by-name/li/libfaketime/package.nix b/pkgs/by-name/li/libfaketime/package.nix index 9c7847b94567..029a24c29398 100644 --- a/pkgs/by-name/li/libfaketime/package.nix +++ b/pkgs/by-name/li/libfaketime/package.nix @@ -6,29 +6,51 @@ perl, coreutils, }: +let + hashes = { + "0.9.10" = "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ="; + "0.9.11" = "sha256-a0TjHYzwbkRQyvr9Sj/DqjgLBnE1Z8kjsTQxTfGqLjE="; + }; +in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libfaketime"; - version = "0.9.11"; + # 0.9.10 break dict-db-wiktionary and quartus-prime-lite on linux, + # and 0.9.11 break everything on darwin + version = if stdenv.hostPlatform.isDarwin then "0.9.10" else "0.9.11"; src = fetchFromGitHub { owner = "wolfcw"; repo = "libfaketime"; - rev = "v${version}"; - sha256 = "sha256-a0TjHYzwbkRQyvr9Sj/DqjgLBnE1Z8kjsTQxTfGqLjE="; + tag = "v${finalAttrs.version}"; + hash = hashes.${finalAttrs.version}; }; - patches = [ - ./nix-store-date.patch - ]; + patches = + [ + ./nix-store-date.patch + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (fetchpatch { + name = "0001-libfaketime.c-wrap-timespec_get-in-TIME_UTC-macro.patch"; + url = "https://github.com/wolfcw/libfaketime/commit/e0e6b79568d36a8fd2b3c41f7214769221182128.patch"; + sha256 = "sha256-KwwP76v0DXNW73p/YBvwUOPdKMAcVdbQSKexD/uFOYo="; + }) + (fetchpatch { + name = "LFS64.patch"; + url = "https://github.com/wolfcw/libfaketime/commit/f32986867addc9d22b0fab29c1c927f079d44ac1.patch"; + hash = "sha256-fIXuxxcV9J2IcgwcwSrMo4maObkH9WYv1DC/wdtbq/g="; + }) + # https://github.com/wolfcw/libfaketime/issues/277 + ./0001-Remove-unsupported-clang-flags.patch + ]; postPatch = '' patchShebangs test src - for a in test/functests/test_exclude_mono.sh src/faketime.c ; do - substituteInPlace $a \ - --replace-fail /bin/bash ${stdenv.shell} - done - substituteInPlace src/faketime.c --replace-fail @DATE_CMD@ ${coreutils}/bin/date + substituteInPlace test/functests/test_exclude_mono.sh src/faketime.c \ + --replace-fail /bin/bash ${stdenv.shell} + substituteInPlace src/faketime.c \ + --replace-fail @DATE_CMD@ ${lib.getExe' coreutils "date"} ''; PREFIX = placeholder "out"; @@ -49,12 +71,12 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { description = "Report faked system time to programs without having to change the system-wide time"; homepage = "https://github.com/wolfcw/libfaketime/"; - license = licenses.gpl2; - platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "faketime"; }; -} +}) diff --git a/pkgs/by-name/li/libgen-cli/package.nix b/pkgs/by-name/li/libgen-cli/package.nix index 33aa2fc8cfa1..7b7963093a5f 100644 --- a/pkgs/by-name/li/libgen-cli/package.nix +++ b/pkgs/by-name/li/libgen-cli/package.nix @@ -38,7 +38,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/ciehanski/libgen-cli"; - description = "A CLI tool used to access the Library Genesis dataset; written in Go"; + description = "CLI tool used to access the Library Genesis dataset; written in Go"; longDescription = '' libgen-cli is a command line interface application which allows users to quickly query the Library Genesis dataset and download any of its diff --git a/pkgs/by-name/li/libnop/package.nix b/pkgs/by-name/li/libnop/package.nix index 09cba2b2404c..f1eeb531bc11 100644 --- a/pkgs/by-name/li/libnop/package.nix +++ b/pkgs/by-name/li/libnop/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "A fast, header-only C++ serialization library"; + description = "Fast, header-only C++ serialization library"; homepage = "https://github.com/google/libnop"; license = lib.licenses.asl20; platforms = lib.platforms.all; diff --git a/pkgs/by-name/li/libpisp/package.nix b/pkgs/by-name/li/libpisp/package.nix index 2a9dd59d2d46..d7aa73b00722 100644 --- a/pkgs/by-name/li/libpisp/package.nix +++ b/pkgs/by-name/li/libpisp/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/raspberrypi/libpisp"; - description = "A helper library to generate run-time configuration for the Raspberry Pi ISP (PiSP), consisting of the Frontend and Backend hardware components."; + description = "Helper library to generate run-time configuration for the Raspberry Pi ISP (PiSP), consisting of the Frontend and Backend hardware components"; license = licenses.bsd2; platforms = platforms.all; }; diff --git a/pkgs/by-name/li/librandombytes/package.nix b/pkgs/by-name/li/librandombytes/package.nix index e6ecbdef8eea..cb19ead59257 100644 --- a/pkgs/by-name/li/librandombytes/package.nix +++ b/pkgs/by-name/li/librandombytes/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://randombytes.cr.yp.to/"; - description = "A simple API for applications generating fresh randomness"; + description = "Simple API for applications generating fresh randomness"; changelog = "https://randombytes.cr.yp.to/download.html"; license = with lib.licenses; [ # Upstream specifies the public domain licenses with the terms here https://cr.yp.to/spdx.html diff --git a/pkgs/by-name/li/librearp-lv2/package.nix b/pkgs/by-name/li/librearp-lv2/package.nix index c5a0cd73daf0..0d30ff5115ab 100644 --- a/pkgs/by-name/li/librearp-lv2/package.nix +++ b/pkgs/by-name/li/librearp-lv2/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "A pattern-based arpeggio generator plugin."; + description = "Pattern-based arpeggio generator plugin"; homepage = "https://librearp.gitlab.io/"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/li/librearp/package.nix b/pkgs/by-name/li/librearp/package.nix index eb6f10ea8a74..491ea9d1f3fb 100644 --- a/pkgs/by-name/li/librearp/package.nix +++ b/pkgs/by-name/li/librearp/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "A pattern-based arpeggio generator plugin"; + description = "Pattern-based arpeggio generator plugin"; homepage = "https://librearp.gitlab.io/"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/li/libstudxml/package.nix b/pkgs/by-name/li/libstudxml/package.nix index 7cba6de407cd..501f416d7a80 100644 --- a/pkgs/by-name/li/libstudxml/package.nix +++ b/pkgs/by-name/li/libstudxml/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "A streaming XML pull parser and streaming XML serializer implementation for modern, standard C++"; + description = "Streaming XML pull parser and streaming XML serializer implementation for modern, standard C++"; homepage = "https://www.codesynthesis.com/projects/libstudxml/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix index c68648a0ee3d..75cc4d103c14 100644 --- a/pkgs/by-name/li/lightning-loop/package.nix +++ b/pkgs/by-name/li/lightning-loop/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.28.8-beta"; + version = "0.31.1-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - hash = "sha256-zgKKYHDRYXPslPHay/V2DAL1jQfeX5qPWUQQtuvp1M0="; + hash = "sha256-OJWf96Dq06U56dIMMocGYgyZdu94VM3A6ViJZR+gbxQ="; }; - vendorHash = "sha256-v7zSvCp63z+xZIuXbqHueamEBN/jZBr2Kysvq03e8L0="; + vendorHash = "sha256-TnnYjTbN6zuXUbZbh1sK9bmjR7FleFqNFrqwBTllypY="; subPackages = [ "cmd/loop" diff --git a/pkgs/by-name/li/littlenavmap/atools.nix b/pkgs/by-name/li/littlenavmap/atools.nix index 3072f02f4e55..96f92a39c369 100644 --- a/pkgs/by-name/li/littlenavmap/atools.nix +++ b/pkgs/by-name/li/littlenavmap/atools.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = { - description = "A static library extending Qt for exception handling, a log4j like logging framework, Flight Simulator related utilities like BGL reader and more"; + description = "Static library extending Qt for exception handling, a log4j like logging framework, Flight Simulator related utilities like BGL reader and more"; homepage = "https://github.com/albar965/atools"; changelog = "https://github.com/albar965/atools/blob/${src.rev}/CHANGELOG.txt"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/li/littlenavmap/package.nix b/pkgs/by-name/li/littlenavmap/package.nix index 8ebe6e9dce63..f01cdeee5494 100644 --- a/pkgs/by-name/li/littlenavmap/package.nix +++ b/pkgs/by-name/li/littlenavmap/package.nix @@ -51,14 +51,12 @@ let ]; }); - pname = "littlenavmap"; - desktopItem = makeDesktopItem { name = "Little Navmap"; desktopName = "Little Navmap"; - icon = pname; + icon = "littlenavmap"; terminal = false; - exec = pname; + exec = "littlenavmap"; categories = [ "Qt" "Utility" @@ -67,14 +65,14 @@ let ]; }; in -stdenv.mkDerivation (finalAttrs: rec { - inherit pname; +stdenv.mkDerivation (finalAttrs: { + pname = "littlenavmap"; version = "3.0.17"; src = fetchFromGitHub { owner = "albar965"; repo = "littlenavmap"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/1YB2uEQzT0K6IylpWDqOaMSENDR9GuyJNty+2C8kXM="; }; @@ -120,9 +118,9 @@ stdenv.mkDerivation (finalAttrs: rec { passthru.local-packages = { inherit atools marble; }; meta = { - description = "A free flight planner, navigation tool, moving map, airport search and airport information system for Flight Simulator X, Microsoft Flight Simulator 2020, Prepar3D and X-Plane"; + description = "Free flight planner, navigation tool, moving map, airport search and airport information system for Flight Simulator X, Microsoft Flight Simulator 2020, Prepar3D and X-Plane"; homepage = "https://github.com/albar965/littlenavmap"; - changelog = "https://github.com/albar965/littlenavmap/blob/${src.rev}/CHANGELOG.txt"; + changelog = "https://github.com/albar965/littlenavmap/blob/${finalAttrs.src.tag}/CHANGELOG.txt"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ ck3d ]; mainProgram = "littlenavmap"; diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix index 35abab93682f..9ee557bd80cb 100644 --- a/pkgs/by-name/li/livekit/package.nix +++ b/pkgs/by-name/li/livekit/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "livekit"; - version = "1.8.4"; + version = "1.9.0"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit"; rev = "v${version}"; - hash = "sha256-j8alEPvSMdYpQLdWwaoSG5ZYgO17O1BMa71omeCb2Ug="; + hash = "sha256-xj0K9DaLXrj7U9zlaaAOMu7HFkTvn6P9PBb83j26D70="; }; - vendorHash = "sha256-7Zs7b0vaXyho1X33obsHh5f7sIUyhJKfJmHsFf/IuPY="; + vendorHash = "sha256-3zrP84YkPRn4NC3l9XRhtNraX8G5WnRxo2CNOmMfVJs="; subPackages = [ "cmd/server" ]; diff --git a/pkgs/by-name/lm/lmdb/package.nix b/pkgs/by-name/lm/lmdb/package.nix index e7ec894cf95b..dcb05051d155 100644 --- a/pkgs/by-name/lm/lmdb/package.nix +++ b/pkgs/by-name/lm/lmdb/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ln -s lmdb.pc "$dev/lib/pkgconfig/liblmdb.pc" ''; - meta = with lib; { + meta = { description = "Lightning memory-mapped database"; longDescription = '' LMDB is an ultra-fast, ultra-compact key-value embedded data store @@ -84,11 +84,11 @@ stdenv.mkDerivation rec { ''; homepage = "https://symas.com/lmdb/"; changelog = "https://git.openldap.org/openldap/openldap/-/blob/LMDB_${version}/libraries/liblmdb/CHANGES"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ jb55 vcunat ]; - license = licenses.openldap; - platforms = platforms.all; + license = lib.licenses.openldap; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/lo/logcheck/package.nix b/pkgs/by-name/lo/logcheck/package.nix index 37ba09a68109..83c54e62f1c6 100644 --- a/pkgs/by-name/lo/logcheck/package.nix +++ b/pkgs/by-name/lo/logcheck/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "logcheck"; - version = "1.4.4"; + version = "1.4.5"; _name = "logcheck_${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz"; - sha256 = "sha256-1A4aknB+GVgc3F8VlqVtJjlvGLBhYS6E+w+9lXvAOGQ="; + sha256 = "sha256-enUxHYVhdiDQLMAnQnRjx/mvIEHgL8k/W8Jda6PMrfE="; }; prePatch = '' diff --git a/pkgs/by-name/lo/lon/package.nix b/pkgs/by-name/lo/lon/package.nix index 0296246aa5b4..718b48d3586a 100644 --- a/pkgs/by-name/lo/lon/package.nix +++ b/pkgs/by-name/lo/lon/package.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "lon"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "nikstur"; repo = "lon"; tag = version; - hash = "sha256-/7RelKn3pzC8n+b2OV1pcUEaWeEoH4qC2TvAWwni5AA="; + hash = "sha256-+hCqAtu9uo9BndZogXUIMMoL1pXmwyec5edj6gg82GM="; }; sourceRoot = "source/rust/lon"; useFetchCargoVendor = true; - cargoHash = "sha256-2/lHRv3bD0hX/JVSucsA3G5gM9NMgRrBf21JtEvzu64="; + cargoHash = "sha256-i+DAVtXAYQ254Y7jechjOcwe3nT/0O4AzxBH5QkK9aM="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/lo/lorien/package.nix b/pkgs/by-name/lo/lorien/package.nix index 345be9574959..664b5453cef8 100644 --- a/pkgs/by-name/lo/lorien/package.nix +++ b/pkgs/by-name/lo/lorien/package.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/mbrlabs/Lorien"; - description = "An infinite canvas drawing/note-taking app"; + description = "Infinite canvas drawing/note-taking app"; longDescription = '' An infinite canvas drawing/note-taking app that is focused on performance, small savefiles and simplicity diff --git a/pkgs/by-name/lp/lprobe/package.nix b/pkgs/by-name/lp/lprobe/package.nix index 2aacf60ec18b..853db3bffdb1 100644 --- a/pkgs/by-name/lp/lprobe/package.nix +++ b/pkgs/by-name/lp/lprobe/package.nix @@ -23,7 +23,7 @@ buildGoModule rec { ]; meta = { - description = "A command-line tool to perform Local Health Check Probes inside Container Images (ECS, Docker)"; + description = "Command-line tool to perform Local Health Check Probes inside Container Images (ECS, Docker)"; homepage = "https://github.com/fivexl/lprobe"; license = lib.licenses.asl20; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/ls/lscolors/package.nix b/pkgs/by-name/ls/lscolors/package.nix index 2f7441b9cff4..17e9a1151480 100644 --- a/pkgs/by-name/ls/lscolors/package.nix +++ b/pkgs/by-name/ls/lscolors/package.nix @@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec { # setid is not allowed in the sandbox checkFlags = [ "--skip=tests::style_for_setid" ]; - meta = with lib; { + meta = { description = "Rust library and tool to colorize paths using LS_COLORS"; homepage = "https://github.com/sharkdp/lscolors"; changelog = "https://github.com/sharkdp/lscolors/releases/tag/v${version}"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "lscolors"; }; } diff --git a/pkgs/by-name/ls/lse/package.nix b/pkgs/by-name/ls/lse/package.nix index 6d9c8caa9135..f46959a34679 100644 --- a/pkgs/by-name/ls/lse/package.nix +++ b/pkgs/by-name/ls/lse/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ bash ]} ''; - meta = with lib; { + meta = { description = "Linux enumeration tool with verbosity levels"; homepage = "https://github.com/diego-treitos/linux-smart-enumeration"; changelog = "https://github.com/diego-treitos/linux-smart-enumeration/releases/tag/${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "lse.sh"; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ls/lsh/package.nix b/pkgs/by-name/ls/lsh/package.nix index bfa38767ab47..7e53904476f1 100644 --- a/pkgs/by-name/ls/lsh/package.nix +++ b/pkgs/by-name/ls/lsh/package.nix @@ -14,11 +14,11 @@ buildGoModule rec { }; vendorHash = "sha256-ogdyzfayleka4Y8x74ZtttD7MaeCl1qP/rQi9x0tMto="; subPackages = [ "." ]; - meta = with lib; { + meta = { changelog = "https://github.com/latitudesh/lsh/releases/tag/v${version}"; description = "Command-Line Interface for Latitude.sh"; homepage = "https://github.com/latitudesh/lsh"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ lib.maintainers.dzmitry-lahoda ]; }; } diff --git a/pkgs/by-name/lt/lttoolbox/package.nix b/pkgs/by-name/lt/lttoolbox/package.nix index 48db7dcea516..dd4e74203b78 100644 --- a/pkgs/by-name/lt/lttoolbox/package.nix +++ b/pkgs/by-name/lt/lttoolbox/package.nix @@ -47,12 +47,12 @@ stdenv.mkDerivation rec { python3 tests/run_tests.py ''; - meta = with lib; { + meta = { description = "Finite state compiler, processor and helper tools used by apertium"; homepage = "https://github.com/apertium/lttoolbox"; - maintainers = with maintainers; [ onthestairs ]; + maintainers = with lib.maintainers; [ onthestairs ]; changelog = "https://github.com/apertium/lttoolbox/releases/tag/v${version}"; - license = licenses.gpl2; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix index ba6f24bbf5bf..d99cddaf95a9 100644 --- a/pkgs/by-name/lu/luanti/package.nix +++ b/pkgs/by-name/lu/luanti/package.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://www.luanti.org/"; - description = "An open source voxel game engine (formerly Minetest)"; + description = "Open source voxel game engine (formerly Minetest)"; license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ diff --git a/pkgs/by-name/lu/lumafly/package.nix b/pkgs/by-name/lu/lumafly/package.nix index 1f36430c1997..19278a3a9add 100644 --- a/pkgs/by-name/lu/lumafly/package.nix +++ b/pkgs/by-name/lu/lumafly/package.nix @@ -68,7 +68,7 @@ buildDotnetModule rec { ]; meta = { - description = "A cross platform mod manager for Hollow Knight written in Avalonia"; + description = "Cross platform mod manager for Hollow Knight written in Avalonia"; homepage = "https://themulhima.github.io/Lumafly/"; license = lib.licenses.gpl3Plus; mainProgram = "Lumafly"; diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index 6be8e51cc2d2..1c7805b92fcb 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -86,15 +86,15 @@ buildNpmPackage rec { --add-flags ${lib.escapeShellArg commandLineArgs} ''; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Music software based on Electron and Vue"; homepage = "https://github.com/lyswhut/lx-music-desktop"; changelog = "https://github.com/lyswhut/lx-music-desktop/releases/tag/v${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; platforms = electron.meta.platforms; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "lx-music-desktop"; - maintainers = with maintainers; [ oosquare ]; + maintainers = with lib.maintainers; [ oosquare ]; }; } diff --git a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix index f1cf3561ea2a..c924b449db26 100644 --- a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix +++ b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix @@ -100,15 +100,15 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = "https://ubuntu.com/lxd"; changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}"; - license = with licenses; [ + license = with lib.licenses; [ asl20 agpl3Plus ]; - maintainers = [ ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ly/lyra-cursors/package.nix b/pkgs/by-name/ly/lyra-cursors/package.nix index b1ce03d965fb..da7b6530080b 100644 --- a/pkgs/by-name/ly/lyra-cursors/package.nix +++ b/pkgs/by-name/ly/lyra-cursors/package.nix @@ -73,7 +73,7 @@ stdenvNoCC.mkDerivation { ''; meta = { - description = "A cursor theme inspired by macOS and based on capitaine-cursors"; + description = "Cursor theme inspired by macOS and based on capitaine-cursors"; homepage = "https://github.com/yeyushengfan258/Lyra-Cursors"; license = lib.licenses.gpl3Only; platforms = lib.platforms.all; diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix index 63113960f5ec..93de75693573 100644 --- a/pkgs/by-name/ma/mackup/package.nix +++ b/pkgs/by-name/ma/mackup/package.nix @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { disabledTests = [ "test_is_process_running" ]; meta = { - description = "A tool to keep your application settings in sync (OS X/Linux)"; + description = "Tool to keep your application settings in sync (OS X/Linux)"; changelog = "https://github.com/lra/mackup/releases/tag/${version}"; license = lib.licenses.agpl3Only; homepage = "https://github.com/lra/mackup"; diff --git a/pkgs/by-name/ma/makemkv/package.nix b/pkgs/by-name/ma/makemkv/package.nix index a664daaeb4d5..776d387ac61c 100644 --- a/pkgs/by-name/ma/makemkv/package.nix +++ b/pkgs/by-name/ma/makemkv/package.nix @@ -130,7 +130,7 @@ libsForQt5.mkDerivation { licenses.unfree licenses.lgpl21 ]; - homepage = "http://makemkv.com"; + homepage = "https://makemkv.com"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jchw ]; }; diff --git a/pkgs/by-name/ma/mangl/package.nix b/pkgs/by-name/ma/mangl/package.nix index 699babd5ae4f..53c00df623d2 100644 --- a/pkgs/by-name/ma/mangl/package.nix +++ b/pkgs/by-name/ma/mangl/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/zigalenarcic/mangl"; - description = "A graphical man page viewer based on the mandoc library"; + description = "Graphical man page viewer based on the mandoc library"; license = licenses.bsd2; maintainers = with maintainers; [ nrabulinski ]; platforms = platforms.linux; diff --git a/pkgs/by-name/ma/marble-marcher-ce/package.nix b/pkgs/by-name/ma/marble-marcher-ce/package.nix index bff892e6c6c5..47768199202b 100644 --- a/pkgs/by-name/ma/marble-marcher-ce/package.nix +++ b/pkgs/by-name/ma/marble-marcher-ce/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "A community-developed version of the original Marble Marcher - a fractal physics game"; + description = "Community-developed version of the original Marble Marcher - a fractal physics game"; mainProgram = "marble-marcher-ce"; homepage = "https://michaelmoroz.itch.io/mmce"; license = with lib.licenses; [ diff --git a/pkgs/by-name/ma/markdown-code-runner/package.nix b/pkgs/by-name/ma/markdown-code-runner/package.nix index 94615392a96c..5cf2bb999d9a 100644 --- a/pkgs/by-name/ma/markdown-code-runner/package.nix +++ b/pkgs/by-name/ma/markdown-code-runner/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage { dontUseCargoParallelTests = true; meta = { - description = "A configurable Markdown code runner that executes and optionally replaces code blocks using external commands"; + description = "Configurable Markdown code runner that executes and optionally replaces code blocks using external commands"; longDescription = '' markdown-code-runner is a command-line tool that scans Markdown files for fenced code blocks, executes them using per-language configuration, and optionally replaces the block content diff --git a/pkgs/by-name/ma/markdown-oxide/package.nix b/pkgs/by-name/ma/markdown-oxide/package.nix index 9bcb6a7cd31f..509ce2b8967b 100644 --- a/pkgs/by-name/ma/markdown-oxide/package.nix +++ b/pkgs/by-name/ma/markdown-oxide/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "markdown-oxide"; - version = "0.25.1"; + version = "0.25.2"; src = fetchFromGitHub { owner = "Feel-ix-343"; repo = "markdown-oxide"; tag = "v${finalAttrs.version}"; - hash = "sha256-hgXqJwmIpXJNIl67Jjbg5MR4PlwB5XbqnFo+rNLoqbE="; + hash = "sha256-LXFZAMxg2Mlatwx7d4ozofr7H9nrqDxai9U/oB4vkqA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-o4wn6L5PVZM0SN8kA34NOp6ogTSoCv2xiN4vfj+ptc8="; + cargoHash = "sha256-VEYwLTWnFMO6qH9qsO4/oiNeIHgoEZAF+YjeVgFOESQ="; meta = { description = "Markdown LSP server inspired by Obsidian"; diff --git a/pkgs/by-name/ma/mars-mips/package.nix b/pkgs/by-name/ma/mars-mips/package.nix index 3de083a98317..2e1474e676b9 100644 --- a/pkgs/by-name/ma/mars-mips/package.nix +++ b/pkgs/by-name/ma/mars-mips/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "An IDE for programming in MIPS assembly language intended for educational-level use"; + description = "IDE for programming in MIPS assembly language intended for educational-level use"; mainProgram = "Mars"; homepage = "https://courses.missouristate.edu/KenVollmar/MARS/"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; diff --git a/pkgs/by-name/ma/matrix-brandy/package.nix b/pkgs/by-name/ma/matrix-brandy/package.nix index 7c46b34b6c77..4d768943462d 100644 --- a/pkgs/by-name/ma/matrix-brandy/package.nix +++ b/pkgs/by-name/ma/matrix-brandy/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - homepage = "http://brandy.matrixnetwork.co.uk/"; + homepage = "https://brandy.matrixnetwork.co.uk/"; description = "Matrix Brandy BASIC VI for Linux, Windows, MacOSX"; mainProgram = "brandy"; license = licenses.gpl2Plus; diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix index fe082b6e8517..8ace6e4d0edf 100644 --- a/pkgs/by-name/ma/matrix-continuwuity/package.nix +++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix @@ -71,6 +71,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFeatures = [ "brotli_compression" + "direct_tls" "element_hacks" "gzip_compression" "media_thumbnail" @@ -87,6 +88,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ++ lib.optional enableLiburing "io_uring"; passthru = { + rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts) updateScript = nix-update-script { }; tests = { diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index a5e3f1d6f921..69acde9bad8c 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -17,19 +17,19 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.130.0"; + version = "1.131.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-/rPVJvIJfPMV+8hMenNF2dJzgemhaD2Z+/G4+6d7r1k="; + hash = "sha256-nXDVkuV5GCk0Lp4LfyiModKdO30PJ40B5mXdm5tMHQo="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-Gq3QvQSRfxRovzuvdboLCheNuMW58GFO9x2N2os+p38="; + hash = "sha256-9VJnn8aPkShqK2wYGFr+S5koIjma7VOr+LkLXwStL1E="; }; postPatch = '' diff --git a/pkgs/by-name/ma/maxcso/package.nix b/pkgs/by-name/ma/maxcso/package.nix index d0f670578d86..f0810fd126e3 100644 --- a/pkgs/by-name/ma/maxcso/package.nix +++ b/pkgs/by-name/ma/maxcso/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/unknownbrackets/maxcso"; - description = "A fast ISO to CSO compression program for use with PSP and PS2 emulators, which uses multiple algorithms for best compression ratio"; + description = "Fast ISO to CSO compression program for use with PSP and PS2 emulators, which uses multiple algorithms for best compression ratio"; maintainers = with maintainers; [ david-sawatzke ]; platforms = platforms.linux ++ platforms.darwin; license = licenses.isc; diff --git a/pkgs/by-name/mb/mbtileserver/package.nix b/pkgs/by-name/mb/mbtileserver/package.nix index 0cfdf7ac133b..4bd5f60252f0 100644 --- a/pkgs/by-name/mb/mbtileserver/package.nix +++ b/pkgs/by-name/mb/mbtileserver/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { vendorHash = "sha256-yn7LcR/DvHDSRicUnWLrFZKqZti+YQoLSk3mZkDIj10="; - meta = with lib; { + meta = { description = "Simple Go-based server for map tiles stored in mbtiles format"; mainProgram = "mbtileserver"; homepage = "https://github.com/consbio/mbtileserver"; changelog = "https://github.com/consbio/mbtileserver/blob/v${version}/CHANGELOG.md"; - license = licenses.isc; - teams = [ teams.geospatial ]; + license = lib.licenses.isc; + teams = [ lib.teams.geospatial ]; }; } diff --git a/pkgs/by-name/mb/mbusd/package.nix b/pkgs/by-name/mb/mbusd/package.nix index d3331da67f47..baba9df86a83 100644 --- a/pkgs/by-name/mb/mbusd/package.nix +++ b/pkgs/by-name/mb/mbusd/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pkg-config ]; - meta = with lib; { + meta = { description = "Modbus TCP to Modbus RTU (RS-232/485) gateway"; homepage = "https://github.com/3cky/mbusd"; changelog = "https://github.com/3cky/mbusd/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; mainProgram = "mbusd"; }; } diff --git a/pkgs/by-name/mc/mcphost/package.nix b/pkgs/by-name/mc/mcphost/package.nix index 485d91a0da40..90c81ab70dab 100644 --- a/pkgs/by-name/mc/mcphost/package.nix +++ b/pkgs/by-name/mc/mcphost/package.nix @@ -18,7 +18,7 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-yD+83cuOIBFF91Zu4Xi2g+dsP4iUOTrjBOuetowLRQw="; meta = { - description = "A CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP"; + 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 = with lib.maintainers; [ drupol ]; diff --git a/pkgs/by-name/md/mdbook-emojicodes/package.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix index 5de989c1176a..1449b7bccff4 100644 --- a/pkgs/by-name/md/mdbook-emojicodes/package.nix +++ b/pkgs/by-name/md/mdbook-emojicodes/package.nix @@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-+VVkrXvsqtizeVhfuO0U8ADfSkmovpT7DVwrz7QljU0="; - meta = with lib; { + meta = { description = "MDBook preprocessor for converting emojicodes (e.g. `: cat :`) into emojis 🐱"; mainProgram = "mdbook-emojicodes"; homepage = "https://github.com/blyxyas/mdbook-emojicodes"; changelog = "https://github.com/blyxyas/mdbook-emojicodes/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix index c790d9bff40b..0049b257893c 100644 --- a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix +++ b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix @@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-ZBGMfJA2diPvvoIXPosUs4ngXU9/GMGa4GAlKIjwm8s="; - meta = with lib; { + meta = { description = "Helpers for a mdbook i18n workflow based on Gettext"; homepage = "https://github.com/google/mdbook-i18n-helpers"; changelog = "https://github.com/google/mdbook-i18n-helpers/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ teutat3s matthiasbeyer ]; diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix index 2fe5d5c9c7da..e7ef7b1f3f28 100644 --- a/pkgs/by-name/me/melange/package.nix +++ b/pkgs/by-name/me/melange/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "melange"; - version = "0.26.0"; + version = "0.26.6"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "melange"; rev = "v${version}"; - hash = "sha256-tdZsroG5rwOr+rMA3PPv/XVK1ubqZAu3v75zEa3wQpY="; + hash = "sha256-4bH4eobaqnOYHTN8Nj0WVwNQ9FezxWsXpAjZBx9Bbas="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -26,7 +26,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-C8P750AtJX4c/7MtuETP7q5T7WJZPbV4X/0y7HgRPDI="; + vendorHash = "sha256-AOlMb39c+S4kDTXpDorXjG6iO1dct9x5kLbboRJSzv4="; subPackages = [ "." ]; diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix index a821d74fdb66..25a8ae792f28 100644 --- a/pkgs/by-name/me/melos/package.nix +++ b/pkgs/by-name/me/melos/package.nix @@ -36,7 +36,7 @@ buildDartApplication { meta = { homepage = "https://github.com/invertase/melos"; - description = "A tool for managing Dart projects with multiple packages. With IntelliJ and Vscode IDE support. Supports automated versioning, changelogs & publishing via Conventional Commits. "; + description = "Tool for managing Dart projects with multiple packages. With IntelliJ and Vscode IDE support. Supports automated versioning, changelogs & publishing via Conventional Commits. "; mainProgram = "melos"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.eymeric ]; diff --git a/pkgs/by-name/me/memogram/package.nix b/pkgs/by-name/me/memogram/package.nix index 9205ea5d3f5b..ebe7c03b0196 100644 --- a/pkgs/by-name/me/memogram/package.nix +++ b/pkgs/by-name/me/memogram/package.nix @@ -4,18 +4,18 @@ fetchFromGitHub, nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "memogram"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "usememos"; repo = "telegram-integration"; - tag = "v${version}"; - hash = "sha256-nhNVo8Bp/g/IWyj548BQlyxPy1t3DDCyLmInDwQCH4c="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q3C1Ehs2TMeKsnjcNiL4HK08sCeWXjqVHiE55iHs0g8="; }; - vendorHash = "sha256-g8mAG5l2juOVaem2xk+pPVzKYNJHbWbkS/D0LwF+XdM="; + vendorHash = "sha256-3NdWhckcXUEeKLz2G7xsHlbIBViyvFDCQzNVvaDi48U="; subPackages = [ "bin/memogram" ]; @@ -24,10 +24,10 @@ buildGoModule rec { meta = { description = "Easy to use integration service for syncing messages and images from a Telegram bot into your Memos"; homepage = "https://github.com/usememos/telegram-integration"; - changelog = "https://github.com/usememos/telegram-integration/releases/v${version}"; + changelog = "https://github.com/usememos/telegram-integration/releases/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ merrkry ]; mainProgram = "memogram"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/me/merkaartor/package.nix b/pkgs/by-name/me/merkaartor/package.nix index 8d3abd715a43..c56f9ce4b8a1 100644 --- a/pkgs/by-name/me/merkaartor/package.nix +++ b/pkgs/by-name/me/merkaartor/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "OpenStreetMap editor"; - homepage = "http://merkaartor.be/"; + homepage = "https://merkaartor.be/"; license = lib.licenses.gpl2Plus; mainProgram = "merkaartor"; maintainers = with lib.maintainers; [ sikmir ]; diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix index bd8c30791060..2c67abb0968a 100644 --- a/pkgs/by-name/me/mesonlsp/package.nix +++ b/pkgs/by-name/me/mesonlsp/package.nix @@ -160,7 +160,7 @@ stdenv'.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "An unofficial, unendorsed language server for Meson written in C++"; + description = "Unofficial, unendorsed language server for Meson written in C++"; homepage = "https://github.com/JCWasmx86/mesonlsp"; changelog = "https://github.com/JCWasmx86/mesonlsp/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3Plus; diff --git a/pkgs/by-name/me/metals/package.nix b/pkgs/by-name/me/metals/package.nix index 6a97121ff564..a913e17d150b 100644 --- a/pkgs/by-name/me/metals/package.nix +++ b/pkgs/by-name/me/metals/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "metals"; - version = "1.5.3"; + version = "1.6.0"; deps = stdenv.mkDerivation { name = "metals-deps-${finalAttrs.version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-jxrAtlD+s3yjcDWYLoN7mr8RozutItCv8dt28/UoVjk="; + outputHash = "sha256-+6u/nnaoCBEQCwhvPs1WQzMnppz7KEWWd1TlzbKYpAU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mf/mftrace/package.nix b/pkgs/by-name/mf/mftrace/package.nix index a384846e7ec1..8f387f970bb3 100644 --- a/pkgs/by-name/mf/mftrace/package.nix +++ b/pkgs/by-name/mf/mftrace/package.nix @@ -20,7 +20,7 @@ - fontforge = null (limited functionality) */ -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "mftrace"; version = "1.2.20"; @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: rec { src = fetchFromGitHub { owner = "hanwen"; repo = "mftrace"; - rev = "release/${version}"; + rev = "release/${finalAttrs.version}"; sha256 = "02ik25aczkbi10jrjlnxby3fmixxrwm2k5r4fkfif3bjfym7nqbc"; }; diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 1ea7711b30a7..ad4336297b5a 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "mihomo-party"; - version = "1.7.3"; + version = "1.7.4"; src = let @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { fetchurl { url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-${arch}.deb"; hash = selectSystem { - x86_64-linux = "sha256-IzOW36nJS8SBc3o6/E6eGdBi9I7JApmWydk1x0gEWUw="; - aarch64-linux = "sha256-AKOATvsAqX1CkoQrMQzVlbf2x+BzIP4bcj49vPRIkEg="; + x86_64-linux = "sha256-pQcDW9ztCTIS5dbmPuvig32cXWfzYiHksa3Jv/O5J7E="; + aarch64-linux = "sha256-YHLHJ05sdMj/Wz/WAEianbDIUz9X+AER2wm9T/QHRXI="; }; }; diff --git a/pkgs/by-name/mi/min/package.nix b/pkgs/by-name/mi/min/package.nix index 60d1b11404d1..5897d391e42a 100644 --- a/pkgs/by-name/mi/min/package.nix +++ b/pkgs/by-name/mi/min/package.nix @@ -34,7 +34,7 @@ buildNimPackage (finalAttrs: { NIX_LDFLAGS = [ "-lpcre" ]; meta = { - description = "A functional, concatenative programming language with a minimalist syntax"; + description = "Functional, concatenative programming language with a minimalist syntax"; homepage = "https://min-lang.org/"; changelog = "https://github.com/h3rald/min/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/mi/miniaudio/package.nix b/pkgs/by-name/mi/miniaudio/package.nix index 5f591c1cecba..adece2e438ce 100644 --- a/pkgs/by-name/mi/miniaudio/package.nix +++ b/pkgs/by-name/mi/miniaudio/package.nix @@ -2,32 +2,52 @@ lib, stdenv, fetchFromGitHub, + testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "miniaudio"; version = "0.11.22"; src = fetchFromGitHub { owner = "mackron"; repo = "miniaudio"; - rev = version; + rev = finalAttrs.version; hash = "sha256-o/7sfBcrhyXEakccOAogQqm8dO4Szj1QSpaIHg6OSt4="; }; - installPhase = '' - mkdir -p $out - cp -r $src/* $out/ + postInstall = '' + mkdir -p $out/include + mkdir -p $out/lib/pkgconfig + + cp $src/miniaudio.h $out/include + ln -s $out/include/miniaudio.h $out + + cp -r $src/extras $out/ + + cat <$out/lib/pkgconfig/miniaudio.pc + prefix=$out + includedir=$out/include + + Name: miniaudio + Description: An audio playback and capture library in a single source file. + Version: $version + Cflags: -I$out/include + Libs: -lm -lpthread -latomic + EOF ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Single header audio playback and capture library written in C"; homepage = "https://github.com/mackron/miniaudio"; - changelog = "https://github.com/mackron/miniaudio/blob/${src.rev}/CHANGES.md"; + changelog = "https://github.com/mackron/miniaudio/blob/${finalAttrs.version}/CHANGES.md"; license = with licenses; [ unlicense # or mit0 ]; maintainers = [ maintainers.jansol ]; + pkgConfigModules = [ "miniaudio" ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index d32e1f6df35d..dc66bc77a164 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.142.2", + "version": "3.143.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.2/mirrord_linux_x86_64", - "hash": "sha256-lTY28QpoC7/CosXRHFwTdwL4Jd5OKGMaaSPaVrUnHco=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.143.0/mirrord_linux_x86_64", + "hash": "sha256-0wu90iNAP7OQYENHIPsTSPk8Ko2jK0uBdZWe2d1URS8=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.2/mirrord_linux_aarch64", - "hash": "sha256-svFAYPSLM9ykk8hTwU6ITmB5uBewGG8rHy97R95D02w=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.143.0/mirrord_linux_aarch64", + "hash": "sha256-MWQ5k9Tk6q7f5QQ3Og9O5dyEDd+wNi3FFYqbFpa7uxM=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.2/mirrord_mac_universal", - "hash": "sha256-hHCDq+rcJhuF1lnJTXfM4jcBenDHz5YTSX1tYptZREg=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.143.0/mirrord_mac_universal", + "hash": "sha256-GdwZWtNTuiUf+DcuZkVUm0YVH0EKfT6V6clcv1E7BxY=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.2/mirrord_mac_universal", - "hash": "sha256-hHCDq+rcJhuF1lnJTXfM4jcBenDHz5YTSX1tYptZREg=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.143.0/mirrord_mac_universal", + "hash": "sha256-GdwZWtNTuiUf+DcuZkVUm0YVH0EKfT6V6clcv1E7BxY=" } } } diff --git a/pkgs/by-name/mi/mitm-cache/package.nix b/pkgs/by-name/mi/mitm-cache/package.nix index 9c4e89bf3d55..dbef2c58b7e8 100644 --- a/pkgs/by-name/mi/mitm-cache/package.nix +++ b/pkgs/by-name/mi/mitm-cache/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { passthru.fetch = callPackage ./fetch.nix { }; meta = with lib; { - description = "A MITM caching proxy for use in nixpkgs"; + description = "MITM caching proxy for use in nixpkgs"; homepage = "https://github.com/chayleaf/mitm-cache#readme"; license = licenses.mit; maintainers = with maintainers; [ chayleaf ]; diff --git a/pkgs/by-name/mk/mkbrr/package.nix b/pkgs/by-name/mk/mkbrr/package.nix index 99010243e484..020a2a0c9f2b 100644 --- a/pkgs/by-name/mk/mkbrr/package.nix +++ b/pkgs/by-name/mk/mkbrr/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "mkbrr"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "autobrr"; repo = "mkbrr"; tag = "v${finalAttrs.version}"; - hash = "sha256-v5MkbsXbS37axZTrp7YTNCU5/uqVW1vnJu+F5hxk3bI="; + hash = "sha256-gUIX271eaG15329pLnZ8QnZD7BrdCk+cWs43uUzKxOE="; }; vendorHash = "sha256-G8WM5x99UZfAZUkE5W37Ogx/OKk8JypPzGBrIuBOFNo="; diff --git a/pkgs/by-name/mm/mmsd/package.nix b/pkgs/by-name/mm/mmsd/package.nix deleted file mode 100644 index f52ebf4cdcef..000000000000 --- a/pkgs/by-name/mm/mmsd/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - autoreconfHook, - pkg-config, - glib, - dbus, -}: - -stdenv.mkDerivation { - pname = "mmsd"; - version = "unstable-2019-07-15"; - - src = fetchzip { - url = "https://git.kernel.org/pub/scm/network/ofono/mmsd.git/snapshot/mmsd-f4b8b32477a411180be1823fdc460b4f7e1e3c9c.tar.gz"; - sha256 = "0hcnpyhsi7b5m825dhnwbp65yi0961wi8mipzdvaw5nc693xv15b"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - glib - dbus - ]; - - doCheck = true; - - meta = with lib; { - description = "Multimedia Messaging Service Daemon"; - homepage = "https://01.org/ofono"; - license = licenses.gpl2Only; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/mm/mmseqs2/package.nix b/pkgs/by-name/mm/mmseqs2/package.nix index dfbfc21be257..e4e558124f97 100644 --- a/pkgs/by-name/mm/mmseqs2/package.nix +++ b/pkgs/by-name/mm/mmseqs2/package.nix @@ -85,13 +85,13 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "Ultra fast and sensitive sequence search and clustering suite"; mainProgram = "mmseqs"; homepage = "https://mmseqs.com/"; - changelog = "https://github.com/soedinglab/MMseqs2/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; - platforms = platforms.unix; + changelog = "https://github.com/soedinglab/MMseqs2/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/mm/mmtc/package.nix b/pkgs/by-name/mm/mmtc/package.nix index b7fbabd2f3f8..978efda99512 100644 --- a/pkgs/by-name/mm/mmtc/package.nix +++ b/pkgs/by-name/mm/mmtc/package.nix @@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec { GEN_ARTIFACTS = "artifacts"; - meta = with lib; { + meta = { description = "Minimal mpd terminal client that aims to be simple yet highly configurable"; homepage = "https://github.com/figsoda/mmtc"; changelog = "https://github.com/figsoda/mmtc/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "mmtc"; }; } diff --git a/pkgs/by-name/mo/moonpalace/package.nix b/pkgs/by-name/mo/moonpalace/package.nix index a317b5bc3b29..a661020ee17b 100644 --- a/pkgs/by-name/mo/moonpalace/package.nix +++ b/pkgs/by-name/mo/moonpalace/package.nix @@ -29,7 +29,7 @@ buildGoModule rec { }; meta = { - description = "An API debugging tool provided by Moonshot AI"; + description = "API debugging tool provided by Moonshot AI"; homepage = "https://github.com/MoonshotAI/moonpalace"; changelog = "https://github.com/MoonshotAI/moonpalace/releases/tag/v${version}"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/mo/mov-cli/mov-cli-test.nix b/pkgs/by-name/mo/mov-cli/mov-cli-test.nix index 7c34524eabcd..9819ad9ce4ab 100644 --- a/pkgs/by-name/mo/mov-cli/mov-cli-test.nix +++ b/pkgs/by-name/mo/mov-cli/mov-cli-test.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; meta = { - description = "A mov-cli plugin that let's you test mov-cli's capabilities by watching free films and animations in the creative commons"; + description = "Mov-cli plugin that let's you test mov-cli's capabilities by watching free films and animations in the creative commons"; homepage = "https://github.com/mov-cli/mov-cli-test"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ youhaveme9 ]; diff --git a/pkgs/by-name/mo/mozhi/package.nix b/pkgs/by-name/mo/mozhi/package.nix new file mode 100644 index 000000000000..0f5fdeb998aa --- /dev/null +++ b/pkgs/by-name/mo/mozhi/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildGoModule, + fetchFromGitea, + unstableGitUpdater, +}: +buildGoModule { + pname = "mozhi"; + version = "0-unstable-2025-04-14"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "aryak"; + repo = "mozhi"; + rev = "c2c14988c09e6c5fae5a8ac59c07a650f0997a5a"; + hash = "sha256-xJw9BkdKlN1VToKyDlkW8UUZB94gzD9nclNciDmVIkk="; + }; + + vendorHash = "sha256-ptwP+ZuuzxRpIuNDoXnAML1KYEh9zTBcOs9YTI8z63A="; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://codeberg.org/aryak/mozhi"; + description = "Alternative-frontend for many translation engines, fork of SimplyTranslate"; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.ryand56 ]; + mainProgram = "mozhi"; + }; +} diff --git a/pkgs/by-name/mp/mpv-subs-popout/package.nix b/pkgs/by-name/mp/mpv-subs-popout/package.nix index b4831561b7af..f02963827731 100644 --- a/pkgs/by-name/mp/mpv-subs-popout/package.nix +++ b/pkgs/by-name/mp/mpv-subs-popout/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; meta = { - description = "A little application that makes it possible to display mpv's subs anywhere you want. With translation features"; + description = "Little application that makes it possible to display mpv's subs anywhere you want. With translation features"; homepage = "https://github.com/sdaqo/mpv-subs-popout"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.sdaqo ]; diff --git a/pkgs/by-name/mq/mqtt-benchmark/package.nix b/pkgs/by-name/mq/mqtt-benchmark/package.nix index b7dbca6aa693..85bee9c107e9 100644 --- a/pkgs/by-name/mq/mqtt-benchmark/package.nix +++ b/pkgs/by-name/mq/mqtt-benchmark/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { vendorHash = "sha256-ZN5tNDIisbhMMOA2bVJnE96GPdZ54HXTneFQewwJmHI="; - meta = with lib; { + meta = { description = "MQTT broker benchmarking tool"; homepage = "https://github.com/krylovsk/mqtt-benchmark"; changelog = "https://github.com/krylovsk/mqtt-benchmark/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "mqtt-benchmark"; }; } diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix index 75ff2b1b798a..c83aee844f79 100644 --- a/pkgs/by-name/mq/mqtt-explorer/package.nix +++ b/pkgs/by-name/mq/mqtt-explorer/package.nix @@ -168,12 +168,12 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { - description = "An all-round MQTT client that provides a structured topic overview"; + meta = { + description = "All-round MQTT client that provides a structured topic overview"; homepage = "https://github.com/thomasnordquist/MQTT-Explorer"; changelog = "https://github.com/thomasnordquist/MQTT-Explorer/releases/tag/v${version}"; - license = licenses.cc-by-nd-40; - maintainers = with maintainers; [ tsandrini ]; + license = lib.licenses.cc-by-nd-40; + maintainers = with lib.maintainers; [ tsandrini ]; platforms = electron.meta.platforms; mainProgram = "mqtt-explorer"; }; diff --git a/pkgs/by-name/mq/mqttx/package.nix b/pkgs/by-name/mq/mqttx/package.nix index a7fdd5940e1f..7c9328425f5d 100644 --- a/pkgs/by-name/mq/mqttx/package.nix +++ b/pkgs/by-name/mq/mqttx/package.nix @@ -48,13 +48,13 @@ appimageTools.wrapType2 { --replace-fail 'Exec=AppRun' 'Exec=${pname}' ''; - meta = with lib; { + meta = { description = "Powerful cross-platform MQTT 5.0 Desktop, CLI, and WebSocket client tools"; homepage = "https://mqttx.app/"; changelog = "https://github.com/emqx/MQTTX/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ gaelreyrol ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ gaelreyrol ]; mainProgram = "mqttx"; }; } diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix index 6f2613b10ca3..20dde2ec5641 100644 --- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix @@ -12,14 +12,14 @@ makeDesktopItem, nix-update-script, }: -buildDotnetModule (finalAttrs: rec { +buildDotnetModule (finalAttrs: { pname = "msbuild-structured-log-viewer"; version = "2.2.490"; src = fetchFromGitHub { owner = "KirillOsenkov"; repo = "MSBuildStructuredLog"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-VJun6bs47NKj90e/6ZGp66x+MG1R/qxqrn2L1bVkdHY="; }; @@ -48,10 +48,10 @@ buildDotnetModule (finalAttrs: rec { postFixup = '' - wrapDotnetProgram $out/lib/${finalAttrs.pname}/StructuredLogViewer.Avalonia $out/bin/${meta.mainProgram} + wrapDotnetProgram $out/lib/msbuild-structured-log-viewer/StructuredLogViewer.Avalonia $out/bin/${finalAttrs.meta.mainProgram} '' + lib.optionalString stdenv.hostPlatform.isLinux '' - install -Dm444 $src/src/StructuredLogViewer/icons/msbuild-structured-log-viewer.png $out/share/icons/hicolor/32x32/apps/${finalAttrs.pname}.png + install -Dm444 $src/src/StructuredLogViewer/icons/msbuild-structured-log-viewer.png $out/share/icons/hicolor/32x32/apps/msbuild-structured-log-viewer.png '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/StructuredLogViewer.Avalonia/Info.plist \ @@ -60,15 +60,15 @@ buildDotnetModule (finalAttrs: rec { install -Dm444 src/StructuredLogViewer.Avalonia/Info.plist $out/Applications/StructuredLogViewer.app/Contents/Info.plist install -Dm444 src/StructuredLogViewer.Avalonia/StructuredLogViewer.icns $out/Applications/StructuredLogViewer.app/Contents/Resources/StructuredLogViewer.icns mkdir -p $out/Applications/StructuredLogViewer.app/Contents/MacOS - ln -s $out/bin/${meta.mainProgram} $out/Applications/StructuredLogViewer.app/Contents/MacOS/StructuredLogViewer.Avalonia + ln -s $out/bin/${finalAttrs.meta.mainProgram} $out/Applications/StructuredLogViewer.app/Contents/MacOS/StructuredLogViewer.Avalonia ''; desktopItems = makeDesktopItem { - name = finalAttrs.pname; + name = "msbuild-structured-log-viewer"; desktopName = "MSBuild Structured Log Viewer"; comment = finalAttrs.meta.description; - icon = finalAttrs.pname; - exec = meta.mainProgram; + icon = "msbuild-structured-log-viewer"; + exec = finalAttrs.meta.mainProgram; categories = [ "Development" ]; }; diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix index 70077d7783c9..ec192cdd1df4 100644 --- a/pkgs/by-name/mt/mtail/package.nix +++ b/pkgs/by-name/mt/mtail/package.nix @@ -3,20 +3,25 @@ stdenv, buildGoModule, fetchFromGitHub, + gotools, }: buildGoModule rec { pname = "mtail"; - version = "3.0.23"; + version = "3.2.4"; src = fetchFromGitHub { owner = "jaqx0r"; repo = "mtail"; rev = "v${version}"; - hash = "sha256-B/to05/qORplhNyz0s7t/WgpmOJ6UZoKnmJfqaf6Htc="; + hash = "sha256-3ox+EXd5/Rh3N/7GbX+JUmH4C9j/Er+REkUHZndTxw0="; }; - vendorHash = "sha256-jE1tcZJ7TaMC3yegBHE3Zad9sF0EfbHxDA8ffehNL4U="; + vendorHash = "sha256-7EQFO7dlVhBwHdY6c3WmxJo4WdCUJbWKw5P4fL6jBsA="; + + nativeBuildInputs = [ + gotools # goyacc + ]; ldflags = [ "-X=main.Branch=main" @@ -27,11 +32,20 @@ buildGoModule rec { # fails on darwin with: write unixgram -> /rsyncd.log: write: message too long doCheck = !stdenv.hostPlatform.isDarwin; - meta = with lib; { + checkFlags = [ + # can only be executed under bazel + "-skip=TestExecMtail" + ]; + + preBuild = '' + GOOS= GOARCH= go generate ./... + ''; + + meta = { description = "Tool for extracting metrics from application logs"; homepage = "https://github.com/jaqx0r/mtail"; - license = licenses.asl20; - maintainers = with maintainers; [ nickcao ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nickcao ]; mainProgram = "mtail"; }; } diff --git a/pkgs/by-name/mt/mtr-exporter/package.nix b/pkgs/by-name/mt/mtr-exporter/package.nix index 3bc1d67f2f5a..4a7f1fae3d7a 100644 --- a/pkgs/by-name/mt/mtr-exporter/package.nix +++ b/pkgs/by-name/mt/mtr-exporter/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mtr-exporter"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mgumz"; repo = "mtr-exporter"; rev = version; - hash = "sha256-+myQg27TGclU+SfU8oO+DvXYqc/8sWE2zRK6fL2DhwM="; + hash = "sha256-GkTkL72ZdxeCMG24rjGx8vWt5GQqrTXNxTDpQ81ite8="; }; vendorHash = null; diff --git a/pkgs/by-name/mu/mu/package.nix b/pkgs/by-name/mu/mu/package.nix index 26193a8a1246..50e8a88825b6 100644 --- a/pkgs/by-name/mu/mu/package.nix +++ b/pkgs/by-name/mu/mu/package.nix @@ -89,17 +89,17 @@ stdenv.mkDerivation rec { # Tests need a UTF-8 aware locale configured env.LANG = "C.UTF-8"; - meta = with lib; { + meta = { description = "Collection of utilities for indexing and searching Maildirs"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.djcbsoftware.nl/code/mu/"; changelog = "https://github.com/djcb/mu/releases/tag/v${version}"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ antono chvp peterhoeg ]; mainProgram = "mu"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/mu/mubeng/package.nix b/pkgs/by-name/mu/mubeng/package.nix index 4a3f8e010157..35fb5632b894 100644 --- a/pkgs/by-name/mu/mubeng/package.nix +++ b/pkgs/by-name/mu/mubeng/package.nix @@ -23,12 +23,12 @@ buildGoModule rec { "-X=ktbs.dev/mubeng/common.Version=${version}" ]; - meta = with lib; { + meta = { description = "Proxy checker and IP rotator"; homepage = "https://github.com/kitabisa/mubeng"; changelog = "https://github.com/kitabisa/mubeng/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "mubeng"; }; } diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index 3723c584bff7..b746678f57bc 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { vendorHash = "sha256-scma8hrm8e/KU2x+TIGOvaUk6nYxKIZ1eaGqs/W2I0I="; - meta = with lib; { + meta = { description = "Website link checker which scrapes and inspects all pages in a website recursively"; homepage = "https://github.com/raviqqe/muffet"; changelog = "https://github.com/raviqqe/muffet/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "muffet"; }; } diff --git a/pkgs/by-name/mu/multipass/pubspec.lock.json b/pkgs/by-name/mu/multipass/pubspec.lock.json index a6afc3de0299..a96a27a386ef 100644 --- a/pkgs/by-name/mu/multipass/pubspec.lock.json +++ b/pkgs/by-name/mu/multipass/pubspec.lock.json @@ -1 +1 @@ -{"packages":{"args":{"dependency":"transitive","description":{"name":"args","sha256":"7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a","url":"https://pub.dev"},"source":"hosted","version":"2.5.0"},"asn1lib":{"dependency":"transitive","description":{"name":"asn1lib","sha256":"6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70","url":"https://pub.dev"},"source":"hosted","version":"1.5.5"},"async":{"dependency":"direct main","description":{"name":"async","sha256":"947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c","url":"https://pub.dev"},"source":"hosted","version":"2.11.0"},"basics":{"dependency":"direct main","description":{"name":"basics","sha256":"41ff8aded84ae174d1df5cce0bcac3ab9070caac9f7da35fd2cc638dfee6163f","url":"https://pub.dev"},"source":"hosted","version":"0.10.0"},"boolean_selector":{"dependency":"transitive","description":{"name":"boolean_selector","sha256":"6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"built_collection":{"dependency":"direct main","description":{"name":"built_collection","sha256":"376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"characters":{"dependency":"transitive","description":{"name":"characters","sha256":"04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"clock":{"dependency":"transitive","description":{"name":"clock","sha256":"cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"collection":{"dependency":"direct main","description":{"name":"collection","sha256":"ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a","url":"https://pub.dev"},"source":"hosted","version":"1.18.0"},"convert":{"dependency":"transitive","description":{"name":"convert","sha256":"0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592","url":"https://pub.dev"},"source":"hosted","version":"3.1.1"},"cross_file":{"dependency":"transitive","description":{"name":"cross_file","sha256":"7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670","url":"https://pub.dev"},"source":"hosted","version":"0.3.4+2"},"crypto":{"dependency":"transitive","description":{"name":"crypto","sha256":"ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27","url":"https://pub.dev"},"source":"hosted","version":"3.0.5"},"dartssh2":{"dependency":"direct main","description":{"path":".","ref":"2.10.0+mp","resolved-ref":"e7c66932cf7ca8eba083268fa3230222c8cd0722","url":"https://github.com/andrei-toterman/dartssh2.git"},"source":"git","version":"2.10.0"},"equatable":{"dependency":"transitive","description":{"name":"equatable","sha256":"c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2","url":"https://pub.dev"},"source":"hosted","version":"2.0.5"},"extended_text":{"dependency":"direct main","description":{"name":"extended_text","sha256":"b0cdd240b4ddf61d18d7e33e7775195971f2d033bd69706fa897446dc96c3b81","url":"https://pub.dev"},"source":"hosted","version":"14.1.0"},"extended_text_library":{"dependency":"transitive","description":{"name":"extended_text_library","sha256":"55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829","url":"https://pub.dev"},"source":"hosted","version":"12.0.0"},"ffi":{"dependency":"direct main","description":{"name":"ffi","sha256":"16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6","url":"https://pub.dev"},"source":"hosted","version":"2.1.3"},"file":{"dependency":"transitive","description":{"name":"file","sha256":"5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"file_selector":{"dependency":"direct main","description":{"name":"file_selector","sha256":"5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"file_selector_android":{"dependency":"transitive","description":{"name":"file_selector_android","sha256":"8bcc3af859e9d47fab9c7dc315537406511a894ab578e198bd8f9ed745ea5a01","url":"https://pub.dev"},"source":"hosted","version":"0.5.1+2"},"file_selector_ios":{"dependency":"transitive","description":{"name":"file_selector_ios","sha256":"38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb","url":"https://pub.dev"},"source":"hosted","version":"0.5.3"},"file_selector_linux":{"dependency":"transitive","description":{"name":"file_selector_linux","sha256":"045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492","url":"https://pub.dev"},"source":"hosted","version":"0.9.2+1"},"file_selector_macos":{"dependency":"transitive","description":{"name":"file_selector_macos","sha256":"f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385","url":"https://pub.dev"},"source":"hosted","version":"0.9.4"},"file_selector_platform_interface":{"dependency":"transitive","description":{"name":"file_selector_platform_interface","sha256":"a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b","url":"https://pub.dev"},"source":"hosted","version":"2.6.2"},"file_selector_web":{"dependency":"transitive","description":{"name":"file_selector_web","sha256":"c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+2"},"file_selector_windows":{"dependency":"transitive","description":{"name":"file_selector_windows","sha256":"2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+2"},"fixnum":{"dependency":"transitive","description":{"name":"fixnum","sha256":"25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"fl_chart":{"dependency":"direct main","description":{"name":"fl_chart","sha256":"94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef","url":"https://pub.dev"},"source":"hosted","version":"0.69.0"},"flutter":{"dependency":"direct main","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_lints":{"dependency":"direct dev","description":{"name":"flutter_lints","sha256":"5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"flutter_riverpod":{"dependency":"direct main","description":{"name":"flutter_riverpod","sha256":"0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"flutter_svg":{"dependency":"direct main","description":{"name":"flutter_svg","sha256":"7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2","url":"https://pub.dev"},"source":"hosted","version":"2.0.10+1"},"flutter_web_plugins":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"fpdart":{"dependency":"direct main","description":{"name":"fpdart","sha256":"7413acc5a6569a3fe8277928fc7487f3198530f0c4e635d0baef199ea36e8ee9","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"google_identity_services_web":{"dependency":"transitive","description":{"name":"google_identity_services_web","sha256":"5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6","url":"https://pub.dev"},"source":"hosted","version":"0.3.1+4"},"googleapis_auth":{"dependency":"transitive","description":{"name":"googleapis_auth","sha256":"befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938","url":"https://pub.dev"},"source":"hosted","version":"1.6.0"},"grpc":{"dependency":"direct main","description":{"name":"grpc","sha256":"5b99b7a420937d4361ece68b798c9af8e04b5bc128a7859f2a4be87427694813","url":"https://pub.dev"},"source":"hosted","version":"4.0.1"},"hotkey_manager":{"dependency":"direct main","description":{"name":"hotkey_manager","sha256":"06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd","url":"https://pub.dev"},"source":"hosted","version":"0.2.3"},"hotkey_manager_linux":{"dependency":"direct overridden","description":{"path":"packages/hotkey_manager_linux","ref":"no-cooked-accel","resolved-ref":"7e5a662615fbc9f077c1567fd7a66ec34ad52b5e","url":"https://github.com/andrei-toterman/hotkey_manager.git"},"source":"git","version":"0.2.0"},"hotkey_manager_macos":{"dependency":"transitive","description":{"name":"hotkey_manager_macos","sha256":"03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_platform_interface":{"dependency":"transitive","description":{"name":"hotkey_manager_platform_interface","sha256":"98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_windows":{"dependency":"transitive","description":{"name":"hotkey_manager_windows","sha256":"0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"http":{"dependency":"transitive","description":{"name":"http","sha256":"b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010","url":"https://pub.dev"},"source":"hosted","version":"1.2.2"},"http2":{"dependency":"transitive","description":{"name":"http2","sha256":"9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"http_parser":{"dependency":"transitive","description":{"name":"http_parser","sha256":"2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b","url":"https://pub.dev"},"source":"hosted","version":"4.0.2"},"intl":{"dependency":"direct main","description":{"name":"intl","sha256":"99f282cb0e02edcbbf8c6b3bbc7c90b65635156c412e58f3975a7e55284ce685","url":"https://pub.dev"},"source":"hosted","version":"0.20.0"},"js":{"dependency":"transitive","description":{"name":"js","sha256":"c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf","url":"https://pub.dev"},"source":"hosted","version":"0.7.1"},"json_annotation":{"dependency":"transitive","description":{"name":"json_annotation","sha256":"1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1","url":"https://pub.dev"},"source":"hosted","version":"4.9.0"},"lints":{"dependency":"transitive","description":{"name":"lints","sha256":"3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"local_notifier":{"dependency":"direct main","description":{"name":"local_notifier","sha256":"f6cfc933c6fbc961f4e52b5c880f68e41b2d3cd29aad557cc654fd211093a025","url":"https://pub.dev"},"source":"hosted","version":"0.1.6"},"logger":{"dependency":"direct main","description":{"name":"logger","sha256":"697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"matcher":{"dependency":"transitive","description":{"name":"matcher","sha256":"d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb","url":"https://pub.dev"},"source":"hosted","version":"0.12.16+1"},"material_color_utilities":{"dependency":"transitive","description":{"name":"material_color_utilities","sha256":"f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec","url":"https://pub.dev"},"source":"hosted","version":"0.11.1"},"meta":{"dependency":"transitive","description":{"name":"meta","sha256":"bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7","url":"https://pub.dev"},"source":"hosted","version":"1.15.0"},"path":{"dependency":"transitive","description":{"name":"path","sha256":"087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af","url":"https://pub.dev"},"source":"hosted","version":"1.9.0"},"path_parsing":{"dependency":"transitive","description":{"name":"path_parsing","sha256":"e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf","url":"https://pub.dev"},"source":"hosted","version":"1.0.1"},"path_provider":{"dependency":"direct main","description":{"name":"path_provider","sha256":"fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"path_provider_android":{"dependency":"transitive","description":{"name":"path_provider_android","sha256":"6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7","url":"https://pub.dev"},"source":"hosted","version":"2.2.10"},"path_provider_foundation":{"dependency":"transitive","description":{"name":"path_provider_foundation","sha256":"f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"path_provider_linux":{"dependency":"transitive","description":{"name":"path_provider_linux","sha256":"f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279","url":"https://pub.dev"},"source":"hosted","version":"2.2.1"},"path_provider_platform_interface":{"dependency":"transitive","description":{"name":"path_provider_platform_interface","sha256":"88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"path_provider_windows":{"dependency":"transitive","description":{"name":"path_provider_windows","sha256":"bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"petitparser":{"dependency":"transitive","description":{"name":"petitparser","sha256":"c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27","url":"https://pub.dev"},"source":"hosted","version":"6.0.2"},"pinenacl":{"dependency":"transitive","description":{"name":"pinenacl","sha256":"57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf","url":"https://pub.dev"},"source":"hosted","version":"0.6.0"},"platform":{"dependency":"transitive","description":{"name":"platform","sha256":"9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65","url":"https://pub.dev"},"source":"hosted","version":"3.1.5"},"plugin_platform_interface":{"dependency":"transitive","description":{"name":"plugin_platform_interface","sha256":"4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02","url":"https://pub.dev"},"source":"hosted","version":"2.1.8"},"pointycastle":{"dependency":"transitive","description":{"name":"pointycastle","sha256":"4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe","url":"https://pub.dev"},"source":"hosted","version":"3.9.1"},"protobuf":{"dependency":"direct main","description":{"name":"protobuf","sha256":"68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d","url":"https://pub.dev"},"source":"hosted","version":"3.1.0"},"quiver":{"dependency":"transitive","description":{"name":"quiver","sha256":"ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"riverpod":{"dependency":"transitive","description":{"name":"riverpod","sha256":"f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"rxdart":{"dependency":"direct main","description":{"name":"rxdart","sha256":"5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962","url":"https://pub.dev"},"source":"hosted","version":"0.28.0"},"screen_retriever":{"dependency":"transitive","description":{"name":"screen_retriever","sha256":"6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90","url":"https://pub.dev"},"source":"hosted","version":"0.1.9"},"shared_preferences":{"dependency":"direct main","description":{"name":"shared_preferences","sha256":"746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_android":{"dependency":"transitive","description":{"name":"shared_preferences_android","sha256":"480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_foundation":{"dependency":"transitive","description":{"name":"shared_preferences_foundation","sha256":"c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f","url":"https://pub.dev"},"source":"hosted","version":"2.5.2"},"shared_preferences_linux":{"dependency":"transitive","description":{"name":"shared_preferences_linux","sha256":"580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_platform_interface":{"dependency":"transitive","description":{"name":"shared_preferences_platform_interface","sha256":"57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_web":{"dependency":"transitive","description":{"name":"shared_preferences_web","sha256":"d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e","url":"https://pub.dev"},"source":"hosted","version":"2.4.2"},"shared_preferences_windows":{"dependency":"transitive","description":{"name":"shared_preferences_windows","sha256":"94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"sky_engine":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.99"},"source_span":{"dependency":"transitive","description":{"name":"source_span","sha256":"53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c","url":"https://pub.dev"},"source":"hosted","version":"1.10.0"},"sprintf":{"dependency":"transitive","description":{"name":"sprintf","sha256":"1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"stack_trace":{"dependency":"transitive","description":{"name":"stack_trace","sha256":"9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377","url":"https://pub.dev"},"source":"hosted","version":"1.12.0"},"state_notifier":{"dependency":"transitive","description":{"name":"state_notifier","sha256":"b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"stream_channel":{"dependency":"transitive","description":{"name":"stream_channel","sha256":"ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"string_scanner":{"dependency":"transitive","description":{"name":"string_scanner","sha256":"688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"synchronized":{"dependency":"direct main","description":{"name":"synchronized","sha256":"69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225","url":"https://pub.dev"},"source":"hosted","version":"3.3.0+3"},"term_glyph":{"dependency":"transitive","description":{"name":"term_glyph","sha256":"a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"test_api":{"dependency":"transitive","description":{"name":"test_api","sha256":"664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c","url":"https://pub.dev"},"source":"hosted","version":"0.7.3"},"tray_menu":{"dependency":"direct main","description":{"path":".","ref":"7c1394c","resolved-ref":"7c1394c46aac4598ebdd3fa6670e4ea2904a4d31","url":"https://github.com/andrei-toterman/tray_menu.git"},"source":"git","version":"0.0.1"},"two_dimensional_scrollables":{"dependency":"direct main","description":{"name":"two_dimensional_scrollables","sha256":"74ce1f35a8c74370b322049c9d00bf098938661e9f67054eae0f618e6dc0cb62","url":"https://pub.dev"},"source":"hosted","version":"0.3.2"},"typed_data":{"dependency":"transitive","description":{"name":"typed_data","sha256":"facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c","url":"https://pub.dev"},"source":"hosted","version":"1.3.2"},"uni_platform":{"dependency":"transitive","description":{"name":"uni_platform","sha256":"e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84","url":"https://pub.dev"},"source":"hosted","version":"0.1.3"},"url_launcher":{"dependency":"direct main","description":{"name":"url_launcher","sha256":"21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3","url":"https://pub.dev"},"source":"hosted","version":"6.3.0"},"url_launcher_android":{"dependency":"transitive","description":{"name":"url_launcher_android","sha256":"e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab","url":"https://pub.dev"},"source":"hosted","version":"6.3.10"},"url_launcher_ios":{"dependency":"transitive","description":{"name":"url_launcher_ios","sha256":"e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e","url":"https://pub.dev"},"source":"hosted","version":"6.3.1"},"url_launcher_linux":{"dependency":"transitive","description":{"name":"url_launcher_linux","sha256":"e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af","url":"https://pub.dev"},"source":"hosted","version":"3.2.0"},"url_launcher_macos":{"dependency":"transitive","description":{"name":"url_launcher_macos","sha256":"769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672","url":"https://pub.dev"},"source":"hosted","version":"3.2.1"},"url_launcher_platform_interface":{"dependency":"transitive","description":{"name":"url_launcher_platform_interface","sha256":"552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"url_launcher_web":{"dependency":"transitive","description":{"name":"url_launcher_web","sha256":"772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e","url":"https://pub.dev"},"source":"hosted","version":"2.3.3"},"url_launcher_windows":{"dependency":"transitive","description":{"name":"url_launcher_windows","sha256":"49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185","url":"https://pub.dev"},"source":"hosted","version":"3.1.2"},"uuid":{"dependency":"transitive","description":{"name":"uuid","sha256":"a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff","url":"https://pub.dev"},"source":"hosted","version":"4.5.1"},"vector_graphics":{"dependency":"transitive","description":{"name":"vector_graphics","sha256":"32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_codec":{"dependency":"transitive","description":{"name":"vector_graphics_codec","sha256":"c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_compiler":{"dependency":"transitive","description":{"name":"vector_graphics_compiler","sha256":"12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_math":{"dependency":"transitive","description":{"name":"vector_math","sha256":"80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"web":{"dependency":"transitive","description":{"name":"web","sha256":"97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27","url":"https://pub.dev"},"source":"hosted","version":"0.5.1"},"win32":{"dependency":"direct main","description":{"name":"win32","sha256":"4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec","url":"https://pub.dev"},"source":"hosted","version":"5.5.5"},"window_manager":{"dependency":"direct main","description":{"name":"window_manager","sha256":"ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792","url":"https://pub.dev"},"source":"hosted","version":"0.4.2"},"window_size":{"dependency":"direct main","description":{"path":"plugins/window_size","ref":"6c66ad2","resolved-ref":"6c66ad23ee79749f30a8eece542cf54eaf157ed8","url":"https://github.com/google/flutter-desktop-embedding.git"},"source":"git","version":"0.1.0"},"xdg_directories":{"dependency":"transitive","description":{"name":"xdg_directories","sha256":"faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d","url":"https://pub.dev"},"source":"hosted","version":"1.0.4"},"xml":{"dependency":"transitive","description":{"name":"xml","sha256":"b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226","url":"https://pub.dev"},"source":"hosted","version":"6.5.0"},"xterm":{"dependency":"direct main","description":{"path":".","ref":"4.0.0+mp","resolved-ref":"ff2309c1581c025ba8b9f65e6619fe2fe2252827","url":"https://github.com/levkropp/xterm.dart"},"source":"git","version":"4.0.0"},"zmodem":{"dependency":"transitive","description":{"name":"zmodem","sha256":"3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf","url":"https://pub.dev"},"source":"hosted","version":"0.0.6"}},"sdks":{"dart":">=3.5.0 <4.0.0","flutter":">=3.24.0"}} +{"packages":{"args":{"dependency":"transitive","description":{"name":"args","sha256":"7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a","url":"https://pub.dev"},"source":"hosted","version":"2.5.0"},"asn1lib":{"dependency":"transitive","description":{"name":"asn1lib","sha256":"6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70","url":"https://pub.dev"},"source":"hosted","version":"1.5.5"},"async":{"dependency":"direct main","description":{"name":"async","sha256":"947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c","url":"https://pub.dev"},"source":"hosted","version":"2.11.0"},"basics":{"dependency":"direct main","description":{"name":"basics","sha256":"41ff8aded84ae174d1df5cce0bcac3ab9070caac9f7da35fd2cc638dfee6163f","url":"https://pub.dev"},"source":"hosted","version":"0.10.0"},"boolean_selector":{"dependency":"transitive","description":{"name":"boolean_selector","sha256":"6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"built_collection":{"dependency":"direct main","description":{"name":"built_collection","sha256":"376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"characters":{"dependency":"transitive","description":{"name":"characters","sha256":"04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"clock":{"dependency":"transitive","description":{"name":"clock","sha256":"cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"collection":{"dependency":"direct main","description":{"name":"collection","sha256":"ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a","url":"https://pub.dev"},"source":"hosted","version":"1.18.0"},"convert":{"dependency":"transitive","description":{"name":"convert","sha256":"0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592","url":"https://pub.dev"},"source":"hosted","version":"3.1.1"},"cross_file":{"dependency":"transitive","description":{"name":"cross_file","sha256":"7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670","url":"https://pub.dev"},"source":"hosted","version":"0.3.4+2"},"crypto":{"dependency":"transitive","description":{"name":"crypto","sha256":"ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27","url":"https://pub.dev"},"source":"hosted","version":"3.0.5"},"dartssh2":{"dependency":"direct main","description":{"path":".","ref":"2.10.0+mp","resolved-ref":"e7c66932cf7ca8eba083268fa3230222c8cd0722","url":"https://github.com/andrei-toterman/dartssh2.git"},"source":"git","version":"2.10.0"},"equatable":{"dependency":"transitive","description":{"name":"equatable","sha256":"c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2","url":"https://pub.dev"},"source":"hosted","version":"2.0.5"},"extended_text":{"dependency":"direct main","description":{"name":"extended_text","sha256":"b0cdd240b4ddf61d18d7e33e7775195971f2d033bd69706fa897446dc96c3b81","url":"https://pub.dev"},"source":"hosted","version":"14.1.0"},"extended_text_library":{"dependency":"transitive","description":{"name":"extended_text_library","sha256":"55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829","url":"https://pub.dev"},"source":"hosted","version":"12.0.0"},"ffi":{"dependency":"direct main","description":{"name":"ffi","sha256":"16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6","url":"https://pub.dev"},"source":"hosted","version":"2.1.3"},"file":{"dependency":"transitive","description":{"name":"file","sha256":"5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"file_selector":{"dependency":"direct main","description":{"name":"file_selector","sha256":"5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"file_selector_android":{"dependency":"transitive","description":{"name":"file_selector_android","sha256":"8bcc3af859e9d47fab9c7dc315537406511a894ab578e198bd8f9ed745ea5a01","url":"https://pub.dev"},"source":"hosted","version":"0.5.1+2"},"file_selector_ios":{"dependency":"transitive","description":{"name":"file_selector_ios","sha256":"38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb","url":"https://pub.dev"},"source":"hosted","version":"0.5.3"},"file_selector_linux":{"dependency":"transitive","description":{"name":"file_selector_linux","sha256":"045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492","url":"https://pub.dev"},"source":"hosted","version":"0.9.2+1"},"file_selector_macos":{"dependency":"transitive","description":{"name":"file_selector_macos","sha256":"f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385","url":"https://pub.dev"},"source":"hosted","version":"0.9.4"},"file_selector_platform_interface":{"dependency":"transitive","description":{"name":"file_selector_platform_interface","sha256":"a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b","url":"https://pub.dev"},"source":"hosted","version":"2.6.2"},"file_selector_web":{"dependency":"transitive","description":{"name":"file_selector_web","sha256":"c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+2"},"file_selector_windows":{"dependency":"transitive","description":{"name":"file_selector_windows","sha256":"2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+2"},"fixnum":{"dependency":"transitive","description":{"name":"fixnum","sha256":"25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"fl_chart":{"dependency":"direct main","description":{"name":"fl_chart","sha256":"94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef","url":"https://pub.dev"},"source":"hosted","version":"0.69.0"},"flutter":{"dependency":"direct main","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_lints":{"dependency":"direct dev","description":{"name":"flutter_lints","sha256":"5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"flutter_riverpod":{"dependency":"direct main","description":{"name":"flutter_riverpod","sha256":"0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"flutter_svg":{"dependency":"direct main","description":{"name":"flutter_svg","sha256":"7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2","url":"https://pub.dev"},"source":"hosted","version":"2.0.10+1"},"flutter_web_plugins":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"fpdart":{"dependency":"direct main","description":{"name":"fpdart","sha256":"7413acc5a6569a3fe8277928fc7487f3198530f0c4e635d0baef199ea36e8ee9","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"google_identity_services_web":{"dependency":"transitive","description":{"name":"google_identity_services_web","sha256":"5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6","url":"https://pub.dev"},"source":"hosted","version":"0.3.1+4"},"googleapis_auth":{"dependency":"transitive","description":{"name":"googleapis_auth","sha256":"befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938","url":"https://pub.dev"},"source":"hosted","version":"1.6.0"},"grpc":{"dependency":"direct main","description":{"name":"grpc","sha256":"5b99b7a420937d4361ece68b798c9af8e04b5bc128a7859f2a4be87427694813","url":"https://pub.dev"},"source":"hosted","version":"4.0.1"},"hotkey_manager":{"dependency":"direct main","description":{"name":"hotkey_manager","sha256":"06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd","url":"https://pub.dev"},"source":"hosted","version":"0.2.3"},"hotkey_manager_linux":{"dependency":"direct overridden","description":{"path":"packages/hotkey_manager_linux","ref":"no-cooked-accel","resolved-ref":"7e5a662615fbc9f077c1567fd7a66ec34ad52b5e","url":"https://github.com/andrei-toterman/hotkey_manager.git"},"source":"git","version":"0.2.0"},"hotkey_manager_macos":{"dependency":"transitive","description":{"name":"hotkey_manager_macos","sha256":"03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_platform_interface":{"dependency":"transitive","description":{"name":"hotkey_manager_platform_interface","sha256":"98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_windows":{"dependency":"transitive","description":{"name":"hotkey_manager_windows","sha256":"0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"http":{"dependency":"transitive","description":{"name":"http","sha256":"b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010","url":"https://pub.dev"},"source":"hosted","version":"1.2.2"},"http2":{"dependency":"transitive","description":{"name":"http2","sha256":"9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"http_parser":{"dependency":"transitive","description":{"name":"http_parser","sha256":"2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b","url":"https://pub.dev"},"source":"hosted","version":"4.0.2"},"intl":{"dependency":"direct main","description":{"name":"intl","sha256":"99f282cb0e02edcbbf8c6b3bbc7c90b65635156c412e58f3975a7e55284ce685","url":"https://pub.dev"},"source":"hosted","version":"0.20.0"},"js":{"dependency":"transitive","description":{"name":"js","sha256":"c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf","url":"https://pub.dev"},"source":"hosted","version":"0.7.1"},"json_annotation":{"dependency":"transitive","description":{"name":"json_annotation","sha256":"1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1","url":"https://pub.dev"},"source":"hosted","version":"4.9.0"},"lints":{"dependency":"transitive","description":{"name":"lints","sha256":"3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"local_notifier":{"dependency":"direct main","description":{"name":"local_notifier","sha256":"f6cfc933c6fbc961f4e52b5c880f68e41b2d3cd29aad557cc654fd211093a025","url":"https://pub.dev"},"source":"hosted","version":"0.1.6"},"logger":{"dependency":"direct main","description":{"name":"logger","sha256":"697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"matcher":{"dependency":"transitive","description":{"name":"matcher","sha256":"d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb","url":"https://pub.dev"},"source":"hosted","version":"0.12.16+1"},"material_color_utilities":{"dependency":"transitive","description":{"name":"material_color_utilities","sha256":"f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec","url":"https://pub.dev"},"source":"hosted","version":"0.11.1"},"meta":{"dependency":"transitive","description":{"name":"meta","sha256":"bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7","url":"https://pub.dev"},"source":"hosted","version":"1.15.0"},"path":{"dependency":"transitive","description":{"name":"path","sha256":"087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af","url":"https://pub.dev"},"source":"hosted","version":"1.9.0"},"path_parsing":{"dependency":"transitive","description":{"name":"path_parsing","sha256":"e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf","url":"https://pub.dev"},"source":"hosted","version":"1.0.1"},"path_provider":{"dependency":"direct main","description":{"name":"path_provider","sha256":"fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"path_provider_android":{"dependency":"transitive","description":{"name":"path_provider_android","sha256":"6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7","url":"https://pub.dev"},"source":"hosted","version":"2.2.10"},"path_provider_foundation":{"dependency":"transitive","description":{"name":"path_provider_foundation","sha256":"f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"path_provider_linux":{"dependency":"transitive","description":{"name":"path_provider_linux","sha256":"f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279","url":"https://pub.dev"},"source":"hosted","version":"2.2.1"},"path_provider_platform_interface":{"dependency":"transitive","description":{"name":"path_provider_platform_interface","sha256":"88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"path_provider_windows":{"dependency":"transitive","description":{"name":"path_provider_windows","sha256":"bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"petitparser":{"dependency":"transitive","description":{"name":"petitparser","sha256":"c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27","url":"https://pub.dev"},"source":"hosted","version":"6.0.2"},"pinenacl":{"dependency":"transitive","description":{"name":"pinenacl","sha256":"57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf","url":"https://pub.dev"},"source":"hosted","version":"0.6.0"},"platform":{"dependency":"transitive","description":{"name":"platform","sha256":"9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65","url":"https://pub.dev"},"source":"hosted","version":"3.1.5"},"plugin_platform_interface":{"dependency":"transitive","description":{"name":"plugin_platform_interface","sha256":"4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02","url":"https://pub.dev"},"source":"hosted","version":"2.1.8"},"pointycastle":{"dependency":"transitive","description":{"name":"pointycastle","sha256":"4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe","url":"https://pub.dev"},"source":"hosted","version":"3.9.1"},"protobuf":{"dependency":"direct main","description":{"name":"protobuf","sha256":"579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731","url":"https://pub.dev"},"source":"hosted","version":"4.1.0"},"quiver":{"dependency":"transitive","description":{"name":"quiver","sha256":"ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"riverpod":{"dependency":"transitive","description":{"name":"riverpod","sha256":"f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"rxdart":{"dependency":"direct main","description":{"name":"rxdart","sha256":"5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962","url":"https://pub.dev"},"source":"hosted","version":"0.28.0"},"screen_retriever":{"dependency":"transitive","description":{"name":"screen_retriever","sha256":"6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90","url":"https://pub.dev"},"source":"hosted","version":"0.1.9"},"shared_preferences":{"dependency":"direct main","description":{"name":"shared_preferences","sha256":"746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_android":{"dependency":"transitive","description":{"name":"shared_preferences_android","sha256":"480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_foundation":{"dependency":"transitive","description":{"name":"shared_preferences_foundation","sha256":"c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f","url":"https://pub.dev"},"source":"hosted","version":"2.5.2"},"shared_preferences_linux":{"dependency":"transitive","description":{"name":"shared_preferences_linux","sha256":"580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_platform_interface":{"dependency":"transitive","description":{"name":"shared_preferences_platform_interface","sha256":"57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_web":{"dependency":"transitive","description":{"name":"shared_preferences_web","sha256":"d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e","url":"https://pub.dev"},"source":"hosted","version":"2.4.2"},"shared_preferences_windows":{"dependency":"transitive","description":{"name":"shared_preferences_windows","sha256":"94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"sky_engine":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.99"},"source_span":{"dependency":"transitive","description":{"name":"source_span","sha256":"53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c","url":"https://pub.dev"},"source":"hosted","version":"1.10.0"},"sprintf":{"dependency":"transitive","description":{"name":"sprintf","sha256":"1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"stack_trace":{"dependency":"transitive","description":{"name":"stack_trace","sha256":"9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377","url":"https://pub.dev"},"source":"hosted","version":"1.12.0"},"state_notifier":{"dependency":"transitive","description":{"name":"state_notifier","sha256":"b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"stream_channel":{"dependency":"transitive","description":{"name":"stream_channel","sha256":"ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"string_scanner":{"dependency":"transitive","description":{"name":"string_scanner","sha256":"688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"synchronized":{"dependency":"direct main","description":{"name":"synchronized","sha256":"69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225","url":"https://pub.dev"},"source":"hosted","version":"3.3.0+3"},"term_glyph":{"dependency":"transitive","description":{"name":"term_glyph","sha256":"a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"test_api":{"dependency":"transitive","description":{"name":"test_api","sha256":"664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c","url":"https://pub.dev"},"source":"hosted","version":"0.7.3"},"tray_menu":{"dependency":"direct main","description":{"path":".","ref":"7c1394c","resolved-ref":"7c1394c46aac4598ebdd3fa6670e4ea2904a4d31","url":"https://github.com/andrei-toterman/tray_menu.git"},"source":"git","version":"0.0.1"},"two_dimensional_scrollables":{"dependency":"direct main","description":{"name":"two_dimensional_scrollables","sha256":"74ce1f35a8c74370b322049c9d00bf098938661e9f67054eae0f618e6dc0cb62","url":"https://pub.dev"},"source":"hosted","version":"0.3.2"},"typed_data":{"dependency":"transitive","description":{"name":"typed_data","sha256":"facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c","url":"https://pub.dev"},"source":"hosted","version":"1.3.2"},"uni_platform":{"dependency":"transitive","description":{"name":"uni_platform","sha256":"e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84","url":"https://pub.dev"},"source":"hosted","version":"0.1.3"},"url_launcher":{"dependency":"direct main","description":{"name":"url_launcher","sha256":"21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3","url":"https://pub.dev"},"source":"hosted","version":"6.3.0"},"url_launcher_android":{"dependency":"transitive","description":{"name":"url_launcher_android","sha256":"e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab","url":"https://pub.dev"},"source":"hosted","version":"6.3.10"},"url_launcher_ios":{"dependency":"transitive","description":{"name":"url_launcher_ios","sha256":"e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e","url":"https://pub.dev"},"source":"hosted","version":"6.3.1"},"url_launcher_linux":{"dependency":"transitive","description":{"name":"url_launcher_linux","sha256":"e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af","url":"https://pub.dev"},"source":"hosted","version":"3.2.0"},"url_launcher_macos":{"dependency":"transitive","description":{"name":"url_launcher_macos","sha256":"769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672","url":"https://pub.dev"},"source":"hosted","version":"3.2.1"},"url_launcher_platform_interface":{"dependency":"transitive","description":{"name":"url_launcher_platform_interface","sha256":"552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"url_launcher_web":{"dependency":"transitive","description":{"name":"url_launcher_web","sha256":"772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e","url":"https://pub.dev"},"source":"hosted","version":"2.3.3"},"url_launcher_windows":{"dependency":"transitive","description":{"name":"url_launcher_windows","sha256":"49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185","url":"https://pub.dev"},"source":"hosted","version":"3.1.2"},"uuid":{"dependency":"transitive","description":{"name":"uuid","sha256":"a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff","url":"https://pub.dev"},"source":"hosted","version":"4.5.1"},"vector_graphics":{"dependency":"transitive","description":{"name":"vector_graphics","sha256":"32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_codec":{"dependency":"transitive","description":{"name":"vector_graphics_codec","sha256":"c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_compiler":{"dependency":"transitive","description":{"name":"vector_graphics_compiler","sha256":"12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_math":{"dependency":"transitive","description":{"name":"vector_math","sha256":"80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"web":{"dependency":"transitive","description":{"name":"web","sha256":"97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27","url":"https://pub.dev"},"source":"hosted","version":"0.5.1"},"win32":{"dependency":"direct main","description":{"name":"win32","sha256":"4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec","url":"https://pub.dev"},"source":"hosted","version":"5.5.5"},"window_manager":{"dependency":"direct main","description":{"name":"window_manager","sha256":"ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792","url":"https://pub.dev"},"source":"hosted","version":"0.4.2"},"window_size":{"dependency":"direct main","description":{"path":"plugins/window_size","ref":"6c66ad2","resolved-ref":"6c66ad23ee79749f30a8eece542cf54eaf157ed8","url":"https://github.com/google/flutter-desktop-embedding.git"},"source":"git","version":"0.1.0"},"xdg_directories":{"dependency":"transitive","description":{"name":"xdg_directories","sha256":"faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d","url":"https://pub.dev"},"source":"hosted","version":"1.0.4"},"xml":{"dependency":"transitive","description":{"name":"xml","sha256":"b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226","url":"https://pub.dev"},"source":"hosted","version":"6.5.0"},"xterm":{"dependency":"direct main","description":{"path":".","ref":"4.0.0+mp","resolved-ref":"ff2309c1581c025ba8b9f65e6619fe2fe2252827","url":"https://github.com/levkropp/xterm.dart"},"source":"git","version":"4.0.0"},"zmodem":{"dependency":"transitive","description":{"name":"zmodem","sha256":"3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf","url":"https://pub.dev"},"source":"hosted","version":"0.0.6"}},"sdks":{"dart":">=3.5.0 <4.0.0","flutter":">=3.24.0"}} diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 50344eb22589..3edd5e8d23e9 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -278,13 +278,13 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { homepage = "https://mupdf.com"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ fpletz ]; - platforms = platforms.unix; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ fpletz ]; + platforms = lib.platforms.unix; mainProgram = "mupdf"; }; } diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix index f2976a021145..ef056f3033b2 100644 --- a/pkgs/by-name/mu/music-assistant/frontend.nix +++ b/pkgs/by-name/mu/music-assistant/frontend.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "music_assistant_frontend" ]; - meta = with lib; { + meta = { changelog = "https://github.com/music-assistant/frontend/releases/tag/${version}"; - description = "The Music Assistant frontend"; + description = "Music Assistant frontend"; homepage = "https://github.com/music-assistant/frontend"; - license = licenses.asl20; - maintainers = with maintainers; [ hexa ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; }; } diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index f62bcbcd930c..f56a60fc09d3 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -173,7 +173,7 @@ python.pkgs.buildPythonApplication rec { tests = nixosTests.music-assistant; }; - meta = with lib; { + meta = { changelog = "https://github.com/music-assistant/server/releases/tag/${version}"; description = "Music Assistant is a music library manager for various music sources which can easily stream to a wide range of supported players"; longDescription = '' @@ -182,8 +182,8 @@ python.pkgs.buildPythonApplication rec { always-on device like a Raspberry Pi, a NAS or an Intel NUC or alike. ''; homepage = "https://github.com/music-assistant/server"; - license = licenses.asl20; - maintainers = with maintainers; [ hexa ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; mainProgram = "mass"; }; } diff --git a/pkgs/by-name/mu/musl-obstack/package.nix b/pkgs/by-name/mu/musl-obstack/package.nix index 8de4fee17b2b..31475e66a1f4 100644 --- a/pkgs/by-name/mu/musl-obstack/package.nix +++ b/pkgs/by-name/mu/musl-obstack/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/void-linux/musl-obstack"; - description = "An extraction of the obstack functions and macros from GNU libiberty for use with musl-libc"; + description = "Extraction of the obstack functions and macros from GNU libiberty for use with musl-libc"; platforms = platforms.unix; license = licenses.lgpl21Plus; maintainers = [ maintainers.pjjw ]; diff --git a/pkgs/by-name/mu/musl/package.nix b/pkgs/by-name/mu/musl/package.nix index d2227dd12a49..97a61412aa49 100644 --- a/pkgs/by-name/mu/musl/package.nix +++ b/pkgs/by-name/mu/musl/package.nix @@ -163,11 +163,11 @@ stdenv.mkDerivation rec { passthru.linuxHeaders = linuxHeaders; - meta = with lib; { + meta = { description = "Efficient, small, quality libc implementation"; homepage = "https://musl.libc.org/"; changelog = "https://git.musl-libc.org/cgit/musl/tree/WHATSNEW?h=v${version}"; - license = licenses.mit; + license = lib.licenses.mit; platforms = [ "aarch64-linux" "armv5tel-linux" @@ -190,7 +190,7 @@ stdenv.mkDerivation rec { "s390x-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ thoughtpolice dtzWill ]; diff --git a/pkgs/by-name/mu/mutagen-compose/package.nix b/pkgs/by-name/mu/mutagen-compose/package.nix index 73c85bbfd420..567d43d5a5df 100644 --- a/pkgs/by-name/mu/mutagen-compose/package.nix +++ b/pkgs/by-name/mu/mutagen-compose/package.nix @@ -23,12 +23,12 @@ buildGoModule rec { tags = [ "mutagencompose" ]; - meta = with lib; { + meta = { description = "Compose with Mutagen integration"; homepage = "https://mutagen.io/"; changelog = "https://github.com/mutagen-io/mutagen-compose/releases/tag/v${version}"; - maintainers = [ maintainers.matthewpi ]; - license = licenses.mit; + maintainers = [ lib.maintainers.matthewpi ]; + license = lib.licenses.mit; mainProgram = "mutagen-compose"; }; } diff --git a/pkgs/by-name/mu/mutagen/package.nix b/pkgs/by-name/mu/mutagen/package.nix index 7f1177ad06b7..fdc14fa7f14e 100644 --- a/pkgs/by-name/mu/mutagen/package.nix +++ b/pkgs/by-name/mu/mutagen/package.nix @@ -60,12 +60,12 @@ buildGoModule rec { --zsh mutagen.zsh ''; - meta = with lib; { + meta = { description = "Make remote development work with your local tools"; homepage = "https://mutagen.io/"; changelog = "https://github.com/mutagen-io/mutagen/releases/tag/v${version}"; - maintainers = [ ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/by-name/mu/mutmut/package.nix b/pkgs/by-name/mu/mutmut/package.nix index caaa5438d9ab..7d05a0215d94 100644 --- a/pkgs/by-name/mu/mutmut/package.nix +++ b/pkgs/by-name/mu/mutmut/package.nix @@ -31,13 +31,13 @@ python3Packages.buildPythonApplication rec { textual ]; - meta = with lib; { + meta = { description = "mutation testing system for Python, with a strong focus on ease of use"; mainProgram = "mutmut"; homepage = "https://github.com/boxed/mutmut"; changelog = "https://github.com/boxed/mutmut/blob/${version}/HISTORY.rst"; - license = licenses.bsd3; - maintainers = with maintainers; [ + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ l0b0 synthetica ]; diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix index 59a8645d3a81..b08669a624f0 100644 --- a/pkgs/by-name/mv/mvnd/package.nix +++ b/pkgs/by-name/mv/mvnd/package.nix @@ -100,7 +100,7 @@ maven.buildMavenPackage rec { }); meta = { - description = "The Apache Maven Daemon"; + description = "Apache Maven Daemon"; homepage = "https://maven.apache.org/"; license = lib.licenses.asl20; platforms = builtins.attrNames platformMap; diff --git a/pkgs/by-name/n2/n2048/package.nix b/pkgs/by-name/n2/n2048/package.nix deleted file mode 100644 index e28b685d9f52..000000000000 --- a/pkgs/by-name/n2/n2048/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "n2048"; - version = "0.1"; - - src = fetchurl { - url = "http://www.dettus.net/n2048/n2048_v${finalAttrs.version}.tar.gz"; - hash = "sha256-c4bHWmdQuwyRXIm/sqw3p71pMv6VLAzIuUTaDHIWn6A="; - }; - - env = { - NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=implicit-function-declaration" - ]; - }; - - buildInputs = [ - ncurses - ]; - - makeFlags = [ - "DESTDIR=$(out)" - ]; - - preInstall = '' - mkdir -p "$out"/{share/man,bin} - ''; - - meta = { - description = "Console implementation of 2048 game"; - mainProgram = "n2048"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.linux; - homepage = "http://www.dettus.net/n2048/"; - }; -}) diff --git a/pkgs/by-name/nb/nbsdgames/package.nix b/pkgs/by-name/nb/nbsdgames/package.nix index 552694601833..7543a39f9fbc 100644 --- a/pkgs/by-name/nb/nbsdgames/package.nix +++ b/pkgs/by-name/nb/nbsdgames/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "A package of 18 text-based modern games"; + description = "Package of 18 text-based modern games"; homepage = "https://github.com/abakh/nbsdgames"; license = lib.licenses.cc0; maintainers = with lib.maintainers; [ sarcasticadmin ]; diff --git a/pkgs/by-name/nb/nbtscanner/package.nix b/pkgs/by-name/nb/nbtscanner/package.nix index 7700a16fe628..ef287641bf82 100644 --- a/pkgs/by-name/nb/nbtscanner/package.nix +++ b/pkgs/by-name/nb/nbtscanner/package.nix @@ -35,12 +35,12 @@ rustPlatform.buildRustPackage rec { versionCheckProgramArg = "--version"; - meta = with lib; { + meta = { description = "NetBIOS scanner written in Rust"; homepage = "https://github.com/jonkgrimes/nbtscanner"; changelog = "https://github.com/jonkgrimes/nbtscanner/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "nbtscanner"; }; } diff --git a/pkgs/by-name/ne/nekoray/package.nix b/pkgs/by-name/ne/nekoray/package.nix index 5275ff38d4a3..07c75a213e98 100644 --- a/pkgs/by-name/ne/nekoray/package.nix +++ b/pkgs/by-name/ne/nekoray/package.nix @@ -71,8 +71,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall install -Dm755 nekoray "$out/share/nekoray/nekoray" - - install -Dm644 "$src/res/public/nekobox.png" "$out/share/pixmaps/nekoray.png" + install -Dm644 "$src/res/public/nekobox.png" "$out/share/icons/hicolor/256x256/apps/nekoray.png" mkdir -p "$out/bin" ln -s "$out/share/nekoray/nekoray" "$out/bin" @@ -90,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { desktopItems = [ (makeDesktopItem { name = "nekoray"; - desktopName = "nekoray"; + desktopName = "Nekoray"; exec = "nekoray"; icon = "nekoray"; comment = finalAttrs.meta.description; diff --git a/pkgs/by-name/ne/newelle/package.nix b/pkgs/by-name/ne/newelle/package.nix new file mode 100644 index 000000000000..e226ca62f03b --- /dev/null +++ b/pkgs/by-name/ne/newelle/package.nix @@ -0,0 +1,104 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + gobject-introspection, + desktop-file-utils, + libadwaita, + vte-gtk4, + gsettings-desktop-schemas, + gtksourceview5, + lsb-release, + bash, + ffmpeg, + nix-update-script, +}: + +python3Packages.buildPythonApplication rec { + pname = "newelle"; + version = "0.9.7"; + pyproject = false; # uses meson + + src = fetchFromGitHub { + owner = "qwersyk"; + repo = "Newelle"; + tag = version; + hash = "sha256-h0dWjnUqWcPdSbR60HF2KvQxUyYeR3qHf2GMHt/kSm0="; + }; + + postPatch = '' + substituteInPlace src/utility/pip.py \ + --replace-fail "# Manage pip path locking" "return None" + ''; + + nativeBuildInputs = [ + meson + ninja + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + pkg-config + ]; + + buildInputs = [ + libadwaita + vte-gtk4 + gsettings-desktop-schemas + gtksourceview5 + ]; + + dependencies = with python3Packages; [ + pygobject3 + libxml2 + pydub + gtts + speechrecognition + numpy + matplotlib + pylatexenc + pyaudio + pip-install-test + newspaper3k + tiktoken + openai + ollama + llama-index-core + llama-index-readers-file + google-genai + anthropic + ]; + + strictDeps = true; + + postInstallCheck = '' + mesonCheckPhase + ''; + + dontWrapGApps = true; + + makeWrapperArgs = [ + "\${gappsWrapperArgs[@]}" + "--prefix PATH : ${ + lib.makeBinPath [ + lsb-release + bash + ffmpeg + ] + }" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/qwersyk/Newelle"; + description = "Ultimate Virtual Assistant"; + mainProgram = "newelle"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ emaryn ]; + }; +} diff --git a/pkgs/by-name/ne/newt-go/package.nix b/pkgs/by-name/ne/newt-go/package.nix index 6f86105d62f5..1703a9373257 100644 --- a/pkgs/by-name/ne/newt-go/package.nix +++ b/pkgs/by-name/ne/newt-go/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "newt"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "fosrl"; repo = "newt"; tag = version; - hash = "sha256-wfm2UI4QUiYiAJIYBiSCOD/w72WRJIv2cyLIkfqGsek="; + hash = "sha256-dZsHPEhvrElFdmJ6mgqyLqcblyUfpt8dtLsNFm1emrw="; }; - vendorHash = "sha256-8VlT9cy2uNhQPiUpr1jJuQSgUR6TtlbQ+etran2Htxs="; + vendorHash = "sha256-Yc5IXnShciek/bKkVezkAcaq47zGiZP8vUHFb9p09LI="; postPatch = '' substituteInPlace main.go \ diff --git a/pkgs/by-name/ne/next-ls/package.nix b/pkgs/by-name/ne/next-ls/package.nix index 68e9f96d9510..7771bae3a195 100644 --- a/pkgs/by-name/ne/next-ls/package.nix +++ b/pkgs/by-name/ne/next-ls/package.nix @@ -37,7 +37,7 @@ beamPackages.mixRelease rec { meta = { homepage = "https://www.elixir-tools.dev/next-ls/"; changelog = "https://github.com/elixir-tools/next-ls/releases/tag/v${version}"; - description = "The language server for Elixir that just works"; + description = "Language server for Elixir that just works"; license = lib.licenses.mit; mainProgram = "nextls"; maintainers = [ lib.maintainers.adamcstephens ]; diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix index dcf4d86a9f70..1f32c3a48dc8 100644 --- a/pkgs/by-name/ne/nextcloud-client/package.nix +++ b/pkgs/by-name/ne/nextcloud-client/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.16.4"; + version = "3.16.5"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud-releases"; repo = "desktop"; tag = "v${version}"; - hash = "sha256-8P73YitjuU9SGDBNimqJsvSfGOE9lNCVUNN3f4KXWSY="; + hash = "sha256-Xul3NGHResU/ZGP/C7v2bnhcxqGn3CjwjwnaPVmUhfM="; }; patches = [ diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix index 057aa9e93aff..c4558c101191 100644 --- a/pkgs/by-name/ng/nghttp2/package.nix +++ b/pkgs/by-name/ng/nghttp2/package.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { inherit curl libsoup_3; }; - meta = with lib; { + meta = { description = "HTTP/2 C library and tools"; longDescription = '' nghttp2 is an implementation of the HyperText Transfer Protocol version 2 in C. @@ -137,8 +137,8 @@ stdenv.mkDerivation rec { homepage = "https://nghttp2.org/"; changelog = "https://github.com/nghttp2/nghttp2/releases/tag/v${version}"; # News articles with changes summary can be found here: https://nghttp2.org/blog/archives/ - license = licenses.mit; - maintainers = with maintainers; [ c0bw3b ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ c0bw3b ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ni/nix-check-deps/package.nix b/pkgs/by-name/ni/nix-check-deps/package.nix new file mode 100644 index 000000000000..ac14368eeee6 --- /dev/null +++ b/pkgs/by-name/ni/nix-check-deps/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + unstableGitUpdater, +}: + +rustPlatform.buildRustPackage { + pname = "nix-check-deps"; + version = "0-unstable-2025-04-09"; + + src = fetchFromGitHub { + owner = "LordGrimmauld"; + repo = "nix-check-deps"; + rev = "263701905ec40a19c52d23d0fdceb1126e20c99e"; + hash = "sha256-RaPk8Cd5ovskxFFvFd0+auIopCo1YHyH+6199qK+d18="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-1fazKGz3PtyTvcIW+PY/LwYc6JlErSO9ZFisTUXJdhc="; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Scan nix packages for unused buildInputs"; + homepage = "https://github.com/LordGrimmauld/nix-check-deps"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + mainProgram = "nix-check-deps"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix index bda305c30d35..a662a3b0b563 100644 --- a/pkgs/by-name/ni/nix-your-shell/package.nix +++ b/pkgs/by-name/ni/nix-your-shell/package.nix @@ -3,6 +3,8 @@ rustPlatform, fetchFromGitHub, nix-update-script, + runCommand, + nix-your-shell, }: rustPlatform.buildRustPackage rec { pname = "nix-your-shell"; @@ -11,13 +13,22 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = "nix-your-shell"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c="; }; useFetchCargoVendor = true; cargoHash = "sha256-zQpK13iudyWDZbpAN8zm9kKmz8qy3yt8JxT4lwq4YF0="; + passthru = { + generate-config = + shell: + runCommand "nix-your-shell-config" { } '' + ${lib.getExe nix-your-shell} ${lib.escapeShellArg shell} >> "$out" + ''; + updateScript = nix-update-script { }; + }; + meta = { mainProgram = "nix-your-shell"; description = "`nix` and `nix-shell` wrapper for shells other than `bash`"; @@ -26,6 +37,4 @@ rustPlatform.buildRustPackage rec { license = [ lib.licenses.mit ]; maintainers = with lib.maintainers; [ _9999years ]; }; - - passthru.updateScript = nix-update-script { }; } diff --git a/pkgs/by-name/ni/nixos-firewall-tool/package.nix b/pkgs/by-name/ni/nixos-firewall-tool/package.nix index 13f27d3b7b25..4615287fb260 100644 --- a/pkgs/by-name/ni/nixos-firewall-tool/package.nix +++ b/pkgs/by-name/ni/nixos-firewall-tool/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation { ''; meta = with lib; { - description = "A tool to temporarily manipulate the NixOS firewall"; + description = "Tool to temporarily manipulate the NixOS firewall"; license = licenses.mit; maintainers = with maintainers; [ clerie diff --git a/pkgs/by-name/ni/nixos-install-tools/package.nix b/pkgs/by-name/ni/nixos-install-tools/package.nix index 853c4d718e38..03be3c9ea39b 100644 --- a/pkgs/by-name/ni/nixos-install-tools/package.nix +++ b/pkgs/by-name/ni/nixos-install-tools/package.nix @@ -28,7 +28,7 @@ in extraOutputsToInstall = [ "man" ]; meta = { - description = "The essential commands from the NixOS installer as a package"; + description = "Essential commands from the NixOS installer as a package"; longDescription = '' With this package, you get the commands like nixos-generate-config and nixos-install that you would otherwise only find on a NixOS system, such diff --git a/pkgs/by-name/nk/nkeys/package.nix b/pkgs/by-name/nk/nkeys/package.nix index 2495bfee0241..e11b48b54c66 100644 --- a/pkgs/by-name/nk/nkeys/package.nix +++ b/pkgs/by-name/nk/nkeys/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { vendorHash = "sha256-89DGLTkt9c8jJhAX3Uo8BBtLcBbnYE0q4mCqq/RGXM4="; - meta = with lib; { + meta = { description = "Public-key signature system for NATS"; homepage = "https://github.com/nats-io/nkeys"; changelog = "https://github.com/nats-io/nkeys/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "nk"; }; } diff --git a/pkgs/by-name/nm/nmap-formatter/package.nix b/pkgs/by-name/nm/nmap-formatter/package.nix index eedcf3690869..7a5cc79679f9 100644 --- a/pkgs/by-name/nm/nmap-formatter/package.nix +++ b/pkgs/by-name/nm/nmap-formatter/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { vendorHash = "sha256-xOS59co6FE2lJae2VtsBKcGjvmMRiGlmZKbqH++mEYk="; - meta = with lib; { + meta = { description = "Tool that allows you to convert nmap output"; mainProgram = "nmap-formatter"; homepage = "https://github.com/vdjagilev/nmap-formatter"; changelog = "https://github.com/vdjagilev/nmap-formatter/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/no/noti/package.nix b/pkgs/by-name/no/noti/package.nix index 27b8675652c0..4cfd4316b9ea 100644 --- a/pkgs/by-name/no/noti/package.nix +++ b/pkgs/by-name/no/noti/package.nix @@ -5,7 +5,7 @@ installShellFiles, }: -buildGoModule (finalAttrs: rec { +buildGoModule (finalAttrs: { pname = "noti"; version = "3.8.0"; diff --git a/pkgs/by-name/np/np/package.nix b/pkgs/by-name/np/np/package.nix index 2cd7e5178eaf..9057b7f939b4 100644 --- a/pkgs/by-name/np/np/package.nix +++ b/pkgs/by-name/np/np/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Tool to parse, deduplicate, and query multiple port scans"; homepage = "https://github.com/leesoh/np"; changelog = "https://github.com/leesoh/np/releases/tag/v${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "np"; }; } diff --git a/pkgs/by-name/np/nph/package.nix b/pkgs/by-name/np/nph/package.nix index 60aa0d965f06..9b93f5cd87bb 100644 --- a/pkgs/by-name/np/nph/package.nix +++ b/pkgs/by-name/np/nph/package.nix @@ -10,13 +10,13 @@ let nim2 = nim-2_0; }; in -buildNimPackage' (finalAttrs: rec { +buildNimPackage' (finalAttrs: { pname = "nph"; version = "0.6.1"; postPatch = '' substituteInPlace src/nph.nim \ - --replace-fail 'git describe --long --dirty --always --tags' "echo ${version}" + --replace-fail 'git describe --long --dirty --always --tags' "echo ${finalAttrs.version}" ''; src = fetchFromGitHub { diff --git a/pkgs/by-name/np/npm-check/package.nix b/pkgs/by-name/np/npm-check/package.nix index 2c4387a9dcd1..5f75bc5735d4 100644 --- a/pkgs/by-name/np/npm-check/package.nix +++ b/pkgs/by-name/np/npm-check/package.nix @@ -21,12 +21,12 @@ buildNpmPackage rec { dontNpmBuild = true; - meta = with lib; { + meta = { description = "Check for outdated, incorrect, and unused dependencies"; mainProgram = "npm-check"; homepage = "https://github.com/dylang/npm-check"; changelog = "https://github.com/dylang/npm-check/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ maintainers.thomasjm ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.thomasjm ]; }; } diff --git a/pkgs/by-name/nr/nray/package.nix b/pkgs/by-name/nr/nray/package.nix index 475ac85dba52..5a0dca344f49 100644 --- a/pkgs/by-name/nr/nray/package.nix +++ b/pkgs/by-name/nr/nray/package.nix @@ -22,13 +22,13 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Distributed port scanner"; homepage = "https://github.com/nray-scanner/nray"; changelog = "https://github.com/nray-scanner/nray/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "nray"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ns/nsh/package.nix b/pkgs/by-name/ns/nsh/package.nix index 1d378ac5b774..fd1fd049e72f 100644 --- a/pkgs/by-name/ns/nsh/package.nix +++ b/pkgs/by-name/ns/nsh/package.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { doCheck = false; - meta = with lib; { + meta = { description = "Command-line shell like fish, but POSIX compatible"; mainProgram = "nsh"; homepage = "https://github.com/nuta/nsh"; changelog = "https://github.com/nuta/nsh/raw/v${version}/docs/changelog.md"; license = [ - licenses.cc0 # or - licenses.mit + lib.licenses.cc0 # or + lib.licenses.mit ]; - maintainers = with maintainers; [ cafkafk ]; + maintainers = with lib.maintainers; [ cafkafk ]; }; passthru = { diff --git a/pkgs/by-name/ns/nsq/package.nix b/pkgs/by-name/ns/nsq/package.nix index f8290cf52916..b5ece6fe7174 100644 --- a/pkgs/by-name/ns/nsq/package.nix +++ b/pkgs/by-name/ns/nsq/package.nix @@ -24,11 +24,11 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { homepage = "https://nsq.io/"; description = "Realtime distributed messaging platform"; changelog = "https://github.com/nsqio/nsq/raw/v${version}/ChangeLog.md"; - license = licenses.mit; - maintainers = with maintainers; [ blakesmith ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ blakesmith ]; }; } diff --git a/pkgs/by-name/nt/ntfy-alertmanager/package.nix b/pkgs/by-name/nt/ntfy-alertmanager/package.nix index ef87df47b46f..88edb49f9157 100644 --- a/pkgs/by-name/nt/ntfy-alertmanager/package.nix +++ b/pkgs/by-name/nt/ntfy-alertmanager/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorHash = "sha256-8a6dvBERegpFYFHQGJppz5tlQioQAudCe3/Q7vro+ZI="; meta = with lib; { - description = "A bridge between ntfy and Alertmanager"; + description = "Bridge between ntfy and Alertmanager"; homepage = "https://git.xenrox.net/~xenrox/ntfy-alertmanager"; license = licenses.agpl3Only; mainProgram = "ntfy-alertmanager"; diff --git a/pkgs/by-name/nt/ntlmrecon/package.nix b/pkgs/by-name/nt/ntlmrecon/package.nix index 539d55e74fbf..94f47b691f32 100644 --- a/pkgs/by-name/nt/ntlmrecon/package.nix +++ b/pkgs/by-name/nt/ntlmrecon/package.nix @@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec { "ntlmrecon" ]; - meta = with lib; { + meta = { description = "Information enumerator for NTLM authentication enabled web endpoints"; mainProgram = "ntlmrecon"; homepage = "https://github.com/pwnfoo/NTLMRecon"; changelog = "https://github.com/pwnfoo/NTLMRecon/releases/tag/v-${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 78563010798a..3b2e538d82b6 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -25,12 +25,12 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Templates for the nuclei engine to find security vulnerabilities"; homepage = "https://github.com/projectdiscovery/nuclei-templates"; changelog = "https://github.com/projectdiscovery/nuclei-templates/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix index ff0086db8572..718f411c1867 100644 --- a/pkgs/by-name/nu/nuclei/package.nix +++ b/pkgs/by-name/nu/nuclei/package.nix @@ -36,7 +36,7 @@ buildGoModule rec { versionCheckProgramArg = "-version"; - meta = with lib; { + meta = { description = "Tool for configurable targeted scanning"; longDescription = '' Nuclei is used to send requests across targets based on a template @@ -47,8 +47,8 @@ buildGoModule rec { ''; homepage = "https://github.com/projectdiscovery/nuclei"; changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab Misaka13514 ]; diff --git a/pkgs/by-name/nu/nucleiparser/package.nix b/pkgs/by-name/nu/nucleiparser/package.nix index 3b02420f1997..9cd5aac545b5 100644 --- a/pkgs/by-name/nu/nucleiparser/package.nix +++ b/pkgs/by-name/nu/nucleiparser/package.nix @@ -28,12 +28,12 @@ python3.pkgs.buildPythonApplication rec { "nucleiparser" ]; - meta = with lib; { + meta = { description = "Nuclei output parser for CLI"; homepage = "https://github.com/sinkmanu/nucleiparser"; changelog = "https://github.com/Sinkmanu/nucleiparser/releases/tag/${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "nparser"; }; } diff --git a/pkgs/by-name/nu/numberstation/package.nix b/pkgs/by-name/nu/numberstation/package.nix index 2b2db29ab396..27197ab7ad6c 100644 --- a/pkgs/by-name/nu/numberstation/package.nix +++ b/pkgs/by-name/nu/numberstation/package.nix @@ -60,12 +60,12 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - meta = with lib; { + meta = { changelog = "https://git.sr.ht/~martijnbraam/numberstation/refs/${version}"; description = "TOTP Authentication application for mobile"; mainProgram = "numberstation"; homepage = "https://sr.ht/~martijnbraam/numberstation/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix index 4da4d7f0e896..4e0c547d0920 100644 --- a/pkgs/by-name/nu/nurl/package.nix +++ b/pkgs/by-name/nu/nurl/package.nix @@ -48,12 +48,12 @@ rustPlatform.buildRustPackage rec { GEN_ARTIFACTS = "artifacts"; }; - meta = with lib; { + meta = { description = "Command-line tool to generate Nix fetcher calls from repository URLs"; homepage = "https://github.com/nix-community/nurl"; changelog = "https://github.com/nix-community/nurl/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "nurl"; }; } diff --git a/pkgs/by-name/nu/nuv/package.nix b/pkgs/by-name/nu/nuv/package.nix index 0cd295b98b9c..94c50de321cc 100644 --- a/pkgs/by-name/nu/nuv/package.nix +++ b/pkgs/by-name/nu/nuv/package.nix @@ -71,7 +71,7 @@ buildGoModule { meta = { homepage = "https://nuvolaris.io/"; - description = "A CLI tool for running tasks using the Nuvolaris serverless engine"; + description = "CLI tool for running tasks using the Nuvolaris serverless engine"; license = lib.licenses.asl20; mainProgram = "nuv"; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/nv/nvdtools/package.nix b/pkgs/by-name/nv/nvdtools/package.nix index c703af25a703..b0ae310dcd2e 100644 --- a/pkgs/by-name/nv/nvdtools/package.nix +++ b/pkgs/by-name/nv/nvdtools/package.nix @@ -22,11 +22,11 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Tools to work with the feeds (vulnerabilities, CPE dictionary etc.) distributed by National Vulnerability Database"; homepage = "https://github.com/facebookincubator/nvdtools"; changelog = "https://github.com/facebookincubator/nvdtools/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix index 371fdf825d0a..dec6073e3687 100644 --- a/pkgs/by-name/nw/nwg-panel/package.nix +++ b/pkgs/by-name/nw/nwg-panel/package.nix @@ -23,13 +23,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.10.4"; + version = "0.10.6"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; tag = "v${version}"; - hash = "sha256-yONNXCKKUH2P0Bhq2lRh3zNWZGvZG4LUi/ONUozTYmI="; + hash = "sha256-+LnnYP7AA/Gohusk9/lvvxdHpnOfMhBu58UB/LhkMX4="; }; # No tests diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix index 015ca1efd4bc..b4b8f08b630c 100644 --- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix +++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { ''; meta = { - description = "An app runtime based on Chromium and node.js"; + description = "App runtime based on Chromium and node.js"; homepage = "https://nwjs.io/"; platforms = [ "i686-linux" diff --git a/pkgs/by-name/oa/oapi-codegen/package.nix b/pkgs/by-name/oa/oapi-codegen/package.nix index ee2bbcf61521..5deb88e7ed80 100644 --- a/pkgs/by-name/oa/oapi-codegen/package.nix +++ b/pkgs/by-name/oa/oapi-codegen/package.nix @@ -24,12 +24,12 @@ buildGoModule rec { ldflags = [ "-X main.noVCSVersionOverride=${version}" ]; - meta = with lib; { + meta = { description = "Go client and server OpenAPI 3 generator"; homepage = "https://github.com/deepmap/oapi-codegen"; changelog = "https://github.com/deepmap/oapi-codegen/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ j4m3s ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ j4m3s ]; mainProgram = "oapi-codegen"; }; } diff --git a/pkgs/by-name/ob/objfw/package.nix b/pkgs/by-name/ob/objfw/package.nix index 27604339d318..ebda5feb6aa0 100644 --- a/pkgs/by-name/ob/objfw/package.nix +++ b/pkgs/by-name/ob/objfw/package.nix @@ -37,7 +37,7 @@ clangStdenv.mkDerivation (finalAttrs: { }; meta = { - description = "A portable framework for the Objective-C language"; + description = "Portable framework for the Objective-C language"; homepage = "https://objfw.nil.im"; license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.steeleduncan ]; diff --git a/pkgs/by-name/ob/obs-cli/package.nix b/pkgs/by-name/ob/obs-cli/package.nix index cece45f3bf3f..53d52131ade8 100644 --- a/pkgs/by-name/ob/obs-cli/package.nix +++ b/pkgs/by-name/ob/obs-cli/package.nix @@ -29,13 +29,13 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "OBS-cli is a command-line remote control for OBS"; homepage = "https://github.com/muesli/obs-cli"; changelog = "https://github.com/muesli/obs-cli/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ flexiondotorg ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ flexiondotorg ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "obs-cli"; }; } diff --git a/pkgs/by-name/oc/ocelot-desktop/package.nix b/pkgs/by-name/oc/ocelot-desktop/package.nix index 73a127dc1d1c..8369fd56bb15 100644 --- a/pkgs/by-name/oc/ocelot-desktop/package.nix +++ b/pkgs/by-name/oc/ocelot-desktop/package.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "An advanced OpenComputers emulator"; + description = "Advanced OpenComputers emulator"; homepage = "https://ocelot.fomalhaut.me/desktop"; changelog = "https://gitlab.com/cc-ru/ocelot/ocelot-desktop/-/releases/v${finalAttrs.version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/oc/ocm/package.nix b/pkgs/by-name/oc/ocm/package.nix index f9b2fa28dbad..108d85efd83d 100644 --- a/pkgs/by-name/oc/ocm/package.nix +++ b/pkgs/by-name/oc/ocm/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "ocm"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "sha256-0JCmKuSVuSOinJiLDT4dOKNON6PnICum6Smnf3syJfM="; + sha256 = "sha256-NNhHd4++o2nJjG4okx5dWUng9Z2b032goaLq+1eZ+KI="; }; - vendorHash = "sha256-kTgTRRSJe3zvgoy923FRtomJpXqnK1t7MF53QAidyuo="; + vendorHash = "sha256-KlpQO2xi6edysM45ks2m7/3kkEfxACvK/hzrLpHnEic="; # Strip the final binary. ldflags = [ diff --git a/pkgs/by-name/oc/ocrodjvu/package.nix b/pkgs/by-name/oc/ocrodjvu/package.nix index e42ceb81f101..ecd5bce8a5f6 100644 --- a/pkgs/by-name/oc/ocrodjvu/package.nix +++ b/pkgs/by-name/oc/ocrodjvu/package.nix @@ -20,14 +20,14 @@ python3Packages.buildPythonApplication rec { pname = "ocrodjvu"; - version = "0.13.2"; + version = "0.14"; pyproject = true; src = fetchFromGitHub { owner = "FriedrichFroebel"; repo = "ocrodjvu"; - rev = version; - hash = "sha256-EiMCrRFUAJbu9QLgKpFIKqigCZ77lpTDD6AvZuMbyhA="; + tag = version; + hash = "sha256-/TPo8YCE8JKKKBBeV12ilgTNDmuklwfy0TPI/7dBiOs="; }; build-system = with python3Packages; [ @@ -63,13 +63,13 @@ python3Packages.buildPythonApplication rec { "-v" ]; - meta = with lib; { + meta = { description = "Wrapper for OCR systems that allows you to perform OCR on DjVu files"; homepage = "https://github.com/FriedrichFroebel/ocrodjvu"; changelog = "https://github.com/FriedrichFroebel/ocrodjvu/blob/${version}/doc/changelog"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ dansbandit ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ dansbandit ]; mainProgram = "ocrodjvu"; }; } diff --git a/pkgs/by-name/oc/ocsinventory-agent/package.nix b/pkgs/by-name/oc/ocsinventory-agent/package.nix index 890792cd5c4a..d0a30f65e027 100644 --- a/pkgs/by-name/oc/ocsinventory-agent/package.nix +++ b/pkgs/by-name/oc/ocsinventory-agent/package.nix @@ -113,7 +113,7 @@ perlPackages.buildPerlPackage rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "OCS Inventory unified agent for Unix operating systems"; longDescription = '' Open Computers and Software Inventory (OCS) is an application designed @@ -123,12 +123,12 @@ perlPackages.buildPerlPackage rec { homepage = "https://ocsinventory-ng.org"; changelog = "https://github.com/OCSInventory-NG/UnixAgent/releases/tag/v${version}"; downloadPage = "https://github.com/OCSInventory-NG/UnixAgent/releases"; - license = licenses.gpl2Only; + license = lib.licenses.gpl2Only; mainProgram = "ocsinventory-agent"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ totoroot anthonyroussel ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/oc/octosuite/package.nix b/pkgs/by-name/oc/octosuite/package.nix index f1e04885cd23..beaf6f77a857 100644 --- a/pkgs/by-name/oc/octosuite/package.nix +++ b/pkgs/by-name/oc/octosuite/package.nix @@ -40,12 +40,12 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - meta = with lib; { + meta = { description = "Advanced Github OSINT framework"; mainProgram = "octosuite"; homepage = "https://github.com/bellingcat/octosuite"; changelog = "https://github.com/bellingcat/octosuite/releases/tag/${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/od/odo/package.nix b/pkgs/by-name/od/odo/package.nix index 2ebfc08a7669..0eecb5d228ba 100644 --- a/pkgs/by-name/od/odo/package.nix +++ b/pkgs/by-name/od/odo/package.nix @@ -34,12 +34,12 @@ buildGoModule rec { version = "v${version}"; }; - meta = with lib; { + meta = { description = "Developer-focused CLI for OpenShift and Kubernetes"; mainProgram = "odo"; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://odo.dev"; changelog = "https://github.com/redhat-developer/odo/releases/v${version}"; - maintainers = with maintainers; [ stehessel ]; + maintainers = with lib.maintainers; [ stehessel ]; }; } diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix index 4dabb4db14d7..8c82969e8ebb 100644 --- a/pkgs/by-name/of/offat/package.nix +++ b/pkgs/by-name/of/offat/package.nix @@ -52,12 +52,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "offat" ]; - meta = with lib; { + meta = { description = "Tool to test APIs for prevalent vulnerabilities"; homepage = "https://github.com/OWASP/OFFAT/"; changelog = "https://github.com/OWASP/OFFAT/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "offat"; }; } diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index dd5246da78a9..639b88560c98 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorHash = "sha256-BucMDbubJ+gEb5tBBSOf+P0A+KkDnUSAJRALyL9uhXU="; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; ldflags = [ "-s" diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index e0443aa161ab..bf49a3478d1b 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec { # tests don't work inside the sandbox doCheck = false; - meta = with lib; { + meta = { description = "HTTP load generator inspired by rakyll/hey with tui animation"; homepage = "https://github.com/hatoo/oha"; changelog = "https://github.com/hatoo/oha/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "oha"; }; } diff --git a/pkgs/by-name/ol/olaris-server/package.nix b/pkgs/by-name/ol/olaris-server/package.nix index 5449ea448ac3..bd7015506693 100644 --- a/pkgs/by-name/ol/olaris-server/package.nix +++ b/pkgs/by-name/ol/olaris-server/package.nix @@ -57,11 +57,11 @@ buildGoModule rec { wrapProgram $out/bin/olaris-server --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} ''; - meta = with lib; { + meta = { description = "Media manager and transcoding server"; homepage = "https://gitlab.com/olaris/olaris-server"; changelog = "https://gitlab.com/olaris/olaris-server/-/releases/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ urandom ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ urandom ]; }; } diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix index e39081ae01fa..099f91830fc5 100644 --- a/pkgs/by-name/ol/olivetin/package.nix +++ b/pkgs/by-name/ol/olivetin/package.nix @@ -81,13 +81,13 @@ buildGoModule ( { pname = "olivetin"; - version = "2025.6.1"; + version = "2025.6.6"; src = fetchFromGitHub { owner = "OliveTin"; repo = "OliveTin"; tag = finalAttrs.version; - hash = "sha256-Bd+zxVEhP7LZk74Mfai/MkML1pKlPBKm4kh4jAkC/kQ="; + hash = "sha256-yzAuhrkJEBErf9yYuRoq5B7PT0XA0w668AG5LNSSRFM="; }; modRoot = "service"; diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix index d885a6601df9..9e4076306615 100644 --- a/pkgs/by-name/om/omnom/package.nix +++ b/pkgs/by-name/om/omnom/package.nix @@ -78,7 +78,7 @@ buildGoModule (finalAttrs: { ''; meta = { - description = "A webpage bookmarking and snapshotting service"; + description = "Webpage bookmarking and snapshotting service"; homepage = "https://github.com/asciimoo/omnom"; license = lib.licenses.agpl3Only; teams = [ lib.teams.ngi ]; diff --git a/pkgs/by-name/on/oncall/package.nix b/pkgs/by-name/on/oncall/package.nix index 4c56b281699c..f2f246aceb85 100644 --- a/pkgs/by-name/on/oncall/package.nix +++ b/pkgs/by-name/on/oncall/package.nix @@ -100,8 +100,8 @@ python3.pkgs.buildPythonApplication rec { }; meta = { - description = "A calendar web-app designed for scheduling and managing on-call shifts"; - homepage = "http://oncall.tools"; + description = "Calendar web-app designed for scheduling and managing on-call shifts"; + homepage = "https://oncall.tools"; changelog = "https://github.com/linkedin/oncall/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ onny ]; diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix index d4ca51341cae..823e3767f18c 100644 --- a/pkgs/by-name/on/onefetch/package.nix +++ b/pkgs/by-name/on/onefetch/package.nix @@ -64,12 +64,12 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/onefetch --generate zsh) ''; - meta = with lib; { + meta = { description = "Git repository summary on your terminal"; homepage = "https://github.com/o2sh/onefetch"; changelog = "https://github.com/o2sh/onefetch/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne figsoda kloenk diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix index 99cb30ccf703..7d2ae1fb3fd4 100644 --- a/pkgs/by-name/op/opa-envoy-plugin/package.nix +++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix @@ -67,7 +67,7 @@ buildGoModule rec { mainProgram = "opa"; homepage = "https://www.openpolicyagent.org/docs/latest/envoy-introduction/"; changelog = "https://github.com/open-policy-agent/opa-envoy-plugin/blob/v${version}/CHANGELOG.md"; - description = "A plugin to enforce OPA policies with Envoy"; + description = "Plugin to enforce OPA policies with Envoy"; longDescription = '' OPA-Envoy extends OPA with a gRPC server that implements the Envoy External Authorization API. You can use this version of OPA to enforce diff --git a/pkgs/by-name/op/opcr-policy/package.nix b/pkgs/by-name/op/opcr-policy/package.nix index 7a9d9eb298aa..c4a5fdc98f97 100644 --- a/pkgs/by-name/op/opcr-policy/package.nix +++ b/pkgs/by-name/op/opcr-policy/package.nix @@ -38,7 +38,7 @@ buildGoModule rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { mainProgram = "policy"; homepage = "https://www.openpolicyregistry.io/"; changelog = "https://github.com/opcr-io/policy/releases/tag/v${version}"; @@ -47,8 +47,8 @@ buildGoModule rec { The policy CLI is a tool for building, versioning and publishing your authorization policies. It uses OCI standards to manage artifacts, and the Open Policy Agent (OPA) to compile and run. ''; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ naphta jk ]; diff --git a/pkgs/by-name/op/openapi-changes/package.nix b/pkgs/by-name/op/openapi-changes/package.nix index 014a89e7caa4..f878e338c8cf 100644 --- a/pkgs/by-name/op/openapi-changes/package.nix +++ b/pkgs/by-name/op/openapi-changes/package.nix @@ -35,11 +35,11 @@ buildGoModule rec { rev-prefix = "v"; }; - meta = with lib; { + meta = { description = "World's sexiest OpenAPI breaking changes detector"; homepage = "https://pb33f.io/openapi-changes/"; changelog = "https://github.com/pb33f/openapi-changes/releases/tag/v${version}"; - license = licenses.gpl3; - maintainers = with maintainers; [ mguentner ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ mguentner ]; }; } diff --git a/pkgs/by-name/op/openbgpd/package.nix b/pkgs/by-name/op/openbgpd/package.nix index a6decdcf8ff6..7c33126a56a4 100644 --- a/pkgs/by-name/op/openbgpd/package.nix +++ b/pkgs/by-name/op/openbgpd/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { - description = "A free implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol"; + description = "Free implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol"; license = licenses.isc; homepage = "http://www.openbgpd.org/"; maintainers = with maintainers; [ kloenk ]; diff --git a/pkgs/by-name/op/openfortivpn-webview-qt/package.nix b/pkgs/by-name/op/openfortivpn-webview-qt/package.nix index 59e8a2576a6e..b51ecd5d7755 100644 --- a/pkgs/by-name/op/openfortivpn-webview-qt/package.nix +++ b/pkgs/by-name/op/openfortivpn-webview-qt/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { rev = "v${version}-electron"; hash = "sha256-jGDCFdqRfnYwUgVs3KO1pDr52JgkYVRHi2KvABaZFl4="; }; - sourceRoot = "source/openfortivpn-webview-qt"; + sourceRoot = "${src.name}/openfortivpn-webview-qt"; nativeBuildInputs = [ qt6Packages.wrapQtAppsHook diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix index 045976f632e2..834f83c5e82a 100644 --- a/pkgs/by-name/op/opengrok/package.nix +++ b/pkgs/by-name/op/opengrok/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Source code search and cross reference engine"; mainProgram = "opengrok"; homepage = "https://opengrok.github.io/OpenGrok/"; changelog = "https://github.com/oracle/opengrok/releases/tag/${version}"; - license = licenses.cddl; - maintainers = [ ]; - platforms = platforms.all; + license = lib.licenses.cddl; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index d70de0343f30..4bb6ff2b2fbf 100644 --- a/pkgs/by-name/op/openimagedenoise/package.nix +++ b/pkgs/by-name/op/openimagedenoise/package.nix @@ -53,12 +53,12 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "TBB_ROOT" "${tbb}") ]; - meta = with lib; { + meta = { homepage = "https://www.openimagedenoise.org"; description = "High-Performance Denoising Library for Ray Tracing"; - license = licenses.asl20; - maintainers = [ maintainers.leshainc ]; - platforms = platforms.unix; - changelog = "https://github.com/RenderKit/oidn/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.leshainc ]; + platforms = lib.platforms.unix; + changelog = "https://github.com/RenderKit/oidn/blob/v${finalAttrs.version}/CHANGELOG.md"; }; }) diff --git a/pkgs/by-name/op/openjpeg/package.nix b/pkgs/by-name/op/openjpeg/package.nix index 8462ce052540..37e66bf7cd6c 100644 --- a/pkgs/by-name/op/openjpeg/package.nix +++ b/pkgs/by-name/op/openjpeg/package.nix @@ -127,12 +127,12 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { description = "Open-source JPEG 2000 codec written in C language"; homepage = "https://www.openjpeg.org/"; - license = licenses.bsd2; - maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ codyopel ]; + platforms = lib.platforms.all; changelog = "https://github.com/uclouvain/openjpeg/blob/v${version}/CHANGELOG.md"; }; } diff --git a/pkgs/by-name/op/openllm/package.nix b/pkgs/by-name/op/openllm/package.nix index f25286d4608b..c5b129189acb 100644 --- a/pkgs/by-name/op/openllm/package.nix +++ b/pkgs/by-name/op/openllm/package.nix @@ -62,12 +62,12 @@ python.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "openllm" ]; - meta = with lib; { + meta = { description = "Run any open-source LLMs, such as Llama 3.1, Gemma, as OpenAI compatible API endpoint in the cloud"; homepage = "https://github.com/bentoml/OpenLLM"; changelog = "https://github.com/bentoml/OpenLLM/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada natsukium ]; diff --git a/pkgs/by-name/op/openorienteering-mapper/package.nix b/pkgs/by-name/op/openorienteering-mapper/package.nix index e13124d94dac..53d907d0feb8 100644 --- a/pkgs/by-name/op/openorienteering-mapper/package.nix +++ b/pkgs/by-name/op/openorienteering-mapper/package.nix @@ -92,16 +92,16 @@ stdenv.mkDerivation rec { ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/Mapper ''; - meta = with lib; { + meta = { homepage = "https://www.openorienteering.org/apps/mapper/"; description = "Orienteering mapmaking program"; changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ mpickering sikmir ]; - platforms = with platforms; unix; + platforms = with lib.platforms; unix; mainProgram = "Mapper"; }; } diff --git a/pkgs/by-name/op/openrisk/package.nix b/pkgs/by-name/op/openrisk/package.nix index 827870fab749..a59c919ff5dd 100644 --- a/pkgs/by-name/op/openrisk/package.nix +++ b/pkgs/by-name/op/openrisk/package.nix @@ -27,12 +27,12 @@ buildGoModule rec { doInstallCheck = true; - meta = with lib; { + meta = { description = "Tool that generates an AI-based risk score"; homepage = "https://github.com/projectdiscovery/openrisk"; changelog = "https://github.com/projectdiscovery/openrisk/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "openrisk"; }; } diff --git a/pkgs/by-name/op/opensupaplex/package.nix b/pkgs/by-name/op/opensupaplex/package.nix index 66a2079282ce..b1cbe51469f0 100644 --- a/pkgs/by-name/op/opensupaplex/package.nix +++ b/pkgs/by-name/op/opensupaplex/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "A decompilation of Supaplex in C and SDL"; + description = "Decompilation of Supaplex in C and SDL"; homepage = "https://github.com/sergiou87/open-supaplex"; changelog = "https://github.com/sergiou87/open-supaplex/blob/master/changelog/v${version}.txt"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/op/opentimestamps-client/package.nix b/pkgs/by-name/op/opentimestamps-client/package.nix index bb563188ca97..2b59a51f67b0 100644 --- a/pkgs/by-name/op/opentimestamps-client/package.nix +++ b/pkgs/by-name/op/opentimestamps-client/package.nix @@ -31,12 +31,12 @@ python3.pkgs.buildPythonApplication rec { "otsclient" ]; - meta = with lib; { + meta = { description = "Command-line tool to create and verify OpenTimestamps proofs"; mainProgram = "ots"; homepage = "https://github.com/opentimestamps/opentimestamps-client"; changelog = "https://github.com/opentimestamps/opentimestamps-client/releases/tag/opentimestamps-client-v${version}"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ erikarvstedt ]; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ erikarvstedt ]; }; } diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix index 6c7c2792d443..6e7352c977d9 100644 --- a/pkgs/by-name/op/opentofu/package.nix +++ b/pkgs/by-name/op/opentofu/package.nix @@ -60,12 +60,12 @@ let subPackages = [ "./cmd/..." ]; - meta = with lib; { + meta = { description = "Tool for building, changing, and versioning infrastructure"; homepage = "https://opentofu.org/"; changelog = "https://github.com/opentofu/opentofu/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ nickcao zowoq ]; diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix index e9fa46d811e1..ba0493a7b767 100644 --- a/pkgs/by-name/op/openvswitch/package.nix +++ b/pkgs/by-name/op/openvswitch/package.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; description = "Multilayer virtual switch"; longDescription = '' @@ -148,13 +148,13 @@ stdenv.mkDerivation rec { to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. ''; homepage = "https://www.openvswitch.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ adamcstephens kmcopper netixx xddxdd ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/op/operator-sdk/package.nix b/pkgs/by-name/op/operator-sdk/package.nix index f6298e4a85c0..6650daf86c61 100644 --- a/pkgs/by-name/op/operator-sdk/package.nix +++ b/pkgs/by-name/op/operator-sdk/package.nix @@ -41,12 +41,12 @@ buildGoModule rec { wrapProgram $out/bin/operator-sdk --prefix PATH : ${lib.makeBinPath [ go ]} ''; - meta = with lib; { + meta = { description = "SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding"; homepage = "https://github.com/operator-framework/operator-sdk"; changelog = "https://github.com/operator-framework/operator-sdk/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ arnarg ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ arnarg ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/op/opkg/package.nix b/pkgs/by-name/op/opkg/package.nix index 43eb194ba962..478c606ba1e5 100644 --- a/pkgs/by-name/op/opkg/package.nix +++ b/pkgs/by-name/op/opkg/package.nix @@ -44,12 +44,12 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - meta = with lib; { + meta = { description = "Lightweight package management system based upon ipkg"; homepage = "https://git.yoctoproject.org/cgit/cgit.cgi/opkg/"; changelog = "https://git.yoctoproject.org/opkg/tree/NEWS?h=v${version}"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ pSub ]; }; } diff --git a/pkgs/by-name/op/opsdroid/package.nix b/pkgs/by-name/op/opsdroid/package.nix index 09733948dadf..d0a0166a1af7 100644 --- a/pkgs/by-name/op/opsdroid/package.nix +++ b/pkgs/by-name/op/opsdroid/package.nix @@ -63,16 +63,16 @@ python3Packages.buildPythonPackage rec { # Tests are not included in releases doCheck = false; - meta = with lib; { + meta = { description = "Open source chat-ops bot framework"; homepage = "https://opsdroid.dev"; changelog = "https://github.com/opsdroid/opsdroid/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ globin willibutz ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "opsdroid"; }; } diff --git a/pkgs/by-name/op/optional-lite/package.nix b/pkgs/by-name/op/optional-lite/package.nix index aa07b6be1936..062e09519e6d 100644 --- a/pkgs/by-name/op/optional-lite/package.nix +++ b/pkgs/by-name/op/optional-lite/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library"; + description = "C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library"; homepage = "https://github.com/martinmoene/optional-lite"; changelog = "https://github.com/martinmoene/optional-lite/blob/v${finalAttrs.version}/CHANGES.txt"; license = lib.licenses.boost; diff --git a/pkgs/by-name/or/orbuculum/package.nix b/pkgs/by-name/or/orbuculum/package.nix index eeef29d76404..00c54c260a1a 100644 --- a/pkgs/by-name/or/orbuculum/package.nix +++ b/pkgs/by-name/or/orbuculum/package.nix @@ -49,12 +49,12 @@ stdenv.mkDerivation rec { cp $src/Support/60-orbcode.rules $out/etc/udev/rules.d/ ''; - meta = with lib; { + meta = { description = "Cortex M SWO SWV Demux and Postprocess for the ORBTrace"; homepage = "https://orbcode.org"; changelog = "https://github.com/orbcode/orbuculum/blob/V${version}/CHANGES.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ newam ]; - platforms = platforms.linux; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ newam ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/os/osinfo-db/package.nix b/pkgs/by-name/os/osinfo-db/package.nix index 121d051761de..5e39efb7c50e 100644 --- a/pkgs/by-name/os/osinfo-db/package.nix +++ b/pkgs/by-name/os/osinfo-db/package.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { osinfo-db-import --dir "$out/share/osinfo" "${src}" ''; - meta = with lib; { + meta = { description = "Osinfo database of information about operating systems for virtualization provisioning tools"; homepage = "https://gitlab.com/libosinfo/osinfo-db/"; changelog = "https://gitlab.com/libosinfo/osinfo-db/-/commits/v${version}"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.bjornfor ]; }; } diff --git a/pkgs/by-name/os/osquery/toolchain-bin.nix b/pkgs/by-name/os/osquery/toolchain-bin.nix index 5a12e7fb3746..3d05ee9f1e2f 100644 --- a/pkgs/by-name/os/osquery/toolchain-bin.nix +++ b/pkgs/by-name/os/osquery/toolchain-bin.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A LLVM-based toolchain for Linux designed to build a portable osquery"; + description = "LLVM-based toolchain for Linux designed to build a portable osquery"; homepage = "https://github.com/osquery/osquery-toolchain"; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/os/ossutil/package.nix b/pkgs/by-name/os/ossutil/package.nix index 80f5b13a7803..58ff83fd85c7 100644 --- a/pkgs/by-name/os/ossutil/package.nix +++ b/pkgs/by-name/os/ossutil/package.nix @@ -20,12 +20,12 @@ buildGoModule rec { # don't run tests as they require secret access keys that only travis has doCheck = false; - meta = with lib; { + meta = { description = "User friendly command line tool to access Alibaba Cloud OSS"; homepage = "https://github.com/aliyun/ossutil"; changelog = "https://github.com/aliyun/ossutil/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ jpetrucciani ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jpetrucciani ]; mainProgram = "ossutil"; }; } diff --git a/pkgs/by-name/os/osv-detector/package.nix b/pkgs/by-name/os/osv-detector/package.nix index 76fb133961d0..ea2b3973ab17 100644 --- a/pkgs/by-name/os/osv-detector/package.nix +++ b/pkgs/by-name/os/osv-detector/package.nix @@ -50,12 +50,12 @@ buildGoModule rec { version = "osv-detector ${version} (unknown, commit none)"; }; - meta = with lib; { + meta = { description = "Auditing tool for detecting vulnerabilities"; mainProgram = "osv-detector"; homepage = "https://github.com/G-Rath/osv-detector"; changelog = "https://github.com/G-Rath/osv-detector/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix index 761c89ca810b..b6a1dbd7ce05 100644 --- a/pkgs/by-name/os/osv-scanner/package.nix +++ b/pkgs/by-name/os/osv-scanner/package.nix @@ -38,13 +38,13 @@ buildGoModule rec { package = osv-scanner; }; - meta = with lib; { + meta = { description = "Vulnerability scanner written in Go which uses the data provided by https://osv.dev"; mainProgram = "osv-scanner"; homepage = "https://github.com/google/osv-scanner"; changelog = "https://github.com/google/osv-scanner/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ stehessel urandom ]; diff --git a/pkgs/by-name/ot/otel-cli/package.nix b/pkgs/by-name/ot/otel-cli/package.nix index 0ed768400d9d..274a3b48e395 100644 --- a/pkgs/by-name/ot/otel-cli/package.nix +++ b/pkgs/by-name/ot/otel-cli/package.nix @@ -39,11 +39,11 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { homepage = "https://github.com/equinix-labs/otel-cli"; description = "Command-line tool for sending OpenTelemetry traces"; changelog = "https://github.com/equinix-labs/otel-cli/releases/tag/v${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ emattiza urandom diff --git a/pkgs/by-name/ot/otel-desktop-viewer/package.nix b/pkgs/by-name/ot/otel-desktop-viewer/package.nix index 16dc72a29d76..7eb7e5778385 100644 --- a/pkgs/by-name/ot/otel-desktop-viewer/package.nix +++ b/pkgs/by-name/ot/otel-desktop-viewer/package.nix @@ -39,12 +39,12 @@ buildGoModule rec { command = "otel-desktop-viewer --version"; }; - meta = with lib; { + meta = { changelog = "https://github.com/CtrlSpice/otel-desktop-viewer/releases/tag/v${version}"; description = "Receive & visualize OpenTelemtry traces locally within one CLI tool"; homepage = "https://github.com/CtrlSpice/otel-desktop-viewer"; - license = licenses.asl20; - maintainers = with maintainers; [ gaelreyrol ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ gaelreyrol ]; mainProgram = "otel-desktop-viewer"; }; } diff --git a/pkgs/by-name/ot/otpclient/package.nix b/pkgs/by-name/ot/otpclient/package.nix index 663366299cef..e286f04ffbab 100644 --- a/pkgs/by-name/ot/otpclient/package.nix +++ b/pkgs/by-name/ot/otpclient/package.nix @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { zbar ]; - meta = with lib; { + meta = { description = "Highly secure and easy to use OTP client written in C/GTK that supports both TOTP and HOTP"; homepage = "https://github.com/paolostivanin/OTPClient"; changelog = "https://github.com/paolostivanin/OTPClient/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ alexbakker ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ alexbakker ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ot/ots/package.nix b/pkgs/by-name/ot/ots/package.nix index e370123c6f71..861c632dbd9f 100644 --- a/pkgs/by-name/ot/ots/package.nix +++ b/pkgs/by-name/ot/ots/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-X main.buildSource=nix" ]; - meta = with lib; { + meta = { description = "Share end-to-end encrypted secrets with others via a one-time URL"; mainProgram = "ots"; homepage = "https://ots.sniptt.com"; changelog = "https://github.com/sniptt-official/ots/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ elliot ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ elliot ]; }; } diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix index 9044782ea4d4..539f64907e9b 100644 --- a/pkgs/by-name/ou/ouch/package.nix +++ b/pkgs/by-name/ou/ouch/package.nix @@ -53,12 +53,12 @@ rustPlatform.buildRustPackage rec { env.OUCH_ARTIFACTS_FOLDER = "artifacts"; - meta = with lib; { + meta = { description = "Command-line utility for easily compressing and decompressing files and directories"; homepage = "https://github.com/ouch-org/ouch"; changelog = "https://github.com/ouch-org/ouch/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda psibi krovuxdev diff --git a/pkgs/by-name/ou/outfox/package.nix b/pkgs/by-name/ou/outfox/package.nix index 693d757ff9f2..5bfe4933dc47 100644 --- a/pkgs/by-name/ou/outfox/package.nix +++ b/pkgs/by-name/ou/outfox/package.nix @@ -70,19 +70,19 @@ stdenv.mkDerivation rec { makeWrapper $out/share/OutFox/OutFox $out/bin/OutFox --argv0 ''; - meta = with lib; { + meta = { description = "Rhythm game engine forked from StepMania"; homepage = "https://projectoutfox.com"; changelog = "https://projectoutfox.com/releases/${version}"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "armv7l-linux" ]; - maintainers = with maintainers; [ maxwell-lt ]; + maintainers = with lib.maintainers; [ maxwell-lt ]; mainProgram = "OutFox"; }; } diff --git a/pkgs/by-name/ou/outputcheck/package.nix b/pkgs/by-name/ou/outputcheck/package.nix index 9025c26c5ec5..3b2f06857bd4 100644 --- a/pkgs/by-name/ou/outputcheck/package.nix +++ b/pkgs/by-name/ou/outputcheck/package.nix @@ -43,12 +43,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "OutputCheck" ]; - meta = with lib; { + meta = { description = "Tool for checking tool output inspired by LLVM's FileCheck"; homepage = "https://github.com/stp/OutputCheck"; changelog = "https://github.com/stp/OutputCheck/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ fsagbuya ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fsagbuya ]; mainProgram = "OutputCheck"; }; } diff --git a/pkgs/by-name/ov/ov/package.nix b/pkgs/by-name/ov/ov/package.nix index c181967c0f70..ca8d6a5b2b63 100644 --- a/pkgs/by-name/ov/ov/package.nix +++ b/pkgs/by-name/ov/ov/package.nix @@ -68,12 +68,12 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "Feature-rich terminal-based text viewer"; homepage = "https://noborus.github.io/ov"; changelog = "https://github.com/noborus/ov/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ farcaller figsoda ]; diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix index 7b76d5fd1630..df9cef98e404 100644 --- a/pkgs/by-name/ov/overskride/package.nix +++ b/pkgs/by-name/ov/overskride/package.nix @@ -77,14 +77,14 @@ rustPlatform.buildRustPackage { glib-compile-schemas $out/share/gsettings-schemas/${name}-${version}/glib-2.0/schemas ''; - meta = with lib; { - description = "A Bluetooth and Obex client that is straight to the point, DE/WM agnostic, and beautiful"; + meta = { + description = "Bluetooth and Obex client that is straight to the point, DE/WM agnostic, and beautiful"; homepage = "https://github.com/${owner}/${name}"; changelog = "https://github.com/${owner}/${name}/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; mainProgram = name; - maintainers = with maintainers; [ mrcjkb ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ mrcjkb ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ov/oversteer/package.nix b/pkgs/by-name/ov/oversteer/package.nix index f172c3196292..81a8c2368ccc 100644 --- a/pkgs/by-name/ov/oversteer/package.nix +++ b/pkgs/by-name/ov/oversteer/package.nix @@ -95,13 +95,13 @@ stdenv.mkDerivation { patches = [ ]; - meta = with lib; { + meta = { homepage = "https://github.com/berarma/oversteer"; changelog = "https://github.com/berarma/oversteer/releases/tag/${version}"; description = "Steering Wheel Manager for Linux"; mainProgram = "oversteer"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.srounce ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.srounce ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix index 082265addff8..7c860ea74c23 100644 --- a/pkgs/by-name/ow/owmods-cli/package.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -61,14 +61,14 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "CLI version of the mod manager for Outer Wilds Mod Loader"; homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_cli"; downloadPage = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; mainProgram = "owmods"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ bwc9876 spoonbaker locochoco diff --git a/pkgs/by-name/ow/owncloud-client/package.nix b/pkgs/by-name/ow/owncloud-client/package.nix index 1ff93232c75a..3ee82ec6f1cc 100644 --- a/pkgs/by-name/ow/owncloud-client/package.nix +++ b/pkgs/by-name/ow/owncloud-client/package.nix @@ -54,15 +54,15 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Synchronise your ownCloud with your computer using this desktop client"; homepage = "https://owncloud.org"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ qknight hellwolf ]; - platforms = platforms.unix; - license = licenses.gpl2Plus; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; changelog = "https://github.com/owncloud/client/releases/tag/v${version}"; }; } diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix index 93980b2e1bf2..092a8b8a1fe5 100644 --- a/pkgs/by-name/ox/ox/package.nix +++ b/pkgs/by-name/ox/ox/package.nix @@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Independent Rust text editor that runs in your terminal"; homepage = "https://github.com/curlpipe/ox"; changelog = "https://github.com/curlpipe/ox/releases/tag/${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ moni kachick ]; diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix index 3176d0ffcdd1..ceeb53b7d3cf 100644 --- a/pkgs/by-name/ox/oxide-rs/package.nix +++ b/pkgs/by-name/ox/oxide-rs/package.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { }; meta = { - description = "The Oxide Rust SDK and CLI"; + description = "Oxide Rust SDK and CLI"; homepage = "https://github.com/oxidecomputer/oxide.rs"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/pa/packer/package.nix b/pkgs/by-name/pa/packer/package.nix index 2205a6059f8e..8f8f0ac3baf4 100644 --- a/pkgs/by-name/pa/packer/package.nix +++ b/pkgs/by-name/pa/packer/package.nix @@ -31,11 +31,11 @@ buildGoModule rec { installShellCompletion --zsh contrib/zsh-completion/_packer ''; - meta = with lib; { + meta = { description = "Tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; - license = licenses.bsl11; - maintainers = with maintainers; [ + license = lib.licenses.bsl11; + maintainers = with lib.maintainers; [ zimbatm ma27 techknowlogick diff --git a/pkgs/by-name/pa/packj/package.nix b/pkgs/by-name/pa/packj/package.nix index 831955d9ef28..e8e3f3458602 100644 --- a/pkgs/by-name/pa/packj/package.nix +++ b/pkgs/by-name/pa/packj/package.nix @@ -52,12 +52,12 @@ python3.pkgs.buildPythonApplication rec { "packj" ]; - meta = with lib; { + meta = { description = "Tool to detect malicious/vulnerable open-source dependencies"; homepage = "https://github.com/ossillate-inc/packj"; changelog = "https://github.com/ossillate-inc/packj/releases/tag/v${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "packj"; }; } diff --git a/pkgs/by-name/pa/pacproxy/package.nix b/pkgs/by-name/pa/pacproxy/package.nix index 5bb1937f7aeb..9113a731f69b 100644 --- a/pkgs/by-name/pa/pacproxy/package.nix +++ b/pkgs/by-name/pa/pacproxy/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { vendorHash = "sha256-0Go+xwzaT1qt+cJfcPkC8ft3eB/OZCvOi2Pnn/A/rtQ="; - meta = with lib; { + meta = { description = "No-frills local HTTP proxy server powered by a proxy auto-config (PAC) file"; homepage = "https://github.com/williambailey/pacproxy"; changelog = "https://github.com/williambailey/pacproxy/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ terlar ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ terlar ]; mainProgram = "pacproxy"; }; } diff --git a/pkgs/by-name/pa/pactorio/package.nix b/pkgs/by-name/pa/pactorio/package.nix index ae57c9eac102..4dffe957b138 100644 --- a/pkgs/by-name/pa/pactorio/package.nix +++ b/pkgs/by-name/pa/pactorio/package.nix @@ -35,12 +35,12 @@ rustPlatform.buildRustPackage rec { GEN_ARTIFACTS = "artifacts"; - meta = with lib; { + meta = { description = "Mod packager for factorio"; mainProgram = "pactorio"; homepage = "https://github.com/figsoda/pactorio"; changelog = "https://github.com/figsoda/pactorio/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix index 14ee0c3ab078..a2e389fba97f 100644 --- a/pkgs/by-name/pa/pacu/package.nix +++ b/pkgs/by-name/pa/pacu/package.nix @@ -72,12 +72,12 @@ python.pkgs.buildPythonApplication rec { "test_update_second_time" ]; - meta = with lib; { + meta = { description = "AWS exploitation framework"; homepage = "https://github.com/RhinoSecurityLabs/pacu"; changelog = "https://github.com/RhinoSecurityLabs/pacu/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "pacu"; }; } diff --git a/pkgs/by-name/pa/padre/package.nix b/pkgs/by-name/pa/padre/package.nix index c24ee299579c..b0c23dd8d653 100644 --- a/pkgs/by-name/pa/padre/package.nix +++ b/pkgs/by-name/pa/padre/package.nix @@ -22,13 +22,13 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Advanced exploiting tool for Padding Oracle attacks against CBC mode encryption"; homepage = "https://github.com/glebarez/padre"; changelog = "https://github.com/glebarez/padre/releases/tag/v${version}"; # https://github.com/glebarez/padre/issues/28 - license = licenses.unfree; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "padre"; }; } diff --git a/pkgs/by-name/pa/pam_u2f/package.nix b/pkgs/by-name/pa/pam_u2f/package.nix index 772fff0f4183..749fe8ffaf6c 100644 --- a/pkgs/by-name/pa/pam_u2f/package.nix +++ b/pkgs/by-name/pa/pam_u2f/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pam_u2f = nixosTests.pam-u2f; }; - meta = with lib; { + meta = { homepage = "https://developers.yubico.com/pam-u2f/"; description = "PAM module for allowing authentication with a U2F device"; changelog = "https://github.com/Yubico/pam-u2f/raw/pam_u2f-${version}/NEWS"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ philandstuff ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ philandstuff ]; mainProgram = "pamu2fcfg"; }; } diff --git a/pkgs/by-name/pa/parquet-tools/package.nix b/pkgs/by-name/pa/parquet-tools/package.nix index 92771bad07f5..87dcc052da56 100644 --- a/pkgs/by-name/pa/parquet-tools/package.nix +++ b/pkgs/by-name/pa/parquet-tools/package.nix @@ -71,12 +71,12 @@ python3Packages.buildPythonApplication rec { "parquet_tools" ]; - meta = with lib; { + meta = { description = "CLI tool for parquet files"; homepage = "https://github.com/ktrueda/parquet-tools"; changelog = "https://github.com/ktrueda/parquet-tools/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ cpcloud ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ cpcloud ]; mainProgram = "parquet-tools"; }; } diff --git a/pkgs/by-name/pa/particle-cli/package.nix b/pkgs/by-name/pa/particle-cli/package.nix index a9c92a460687..66864caab6c3 100644 --- a/pkgs/by-name/pa/particle-cli/package.nix +++ b/pkgs/by-name/pa/particle-cli/package.nix @@ -8,16 +8,16 @@ buildNpmPackage (finalAttrs: { pname = "particle-cli"; - version = "3.35.11"; + version = "3.36.1"; src = fetchFromGitHub { owner = "particle-iot"; repo = "particle-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-LqQAdyaNSyWDPZEZWnUT1NLbmRkuBVn4yUXgBlU5EUI="; + hash = "sha256-7u0RXoUBu/aJSBVSdmheIPvQ6b6Vji2KZ2t3sNhh3kY="; }; - npmDepsHash = "sha256-CpDZrnOZFD42jIoyGCWiYoQgA2Bn2iwaOrSx0SdihTk="; + npmDepsHash = "sha256-0yLu3iyHQwWId+EAXu4dlCNHvuFZeEts2r5Y+FpHPQI="; buildInputs = [ udev diff --git a/pkgs/by-name/pa/passdetective/package.nix b/pkgs/by-name/pa/passdetective/package.nix index 842de021361f..e26f4845690b 100644 --- a/pkgs/by-name/pa/passdetective/package.nix +++ b/pkgs/by-name/pa/passdetective/package.nix @@ -25,12 +25,12 @@ buildGoModule rec { "-X=main.build=${version}" ]; - meta = with lib; { + meta = { description = "Scans command history to detect mistakenly written passwords, API keys, and secrets"; homepage = "https://github.com/aydinnyunus/PassDetective"; changelog = "https://github.com/aydinnyunus/PassDetective/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ octodi ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ octodi ]; mainProgram = "PassDetective"; }; } diff --git a/pkgs/by-name/pa/past-time/package.nix b/pkgs/by-name/pa/past-time/package.nix index 249526583c13..a8f08ed4578b 100644 --- a/pkgs/by-name/pa/past-time/package.nix +++ b/pkgs/by-name/pa/past-time/package.nix @@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec { "past_time" ]; - meta = with lib; { + meta = { description = "Tool to visualize the progress of the year based on the past days"; homepage = "https://github.com/fabaff/past-time"; changelog = "https://github.com/fabaff/past-time/releases/tag/${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "past-time"; }; } diff --git a/pkgs/by-name/pa/pastel/package.nix b/pkgs/by-name/pa/pastel/package.nix index 87e3cfb3887d..cee0011aaff7 100644 --- a/pkgs/by-name/pa/pastel/package.nix +++ b/pkgs/by-name/pa/pastel/package.nix @@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug="; - meta = with lib; { + meta = { description = "Command-line tool to generate, analyze, convert and manipulate colors"; homepage = "https://github.com/sharkdp/pastel"; changelog = "https://github.com/sharkdp/pastel/releases/tag/v${version}"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "pastel"; }; } diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index 08db95c2d00e..8269b2c3105c 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -30,12 +30,12 @@ buildGoModule rec { version = version; }; - meta = with lib; { + meta = { description = "Create pull requests from patches without cloning the repository"; homepage = "https://github.com/bluekeyes/patch2pr"; changelog = "https://github.com/bluekeyes/patch2pr/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ katrinafyi ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ katrinafyi ]; mainProgram = "patch2pr"; }; } diff --git a/pkgs/by-name/pa/patchcil/package.nix b/pkgs/by-name/pa/patchcil/package.nix index d0bdfb97c7b2..4f019dfe4516 100644 --- a/pkgs/by-name/pa/patchcil/package.nix +++ b/pkgs/by-name/pa/patchcil/package.nix @@ -59,7 +59,7 @@ buildDotnetModule rec { }; meta = { - description = "A small utility to modify the library paths from PInvoke in .NET assemblies."; + description = "Small utility to modify the library paths from PInvoke in .NET assemblies"; homepage = "https://github.com/GGG-KILLER/patchcil"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ggg ]; diff --git a/pkgs/by-name/pa/patsh/package.nix b/pkgs/by-name/pa/patsh/package.nix index 3e850dece1b7..5cfa94d96738 100644 --- a/pkgs/by-name/pa/patsh/package.nix +++ b/pkgs/by-name/pa/patsh/package.nix @@ -43,12 +43,12 @@ rustPlatform.buildRustPackage rec { done ''; - meta = with lib; { + meta = { description = "Command-line tool for patching shell scripts inspired by resholve"; mainProgram = "patsh"; homepage = "https://github.com/nix-community/patsh"; changelog = "https://github.com/nix-community/patsh/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/pa/paup-cli/package.nix b/pkgs/by-name/pa/paup-cli/package.nix index 12796245bced..006a65b7fb95 100644 --- a/pkgs/by-name/pa/paup-cli/package.nix +++ b/pkgs/by-name/pa/paup-cli/package.nix @@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation { ''; meta = { - description = "A software package for inferring evolutionary trees"; + description = "Software package for inferring evolutionary trees"; homepage = "http://phylosolutions.com/paup-test/"; license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/pa/pavucontrol/package.nix b/pkgs/by-name/pa/pavucontrol/package.nix index a7ca399e4946..bb0c09158d8c 100644 --- a/pkgs/by-name/pa/pavucontrol/package.nix +++ b/pkgs/by-name/pa/pavucontrol/package.nix @@ -15,7 +15,6 @@ wrapGAppsHook4, meson, ninja, - libpressureaudio, }: stdenv.mkDerivation (finalAttrs: { @@ -37,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.optionals withLibcanberra libcanberra-gtk3) json-glib adwaita-icon-theme - libpressureaudio ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/payload-dumper-go/package.nix b/pkgs/by-name/pa/payload-dumper-go/package.nix index ede53a171dcb..4f76fac6cf8c 100644 --- a/pkgs/by-name/pa/payload-dumper-go/package.nix +++ b/pkgs/by-name/pa/payload-dumper-go/package.nix @@ -20,12 +20,12 @@ buildGoModule rec { buildInputs = [ xz ]; - meta = with lib; { + meta = { description = "Android OTA payload dumper written in Go"; homepage = "https://github.com/ssut/payload-dumper-go"; changelog = "https://github.com/ssut/payload-dumper-go/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ aleksana ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ aleksana ]; mainProgram = "payload-dumper-go"; }; } diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix index e8375dc46f57..93a9b4974322 100644 --- a/pkgs/by-name/pc/pcsx2/package.nix +++ b/pkgs/by-name/pc/pcsx2/package.nix @@ -25,7 +25,6 @@ wayland, zip, zstd, - fetchpatch, }: let @@ -37,16 +36,6 @@ let qtwayland wrapQtAppsHook ; - - cubeb' = cubeb.overrideAttrs (old: { - patches = (old.patches or [ ]) ++ [ - (fetchpatch { - url = "https://github.com/PCSX2/pcsx2/commit/430e31abe4a9e09567cb542f1416b011bb9b6ef9.patch"; - stripLen = 2; - hash = "sha256-bbH0c1X3lMeX6hfNKObhcq5xraFpicFV3mODQGYudvQ="; - }) - ]; - }); in llvmPackages.stdenv.mkDerivation (finalAttrs: { inherit (sources.pcsx2) pname version src; @@ -93,7 +82,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { vulkan-headers wayland zstd - cubeb' + cubeb ]; strictDeps = true; diff --git a/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch b/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch index 2c98f22746dd..c8196e5b0ac5 100644 --- a/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch +++ b/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch @@ -15,15 +15,19 @@ index ff66f9c..e177c90 100644 # Find the Qt components that we need. find_package(Qt6 6.7.2 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED) diff --git a/pcsx2/Host/CubebAudioStream.cpp b/pcsx2/Host/CubebAudioStream.cpp -index 4cd9993..604635d 100644 +index 4cd9993..74c2f5a 100644 --- a/pcsx2/Host/CubebAudioStream.cpp +++ b/pcsx2/Host/CubebAudioStream.cpp -@@ -288,7 +288,7 @@ std::vector> AudioStream::GetCubebDriverName +@@ -288,9 +288,9 @@ std::vector> AudioStream::GetCubebDriverName std::vector> names; names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default")); - const char** cubeb_names = cubeb_get_backend_names(); -+ const char* const* cubeb_names = cubeb_get_backend_names(); - for (u32 i = 0; cubeb_names[i] != nullptr; i++) - names.emplace_back(cubeb_names[i], cubeb_names[i]); +- for (u32 i = 0; cubeb_names[i] != nullptr; i++) +- names.emplace_back(cubeb_names[i], cubeb_names[i]); ++ cubeb_backend_names backends = cubeb_get_backend_names(); ++ for (u32 i = 0; i < backends.count; i++) ++ names.emplace_back(backends.names[i], backends.names[i]); + return names; + } diff --git a/pkgs/by-name/pd/pdfrip/package.nix b/pkgs/by-name/pd/pdfrip/package.nix index 7829a714331c..9eff2f0fe7e6 100644 --- a/pkgs/by-name/pd/pdfrip/package.nix +++ b/pkgs/by-name/pd/pdfrip/package.nix @@ -23,12 +23,12 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - meta = with lib; { + meta = { description = "PDF password cracking utility"; homepage = "https://github.com/mufeedvh/pdfrip"; changelog = "https://github.com/mufeedvh/pdfrip/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "pdfrip"; }; } diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index 0eeb269bb258..340ae0077dbe 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -128,12 +128,12 @@ python.pkgs.buildPythonApplication rec { passthru.tests.version = testers.testVersion { package = pdm; }; - meta = with lib; { + meta = { homepage = "https://pdm-project.org"; changelog = "https://github.com/pdm-project/pdm/releases/tag/${version}"; description = "Modern Python package and dependency manager supporting the latest PEP standards"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ cpcloud natsukium misilelab diff --git a/pkgs/by-name/pe/pe-parse/package.nix b/pkgs/by-name/pe/pe-parse/package.nix index e259b51aa564..ccbb06f01e71 100644 --- a/pkgs/by-name/pe/pe-parse/package.nix +++ b/pkgs/by-name/pe/pe-parse/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { $out/bin/dump-pe ../tests/assets/example.exe ''; - meta = with lib; { + meta = { description = "Principled, lightweight parser for Windows portable executable files"; homepage = "https://github.com/trailofbits/pe-parse"; changelog = "https://github.com/trailofbits/pe-parse/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ arturcygan ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ arturcygan ]; mainProgram = "dump-pe"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/pe/peco/package.nix b/pkgs/by-name/pe/peco/package.nix index 0c794fb719ae..5077d5196df3 100644 --- a/pkgs/by-name/pe/peco/package.nix +++ b/pkgs/by-name/pe/peco/package.nix @@ -19,12 +19,12 @@ buildGoModule rec { vendorHash = "sha256-+HQz7UUgATdgSWlI1dg2DdQRUSke9MyAtXgLikFhF90="; - meta = with lib; { + meta = { description = "Simplistic interactive filtering tool"; mainProgram = "peco"; homepage = "https://github.com/peco/peco"; changelog = "https://github.com/peco/peco/blob/v${version}/Changes"; - license = licenses.mit; - maintainers = with maintainers; [ pSub ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pSub ]; }; } diff --git a/pkgs/by-name/pe/peertube-viewer/package.nix b/pkgs/by-name/pe/peertube-viewer/package.nix index 4aa5dca89d33..97aef545c6c9 100644 --- a/pkgs/by-name/pe/peertube-viewer/package.nix +++ b/pkgs/by-name/pe/peertube-viewer/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-Pf8Jj8XGYbNOAyYEBdAysOK92S3S7bZHerQh/2UlrbQ="; meta = with lib; { - description = "A simple CLI browser for the peertube federated video platform"; + description = "Simple CLI browser for the peertube federated video platform"; homepage = "https://gitlab.com/peertube-viewer/peertube-viewer-rs"; license = licenses.agpl3Only; maintainers = with maintainers; [ haruki7049 ]; diff --git a/pkgs/by-name/pe/pentestgpt/package.nix b/pkgs/by-name/pe/pentestgpt/package.nix index cf2bdd3d487a..d67ab642a20f 100644 --- a/pkgs/by-name/pe/pentestgpt/package.nix +++ b/pkgs/by-name/pe/pentestgpt/package.nix @@ -47,11 +47,11 @@ python3.pkgs.buildPythonApplication rec { "pentestgpt" ]; - meta = with lib; { + meta = { description = "GPT-empowered penetration testing tool"; homepage = "https://github.com/GreyDGL/PentestGPT"; changelog = "https://github.com/GreyDGL/PentestGPT/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/pe/perses/package.nix b/pkgs/by-name/pe/perses/package.nix index 7db0debadcb2..1682b11683df 100644 --- a/pkgs/by-name/pe/perses/package.nix +++ b/pkgs/by-name/pe/perses/package.nix @@ -119,7 +119,7 @@ buildGoModule (finalAttrs: { }; meta = { - description = "The CNCF sandbox for observability visualisation"; + description = "CNCF sandbox for observability visualisation"; homepage = "https://perses.dev/"; changelog = "https://github.com/perses/perses/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; diff --git a/pkgs/by-name/pe/perseus/package.nix b/pkgs/by-name/pe/perseus/package.nix index 4b39d2e91395..8e83890ea2f9 100644 --- a/pkgs/by-name/pe/perseus/package.nix +++ b/pkgs/by-name/pe/perseus/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { around datasets arising from point samples, images, distance matrices and so forth. ''; - homepage = "http://people.maths.ox.ac.uk/nanda/perseus/index.html"; + homepage = "https://people.maths.ox.ac.uk/nanda/perseus/index.html"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ erikryb ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/pf/pfetch-rs/package.nix b/pkgs/by-name/pf/pfetch-rs/package.nix index b01632e6a4fb..cdb0e725d122 100644 --- a/pkgs/by-name/pf/pfetch-rs/package.nix +++ b/pkgs/by-name/pf/pfetch-rs/package.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-36MjBzSzEOVaSnd6dTqYnV+Pi+5EDoUskkYsvYMGrgg="; - meta = with lib; { + meta = { description = "Rewrite of the pfetch system information tool in Rust"; homepage = "https://github.com/Gobidev/pfetch-rs"; changelog = "https://github.com/Gobidev/pfetch-rs/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ gobidev ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gobidev ]; mainProgram = "pfetch"; }; } diff --git a/pkgs/by-name/pg/pgcenter/package.nix b/pkgs/by-name/pg/pgcenter/package.nix index 41025c33af03..4d5642488f58 100644 --- a/pkgs/by-name/pg/pgcenter/package.nix +++ b/pkgs/by-name/pg/pgcenter/package.nix @@ -33,12 +33,12 @@ buildGoModule rec { doCheck = false; - meta = with lib; { + meta = { homepage = "https://pgcenter.org/"; changelog = "https://github.com/lesovsky/pgcenter/raw/v${version}/doc/Changelog"; description = "Command-line admin tool for observing and troubleshooting PostgreSQL"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ]; mainProgram = "pgcenter"; }; } diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index 8ee301ef4dfa..6a70d626eece 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -40,14 +40,14 @@ perlPackages.buildPerlPackage rec { doCheck = false; - meta = with lib; { + meta = { description = "PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI"; homepage = "https://github.com/darold/pgFormatter"; changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ ]; license = [ - licenses.postgresql - licenses.artistic2 + lib.licenses.postgresql + lib.licenses.artistic2 ]; mainProgram = "pg_format"; }; diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index 108ae819fbde..fd898ea8dd3b 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error"; - meta = with lib; { + meta = { description = "Backup / restore solution for PostgreSQL"; homepage = "https://pgmoneta.github.io/"; changelog = "https://github.com/pgmoneta/pgmoneta/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = platforms.linux; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/pg/pgo-client/package.nix b/pkgs/by-name/pg/pgo-client/package.nix index cce769dee966..32a8b6358058 100644 --- a/pkgs/by-name/pg/pgo-client/package.nix +++ b/pkgs/by-name/pg/pgo-client/package.nix @@ -19,12 +19,12 @@ buildGoModule rec { subPackages = [ "cmd/pgo" ]; - meta = with lib; { + meta = { description = "CLI client for Crunchy PostgreSQL Kubernetes Operator"; homepage = "https://github.com/CrunchyData/postgres-operator"; changelog = "https://github.com/CrunchyData/postgres-operator/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ maintainers.bryanasdev000 ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.bryanasdev000 ]; mainProgram = "pgo"; }; } diff --git a/pkgs/by-name/pg/pgtop/package.nix b/pkgs/by-name/pg/pgtop/package.nix index dc7414f1949f..f34ae6c2e4f4 100644 --- a/pkgs/by-name/pg/pgtop/package.nix +++ b/pkgs/by-name/pg/pgtop/package.nix @@ -32,12 +32,12 @@ perlPackages.buildPerlPackage rec { shortenPerlShebang $out/bin/pgtop ''; - meta = with lib; { + meta = { description = "PostgreSQL clone of `mytop', which in turn is a `top' clone for MySQL"; mainProgram = "pgtop"; homepage = "https://github.com/cosimo/pgtop"; changelog = "https://github.com/cosimo/pgtop/releases/tag/v${version}"; - maintainers = [ maintainers.hagl ]; - license = [ licenses.gpl2Only ]; + maintainers = [ lib.maintainers.hagl ]; + license = [ lib.licenses.gpl2Only ]; }; } diff --git a/pkgs/by-name/pg/pgweb/package.nix b/pkgs/by-name/pg/pgweb/package.nix index 28e073de8e41..cb2964bcc694 100644 --- a/pkgs/by-name/pg/pgweb/package.nix +++ b/pkgs/by-name/pg/pgweb/package.nix @@ -51,7 +51,7 @@ buildGoModule rec { integration_test = nixosTests.pgweb; }; - meta = with lib; { + meta = { changelog = "https://github.com/sosedoff/pgweb/releases/tag/v${version}"; description = "Web-based database browser for PostgreSQL"; longDescription = '' @@ -59,9 +59,9 @@ buildGoModule rec { run queries and examine tables and indexes. ''; homepage = "https://sosedoff.github.io/pgweb/"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "pgweb"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ zupo luisnquin ]; diff --git a/pkgs/by-name/ph/phd2/package.nix b/pkgs/by-name/ph/phd2/package.nix index 96bf38706186..8ffd39b974da 100644 --- a/pkgs/by-name/ph/phd2/package.nix +++ b/pkgs/by-name/ph/phd2/package.nix @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { mv $out/bin/.phd2.bin-wrapped $out/bin/.phd2-wrapped.bin ''; - meta = with lib; { + meta = { homepage = "https://openphdguiding.org/"; description = "Telescope auto-guidance application"; changelog = "https://github.com/OpenPHDGuiding/phd2/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ hjones2199 ]; - platforms = platforms.linux; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ hjones2199 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ph/phetch/package.nix b/pkgs/by-name/ph/phetch/package.nix index b795386ced24..2e0842e7d4c9 100644 --- a/pkgs/by-name/ph/phetch/package.nix +++ b/pkgs/by-name/ph/phetch/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { doCheck = true; - meta = with lib; { + meta = { description = "Quick lil gopher client for your terminal, written in rust"; mainProgram = "phetch"; longDescription = '' @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { ''; changelog = "https://github.com/xvxx/phetch/releases/tag/v${version}"; homepage = "https://github.com/xvxx/phetch"; - license = licenses.mit; - maintainers = with maintainers; [ felixalbrigtsen ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ felixalbrigtsen ]; }; } diff --git a/pkgs/by-name/ph/photini/package.nix b/pkgs/by-name/ph/photini/package.nix index c9d8bd031bc4..841794754f60 100644 --- a/pkgs/by-name/ph/photini/package.nix +++ b/pkgs/by-name/ph/photini/package.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { meta = { homepage = "https://github.com/jim-easterbrook/Photini"; changelog = "https://photini.readthedocs.io/en/release-${version}/misc/changelog.html"; - description = "An easy to use digital photograph metadata (Exif, IPTC, XMP) editing application"; + description = "Easy to use digital photograph metadata (Exif, IPTC, XMP) editing application"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ zebreus ]; mainProgram = "photini"; diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index ff5cfee3099d..533e937009d5 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -23,11 +23,11 @@ buildGoModule rec { ln -s $out/bin/phrase-cli $out/bin/phrase ''; - meta = with lib; { + meta = { homepage = "http://docs.phraseapp.com"; description = "PhraseApp API v2 Command Line Client"; changelog = "https://github.com/phrase/phrase-cli/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ juboba ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ juboba ]; }; } diff --git a/pkgs/by-name/pi/piano-rs/package.nix b/pkgs/by-name/pi/piano-rs/package.nix index bedc763202d2..5ab9be6b6cdb 100644 --- a/pkgs/by-name/pi/piano-rs/package.nix +++ b/pkgs/by-name/pi/piano-rs/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A multiplayer piano using UDP sockets that can be played using computer keyboard, in the terminal"; + description = "Multiplayer piano using UDP sockets that can be played using computer keyboard, in the terminal"; homepage = "https://github.com/ritiek/piano-rs"; license = licenses.mit; mainProgram = "piano-rs"; diff --git a/pkgs/by-name/pi/pihole/package.nix b/pkgs/by-name/pi/pihole/package.nix index 55d051213750..d55a7f99273b 100644 --- a/pkgs/by-name/pi/pihole/package.nix +++ b/pkgs/by-name/pi/pihole/package.nix @@ -232,7 +232,7 @@ }; meta = { - description = "A black hole for Internet advertisements"; + description = "Black hole for Internet advertisements"; license = lib.licenses.eupl12; maintainers = with lib.maintainers; [ averyvigolo ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/pi/pika-backup/package.nix b/pkgs/by-name/pi/pika-backup/package.nix index c70586e44e54..fdeeddef8479 100644 --- a/pkgs/by-name/pi/pika-backup/package.nix +++ b/pkgs/by-name/pi/pika-backup/package.nix @@ -72,13 +72,13 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Simple backups based on borg"; homepage = "https://apps.gnome.org/app/org.gnome.World.PikaBackup"; changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; - teams = [ teams.gnome-circle ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + teams = [ lib.teams.gnome-circle ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index 81849bb79419..60d5fbc98252 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -47,7 +47,11 @@ buildGoModule (finalAttrs: { versionCheckProgramArg = "version"; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex=^v([\\d\\.]+)$" + ]; + }; }; ldflags = [ diff --git a/pkgs/by-name/pi/piping-server-rust/package.nix b/pkgs/by-name/pi/piping-server-rust/package.nix index 88261b5d39d7..0ab7de765cf6 100644 --- a/pkgs/by-name/pi/piping-server-rust/package.nix +++ b/pkgs/by-name/pi/piping-server-rust/package.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-m6bYkewBE0ZloDVUhUslS+dgPyoK+eay7rrP3+c00mo="; - meta = with lib; { + meta = { description = "Infinitely transfer between every device over pure HTTP with pipes or browsers"; homepage = "https://github.com/nwtgck/piping-server-rust"; changelog = "https://github.com/nwtgck/piping-server-rust/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "piping-server"; }; } diff --git a/pkgs/by-name/pi/piscope/package.nix b/pkgs/by-name/pi/piscope/package.nix index 8191f53aa1c9..9873ada380eb 100644 --- a/pkgs/by-name/pi/piscope/package.nix +++ b/pkgs/by-name/pi/piscope/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://abyz.me.uk/rpi/pigpio/piscope.html"; - description = "A logic analyser (digital waveform viewer) for the Raspberry"; + description = "Logic analyser (digital waveform viewer) for the Raspberry"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ doronbehar ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/pi/pixman/package.nix b/pkgs/by-name/pi/pixman/package.nix index dcf1fad292eb..94d742f374e3 100644 --- a/pkgs/by-name/pi/pixman/package.nix +++ b/pkgs/by-name/pi/pixman/package.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - homepage = "http://pixman.org"; + homepage = "https://pixman.org"; description = "Low-level library for pixel manipulation"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/by-name/pk/pkger/package.nix b/pkgs/by-name/pk/pkger/package.nix index 5dbad7a889ca..f432e341d8c2 100644 --- a/pkgs/by-name/pk/pkger/package.nix +++ b/pkgs/by-name/pk/pkger/package.nix @@ -20,12 +20,12 @@ buildGoModule rec { doCheck = false; - meta = with lib; { + meta = { description = "Embed static files in Go binaries (replacement for gobuffalo/packr)"; mainProgram = "pkger"; homepage = "https://github.com/markbates/pkger"; changelog = "https://github.com/markbates/pkger/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ flokli ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ flokli ]; }; } diff --git a/pkgs/by-name/pk/pkgtop/package.nix b/pkgs/by-name/pk/pkgtop/package.nix index c730478d8410..09f4eff0fbb2 100644 --- a/pkgs/by-name/pk/pkgtop/package.nix +++ b/pkgs/by-name/pk/pkgtop/package.nix @@ -21,12 +21,12 @@ buildGoModule rec { mv $out/bin/{cmd,pkgtop} ''; - meta = with lib; { + meta = { description = "Interactive package manager and resource monitor designed for the GNU/Linux"; homepage = "https://github.com/orhun/pkgtop"; changelog = "https://github.com/orhun/pkgtop/releases/tag/${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "pkgtop"; }; } diff --git a/pkgs/by-name/pl/planus/package.nix b/pkgs/by-name/pl/planus/package.nix index a4c4f5254bf6..390536078587 100644 --- a/pkgs/by-name/pl/planus/package.nix +++ b/pkgs/by-name/pl/planus/package.nix @@ -30,15 +30,15 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/planus generate-completions zsh) ''; - meta = with lib; { + meta = { description = "Alternative compiler for flatbuffers"; mainProgram = "planus"; homepage = "https://github.com/planus-org/planus"; changelog = "https://github.com/planus-org/planus/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/pl/plow/package.nix b/pkgs/by-name/pl/plow/package.nix index c7e0cd711d37..8a64914828e6 100644 --- a/pkgs/by-name/pl/plow/package.nix +++ b/pkgs/by-name/pl/plow/package.nix @@ -29,12 +29,12 @@ buildGoModule rec { package = plow; }; - meta = with lib; { + meta = { description = "High-performance HTTP benchmarking tool that includes a real-time web UI and terminal display"; homepage = "https://github.com/six-ddc/plow"; changelog = "https://github.com/six-ddc/plow/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ ecklf ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ecklf ]; mainProgram = "plow"; }; } diff --git a/pkgs/by-name/pl/plutovg/package.nix b/pkgs/by-name/pl/plutovg/package.nix index 88b1d186081a..7e795b499e6e 100644 --- a/pkgs/by-name/pl/plutovg/package.nix +++ b/pkgs/by-name/pl/plutovg/package.nix @@ -6,15 +6,23 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "plutovg"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "sammycage"; repo = "plutovg"; tag = "v${finalAttrs.version}"; - hash = "sha256-xNWwACKGU5UIJviVZ3wU4GMuRxKn/rR8jBsZQpZiFZ8="; + hash = "sha256-989MA60nc1Tzp/4RzT0iYHz4JBJkU9zgEjEswa4vDpk="; }; + cmakeFlags = [ + # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly + # (setting it to an absolute path causes include files to go to $out/$out/include, + # because the absolute path is interpreted with root at $out). + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/pm/pm2/package.nix b/pkgs/by-name/pm/pm2/package.nix index 731c0c8b0561..a4c66208e2c9 100644 --- a/pkgs/by-name/pm/pm2/package.nix +++ b/pkgs/by-name/pm/pm2/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "pm2"; - version = "6.0.6"; + version = "6.0.8"; src = fetchFromGitHub { owner = "Unitech"; repo = "pm2"; rev = "v${version}"; - hash = "sha256-ji6IOlPSEj+qpSusF3OX056KuZDL3JjvaTNT/UQTiqA="; + hash = "sha256-roSHLJsDeNAa9z9O/hgy9P4ho5zeLz1+w0a8U0Ix2ao="; # Requested patch upstream: https://github.com/Unitech/pm2/pull/5985 postFetch = '' @@ -21,7 +21,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-b+SSal4eNruQOMNAFoLLJdzfFhz1T3EieDv4kTwwA1Y="; + npmDepsHash = "sha256-6xUGO1vrzU5pi33ZaiRB6L5gY8p7ES93effyGdhsV5o="; dontNpmBuild = true; diff --git a/pkgs/by-name/pm/pmacct/package.nix b/pkgs/by-name/pm/pmacct/package.nix index b00ffe4196a6..ab19c7cae498 100644 --- a/pkgs/by-name/pm/pmacct/package.nix +++ b/pkgs/by-name/pm/pmacct/package.nix @@ -77,16 +77,16 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Small set of multi-purpose passive network monitoring tools"; longDescription = '' pmacct is a small set of multi-purpose passive network monitoring tools [NetFlow IPFIX sFlow libpcap BGP BMP RPKI IGP Streaming Telemetry] ''; homepage = "http://www.pmacct.net/"; - changelog = "https://github.com/pmacct/pmacct/blob/v${version}/ChangeLog"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ _0x4A6F ]; - platforms = platforms.unix; + changelog = "https://github.com/pmacct/pmacct/blob/v${finalAttrs.version}/ChangeLog"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ _0x4A6F ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/pn/pngpaste/package.nix b/pkgs/by-name/pn/pngpaste/package.nix index 2360b9de8d26..eb558b1bb6e8 100644 --- a/pkgs/by-name/pn/pngpaste/package.nix +++ b/pkgs/by-name/pn/pngpaste/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { cp pngpaste $out/bin ''; - meta = with lib; { + meta = { description = "Paste image files from clipboard to file on MacOS"; longDescription = '' Paste PNG into files on MacOS, much like pbpaste does for text. @@ -33,8 +33,8 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/jcsalterego/pngpaste"; changelog = "https://github.com/jcsalterego/pngpaste/raw/${version}/CHANGELOG.md"; - platforms = platforms.darwin; - license = licenses.bsd2; - maintainers = with maintainers; [ samw ]; + platforms = lib.platforms.darwin; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ samw ]; }; } diff --git a/pkgs/by-name/pn/pngquant/package.nix b/pkgs/by-name/pn/pngquant/package.nix index 2c70fa3032e4..1473653a77d1 100644 --- a/pkgs/by-name/pn/pngquant/package.nix +++ b/pkgs/by-name/pn/pngquant/package.nix @@ -45,17 +45,17 @@ rustPlatform.buildRustPackage rec { install -Dpm0444 pngquant.1 $man/share/man/man1/pngquant.1 ''; - meta = with lib; { + meta = { homepage = "https://pngquant.org/"; description = "Tool to convert 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved"; changelog = "https://github.com/kornelski/pngquant/raw/${version}/CHANGELOG"; - platforms = platforms.unix; - license = with licenses; [ + platforms = lib.platforms.unix; + license = with lib.licenses; [ gpl3Plus hpnd bsd2 ]; mainProgram = "pngquant"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/po/pocl/package.nix b/pkgs/by-name/po/pocl/package.nix index 671b6592bb2f..f9d70e39c395 100644 --- a/pkgs/by-name/po/pocl/package.nix +++ b/pkgs/by-name/po/pocl/package.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "portable open source (MIT-licensed) implementation of the OpenCL standard"; - homepage = "http://portablecl.org"; + homepage = "https://portablecl.org"; changelog = "https://github.com/pocl/pocl/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index ad256b2253f9..666a5f0f9aae 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "A graphical tool for developing on containers and Kubernetes"; + description = "Graphical tool for developing on containers and Kubernetes"; homepage = "https://podman-desktop.io"; changelog = "https://github.com/containers/podman-desktop/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 7224359cb18b..e9f26b21551b 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -181,7 +181,7 @@ buildGoModule rec { oci-containers-podman = nixosTests.oci-containers.podman; }; - meta = with lib; { + meta = { homepage = "https://podman.io/"; description = "Program for managing pods, containers and container images"; longDescription = '' @@ -190,8 +190,8 @@ buildGoModule rec { To install on NixOS, please use the option `virtualisation.podman.enable = true`. ''; changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md"; - license = licenses.asl20; - teams = [ teams.podman ]; + license = lib.licenses.asl20; + teams = [ lib.teams.podman ]; mainProgram = "podman"; }; } diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix index fea3c32c1996..d1608d341a12 100644 --- a/pkgs/by-name/po/poethepoet/package.nix +++ b/pkgs/by-name/po/poethepoet/package.nix @@ -33,12 +33,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "poethepoet" ]; - meta = with lib; { + meta = { description = "Task runner that works well with poetry"; homepage = "https://github.com/nat-n/poethepoet"; changelog = "https://github.com/nat-n/poethepoet/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "poe"; }; } diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix index d017054aaeb1..43d6e59f3458 100644 --- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix +++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix @@ -37,11 +37,11 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - meta = with lib; { + meta = { description = "Poetry plugin to simplify package updates"; homepage = "https://github.com/MousaZeidBaker/poetry-plugin-up"; changelog = "https://github.com/MousaZeidBaker/poetry-plugin-up/releases/tag/${version}"; - license = licenses.mit; - maintainers = [ maintainers.k900 ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.k900 ]; }; } diff --git a/pkgs/by-name/po/poezio/package.nix b/pkgs/by-name/po/poezio/package.nix index b222f1c1a54f..f6146e5e8b85 100644 --- a/pkgs/by-name/po/poezio/package.nix +++ b/pkgs/by-name/po/poezio/package.nix @@ -48,11 +48,11 @@ python3.pkgs.buildPythonApplication rec { rm -r poezio ''; - meta = with lib; { + meta = { description = "Free console XMPP client"; homepage = "https://poez.io"; changelog = "https://codeberg.org/poezio/poezio/src/tag/v${version}/CHANGELOG"; - license = licenses.zlib; - maintainers = with maintainers; [ lsix ]; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ lsix ]; }; } diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix index 3d65af77c032..ca1409cffdb0 100644 --- a/pkgs/by-name/po/polarity/package.nix +++ b/pkgs/by-name/po/polarity/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { - description = "A Language with Dependent Data and Codata Types"; + description = "Language with Dependent Data and Codata Types"; homepage = "https://polarity-lang.github.io/"; changelog = "https://github.com/polarity-lang/polarity/blob/${src.rev}/CHANGELOG.md"; license = with lib.licenses; [ diff --git a/pkgs/by-name/po/polymake/package.nix b/pkgs/by-name/po/polymake/package.nix index 9812c8a19fe7..4997e4ce3eee 100644 --- a/pkgs/by-name/po/polymake/package.nix +++ b/pkgs/by-name/po/polymake/package.nix @@ -75,12 +75,12 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { description = "Software for research in polyhedral geometry"; homepage = "https://www.polymake.org/doku.php"; changelog = "https://github.com/polymake/polymake/blob/V${version}/ChangeLog"; - license = licenses.gpl2Plus; - teams = [ teams.sage ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.sage ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/po/pomsky/package.nix b/pkgs/by-name/po/pomsky/package.nix index 73dbffd89916..749d607dfe42 100644 --- a/pkgs/by-name/po/pomsky/package.nix +++ b/pkgs/by-name/po/pomsky/package.nix @@ -36,15 +36,15 @@ rustPlatform.buildRustPackage rec { # thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: invalid option '--test-threads'' doCheck = false; - meta = with lib; { + meta = { description = "Portable, modern regular expression language"; mainProgram = "pomsky"; homepage = "https://pomsky-lang.org"; changelog = "https://github.com/pomsky-lang/pomsky/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ mit # or asl20 ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/po/pop/package.nix b/pkgs/by-name/po/pop/package.nix index d320feb46e82..4452a75aab08 100644 --- a/pkgs/by-name/po/pop/package.nix +++ b/pkgs/by-name/po/pop/package.nix @@ -39,12 +39,12 @@ buildGoModule rec { --zsh <($out/bin/pop completion zsh) ''; - meta = with lib; { + meta = { description = "Send emails from your terminal"; homepage = "https://github.com/charmbracelet/pop"; changelog = "https://github.com/charmbracelet/pop/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ caarlos0 maaslalani ]; diff --git a/pkgs/by-name/po/popcorntime/package.nix b/pkgs/by-name/po/popcorntime/package.nix index 93413a04572d..c6db6644f36c 100644 --- a/pkgs/by-name/po/popcorntime/package.nix +++ b/pkgs/by-name/po/popcorntime/package.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/popcorn-official/popcorn-desktop"; - description = "An application that streams movies and TV shows from torrents"; + description = "Application that streams movies and TV shows from torrents"; platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl3; diff --git a/pkgs/by-name/po/popeye/package.nix b/pkgs/by-name/po/popeye/package.nix index 01d4bbaa3125..31fff97a6478 100644 --- a/pkgs/by-name/po/popeye/package.nix +++ b/pkgs/by-name/po/popeye/package.nix @@ -39,12 +39,12 @@ buildGoModule rec { $out/bin/popeye version | grep ${version} > /dev/null ''; - meta = with lib; { + meta = { description = "Kubernetes cluster resource sanitizer"; mainProgram = "popeye"; homepage = "https://github.com/derailed/popeye"; changelog = "https://github.com/derailed/popeye/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ maintainers.bryanasdev000 ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.bryanasdev000 ]; }; } diff --git a/pkgs/by-name/po/popsicle/package.nix b/pkgs/by-name/po/popsicle/package.nix index a7d5a90624db..1738985d7769 100644 --- a/pkgs/by-name/po/popsicle/package.nix +++ b/pkgs/by-name/po/popsicle/package.nix @@ -47,15 +47,15 @@ stdenv.mkDerivation rec { "prefix=$(out)" ]; - meta = with lib; { + meta = { description = "Multiple USB File Flasher"; homepage = "https://github.com/pop-os/popsicle"; changelog = "https://github.com/pop-os/popsicle/releases/tag/${version}"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ _13r0ck figsoda ]; - license = licenses.mit; - platforms = platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/po/portal/package.nix b/pkgs/by-name/po/portal/package.nix index 1ec52592b8b5..2d3eeef1dfbd 100644 --- a/pkgs/by-name/po/portal/package.nix +++ b/pkgs/by-name/po/portal/package.nix @@ -20,12 +20,12 @@ buildGoModule rec { ldflags = [ "-s -X main.version=${version}" ]; # from: https://github.com/SpatiumPortae/portal/blob/master/Makefile#L3 - meta = with lib; { + meta = { description = "Quick and easy command-line file transfer utility from any computer to another"; homepage = "https://github.com/SpatiumPortae/portal"; changelog = "https://github.com/SpatiumPortae/portal/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ tennox ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tennox ]; mainProgram = "portal"; }; } diff --git a/pkgs/by-name/po/portfolio-filemanager/package.nix b/pkgs/by-name/po/portfolio-filemanager/package.nix index dcba59036fd6..de87e12285a1 100644 --- a/pkgs/by-name/po/portfolio-filemanager/package.nix +++ b/pkgs/by-name/po/portfolio-filemanager/package.nix @@ -72,14 +72,14 @@ python3.pkgs.buildPythonApplication rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Minimalist file manager for those who want to use Linux mobile devices"; homepage = "https://github.com/tchx84/Portfolio"; changelog = "https://github.com/tchx84/Portfolio/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl3Plus; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; mainProgram = "dev.tchx84.Portfolio"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ dotlambda chuangzhu ]; diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix index 051aea4e141b..8afc3bf69676 100644 --- a/pkgs/by-name/po/postfix-tlspol/package.nix +++ b/pkgs/by-name/po/postfix-tlspol/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "postfix-tlspol"; - version = "1.8.10"; + version = "1.8.11"; src = fetchFromGitHub { owner = "Zuplu"; repo = "postfix-tlspol"; tag = "v${version}"; - hash = "sha256-UAAjvu/nWF9Q60n+Fojw/a6CsgY6iI5qjKv2nsBuzvo="; + hash = "sha256-hQSJ0bp3ghfi5chislf2zuCrvPhhoA0jjChRdGYHcFY="; }; vendorHash = null; diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix index 03f555ec84a3..5028c309d9b1 100644 --- a/pkgs/by-name/po/postfix/package.nix +++ b/pkgs/by-name/po/postfix/package.nix @@ -183,16 +183,16 @@ stdenv.mkDerivation rec { updateScript = ./update.sh; }; - meta = with lib; { + meta = { homepage = "http://www.postfix.org/"; changelog = "https://www.postfix.org/announcements/postfix-${version}.html"; description = "Fast, easy to administer, and secure mail server"; - license = with licenses; [ + license = with lib.licenses; [ ipl10 epl20 ]; - platforms = platforms.linux; - maintainers = with maintainers; [ + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ globin dotlambda lewo diff --git a/pkgs/by-name/po/postgresql_jdbc/package.nix b/pkgs/by-name/po/postgresql_jdbc/package.nix index 7b3846cb18df..f1358eb83455 100644 --- a/pkgs/by-name/po/postgresql_jdbc/package.nix +++ b/pkgs/by-name/po/postgresql_jdbc/package.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://jdbc.postgresql.org/"; changelog = "https://github.com/pgjdbc/pgjdbc/releases/tag/REL${version}"; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; - license = licenses.bsd2; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.unix; + license = lib.licenses.bsd2; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/po/postmoogle/package.nix b/pkgs/by-name/po/postmoogle/package.nix index 0f079334385e..929dfb83872d 100644 --- a/pkgs/by-name/po/postmoogle/package.nix +++ b/pkgs/by-name/po/postmoogle/package.nix @@ -21,12 +21,12 @@ buildGoModule rec { vendorHash = null; - meta = with lib; { + meta = { description = "Postmoogle is Matrix <-> Email bridge in a form of an SMTP server"; homepage = "https://github.com/etkecc/postmoogle"; changelog = "https://github.com/etkecc/postmoogle/releases/tag/v${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ amuckstot30 ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ amuckstot30 ]; mainProgram = "postmoogle"; }; } diff --git a/pkgs/by-name/po/pouf/package.nix b/pkgs/by-name/po/pouf/package.nix index faed38561102..af0b1cc3ed20 100644 --- a/pkgs/by-name/po/pouf/package.nix +++ b/pkgs/by-name/po/pouf/package.nix @@ -20,12 +20,12 @@ rustPlatform.buildRustPackage rec { postInstall = "make PREFIX=$out copy-data"; - meta = with lib; { + meta = { description = "CLI program for produce fake datas"; homepage = "https://github.com/mothsart/pouf"; changelog = "https://github.com/mothsart/pouf/releases/tag/${version}"; - maintainers = with maintainers; [ mothsart ]; - license = with licenses; [ mit ]; + maintainers = with lib.maintainers; [ mothsart ]; + license = with lib.licenses; [ mit ]; mainProgram = "pouf"; }; } diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix index 7dec487e37a2..b41951ad7671 100644 --- a/pkgs/by-name/po/poutine/package.nix +++ b/pkgs/by-name/po/poutine/package.nix @@ -33,12 +33,12 @@ buildGoModule rec { --zsh <($out/bin/${meta.mainProgram} completion zsh) ''; - meta = with lib; { + meta = { description = "Security scanner that detects misconfigurations and vulnerabilities in build pipelines of repositories"; homepage = "https://github.com/boostsecurityio/poutine"; changelog = "https://github.com/boostsecurityio/poutine/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "poutine"; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/po/powerhub/package.nix b/pkgs/by-name/po/powerhub/package.nix index 40fd1ab49a46..fcd5180ae4f6 100644 --- a/pkgs/by-name/po/powerhub/package.nix +++ b/pkgs/by-name/po/powerhub/package.nix @@ -54,12 +54,12 @@ python3.pkgs.buildPythonApplication rec { cd tests/helpers ''; - meta = with lib; { + meta = { description = "Post exploitation tool based on a web application, focusing on bypassing endpoint protection and application whitelisting"; homepage = "https://github.com/AdrianVollmer/PowerHub"; changelog = "https://github.com/AdrianVollmer/PowerHub/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "powerhub"; }; } diff --git a/pkgs/by-name/po/powerline-go/package.nix b/pkgs/by-name/po/powerline-go/package.nix index 704b46a4a214..66c135a8689c 100644 --- a/pkgs/by-name/po/powerline-go/package.nix +++ b/pkgs/by-name/po/powerline-go/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { vendorHash = "sha256-W7Lf9s689oJy4U5sQlkLt3INJwtvzU2pot3EFimp7Jw="; - meta = with lib; { + meta = { description = "Powerline like prompt for Bash, ZSH and Fish"; homepage = "https://github.com/justjanne/powerline-go"; changelog = "https://github.com/justjanne/powerline-go/releases/tag/v${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sifmelcara ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ sifmelcara ]; mainProgram = "powerline-go"; }; } diff --git a/pkgs/by-name/po/powershell-editor-services/package.nix b/pkgs/by-name/po/powershell-editor-services/package.nix index 3fbf787d671d..23adf690335c 100644 --- a/pkgs/by-name/po/powershell-editor-services/package.nix +++ b/pkgs/by-name/po/powershell-editor-services/package.nix @@ -25,14 +25,14 @@ stdenvNoCC.mkDerivation rec { chmod +x $out/bin/powershell-editor-services ''; - meta = with lib; { + meta = { description = "Common platform for PowerShell development support in any editor or application"; homepage = "https://github.com/PowerShell/PowerShellEditorServices"; changelog = "https://github.com/PowerShell/PowerShellEditorServices/releases/tag/v${version}"; - platforms = platforms.unix; - license = licenses.mit; - maintainers = with maintainers; [ sharpchen ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sharpchen ]; mainProgram = "powershell-editor-services"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; } diff --git a/pkgs/by-name/po/powertop/package.nix b/pkgs/by-name/po/powertop/package.nix index d65f79d70ba6..7c8aafec28e6 100644 --- a/pkgs/by-name/po/powertop/package.nix +++ b/pkgs/by-name/po/powertop/package.nix @@ -61,16 +61,16 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { inherit (src.meta) homepage; changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}"; description = "Analyze power consumption on Intel-based laptops"; mainProgram = "powertop"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fpletz anthonyroussel ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/pp/pplatex/package.nix b/pkgs/by-name/pp/pplatex/package.nix index f7f0a04f2181..a6380ec920c8 100644 --- a/pkgs/by-name/pp/pplatex/package.nix +++ b/pkgs/by-name/pp/pplatex/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "A tool to reformat the output of latex and friends into readable messages"; + description = "Tool to reformat the output of latex and friends into readable messages"; mainProgram = "pplatex"; homepage = "https://github.com/stefanhepp/pplatex"; license = licenses.gpl3Plus; diff --git a/pkgs/by-name/pr/pr-tracker/package.nix b/pkgs/by-name/pr/pr-tracker/package.nix index dfee8b6db957..f929f5fdde32 100644 --- a/pkgs/by-name/pr/pr-tracker/package.nix +++ b/pkgs/by-name/pr/pr-tracker/package.nix @@ -25,17 +25,17 @@ rustPlatform.buildRustPackage rec { systemd ]; - meta = with lib; { + meta = { changelog = "https://git.qyliss.net/pr-tracker/plain/NEWS?h=${version}"; description = "Nixpkgs pull request channel tracker"; longDescription = '' A web server that displays the path a Nixpkgs pull request will take through the various release channels. ''; - platforms = platforms.linux; + platforms = lib.platforms.linux; homepage = "https://git.qyliss.net/pr-tracker"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ qyliss sumnerevans ]; diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index 5bee2ddd0c3e..a6ce5d508873 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -11,16 +11,19 @@ nodejs, perl, cabal-install, + julia, + julia-bin, pre-commit, }: with python3Packages; let i686Linux = stdenv.buildPlatform.system == "i686-linux"; + julia' = if lib.meta.availableOn stdenv.hostPlatform julia then julia else julia-bin; in buildPythonApplication rec { pname = "pre-commit"; - version = "4.0.1"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -29,7 +32,7 @@ buildPythonApplication rec { owner = "pre-commit"; repo = "pre-commit"; tag = "v${version}"; - hash = "sha256-qMNnzAxJOS7mabHmGYZ/VkDrpaZbqTJyETSCxq/OrGQ="; + hash = "sha256-rUhI9NaxyRfLu/mfLwd5B0ybSnlAQV2Urx6+fef0sGM="; }; patches = [ @@ -60,6 +63,7 @@ buildPythonApplication rec { pytestCheckHook re-assert cabal-install + julia' ] ++ lib.optionals (!i686Linux) [ # coursier can be moved back to the main nativeCheckInputs list once we’re able to bootstrap a @@ -135,6 +139,7 @@ buildPythonApplication rec { "test_additional_node_dependencies_installed" "test_additional_rust_cli_dependencies_installed" "test_additional_rust_lib_dependencies_installed" + "test_automatic_toolchain_switching" "test_coursier_hook" "test_coursier_hook_additional_dependencies" "test_dart" @@ -150,6 +155,8 @@ buildPythonApplication rec { "test_language_version_with_rustup" "test_installs_rust_missing_rustup" "test_installs_without_links_outside_env" + "test_julia_hook" + "test_julia_repo_local" "test_local_golang_additional_deps" "test_lua" "test_lua_additional_dependencies" diff --git a/pkgs/by-name/pr/pre2k/package.nix b/pkgs/by-name/pr/pre2k/package.nix index 055663b69ce9..1f8a008220ae 100644 --- a/pkgs/by-name/pr/pre2k/package.nix +++ b/pkgs/by-name/pr/pre2k/package.nix @@ -39,12 +39,12 @@ python3.pkgs.buildPythonApplication rec { "pre2k" ]; - meta = with lib; { + meta = { description = "Tool to query for the existence of pre-windows 2000 computer objects"; homepage = "https://github.com/garrettfoster13/pre2k"; changelog = "https://github.com/garrettfoster13/pre2k/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "pre2k"; }; } diff --git a/pkgs/by-name/pr/premid/package.nix b/pkgs/by-name/pr/premid/package.nix index 557a3ab20161..6cf748999a4d 100644 --- a/pkgs/by-name/pr/premid/package.nix +++ b/pkgs/by-name/pr/premid/package.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A simple, configurable utility to show your web activity as playing status on Discord"; + description = "Simple, configurable utility to show your web activity as playing status on Discord"; homepage = "https://premid.app"; downloadPage = "https://premid.app/downloads"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index a2dccadd422e..f1e135d438d5 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -31,15 +31,15 @@ let hash = "sha256-BlPmrfHbpsLI8DCldzoRudpf7T4SUpJXQA5h9o4Thek="; }; - meta = with lib; { + meta = { description = "Conference planning tool: CfP, scheduling, speaker management"; mainProgram = "pretalx-manage"; homepage = "https://github.com/pretalx/pretalx"; changelog = "https://docs.pretalx.org/changelog/#${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ hexa ]; - teams = [ teams.c3d2 ]; - platforms = platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + teams = [ lib.teams.c3d2 ]; + platforms = lib.platforms.linux; }; frontend = buildNpmPackage { diff --git a/pkgs/by-name/pr/pretender/package.nix b/pkgs/by-name/pr/pretender/package.nix index 5499ba5c948c..a902c23a247a 100644 --- a/pkgs/by-name/pr/pretender/package.nix +++ b/pkgs/by-name/pr/pretender/package.nix @@ -20,12 +20,12 @@ buildGoModule rec { # Tests require network access doCheck = false; - meta = with lib; { + meta = { description = "Tool for handling machine-in-the-middle tasks"; mainProgram = "pretender"; homepage = "https://github.com/RedTeamPentesting/pretender"; changelog = "https://github.com/RedTeamPentesting/pretender/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/pr/pretty-php/package.nix b/pkgs/by-name/pr/pretty-php/package.nix index ab9e61be897d..35a132174ecc 100644 --- a/pkgs/by-name/pr/pretty-php/package.nix +++ b/pkgs/by-name/pr/pretty-php/package.nix @@ -25,7 +25,7 @@ php.buildComposerProject2 (finalAttrs: { }; meta = { - description = "The opinionated PHP code formatter"; + description = "Opinionated PHP code formatter"; homepage = "https://github.com/lkrms/pretty-php"; license = lib.licenses.mit; mainProgram = "pretty-php"; diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix index 8da8a62ac711..244e14ebf756 100644 --- a/pkgs/by-name/pr/probe-rs-tools/package.nix +++ b/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -62,15 +62,15 @@ rustPlatform.buildRustPackage rec { "--skip=util::cargo::test::workspace_root" ]; - meta = with lib; { + meta = { description = "CLI tool for on-chip debugging and flashing of ARM chips"; homepage = "https://probe.rs/"; changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ xgroleau newam ]; diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix index 5ffb72dcd49b..63ff211b5f48 100644 --- a/pkgs/by-name/pr/process-compose/package.nix +++ b/pkgs/by-name/pr/process-compose/package.nix @@ -58,12 +58,12 @@ buildGoModule rec { --fish <($out/bin/process-compose completion fish) ''; - meta = with lib; { + meta = { description = "Simple and flexible scheduler and orchestrator to manage non-containerized applications"; homepage = "https://github.com/F1bonacc1/process-compose"; changelog = "https://github.com/F1bonacc1/process-compose/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ thenonameguy ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ thenonameguy ]; mainProgram = "process-compose"; }; } diff --git a/pkgs/by-name/pr/procs/package.nix b/pkgs/by-name/pr/procs/package.nix index 71136f1d5cff..eef9369ee4f7 100644 --- a/pkgs/by-name/pr/procs/package.nix +++ b/pkgs/by-name/pr/procs/package.nix @@ -37,12 +37,12 @@ rustPlatform.buildRustPackage rec { libiconv ]; - meta = with lib; { + meta = { description = "Modern replacement for ps written in Rust"; homepage = "https://github.com/dalance/procs"; changelog = "https://github.com/dalance/procs/raw/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne sciencentistguy ]; diff --git a/pkgs/by-name/pr/programmer-calculator/package.nix b/pkgs/by-name/pr/programmer-calculator/package.nix index 4921ad30d153..16a32ce8057e 100644 --- a/pkgs/by-name/pr/programmer-calculator/package.nix +++ b/pkgs/by-name/pr/programmer-calculator/package.nix @@ -24,7 +24,7 @@ gccStdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Terminal calculator for programmers"; mainProgram = "pcalc"; longDescription = '' @@ -33,8 +33,8 @@ gccStdenv.mkDerivation rec { ''; homepage = "https://alt-romes.github.io/programmer-calculator"; changelog = "https://github.com/alt-romes/programmer-calculator/releases/tag/v${version}"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ cjab ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix index 4c317159f552..73d2a823f0c1 100644 --- a/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix +++ b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation ( meta = { homepage = "https://github.com/prometheus/jmx_exporter"; - description = "A process for exposing JMX Beans via HTTP for Prometheus consumption"; + description = "Process for exposing JMX Beans via HTTP for Prometheus consumption"; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; license = lib.licenses.asl20; maintainers = [ lib.maintainers.srhb ]; diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index d36c608385af..a26054c42efb 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -36,13 +36,13 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) node; }; - meta = with lib; { + meta = { description = "Prometheus exporter for machine metrics"; mainProgram = "node_exporter"; homepage = "https://github.com/prometheus/node_exporter"; changelog = "https://github.com/prometheus/node_exporter/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ benley fpletz globin diff --git a/pkgs/by-name/pr/promptfoo/package.nix b/pkgs/by-name/pr/promptfoo/package.nix index 3dda7203bd4e..c8dd41207455 100644 --- a/pkgs/by-name/pr/promptfoo/package.nix +++ b/pkgs/by-name/pr/promptfoo/package.nix @@ -19,12 +19,12 @@ buildNpmPackage rec { dontNpmBuild = true; - meta = with lib; { + meta = { description = "Test your prompts, models, RAGs. Evaluate and compare LLM outputs, catch regressions, and improve prompt quality"; mainProgram = "promptfoo"; homepage = "https://www.promptfoo.dev/"; changelog = "https://github.com/promptfoo/promptfoo/releases/tag/${version}"; - license = licenses.mit; - maintainers = [ maintainers.nathanielbrough ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nathanielbrough ]; }; } diff --git a/pkgs/by-name/pr/promscale/package.nix b/pkgs/by-name/pr/promscale/package.nix index 5c4195f7e24d..8af6ba2fa6be 100644 --- a/pkgs/by-name/pr/promscale/package.nix +++ b/pkgs/by-name/pr/promscale/package.nix @@ -46,13 +46,13 @@ buildGoModule rec { command = "promscale -version"; }; - meta = with lib; { + meta = { description = "Open-source analytical platform for Prometheus metrics"; mainProgram = "promscale"; homepage = "https://github.com/timescale/promscale"; changelog = "https://github.com/timescale/promscale/blob/${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ _0x4A6F anpin ]; diff --git a/pkgs/by-name/pr/protege/package.nix b/pkgs/by-name/pr/protege/package.nix index 4ef2318e150d..45bd7081b6e9 100644 --- a/pkgs/by-name/pr/protege/package.nix +++ b/pkgs/by-name/pr/protege/package.nix @@ -74,7 +74,7 @@ maven.buildMavenPackage rec { meta = { homepage = "https://protege.stanford.edu/"; downloadPage = "https://protege.stanford.edu/software.php#desktop-protege"; - description = "A free and open-source OWL 2 ontology editor"; + description = "Free and open-source OWL 2 ontology editor"; longDescription = '' Protégé Desktop is a feature rich ontology editing environment with full support for the OWL 2 Web Ontology Language, and direct in-memory diff --git a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix index 105b40ce97b4..9c1debf33bb7 100644 --- a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix +++ b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix @@ -26,13 +26,13 @@ buildGoModule rec { unset subPackages ''; - meta = with lib; { + meta = { description = "Simple, reliable, interoperable, better gRPC"; mainProgram = "protoc-gen-connect-go"; homepage = "https://github.com/connectrpc/connect-go"; changelog = "https://github.com/connectrpc/connect-go/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kilimnik jk ]; diff --git a/pkgs/by-name/pr/protoc-gen-dart/package.nix b/pkgs/by-name/pr/protoc-gen-dart/package.nix index 4eb95f412bbb..6b2610cd709e 100644 --- a/pkgs/by-name/pr/protoc-gen-dart/package.nix +++ b/pkgs/by-name/pr/protoc-gen-dart/package.nix @@ -1,18 +1,18 @@ { lib, - fetchFromGitHub, buildDartApplication, + fetchFromGitHub, }: buildDartApplication rec { pname = "protoc-gen-dart"; - version = "21.1.2"; + version = "22.3.0"; src = fetchFromGitHub { owner = "google"; repo = "protobuf.dart"; tag = "protoc_plugin-v${version}"; - hash = "sha256-luptbRgOtOBapWmyIJ35GqOClpcmDuKSPu3QoDfp2FU="; + hash = "sha256-P2h1M7Wga0qOrI/sTUrQ6k/a5gqKVqAfs/J1eGFHHwg="; }; sourceRoot = "${src.name}/protoc_plugin"; diff --git a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json index 05723b64b240..13b7eb5483a6 100644 --- a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json +++ b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json @@ -4,47 +4,41 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", + "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f", "url": "https://pub.dev" }, "source": "hosted", - "version": "73.0.0" - }, - "_macros": { - "dependency": "transitive", - "description": "dart", - "source": "sdk", - "version": "0.3.2" + "version": "82.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", + "sha256": "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.8.0" + "version": "7.4.5" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.12.0" + "version": "2.13.0" }, "boolean_selector": { "dependency": "transitive", @@ -56,8 +50,28 @@ "source": "hosted", "version": "2.1.2" }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, "collection": { - "dependency": "direct dev", + "dependency": "direct main", "description": { "name": "collection", "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", @@ -80,11 +94,11 @@ "dependency": "transitive", "description": { "name": "coverage", - "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43", + "sha256": "4b8701e48a58f7712492c9b1f7ba0bb9d525644dd66d023b62e1fc8cdb560c8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.14.0" }, "crypto": { "dependency": "transitive", @@ -140,11 +154,11 @@ "dependency": "transitive", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "http_multi_server": { "dependency": "transitive", @@ -180,11 +194,21 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.2" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" }, "lints": { "dependency": "transitive", @@ -206,16 +230,6 @@ "source": "hosted", "version": "1.3.0" }, - "macros": { - "dependency": "transitive", - "description": { - "name": "macros", - "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.2-main.4" - }, "matcher": { "dependency": "direct dev", "description": { @@ -230,11 +244,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.16.0" + "version": "1.17.0" }, "mime": { "dependency": "transitive", @@ -260,11 +274,11 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" }, "path": { "dependency": "direct main", @@ -290,21 +304,31 @@ "dependency": "direct main", "description": { "name": "protobuf", - "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d", + "sha256": "579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "4.1.0" }, "pub_semver": { "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" }, "shelf": { "dependency": "transitive", @@ -340,11 +364,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.0" }, "source_map_stack_trace": { "dependency": "transitive", @@ -390,11 +414,11 @@ "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "4ac0537115a24d772c408a2520ecd0abb99bca2ea9c4e634ccbdbfae64fe17ec", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "string_scanner": { "dependency": "transitive", @@ -420,31 +444,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "8391fbe68d520daf2314121764d38e37f934c02fd7301ad18307bd93bd6b725d", + "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.14" + "version": "1.26.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.4" + "version": "0.7.6" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa", + "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.8" + "version": "0.6.11" }, "typed_data": { "dependency": "transitive", @@ -460,11 +484,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", + "sha256": "6f82e9ee8e7339f5d8b699317f6f3afc17c80a68ebef1bc0d6f52a678c14b1e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.0.0" + "version": "15.0.1" }, "watcher": { "dependency": "transitive", @@ -480,31 +504,31 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", "description": { "name": "web_socket", - "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.6" + "version": "1.0.1" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.3" }, "webkit_inspection_protocol": { "dependency": "transitive", @@ -528,6 +552,6 @@ } }, "sdks": { - "dart": ">=3.5.0 <4.0.0" + "dart": ">=3.7.0-0 <4.0.0" } } diff --git a/pkgs/by-name/pr/protoc-gen-dart/update.sh b/pkgs/by-name/pr/protoc-gen-dart/update.sh index 888315460c49..81ca066de57c 100755 --- a/pkgs/by-name/pr/protoc-gen-dart/update.sh +++ b/pkgs/by-name/pr/protoc-gen-dart/update.sh @@ -25,6 +25,7 @@ src="$(nix-build --no-link "$NIXPKGS_DIR" -A protoc-gen-dart.src)/protoc_plugin" cp $src/pubspec.* . if ! test -f pubspec.lock; then + sed -i '/resolution: workspace/d' pubspec.yaml dart pub update fi diff --git a/pkgs/by-name/pr/protoc-gen-elixir/package.nix b/pkgs/by-name/pr/protoc-gen-elixir/package.nix index 96af826fd59f..ba7e9ed2d18d 100644 --- a/pkgs/by-name/pr/protoc-gen-elixir/package.nix +++ b/pkgs/by-name/pr/protoc-gen-elixir/package.nix @@ -30,7 +30,7 @@ mixRelease rec { passthru.updateScript = nix-update-script { }; meta = { - description = "A protoc plugin to generate Elixir code"; + description = "Protoc plugin to generate Elixir code"; mainProgram = "protoc-gen-elixir"; homepage = "https://github.com/elixir-protobuf/protobuf"; license = lib.licenses.mit; diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix index 9c30e4d41b5c..e1dc6043821c 100644 --- a/pkgs/by-name/pr/protoc-gen-es/package.nix +++ b/pkgs/by-name/pr/protoc-gen-es/package.nix @@ -47,12 +47,12 @@ buildNpmPackage rec { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { description = "Protobuf plugin for generating ECMAScript code"; homepage = "https://github.com/bufbuild/protobuf-es"; changelog = "https://github.com/bufbuild/protobuf-es/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ felschr jtszalay ]; diff --git a/pkgs/by-name/pr/proton-caller/package.nix b/pkgs/by-name/pr/proton-caller/package.nix index 7321597a5dc9..c8a03e5431c8 100644 --- a/pkgs/by-name/pr/proton-caller/package.nix +++ b/pkgs/by-name/pr/proton-caller/package.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-AZp6Mbm9Fg+EVr31oJe6/Z8LIwapYhos8JpZzPMiwz0="; - meta = with lib; { + meta = { description = "Run Windows programs with Proton"; changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}"; homepage = "https://github.com/caverym/proton-caller"; - license = licenses.mit; - maintainers = with maintainers; [ kho-dialga ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kho-dialga ]; mainProgram = "proton-call"; }; } diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index c94b612280a4..504a570d11f8 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.31.4"; + version = "1.31.5"; src = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; - hash = "sha256-gl4qCj9BAN9B09b+F78v0f3tUyxRU4/IpsSvtK0CZOM="; + hash = "sha256-PNBqnVpLLIpi/S0MLyhCBE6ggnjHJ8aEmBJuYC3DcwQ="; }; dontConfigure = true; diff --git a/pkgs/by-name/pr/protox/package.nix b/pkgs/by-name/pr/protox/package.nix index 480ed5d4c0ff..ce528f4daca9 100644 --- a/pkgs/by-name/pr/protox/package.nix +++ b/pkgs/by-name/pr/protox/package.nix @@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec { # tests are not included in the crate source doCheck = false; - meta = with lib; { + meta = { description = "Rust implementation of the protobuf compiler"; mainProgram = "protox"; homepage = "https://github.com/andrewhickman/protox"; changelog = "https://github.com/andrewhickman/protox/blob/${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix index 2368d0d7eea7..1f8fa5a9a97c 100644 --- a/pkgs/by-name/pr/prowlarr/package.nix +++ b/pkgs/by-name/pr/prowlarr/package.nix @@ -83,12 +83,12 @@ stdenv.mkDerivation rec { tests.smoke-test = nixosTests.prowlarr; }; - meta = with lib; { + meta = { description = "Indexer manager/proxy built on the popular arr .net/reactjs base stack"; homepage = "https://wiki.servarr.com/prowlarr"; changelog = "https://github.com/Prowlarr/Prowlarr/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ pizzapim ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ pizzapim ]; mainProgram = "Prowlarr"; platforms = [ "aarch64-darwin" diff --git a/pkgs/by-name/pr/proxify/package.nix b/pkgs/by-name/pr/proxify/package.nix index 28e4313bbf33..1a313caa2423 100644 --- a/pkgs/by-name/pr/proxify/package.nix +++ b/pkgs/by-name/pr/proxify/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorHash = "sha256-eGcCc83napjt0VBhpDiHWn7+ew77XparDJ9uyjF353w="; - meta = with lib; { + meta = { description = "Proxy tool for HTTP/HTTPS traffic capture"; longDescription = '' This tool supports multiple operations such as request/response dump, filtering @@ -27,7 +27,7 @@ buildGoModule rec { ''; homepage = "https://github.com/projectdiscovery/proxify"; changelog = "https://github.com/projectdiscovery/proxify/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch index c1ba7aa5290f..37d230f52c57 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch +++ b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch @@ -1,19 +1,19 @@ -From 15345a1ca0a52f2e977361002fe984609704ec90 Mon Sep 17 00:00:00 2001 +From fe701cc514b479ca01d18d7f1ab1da6acbc93273 Mon Sep 17 00:00:00 2001 From: Christoph Heiss -Date: Tue, 24 Dec 2024 17:40:48 +0100 -Subject: [PATCH 1/3] cargo: re-route dependencies not available on crates.io +Date: Thu, 5 Jun 2025 11:26:24 +0200 +Subject: [PATCH 1/5] cargo: re-route dependencies not available on crates.io to git repos Signed-off-by: Christoph Heiss --- - Cargo.toml | 147 ++++++++++------------------------------------------- - 1 file changed, 26 insertions(+), 121 deletions(-) + Cargo.toml | 146 ++++++++++------------------------------------------- + 1 file changed, 27 insertions(+), 119 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index 9354fb17..d2014429 100644 +index d38321e3..99d712da 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -42,8 +42,6 @@ members = [ +@@ -41,8 +41,6 @@ members = [ "proxmox-backup-banner", "proxmox-backup-client", @@ -22,23 +22,7 @@ index 9354fb17..d2014429 100644 "pxar-bin", ] -@@ -112,7 +110,6 @@ pbs-tools = { path = "pbs-tools" } - # regular crates - anyhow = "1.0" - async-trait = "0.1.56" --apt-pkg-native = "0.3.2" - base64 = "0.13" - bitflags = "2.4" - bytes = "1.0" -@@ -126,7 +123,6 @@ flate2 = "1.0" - foreign-types = "0.3" - futures = "0.3" - h2 = { version = "0.4", features = [ "stream" ] } --handlebars = "3.0" - hex = "0.4.3" - http = "0.2" - hyper = { version = "0.14", features = [ "full" ] } -@@ -162,139 +158,48 @@ xdg = "2.2" +@@ -160,138 +158,48 @@ xdg = "2.2" zstd = { version = "0.12", features = [ "bindgen" ] } zstd-safe = "6.0" @@ -55,7 +39,6 @@ index 9354fb17..d2014429 100644 -futures.workspace = true -h2.workspace = true -hex.workspace = true --http.workspace = true -hyper.workspace = true -libc.workspace = true -log.workspace = true @@ -116,13 +99,13 @@ index 9354fb17..d2014429 100644 -proxmox-time.workspace = true -proxmox-uuid.workspace = true -proxmox-worker-task.workspace = true +-pbs-api-types.workspace = true - -# in their respective repo -proxmox-acme.workspace = true -pxar.workspace = true - -# proxmox-backup workspace/internal crates --pbs-api-types.workspace = true -pbs-buildcfg.workspace = true -pbs-client.workspace = true -pbs-config.workspace = true @@ -136,7 +119,9 @@ index 9354fb17..d2014429 100644 # Local path overrides # NOTE: You must run `cargo update` after changing this for it to take effect! [patch.crates-io] - +-#pbs-api-types = { path = "../proxmox/pbs-api-types" } ++pbs-api-types = { path = "../proxmox/pbs-api-types" } + #proxmox-acme = { path = "../proxmox/proxmox-acme" } #proxmox-apt = { path = "../proxmox/proxmox-apt" } -#proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" } -#proxmox-async = { path = "../proxmox/proxmox-async" } @@ -196,7 +181,6 @@ index 9354fb17..d2014429 100644 +proxmox-uuid = { path = "../proxmox/proxmox-uuid" } +proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" } - #proxmox-acme = { path = "../proxmox/proxmox-acme" } -#pathpatterns = {path = "../pathpatterns" } -#pxar = { path = "../pxar" } +pathpatterns = {path = "../pathpatterns" } @@ -205,5 +189,5 @@ index 9354fb17..d2014429 100644 [features] default = [] -- -2.47.0 +2.49.0 diff --git a/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-add-target-path-fixup-variable.patch similarity index 70% rename from pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch rename to pkgs/by-name/pr/proxmox-backup-client/0002-docs-add-target-path-fixup-variable.patch index a052c9b7fba0..5f09aa9c95a1 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch +++ b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-add-target-path-fixup-variable.patch @@ -1,7 +1,7 @@ -From fbfbc075c7451cda415fc5678cf5bce8bb11dc78 Mon Sep 17 00:00:00 2001 +From b71b5bab3fadc663d322e3ef2faa8f098423fb03 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 24 Dec 2024 17:22:35 +0100 -Subject: [PATCH 2/3] docs: Add target path fixup variable +Subject: [PATCH 2/5] docs: add target path fixup variable Signed-off-by: Christoph Heiss --- @@ -9,10 +9,10 @@ Signed-off-by: Christoph Heiss 1 file changed, 1 insertion(+) diff --git a/docs/Makefile b/docs/Makefile -index 66da6037..a9939131 100644 +index c57cbbc2..fa00729e 100644 --- a/docs/Makefile +++ b/docs/Makefile -@@ -92,6 +92,7 @@ API_VIEWER_FILES := \ +@@ -94,6 +94,7 @@ API_VIEWER_FILES := \ SPHINXOPTS = -E SPHINXBUILD = sphinx-build BUILDDIR = output @@ -21,5 +21,5 @@ index 66da6037..a9939131 100644 ifeq ($(BUILD_MODE), release) COMPILEDIR := ../target/$(DEB_HOST_RUST_TYPE)/release -- -2.47.0 +2.49.0 diff --git a/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch b/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch index 4a92350d3ebd..fdac6856b983 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch +++ b/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch @@ -1,7 +1,7 @@ -From 3fc7e2ab65ad6a8af360fafa84b97f551fa1b619 Mon Sep 17 00:00:00 2001 +From 88f8ac1e5d158ad0a46177b813fd7557cc5e3fbe Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 24 Dec 2024 17:35:40 +0100 -Subject: [PATCH 3/3] cargo: use local patched h2 dependency +Subject: [PATCH 3/5] cargo: use local patched h2 dependency Signed-off-by: Christoph Heiss --- @@ -9,7 +9,7 @@ Signed-off-by: Christoph Heiss 1 file changed, 2 insertions(+) diff --git a/Cargo.toml b/Cargo.toml -index d2014429..54f951c8 100644 +index 99d712da..091696f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -201,6 +201,8 @@ proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" } @@ -22,5 +22,5 @@ index d2014429..54f951c8 100644 default = [] #valgrind = ["valgrind_request"] -- -2.47.0 +2.49.0 diff --git a/pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch b/pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch new file mode 100644 index 000000000000..4db8088010d2 --- /dev/null +++ b/pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch @@ -0,0 +1,83 @@ +From 846d0b9c8f62340cb0703c59d16414b05a15382a Mon Sep 17 00:00:00 2001 +From: Thomas Lamprecht +Date: Tue, 29 Nov 2022 17:20:28 +0100 +Subject: [PATCH 4/5] docs: drop all but client man pages + +Signed-off-by: Thomas Lamprecht +Signed-off-by: Christoph Heiss +--- + docs/Makefile | 19 ------------------- + docs/conf.py | 24 ------------------------ + 2 files changed, 43 deletions(-) + +diff --git a/docs/Makefile b/docs/Makefile +index fa00729e..53a420b5 100644 +--- a/docs/Makefile ++++ b/docs/Makefile +@@ -1,27 +1,8 @@ + include ../defines.mk + + GENERATED_SYNOPSIS := \ +- config/acl/roles.rst \ +- config/datastore/config.rst \ +- config/domains/config.rst \ +- config/media-pool/config.rst \ +- config/notifications-priv/config.rst \ +- config/notifications/config.rst \ +- config/remote/config.rst \ +- config/sync/config.rst \ +- config/tape-job/config.rst \ +- config/tape/config.rst \ +- config/user/config.rst \ +- config/verification/config.rst \ +- config/prune/config.rst \ +- pmt/synopsis.rst \ +- pmtx/synopsis.rst \ + proxmox-backup-client/catalog-shell-synopsis.rst \ + proxmox-backup-client/synopsis.rst \ +- proxmox-backup-debug/synopsis.rst \ +- proxmox-backup-manager/synopsis.rst \ +- proxmox-file-restore/synopsis.rst \ +- proxmox-tape/synopsis.rst \ + pxar/synopsis.rst \ + + MAN1_PAGES := \ +diff --git a/docs/conf.py b/docs/conf.py +index a7fa1079..345a0170 100644 +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -93,31 +93,7 @@ rst_epilog += f"\n.. |pbs-copyright| replace:: Copyright (C) {copyright}" + man_pages = [ + # CLI + ('proxmox-backup-client/man1', 'proxmox-backup-client', 'Command line tool for Backup and Restore', [author], 1), +- ('proxmox-backup-manager/man1', 'proxmox-backup-manager', 'Command line tool to manage and configure the backup server.', [author], 1), +- ('proxmox-backup-debug/man1', 'proxmox-backup-debug', 'Debugging command line tool for Backup and Restore', [author], 1), +- ('proxmox-backup-proxy/man1', 'proxmox-backup-proxy', 'Proxmox Backup Public API Server', [author], 1), +- ('proxmox-backup/man1', 'proxmox-backup', 'Proxmox Backup Local API Server', [author], 1), +- ('proxmox-file-restore/man1', 'proxmox-file-restore', 'CLI tool for restoring files and directories from Proxmox Backup Server archives', [author], 1), +- ('proxmox-tape/man1', 'proxmox-tape', 'Proxmox Tape Backup CLI Tool', [author], 1), + ('pxar/man1', 'pxar', 'Proxmox File Archive CLI Tool', [author], 1), +- ('pmt/man1', 'pmt', 'Control Linux Tape Devices', [author], 1), +- ('pmtx/man1', 'pmtx', 'Control SCSI media changer devices (tape autoloaders)', [author], 1), +- ('pbs2to3/man1', 'pbs2to3', 'Proxmox Backup Server upgrade checker script for 2.4+ to current 3.x major upgrades', [author], 1), +- # configs +- ('config/acl/man5', 'acl.cfg', 'Access Control Configuration', [author], 5), +- ('config/datastore/man5', 'datastore.cfg', 'Datastore Configuration', [author], 5), +- ('config/domains/man5', 'domains.cfg', 'Realm Configuration', [author], 5), +- ('config/media-pool/man5', 'media-pool.cfg', 'Media Pool Configuration', [author], 5), +- ('config/node/man5', 'proxmox-backup.node.cfg', 'Proxmox Backup Server - Node Configuration', [author], 5), +- ('config/remote/man5', 'remote.cfg', 'Remote Server Configuration', [author], 5), +- ('config/sync/man5', 'sync.cfg', 'Synchronization Job Configuration', [author], 5), +- ('config/tape-job/man5', 'tape-job.cfg', 'Tape Job Configuration', [author], 5), +- ('config/tape/man5', 'tape.cfg', 'Tape Drive and Changer Configuration', [author], 5), +- ('config/user/man5', 'user.cfg', 'User Configuration', [author], 5), +- ('config/verification/man5', 'verification.cfg', 'Verification Job Configuration', [author], 5), +- ('config/prune/man5', 'prune.cfg', 'Prune Job Configuration', [author], 5), +- ('config/notifications/man5', 'notifications.cfg', 'Notification target/matcher configuration', [author], 5), +- ('config/notifications-priv/man5', 'notifications-priv.cfg', 'Notification target secrets', [author], 5), + ] + + +-- +2.49.0 + diff --git a/pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch b/pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch new file mode 100644 index 000000000000..535191c61d0e --- /dev/null +++ b/pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch @@ -0,0 +1,198 @@ +From b1a06f6a63a63410f89bd0d2968a6fdb7ce2352d Mon Sep 17 00:00:00 2001 +From: Christoph Heiss +Date: Thu, 5 Jun 2025 12:01:10 +0200 +Subject: [PATCH 5/5] Revert "h2: switch to legacy feature" + +This reverts commit 168ed370263e84a6235968c615b856b9280debe1. + +It's a Proxmox-specific workaround (see also the commit description +itself) and does not apply here. + +Signed-off-by: Christoph Heiss +--- + Cargo.toml | 2 +- + examples/h2client.rs | 6 +++--- + examples/h2s-client.rs | 6 +++--- + pbs-client/src/backup_writer.rs | 8 ++++---- + pbs-client/src/http_client.rs | 12 +++++------- + pbs-client/src/pipe_to_stream.rs | 2 +- + 6 files changed, 17 insertions(+), 19 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 091696f1..063f62f8 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -122,7 +122,7 @@ env_logger = "0.11" + flate2 = "1.0" + foreign-types = "0.3" + futures = "0.3" +-h2 = { version = "0.4", features = [ "legacy", "stream" ] } ++h2 = { version = "0.4", features = [ "stream" ] } + handlebars = "3.0" + hex = "0.4.3" + hickory-resolver = { version = "0.24.1", default-features = false, features = [ "system-config", "tokio-runtime" ] } +diff --git a/examples/h2client.rs b/examples/h2client.rs +index e44c43fa..1dcb4498 100644 +--- a/examples/h2client.rs ++++ b/examples/h2client.rs +@@ -10,7 +10,7 @@ use tokio::net::TcpStream; + // Simple H2 client to test H2 download speed using h2server.rs + + struct Process { +- body: h2::legacy::RecvStream, ++ body: h2::RecvStream, + trailers: bool, + bytes: usize, + } +@@ -50,7 +50,7 @@ impl Future for Process { + } + + fn send_request( +- mut client: h2::legacy::client::SendRequest, ++ mut client: h2::client::SendRequest, + ) -> impl Future> { + println!("sending request"); + +@@ -78,7 +78,7 @@ async fn run() -> Result<(), Error> { + let conn = TcpStream::connect(std::net::SocketAddr::from(([127, 0, 0, 1], 8008))).await?; + conn.set_nodelay(true).unwrap(); + +- let (client, h2) = h2::legacy::client::Builder::new() ++ let (client, h2) = h2::client::Builder::new() + .initial_connection_window_size(1024 * 1024 * 1024) + .initial_window_size(1024 * 1024 * 1024) + .max_frame_size(4 * 1024 * 1024) +diff --git a/examples/h2s-client.rs b/examples/h2s-client.rs +index 86b3a931..a12b5a48 100644 +--- a/examples/h2s-client.rs ++++ b/examples/h2s-client.rs +@@ -10,7 +10,7 @@ use tokio::net::TcpStream; + // Simple H2 client to test H2 download speed using h2s-server.rs + + struct Process { +- body: h2::legacy::RecvStream, ++ body: h2::RecvStream, + trailers: bool, + bytes: usize, + } +@@ -50,7 +50,7 @@ impl Future for Process { + } + + fn send_request( +- mut client: h2::legacy::client::SendRequest, ++ mut client: h2::client::SendRequest, + ) -> impl Future> { + println!("sending request"); + +@@ -94,7 +94,7 @@ async fn run() -> Result<(), Error> { + .await + .map_err(|err| format_err!("connect failed - {}", err))?; + +- let (client, h2) = h2::legacy::client::Builder::new() ++ let (client, h2) = h2::client::Builder::new() + .initial_connection_window_size(1024 * 1024 * 1024) + .initial_window_size(1024 * 1024 * 1024) + .max_frame_size(4 * 1024 * 1024) +diff --git a/pbs-client/src/backup_writer.rs b/pbs-client/src/backup_writer.rs +index 32542506..1253ef56 100644 +--- a/pbs-client/src/backup_writer.rs ++++ b/pbs-client/src/backup_writer.rs +@@ -56,7 +56,7 @@ pub struct UploadOptions { + } + + struct ChunkUploadResponse { +- future: h2::legacy::client::ResponseFuture, ++ future: h2::client::ResponseFuture, + size: usize, + } + +@@ -143,7 +143,7 @@ impl BackupWriter { + param: Option, + content_type: &str, + data: Vec, +- ) -> Result { ++ ) -> Result { + let request = + H2Client::request_builder("localhost", method, path, param, Some(content_type)) + .unwrap(); +@@ -514,7 +514,7 @@ impl BackupWriter { + } + + fn response_queue() -> ( +- mpsc::Sender, ++ mpsc::Sender, + oneshot::Receiver>, + ) { + let (verify_queue_tx, verify_queue_rx) = mpsc::channel(100); +@@ -537,7 +537,7 @@ impl BackupWriter { + tokio::spawn( + ReceiverStream::new(verify_queue_rx) + .map(Ok::<_, Error>) +- .try_for_each(move |response: h2::legacy::client::ResponseFuture| { ++ .try_for_each(move |response: h2::client::ResponseFuture| { + response + .map_err(Error::from) + .and_then(H2Client::h2api_response) +diff --git a/pbs-client/src/http_client.rs b/pbs-client/src/http_client.rs +index c95def07..8f6f8b41 100644 +--- a/pbs-client/src/http_client.rs ++++ b/pbs-client/src/http_client.rs +@@ -863,7 +863,7 @@ impl HttpClient { + + let max_window_size = (1 << 31) - 2; + +- let (h2, connection) = h2::legacy::client::Builder::new() ++ let (h2, connection) = h2::client::Builder::new() + .initial_connection_window_size(max_window_size) + .initial_window_size(max_window_size) + .max_frame_size(4 * 1024 * 1024) +@@ -1008,11 +1008,11 @@ impl Drop for HttpClient { + + #[derive(Clone)] + pub struct H2Client { +- h2: h2::legacy::client::SendRequest, ++ h2: h2::client::SendRequest, + } + + impl H2Client { +- pub fn new(h2: h2::legacy::client::SendRequest) -> Self { ++ pub fn new(h2: h2::client::SendRequest) -> Self { + Self { h2 } + } + +@@ -1092,7 +1092,7 @@ impl H2Client { + &self, + request: Request<()>, + data: Option, +- ) -> impl Future> { ++ ) -> impl Future> { + self.h2 + .clone() + .ready() +@@ -1109,9 +1109,7 @@ impl H2Client { + }) + } + +- pub async fn h2api_response( +- response: Response, +- ) -> Result { ++ pub async fn h2api_response(response: Response) -> Result { + let status = response.status(); + + let (_head, mut body) = response.into_parts(); +diff --git a/pbs-client/src/pipe_to_stream.rs b/pbs-client/src/pipe_to_stream.rs +index 3fc942d3..ae689851 100644 +--- a/pbs-client/src/pipe_to_stream.rs ++++ b/pbs-client/src/pipe_to_stream.rs +@@ -8,7 +8,7 @@ use std::task::{Context, Poll}; + use anyhow::{format_err, Error}; + use bytes::Bytes; + use futures::{ready, Future}; +-use h2::legacy::SendStream; ++use h2::SendStream; + + pub struct PipeToSendStream { + body_tx: SendStream, +-- +2.49.0 + diff --git a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock index f7420ac3d37e..9c10cf28e635 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock +++ b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock @@ -19,9 +19,9 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", "once_cell", @@ -45,10 +45,71 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] -name = "anyhow" -version = "1.0.95" +name = "anstream" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" + +[[package]] +name = "anstyle-parse" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.59.0", +] + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "async-trait" +version = "0.1.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" +dependencies = [ + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", +] [[package]] name = "atomic-waker" @@ -64,9 +125,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ "addr2line", "cfg-if", @@ -91,23 +152,20 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bindgen" -version = "0.69.5" +version = "0.71.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.1", "cexpr", "clang-sys", "itertools", - "lazy_static", - "lazycell", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2 1.0.95", + "quote 1.0.40", "regex", "rustc-hash", "shlex", - "syn 2.0.91", - "which", + "syn 2.0.101", ] [[package]] @@ -118,9 +176,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" [[package]] name = "block-buffer" @@ -133,21 +191,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "bytes" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.5" +version = "1.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" +checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951" dependencies = [ "jobserver", "libc", @@ -160,7 +218,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "nom", + "nom 7.1.3", ] [[package]] @@ -201,6 +259,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "colorchoice" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + [[package]] name = "const_format" version = "0.2.34" @@ -216,8 +280,8 @@ version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2 1.0.95", + "quote 1.0.40", "unicode-xid 0.2.6", ] @@ -239,9 +303,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -265,6 +329,12 @@ dependencies = [ "typenum", ] +[[package]] +name = "data-encoding" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" + [[package]] name = "digest" version = "0.10.7" @@ -302,22 +372,22 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "either" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "email-encoding" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3d894bbbab314476b265f9b2d46bf24b123a36dd0e96b06a1b49545b9d9dcc" +checksum = "9298e6504d9b9e780ed3f7dfd43a61be8cd0e09eb07f7706a945b0072b6670b6" dependencies = [ "base64 0.22.1", "memchr", @@ -355,29 +425,51 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.10.2" +name = "enum-as-inner" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +dependencies = [ + "heck", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", +] + +[[package]] +name = "env_filter" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" dependencies = [ - "humantime", - "is-terminal", "log", "regex", - "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "jiff", + "log", ] [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.10" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" dependencies = [ "libc", "windows-sys 0.59.0", @@ -406,7 +498,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix", + "rustix 0.38.44", "windows-sys 0.48.0", ] @@ -424,9 +516,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.35" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" dependencies = [ "crc32fast", "miniz_oxide", @@ -516,9 +608,9 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] @@ -563,13 +655,25 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", ] [[package]] @@ -580,9 +684,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "h2" @@ -605,7 +709,7 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.7" +version = "0.4.10" dependencies = [ "atomic-waker", "bytes", @@ -646,15 +750,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" [[package]] -name = "hermit-abi" -version = "0.4.0" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hex" @@ -666,23 +770,59 @@ dependencies = [ ] [[package]] -name = "home" -version = "0.5.11" +name = "hickory-proto" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +checksum = "92652067c9ce6f66ce53cc38d1169daa36e6e7eb7dd3b63b5103bd9d97117248" dependencies = [ - "windows-sys 0.59.0", + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna", + "ipnet", + "once_cell", + "rand", + "thiserror 1.0.69", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "smallvec", + "thiserror 1.0.69", + "tokio", + "tracing", ] [[package]] name = "hostname" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" dependencies = [ "cfg-if", "libc", - "windows", + "windows-link", ] [[package]] @@ -709,9 +849,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.5" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "httpdate" @@ -719,12 +859,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" version = "0.14.32" @@ -751,21 +885,22 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", ] [[package]] -name = "icu_locid" -version = "1.5.0" +name = "icu_locale_core" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" dependencies = [ "displaydoc", "litemap", @@ -774,31 +909,11 @@ dependencies = [ "zerovec", ] -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" dependencies = [ "displaydoc", "icu_collections", @@ -806,67 +921,54 @@ dependencies = [ "icu_properties", "icu_provider", "smallvec", - "utf16_iter", - "utf8_iter", - "write16", "zerovec", ] [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" [[package]] name = "icu_properties" -version = "1.5.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" dependencies = [ "displaydoc", "icu_collections", - "icu_locid_transform", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" dependencies = [ "displaydoc", - "icu_locid", - "icu_provider_macros", + "icu_locale_core", "stable_deref_trait", "tinystr", "writeable", "yoke", "zerofrom", + "zerotrie", "zerovec", ] -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", -] - [[package]] name = "idna" version = "1.0.3" @@ -880,9 +982,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ "icu_normalizer", "icu_properties", @@ -890,54 +992,92 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown 0.15.3", ] [[package]] -name = "is-terminal" -version = "0.4.13" +name = "ipconfig" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.52.0", + "socket2", + "widestring", + "windows-sys 0.48.0", + "winreg", ] +[[package]] +name = "ipnet" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jiff" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442" +dependencies = [ + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", +] [[package]] name = "jobserver" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" dependencies = [ + "getrandom 0.3.3", "libc", ] [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -949,17 +1089,11 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "lettre" -version = "0.11.11" +version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c9a167ff73df98a5ecc07e8bf5ce90b583665da3d1762eb1f775ad4d0d6f5" +checksum = "87ffd14fa289730e3ad68edefdc31f603d56fe716ec38f2076bb7410e09147c2" dependencies = [ "base64 0.22.1", "chumsky", @@ -972,7 +1106,7 @@ dependencies = [ "idna", "mime", "native-tls", - "nom", + "nom 8.0.0", "percent-encoding", "quoted_printable", "socket2", @@ -982,18 +1116,18 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.169" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libloading" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.53.0", ] [[package]] @@ -1002,7 +1136,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.1", "libc", "redox_syscall", ] @@ -1018,22 +1152,53 @@ dependencies = [ ] [[package]] -name = "linux-raw-sys" -version = "0.4.14" +name = "linked-hash-map" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" + +[[package]] +name = "lock_api" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +dependencies = [ + "autocfg", + "scopeguard", +] [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] [[package]] name = "memchr" @@ -1073,29 +1238,29 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", - "wasi", - "windows-sys 0.52.0", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.59.0", ] [[package]] name = "native-tls" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" dependencies = [ "libc", "log", @@ -1153,6 +1318,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nom" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" +dependencies = [ + "memchr", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -1174,17 +1348,23 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" [[package]] name = "openssl" -version = "0.10.68" +version = "0.10.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.1", "cfg-if", "foreign-types", "libc", @@ -1199,22 +1379,22 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.104" +version = "0.9.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" dependencies = [ "cc", "libc", @@ -1228,6 +1408,29 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "parking_lot" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + [[package]] name = "pathpatterns" version = "0.3.0" @@ -1238,7 +1441,7 @@ dependencies = [ [[package]] name = "pbs-api-types" -version = "0.1.0" +version = "0.2.2" dependencies = [ "anyhow", "const_format", @@ -1259,19 +1462,19 @@ dependencies = [ [[package]] name = "pbs-buildcfg" -version = "3.3.2" +version = "3.4.2" [[package]] name = "pbs-client" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 2.6.0", + "bitflags 2.9.1", "bytes", "futures", - "h2 0.4.7", + "h2 0.4.10", "hex", - "http", + "hickory-resolver", "hyper", "libc", "nix 0.26.4", @@ -1324,6 +1527,7 @@ dependencies = [ "proxmox-shared-memory", "proxmox-sys", "proxmox-time", + "proxmox-uuid", "regex", "serde", "serde_json", @@ -1335,6 +1539,7 @@ version = "0.1.0" dependencies = [ "anyhow", "base64 0.13.1", + "const_format", "crc32fast", "endian_trait", "futures", @@ -1356,10 +1561,12 @@ dependencies = [ "proxmox-schema", "proxmox-serde", "proxmox-sys", + "proxmox-systemd", "proxmox-time", "proxmox-uuid", "proxmox-worker-task", "pxar", + "regex", "serde", "serde_json", "tokio", @@ -1423,7 +1630,7 @@ name = "pbs-tape" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 2.6.0", + "bitflags 2.9.1", "endian_trait", "hex", "libc", @@ -1457,7 +1664,7 @@ dependencies = [ "foreign-types", "hex", "libc", - "nom", + "nom 7.1.3", "openssl", "proxmox-async", "proxmox-human-byte", @@ -1476,20 +1683,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" +checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6" dependencies = [ "memchr", - "thiserror 2.0.9", + "thiserror 2.0.12", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" +checksum = "d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5" dependencies = [ "pest", "pest_generator", @@ -1497,22 +1704,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" +checksum = "db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "pest_meta" -version = "2.7.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" +checksum = "7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0" dependencies = [ "once_cell", "pest", @@ -1521,9 +1728,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -1533,9 +1740,42 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "portable-atomic" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro2" @@ -1548,26 +1788,26 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] [[package]] name = "proxmox-api-macro" -version = "1.2.1" +version = "1.3.3" dependencies = [ "anyhow", - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "proxmox-apt-api-types" -version = "1.0.2" +version = "1.0.3" dependencies = [ "proxmox-config-digest", "proxmox-schema", @@ -1589,7 +1829,7 @@ dependencies = [ [[package]] name = "proxmox-auth-api" -version = "0.4.6" +version = "0.4.8" dependencies = [ "anyhow", "const_format", @@ -1601,7 +1841,7 @@ dependencies = [ [[package]] name = "proxmox-backup" -version = "3.3.2" +version = "3.4.2" [[package]] name = "proxmox-backup-banner" @@ -1676,7 +1916,7 @@ dependencies = [ [[package]] name = "proxmox-config-digest" -version = "0.1.0" +version = "0.1.1" dependencies = [ "anyhow", "hex", @@ -1699,7 +1939,7 @@ dependencies = [ [[package]] name = "proxmox-http" -version = "0.9.4" +version = "0.9.5" dependencies = [ "anyhow", "base64 0.13.1", @@ -1715,6 +1955,7 @@ dependencies = [ "serde_json", "tokio", "tokio-openssl", + "tower-service", "ureq", "url", ] @@ -1730,7 +1971,7 @@ dependencies = [ [[package]] name = "proxmox-human-byte" -version = "0.1.3" +version = "0.1.4" dependencies = [ "anyhow", "proxmox-schema", @@ -1752,7 +1993,7 @@ version = "1.4.0" [[package]] name = "proxmox-log" -version = "0.2.7" +version = "0.2.9" dependencies = [ "anyhow", "nix 0.26.4", @@ -1767,7 +2008,7 @@ dependencies = [ [[package]] name = "proxmox-notify" -version = "0.5.1" +version = "0.5.5" dependencies = [ "anyhow", "base64 0.13.1", @@ -1795,7 +2036,7 @@ dependencies = [ [[package]] name = "proxmox-router" -version = "3.0.0" +version = "3.1.1" dependencies = [ "anyhow", "env_logger", @@ -1812,12 +2053,12 @@ dependencies = [ "serde", "serde_json", "serde_plain", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] name = "proxmox-schema" -version = "3.2.0" +version = "4.0.0" dependencies = [ "anyhow", "const_format", @@ -1830,7 +2071,7 @@ dependencies = [ [[package]] name = "proxmox-section-config" -version = "2.1.1" +version = "3.0.0" dependencies = [ "anyhow", "hex", @@ -1875,14 +2116,14 @@ dependencies = [ name = "proxmox-sortable-macro" version = "0.1.3" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "proxmox-sys" -version = "0.6.5" +version = "0.6.7" dependencies = [ "anyhow", "libc", @@ -1905,13 +2146,13 @@ dependencies = [ [[package]] name = "proxmox-time" -version = "2.0.3" +version = "2.0.4" dependencies = [ "anyhow", - "bitflags 2.6.0", + "bitflags 2.9.1", "js-sys", "libc", - "nom", + "nom 7.1.3", ] [[package]] @@ -1931,9 +2172,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" +checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f" dependencies = [ "cc", ] @@ -1987,11 +2228,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ - "proc-macro2 1.0.92", + "proc-macro2 1.0.95", ] [[package]] @@ -2000,6 +2241,12 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73" +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + [[package]] name = "radix_trie" version = "0.2.1" @@ -2011,12 +2258,42 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.5.8" +name = "rand" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "bitflags 2.6.0", + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.16", +] + +[[package]] +name = "redox_syscall" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" +dependencies = [ + "bitflags 2.9.1", ] [[package]] @@ -2025,7 +2302,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom", + "getrandom 0.2.16", "libredox", "thiserror 1.0.69", ] @@ -2059,6 +2336,12 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +[[package]] +name = "resolv-conf" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3" + [[package]] name = "rustc-demangle" version = "0.1.24" @@ -2067,20 +2350,33 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.1", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +dependencies = [ + "bitflags 2.9.1", + "errno", + "libc", + "linux-raw-sys 0.9.4", "windows-sys 0.59.0", ] @@ -2108,9 +2404,12 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +dependencies = [ + "zeroize", +] [[package]] name = "rustyline" @@ -2131,16 +2430,16 @@ dependencies = [ "scopeguard", "smallvec", "unicode-segmentation", - "unicode-width", + "unicode-width 0.1.14", "utf8parse", "winapi", ] [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "same-file" @@ -2172,7 +2471,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.1", "core-foundation", "core-foundation-sys", "libc", @@ -2181,9 +2480,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -2191,29 +2490,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.216" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.216" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", "memchr", @@ -2232,9 +2531,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -2258,9 +2557,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" dependencies = [ "libc", ] @@ -2282,9 +2581,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "smawk" @@ -2294,9 +2593,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2310,9 +2609,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.17" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" +checksum = "cddb07e32ddb770749da91081d8d0ac3a16f1a569a18b20348cd371f5dead06b" dependencies = [ "cc", "cfg-if", @@ -2340,31 +2639,31 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.91" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2 1.0.95", + "quote 1.0.40", "unicode-ident", ] [[package]] name = "synstructure" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "tar" -version = "0.4.43" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" +checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a" dependencies = [ "filetime", "libc", @@ -2373,35 +2672,26 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.14.0" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" dependencies = [ - "cfg-if", "fastrand", + "getrandom 0.3.3", "once_cell", - "rustix", + "rustix 1.0.7", "windows-sys 0.59.0", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "textwrap" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" +checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057" dependencies = [ "smawk", "unicode-linebreak", - "unicode-width", + "unicode-width 0.2.0", ] [[package]] @@ -2415,11 +2705,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.12", ] [[package]] @@ -2428,20 +2718,20 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] @@ -2456,19 +2746,34 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ "displaydoc", "zerovec", ] [[package]] -name = "tokio" -version = "1.42.0" +name = "tinyvec" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.45.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" dependencies = [ "backtrace", "bytes", @@ -2483,13 +2788,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] @@ -2516,9 +2821,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.13" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" +checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" dependencies = [ "bytes", "futures-core", @@ -2550,9 +2855,9 @@ version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] @@ -2609,9 +2914,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "ucd-trie" @@ -2631,9 +2936,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-linebreak" @@ -2653,6 +2958,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "unicode-xid" version = "0.1.0" @@ -2690,12 +3001,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -2710,9 +3015,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "valuable" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "vcpkg" @@ -2752,10 +3057,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.99" +name = "wasi" +version = "0.14.2+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", @@ -2764,58 +3078,55 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ - "quote 1.0.37", + "quote 1.0.40", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] -name = "which" -version = "4.4.2" +name = "widestring" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] +checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d" [[package]] name = "winapi" @@ -2849,23 +3160,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.52.0" +name = "windows-link" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" [[package]] name = "windows-sys" @@ -2918,13 +3216,29 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -2937,6 +3251,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -2949,6 +3269,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -2961,12 +3287,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -2979,6 +3317,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -2991,6 +3335,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -3003,6 +3353,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -3016,26 +3372,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "write16" -version = "1.0.0" +name = "windows_x86_64_msvc" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags 2.9.1", +] [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" [[package]] name = "xattr" -version = "1.3.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e" dependencies = [ "libc", - "linux-raw-sys", - "rustix", + "rustix 1.0.7", ] [[package]] @@ -3046,9 +3420,9 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "yoke" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" dependencies = [ "serde", "stable_deref_trait", @@ -3058,62 +3432,79 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "zerofrom" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", "synstructure", ] [[package]] -name = "zerovec" -version = "0.10.4" +name = "zeroize" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" dependencies = [ "yoke", "zerofrom", @@ -3122,13 +3513,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] @@ -3152,9 +3543,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" +version = "2.0.15+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" dependencies = [ "bindgen", "cc", diff --git a/pkgs/by-name/pr/proxmox-backup-client/package.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix index 833f668aacf5..e19b41c293c6 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/package.nix +++ b/pkgs/by-name/pr/proxmox-backup-client/package.nix @@ -21,20 +21,20 @@ let pname = "proxmox-backup-client"; - version = "3.3.2"; + version = "3.4.2"; proxmox-backup_src = fetchgit { url = "git://git.proxmox.com/git/proxmox-backup.git"; - tag = "v${version}"; + rev = "37f1949335cad801f7cdaa0173cc114590a37e4e"; name = "proxmox-backup"; - hash = "sha256-0piUftzuK9e8KbOe+bc3SXWa0DlnEgk5iNGWGn4fw7Y="; + hash = "sha256-OW6GG/4IcEw8XOSSB5EoN+jyoOaL0ZtavJahnKOuAqI="; }; proxmox_src = fetchgit { url = "git://git.proxmox.com/git/proxmox.git"; - rev = "df6b705f564ff145faa14770db6493bc5da8cab3"; + rev = "e47fdf411be61b15382bc3baa3064f1e7cb03fa2"; name = "proxmox"; - hash = "sha256-6fQVK+G5FMPy+29hScMkvQ+MQQryYs8f8oooq1YGXbg="; + hash = "sha256-jSU00D75sx40VS8rgF+D6h120FMaD1Jfq4e8l+8D5BQ="; }; proxmox-fuse_src = fetchgit { @@ -63,11 +63,9 @@ let name = "h2"; owner = "hyperium"; repo = "h2"; - rev = "v0.4.7"; - hash = "sha256-GcO4321Jqt1w7jbvQKd0GXIjptyz+tlN2SuxHoBJ/9k="; + rev = "v0.4.10"; + hash = "sha256-PasHCbU466ByHIbDQpMMgzjg2dMRveOButHeVSknSEQ="; }; - - aurPatchCommit = "6f83f58d54bc7186211d0cfa637c652b13e0dfee"; in rustPlatform.buildRustPackage { @@ -85,7 +83,7 @@ rustPlatform.buildRustPackage { sourceRoot = proxmox-backup_src.name; # These patches are essentially un-upstreamable, due to being "workarounds" related to the - # project structure. + # project structure and upstream/Debian-specific packaging. cargoPatches = [ # A lot of Rust crates `proxmox-backup-client` depends on are only available through git (or # Debian packages). This patch redirects all these dependencies to a local, relative path, which @@ -94,17 +92,16 @@ rustPlatform.buildRustPackage { # `make docs` assumes that the binaries are located under `target/{debug,release}`, but due # to how `buildRustPackage` works, they get put under `target/$RUSTC_TARGET/{debug,release}`. # This patch simply fixes that up. - ./0002-docs-Add-target-path-fixup-variable.patch + ./0002-docs-add-target-path-fixup-variable.patch # Need to use a patched version of the `h2` crate (with a downgraded dependency, see also postPatch). # This overrides it in the Cargo.toml as needed. ./0003-cargo-use-local-patched-h2-dependency.patch # This patch prevents the generation of the man-pages for other components inside the repo, # which would require them too be built too. Thus avoid wasting resources and just skip them. - (fetchpatch { - name = "0002-docs-drop-all-but-client-man-pages.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-docs-drop-all-but-client-man-pages.patch?h=proxmox-backup-client&id=${aurPatchCommit}"; - hash = "sha256-AlIGfJZGaZl2NBVfuFxpDL6bgyvXA2Wcz7UWSrnQa24="; - }) + ./0004-docs-drop-all-but-client-man-pages.patch + # Upstream uses a patched version of the h2 crate (see [0]), which does not apply here. + # [0] https://git.proxmox.com/?p=debcargo-conf.git;a=blob;f=src/h2/debian/patches/add-legacy.patch;h=0913da317 + ./0005-Revert-h2-switch-to-legacy-feature.patch ]; postPatch = '' diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix index 0acf7886422f..ae499019b099 100644 --- a/pkgs/by-name/pr/proxsuite/package.nix +++ b/pkgs/by-name/pr/proxsuite/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { pythonImportsCheck = [ "proxsuite" ]; meta = { - description = "The Advanced Proximal Optimization Toolbox"; + description = "Advanced Proximal Optimization Toolbox"; homepage = "https://github.com/Simple-Robotics/proxsuite"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ nim65s ]; diff --git a/pkgs/by-name/pr/prs/package.nix b/pkgs/by-name/pr/prs/package.nix index 03f66f6f8422..916e1dfc4ecd 100644 --- a/pkgs/by-name/pr/prs/package.nix +++ b/pkgs/by-name/pr/prs/package.nix @@ -49,15 +49,15 @@ rustPlatform.buildRustPackage rec { done ''; - meta = with lib; { + meta = { description = "Secure, fast & convenient password manager CLI using GPG and git to sync"; homepage = "https://gitlab.com/timvisee/prs"; changelog = "https://gitlab.com/timvisee/prs/-/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ lgpl3Only # lib gpl3Only # everything else ]; - maintainers = with maintainers; [ colemickens ]; + maintainers = with lib.maintainers; [ colemickens ]; mainProgram = "prs"; }; } diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index 58dfc057515a..bfa65a34d437 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -44,13 +44,13 @@ buildGoModule rec { package = pscale; }; - meta = with lib; { + meta = { description = "CLI for PlanetScale Database"; mainProgram = "pscale"; changelog = "https://github.com/planetscale/cli/releases/tag/v${version}"; homepage = "https://www.planetscale.com/"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pimeys kashw2 ]; diff --git a/pkgs/by-name/ps/psudohash/package.nix b/pkgs/by-name/ps/psudohash/package.nix index 461e70030746..d373f631ad54 100644 --- a/pkgs/by-name/ps/psudohash/package.nix +++ b/pkgs/by-name/ps/psudohash/package.nix @@ -31,12 +31,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Password list generator for orchestrating brute force attacks and cracking hashes"; homepage = "https://github.com/t3l3machus/psudohash"; changelog = "https://github.com/t3l3machus/psudohash/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ exploitoverload ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ exploitoverload ]; mainProgram = "psudohash"; }; } diff --git a/pkgs/by-name/pt/ptouch-driver/package.nix b/pkgs/by-name/pt/ptouch-driver/package.nix index 95c04d04d462..149215771fbe 100644 --- a/pkgs/by-name/pt/ptouch-driver/package.nix +++ b/pkgs/by-name/pt/ptouch-driver/package.nix @@ -73,14 +73,14 @@ stdenv.mkDerivation rec { "foomatic-rip" # cups-filters ]; - meta = with lib; { + meta = { changelog = "https://github.com/philpem/printer-driver-ptouch/releases/tag/v${version}"; description = "Printer Driver for Brother P-touch and QL Label Printers"; downloadPage = "https://github.com/philpem/printer-driver-ptouch"; homepage = "https://github.com/philpem/printer-driver-ptouch"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ sascha8a ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ sascha8a ]; + platforms = lib.platforms.linux; longDescription = '' This is ptouch-driver, a printer driver based on CUPS and foomatic, for the Brother P-touch and QL label printer families. diff --git a/pkgs/by-name/pu/public-sans/package.nix b/pkgs/by-name/pu/public-sans/package.nix index 30b40c3f068f..4c91fc03be41 100644 --- a/pkgs/by-name/pu/public-sans/package.nix +++ b/pkgs/by-name/pu/public-sans/package.nix @@ -23,12 +23,12 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Strong, neutral, principles-driven, open source typeface for text or display"; homepage = "https://public-sans.digital.gov/"; changelog = "https://github.com/uswds/public-sans/raw/v${version}/FONTLOG.txt"; - license = licenses.ofl; - maintainers = [ ]; - platforms = platforms.all; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix index b90481040830..546632649cdc 100644 --- a/pkgs/by-name/pu/publii/package.nix +++ b/pkgs/by-name/pu/publii/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} ''; - meta = with lib; { + meta = { description = "Static Site CMS with GUI to build privacy-focused SEO-friendly website"; mainProgram = "Publii"; longDescription = '' @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://getpublii.com"; changelog = "https://github.com/getpublii/publii/releases/tag/v${version}"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ urandom sebtm diff --git a/pkgs/by-name/pu/pubs/package.nix b/pkgs/by-name/pu/pubs/package.nix index 6f8772f2ac72..0aa4e6b47430 100644 --- a/pkgs/by-name/pu/pubs/package.nix +++ b/pkgs/by-name/pu/pubs/package.nix @@ -71,13 +71,13 @@ python3.pkgs.buildPythonApplication rec { "pubs" ]; - meta = with lib; { + meta = { description = "Command-line bibliography manager"; mainProgram = "pubs"; homepage = "https://github.com/pubs/pubs"; changelog = "https://github.com/pubs/pubs/blob/v${version}/changelog.md"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/by-name/pu/pueue/package.nix b/pkgs/by-name/pu/pueue/package.nix index 6412b1e21a8f..4324c882cf4a 100644 --- a/pkgs/by-name/pu/pueue/package.nix +++ b/pkgs/by-name/pu/pueue/package.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion pueue.{bash,fish} _pueue ''; - meta = with lib; { + meta = { homepage = "https://github.com/Nukesor/pueue"; description = "Daemon for managing long running shell commands"; longDescription = '' @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { processed, even if you no longer have any active ssh sessions. ''; changelog = "https://github.com/Nukesor/pueue/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ sarcasticadmin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sarcasticadmin ]; }; } diff --git a/pkgs/by-name/pu/pur/package.nix b/pkgs/by-name/pu/pur/package.nix index 3d1723fe119b..eebb7b1284d3 100644 --- a/pkgs/by-name/pu/pur/package.nix +++ b/pkgs/by-name/pu/pur/package.nix @@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec { "test_no_arguments_and_no_requirements_file" ]; - meta = with lib; { + meta = { description = "Python library for update and track the requirements"; homepage = "https://github.com/alanhamlett/pip-update-requirements"; changelog = "https://github.com/alanhamlett/pip-update-requirements/blob/${version}/HISTORY.rst"; - license = licenses.bsd2; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "pur"; }; } diff --git a/pkgs/by-name/pw/pw-volume/package.nix b/pkgs/by-name/pw/pw-volume/package.nix index deb28d104371..9687a37a3691 100644 --- a/pkgs/by-name/pw/pw-volume/package.nix +++ b/pkgs/by-name/pw/pw-volume/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-MQ21pM8aSA/OnxGPVSEVVM6yF0CeX1T0VYN27tqZru8="; - meta = with lib; { + meta = { description = "Basic interface to PipeWire volume controls"; homepage = "https://github.com/smasher164/pw-volume"; changelog = "https://github.com/smasher164/pw-volume/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ astro figsoda ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "pw-volume"; }; } diff --git a/pkgs/by-name/pw/pwdsafety/package.nix b/pkgs/by-name/pw/pwdsafety/package.nix index b1ea4a5e23a5..1bebac09f4d2 100644 --- a/pkgs/by-name/pw/pwdsafety/package.nix +++ b/pkgs/by-name/pw/pwdsafety/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-s" ]; - meta = with lib; { + meta = { description = "Command line tool checking password safety"; homepage = "https://github.com/edoardottt/pwdsafety"; changelog = "https://github.com/edoardottt/pwdsafety/releases/tag/v${version}"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "pwdsafety"; }; } diff --git a/pkgs/by-name/pw/pwncat/package.nix b/pkgs/by-name/pw/pwncat/package.nix index 12b54f3a4738..ccc883c001e8 100644 --- a/pkgs/by-name/pw/pwncat/package.nix +++ b/pkgs/by-name/pw/pwncat/package.nix @@ -19,12 +19,12 @@ python3Packages.buildPythonApplication rec { # Tests requires to start containers doCheck = false; - meta = with lib; { + meta = { description = "TCP/UDP communication suite"; homepage = "https://pwncat.org/"; changelog = "https://github.com/cytopia/pwncat/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "pwncat"; }; } diff --git a/pkgs/by-name/py/py-spy/package.nix b/pkgs/by-name/py/py-spy/package.nix index f0000dd4c458..31d39067dab0 100644 --- a/pkgs/by-name/py/py-spy/package.nix +++ b/pkgs/by-name/py/py-spy/package.nix @@ -38,13 +38,13 @@ rustPlatform.buildRustPackage rec { "--skip=test_negative_linenumber_increment" ]; - meta = with lib; { + meta = { description = "Sampling profiler for Python programs"; mainProgram = "py-spy"; homepage = "https://github.com/benfred/py-spy"; changelog = "https://github.com/benfred/py-spy/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ lnl7 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lnl7 ]; platforms = lib.platforms.linux; # https://github.com/benfred/py-spy/pull/330 broken = stdenv.hostPlatform.isAarch64; diff --git a/pkgs/by-name/py/py3c/package.nix b/pkgs/by-name/py/py3c/package.nix index 8f42639a737c..7ddef7728128 100644 --- a/pkgs/by-name/py/py3c/package.nix +++ b/pkgs/by-name/py/py3c/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - python311, + python3, }: stdenv.mkDerivation rec { @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { doCheck = true; nativeCheckInputs = [ - python311 + python3 + python3.pkgs.distutils ]; checkTarget = "test-python"; diff --git a/pkgs/by-name/py/pymol/package.nix b/pkgs/by-name/py/pymol/package.nix index 27cedfb1e044..df3549541efa 100644 --- a/pkgs/by-name/py/pymol/package.nix +++ b/pkgs/by-name/py/pymol/package.nix @@ -17,7 +17,7 @@ }: let pname = "pymol"; - description = "A Python-enhanced molecular graphics tool"; + description = "Python-enhanced molecular graphics tool"; desktopItem = makeDesktopItem { name = pname; diff --git a/pkgs/by-name/py/pyrosimple/package.nix b/pkgs/by-name/py/pyrosimple/package.nix index 88af7907c8e6..8126e926f994 100644 --- a/pkgs/by-name/py/pyrosimple/package.nix +++ b/pkgs/by-name/py/pyrosimple/package.nix @@ -63,12 +63,12 @@ python3.pkgs.buildPythonApplication rec { }; }; - meta = with lib; { + meta = { description = "RTorrent client"; homepage = "https://kannibalox.github.io/pyrosimple/"; changelog = "https://github.com/kannibalox/pyrosimple/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ne9z vamega ]; diff --git a/pkgs/by-name/py/pysolfc/package.nix b/pkgs/by-name/py/pysolfc/package.nix index 1c8d0b852663..38ddf835ecd4 100644 --- a/pkgs/by-name/py/pysolfc/package.nix +++ b/pkgs/by-name/py/pysolfc/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchzip, - python311Packages, + python3Packages, desktop-file-utils, freecell-solver, black-hole-solver, @@ -10,7 +10,7 @@ gitUpdater, }: -python311Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pysolfc"; version = "3.2.0"; @@ -51,7 +51,7 @@ python311Packages.buildPythonApplication rec { ''; }; - propagatedBuildInputs = with python311Packages; [ + propagatedBuildInputs = with python3Packages; [ tkinter six random2 @@ -98,7 +98,7 @@ python311Packages.buildPythonApplication rec { ); meta = with lib; { - description = "A collection of more than 1000 solitaire card games"; + description = "Collection of more than 1000 solitaire card games"; mainProgram = "pysol.py"; homepage = "https://pysolfc.sourceforge.io"; license = licenses.gpl3; diff --git a/pkgs/by-name/py/pysqlrecon/package.nix b/pkgs/by-name/py/pysqlrecon/package.nix index 3a5753493aeb..26f0cf92827c 100644 --- a/pkgs/by-name/py/pysqlrecon/package.nix +++ b/pkgs/by-name/py/pysqlrecon/package.nix @@ -36,12 +36,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "pysqlrecon" ]; - meta = with lib; { + meta = { description = "Offensive MSSQL toolkit"; homepage = "https://github.com/Tw1sm/PySQLRecon"; changelog = "https://github.com/Tw1sm/PySQLRecon/blob/${version}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "pysqlrecon"; }; } diff --git a/pkgs/by-name/py/python-launcher/package.nix b/pkgs/by-name/py/python-launcher/package.nix index 7d2bef8b0279..c9a36c6ea4bf 100644 --- a/pkgs/by-name/py/python-launcher/package.nix +++ b/pkgs/by-name/py/python-launcher/package.nix @@ -23,12 +23,12 @@ rustPlatform.buildRustPackage rec { useNextest = true; - meta = with lib; { + meta = { description = "Implementation of the `py` command for Unix-based platforms"; homepage = "https://github.com/brettcannon/python-launcher"; changelog = "https://github.com/brettcannon/python-launcher/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "py"; }; } diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix index e93f4c3ef4d1..7acf51d007d2 100644 --- a/pkgs/by-name/py/pywal16/package.nix +++ b/pkgs/by-name/py/pywal16/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pywal16"; - version = "3.8.6"; + version = "3.8.9"; pyproject = true; src = fetchFromGitHub { owner = "eylles"; repo = "pywal16"; tag = version; - hash = "sha256-aq9I9KJnzwFjfLZ2fzW80abJQ/oSX7FcmCXYi1JMY7Q="; + hash = "sha256-43nKFTkIqaG9UzAjvNbZAog3NLMRKdtnZHxiiiBuD/4="; }; build-system = [ python3.pkgs.setuptools ]; diff --git a/pkgs/by-name/py/pyzy/package.nix b/pkgs/by-name/py/pyzy/package.nix index 5fdcae56c47b..e9e5d392ccf1 100644 --- a/pkgs/by-name/py/pyzy/package.nix +++ b/pkgs/by-name/py/pyzy/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { }; meta = with lib; { - description = "The Chinese PinYin and Bopomofo conversion library"; + description = "Chinese PinYin and Bopomofo conversion library"; homepage = "https://github.com/openSUSE/pyzy"; license = licenses.lgpl21; maintainers = with maintainers; [ azuwis ]; diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix index d56ffd92ae7a..d46ea13d2d49 100644 --- a/pkgs/by-name/q2/q2pro/package.nix +++ b/pkgs/by-name/q2/q2pro/package.nix @@ -30,7 +30,7 @@ waylandSupport ? stdenv.hostPlatform.isLinux, }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "q2pro"; version = "0-unstable-2025-05-03"; @@ -90,9 +90,9 @@ stdenv.mkDerivation (finalAttrs: rec { (lib.mesonEnable "windows-crash-dumps" false) ]; - internalVersion = "r${revCount}~${builtins.substring 0 8 src.rev}"; + internalVersion = "r${finalAttrs.revCount}~${builtins.substring 0 8 finalAttrs.src.rev}"; postPatch = '' - echo '${internalVersion}' > VERSION + echo '${finalAttrs.internalVersion}' > VERSION ''; postInstall = @@ -105,13 +105,13 @@ stdenv.mkDerivation (finalAttrs: rec { makeWrapper $out/bin/q2pro-unwrapped $out/bin/q2pro \ --prefix ${ldLibraryPathEnvName} : "${lib.makeLibraryPath finalAttrs.buildInputs}" - install -D ${src}/src/unix/res/q2pro.xpm $out/share/icons/hicolor/32x32/apps/q2pro.xpm + install -D ${finalAttrs.src}/src/unix/res/q2pro.xpm $out/share/icons/hicolor/32x32/apps/q2pro.xpm ''; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; preVersionCheck = '' - export version='${internalVersion}' + export version='${finalAttrs.internalVersion}' ''; doInstallCheck = true; diff --git a/pkgs/by-name/qm/qmk/package.nix b/pkgs/by-name/qm/qmk/package.nix index 91c5cdc262d6..39c130310768 100644 --- a/pkgs/by-name/qm/qmk/package.nix +++ b/pkgs/by-name/qm/qmk/package.nix @@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { pkgsCross.avr.buildPackages.binutils pkgsCross.avr.buildPackages.binutils.bintools pkgsCross.avr.buildPackages.gcc - pkgsCross.avr.libcCross + pkgsCross.avr.libc ]; # no tests implemented diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix index f401c7e070f8..522c671f073f 100644 --- a/pkgs/by-name/qo/qovery-cli/package.nix +++ b/pkgs/by-name/qo/qovery-cli/package.nix @@ -34,12 +34,12 @@ buildGoModule rec { command = "HOME=$(mktemp -d); ${pname} version"; }; - meta = with lib; { + meta = { description = "Qovery Command Line Interface"; homepage = "https://github.com/Qovery/qovery-cli"; changelog = "https://github.com/Qovery/qovery-cli/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "qovery-cli"; }; } diff --git a/pkgs/by-name/qr/qrencode/package.nix b/pkgs/by-name/qr/qrencode/package.nix index 246499eba9ce..b9a588488a51 100644 --- a/pkgs/by-name/qr/qrencode/package.nix +++ b/pkgs/by-name/qr/qrencode/package.nix @@ -8,7 +8,7 @@ libiconv, }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "qrencode"; version = "4.1.1"; @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: rec { ]; src = fetchurl { - url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz"; + url = "https://fukuchi.org/works/qrencode/qrencode-${finalAttrs.version}.tar.gz"; sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4="; }; diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix index 22f020325984..0efef1f7a502 100644 --- a/pkgs/by-name/qu/quadrapassel/package.nix +++ b/pkgs/by-name/qu/quadrapassel/package.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "quadrapassel"; }; }; - meta = with lib; { + meta = { description = "Classic falling-block game, Tetris"; mainProgram = "quadrapassel"; homepage = "https://gitlab.gnome.org/GNOME/quadrapassel"; changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${version}/NEWS?ref_type=tags"; - license = licenses.gpl2Plus; - teams = [ teams.gnome ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.gnome ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/qu/quark-goldleaf/package.nix b/pkgs/by-name/qu/quark-goldleaf/package.nix index 7395bff0c8f8..927e6f097f97 100644 --- a/pkgs/by-name/qu/quark-goldleaf/package.nix +++ b/pkgs/by-name/qu/quark-goldleaf/package.nix @@ -98,7 +98,7 @@ maven.buildMavenPackage rec { meta = { changelog = "https://github.com/XorTroll/Goldleaf/releases/tag/${src.rev}"; - description = "A GUI tool for transfering files between a computer and a Nintendo Switch running Goldleaf"; + description = "GUI tool for transfering files between a computer and a Nintendo Switch running Goldleaf"; homepage = "https://github.com/XorTroll/Goldleaf#quark-and-remote-browsing"; longDescription = '' ${meta.description} diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix index c16483060a98..fa09cc22d5b1 100644 --- a/pkgs/by-name/qu/qutebrowser/package.nix +++ b/pkgs/by-name/qu/qutebrowser/package.nix @@ -155,14 +155,14 @@ python3.pkgs.buildPythonApplication { ) ''; - meta = with lib; { + meta = { homepage = "https://github.com/qutebrowser/qutebrowser"; changelog = "https://github.com/qutebrowser/qutebrowser/blob/v${version}/doc/changelog.asciidoc"; description = "Keyboard-focused browser with a minimal GUI"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; mainProgram = "qutebrowser"; platforms = if enableWideVine then [ "x86_64-linux" ] else qt6Packages.qtwebengine.meta.platforms; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ jagajaga rnhmjoj ebzzry diff --git a/pkgs/development/interpreters/racket/configure-installation.rkt b/pkgs/by-name/ra/racket/configure-installation.rkt similarity index 100% rename from pkgs/development/interpreters/racket/configure-installation.rkt rename to pkgs/by-name/ra/racket/configure-installation.rkt diff --git a/pkgs/by-name/ra/racket/manifest.json b/pkgs/by-name/ra/racket/manifest.json new file mode 100644 index 000000000000..e7250d32f99d --- /dev/null +++ b/pkgs/by-name/ra/racket/manifest.json @@ -0,0 +1,11 @@ +{ + "version": "8.17", + "full": { + "filename": "racket-8.17-src.tgz", + "sha256": "44431395138f7b8c5e67d416ff063b8fb6ce056f4c4f0fda27b7b1ec58bfa33b" + }, + "minimal": { + "filename": "racket-minimal-8.17-src.tgz", + "sha256": "4acb365869290881fa07c69588cfa8b2dc1000bdc69955d70964b0b1e76b71ba" + } +} diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/by-name/ra/racket/minimal.nix similarity index 94% rename from pkgs/development/interpreters/racket/minimal.nix rename to pkgs/by-name/ra/racket/minimal.nix index 8d85729c2a58..2acd10f83bd7 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/by-name/ra/racket/minimal.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchpatch, fetchurl, libiconvReal, @@ -50,13 +49,6 @@ stdenv.mkDerivation (finalAttrs: { circumvent this error. */ ./patches/force-remove-codesign-then-add.patch - - (fetchpatch { - name = "darwin-cs-preprocess.patch"; - url = "https://github.com/racket/racket/commit/ee9fb20a10a1a8e36650681afcafe99f0b044423.patch"; - hash = "sha256-9aTRzfd3dwznfJg0fwsjhN4SYgXncrGyBCbcmKlxlio="; - stripLen = 1; - }) ]; preConfigure = @@ -173,6 +165,10 @@ stdenv.mkDerivation (finalAttrs: { asl20 mit ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode + ]; maintainers = with lib.maintainers; [ rc-zb ]; mainProgram = "racket"; platforms = lib.platforms.all; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/by-name/ra/racket/package.nix similarity index 100% rename from pkgs/development/interpreters/racket/default.nix rename to pkgs/by-name/ra/racket/package.nix diff --git a/pkgs/development/interpreters/racket/patches/force-cs-variant.patch b/pkgs/by-name/ra/racket/patches/force-cs-variant.patch similarity index 100% rename from pkgs/development/interpreters/racket/patches/force-cs-variant.patch rename to pkgs/by-name/ra/racket/patches/force-cs-variant.patch diff --git a/pkgs/development/interpreters/racket/patches/force-remove-codesign-then-add.patch b/pkgs/by-name/ra/racket/patches/force-remove-codesign-then-add.patch similarity index 100% rename from pkgs/development/interpreters/racket/patches/force-remove-codesign-then-add.patch rename to pkgs/by-name/ra/racket/patches/force-remove-codesign-then-add.patch diff --git a/pkgs/development/interpreters/racket/tests/draw-crossing.nix b/pkgs/by-name/ra/racket/tests/draw-crossing.nix similarity index 100% rename from pkgs/development/interpreters/racket/tests/draw-crossing.nix rename to pkgs/by-name/ra/racket/tests/draw-crossing.nix diff --git a/pkgs/development/interpreters/racket/tests/get-version-and-variant.nix b/pkgs/by-name/ra/racket/tests/get-version-and-variant.nix similarity index 100% rename from pkgs/development/interpreters/racket/tests/get-version-and-variant.nix rename to pkgs/by-name/ra/racket/tests/get-version-and-variant.nix diff --git a/pkgs/development/interpreters/racket/tests/load-openssl.nix b/pkgs/by-name/ra/racket/tests/load-openssl.nix similarity index 100% rename from pkgs/development/interpreters/racket/tests/load-openssl.nix rename to pkgs/by-name/ra/racket/tests/load-openssl.nix diff --git a/pkgs/development/interpreters/racket/tests/nix-write-script.nix b/pkgs/by-name/ra/racket/tests/nix-write-script.nix similarity index 100% rename from pkgs/development/interpreters/racket/tests/nix-write-script.nix rename to pkgs/by-name/ra/racket/tests/nix-write-script.nix diff --git a/pkgs/development/interpreters/racket/tests/write-greeting.nix b/pkgs/by-name/ra/racket/tests/write-greeting.nix similarity index 100% rename from pkgs/development/interpreters/racket/tests/write-greeting.nix rename to pkgs/by-name/ra/racket/tests/write-greeting.nix diff --git a/pkgs/development/interpreters/racket/update.py b/pkgs/by-name/ra/racket/update.py similarity index 100% rename from pkgs/development/interpreters/racket/update.py rename to pkgs/by-name/ra/racket/update.py diff --git a/pkgs/by-name/ra/radcli/package.nix b/pkgs/by-name/ra/radcli/package.nix index f0e9bd7b59af..e0d9d2109584 100644 --- a/pkgs/by-name/ra/radcli/package.nix +++ b/pkgs/by-name/ra/radcli/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { nettle ]; - meta = with lib; { + meta = { description = "Simple RADIUS client library"; homepage = "https://github.com/radcli/radcli"; changelog = "https://github.com/radcli/radcli/blob/${version}/NEWS"; - license = licenses.bsd2; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "radcli"; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix index a6eb1001ea5e..6c467f96b1e1 100644 --- a/pkgs/by-name/ra/radicle-explorer/package.nix +++ b/pkgs/by-name/ra/radicle-explorer/package.nix @@ -63,7 +63,7 @@ lib.fix ( self: lib.makeOverridable ( { - npmDepsHash ? "sha256-pPbN/goBsRHGAnDzof50PlQtS0RMux4dq1b8Gn5jEP4=", + npmDepsHash ? "sha256-7/DH0p66FTfC0N42FhWTqehg5m/yq929ANhL4jAt7Ss=", patches ? [ ], }@args: buildNpmPackage { @@ -77,7 +77,7 @@ lib.fix ( # separate hash. src = fetchgit { inherit (radicle-httpd.src) url rev; - hash = "sha256-jxiGL9gEbl4n+GmFeRc8cVljfD8hrFRfSrA9GnOeE40="; + hash = "sha256-HRSrLdiDETTWNF+Rzvlg1XQerXcCE2xaY+6Xbq5pItI="; }; postPatch = '' diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index 23be36f33645..365992ca2b1f 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -12,20 +12,20 @@ }: rustPlatform.buildRustPackage rec { pname = "radicle-httpd"; - version = "0.18.2"; + version = "0.19.1"; env.RADICLE_VERSION = version; # You must update the radicle-explorer source hash when changing this. src = fetchgit { url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git"; rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}"; - hash = "sha256-s4QZi3/EEKzlvfhlU9KMuSeH8Al4kFnhADk10WLUilA="; + hash = "sha256-RDF36bEJg54DG/YgORGo+BwrHMfmd12FRCrP6fVvHPg="; sparseCheckout = [ "radicle-httpd" ]; }; sourceRoot = "${src.name}/radicle-httpd"; useFetchCargoVendor = true; - cargoHash = "sha256-ILsrDrpBMY8X3ZpfyUdf342agP6E8d32LEQTYtV869o="; + cargoHash = "sha256-wSz0kM2XU717A0+mU+3eOHJWlRGdG9KjvfUkUq5bv14="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix index 9c359fa71505..f6b00cb145ee 100644 --- a/pkgs/by-name/ra/rage/package.nix +++ b/pkgs/by-name/ra/rage/package.nix @@ -35,15 +35,15 @@ rustPlatform.buildRustPackage rec { --zsh target/*/release/completions/_* ''; - meta = with lib; { + meta = { description = "Simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability"; homepage = "https://github.com/str4d/rage"; changelog = "https://github.com/str4d/rage/blob/v${version}/rage/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ asl20 mit ]; # either at your option - maintainers = with maintainers; [ ryantm ]; + maintainers = with lib.maintainers; [ ryantm ]; mainProgram = "rage"; }; } diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 5c5f8c74109c..b4242a85d87b 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -25,13 +25,13 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; - meta = with lib; { + meta = { mainProgram = "railway"; description = "Railway.app CLI"; homepage = "https://github.com/railwayapp/cli"; changelog = "https://github.com/railwayapp/cli/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Crafter techknowlogick ]; diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index 3931848bdafa..5f3185c7de83 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage { meta = { changelog = "https://github.com/achristmascarl/rainfrog/releases/tag/v${version}"; - description = "A database management TUI for postgres"; + description = "Database management TUI for postgres"; homepage = "https://github.com/achristmascarl/rainfrog"; license = lib.licenses.mit; mainProgram = "rainfrog"; diff --git a/pkgs/by-name/ra/rakkess/package.nix b/pkgs/by-name/ra/rakkess/package.nix index 8ea988b69a57..28c2681edbc7 100644 --- a/pkgs/by-name/ra/rakkess/package.nix +++ b/pkgs/by-name/ra/rakkess/package.nix @@ -22,7 +22,7 @@ buildGoModule rec { "-X github.com/corneliusweig/rakkess/internal/version.version=v${version}" ]; - meta = with lib; { + meta = { homepage = "https://github.com/corneliusweig/rakkess"; changelog = "https://github.com/corneliusweig/rakkess/releases/tag/v${version}"; description = "Review Access - kubectl plugin to show an access matrix for k8s server resources"; @@ -35,7 +35,7 @@ buildGoModule rec { the current user and all server resources, similar to `kubectl auth can-i --list`. ''; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jk ]; }; } diff --git a/pkgs/by-name/ra/range-v3/package.nix b/pkgs/by-name/ra/range-v3/package.nix index 1b5d5caa8e7a..31f0fb720079 100644 --- a/pkgs/by-name/ra/range-v3/package.nix +++ b/pkgs/by-name/ra/range-v3/package.nix @@ -31,12 +31,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-std=c++17"; }; - meta = with lib; { + meta = { description = "Experimental range library for C++11/14/17"; homepage = "https://github.com/ericniebler/range-v3"; changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}"; - license = licenses.boost; - platforms = platforms.all; - maintainers = [ ]; + license = lib.licenses.boost; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/ra/rates/package.nix b/pkgs/by-name/ra/rates/package.nix index 9621e30adc04..2227593bd0bf 100644 --- a/pkgs/by-name/ra/rates/package.nix +++ b/pkgs/by-name/ra/rates/package.nix @@ -25,15 +25,15 @@ rustPlatform.buildRustPackage rec { versionCheckProgramArg = "--version"; - meta = with lib; { + meta = { description = "CLI tool that brings currency exchange rates right into your terminal"; homepage = "https://github.com/lunush/rates"; changelog = "https://github.com/lunush/rates/releases/tag/${version}"; - license = with licenses; [ + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ fab ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "rates"; }; } diff --git a/pkgs/by-name/ra/raygui/package.nix b/pkgs/by-name/ra/raygui/package.nix index b60693f84e92..5aa6b78023b0 100644 --- a/pkgs/by-name/ra/raygui/package.nix +++ b/pkgs/by-name/ra/raygui/package.nix @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; meta = { - description = "A simple and easy-to-use immediate-mode gui library"; + description = "Simple and easy-to-use immediate-mode gui library"; homepage = "https://github.com/raysan5/raygui"; license = lib.licenses.zlib; maintainers = with lib.maintainers; [ sigmanificient ]; diff --git a/pkgs/by-name/rb/rbspy/package.nix b/pkgs/by-name/rb/rbspy/package.nix index 067eeeed9db9..1dda4c0c4149 100644 --- a/pkgs/by-name/rb/rbspy/package.nix +++ b/pkgs/by-name/rb/rbspy/package.nix @@ -57,13 +57,13 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { homepage = "https://rbspy.github.io/"; description = "Sampling CPU Profiler for Ruby"; mainProgram = "rbspy"; changelog = "https://github.com/rbspy/rbspy/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ viraptor ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ viraptor ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix index e596d75b0a59..491471bf614e 100644 --- a/pkgs/by-name/rb/rbw/package.nix +++ b/pkgs/by-name/rb/rbw/package.nix @@ -73,12 +73,12 @@ rustPlatform.buildRustPackage rec { --replace pass ${pass}/bin/pass ''; - meta = with lib; { + meta = { description = "Unofficial command line client for Bitwarden"; homepage = "https://crates.io/crates/rbw"; changelog = "https://git.tozt.net/rbw/plain/CHANGELOG.md?id=${version}"; - license = licenses.mit; - maintainers = with maintainers; [ albakham ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ albakham ]; mainProgram = "rbw"; }; } diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index 436df90d68e9..0d842f31eed0 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage rec { "--skip=copy::copy_tests::check_default_mode" ]; - meta = with lib; { + meta = { changelog = "https://github.com/wykurz/rcp/releases/tag/v${version}"; description = "Tools to efficiently copy, remove and link large filesets"; homepage = "https://github.com/wykurz/rcp"; - license = with licenses; [ mit ]; + license = with lib.licenses; [ mit ]; mainProgram = "rcp"; - maintainers = with maintainers; [ wykurz ]; + maintainers = with lib.maintainers; [ wykurz ]; # Building procfs on an for a unsupported platform. Currently only linux and android are supported # (Your current target_os is macos) broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix index fb28bbd643eb..6b32e4b319aa 100644 --- a/pkgs/by-name/re/reaction/package.nix +++ b/pkgs/by-name/re/reaction/package.nix @@ -34,13 +34,13 @@ buildGoModule { cp ip46tables nft46 $out/bin ''; - meta = with lib; { + meta = { description = "Scan logs and take action: an alternative to fail2ban"; homepage = "https://framagit.org/ppom/reaction"; changelog = "https://framagit.org/ppom/reaction/-/releases/v${version}"; - license = licenses.agpl3Plus; + license = lib.licenses.agpl3Plus; mainProgram = "reaction"; - maintainers = with maintainers; [ ppom ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ ppom ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/re/ready-check/package.nix b/pkgs/by-name/re/ready-check/package.nix index 7b95d52ba120..5c9180153295 100644 --- a/pkgs/by-name/re/ready-check/package.nix +++ b/pkgs/by-name/re/ready-check/package.nix @@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec { "ready" ]; - meta = with lib; { + meta = { description = "Tool to check readiness of websites"; homepage = "https://github.com/sesh/ready"; changelog = "https://github.com/sesh/ready/releases/tag/v${version}"; - license = licenses.isc; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "ready"; }; } diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix index 6edeccfdd07d..3ef4dc7724e7 100644 --- a/pkgs/by-name/re/realm/package.nix +++ b/pkgs/by-name/re/realm/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "A simple, high performance relay server written in rust"; + description = "Simple, high performance relay server written in rust"; homepage = "https://github.com/zhboner/realm"; mainProgram = "realm"; license = licenses.mit; diff --git a/pkgs/by-name/re/redact/package.nix b/pkgs/by-name/re/redact/package.nix index f635684222a7..b04f6be12d16 100644 --- a/pkgs/by-name/re/redact/package.nix +++ b/pkgs/by-name/re/redact/package.nix @@ -49,7 +49,7 @@ appimageTools.wrapType2 { ''; meta = { - description = "The only platform that allows you to automatically clean up your old posts from services like Twitter, Reddit, Facebook, Discord, and more, all in one place."; + description = "Only platform that allows you to automatically clean up your old posts from services like Twitter, Reddit, Facebook, Discord, and more, all in one place"; homepage = "https://redact.dev/"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ reputable2772 ]; diff --git a/pkgs/by-name/re/redfishtool/package.nix b/pkgs/by-name/re/redfishtool/package.nix index c145f7823ea4..51a1c781d4a8 100644 --- a/pkgs/by-name/re/redfishtool/package.nix +++ b/pkgs/by-name/re/redfishtool/package.nix @@ -22,12 +22,12 @@ python3.pkgs.buildPythonApplication { python-dateutil ]; - meta = with lib; { + meta = { description = "Python34 program that implements a command line tool for accessing the Redfish API"; homepage = "https://github.com/DMTF/Redfishtool"; changelog = "https://github.com/DMTF/Redfishtool/blob/${version}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ jfvillablanca ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jfvillablanca ]; mainProgram = "redfishtool"; }; } diff --git a/pkgs/by-name/re/redmine/Gemfile b/pkgs/by-name/re/redmine/Gemfile index 8d0d2183e7a2..19138ab112f1 100644 --- a/pkgs/by-name/re/redmine/Gemfile +++ b/pkgs/by-name/re/redmine/Gemfile @@ -82,8 +82,6 @@ group :test do gem 'bundle-audit', require: false end -gem "webrick" - local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exist?(local_gemfile) eval_gemfile local_gemfile diff --git a/pkgs/by-name/re/redmine/Gemfile.local b/pkgs/by-name/re/redmine/Gemfile.local new file mode 100644 index 000000000000..192455d12b9b --- /dev/null +++ b/pkgs/by-name/re/redmine/Gemfile.local @@ -0,0 +1 @@ +gem 'webrick' diff --git a/pkgs/by-name/re/refinery-cli/package.nix b/pkgs/by-name/re/refinery-cli/package.nix index 56ceae80fe14..a408a67f10e9 100644 --- a/pkgs/by-name/re/refinery-cli/package.nix +++ b/pkgs/by-name/re/refinery-cli/package.nix @@ -29,12 +29,12 @@ rustPlatform.buildRustPackage rec { openssl ]; - meta = with lib; { + meta = { description = "Run migrations for the Refinery ORM for Rust via the CLI"; mainProgram = "refinery"; homepage = "https://github.com/rust-db/refinery"; changelog = "https://github.com/rust-db/refinery/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ lucperkins ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lucperkins ]; }; } diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix index a01733c04ea4..20541744e673 100644 --- a/pkgs/by-name/re/rehex/package.nix +++ b/pkgs/by-name/re/rehex/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Reverse Engineers' Hex Editor"; longDescription = '' A cross-platform (Windows, Linux, Mac) hex editor for reverse @@ -71,12 +71,12 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/solemnwarning/rehex"; changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ markus1189 wegank ]; - platforms = platforms.all; + platforms = lib.platforms.all; mainProgram = "rehex"; }; } diff --git a/pkgs/by-name/re/remarshal_0_17/package.nix b/pkgs/by-name/re/remarshal_0_17/package.nix index c3813d5c80e6..ee9e5cd08ef9 100644 --- a/pkgs/by-name/re/remarshal_0_17/package.nix +++ b/pkgs/by-name/re/remarshal_0_17/package.nix @@ -60,12 +60,12 @@ pythonPackages.buildPythonApplication rec { # nixpkgs-update: no auto update - meta = with lib; { + meta = { changelog = "https://github.com/remarshal-project/remarshal/releases/tag/v${version}"; description = "Convert between TOML, YAML and JSON"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/dbohdan/remarshal"; - maintainers = with maintainers; [ hexa ]; + maintainers = with lib.maintainers; [ hexa ]; mainProgram = "remarshal"; }; } diff --git a/pkgs/by-name/re/remodel/package.nix b/pkgs/by-name/re/remodel/package.nix index 89ac00bd0169..3368c022f86c 100644 --- a/pkgs/by-name/re/remodel/package.nix +++ b/pkgs/by-name/re/remodel/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { openssl ]; - meta = with lib; { + meta = { description = "Roblox file manipulation tool"; mainProgram = "remodel"; longDescription = '' @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rojo-rbx/remodel"; downloadPage = "https://github.com/rojo-rbx/remodel/releases/tag/v${version}"; changelog = "https://github.com/rojo-rbx/remodel/raw/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ wackbyte ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wackbyte ]; }; } diff --git a/pkgs/by-name/re/render50/package.nix b/pkgs/by-name/re/render50/package.nix new file mode 100644 index 000000000000..132d1a76af3e --- /dev/null +++ b/pkgs/by-name/re/render50/package.nix @@ -0,0 +1,53 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + fetchpatch2, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "render50"; + version = "9.2.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cs50"; + repo = "render50"; + tag = "v${version}"; + hash = "sha256-ZCSd1Y7PPVkMQWkEgcaqh3Ypy8OrWxI9iM2HMVT/VeA="; + }; + + build-system = [ + python3Packages.setuptools + ]; + + dependencies = with python3Packages; [ + backports-shutil-which + braceexpand + beautifulsoup4 + natsort + pygments + pypdf + requests + six + termcolor + weasyprint + ]; + + nativeCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + # no pytest checks + + meta = { + description = "Generate syntax-highlighted PDFs of source code"; + homepage = "https://cs50.readthedocs.io/render50/"; + downloadPage = "https://github.com/cs50/render50"; + changelog = "https://github.com/cs50/render50/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + mainProgram = "render50"; + }; +} diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix index dba59f5d201a..2755dc5a94ac 100644 --- a/pkgs/by-name/re/renderdoc/package.nix +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -13,7 +13,7 @@ nix-update-script, pcre, pkg-config, - python311Packages, + python3Packages, qt5, stdenv, vulkan-loader, @@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: { [ libXdmcp libpthreadstubs - python311Packages.pyside2 - python311Packages.pyside2-tools - python311Packages.shiboken2 + python3Packages.pyside2 + python3Packages.pyside2-tools + python3Packages.shiboken2 qt5.qtbase qt5.qtsvg vulkan-loader @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper pcre pkg-config - python311Packages.python + python3Packages.python qt5.qtx11extras qt5.wrapQtAppsHook ]; diff --git a/pkgs/by-name/re/reshape/package.nix b/pkgs/by-name/re/reshape/package.nix index c9a5cef39e03..17209982dd42 100644 --- a/pkgs/by-name/re/reshape/package.nix +++ b/pkgs/by-name/re/reshape/package.nix @@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec { postgresqlTestUserOptions = "LOGIN SUPERUSER"; - meta = with lib; { + meta = { description = "Easy-to-use, zero-downtime schema migration tool for Postgres"; mainProgram = "reshape"; homepage = "https://github.com/fabianlindfors/reshape"; changelog = "https://github.com/fabianlindfors/reshape/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ ilyakooo0 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ilyakooo0 ]; }; } diff --git a/pkgs/by-name/re/restic-browser/package.nix b/pkgs/by-name/re/restic-browser/package.nix index 7cfba5fae808..415dd5cdc27b 100644 --- a/pkgs/by-name/re/restic-browser/package.nix +++ b/pkgs/by-name/re/restic-browser/package.nix @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; meta = { - description = "A GUI to browse and restore restic backup repositories"; + description = "GUI to browse and restore restic backup repositories"; homepage = "https://github.com/emuell/restic-browser"; changelog = "https://github.com/emuell/restic-browser/releases/tag/v${version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix index 4a849ef4ed27..09c9a0eeac7a 100644 --- a/pkgs/by-name/re/restish/package.nix +++ b/pkgs/by-name/re/restish/package.nix @@ -43,12 +43,12 @@ buildGoModule rec { package = restish; }; - meta = with lib; { + meta = { description = "CLI tool for interacting with REST-ish HTTP APIs"; homepage = "https://rest.sh/"; changelog = "https://github.com/danielgtaylor/restish/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "restish"; }; } diff --git a/pkgs/by-name/re/resvg/package.nix b/pkgs/by-name/re/resvg/package.nix index f736828cb521..5c5a7c4aa5bf 100644 --- a/pkgs/by-name/re/resvg/package.nix +++ b/pkgs/by-name/re/resvg/package.nix @@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec { install -Dm644 -t $out/include crates/c-api/*.h ''; - meta = with lib; { + meta = { description = "SVG rendering library"; homepage = "https://github.com/RazrFalcon/resvg"; changelog = "https://github.com/RazrFalcon/resvg/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = [ ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ ]; mainProgram = "resvg"; }; } diff --git a/pkgs/by-name/re/reviewdog/package.nix b/pkgs/by-name/re/reviewdog/package.nix index 6e79a2151804..2a90c7b6dfc5 100644 --- a/pkgs/by-name/re/reviewdog/package.nix +++ b/pkgs/by-name/re/reviewdog/package.nix @@ -27,12 +27,12 @@ buildGoModule rec { "-X github.com/reviewdog/reviewdog/commands.Version=${version}" ]; - meta = with lib; { + meta = { description = "Automated code review tool integrated with any code analysis tools regardless of programming language"; mainProgram = "reviewdog"; homepage = "https://github.com/reviewdog/reviewdog"; changelog = "https://github.com/reviewdog/reviewdog/blob/v${version}/CHANGELOG.md"; - maintainers = [ ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/by-name/re/rewritefs/package.nix b/pkgs/by-name/re/rewritefs/package.nix index 03638fb5cf57..91dd2d334024 100644 --- a/pkgs/by-name/re/rewritefs/package.nix +++ b/pkgs/by-name/re/rewritefs/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { preConfigure = "substituteInPlace Makefile --replace /usr/local $out"; meta = with lib; { - description = "A FUSE filesystem intended to be used like Apache mod_rewrite"; + description = "FUSE filesystem intended to be used like Apache mod_rewrite"; homepage = "https://github.com/sloonz/rewritefs"; license = licenses.gpl2Only; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/by-name/re/rewrk/package.nix b/pkgs/by-name/re/rewrk/package.nix index 86d3063460d5..c68a403562e1 100644 --- a/pkgs/by-name/re/rewrk/package.nix +++ b/pkgs/by-name/re/rewrk/package.nix @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - meta = with lib; { + meta = { description = "More modern http framework benchmarker supporting HTTP/1 and HTTP/2 benchmarks"; homepage = "https://github.com/lnx-search/rewrk"; changelog = "https://github.com/lnx-search/rewrk/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "rewrk"; }; } diff --git a/pkgs/by-name/rh/rhoas/package.nix b/pkgs/by-name/rh/rhoas/package.nix index 304f15e412f1..f02f571f8920 100644 --- a/pkgs/by-name/rh/rhoas/package.nix +++ b/pkgs/by-name/rh/rhoas/package.nix @@ -44,12 +44,12 @@ buildGoModule rec { command = "HOME=$TMP rhoas version"; }; - meta = with lib; { + meta = { description = "Command Line Interface for Red Hat OpenShift Application Services"; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://github.com/redhat-developer/app-services-cli"; changelog = "https://github.com/redhat-developer/app-services-cli/releases/v${version}"; - maintainers = with maintainers; [ stehessel ]; + maintainers = with lib.maintainers; [ stehessel ]; mainProgram = "rhoas"; }; } diff --git a/pkgs/by-name/ri/riff/package.nix b/pkgs/by-name/ri/riff/package.nix index 63a7972968cb..f41cbb5cd434 100644 --- a/pkgs/by-name/ri/riff/package.nix +++ b/pkgs/by-name/ri/riff/package.nix @@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/riff --set-default RIFF_DISABLE_TELEMETRY true ''; - meta = with lib; { + meta = { description = "Tool that automatically provides external dependencies for software projects"; mainProgram = "riff"; homepage = "https://riff.sh"; changelog = "https://github.com/DeterminateSystems/riff/releases/tag/v${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/ri/rime-cli/package.nix b/pkgs/by-name/ri/rime-cli/package.nix index 3f2e31dc59bf..649acfa26bc7 100644 --- a/pkgs/by-name/ri/rime-cli/package.nix +++ b/pkgs/by-name/ri/rime-cli/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { vendorHash = null; - meta = with lib; { + meta = { homepage = "https://github.com/puddinging/rime-cli"; changelog = "https://github.com/puddinging/rime-cli/releases/tag/v${version}"; description = "Command line tool to add customized vocabulary for Rime IME"; - license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ urandom ]; mainProgram = "rime-cli"; }; } diff --git a/pkgs/by-name/ri/rinutils/package.nix b/pkgs/by-name/ri/rinutils/package.nix index ca5717a34fdd..aa006c14c29d 100644 --- a/pkgs/by-name/ri/rinutils/package.nix +++ b/pkgs/by-name/ri/rinutils/package.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { --replace '$'{exec_prefix}/@RINUTILS_INSTALL_MYLIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ ''; - meta = with lib; { + meta = { description = "C11 / gnu11 utilities C library by Shlomi Fish / Rindolf"; homepage = "https://github.com/shlomif/rinutils"; changelog = "https://github.com/shlomif/rinutils/raw/${version}/NEWS.asciidoc"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ri/ripe-atlas-tools/package.nix b/pkgs/by-name/ri/ripe-atlas-tools/package.nix index 8ccac955b77e..31fb70a46782 100644 --- a/pkgs/by-name/ri/ripe-atlas-tools/package.nix +++ b/pkgs/by-name/ri/ripe-atlas-tools/package.nix @@ -90,11 +90,11 @@ python3.pkgs.buildPythonApplication rec { echo "__version__ = \"${version}\"" > ripe/atlas/tools/version.py ''; - meta = with lib; { + meta = { description = "RIPE ATLAS project tools"; homepage = "https://github.com/RIPE-NCC/ripe-atlas-tools"; changelog = "https://github.com/RIPE-NCC/ripe-atlas-tools/blob/v${version}/CHANGES.rst"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ raitobezarius ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ raitobezarius ]; }; } diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix index 4e4bd6f102cb..12418a4e34fc 100644 --- a/pkgs/by-name/ri/ripgrep/package.nix +++ b/pkgs/by-name/ri/ripgrep/package.nix @@ -59,15 +59,15 @@ rustPlatform.buildRustPackage rec { echo '(a(aa)aa)' | ${rg} -P '\((a*|(?R))*\)' ''; - meta = with lib; { + meta = { description = "Utility that combines the usability of The Silver Searcher with the raw speed of grep"; homepage = "https://github.com/BurntSushi/ripgrep"; changelog = "https://github.com/BurntSushi/ripgrep/releases/tag/${version}"; - license = with licenses; [ + license = with lib.licenses; [ unlicense # or mit ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ globin ma27 zowoq diff --git a/pkgs/by-name/ri/rita/package.nix b/pkgs/by-name/ri/rita/package.nix index d5bb24650f51..c6ede0f19ee5 100644 --- a/pkgs/by-name/ri/rita/package.nix +++ b/pkgs/by-name/ri/rita/package.nix @@ -24,12 +24,12 @@ buildGoModule rec { "-X=github.com/activecm/rita/config.ExactVersion=${version}" ]; - meta = with lib; { + meta = { description = "Framework for detecting command and control communication through network traffic analysis"; homepage = "https://github.com/activecm/rita"; changelog = "https://github.com/activecm/rita/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "rita"; }; } diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix index 66d0ad91b5df..cb5ade8756ba 100644 --- a/pkgs/by-name/rk/rke/package.nix +++ b/pkgs/by-name/rk/rke/package.nix @@ -25,12 +25,12 @@ buildGoModule rec { "-X=main.VERSION=v${version}" ]; - meta = with lib; { + meta = { homepage = "https://github.com/rancher/rke"; description = "Extremely simple, lightning fast Kubernetes distribution that runs entirely within containers"; mainProgram = "rke"; changelog = "https://github.com/rancher/rke/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ urandom ]; }; } diff --git a/pkgs/by-name/rk/rkvm/package.nix b/pkgs/by-name/rk/rkvm/package.nix index 1619646431a8..57c887bc078a 100644 --- a/pkgs/by-name/rk/rkvm/package.nix +++ b/pkgs/by-name/rk/rkvm/package.nix @@ -42,12 +42,12 @@ rustPlatform.buildRustPackage rec { inherit (nixosTests) rkvm; }; - meta = with lib; { + meta = { description = "Virtual KVM switch for Linux machines"; homepage = "https://github.com/htrefil/rkvm"; changelog = "https://github.com/htrefil/rkvm/releases/tag/${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/rm/rmapi/package.nix b/pkgs/by-name/rm/rmapi/package.nix index 38b225dc94cf..b410d3bd6670 100644 --- a/pkgs/by-name/rm/rmapi/package.nix +++ b/pkgs/by-name/rm/rmapi/package.nix @@ -19,12 +19,12 @@ buildGoModule rec { doCheck = false; - meta = with lib; { + meta = { description = "Go app that allows access to the ReMarkable Cloud API programmatically"; homepage = "https://github.com/ddvk/rmapi"; changelog = "https://github.com/ddvk/rmapi/blob/v${version}/CHANGELOG.md"; - license = licenses.agpl3Only; - maintainers = [ maintainers.nickhu ]; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.nickhu ]; mainProgram = "rmapi"; }; } diff --git a/pkgs/by-name/rn/rng-tools/package.nix b/pkgs/by-name/rn/rng-tools/package.nix index 32127d5a258a..fe28dc029881 100644 --- a/pkgs/by-name/rn/rng-tools/package.nix +++ b/pkgs/by-name/rn/rng-tools/package.nix @@ -104,13 +104,13 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { description = "Random number generator daemon"; homepage = "https://github.com/nhorman/rng-tools"; changelog = "https://github.com/nhorman/rng-tools/releases/tag/v${version}"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ johnazoidberg c0bw3b ]; diff --git a/pkgs/by-name/rn/rnm/package.nix b/pkgs/by-name/rn/rnm/package.nix index fa07e1d68e6b..e028f5e7f6ee 100644 --- a/pkgs/by-name/rn/rnm/package.nix +++ b/pkgs/by-name/rn/rnm/package.nix @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { pcre2 ]; - meta = with lib; { + meta = { homepage = "https://neurobin.org/projects/softwares/unix/rnm/"; description = "Bulk rename utility"; changelog = "https://github.com/neurobin/rnm/blob/${version}/ChangeLog"; platforms = lib.platforms.all; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; mainProgram = "rnm"; }; } diff --git a/pkgs/by-name/rn/rnr/package.nix b/pkgs/by-name/rn/rnr/package.nix index fef4a0960a48..8341341327aa 100644 --- a/pkgs/by-name/rn/rnr/package.nix +++ b/pkgs/by-name/rn/rnr/package.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-lXo3BECHpiNMRMgd4XZy+b8QHbE0TZ5/P4cz+SgwqsY="; - meta = with lib; { + meta = { description = "Command-line tool to batch rename files and directories"; mainProgram = "rnr"; homepage = "https://github.com/ismaelgv/rnr"; changelog = "https://github.com/ismaelgv/rnr/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/ro/robin-map/package.nix b/pkgs/by-name/ro/robin-map/package.nix index 55e5a663af68..c2afe76559e7 100644 --- a/pkgs/by-name/ro/robin-map/package.nix +++ b/pkgs/by-name/ro/robin-map/package.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { cmake ]; - meta = with lib; { + meta = { description = "C++ implementation of a fast hash map and hash set using robin hood hashing"; homepage = "https://github.com/Tessil/robin-map"; changelog = "https://github.com/Tessil/robin-map/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ro/robotframework-tidy/package.nix b/pkgs/by-name/ro/robotframework-tidy/package.nix index b1637a4c7efd..f6119ecef724 100644 --- a/pkgs/by-name/ro/robotframework-tidy/package.nix +++ b/pkgs/by-name/ro/robotframework-tidy/package.nix @@ -33,12 +33,12 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Code autoformatter for Robot Framework"; homepage = "https://robotidy.readthedocs.io"; changelog = "https://github.com/MarketSquare/robotframework-tidy/blob/main/docs/releasenotes/${src.tag}.rst"; - license = licenses.asl20; - maintainers = with maintainers; [ otavio ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ otavio ]; mainProgram = "robotidy"; }; } diff --git a/pkgs/by-name/ro/rocksndiamonds/package.nix b/pkgs/by-name/ro/rocksndiamonds/package.nix index 503c9819db46..9091dc837ef4 100644 --- a/pkgs/by-name/ro/rocksndiamonds/package.nix +++ b/pkgs/by-name/ro/rocksndiamonds/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, makeDesktopItem, + copyDesktopItems, SDL2, SDL2_image, SDL2_mixer, @@ -10,28 +11,36 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocksndiamonds"; version = "4.4.0.5"; src = fetchurl { - url = "https://www.artsoft.org/RELEASES/linux/${pname}/${pname}-${version}-linux.tar.gz"; + url = "https://www.artsoft.org/RELEASES/linux/rocksndiamonds/rocksndiamonds-${finalAttrs.version}-linux.tar.gz"; hash = "sha256-8e6ZYpFoUQ4+ykHDLlKWWyUANPq1lXv7IRHYWfBOU/U="; }; - desktopItem = makeDesktopItem { - name = "rocksndiamonds"; - exec = "rocksndiamonds"; - icon = "rocksndiamonds"; - comment = meta.description; - desktopName = "Rocks'n'Diamonds"; - genericName = "Tile-based puzzle"; - categories = [ - "Game" - "LogicGame" - ]; - }; + desktopItems = [ + (makeDesktopItem { + name = "rocksndiamonds"; + exec = finalAttrs.meta.mainProgram; + icon = "rocksndiamonds"; + comment = finalAttrs.meta.description; + desktopName = "Rocks'n'Diamonds"; + genericName = "Tile-based puzzle"; + categories = [ + "Game" + "LogicGame" + ]; + }) + ]; + strictDeps = true; + + nativeBuildInputs = [ + SDL2 # sdl2-config + copyDesktopItems + ]; buildInputs = [ SDL2 SDL2_image @@ -40,33 +49,33 @@ stdenv.mkDerivation rec { zlib ]; - preBuild = '' - dataDir="$out/share/rocksndiamonds" - appendToVar makeFlags "BASE_PATH=$dataDir" + preConfigure = '' + dataDir=$out/share/rocksndiamonds + makeFlagsArray+=("CC=$CC" "AR=$AR" "RANLIB=$RANLIB" "BASE_PATH=$dataDir") ''; installPhase = '' runHook preInstall - appDir=$out/share/applications iconDir=$out/share/icons/hicolor/32x32/apps - mkdir -p $out/bin $appDir $iconDir $dataDir + mkdir -p $out/bin $iconDir $dataDir cp rocksndiamonds $out/bin/ - ln -s ${desktopItem}/share/applications/* $appDir/ ln -s $dataDir/graphics/gfx_classic/icons/icon.png $iconDir/rocksndiamonds.png cp -r conf docs graphics levels music sounds $dataDir runHook postInstall ''; - enableParallelBuilding = true; + # flaky with parallel building + # ranlib: game_bd.a: error reading bd_caveengine.o: file truncated + enableParallelBuilding = false; - meta = with lib; { + meta = { description = "Scrolling tile-based arcade style puzzle game"; mainProgram = "rocksndiamonds"; homepage = "https://www.artsoft.org/rocksndiamonds/"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ orivej ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ orivej ]; }; -} +}) diff --git a/pkgs/by-name/ro/roswell/package.nix b/pkgs/by-name/ro/roswell/package.nix index f8f7ec658b09..45230de608aa 100644 --- a/pkgs/by-name/ro/roswell/package.nix +++ b/pkgs/by-name/ro/roswell/package.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { curl ]; - meta = with lib; { + meta = { description = "Lisp implementation installer/manager and launcher"; - license = licenses.mit; - maintainers = with maintainers; [ hiro98 ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hiro98 ]; + platforms = lib.platforms.unix; homepage = "https://github.com/roswell/roswell"; changelog = "https://github.com/roswell/roswell/blob/v${version}/ChangeLog"; mainProgram = "ros"; diff --git a/pkgs/by-name/ro/rott/package.nix b/pkgs/by-name/ro/rott/package.nix new file mode 100644 index 000000000000..0a65dd4ae39e --- /dev/null +++ b/pkgs/by-name/ro/rott/package.nix @@ -0,0 +1,82 @@ +{ + stdenv, + lib, + fetchurl, + fetchzip, + SDL_compat, + SDL_mixer, + makeDesktopItem, + copyDesktopItems, + unzip, + buildShareware ? false, + withSharewareData ? buildShareware, +}: +assert withSharewareData -> buildShareware; + +let + datadir = "share/data/rott-shareware/"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "rott"; + version = "1.1.2"; + + __structuredAttrs = true; + srcs = + [ + (fetchurl { + url = "https://icculus.org/rott/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + hash = "sha256-ECUW6MMS9rC79sYj4fAcv7vDFKzorf4fIB1HsVvZJ/8="; + }) + ] + ++ lib.optional withSharewareData (fetchzip { + url = "http://icculus.org/rott/share/1rott13.zip"; + hash = "sha256-l0pP+mNPAabGh7LZrwcB6KOhPRSycrZpAlPVTyDXc6Y="; + stripRoot = false; + }); + + sourceRoot = "rott-${finalAttrs.version}/rott"; + + nativeBuildInputs = [ copyDesktopItems ] ++ lib.optional withSharewareData unzip; + + buildInputs = [ + SDL_compat + SDL_mixer + ]; + + enableParallelBuilding = true; + + makeFlags = [ + "SHAREWARE=${if buildShareware then "1" else "0"}" + ''EXTRACFLAGS=-DDATADIR=\"${if withSharewareData then "${placeholder "out"}/${datadir}" else ""}\"'' + ]; + + installPhase = '' + runHook preInstall + + ${lib.optionalString withSharewareData '' + mkdir -p "$out/${datadir}" + unzip -d "$out/${datadir}" ../../source/ROTTSW13.SHR + ''} + install -Dm755 -t $out/bin rott + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "rott"; + exec = "rott"; + desktopName = "Rise of the Triad: ${if buildShareware then "The HUNT Begins" else "Dark War"}"; + categories = [ "Game" ]; + }) + ]; + + meta = { + description = "SDL port of Rise of the Triad"; + mainProgram = "rott"; + homepage = "https://icculus.org/rott/"; + license = with lib.licenses; [ gpl2Plus ] ++ lib.optional withSharewareData unfreeRedistributable; + maintainers = with lib.maintainers; [ sander ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix index 7fe1e787ccff..2e9df8012f34 100644 --- a/pkgs/by-name/ro/route-graph/package.nix +++ b/pkgs/by-name/ro/route-graph/package.nix @@ -43,12 +43,12 @@ python3.pkgs.buildPythonApplication rec { "route_graph" ]; - meta = with lib; { + meta = { description = "CLI tool for creating graphs of routes"; homepage = "https://github.com/audiusGmbH/route-graph"; changelog = "https://github.com/audiusGmbH/route-graph/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "route-graph"; }; } diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix index becc0b690658..da2ed65e1b81 100644 --- a/pkgs/by-name/ro/routinator/package.nix +++ b/pkgs/by-name/ro/routinator/package.nix @@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-58EnGouq8iKkgsvyHqARoQ0u4QXjw0m6pv4Am4J9wlU="; - meta = with lib; { + meta = { description = "RPKI Validator written in Rust"; homepage = "https://github.com/NLnetLabs/routinator"; changelog = "https://github.com/NLnetLabs/routinator/blob/v${version}/Changelog.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ _0x4A6F ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ _0x4A6F ]; mainProgram = "routinator"; }; diff --git a/pkgs/by-name/rp/rpm-sequoia/package.nix b/pkgs/by-name/rp/rpm-sequoia/package.nix index aa28141583e3..2c645221c9aa 100644 --- a/pkgs/by-name/rp/rpm-sequoia/package.nix +++ b/pkgs/by-name/rp/rpm-sequoia/package.nix @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; meta = { - description = "An OpenPGP backend for rpm using Sequoia PGP"; + description = "OpenPGP backend for rpm using Sequoia PGP"; homepage = "https://sequoia-pgp.org/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ baloo ]; diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix index f5205818e20a..df92b94d790c 100644 --- a/pkgs/by-name/rq/rqbit/package.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -74,12 +74,12 @@ rustPlatform.buildRustPackage { ]; }; - meta = with lib; { + meta = { description = "Bittorrent client in Rust"; homepage = "https://github.com/ikatson/rqbit"; changelog = "https://github.com/ikatson/rqbit/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ cafkafk toasteruwu ]; diff --git a/pkgs/by-name/rs/rsass/package.nix b/pkgs/by-name/rs/rsass/package.nix index abb176e02a63..94128af96092 100644 --- a/pkgs/by-name/rs/rsass/package.nix +++ b/pkgs/by-name/rs/rsass/package.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-TZZweDTF5sGdrCBXh42yaBMTI9ehjHGSFQu9HzVQEdA="; - meta = with lib; { + meta = { description = "Sass reimplemented in rust with nom"; mainProgram = "rsass"; homepage = "https://github.com/kaj/rsass"; changelog = "https://github.com/kaj/rsass/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ mit # or asl20 ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/rs/rsbkb/package.nix b/pkgs/by-name/rs/rsbkb/package.nix index da1ced5f3812..bc5dfb1640a8 100644 --- a/pkgs/by-name/rs/rsbkb/package.nix +++ b/pkgs/by-name/rs/rsbkb/package.nix @@ -33,11 +33,11 @@ rustPlatform.buildRustPackage { for i in $(./rsbkb list) ; do ln -s $path $i ; done ''; - meta = with lib; { + meta = { description = "Command line tools to encode/decode things"; homepage = "https://github.com/trou/rsbkb"; changelog = "https://github.com/trou/rsbkb/releases/tag/release-${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ProducerMatt ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ProducerMatt ]; }; } diff --git a/pkgs/by-name/rs/rsgain/package.nix b/pkgs/by-name/rs/rsgain/package.nix index be16f7d71467..3581e2d011c5 100644 --- a/pkgs/by-name/rs/rsgain/package.nix +++ b/pkgs/by-name/rs/rsgain/package.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { zlib ]; - meta = with lib; { + meta = { description = "Simple, but powerful ReplayGain 2.0 tagging utility"; mainProgram = "rsgain"; homepage = "https://github.com/complexlogic/rsgain"; changelog = "https://github.com/complexlogic/rsgain/blob/v${version}/CHANGELOG"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = [ maintainers.felipeqq2 ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.felipeqq2 ]; }; } diff --git a/pkgs/by-name/rs/rssguard/package.nix b/pkgs/by-name/rs/rssguard/package.nix index 3f1b74b587a0..cc98879e62b5 100644 --- a/pkgs/by-name/rs/rssguard/package.nix +++ b/pkgs/by-name/rs/rssguard/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { (cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"") ]; - meta = with lib; { + meta = { description = "Simple RSS/Atom feed reader with online synchronization"; mainProgram = "rssguard"; longDescription = '' @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/martinrotter/rssguard"; changelog = "https://github.com/martinrotter/rssguard/releases/tag/${version}"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jluttine tebriel ]; diff --git a/pkgs/by-name/rs/rstfmt/package.nix b/pkgs/by-name/rs/rstfmt/package.nix index cf4dd98ac709..f933f6e204c3 100644 --- a/pkgs/by-name/rs/rstfmt/package.nix +++ b/pkgs/by-name/rs/rstfmt/package.nix @@ -33,11 +33,11 @@ python3.pkgs.buildPythonApplication rec { "rstfmt" ]; - meta = with lib; { + meta = { description = "Formatter for reStructuredText"; homepage = "https://github.com/dzhu/rstfmt"; changelog = "https://github.com/dzhu/rstfmt/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/rt/rtrtr/package.nix b/pkgs/by-name/rt/rtrtr/package.nix index 507652fe2dec..ef3e7d5f6c06 100644 --- a/pkgs/by-name/rt/rtrtr/package.nix +++ b/pkgs/by-name/rt/rtrtr/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = true; - meta = with lib; { + meta = { description = "RPKI data proxy"; longDescription = '' TRTR is an RPKI data proxy, designed to collect Validated ROA Payloads @@ -34,8 +34,8 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/NLnetLabs/rtrtr"; changelog = "https://github.com/NLnetLabs/rtrtr/blob/v${version}/Changelog.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ steamwalker ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ steamwalker ]; mainProgram = "rtrtr"; }; } diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 625968ee98b0..4cad9bee4f43 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,19 +16,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.11.12"; + version = "0.11.13"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-5oLMhP4PKzZTp0ab+Fitq97GAVLV/GJmR2JH9IXlfuU"; + hash = "sha256-qa4TCvjk0zrXRdiTTqjJbUnCXQKpwiRwtA28y8ZuGpw="; }; cargoBuildFlags = [ "--package=ruff" ]; useFetchCargoVendor = true; - cargoHash = "sha256-PIzR9d0O82M/b7HgmPigc2h8KwjSHi08vs3jAQyXbzs"; + cargoHash = "sha256-JkhvTONWKd3/2jI/yQU2jRfEQ2eAp3drup9SsYWOXNA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ru/ruler/package.nix b/pkgs/by-name/ru/ruler/package.nix index d68cd743aeff..b3bcd2f9c188 100644 --- a/pkgs/by-name/ru/ruler/package.nix +++ b/pkgs/by-name/ru/ruler/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-s" ]; - meta = with lib; { + meta = { description = "Tool to abuse Exchange services"; homepage = "https://github.com/sensepost/ruler"; changelog = "https://github.com/sensepost/ruler/releases/tag/${version}"; - license = with licenses; [ cc-by-nc-40 ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ cc-by-nc-40 ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "ruler"; }; } diff --git a/pkgs/by-name/ru/rundeck-cli/package.nix b/pkgs/by-name/ru/rundeck-cli/package.nix index 2bfb535e08a9..cbf54aed1752 100644 --- a/pkgs/by-name/ru/rundeck-cli/package.nix +++ b/pkgs/by-name/ru/rundeck-cli/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "The official CLI tool for Rundeck"; + description = "Official CLI tool for Rundeck"; longDescription = '' The rd command provides command line access to the Rundeck HTTP API, allowing you to access and control your Rundeck server from the diff --git a/pkgs/by-name/ru/rune-languageserver/package.nix b/pkgs/by-name/ru/rune-languageserver/package.nix index 750b5a897dd9..a6440c5bac7b 100644 --- a/pkgs/by-name/ru/rune-languageserver/package.nix +++ b/pkgs/by-name/ru/rune-languageserver/package.nix @@ -20,15 +20,15 @@ rustPlatform.buildRustPackage rec { RUNE_VERSION = version; }; - meta = with lib; { + meta = { description = "Language server for the Rune Language, an embeddable dynamic programming language for Rust"; homepage = "https://crates.io/crates/rune-languageserver"; changelog = "https://github.com/rune-rs/rune/releases/tag/${version}"; - license = with licenses; [ + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "rune-languageserver"; }; } diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix index 61915b6e9801..cf587613b5a8 100644 --- a/pkgs/by-name/ru/rune/package.nix +++ b/pkgs/by-name/ru/rune/package.nix @@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec { RUNE_VERSION = version; }; - meta = with lib; { + meta = { description = "Interpreter for the Rune Language, an embeddable dynamic programming language for Rust"; homepage = "https://rune-rs.github.io/"; changelog = "https://github.com/rune-rs/rune/releases/tag/${version}"; - license = with licenses; [ + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "rune"; }; } diff --git a/pkgs/by-name/ru/runme/package.nix b/pkgs/by-name/ru/runme/package.nix index eb1d7465cfb4..ad4225ada0e2 100644 --- a/pkgs/by-name/ru/runme/package.nix +++ b/pkgs/by-name/ru/runme/package.nix @@ -70,12 +70,12 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "Execute commands inside your runbooks, docs, and READMEs"; mainProgram = "runme"; homepage = "https://runme.dev"; changelog = "https://github.com/runmedev/runme/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/ru/runpodctl/package.nix b/pkgs/by-name/ru/runpodctl/package.nix index 729193992cae..b6dbfdaf8c57 100644 --- a/pkgs/by-name/ru/runpodctl/package.nix +++ b/pkgs/by-name/ru/runpodctl/package.nix @@ -21,12 +21,12 @@ buildGoModule rec { rm $out/bin/docs # remove the docs binary ''; - meta = with lib; { + meta = { homepage = "https://github.com/runpod/runpodctl"; description = "CLI tool to automate / manage GPU pods for runpod.io"; changelog = "https://github.com/runpod/runpodctl/raw/v${version}/CHANGELOG.md"; - license = licenses.gpl3; - maintainers = [ maintainers.georgewhewell ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.georgewhewell ]; mainProgram = "runpodctl"; }; } diff --git a/pkgs/by-name/ru/rush-parallel/package.nix b/pkgs/by-name/ru/rush-parallel/package.nix index 96292cbd65b1..1eeff70b49bf 100644 --- a/pkgs/by-name/ru/rush-parallel/package.nix +++ b/pkgs/by-name/ru/rush-parallel/package.nix @@ -23,7 +23,7 @@ buildGoModule rec { ]; meta = { - description = "A cross-platform command-line tool for executing jobs in parallel"; + description = "Cross-platform command-line tool for executing jobs in parallel"; homepage = "https://github.com/shenwei356/rush"; changelog = "https://github.com/shenwei356/rush/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; diff --git a/pkgs/by-name/ru/rust-cbindgen/package.nix b/pkgs/by-name/ru/rust-cbindgen/package.nix index a69f3804ecb9..548e809af4ad 100644 --- a/pkgs/by-name/ru/rust-cbindgen/package.nix +++ b/pkgs/by-name/ru/rust-cbindgen/package.nix @@ -55,12 +55,12 @@ rustPlatform.buildRustPackage rec { ; }; - meta = with lib; { + meta = { changelog = "https://github.com/mozilla/cbindgen/blob/v${version}/CHANGES"; description = "Project for generating C bindings from Rust code"; mainProgram = "cbindgen"; homepage = "https://github.com/mozilla/cbindgen"; - license = licenses.mpl20; - maintainers = with maintainers; [ hexa ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ hexa ]; }; } diff --git a/pkgs/by-name/ru/rust-motd/package.nix b/pkgs/by-name/ru/rust-motd/package.nix index 9d9f4951ea74..374b4cf5e736 100644 --- a/pkgs/by-name/ru/rust-motd/package.nix +++ b/pkgs/by-name/ru/rust-motd/package.nix @@ -30,12 +30,12 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; - meta = with lib; { + meta = { description = "Beautiful, useful MOTD generation with zero runtime dependencies"; homepage = "https://github.com/rust-motd/rust-motd"; changelog = "https://github.com/rust-motd/rust-motd/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "rust-motd"; }; } diff --git a/pkgs/by-name/ru/rust-script/package.nix b/pkgs/by-name/ru/rust-script/package.nix index aecd1ac4f873..060f5a901af0 100644 --- a/pkgs/by-name/ru/rust-script/package.nix +++ b/pkgs/by-name/ru/rust-script/package.nix @@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec { # tests require network access doCheck = false; - meta = with lib; { + meta = { description = "Run Rust files and expressions as scripts without any setup or compilation step"; mainProgram = "rust-script"; homepage = "https://rust-script.org"; changelog = "https://github.com/fornwall/rust-script/releases/tag/${version}"; - license = with licenses; [ + license = with lib.licenses; [ mit # or asl20 ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/ru/rustcat/package.nix b/pkgs/by-name/ru/rustcat/package.nix index 0d6d73f63266..3d82d3d16250 100644 --- a/pkgs/by-name/ru/rustcat/package.nix +++ b/pkgs/by-name/ru/rustcat/package.nix @@ -25,12 +25,12 @@ rustPlatform.buildRustPackage rec { versionCheckProgram = [ "${placeholder "out"}/bin/rcat" ]; - meta = with lib; { + meta = { description = "Port listener and reverse shell"; homepage = "https://github.com/robiot/rustcat"; changelog = "https://github.com/robiot/rustcat/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "rcat"; }; } diff --git a/pkgs/by-name/ru/rustdesk-server/package.nix b/pkgs/by-name/ru/rustdesk-server/package.nix index 33fb44e5e207..9ad7b1b5d3d0 100644 --- a/pkgs/by-name/ru/rustdesk-server/package.nix +++ b/pkgs/by-name/ru/rustdesk-server/package.nix @@ -43,13 +43,13 @@ rustPlatform.buildRustPackage rec { }; }; - meta = with lib; { + meta = { description = "RustDesk Server Program"; homepage = "https://github.com/rustdesk/rustdesk-server"; changelog = "https://github.com/rustdesk/rustdesk-server/releases/tag/${version}"; - license = licenses.agpl3Only; - platforms = platforms.unix; - maintainers = with maintainers; [ + license = lib.licenses.agpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ gaelreyrol tjni ]; diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix index ea400d9b6ce3..d36140e462e0 100644 --- a/pkgs/by-name/ru/rustic/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, fetchFromGitHub, rustPlatform, installShellFiles, @@ -17,17 +18,15 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HYPzgynCeWDRRNyACHqnzkjn6uZWS0TDHuJE9STJxbQ="; }; - useFetchCargoVendor = true; cargoHash = "sha256-+BlLVnvI2qBfwEtyxmZFNhR9MEzs0/a1Ce6ALOKtoPU="; nativeBuildInputs = [ installShellFiles ]; - postInstall = '' - for shell in {ba,fi,z}sh; do - $out/bin/rustic completions $shell > rustic.$shell - done - - installShellCompletion rustic.{ba,fi,z}sh + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd rustic \ + --bash <($out/bin/rustic completions bash) \ + --fish <($out/bin/rustic completions fish) \ + --zsh <($out/bin/rustic completions zsh) ''; passthru.updateScript = nix-update-script { }; @@ -35,7 +34,7 @@ rustPlatform.buildRustPackage rec { meta = { homepage = "https://github.com/rustic-rs/rustic"; changelog = "https://github.com/rustic-rs/rustic/blob/${src.rev}/CHANGELOG.md"; - description = "fast, encrypted, deduplicated backups powered by pure Rust"; + description = "Fast, encrypted, deduplicated backups powered by pure Rust"; mainProgram = "rustic"; platforms = lib.platforms.linux ++ lib.platforms.darwin; license = [ diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix index 932876025231..bfb842f81181 100644 --- a/pkgs/by-name/ru/rustmission/package.nix +++ b/pkgs/by-name/ru/rustmission/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = { - description = "A TUI for the Transmission daemon"; + description = "TUI for the Transmission daemon"; homepage = "https://github.com/intuis/rustmission"; changelog = "https://github.com/intuis/rustmission/releases/tag/v${version}"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/ru/rustscan/package.nix b/pkgs/by-name/ru/rustscan/package.nix index c012668a34fe..010f3b007c92 100644 --- a/pkgs/by-name/ru/rustscan/package.nix +++ b/pkgs/by-name/ru/rustscan/package.nix @@ -40,12 +40,12 @@ rustPlatform.buildRustPackage rec { "--skip=resolver_default_cloudflare" ]; - meta = with lib; { + meta = { description = "Faster Nmap Scanning with Rust"; homepage = "https://github.com/RustScan/RustScan"; changelog = "https://github.com/RustScan/RustScan/releases/tag/${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "rustscan"; }; } diff --git a/pkgs/by-name/ru/rusty-diceware/package.nix b/pkgs/by-name/ru/rusty-diceware/package.nix index b57e33208c44..67f4197275ce 100644 --- a/pkgs/by-name/ru/rusty-diceware/package.nix +++ b/pkgs/by-name/ru/rusty-diceware/package.nix @@ -20,12 +20,12 @@ rustPlatform.buildRustPackage rec { doCheck = true; - meta = with lib; { + meta = { description = "Commandline diceware, with or without dice, written in Rustlang"; homepage = "https://gitlab.com/yuvallanger/rusty-diceware"; changelog = "https://gitlab.com/yuvallanger/rusty-diceware/-/blob/v${version}/CHANGELOG.md?ref_type=heads"; - license = licenses.gpl3; - maintainers = with maintainers; [ cherrykitten ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ cherrykitten ]; mainProgram = "diceware"; }; } diff --git a/pkgs/by-name/ru/rustycli/package.nix b/pkgs/by-name/ru/rustycli/package.nix index 337bd547c497..5554cbc1c03c 100644 --- a/pkgs/by-name/ru/rustycli/package.nix +++ b/pkgs/by-name/ru/rustycli/package.nix @@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec { # some examples fail to compile cargoTestFlags = [ "--tests" ]; - meta = with lib; { + meta = { description = "Access the rust playground right in terminal"; mainProgram = "rustycli"; homepage = "https://github.com/pwnwriter/rustycli"; changelog = "https://github.com/pwnwriter/rustycli/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix index c97756291304..33e57583ba0a 100644 --- a/pkgs/by-name/ru/rustypaste/package.nix +++ b/pkgs/by-name/ru/rustypaste/package.nix @@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Minimal file upload/pastebin service"; homepage = "https://github.com/orhun/rustypaste"; changelog = "https://github.com/orhun/rustypaste/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda seqizz ]; diff --git a/pkgs/by-name/s3/s3fs/package.nix b/pkgs/by-name/s3/s3fs/package.nix index 4ca4d71a8f6b..c2a056a4d5f3 100644 --- a/pkgs/by-name/s3/s3fs/package.nix +++ b/pkgs/by-name/s3/s3fs/package.nix @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { ln -s $out/bin/s3fs $out/bin/mount.s3fs ''; - meta = with lib; { + meta = { description = "Mount an S3 bucket as filesystem through FUSE"; homepage = "https://github.com/s3fs-fuse/s3fs-fuse"; changelog = "https://github.com/s3fs-fuse/s3fs-fuse/raw/v${version}/ChangeLog"; - maintainers = [ ]; - license = licenses.gpl2Only; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/s3/s3proxy/package.nix b/pkgs/by-name/s3/s3proxy/package.nix index 302e6bd4c504..6b76764f01b9 100644 --- a/pkgs/by-name/s3/s3proxy/package.nix +++ b/pkgs/by-name/s3/s3proxy/package.nix @@ -33,12 +33,12 @@ maven.buildMavenPackage { --add-flags "-jar $out/share/s3proxy/s3proxy-${version}-jar-with-dependencies.jar" ''; - meta = with lib; { + meta = { description = "Access other storage backends via the S3 API"; mainProgram = "s3proxy"; homepage = "https://github.com/gaul/s3proxy"; changelog = "https://github.com/gaul/s3proxy/releases/tag/s3proxy-${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ camelpunch ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ camelpunch ]; }; } diff --git a/pkgs/by-name/s3/s3ql/package.nix b/pkgs/by-name/s3/s3ql/package.nix index 5894d776444f..386baa6f4bb3 100644 --- a/pkgs/by-name/s3/s3ql/package.nix +++ b/pkgs/by-name/s3/s3ql/package.nix @@ -59,12 +59,12 @@ python3.pkgs.buildPythonApplication rec { ]; }; - meta = with lib; { + meta = { description = "Full-featured file system for online data storage"; homepage = "https://github.com/s3ql/s3ql/"; changelog = "https://github.com/s3ql/s3ql/releases/tag/s3ql-${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ rushmorem ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ rushmorem ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/sa/sad/package.nix b/pkgs/by-name/sa/sad/package.nix index 07917e201eba..5ee30cee37e3 100644 --- a/pkgs/by-name/sa/sad/package.nix +++ b/pkgs/by-name/sa/sad/package.nix @@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec { rm .cargo/config.toml ''; - meta = with lib; { + meta = { description = "CLI tool to search and replace"; homepage = "https://github.com/ms-jpq/sad"; changelog = "https://github.com/ms-jpq/sad/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "sad"; }; } diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 321eeb33b522..4dec9b726133 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -89,16 +89,16 @@ stdenv.mkDerivation rec { (lib.cmakeBool "OpenMP_SUPPORT" (!stdenv.hostPlatform.isDarwin)) ]; - meta = with lib; { + meta = { description = "System for Automated Geoscientific Analyses"; homepage = "https://saga-gis.sourceforge.io"; changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog ${version}/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ michelk mpickering ]; - teams = [ teams.geospatial ]; - platforms = with platforms; unix; + teams = [ lib.teams.geospatial ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix index 8d2e0bb7b656..8cd1f7735dc1 100644 --- a/pkgs/by-name/sa/sagoin/package.nix +++ b/pkgs/by-name/sa/sagoin/package.nix @@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec { GEN_ARTIFACTS = "artifacts"; - meta = with lib; { + meta = { description = "Command-line submission tool for the UMD CS Submit Server"; homepage = "https://github.com/figsoda/sagoin"; changelog = "https://github.com/figsoda/sagoin/blob/v${version}/CHANGELOG.md"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "sagoin"; }; } diff --git a/pkgs/by-name/sa/salt/package.nix b/pkgs/by-name/sa/salt/package.nix index 7bf4fa6866df..10f8b6a59171 100644 --- a/pkgs/by-name/sa/salt/package.nix +++ b/pkgs/by-name/sa/salt/package.nix @@ -71,11 +71,11 @@ python3.pkgs.buildPythonApplication rec { # as is it rather long. doCheck = false; - meta = with lib; { + meta = { homepage = "https://saltproject.io/"; changelog = "https://docs.saltproject.io/en/latest/topics/releases/${version}.html"; description = "Portable, distributed, remote execution and configuration management system"; - maintainers = with maintainers; [ Flakebi ]; - license = licenses.asl20; + maintainers = with lib.maintainers; [ Flakebi ]; + license = lib.licenses.asl20; }; } diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix index 71d96226cf07..b1ebdf489812 100644 --- a/pkgs/by-name/sa/sanjuuni/package.nix +++ b/pkgs/by-name/sa/sanjuuni/package.nix @@ -52,12 +52,12 @@ stdenv.mkDerivation rec { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { homepage = "https://github.com/MCJack123/sanjuuni"; description = "Command-line tool that converts images and videos into a format that can be displayed in ComputerCraft"; changelog = "https://github.com/MCJack123/sanjuuni/releases/tag/${version}"; - maintainers = [ maintainers.tomodachi94 ]; - license = licenses.gpl2Plus; + maintainers = [ lib.maintainers.tomodachi94 ]; + license = lib.licenses.gpl2Plus; broken = stdenv.hostPlatform.isDarwin; mainProgram = "sanjuuni"; }; diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix index cba1bff8a1ef..5cc577ddbc40 100644 --- a/pkgs/by-name/sa/sarif-fmt/package.nix +++ b/pkgs/by-name/sa/sarif-fmt/package.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { }; meta = { - description = "A CLI tool to pretty print SARIF diagnostics"; + description = "CLI tool to pretty print SARIF diagnostics"; homepage = "https://psastras.github.io/sarif-rs"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ getchoo ]; diff --git a/pkgs/by-name/sa/satdump/package.nix b/pkgs/by-name/sa/satdump/package.nix index 3da37757f09f..3d5b7f41a0f0 100644 --- a/pkgs/by-name/sa/satdump/package.nix +++ b/pkgs/by-name/sa/satdump/package.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "A generic satellite data processing software"; + description = "Generic satellite data processing software"; homepage = "https://www.satdump.org/"; changelog = "https://github.com/SatDump/SatDump/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/by-name/sa/sauerbraten/package.nix b/pkgs/by-name/sa/sauerbraten/package.nix index 49925da52112..93e8af7faf7a 100644 --- a/pkgs/by-name/sa/sauerbraten/package.nix +++ b/pkgs/by-name/sa/sauerbraten/package.nix @@ -8,9 +8,11 @@ copyDesktopItems, # buildInputs + libGL, SDL2, SDL2_image, SDL2_mixer, + xorg, zlib, makeDesktopItem, @@ -33,9 +35,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + libGL SDL2 SDL2_image SDL2_mixer + xorg.libX11 zlib ]; diff --git a/pkgs/by-name/sa/savvycan/package.nix b/pkgs/by-name/sa/savvycan/package.nix index 210bf16bbbed..6af038f35404 100644 --- a/pkgs/by-name/sa/savvycan/package.nix +++ b/pkgs/by-name/sa/savvycan/package.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { ln -s $out/Applications/SavvyCAN.app/Contents/MacOS/SavvyCAN $out/bin/SavvyCAN ''; - meta = with lib; { + meta = { description = "QT based cross platform canbus tool"; homepage = "https://savvycan.com/"; changelog = "https://github.com/collin80/SavvyCAN/releases/tag/${version}"; - maintainers = with maintainers; [ simoneruffini ]; - platforms = platforms.all; - license = licenses.mit; + maintainers = with lib.maintainers; [ simoneruffini ]; + platforms = lib.platforms.all; + license = lib.licenses.mit; mainProgram = "SavvyCAN"; longDescription = '' SavvyCAN is a cross platform QT based C++ program. It is a CAN bus reverse diff --git a/pkgs/by-name/sb/sbom-utility/package.nix b/pkgs/by-name/sb/sbom-utility/package.nix index 6ebfbcbfe73d..1849fb0dacaa 100644 --- a/pkgs/by-name/sb/sbom-utility/package.nix +++ b/pkgs/by-name/sb/sbom-utility/package.nix @@ -58,12 +58,12 @@ buildGoModule { done ''; - meta = with lib; { + meta = { description = "Utility that provides an API platform for validating, querying and managing BOM data"; homepage = "https://github.com/CycloneDX/sbom-utility"; changelog = "https://github.com/CycloneDX/sbom-utility/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ thillux ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ thillux ]; mainProgram = "sbom-utility"; }; } diff --git a/pkgs/by-name/sb/sbom4python/package.nix b/pkgs/by-name/sb/sbom4python/package.nix index ae712563008d..518b9ca5af77 100644 --- a/pkgs/by-name/sb/sbom4python/package.nix +++ b/pkgs/by-name/sb/sbom4python/package.nix @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { meta = { changelog = "https://github.com/anthonyharrison/sbom4python/releases/tag/${src.tag}"; - description = "A tool to generate a SBOM (Software Bill of Materials) for an installed Python module"; + description = "Tool to generate a SBOM (Software Bill of Materials) for an installed Python module"; homepage = "https://github.com/anthonyharrison/sbom4python"; license = lib.licenses.asl20; mainProgram = "sbom4python"; diff --git a/pkgs/by-name/sb/sbt-extras/package.nix b/pkgs/by-name/sb/sbt-extras/package.nix index a57c84270b5f..aa57a55d2f1b 100644 --- a/pkgs/by-name/sb/sbt-extras/package.nix +++ b/pkgs/by-name/sb/sbt-extras/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A more featureful runner for sbt, the simple/scala/standard build tool"; + description = "More featureful runner for sbt, the simple/scala/standard build tool"; homepage = "https://github.com/paulp/sbt-extras"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/sc/scalr-cli/package.nix b/pkgs/by-name/sc/scalr-cli/package.nix index 3f1b52894ee0..efe605fbf45a 100644 --- a/pkgs/by-name/sc/scalr-cli/package.nix +++ b/pkgs/by-name/sc/scalr-cli/package.nix @@ -33,12 +33,12 @@ buildGoModule rec { doCheck = false; # Skip tests as they require creating actual Scalr resources. - meta = with lib; { + meta = { description = "Command-line tool that communicates directly with the Scalr API"; homepage = "https://github.com/Scalr/scalr-cli"; changelog = "https://github.com/Scalr/scalr-cli/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ dylanmtaylor ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dylanmtaylor ]; mainProgram = "scalr"; }; } diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix index 04a95c7e1bdd..137d28d27924 100644 --- a/pkgs/by-name/sc/sccache/package.nix +++ b/pkgs/by-name/sc/sccache/package.nix @@ -31,15 +31,15 @@ rustPlatform.buildRustPackage rec { # pure environment, see https://github.com/mozilla/sccache/issues/460 doCheck = false; - meta = with lib; { + meta = { description = "Ccache with Cloud Storage"; mainProgram = "sccache"; homepage = "https://github.com/mozilla/sccache"; changelog = "https://github.com/mozilla/sccache/releases/tag/v${version}"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ doronbehar figsoda ]; - license = licenses.asl20; + license = lib.licenses.asl20; }; } diff --git a/pkgs/by-name/sc/scilla/package.nix b/pkgs/by-name/sc/scilla/package.nix index 730c647fc2fa..bc8845d062e2 100644 --- a/pkgs/by-name/sc/scilla/package.nix +++ b/pkgs/by-name/sc/scilla/package.nix @@ -27,12 +27,12 @@ buildGoModule rec { "-skip=TestIPToHostname" ]; - meta = with lib; { + meta = { description = "Information gathering tool for DNS, ports and more"; mainProgram = "scilla"; homepage = "https://github.com/edoardottt/scilla"; changelog = "https://github.com/edoardottt/scilla/releases/tag/v${version}"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/sc/scitokens-cpp/package.nix b/pkgs/by-name/sc/scitokens-cpp/package.nix index 4ba56eb1e849..6f390abeac71 100644 --- a/pkgs/by-name/sc/scitokens-cpp/package.nix +++ b/pkgs/by-name/sc/scitokens-cpp/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/scitokens/scitokens-cpp/"; - description = "A C++ implementation of the SciTokens library with a C library interface"; + description = "C++ implementation of the SciTokens library with a C library interface"; platforms = platforms.unix; license = licenses.asl20; maintainers = with maintainers; [ evey ]; diff --git a/pkgs/by-name/sc/scraper/package.nix b/pkgs/by-name/sc/scraper/package.nix index 2f73d1f6a85d..0dcd8f11c7a9 100644 --- a/pkgs/by-name/sc/scraper/package.nix +++ b/pkgs/by-name/sc/scraper/package.nix @@ -23,12 +23,12 @@ rustPlatform.buildRustPackage rec { installManPage scraper.1 ''; - meta = with lib; { + meta = { description = "Tool to query HTML files with CSS selectors"; mainProgram = "scraper"; homepage = "https://github.com/causal-agent/scraper"; changelog = "https://github.com/causal-agent/scraper/releases/tag/v${version}"; - license = licenses.isc; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/sd/sd-switch/package.nix b/pkgs/by-name/sd/sd-switch/package.nix index 72b7d5bc1555..6e15dadfbdfb 100644 --- a/pkgs/by-name/sd/sd-switch/package.nix +++ b/pkgs/by-name/sd/sd-switch/package.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Systemd unit switcher for Home Manager"; mainProgram = "sd-switch"; homepage = "https://git.sr.ht/~rycee/sd-switch"; changelog = "https://git.sr.ht/~rycee/sd-switch/refs/${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ rycee ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ rycee ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/sd/sdlpop/package.nix b/pkgs/by-name/sd/sdlpop/package.nix index 42a29210c93e..6a82b4ad16ab 100644 --- a/pkgs/by-name/sd/sdlpop/package.nix +++ b/pkgs/by-name/sd/sdlpop/package.nix @@ -79,13 +79,13 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { + meta = { description = "Open-source port of Prince of Persia"; homepage = "https://github.com/NagyD/SDLPoP"; changelog = "https://github.com/NagyD/SDLPoP/blob/v${version}/doc/ChangeLog.txt"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ iblech ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ iblech ]; + platforms = lib.platforms.unix; mainProgram = "prince"; }; } diff --git a/pkgs/by-name/se/secretscanner/package.nix b/pkgs/by-name/se/secretscanner/package.nix index be6f24c530ff..65cc55b081d9 100644 --- a/pkgs/by-name/se/secretscanner/package.nix +++ b/pkgs/by-name/se/secretscanner/package.nix @@ -47,7 +47,7 @@ buildGoModule rec { mv $out/bin/SecretScanner $out/bin/$pname ''; - meta = with lib; { + meta = { description = "Tool to find secrets and passwords in container images and file systems"; mainProgram = "secretscanner"; homepage = "https://github.com/deepfence/SecretScanner"; @@ -56,7 +56,7 @@ buildGoModule rec { "x86_64-linux" "aarch64-linux" ]; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/se/seilfahrt/package.nix b/pkgs/by-name/se/seilfahrt/package.nix index 380498612a8a..8e3f018227ff 100644 --- a/pkgs/by-name/se/seilfahrt/package.nix +++ b/pkgs/by-name/se/seilfahrt/package.nix @@ -20,12 +20,12 @@ buildGoModule rec { buildInputs = [ pandoc ]; - meta = with lib; { + meta = { description = "Tool to create a wiki page from a HedgeDoc"; homepage = "https://github.com/Nerdbergev/seilfahrt"; changelog = "https://github.com/Nerdbergev/seilfahrt/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ xgwq ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xgwq ]; mainProgram = "seilfahrt"; }; } diff --git a/pkgs/by-name/se/selendroid/package.nix b/pkgs/by-name/se/selendroid/package.nix index 170ef05845b4..c8bf6602a6d6 100644 --- a/pkgs/by-name/se/selendroid/package.nix +++ b/pkgs/by-name/se/selendroid/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://selendroid.io/"; + homepage = "https://selendroid.io/"; description = "Test automation for native or hybrid Android apps and the mobile web"; maintainers = with maintainers; [ offline ]; platforms = platforms.all; diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix index c488e4b816ff..7304d51047f7 100644 --- a/pkgs/by-name/se/selene/package.nix +++ b/pkgs/by-name/se/selene/package.nix @@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = !robloxSupport; - meta = with lib; { + meta = { description = "Blazing-fast modern Lua linter written in Rust"; mainProgram = "selene"; homepage = "https://github.com/kampfkarren/selene"; changelog = "https://github.com/kampfkarren/selene/blob/${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/se/sem/package.nix b/pkgs/by-name/se/sem/package.nix index 0e75dfacea5b..886b5a065d12 100644 --- a/pkgs/by-name/se/sem/package.nix +++ b/pkgs/by-name/se/sem/package.nix @@ -27,12 +27,12 @@ buildGoModule rec { install -m755 $out/bin/cli $out/bin/sem ''; - meta = with lib; { + meta = { description = "Cli to operate on semaphore ci (2.0)"; homepage = "https://github.com/semaphoreci/cli"; changelog = "https://github.com/semaphoreci/cli/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ liberatys ]; - platforms = platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ liberatys ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/se/senpai/package.nix b/pkgs/by-name/se/senpai/package.nix index 9812e3d934f2..f204aa91bf51 100644 --- a/pkgs/by-name/se/senpai/package.nix +++ b/pkgs/by-name/se/senpai/package.nix @@ -37,12 +37,12 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Your everyday IRC student"; mainProgram = "senpai"; homepage = "https://sr.ht/~delthas/senpai/"; changelog = "https://git.sr.ht/~delthas/senpai/refs/v${version}"; - license = licenses.isc; - maintainers = with maintainers; [ malte-v ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ malte-v ]; }; } diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix index d52d0b376d99..fb1ddcae10ed 100644 --- a/pkgs/by-name/se/sentry-cli/package.nix +++ b/pkgs/by-name/se/sentry-cli/package.nix @@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/sentry-cli completions zsh) ''; - meta = with lib; { + meta = { homepage = "https://docs.sentry.io/cli/"; - license = licenses.bsd3; + license = lib.licenses.bsd3; description = "Command line utility to work with Sentry"; mainProgram = "sentry-cli"; changelog = "https://github.com/getsentry/sentry-cli/raw/${version}/CHANGELOG.md"; - maintainers = with maintainers; [ rizary ]; + maintainers = with lib.maintainers; [ rizary ]; }; } diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index d684def2563d..5b320a8ac2d0 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { "-DSENTRY_BACKEND=breakpad" ]; - meta = with lib; { + meta = { homepage = "https://github.com/getsentry/sentry-native"; description = "Sentry SDK for C, C++ and native applications"; changelog = "https://github.com/getsentry/sentry-native/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ wheelsandmetal daniel-fahey ]; diff --git a/pkgs/by-name/se/seq-cli/package.nix b/pkgs/by-name/se/seq-cli/package.nix index 4c97eab76450..0d496ad25ffd 100644 --- a/pkgs/by-name/se/seq-cli/package.nix +++ b/pkgs/by-name/se/seq-cli/package.nix @@ -32,7 +32,7 @@ buildDotnetModule (finalAttrs: { }; meta = { - description = "The Seq command-line client. Administer, log, ingest, search, from any OS"; + description = "Seq command-line client. Administer, log, ingest, search, from any OS"; homepage = "https://github.com/datalust/seqcli"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hausken ]; diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index 28939ed70d01..e77b8841a1cb 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { passthru.tests.version = testers.testVersion { package = serie; }; meta = with lib; { - description = "A rich git commit graph in your terminal, like magic"; + description = "Rich git commit graph in your terminal, like magic"; homepage = "https://github.com/lusingander/serie"; license = with licenses; [ mit ]; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index 685a983fae63..a2494c57eba1 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -155,7 +155,7 @@ rustPlatform.buildRustPackage { }; meta = { - description = "The embeddable, independent, memory-safe, modular, parallel web rendering engine"; + description = "Embeddable, independent, memory-safe, modular, parallel web rendering engine"; homepage = "https://servo.org"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/sf/sfrotz/package.nix b/pkgs/by-name/sf/sfrotz/package.nix index 5a798b5f03b7..f4d234e2b767 100644 --- a/pkgs/by-name/sf/sfrotz/package.nix +++ b/pkgs/by-name/sf/sfrotz/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildPhase = "make sdl"; installTargets = [ "install_sfrotz" ]; - meta = with lib; { + meta = { description = "Interpreter for Infocom and other Z-Machine games (SDL interface)"; mainProgram = "sfrotz"; longDescription = '' @@ -65,8 +65,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://davidgriffith.gitlab.io/frotz/"; changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ddelabru ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ddelabru ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/sf/sftpgo/package.nix b/pkgs/by-name/sf/sftpgo/package.nix index 1ff2b8126e28..4aa8c8faddb2 100644 --- a/pkgs/by-name/sf/sftpgo/package.nix +++ b/pkgs/by-name/sf/sftpgo/package.nix @@ -48,7 +48,7 @@ buildGoModule rec { passthru.tests = nixosTests.sftpgo; - meta = with lib; { + meta = { homepage = "https://github.com/drakkan/sftpgo"; changelog = "https://github.com/drakkan/sftpgo/releases/tag/v${version}"; description = "Fully featured and highly configurable SFTP server"; @@ -59,11 +59,11 @@ buildGoModule rec { local filesystem, encrypted local filesystem, S3 (compatible) Object Storage, Google Cloud Storage, Azure Blob Storage, SFTP. ''; - license = with licenses; [ + license = with lib.licenses; [ agpl3Only unfreeRedistributable ]; # Software is AGPLv3, web UI is unfree - maintainers = with maintainers; [ thenonameguy ]; + maintainers = with lib.maintainers; [ thenonameguy ]; mainProgram = "sftpgo"; }; } diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index ef04aac610a0..8bada528041d 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "A shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion"; + description = "Shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion"; homepage = "https://github.com/shader-slang/slang"; license = with lib.licenses; [ asl20 diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index 9c27f92eb921..58cc701e9efc 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -14,7 +14,7 @@ libxslt, libxcrypt, pkg-config, - glibcCross ? null, + glibc ? null, pam ? null, withLibbsd ? lib.meta.availableOn stdenv.hostPlatform libbsd, libbsd, @@ -22,9 +22,9 @@ tcb, }: let - glibc = + glibc' = if stdenv.hostPlatform != stdenv.buildPlatform then - glibcCross + glibc else assert stdenv.hostPlatform.libc == "glibc"; stdenv.cc.libc; @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { ++ lib.optional withTcb "--with-tcb"; preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' - substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd + substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc'.bin}/bin/nscd ''; postInstall = '' diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix index 43f46afa754a..88da965e9446 100644 --- a/pkgs/by-name/sh/shadps4/package.nix +++ b/pkgs/by-name/sh/shadps4/package.nix @@ -119,7 +119,12 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.openorbis-example = nixosTests.shadps4; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v\\.(.*)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix index f7d3b6524b3f..a008b0955810 100644 --- a/pkgs/by-name/sh/shell-gpt/package.nix +++ b/pkgs/by-name/sh/shell-gpt/package.nix @@ -46,12 +46,12 @@ python3.pkgs.buildPythonApplication rec { # Tests want to read the OpenAI API key from stdin doCheck = false; - meta = with lib; { + meta = { description = "Access ChatGPT from your terminal"; homepage = "https://github.com/TheR1D/shell_gpt"; changelog = "https://github.com/TheR1D/shell_gpt/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ SohamG ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ SohamG ]; mainProgram = "sgpt"; }; } diff --git a/pkgs/by-name/sh/shellclear/package.nix b/pkgs/by-name/sh/shellclear/package.nix index 769810e4b2fb..0603f9df45c2 100644 --- a/pkgs/by-name/sh/shellclear/package.nix +++ b/pkgs/by-name/sh/shellclear/package.nix @@ -20,11 +20,11 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "shellclear"; - meta = with lib; { + meta = { description = "Secure shell history commands by finding sensitive data"; homepage = "https://github.com/rusty-ferris-club/shellclear"; changelog = "https://github.com/rusty-ferris-club/shellclear/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/sh/shelldap/package.nix b/pkgs/by-name/sh/shelldap/package.nix index cf69b0f05082..3144a7fdce05 100644 --- a/pkgs/by-name/sh/shelldap/package.nix +++ b/pkgs/by-name/sh/shelldap/package.nix @@ -50,16 +50,16 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; - meta = with lib; { + meta = { homepage = "https://github.com/mahlonsmith/shelldap/"; description = "Handy shell-like interface for browsing LDAP servers and editing their content"; changelog = "https://github.com/mahlonsmith/shelldap/blob/v${version}/CHANGELOG"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ clerie tobiasBora ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "shelldap"; }; } diff --git a/pkgs/by-name/sh/shellspec/package.nix b/pkgs/by-name/sh/shellspec/package.nix index 8fff36ca0ac6..b8865a877c3f 100644 --- a/pkgs/by-name/sh/shellspec/package.nix +++ b/pkgs/by-name/sh/shellspec/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { # "Building" the script happens in Docker dontBuild = true; - meta = with lib; { - description = "A full-featured BDD unit testing framework for bash, ksh, zsh, dash and all POSIX shells"; + meta = { + description = "Full-featured BDD unit testing framework for bash, ksh, zsh, dash and all POSIX shells"; homepage = "https://shellspec.info/"; changelog = "https://github.com/shellspec/shellspec/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ j0hax ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ j0hax ]; + platforms = lib.platforms.unix; mainProgram = "shellspec"; }; } diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix index e2b894df6760..694e717743f3 100644 --- a/pkgs/by-name/sh/shh/package.nix +++ b/pkgs/by-name/sh/shh/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, nix-update-script, - fetchpatch, installShellFiles, python3, strace, @@ -19,41 +18,19 @@ let in rustPlatform.buildRustPackage rec { pname = "shh"; - version = "2025.4.12"; + version = "2025.6.5"; src = fetchFromGitHub { owner = "desbma"; repo = "shh"; tag = "v${version}"; - hash = "sha256-+JWz0ya6gi8pPERnpAcQIe7zZUzWGxha+9/gizMVtEw="; + hash = "sha256-cKN5SK7pVw4Ey6QmCZRYIlDPJ69eg9ihQ1M2vZDmGZ0="; }; - cargoHash = "sha256-rrOH76LHYSEeuNiMIICpAO7U/sz5V0JRO22mbIICQWw="; - - # needs to be done this way to bypass patch conflicts - cargoPatches = [ - (fetchpatch { - # to be removed after next release - name = "refactor-man-page-generation-command.patch"; - url = "https://github.com/desbma/shh/commit/849b9a6646981c83a72a977b6398371e29d3b928.patch"; - hash = "sha256-LZlUFfPtt2ScTxQbQ9j3Kzvp7T4MCFs92cJiI3YbWns="; - }) - (fetchpatch { - # to be removed after next release - name = "support-shell-auto-complete.patch"; - url = "https://github.com/desbma/shh/commit/74914dc8cfd74dbd7e051a090cc4c1f561b8cdde.patch"; - hash = "sha256-WgKRQAEwSpXdQUnrZC1Bp4RfKg2J9kPkT1k6R2wwgT8="; - }) - ]; + cargoHash = "sha256-09mQDautFnL0RYfIfn6KC2T7Ah57gV7JD1JkqmApmYI="; patches = [ ./fix_run_checks.patch - (fetchpatch { - # to be removed after next release - name = "feat-static-strace-path-support-at-compile-time.patch"; - url = "https://github.com/desbma/shh/commit/da62ceeb227de853be06610721744667c6fe994b.patch"; - hash = "sha256-p/W7HRZZ4TpIwrWN8wQB/SH3C8x3ZLXzwGV50oK/znQ="; - }) ]; env = { diff --git a/pkgs/by-name/sh/shikane/package.nix b/pkgs/by-name/sh/shikane/package.nix index 73a21535fc21..7c95d5bb054e 100644 --- a/pkgs/by-name/sh/shikane/package.nix +++ b/pkgs/by-name/sh/shikane/package.nix @@ -36,16 +36,16 @@ rustPlatform.buildRustPackage rec { # upstream has no tests doCheck = false; - meta = with lib; { + meta = { description = "Dynamic output configuration tool that automatically detects and configures connected outputs based on a set of profiles"; homepage = "https://gitlab.com/w0lff/shikane"; changelog = "https://gitlab.com/w0lff/shikane/-/tags/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ michaelpachec0 natsukium ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "shikane"; }; } diff --git a/pkgs/by-name/sh/shipments/package.nix b/pkgs/by-name/sh/shipments/package.nix index f22cbed39da7..9d8a9a66a4e2 100644 --- a/pkgs/by-name/sh/shipments/package.nix +++ b/pkgs/by-name/sh/shipments/package.nix @@ -44,12 +44,12 @@ stdenv.mkDerivation rec { )) ]; - meta = with lib; { + meta = { description = "Postal package tracking application"; mainProgram = "shipments"; homepage = "https://sr.ht/~martijnbraam/shipments/"; changelog = "https://git.sr.ht/~martijnbraam/shipments/refs/${version}"; - license = licenses.lgpl3; - maintainers = with maintainers; [ michaelgrahamevans ]; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ michaelgrahamevans ]; }; } diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix index 1013b52c53e6..b47543a96131 100644 --- a/pkgs/by-name/sh/shipwright/package.nix +++ b/pkgs/by-name/sh/shipwright/package.nix @@ -276,7 +276,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/HarbourMasters/Shipwright"; - description = "A PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more"; + description = "PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more"; mainProgram = "soh"; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix index 092be4dbe8de..e305461485e1 100644 --- a/pkgs/by-name/sh/showmethekey/package.nix +++ b/pkgs/by-name/sh/showmethekey/package.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { libxkbcommon ]; - meta = with lib; { + meta = { description = "Show keys you typed on screen"; homepage = "https://showmethekey.alynx.one/"; changelog = "https://github.com/AlynxZhou/showmethekey/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ ocfox ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ocfox ]; }; } diff --git a/pkgs/by-name/si/sic-image-cli/package.nix b/pkgs/by-name/si/sic-image-cli/package.nix index ee93342f2d93..b5b63b8e1456 100644 --- a/pkgs/by-name/si/sic-image-cli/package.nix +++ b/pkgs/by-name/si/sic-image-cli/package.nix @@ -34,15 +34,15 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh _sic ''; - meta = with lib; { + meta = { description = "Accessible image processing and conversion from the terminal"; homepage = "https://github.com/foresterre/sic"; changelog = "https://github.com/foresterre/sic/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "sic"; }; } diff --git a/pkgs/by-name/si/siege/package.nix b/pkgs/by-name/si/siege/package.nix index 2cdaf54336f3..c45f19b4d2db 100644 --- a/pkgs/by-name/si/siege/package.nix +++ b/pkgs/by-name/si/siege/package.nix @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { "--with-zlib=${zlib.dev}" ]; - meta = with lib; { + meta = { description = "HTTP load tester"; homepage = "https://www.joedog.org/siege-home/"; changelog = "https://github.com/JoeDog/siege/blob/v${version}/ChangeLog"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/si/siglo/package.nix b/pkgs/by-name/si/siglo/package.nix index 147a784d1dcd..b9bc3d44ef63 100644 --- a/pkgs/by-name/si/siglo/package.nix +++ b/pkgs/by-name/si/siglo/package.nix @@ -60,13 +60,13 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; - meta = with lib; { + meta = { description = "GTK app to sync InfiniTime watch with PinePhone"; mainProgram = "siglo"; homepage = "https://github.com/theironrobin/siglo"; changelog = "https://github.com/theironrobin/siglo/tags/v${version}"; - license = licenses.mpl20; - maintainers = [ ]; - platforms = platforms.linux; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 10c160447c3e..3649ea08ca1f 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -14,6 +14,10 @@ replaceVars, noto-fonts-color-emoji, nixosTests, + + # command line arguments which are always set e.g "--password-store=kwallet6" + commandLineArgs ? "", + withAppleEmojis ? false, }: let @@ -203,7 +207,8 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper '${lib.getExe electron}' "$out/bin/signal-desktop" \ --add-flags "$out/share/signal-desktop/app.asar" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall ''; diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix index cd6af5de63de..c03942e480cb 100644 --- a/pkgs/by-name/si/signaturepdf/package.nix +++ b/pkgs/by-name/si/signaturepdf/package.nix @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Web software for signing PDFs and also organize pages, edit metadata and compress pdf"; mainProgram = "signaturepdf"; homepage = "https://pdf.24eme.fr/"; changelog = "https://github.com/24eme/signaturepdf/releases/tag/v${version}"; - license = licenses.agpl3Only; - platforms = platforms.all; - maintainers = with maintainers; [ DamienCassou ]; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ DamienCassou ]; }; } diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix index 66e8bbcdc790..2eb7e11841a8 100644 --- a/pkgs/by-name/si/simple-http-server/package.nix +++ b/pkgs/by-name/si/simple-http-server/package.nix @@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec { # Currently no tests are implemented, so we avoid building the package twice doCheck = false; - meta = with lib; { + meta = { description = "Simple HTTP server in Rust"; homepage = "https://github.com/TheWaWaR/simple-http-server"; changelog = "https://github.com/TheWaWaR/simple-http-server/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda mephistophiles ]; diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index 3b1fc1c03500..05d550d7d1f6 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { description = "Simple scanning utility"; mainProgram = "simple-scan"; longDescription = '' @@ -95,8 +95,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://gitlab.gnome.org/GNOME/simple-scan"; changelog = "https://gitlab.gnome.org/GNOME/simple-scan/-/blob/${version}/NEWS?ref_type=tags"; - license = licenses.gpl3Plus; - teams = [ teams.gnome ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + teams = [ lib.teams.gnome ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 51e32aecd6bb..7eb7cbcdf2f2 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -39,13 +39,13 @@ appimageTools.wrapType2 { ignoredVersions = "-"; }; - meta = with lib; { + meta = { description = "Desktop application for SimpleX Chat"; mainProgram = "simplex-chat-desktop"; homepage = "https://simplex.chat"; changelog = "https://github.com/simplex-chat/simplex-chat/releases/tag/v${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ terryg ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ terryg ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index 867dc573e195..79f8481ad63f 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "sing-box"; - version = "1.11.11"; + version = "1.11.13"; src = fetchFromGitHub { owner = "SagerNet"; repo = "sing-box"; tag = "v${finalAttrs.version}"; - hash = "sha256-hdYYjKBXnTqScYTUCfMmXozDD8GtIorLXnsU2Fmwg/c="; + hash = "sha256-Pq5ElVDNJTeT4h6ZrupnKlCydxfJ2wAxk/9eZblT4d4="; }; - vendorHash = "sha256-/0pwsZbMbyAFXCrukbNf2RmQjQJ1E/ZUwzrC+5NEZcc="; + vendorHash = "sha256-/awpe9v+J1O0DKMvi6CNAgJ0mFJaWoXPHzRAk98nQ+Y="; tags = [ "with_quic" diff --git a/pkgs/by-name/si/sipexer/package.nix b/pkgs/by-name/si/sipexer/package.nix index 2923565da7d3..f7efe4cfdafa 100644 --- a/pkgs/by-name/si/sipexer/package.nix +++ b/pkgs/by-name/si/sipexer/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { vendorHash = "sha256-q2uNqKZc6Zye7YimPDrg40o68Fo4ux4fygjVjJdhqQU="; - meta = with lib; { + meta = { description = "Modern and flexible SIP CLI tool"; homepage = "https://github.com/miconda/sipexer"; changelog = "https://github.com/miconda/sipexer/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ astro ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ astro ]; mainProgram = "sipexer"; }; } diff --git a/pkgs/by-name/si/sipvicious/package.nix b/pkgs/by-name/si/sipvicious/package.nix index 5d25e0858e2d..369f1634b68c 100644 --- a/pkgs/by-name/si/sipvicious/package.nix +++ b/pkgs/by-name/si/sipvicious/package.nix @@ -40,11 +40,11 @@ python3.pkgs.buildPythonApplication rec { "sipvicious" ]; - meta = with lib; { + meta = { description = "Set of tools to audit SIP based VoIP systems"; homepage = "https://github.com/EnableSecurity/sipvicious"; changelog = "https://github.com/EnableSecurity/sipvicious/releases/tag/v${version}"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/si/sish/package.nix b/pkgs/by-name/si/sish/package.nix index 8a8f78bc14b9..2570aadad400 100644 --- a/pkgs/by-name/si/sish/package.nix +++ b/pkgs/by-name/si/sish/package.nix @@ -33,12 +33,12 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; homepage = "https://github.com/antoniomika/sish"; changelog = "https://github.com/antoniomika/sish/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "sish"; }; } diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 2f731da1646f..1eee8fc15de6 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - buildGo123Module, + buildGoModule, replaceVars, pandoc, nodejs, @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.1.28"; + version = "3.1.31"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-s36rtNmVAp17Okj71NE/jgIM/pEZNS+oOYZ8rnjv6Ow="; + hash = "sha256-l9FAGZzu8z5Q4gRoaZ8Z8tYkBEw9Yq9mfmWOKO39KLI="; }; - kernel = buildGo123Module { + kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-i/hpP9S9vGS/jP3gKceDY00wgnBDkmsfYRZtsYQOjck="; + vendorHash = "sha256-uREgNsDGFLzkOBkO2D2/vbJJ8A2rfy0nK2Dx/OvWf9c="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -75,6 +75,12 @@ stdenv.mkDerivation (finalAttrs: { tags = [ "fts5" ]; }; + # this should contain a 'packages' key, but it doesn't... + # we can remove it because it's not needed to build + postPatch = '' + rm pnpm-workspace.yaml + ''; + nativeBuildInputs = [ nodejs pnpm.configHook @@ -88,8 +94,9 @@ stdenv.mkDerivation (finalAttrs: { version src sourceRoot + postPatch ; - hash = "sha256-5KqMmpcI+4iy3Ff72D8aUvhPttW2vwTI8aTwXBJ7sqo="; + hash = "sha256-U8n9FLwJqBq16CTmiIDSh0u4lguSn0rF4jUkU25iu98="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/sk/skaffold/package.nix b/pkgs/by-name/sk/skaffold/package.nix index df747abef0e4..c81e04263d39 100644 --- a/pkgs/by-name/sk/skaffold/package.nix +++ b/pkgs/by-name/sk/skaffold/package.nix @@ -51,7 +51,7 @@ buildGoModule rec { --zsh <($out/bin/skaffold completion zsh) ''; - meta = with lib; { + meta = { homepage = "https://skaffold.dev/"; changelog = "https://github.com/GoogleContainerTools/skaffold/releases/tag/v${version}"; description = "Easy and Repeatable Kubernetes Development"; @@ -62,8 +62,8 @@ buildGoModule rec { Skaffold handles the workflow for building, pushing and deploying your application. It also provides building blocks and describe customizations for a CI/CD pipeline. ''; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ vdemeester bryanasdev000 ]; diff --git a/pkgs/by-name/sk/skjold/package.nix b/pkgs/by-name/sk/skjold/package.nix index fc96ea7cd64c..f5eeaae78539 100644 --- a/pkgs/by-name/sk/skjold/package.nix +++ b/pkgs/by-name/sk/skjold/package.nix @@ -53,11 +53,11 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "skjold" ]; - meta = with lib; { + meta = { description = "Tool to Python dependencies against security advisory databases"; homepage = "https://github.com/twu/skjold"; changelog = "https://github.com/twu/skjold/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/sk/skrive/package.nix b/pkgs/by-name/sk/skrive/package.nix index 1dab0a7ff345..9bc1352fa94e 100644 --- a/pkgs/by-name/sk/skrive/package.nix +++ b/pkgs/by-name/sk/skrive/package.nix @@ -24,13 +24,13 @@ buildGoModule rec { installManPage skrive.1 ''; - meta = with lib; { + meta = { description = "Secure and sleek dosage logging for the terminal"; homepage = "https://github.com/VanuPhantom/skrive"; changelog = "https://github.com/VanuPhantom/skrive/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ freyacodes ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ freyacodes ]; mainProgram = "skrive"; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/sl/sleqp/package.nix b/pkgs/by-name/sl/sleqp/package.nix index 4ca9983ba2a7..cf00b01448b4 100644 --- a/pkgs/by-name/sl/sleqp/package.nix +++ b/pkgs/by-name/sl/sleqp/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "An active set-based NLP solver"; + description = "Active set-based NLP solver"; homepage = "https://github.com/chrhansk/sleqp"; changelog = "https://github.com/chrhansk/sleqp/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.lgpl3Only; diff --git a/pkgs/by-name/sl/slides/package.nix b/pkgs/by-name/sl/slides/package.nix index 59076db89ef2..6dff3aba591f 100644 --- a/pkgs/by-name/sl/slides/package.nix +++ b/pkgs/by-name/sl/slides/package.nix @@ -30,12 +30,12 @@ buildGoModule rec { "-X=main.Version=${version}" ]; - meta = with lib; { + meta = { description = "Terminal based presentation tool"; homepage = "https://github.com/maaslalani/slides"; changelog = "https://github.com/maaslalani/slides/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ maaslalani penguwin ]; diff --git a/pkgs/by-name/sl/slowlorust/package.nix b/pkgs/by-name/sl/slowlorust/package.nix index 71b74b20e646..05191d690cc4 100644 --- a/pkgs/by-name/sl/slowlorust/package.nix +++ b/pkgs/by-name/sl/slowlorust/package.nix @@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec { versionCheckProgramArg = "--version"; - meta = with lib; { + meta = { description = "Lightweight slowloris (HTTP DoS) tool"; homepage = "https://github.com/MJVL/slowlorust"; changelog = "https://github.com/MJVL/slowlorust/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "slowlorust"; }; } diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index 2a30e3b05680..050b02ba29b2 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-acWEinwYCCtoapFkL6XyASvFX4bqYS/HrKjlaAZabi4="; - meta = with lib; { + meta = { description = "Terminal-based HTTP/REST client"; homepage = "https://slumber.lucaspickering.me"; changelog = "https://github.com/LucasPickering/slumber/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "slumber"; - maintainers = with maintainers; [ javaes ]; + maintainers = with lib.maintainers; [ javaes ]; }; } diff --git a/pkgs/by-name/sm/smag/package.nix b/pkgs/by-name/sm/smag/package.nix index ec302ef8d20a..8093a1a7856f 100644 --- a/pkgs/by-name/sm/smag/package.nix +++ b/pkgs/by-name/sm/smag/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-qOinPZwZqcfQ4gv0Z+sfF53zd4tlEWCczaGGmLL79iE="; - meta = with lib; { + meta = { description = "Easily create graphs from cli commands and view them in the terminal"; longDescription = '' Easily create graphs from cli commands and view them in the terminal. Like the watch command but with a graph of the output. ''; homepage = "https://github.com/aantn/smag"; - license = licenses.mit; + license = lib.licenses.mit; changelog = "https://github.com/aantn/smag/releases/tag/v${version}"; mainProgram = "smag"; - maintainers = with maintainers; [ zebreus ]; + maintainers = with lib.maintainers; [ zebreus ]; }; } diff --git a/pkgs/by-name/sm/smartdns/package.nix b/pkgs/by-name/sm/smartdns/package.nix index 3fa68ae0d87b..dcb20ec7015d 100644 --- a/pkgs/by-name/sm/smartdns/package.nix +++ b/pkgs/by-name/sm/smartdns/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A local DNS server to obtain the fastest website IP for the best Internet experience"; + description = "Local DNS server to obtain the fastest website IP for the best Internet experience"; longDescription = '' SmartDNS is a local DNS server. SmartDNS accepts DNS query requests from local clients, obtains DNS query results from multiple upstream DNS servers, and returns the fastest access results to clients. Avoiding DNS pollution and improving network access speed, supports high-performance ad filtering. diff --git a/pkgs/by-name/sm/smassh/package.nix b/pkgs/by-name/sm/smassh/package.nix index 89b42204c16f..4d2c1cecaa95 100644 --- a/pkgs/by-name/sm/smassh/package.nix +++ b/pkgs/by-name/sm/smassh/package.nix @@ -2,13 +2,10 @@ lib, fetchFromGitHub, smassh, - python311, + python3, testers, }: -let - python3 = python311; -in python3.pkgs.buildPythonApplication rec { pname = "smassh"; version = "3.1.6"; diff --git a/pkgs/by-name/sm/smbmap/package.nix b/pkgs/by-name/sm/smbmap/package.nix index 1cccdda3e463..e005921d722e 100644 --- a/pkgs/by-name/sm/smbmap/package.nix +++ b/pkgs/by-name/sm/smbmap/package.nix @@ -31,12 +31,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "smbmap" ]; - meta = with lib; { + meta = { description = "SMB enumeration tool"; homepage = "https://github.com/ShawnDEvans/smbmap"; changelog = "https://github.com/ShawnDEvans/smbmap/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "smbmap"; }; } diff --git a/pkgs/by-name/sm/smtprelay/package.nix b/pkgs/by-name/sm/smtprelay/package.nix index 8e26c63cc584..96e717066690 100644 --- a/pkgs/by-name/sm/smtprelay/package.nix +++ b/pkgs/by-name/sm/smtprelay/package.nix @@ -30,12 +30,12 @@ buildGoModule rec { "-X=main.appVersion=v${version}" ]; - meta = with lib; { + meta = { homepage = "https://github.com/decke/smtprelay"; description = "Simple Golang SMTP relay/proxy server"; mainProgram = "smtprelay"; changelog = "https://github.com/decke/smtprelay/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ juliusrickert ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ juliusrickert ]; }; } diff --git a/pkgs/by-name/sm/smuxi/package.nix b/pkgs/by-name/sm/smuxi/package.nix index 0903db1952c0..019811234b3f 100644 --- a/pkgs/by-name/sm/smuxi/package.nix +++ b/pkgs/by-name/sm/smuxi/package.nix @@ -125,14 +125,14 @@ stdenv.mkDerivation rec { } ''; - meta = with lib; { + meta = { homepage = "https://smuxi.im/"; downloadPage = "https://smuxi.im/download/"; changelog = "https://github.com/meebey/smuxi/releases/tag/v${version}"; description = "irssi-inspired, detachable, cross-platform, multi-protocol (IRC, XMPP/Jabber) chat client for the GNOME desktop"; - platforms = platforms.unix; + platforms = lib.platforms.unix; license = lib.licenses.gpl2Plus; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ meebey ]; }; diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix index 60e876a69e43..52426cc9d075 100644 --- a/pkgs/by-name/sn/sn0int/package.nix +++ b/pkgs/by-name/sn/sn0int/package.nix @@ -50,16 +50,16 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/sn0int completions zsh) ''; - meta = with lib; { + meta = { description = "Semi-automatic OSINT framework and package manager"; homepage = "https://github.com/kpcyrd/sn0int"; changelog = "https://github.com/kpcyrd/sn0int/releases/tag/v${version}"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ fab xrelkd ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "sn0int"; }; } diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 86ca64c861c4..630f8dce0f74 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -5,14 +5,14 @@ lib, makeWrapper, nix-update-script, - python3Packages, + python312Packages, squashfsTools, cacert, stdenv, writableTmpDirAsHomeHook, }: -python3Packages.buildPythonApplication rec { +python312Packages.buildPythonApplication rec { pname = "snapcraft"; version = "8.9.2"; @@ -58,7 +58,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper ]; - dependencies = with python3Packages; [ + dependencies = with python312Packages; [ attrs catkin-pkg click @@ -102,7 +102,7 @@ python3Packages.buildPythonApplication rec { validators ]; - build-system = with python3Packages; [ setuptools-scm ]; + build-system = with python312Packages; [ setuptools-scm ]; pythonRelaxDeps = [ "click" @@ -125,7 +125,7 @@ python3Packages.buildPythonApplication rec { ''; nativeCheckInputs = - with python3Packages; + with python312Packages; [ pytest-check pytest-cov-stub diff --git a/pkgs/by-name/sn/snapdragon-profiler/package.nix b/pkgs/by-name/sn/snapdragon-profiler/package.nix index 923648776911..13febc9a2cd4 100644 --- a/pkgs/by-name/sn/snapdragon-profiler/package.nix +++ b/pkgs/by-name/sn/snapdragon-profiler/package.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://developer.qualcomm.com/software/snapdragon-profiler"; - description = "An profiler for Android devices running Snapdragon chips"; + description = "Profiler for Android devices running Snapdragon chips"; license = licenses.unfree; maintainers = [ ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/sn/snappymail/package.nix b/pkgs/by-name/sn/snappymail/package.nix index bb3d11ef998f..d53ffe1017b2 100644 --- a/pkgs/by-name/sn/snappymail/package.nix +++ b/pkgs/by-name/sn/snappymail/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { cp ${includeScript} $out/include.php ''; - meta = with lib; { + meta = { description = "Simple, modern & fast web-based email client"; homepage = "https://snappymail.eu"; changelog = "https://github.com/the-djmaze/snappymail/blob/v${version}/CHANGELOG.md"; downloadPage = "https://github.com/the-djmaze/snappymail/releases"; - license = licenses.agpl3Only; - platforms = platforms.all; - maintainers = with maintainers; [ mic92 ]; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ mic92 ]; }; } diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix index f8d82b213b31..4a39c56cadc7 100644 --- a/pkgs/by-name/sn/sniffnet/package.nix +++ b/pkgs/by-name/sn/sniffnet/package.nix @@ -77,15 +77,15 @@ rustPlatform.buildRustPackage rec { } ''; - meta = with lib; { + meta = { description = "Cross-platform application to monitor your network traffic with ease"; homepage = "https://github.com/gyulyvgc/sniffnet"; changelog = "https://github.com/gyulyvgc/sniffnet/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ mit # or asl20 ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "sniffnet"; }; } diff --git a/pkgs/by-name/sn/snixembed/package.nix b/pkgs/by-name/sn/snixembed/package.nix index 738e2df44c16..44b5b144ff6a 100644 --- a/pkgs/by-name/sn/snixembed/package.nix +++ b/pkgs/by-name/sn/snixembed/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with lib; { + meta = { description = "Proxy StatusNotifierItems as XEmbedded systemtray-spec icons"; homepage = "https://git.sr.ht/~steef/snixembed"; changelog = "https://git.sr.ht/~steef/snixembed/refs/${version}"; - license = licenses.isc; - platforms = platforms.unix; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.isc; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "snixembed"; }; } diff --git a/pkgs/by-name/sn/snowcat/package.nix b/pkgs/by-name/sn/snowcat/package.nix index 960c7777b88d..91015235981b 100644 --- a/pkgs/by-name/sn/snowcat/package.nix +++ b/pkgs/by-name/sn/snowcat/package.nix @@ -21,7 +21,7 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { homepage = "https://github.com/praetorian-inc/snowcat"; changelog = "https://github.com/praetorian-inc/snowcat/releases/tag/v${version}"; description = "Tool to audit the istio service mesh"; @@ -35,7 +35,7 @@ buildGoModule rec { with Istio, and begin to enumerate the required data. Optionally, you can point snowcat at a directory containing Kubernets YAML files. ''; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jk ]; }; } diff --git a/pkgs/by-name/sn/snowflake/package.nix b/pkgs/by-name/sn/snowflake/package.nix index c59e0377f6ca..f3633fa347a3 100644 --- a/pkgs/by-name/sn/snowflake/package.nix +++ b/pkgs/by-name/sn/snowflake/package.nix @@ -19,14 +19,14 @@ buildGoModule rec { vendorHash = "sha256-vopRE4B4WhncUdBfmBTzRbZzCU20vsHoNCYcPG4BGc0="; - meta = with lib; { + meta = { description = "System to defeat internet censorship"; homepage = "https://snowflake.torproject.org/"; changelog = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/raw/v${version}/ChangeLog"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ bbjubjub yayayayaka ]; - license = licenses.bsd3; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix index 5f24aed06052..88a970818551 100644 --- a/pkgs/by-name/so/soft-serve/package.nix +++ b/pkgs/by-name/so/soft-serve/package.nix @@ -45,12 +45,12 @@ buildGoModule rec { passthru.tests = nixosTests.soft-serve; - meta = with lib; { + meta = { description = "Tasty, self-hosted Git server for the command line"; homepage = "https://github.com/charmbracelet/soft-serve"; changelog = "https://github.com/charmbracelet/soft-serve/releases/tag/v${version}"; mainProgram = "soft"; - license = licenses.mit; - maintainers = with maintainers; [ penguwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ penguwin ]; }; } diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix index 8f8bc8458959..1b5af7fb121d 100644 --- a/pkgs/by-name/so/soju/package.nix +++ b/pkgs/by-name/so/soju/package.nix @@ -60,7 +60,6 @@ buildGoModule rec { maintainers = with maintainers; [ azahi malte-v - jtbx ]; mainProgram = "sojuctl"; }; diff --git a/pkgs/by-name/so/solarus-launcher/github-fetches.patch b/pkgs/by-name/so/solarus-launcher/github-fetches.patch new file mode 100644 index 000000000000..181acbd56123 --- /dev/null +++ b/pkgs/by-name/so/solarus-launcher/github-fetches.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 80b9aab..e56ca84 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -88,8 +88,7 @@ include(FetchContent) + + # Qlementine Icons: an SVG icon library made for Qt. + FetchContent_Declare(qlementine-icons +- GIT_REPOSITORY "https://github.com/oclero/qlementine-icons.git" +- GIT_TAG v1.8.0 ++ SOURCE_DIR "@qlementine-icons-src@" + ) + FetchContent_MakeAvailable(qlementine-icons) + set_target_properties(qlementine-icons +@@ -99,8 +98,7 @@ set_target_properties(qlementine-icons + + # Qlementine: the QStyle library to have a modern look n' feel. + FetchContent_Declare(qlementine +- GIT_REPOSITORY "https://github.com/oclero/qlementine.git" +- GIT_TAG v1.2.0 ++ SOURCE_DIR "@qlementine-src@" + ) + FetchContent_MakeAvailable(qlementine) + set_target_properties(qlementine +@@ -109,8 +107,7 @@ set_target_properties(qlementine + ) + + FetchContent_Declare(QtAppInstanceManager +- GIT_REPOSITORY "https://github.com/oclero/qtappinstancemanager.git" +- GIT_TAG v1.3.0 ++ SOURCE_DIR "@qtappinstancemanager-src@" + ) + FetchContent_MakeAvailable(QtAppInstanceManager) + set_target_properties(QtAppInstanceManager diff --git a/pkgs/by-name/so/solarus-launcher/package.nix b/pkgs/by-name/so/solarus-launcher/package.nix new file mode 100644 index 000000000000..ce8cd109a307 --- /dev/null +++ b/pkgs/by-name/so/solarus-launcher/package.nix @@ -0,0 +1,109 @@ +{ + lib, + stdenv, + fetchFromGitLab, + fetchFromGitHub, + replaceVars, + cmake, + ninja, + luajit, + SDL2, + SDL2_image, + SDL2_ttf, + physfs, + openal, + libmodplug, + libvorbis, + solarus, + glm, + qt6Packages, + kdePackages, +}: + +let + qlementine-icons-src = fetchFromGitHub { + owner = "oclero"; + repo = "qlementine-icons"; + tag = "v1.8.0"; + hash = "sha256-FPndzMEOQvYNYUbT2V6iDlwoYqOww38GW/T3zUID3g0="; + }; + + qlementine-src = fetchFromGitHub { + owner = "oclero"; + repo = "qlementine"; + tag = "v1.2.1"; + hash = "sha256-CPQMmTXyUW+CyLjHYx+IdXY4I2mVPudOmAksjd+izPA="; + }; + + qtappinstancemanager-src = fetchFromGitHub { + owner = "oclero"; + repo = "qtappinstancemanager"; + tag = "v1.3.0"; + hash = "sha256-/zvNR/RHNV19ZI8d+58sotWxY16q2a7wWIBuKO52H5M="; + }; + + inherit (qt6Packages) + qtbase + qttools + wrapQtAppsHook + ; +in +stdenv.mkDerivation (finalAttrs: { + pname = "solarus-launcher"; + version = "2.0.0"; + + src = fetchFromGitLab { + owner = "solarus-games"; + repo = "solarus-launcher"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zBJnHzYJyhfzP1m6TgMkDLRA3EXC1oG8PC0Jq/fC2+Q="; + }; + + patches = [ + (replaceVars ./github-fetches.patch { + inherit qlementine-src qlementine-icons-src qtappinstancemanager-src; + }) + ]; + + strictDeps = true; + nativeBuildInputs = [ + cmake + ninja + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + luajit + SDL2 + SDL2_image + SDL2_ttf + physfs + openal + libmodplug + libvorbis + solarus + qtbase + kdePackages.qtsvg + glm + ]; + + meta = { + description = "Launcher for the Zelda-like ARPG game engine, Solarus"; + longDescription = '' + Solarus is a game engine for Zelda-like ARPG games written in lua. + Many full-fledged games have been writen for the engine. + Games can be created easily using the editor. + ''; + homepage = "https://www.solarus-games.org"; + mainProgram = "solarus-launcher"; + license = with lib.licenses; [ + # code + gpl3Plus + # assets + cc-by-sa-40 + ]; + maintainers = with lib.maintainers; [ marcin-serwin ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/so/solarus-quest-editor/package.nix b/pkgs/by-name/so/solarus-quest-editor/package.nix new file mode 100644 index 000000000000..124e26d348f2 --- /dev/null +++ b/pkgs/by-name/so/solarus-quest-editor/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchFromGitLab, + fetchFromGitHub, + replaceVars, + cmake, + ninja, + luajit, + SDL2, + SDL2_image, + SDL2_ttf, + physfs, + openal, + libmodplug, + libvorbis, + solarus, + glm, + qt6Packages, + kdePackages, +}: + +let + qlementine-src = fetchFromGitHub { + owner = "oclero"; + repo = "qlementine"; + tag = "v1.2.0"; + hash = "sha256-25PKOpQl3IkBXX14gt8KKYXXJKeutQ75O7BftEqCAxk="; + }; + + inherit (qt6Packages) + qtbase + qttools + wrapQtAppsHook + ; +in +stdenv.mkDerivation (finalAttrs: { + pname = "solarus-quest-editor"; + version = "2.0.0"; + + src = fetchFromGitLab { + owner = "solarus-games"; + repo = "solarus-quest-editor"; + tag = "v${finalAttrs.version}"; + hash = "sha256-GTslxValldReWGb3x67zRPrvQUuCO/HQSXOEQlJfAmw="; + }; + + patches = [ + (replaceVars ./qlementine-src.patch { inherit qlementine-src; }) + ]; + + strictDeps = true; + nativeBuildInputs = [ + cmake + ninja + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + luajit + SDL2 + SDL2_image + SDL2_ttf + physfs + openal + libmodplug + libvorbis + solarus + qtbase + kdePackages.qtsvg + glm + ]; + + meta = { + description = "Editor for the Zelda-like ARPG game engine, Solarus"; + mainProgram = "solarus-editor"; + longDescription = '' + Solarus is a game engine for Zelda-like ARPG games written in lua. + Many full-fledged games have been writen for the engine. + Games can be created easily using the editor. + ''; + homepage = "https://www.solarus-games.org"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ marcin-serwin ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/so/solarus-quest-editor/qlementine-src.patch b/pkgs/by-name/so/solarus-quest-editor/qlementine-src.patch new file mode 100644 index 000000000000..a19cc2538f9d --- /dev/null +++ b/pkgs/by-name/so/solarus-quest-editor/qlementine-src.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/AddDependencies.cmake b/cmake/AddDependencies.cmake +index 8272d14..054c079 100644 +--- a/cmake/AddDependencies.cmake ++++ b/cmake/AddDependencies.cmake +@@ -51,7 +51,6 @@ endif() + include(FetchContent) + FetchContent_Declare( + qlementine +- GIT_REPOSITORY https://github.com/oclero/qlementine.git +- GIT_TAG v1.2.0 ++ SOURCE_DIR "@qlementine-src@" + ) + FetchContent_MakeAvailable(qlementine) diff --git a/pkgs/by-name/so/solarus/package.nix b/pkgs/by-name/so/solarus/package.nix new file mode 100644 index 000000000000..34db918dc2d4 --- /dev/null +++ b/pkgs/by-name/so/solarus/package.nix @@ -0,0 +1,92 @@ +{ + lib, + stdenv, + fetchFromGitLab, + fetchpatch, + cmake, + ninja, + luajit, + SDL2, + SDL2_image, + SDL2_ttf, + physfs, + glm, + openal, + libmodplug, + libvorbis, + + # tests + solarus-quest-editor, + solarus-launcher, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "solarus"; + version = "2.0.0"; + + src = fetchFromGitLab { + owner = "solarus-games"; + repo = "solarus"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Kfg4pFZrEhsIU4RQlOox3hMpk2PXbOzrkwDElPGnDjA="; + }; + + patches = [ + # https://gitlab.com/solarus-games/solarus/-/merge_requests/1570 + (fetchpatch { + url = "https://gitlab.com/solarus-games/solarus/-/commit/8e1eee51cbfa5acf2511b059739153065b0ba21d.patch"; + hash = "sha256-KevGavtUhpHRt85WLh9ApmZ8a+NeWB1zDDHKGT08yhQ="; + }) + ]; + + outputs = [ + "out" + "lib" + "dev" + ]; + + strictDeps = true; + nativeBuildInputs = [ + cmake + ninja + ]; + buildInputs = [ + luajit + SDL2 + SDL2_image + SDL2_ttf + physfs + openal + libmodplug + libvorbis + glm + ]; + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGLM_ENABLE_EXPERIMENTAL") + (lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "${placeholder "lib"}/share") + ]; + + passthru.tests = { + inherit solarus-quest-editor solarus-launcher; + }; + + meta = { + description = "Zelda-like ARPG game engine"; + longDescription = '' + Solarus is a game engine for Zelda-like ARPG games written in lua. + Many full-fledged games have been writen for the engine. + ''; + homepage = "https://www.solarus-games.org"; + mainProgram = "solarus-run"; + license = with lib.licenses; [ + # code + gpl3Plus + # assets + cc-by-sa-30 + cc-by-sa-40 + ]; + maintainers = with lib.maintainers; [ marcin-serwin ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/so/solvespace/package.nix b/pkgs/by-name/so/solvespace/package.nix index 8e589e257a6a..7db3f17c387f 100644 --- a/pkgs/by-name/so/solvespace/package.nix +++ b/pkgs/by-name/so/solvespace/package.nix @@ -92,11 +92,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_OPENMP=ON" ]; - meta = with lib; { + meta = { description = "Parametric 3d CAD program"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.edef ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.edef ]; + platforms = lib.platforms.linux; homepage = "https://solvespace.com"; changelog = "https://github.com/solvespace/solvespace/raw/v${version}/CHANGELOG.md"; }; diff --git a/pkgs/by-name/so/sonic-server/package.nix b/pkgs/by-name/so/sonic-server/package.nix index 4518babafeb7..ba20e56efb3e 100644 --- a/pkgs/by-name/so/sonic-server/package.nix +++ b/pkgs/by-name/so/sonic-server/package.nix @@ -55,14 +55,14 @@ rustPlatform.buildRustPackage rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Fast, lightweight and schema-less search backend"; homepage = "https://github.com/valeriansaliou/sonic"; changelog = "https://github.com/valeriansaliou/sonic/releases/tag/v${version}"; - license = licenses.mpl20; - platforms = platforms.unix; + license = lib.licenses.mpl20; + platforms = lib.platforms.unix; mainProgram = "sonic"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ pleshevskiy anthonyroussel ]; diff --git a/pkgs/by-name/so/sonusmix/package.nix b/pkgs/by-name/so/sonusmix/package.nix index 21c19a0cc9d0..f419ac40ec8e 100644 --- a/pkgs/by-name/so/sonusmix/package.nix +++ b/pkgs/by-name/so/sonusmix/package.nix @@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; + mainProgram = "sonusmix"; }; } diff --git a/pkgs/by-name/so/soundalike/package.nix b/pkgs/by-name/so/soundalike/package.nix index b38b65b7422d..66a7ab3fad45 100644 --- a/pkgs/by-name/so/soundalike/package.nix +++ b/pkgs/by-name/so/soundalike/package.nix @@ -62,12 +62,12 @@ buildGoModule rec { --prefix PATH : ${lib.makeBinPath [ chromaprint ]} ''; - meta = with lib; { + meta = { description = "Find duplicate audio files using acoustic fingerprints"; homepage = "https://codeberg.org/derat/soundalike"; changelog = "https://codeberg.org/derat/soundalike/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ atar13 ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ atar13 ]; mainProgram = "soundalike"; }; } diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix index c9eeb51445a2..aec54fa9a398 100644 --- a/pkgs/by-name/so/source-meta-json-schema/package.nix +++ b/pkgs/by-name/so/source-meta-json-schema/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/sourcemeta/jsonschema"; - description = "The CLI for working with JSON Schema. Covers formatting, linting, testing, bundling, and more for both local development and CI/CD pipelines "; + description = "CLI for working with JSON Schema. Covers formatting, linting, testing, bundling, and more for both local development and CI/CD pipelines "; changelog = "https://github.com/sourcemeta/jsonschema/releases"; license = with lib.licenses; [ agpl3Plus diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix index a14e5f750236..3266251654f1 100644 --- a/pkgs/by-name/so/sozu/package.nix +++ b/pkgs/by-name/so/sozu/package.nix @@ -36,12 +36,12 @@ rustPlatform.buildRustPackage rec { }; }; - meta = with lib; { + meta = { description = "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures"; homepage = "https://www.sozu.io"; changelog = "https://github.com/sozu-proxy/sozu/releases/tag/${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ Br1ght0ne gaelreyrol ]; diff --git a/pkgs/by-name/sp/spaceship-prompt/package.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix index 1236d29e9a58..c2bfa083711c 100644 --- a/pkgs/by-name/sp/spaceship-prompt/package.nix +++ b/pkgs/by-name/sp/spaceship-prompt/package.nix @@ -33,13 +33,13 @@ stdenvNoCC.mkDerivation rec { ln -s "$out/lib/spaceship-prompt/spaceship.zsh" "$out/share/zsh/site-functions/prompt_spaceship_setup" ''; - meta = with lib; { + meta = { description = "Zsh prompt for Astronauts"; homepage = "https://github.com/denysdovhan/spaceship-prompt/"; changelog = "https://github.com/spaceship-prompt/spaceship-prompt/releases/tag/v${version}"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ nyanloutre moni kyleondy diff --git a/pkgs/by-name/sp/sparrow3d/package.nix b/pkgs/by-name/sp/sparrow3d/package.nix index 393781481639..b2a519ff07b1 100644 --- a/pkgs/by-name/sp/sparrow3d/package.nix +++ b/pkgs/by-name/sp/sparrow3d/package.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/theZiz/sparrow3d"; - description = "A software renderer for different open handhelds like the gp2x, wiz, caanoo and pandora"; + description = "Software renderer for different open handhelds like the gp2x, wiz, caanoo and pandora"; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ colinsane ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/sp/spip/package.nix b/pkgs/by-name/sp/spip/package.nix index 71fa19fb9949..384e8d6b3dab 100644 --- a/pkgs/by-name/sp/spip/package.nix +++ b/pkgs/by-name/sp/spip/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A random forest model for splice prediction in genomics"; + description = "Random forest model for splice prediction in genomics"; license = licenses.mit; homepage = "https://github.com/raphaelleman/SPiP"; maintainers = with maintainers; [ apraga ]; diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix index ed97b14cd0f8..24ca45983b4c 100644 --- a/pkgs/by-name/sp/spire/package.nix +++ b/pkgs/by-name/sp/spire/package.nix @@ -38,11 +38,11 @@ buildGoModule rec { ln -vs $server/bin/spire-server $out/bin/spire-server ''; - meta = with lib; { + meta = { description = "SPIFFE Runtime Environment"; homepage = "https://github.com/spiffe/spire"; changelog = "https://github.com/spiffe/spire/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fkautz ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fkautz ]; }; } diff --git a/pkgs/by-name/sp/splash/package.nix b/pkgs/by-name/sp/splash/package.nix index d014f3808a2f..3492ad797549 100644 --- a/pkgs/by-name/sp/splash/package.nix +++ b/pkgs/by-name/sp/splash/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; meta = { - description = "An interactive visualisation and plotting tool using kernel interpolation, mainly used for Smoothed Particle Hydrodynamics simulations"; + description = "Interactive visualisation and plotting tool using kernel interpolation, mainly used for Smoothed Particle Hydrodynamics simulations"; inherit (finalAttrs.src.meta) homepage; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ doronbehar ]; diff --git a/pkgs/by-name/sp/sploitscan/package.nix b/pkgs/by-name/sp/sploitscan/package.nix index b58e7ef17f27..14feafe86a2b 100644 --- a/pkgs/by-name/sp/sploitscan/package.nix +++ b/pkgs/by-name/sp/sploitscan/package.nix @@ -33,12 +33,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "sploitscan" ]; - meta = with lib; { + meta = { description = "Cybersecurity utility designed to provide detailed information on vulnerabilities and associated exploits"; homepage = "https://github.com/xaitax/SploitScan"; changelog = "https://github.com/xaitax/SploitScan/releases/tag/v.${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "sploitscan"; }; } diff --git a/pkgs/by-name/sp/spotdl/package.nix b/pkgs/by-name/sp/spotdl/package.nix index c27357cfc747..c57a2f03fdbf 100644 --- a/pkgs/by-name/sp/spotdl/package.nix +++ b/pkgs/by-name/sp/spotdl/package.nix @@ -88,12 +88,12 @@ python3.pkgs.buildPythonApplication rec { (lib.makeBinPath [ ffmpeg ]) ]; - meta = with lib; { + meta = { description = "Download your Spotify playlists and songs along with album art and metadata"; homepage = "https://github.com/spotDL/spotify-downloader"; changelog = "https://github.com/spotDL/spotify-downloader/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; mainProgram = "spotdl"; }; } diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix index 70f9abdc99ea..fd942e25e2a5 100644 --- a/pkgs/by-name/sp/spotify-player/package.nix +++ b/pkgs/by-name/sp/spotify-player/package.nix @@ -5,6 +5,9 @@ pkg-config, openssl, cmake, + installShellFiles, + writableTmpDirAsHomeHook, + # deps for audio backends alsa-lib, libpulseaudio, @@ -63,6 +66,9 @@ rustPlatform.buildRustPackage rec { pkg-config cmake rustPlatform.bindgenHook + installShellFiles + # Tries to access $HOME when installing shell files, and on Darwin + writableTmpDirAsHomeHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper @@ -105,16 +111,21 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals withSixel [ "sixel" ] ++ lib.optionals withFuzzy [ "fzf" ]; - # tries to access HOME only in aarch64-darwin environment when building mac-notification-sys - preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' - export HOME=$TMPDIR - ''; - - # sixel-sys is dynamically linked to libsixel - postInstall = lib.optionals (stdenv.hostPlatform.isDarwin && withSixel) '' - wrapProgram $out/bin/spotify_player \ - --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsixel ]}" - ''; + postInstall = + let + inherit (lib.strings) optionalString; + in + # sixel-sys is dynamically linked to libsixel + optionalString (stdenv.hostPlatform.isDarwin && withSixel) '' + wrapProgram $out/bin/spotify_player \ + --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsixel ]}" + '' + + optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd spotify_player \ + --bash <($out/bin/spotify_player generate bash) \ + --fish <($out/bin/spotify_player generate fish) \ + --zsh <($out/bin/spotify_player generate zsh) + ''; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sp/sptk/package.nix b/pkgs/by-name/sp/sptk/package.nix index 79a0c8a4c501..5d8759c8e106 100644 --- a/pkgs/by-name/sp/sptk/package.nix +++ b/pkgs/by-name/sp/sptk/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { changelog = "https://github.com/sp-nitech/SPTK/releases/tag/v${version}"; description = "Suite of speech signal processing tools"; homepage = "https://github.com/sp-nitech/SPTK"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/sp/sptlrx/package.nix b/pkgs/by-name/sp/sptlrx/package.nix index 3dfd390d2ecb..656ae6381221 100644 --- a/pkgs/by-name/sp/sptlrx/package.nix +++ b/pkgs/by-name/sp/sptlrx/package.nix @@ -40,12 +40,12 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "Spotify lyrics in your terminal"; homepage = "https://github.com/raitonoberu/sptlrx"; changelog = "https://github.com/raitonoberu/sptlrx/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ MoritzBoehme ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ MoritzBoehme ]; mainProgram = "sptlrx"; }; } diff --git a/pkgs/by-name/sq/sqlboiler/package.nix b/pkgs/by-name/sq/sqlboiler/package.nix index ab0b9eb1c47c..ed15064493c9 100644 --- a/pkgs/by-name/sq/sqlboiler/package.nix +++ b/pkgs/by-name/sq/sqlboiler/package.nix @@ -32,12 +32,12 @@ buildGoModule rec { doCheck = false; - meta = with lib; { + meta = { description = "Generate a Go ORM tailored to your database schema"; homepage = "https://github.com/volatiletech/sqlboiler"; changelog = "https://github.com/volatiletech/sqlboiler/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ mrityunjaygr8 ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mrityunjaygr8 ]; mainProgram = "sqlboiler"; }; } diff --git a/pkgs/by-name/sq/sqlcipher/package.nix b/pkgs/by-name/sq/sqlcipher/package.nix index c102af52448b..1dc4d0c66765 100644 --- a/pkgs/by-name/sq/sqlcipher/package.nix +++ b/pkgs/by-name/sq/sqlcipher/package.nix @@ -58,13 +58,13 @@ stdenv.mkDerivation rec { installManPage sqlcipher.1 ''; - meta = with lib; { + meta = { changelog = "https://github.com/sqlcipher/sqlcipher/blob/v${version}/CHANGELOG.md"; description = "SQLite extension that provides 256 bit AES encryption of database files"; mainProgram = "sqlcipher"; homepage = "https://www.zetetic.net/sqlcipher/"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = platforms.unix; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix index 8c5b2a38c766..4b91c874ac6f 100644 --- a/pkgs/by-name/sq/sqlfluff/package.nix +++ b/pkgs/by-name/sq/sqlfluff/package.nix @@ -68,12 +68,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "sqlfluff" ]; - meta = with lib; { + meta = { description = "SQL linter and auto-formatter"; homepage = "https://www.sqlfluff.com/"; changelog = "https://github.com/sqlfluff/sqlfluff/blob/${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "sqlfluff"; }; } diff --git a/pkgs/by-name/sq/sqlmc/package.nix b/pkgs/by-name/sq/sqlmc/package.nix index 9fbf1c49f11b..9d756d6158c5 100644 --- a/pkgs/by-name/sq/sqlmc/package.nix +++ b/pkgs/by-name/sq/sqlmc/package.nix @@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "sqlmc" ]; - meta = with lib; { + meta = { description = "Tool to check URLs of a domain for SQL injections"; homepage = "https://github.com/malvads/sqlmc"; changelog = "https://github.com/malvads/sqlmc/releases/tag/${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "sqlmc"; }; } diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix index f8c3ada6f924..597e898dad86 100644 --- a/pkgs/by-name/sr/srgn/package.nix +++ b/pkgs/by-name/sr/srgn/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A code surgeon for precise text and code transplantation"; + description = "Code surgeon for precise text and code transplantation"; license = licenses.mit; maintainers = with maintainers; [ magistau ]; mainProgram = "srgn"; diff --git a/pkgs/by-name/sr/srisum/package.nix b/pkgs/by-name/sr/srisum/package.nix index 085d7f7011fe..d118d9c4149f 100644 --- a/pkgs/by-name/sr/srisum/package.nix +++ b/pkgs/by-name/sr/srisum/package.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - meta = with lib; { + meta = { description = "Command-line utility to compute and check subresource integrity hashes"; homepage = "https://github.com/zkat/srisum-rs"; changelog = "https://github.com/zkat/srisum-rs/raw/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ pjjw ]; - platforms = platforms.all; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ pjjw ]; + platforms = lib.platforms.all; mainProgram = "srisum"; }; } diff --git a/pkgs/by-name/ss/ssh-audit/package.nix b/pkgs/by-name/ss/ssh-audit/package.nix index da87760dcf6c..89bac7cb7a47 100644 --- a/pkgs/by-name/ss/ssh-audit/package.nix +++ b/pkgs/by-name/ss/ssh-audit/package.nix @@ -37,13 +37,13 @@ python3Packages.buildPythonApplication rec { inherit (nixosTests) ssh-audit; }; - meta = with lib; { + meta = { description = "Tool for ssh server auditing"; homepage = "https://github.com/jtesta/ssh-audit"; changelog = "https://github.com/jtesta/ssh-audit/releases/tag/v${version}"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ tv SuperSandro2000 ]; diff --git a/pkgs/by-name/ss/ssh-mitm/package.nix b/pkgs/by-name/ss/ssh-mitm/package.nix index 49185aa82bee..4fa03112e80c 100644 --- a/pkgs/by-name/ss/ssh-mitm/package.nix +++ b/pkgs/by-name/ss/ssh-mitm/package.nix @@ -68,11 +68,11 @@ buildPythonApplication rec { pythonImportsCheck = [ "sshmitm" ]; - meta = with lib; { + meta = { description = "Tool for SSH security audits"; homepage = "https://github.com/ssh-mitm/ssh-mitm"; changelog = "https://github.com/ssh-mitm/ssh-mitm/blob/${version}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ss/sshocker/package.nix b/pkgs/by-name/ss/sshocker/package.nix index 73ab4de906e5..4fccfd958c81 100644 --- a/pkgs/by-name/ss/sshocker/package.nix +++ b/pkgs/by-name/ss/sshocker/package.nix @@ -30,12 +30,12 @@ buildGoModule rec { versionCheckProgramArg = "--version"; - meta = with lib; { + meta = { description = "Tool for SSH, reverse sshfs and port forwarder"; homepage = "https://github.com/lima-vm/sshocker"; changelog = "https://github.com/lima-vm/sshocker/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "sshocker"; }; } diff --git a/pkgs/by-name/ss/sslstrip/package.nix b/pkgs/by-name/ss/sslstrip/package.nix index 8a75e3fdb8a5..391dfade6b4b 100644 --- a/pkgs/by-name/ss/sslstrip/package.nix +++ b/pkgs/by-name/ss/sslstrip/package.nix @@ -40,12 +40,12 @@ python3.pkgs.buildPythonApplication rec { "sslstrip" ]; - meta = with lib; { + meta = { description = "Tool for exploiting SSL stripping attacks"; homepage = "https://github.com/L1ghtn1ng/sslstrip"; changelog = "https://github.com/L1ghtn1ng/sslstrip/releases/tag/${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "sslstrip"; }; } diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 9cdd191c82f3..5084c8b99d33 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -68,12 +68,12 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "CLI to manage STACKIT cloud services"; homepage = "https://github.com/stackitcloud/stackit-cli"; changelog = "https://github.com/stackitcloud/stackit-cli/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ DerRockWolf ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ DerRockWolf ]; mainProgram = "stackit"; }; } diff --git a/pkgs/by-name/st/starboard/package.nix b/pkgs/by-name/st/starboard/package.nix index 26bdf9ba4afa..2b513ae3f1b3 100644 --- a/pkgs/by-name/st/starboard/package.nix +++ b/pkgs/by-name/st/starboard/package.nix @@ -70,7 +70,7 @@ buildGoModule rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { homepage = "https://github.com/aquasecurity/starboard"; changelog = "https://github.com/aquasecurity/starboard/releases/tag/v${version}"; description = "Kubernetes-native security tool kit"; @@ -84,7 +84,7 @@ buildGoModule rec { plug-in that make security reports available through familiar Kubernetes tools. ''; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jk ]; }; } diff --git a/pkgs/by-name/st/stardust-xr-flatland/package.nix b/pkgs/by-name/st/stardust-xr-flatland/package.nix index 5e3f0b251736..d4fdd4b077d2 100644 --- a/pkgs/by-name/st/stardust-xr-flatland/package.nix +++ b/pkgs/by-name/st/stardust-xr-flatland/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { }; meta = { - description = "A flat window for Stardust XR"; + description = "Flat window for Stardust XR"; homepage = "https://stardustxr.org"; license = lib.licenses.mit; mainProgram = "flatland"; diff --git a/pkgs/by-name/st/stardust-xr-kiara/package.nix b/pkgs/by-name/st/stardust-xr-kiara/package.nix index 8a3fe1ff9f3b..615b8147cb5a 100644 --- a/pkgs/by-name/st/stardust-xr-kiara/package.nix +++ b/pkgs/by-name/st/stardust-xr-kiara/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { }; meta = { - description = "A 360-degree app shell / DE for Stardust XR using Niri"; + description = "360-degree app shell / DE for Stardust XR using Niri"; homepage = "https://stardustxr.org/"; license = lib.licenses.mit; mainProgram = "kiara"; diff --git a/pkgs/by-name/st/stargazer/package.nix b/pkgs/by-name/st/stargazer/package.nix index c48274800d3a..ff2eadc30fb8 100644 --- a/pkgs/by-name/st/stargazer/package.nix +++ b/pkgs/by-name/st/stargazer/package.nix @@ -40,12 +40,12 @@ rustPlatform.buildRustPackage rec { installShellCompletion completions/stargazer.{bash,zsh,fish} ''; - meta = with lib; { + meta = { description = "Fast and easy to use Gemini server"; mainProgram = "stargazer"; homepage = "https://sr.ht/~zethra/stargazer/"; - license = licenses.agpl3Plus; + license = lib.licenses.agpl3Plus; changelog = "https://git.sr.ht/~zethra/stargazer/refs/${version}"; - maintainers = with maintainers; [ gaykitty ]; + maintainers = with lib.maintainers; [ gaykitty ]; }; } diff --git a/pkgs/by-name/st/starlark-rust/package.nix b/pkgs/by-name/st/starlark-rust/package.nix index 6b5ab174261b..3295553e41d0 100644 --- a/pkgs/by-name/st/starlark-rust/package.nix +++ b/pkgs/by-name/st/starlark-rust/package.nix @@ -17,12 +17,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-BSXbFKR4AOKhssj+m5PIfgaoeRVDK+KRkApi8FUa8jg="; - meta = with lib; { + meta = { description = "Rust implementation of the Starlark language"; homepage = "https://github.com/facebook/starlark-rust"; changelog = "https://github.com/facebook/starlark-rust/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "starlark"; }; } diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix index 9a74f63c3b78..9a4ecc6db7c3 100644 --- a/pkgs/by-name/st/starlark/package.nix +++ b/pkgs/by-name/st/starlark/package.nix @@ -6,13 +6,13 @@ }: buildGoModule { pname = "starlark"; - version = "0-unstable-2025-04-17"; + version = "0-unstable-2025-06-03"; src = fetchFromGitHub { owner = "google"; repo = "starlark-go"; - rev = "f57e51f710eb2662fb0866b2bfb87c218cecdc52"; - hash = "sha256-JuWdw0+SDcnfkEp4aUIUtI86dhEbZMBWNUibLEwQBek="; + rev = "27fdb1d4744d057ceaa6c18d8eca9bf5692e3852"; + hash = "sha256-iS9v4XRJTclFxc/siuhTGliUAjM4pqju9lD+muFXp4Y="; }; vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo="; diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix index 86fbb36443cc..e11786d22c3a 100644 --- a/pkgs/by-name/st/static-web-server/package.nix +++ b/pkgs/by-name/st/static-web-server/package.nix @@ -33,15 +33,15 @@ rustPlatform.buildRustPackage rec { inherit (nixosTests) static-web-server; }; - meta = with lib; { + meta = { description = "Asynchronous web server for static files-serving"; homepage = "https://static-web-server.net/"; changelog = "https://github.com/static-web-server/static-web-server/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ mit # or asl20 ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ figsoda misilelab ]; diff --git a/pkgs/by-name/st/station/package.nix b/pkgs/by-name/st/station/package.nix index 7e9391b6866f..c80a0ad5a3b4 100644 --- a/pkgs/by-name/st/station/package.nix +++ b/pkgs/by-name/st/station/package.nix @@ -1,43 +1,50 @@ { + lib, appimageTools, fetchurl, - lib, + makeWrapper, + nix-update-script, }: - let + version = "3.3.0"; pname = "station"; - version = "1.52.2"; - src = fetchurl { - url = "https://github.com/getstation/desktop-app-releases/releases/download/${version}/Station-${version}-x86_64.AppImage"; - sha256 = "0lhiwvnf94is9klvzrqv2wri53gj8nms9lg2678bs4y58pvjxwid"; + url = "https://github.com/getstation/desktop-app/releases/download/v${version}/Station-x86_64.AppImage"; + hash = "sha256-OiUVRKpU2W1dJ6z9Dqvxd+W4/oNpG+Zolj43ZHpKaO0="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; in -appimageTools.wrapType2 rec { +appimageTools.wrapType2 { inherit pname version src; - - profile = '' - export LC_ALL=C.UTF-8 - ''; - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/browserx.png \ - $out/share/icons/hicolor/512x512/apps/browserx.png - substituteInPlace $out/share/applications/browserx.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + install -m 444 -D ${appimageContents}/station-desktop-app.desktop \ + $out/share/applications/station-desktop-app.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/station-desktop-app.png \ + $out/share/icons/hicolor/512x512/apps/station-desktop-app.png + substituteInPlace $out/share/applications/station-desktop-app.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=station' ''; - meta = with lib; { - description = "Single place for all of your web applications"; - homepage = "https://getstation.com"; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = [ ]; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--url=https://github.com/getstation/desktop-app" ]; + }; + }; + + meta = { + changelog = "https://github.com/getstation/desktop-app/releases/tag/v${version}"; + description = "A single place for all of your web applications"; + downloadPage = "https://github.com/getstation/desktop-app/releases"; + homepage = "https://getstation.com/"; + license = lib.licenses.asl20; mainProgram = "station"; + maintainers = with lib.maintainers; [ flexiondotorg ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/by-name/st/stayrtr/package.nix b/pkgs/by-name/st/stayrtr/package.nix index dc90fb2b358c..d36392b7beca 100644 --- a/pkgs/by-name/st/stayrtr/package.nix +++ b/pkgs/by-name/st/stayrtr/package.nix @@ -28,12 +28,12 @@ buildGoModule rec { package = stayrtr; }; - meta = with lib; { + meta = { changelog = "https://github.com/bgp/stayrtr/releases/tag/v${version}"; description = "RPKI-To-Router server implementation in Go"; homepage = "https://github.com/bgp/stayrtr/"; - license = licenses.bsd3; + license = lib.licenses.bsd3; mainProgram = "stayrtr"; - maintainers = with maintainers; [ _0x4A6F ]; + maintainers = with lib.maintainers; [ _0x4A6F ]; }; } diff --git a/pkgs/by-name/st/stc-cli/package.nix b/pkgs/by-name/st/stc-cli/package.nix index 18a7c7c24b46..19e76087c588 100644 --- a/pkgs/by-name/st/stc-cli/package.nix +++ b/pkgs/by-name/st/stc-cli/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { vendorHash = "sha256-qLpWXikTr+vB2bIw2EqnoJ0uOxUc/qc6SdGEJQXwmTQ="; - meta = with lib; { + meta = { description = "Syncthing CLI Tool"; homepage = "https://github.com/tenox7/stc"; changelog = "https://github.com/tenox7/stc/releases/tag/${version}"; - license = licenses.asl20; - maintainers = [ maintainers.ivankovnatsky ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.ivankovnatsky ]; mainProgram = "stc"; }; } diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index 2147b331caf7..e7faa8dc414f 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/steamguard completion --shell zsh) \ ''; - meta = with lib; { + meta = { changelog = "https://github.com/dyc3/steamguard-cli/releases/tag/v${version}"; description = "Linux utility for generating 2FA codes for Steam and managing Steam trade confirmations"; homepage = "https://github.com/dyc3/steamguard-cli"; - license = with licenses; [ gpl3Only ]; + license = with lib.licenses; [ gpl3Only ]; mainProgram = "steamguard"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ surfaceflinger sigmasquadron ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/st/stellarsolver/package.nix b/pkgs/by-name/st/stellarsolver/package.nix index 0417d3cbd2f0..a473e30b18eb 100644 --- a/pkgs/by-name/st/stellarsolver/package.nix +++ b/pkgs/by-name/st/stellarsolver/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "stellarsolver"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "rlancaste"; repo = "stellarsolver"; rev = finalAttrs.version; - sha256 = "sha256-6WDiHaBhi9POtXynGU/eTeuqZSK81JJeuZv4SxOeVoE="; + sha256 = "sha256-tASjV5MZ1ClumZqu/R61b6XE9CGTuVFfpxyC89fwN9o="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/st/step-ca/package.nix b/pkgs/by-name/st/step-ca/package.nix index 6ee922e90865..2a3a89f26918 100644 --- a/pkgs/by-name/st/step-ca/package.nix +++ b/pkgs/by-name/st/step-ca/package.nix @@ -58,13 +58,13 @@ buildGoModule rec { passthru.tests.step-ca = nixosTests.step-ca; - meta = with lib; { + meta = { description = "Private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH"; homepage = "https://smallstep.com/certificates/"; changelog = "https://github.com/smallstep/certificates/releases/tag/v${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "step-ca"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ cmcdragonkai techknowlogick ]; diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index f9074dd623e0..c1ac6753d65f 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.15.37"; + version = "3.15.42"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-d254AsNQgjExXaGd9EQ5dZ1xy5nP6Zqe2INtR9IKMiQ="; + hash = "sha256-Hd5jy64tknibRgPQczERdXLtX/PJdc9tC4gI1K+2uhE="; }; outputs = [ diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix index bd0250accc8e..b8c9af298ff2 100644 --- a/pkgs/by-name/st/stm32cubemx/package.nix +++ b/pkgs/by-name/st/stm32cubemx/package.nix @@ -86,7 +86,7 @@ let ''; meta = with lib; { - description = "A graphical tool for configuring STM32 microcontrollers and microprocessors"; + description = "Graphical tool for configuring STM32 microcontrollers and microprocessors"; longDescription = '' A graphical tool that allows a very easy configuration of STM32 microcontrollers and microprocessors, as well as the generation of the diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix index 26073880ed57..9aae0af822db 100644 --- a/pkgs/by-name/st/stress-ng/package.nix +++ b/pkgs/by-name/st/stress-ng/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { # mystery, though. :-( enableParallelBuilding = (!stdenv.hostPlatform.isi686); - meta = with lib; { + meta = { description = "Stress test a computer system"; longDescription = '' stress-ng will stress test a computer system in various selectable ways. It @@ -94,9 +94,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ColinIanKing/stress-ng"; downloadPage = "https://github.com/ColinIanKing/stress-ng/tags"; changelog = "https://github.com/ColinIanKing/stress-ng/raw/V${version}/debian/changelog"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ c0bw3b ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ c0bw3b ]; + platforms = lib.platforms.unix; mainProgram = "stress-ng"; }; } diff --git a/pkgs/by-name/st/stressapptest/package.nix b/pkgs/by-name/st/stressapptest/package.nix index ea829e2a2694..95261a62f02b 100644 --- a/pkgs/by-name/st/stressapptest/package.nix +++ b/pkgs/by-name/st/stressapptest/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { libaio ]; - meta = with lib; { + meta = { description = "Userspace memory and IO stress test tool"; homepage = "https://github.com/stressapptest/stressapptest"; changelog = "https://github.com/stressapptest/stressapptest/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - platforms = platforms.unix; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ fab ]; + platforms = lib.platforms.unix; mainProgram = "stressapptest"; }; } diff --git a/pkgs/by-name/st/string-view-lite/package.nix b/pkgs/by-name/st/string-view-lite/package.nix index afcb1354ef1d..2d50c921411b 100644 --- a/pkgs/by-name/st/string-view-lite/package.nix +++ b/pkgs/by-name/st/string-view-lite/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "A C++17-like string_view for C++98, C++11 and later in a single-file header-only library"; + description = "C++17-like string_view for C++98, C++11 and later in a single-file header-only library"; homepage = "https://github.com/martinmoene/string-view-lite"; changelog = "https://github.com/martinmoene/string-view-lite/blob/v${finalAttrs.version}/CHANGES.txt"; license = lib.licenses.boost; diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix index d319f8e903f0..f067a21c8aeb 100644 --- a/pkgs/by-name/st/stripe-cli/package.nix +++ b/pkgs/by-name/st/stripe-cli/package.nix @@ -69,7 +69,7 @@ buildGoModule rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { homepage = "https://stripe.com/docs/stripe-cli"; changelog = "https://github.com/stripe/stripe-cli/releases/tag/v${version}"; description = "Command-line tool for Stripe"; @@ -83,8 +83,8 @@ buildGoModule rec { Tail your API request logs in real-time Create, retrieve, update, or delete API objects. ''; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ RaghavSood jk kashw2 diff --git a/pkgs/by-name/st/sttr/package.nix b/pkgs/by-name/st/sttr/package.nix index 1d7558fa43ea..192df215a273 100644 --- a/pkgs/by-name/st/sttr/package.nix +++ b/pkgs/by-name/st/sttr/package.nix @@ -33,12 +33,12 @@ buildGoModule rec { --zsh <($out/bin/sttr completion zsh) ''; - meta = with lib; { + meta = { description = "Cross-platform cli tool to perform various operations on string"; homepage = "https://github.com/abhimanyu003/sttr"; changelog = "https://github.com/abhimanyu003/sttr/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ Ligthiago ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Ligthiago ]; mainProgram = "sttr"; }; } diff --git a/pkgs/by-name/st/stuffbin/package.nix b/pkgs/by-name/st/stuffbin/package.nix index a5b629bf3da1..910e77d0818e 100644 --- a/pkgs/by-name/st/stuffbin/package.nix +++ b/pkgs/by-name/st/stuffbin/package.nix @@ -23,11 +23,11 @@ buildGoModule rec { "-X main.version=${version}" ]; - meta = with lib; { + meta = { description = "Compress and embed static files and assets into Go binaries and access them with a virtual file system in production"; homepage = "https://github.com/knadh/stuffbin"; changelog = "https://github.com/knadh/stuffbin/releases/tag/v${version}"; - maintainers = with maintainers; [ raitobezarius ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ raitobezarius ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix index 5e44efe1b338..da1be2a67419 100644 --- a/pkgs/by-name/st/stylance-cli/package.nix +++ b/pkgs/by-name/st/stylance-cli/package.nix @@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-iSE6SmqYXg9IAMJOb4/q80w+J2OEVd7oyxRpWcCps9U="; - meta = with lib; { + meta = { description = "Library and cli tool for working with scoped CSS in rust"; mainProgram = "stylance"; homepage = "https://github.com/basro/stylance-rs"; changelog = "https://github.com/basro/stylance-rs/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ dav-wolff ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ dav-wolff ]; }; } diff --git a/pkgs/by-name/st/stylelint-lsp/package.nix b/pkgs/by-name/st/stylelint-lsp/package.nix index 7de32eea7929..78c830808d7c 100644 --- a/pkgs/by-name/st/stylelint-lsp/package.nix +++ b/pkgs/by-name/st/stylelint-lsp/package.nix @@ -62,7 +62,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "A stylelint Language Server"; + description = "Stylelint Language Server"; homepage = "https://github.com/bmatcuk/stylelint-lsp"; license = lib.licenses.mit; mainProgram = "stylelint-lsp"; diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix index 8a5286d419dc..77a55c8cace1 100644 --- a/pkgs/by-name/st/stylua/package.nix +++ b/pkgs/by-name/st/stylua/package.nix @@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec { buildFeatures = features; - meta = with lib; { + meta = { description = "Opinionated Lua code formatter"; homepage = "https://github.com/johnnymorganz/stylua"; changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "stylua"; }; } diff --git a/pkgs/by-name/su/sublime-music/package.nix b/pkgs/by-name/su/sublime-music/package.nix index 400b0c1ce10d..cd29662aba6d 100644 --- a/pkgs/by-name/su/sublime-music/package.nix +++ b/pkgs/by-name/su/sublime-music/package.nix @@ -96,12 +96,12 @@ python3.pkgs.buildPythonApplication rec { done ''; - meta = with lib; { + meta = { description = "GTK3 Subsonic/Airsonic client"; homepage = "https://sublimemusic.app"; changelog = "https://github.com/sublime-music/sublime-music/blob/v${version}/CHANGELOG.rst"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ albakham sumnerevans ]; diff --git a/pkgs/by-name/su/subprober/package.nix b/pkgs/by-name/su/subprober/package.nix index 394510650de1..de856aea0234 100644 --- a/pkgs/by-name/su/subprober/package.nix +++ b/pkgs/by-name/su/subprober/package.nix @@ -42,12 +42,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "subprober" ]; - meta = with lib; { + meta = { description = "Subdomain scanning tool"; homepage = "https://github.com/RevoltSecurities/SubProber"; changelog = "https://github.com/RevoltSecurities/SubProber/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "subprober"; }; } diff --git a/pkgs/by-name/su/substudy/package.nix b/pkgs/by-name/su/substudy/package.nix index ea1a89dac4dc..681ea499573d 100644 --- a/pkgs/by-name/su/substudy/package.nix +++ b/pkgs/by-name/su/substudy/package.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Learn foreign languages using audio and subtitles extracted from video files"; - homepage = "http://www.randomhacks.net/substudy"; + homepage = "https://www.randomhacks.net/substudy"; license = licenses.asl20; mainProgram = "substudy"; maintainers = with maintainers; [ paveloom ]; diff --git a/pkgs/by-name/su/subtitleedit/package.nix b/pkgs/by-name/su/subtitleedit/package.nix index 03aab4482d4d..23df1771fed7 100644 --- a/pkgs/by-name/su/subtitleedit/package.nix +++ b/pkgs/by-name/su/subtitleedit/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - description = "A subtitle editor"; + description = "Subtitle editor"; longDescription = '' With Subtitle Edit you can easily adjust a subtitle if it is out of sync with the video in several different ways. You can also use it for making diff --git a/pkgs/by-name/su/sudachidict/package.nix b/pkgs/by-name/su/sudachidict/package.nix index 87b4c8b3a71d..8a885001a346 100644 --- a/pkgs/by-name/su/sudachidict/package.nix +++ b/pkgs/by-name/su/sudachidict/package.nix @@ -49,13 +49,13 @@ lib.checkListOfEnum "${pname}: dict-type" [ "core" "full" "small" ] [ dict-type dict-type = dict-type; }; - meta = with lib; { + meta = { description = "Lexicon for Sudachi"; homepage = "https://github.com/WorksApplications/SudachiDict"; changelog = "https://github.com/WorksApplications/SudachiDict/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ natsukium ]; - platforms = platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ natsukium ]; + platforms = lib.platforms.all; # it is a waste of space and time to build this package in hydra since it is just data hydraPlatforms = [ ]; }; diff --git a/pkgs/by-name/su/sudo-font/package.nix b/pkgs/by-name/su/sudo-font/package.nix index 02c1b09c7757..cee7f4e3f447 100644 --- a/pkgs/by-name/su/sudo-font/package.nix +++ b/pkgs/by-name/su/sudo-font/package.nix @@ -21,12 +21,12 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Font for programmers and command line users"; homepage = "https://www.kutilek.de/sudo-font/"; changelog = "https://github.com/jenskutilek/sudo-font/raw/v${version}/sudo/FONTLOG.txt"; - license = licenses.ofl; - maintainers = [ ]; - platforms = platforms.all; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 78fe7df51084..787b57039a6e 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -7,27 +7,25 @@ makeDesktopItem, nix-update-script, npm-lockfile-fix, - python3, stdenv, }: buildNpmPackage rec { pname = "super-productivity"; - version = "12.0.5"; + version = "13.0.10"; src = fetchFromGitHub { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-+Xw1WZXvZUOdA/ZpLdLCQAy8cmQ9QTiSDRMgj5+jeNw="; + hash = "sha256-2K/6T4f9tLlrKimT/DPSdoz8LHij5nsaF6BWSQf6u7U="; postFetch = '' ${lib.getExe npm-lockfile-fix} -r $out/package-lock.json ''; }; - npmDepsHash = "sha256-SAmSvdPlJFDE6TQCr932MfPzlwDtGcm4YdHesVA6j8c="; - npmFlags = [ "--legacy-peer-deps" ]; + npmDepsHash = "sha256-l9P11ZvLYiTu/cVPQIw391ZTJ0K+cNPUzoVMsdze2uo="; makeCacheWritable = true; env = { @@ -36,19 +34,11 @@ buildNpmPackage rec { CSC_IDENTITY_AUTO_DISCOVERY = "false"; }; - nativeBuildInputs = - [ copyDesktopItems ] - ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ - (python3.withPackages (ps: [ ps.setuptools ])) - ]; + nativeBuildInputs = [ copyDesktopItems ]; - # package.json does not include `core-js` and the comment suggests - # it is only needed on some mobile platforms postPatch = '' substituteInPlace electron-builder.yaml \ --replace-fail "notarize: true" "notarize: false" - substituteInPlace src/polyfills.ts \ - --replace-fail "import 'core-js/es/object';" "" ''; buildPhase = '' @@ -58,8 +48,8 @@ buildNpmPackage rec { cp -r ${electron.dist} electron-dist chmod -R u+w electron-dist - npm run buildFrontend:prod:es6 - npm run electron:build + npm run prepare + npm run build npm exec electron-builder -- --dir \ -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} @@ -79,18 +69,12 @@ buildNpmPackage rec { '' else '' - mkdir -p $out/share/super-productivity/{app,defaults,static/plugins,static/resources/plugins} - cp -r app-builds/*-unpacked/{locales,resources{,.pak}} "$out/share/super-productivity/app" - - for size in 16 32 48 64 128 256 512 1024; do - local sizexsize="''${size}x''${size}" - mkdir -p $out/share/icons/hicolor/$sizexsize/apps - cp -v build/icons/$sizexsize.png \ - $out/share/icons/hicolor/$sizexsize/apps/super-productivity.png - done + mkdir -p $out/share/{super-productivity,icons/hicolor/scalable/apps} + cp -r app-builds/*-unpacked/resources/app.asar $out/share/super-productivity + cp electron/assets/icons/ico-circled.svg $out/share/icons/hicolor/scalable/apps/super-productivity.svg makeWrapper '${lib.getExe electron}' "$out/bin/super-productivity" \ - --add-flags "$out/share/super-productivity/app/resources/app.asar" \ + --add-flags "$out/share/super-productivity/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --inherit-argv0 @@ -110,8 +94,11 @@ buildNpmPackage rec { type = "Application"; icon = "super-productivity"; startupWMClass = "superProductivity"; - comment = builtins.replaceStrings [ "\n" ] [ " " ] meta.longDescription; - categories = [ "Utility" ]; + comment = "ToDo list and Time Tracking"; + categories = [ + "Office" + "ProjectManagement" + ]; }) ]; diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix index e6bb798f9d7b..63f92ca38650 100644 --- a/pkgs/by-name/su/superTuxKart/package.nix +++ b/pkgs/by-name/su/superTuxKart/package.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { --set-default SUPERTUXKART_DATADIR "$out/share/supertuxkart" \ ''; - meta = with lib; { + meta = { description = "Free 3D kart racing game"; mainProgram = "supertuxkart"; longDescription = '' @@ -156,11 +156,11 @@ stdenv.mkDerivation rec { Kart. ''; homepage = "https://supertuxkart.net/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ peterhoeg ]; - platforms = with platforms; unix; + platforms = with lib.platforms; unix; changelog = "https://github.com/supertuxkart/stk-code/blob/${version}/CHANGELOG.md"; }; } diff --git a/pkgs/by-name/su/supermariowar/package.nix b/pkgs/by-name/su/supermariowar/package.nix index 960131aeb9bb..d98c9d6f6909 100644 --- a/pkgs/by-name/su/supermariowar/package.nix +++ b/pkgs/by-name/su/supermariowar/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = unstableGitUpdater { }; meta = { - description = "A fan-made multiplayer Super Mario Bros. style deathmatch game"; + description = "Fan-made multiplayer Super Mario Bros. style deathmatch game"; homepage = "https://github.com/mmatyas/supermariowar"; changelog = "https://github.com/mmatyas/supermariowar/blob/${finalAttrs.src.rev}/CHANGELOG"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 17d452b3d8a9..7a0b1a480458 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -95,7 +95,7 @@ buildGoModule rec { meta = with lib; { mainProgram = "supersonic" + lib.optionalString waylandSupport "-wayland"; - description = "A lightweight cross-platform desktop client for Subsonic music servers"; + description = "Lightweight cross-platform desktop client for Subsonic music servers"; homepage = "https://github.com/dweymouth/supersonic"; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl3Plus; diff --git a/pkgs/by-name/su/survex/package.nix b/pkgs/by-name/su/survex/package.nix index 20970de616f5..a7c1186009f9 100644 --- a/pkgs/by-name/su/survex/package.nix +++ b/pkgs/by-name/su/survex/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { doCheck = (!stdenv.hostPlatform.isDarwin); # times out enableParallelChecking = false; - meta = with lib; { + meta = { description = "Free Software/Open Source software package for mapping caves"; longDescription = '' Survex is a Free Software/Open Source software package for mapping caves, @@ -73,8 +73,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://survex.com/"; changelog = "https://github.com/ojwb/survex/raw/v${version}/NEWS"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.matthewcroughan ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.matthewcroughan ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/su/sus-compiler/package.nix b/pkgs/by-name/su/sus-compiler/package.nix index 50289df4befc..649eeb0026ea 100644 --- a/pkgs/by-name/su/sus-compiler/package.nix +++ b/pkgs/by-name/su/sus-compiler/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; meta = { - description = "A new Hardware Design Language that keeps you in the driver's seat"; + description = "New Hardware Design Language that keeps you in the driver's seat"; homepage = "https://github.com/pc2/sus-compiler"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ pbsds ]; diff --git a/pkgs/by-name/su/sushi/package.nix b/pkgs/by-name/su/sushi/package.nix index 2857f25cba5a..dfa11b986c04 100644 --- a/pkgs/by-name/su/sushi/package.nix +++ b/pkgs/by-name/su/sushi/package.nix @@ -77,13 +77,13 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { homepage = "https://gitlab.gnome.org/GNOME/sushi"; changelog = "https://gitlab.gnome.org/GNOME/sushi/-/blob/${version}/NEWS?ref_type=tags"; description = "Quick previewer for Nautilus"; mainProgram = "sushi"; - teams = [ teams.gnome ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; + teams = [ lib.teams.gnome ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix index 62d524001654..0aabde85862b 100644 --- a/pkgs/by-name/sv/svd2rust/package.nix +++ b/pkgs/by-name/sv/svd2rust/package.nix @@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec { rm .cargo/config.toml ''; - meta = with lib; { + meta = { description = "Generate Rust register maps (`struct`s) from SVD files"; mainProgram = "svd2rust"; homepage = "https://github.com/rust-embedded/svd2rust"; changelog = "https://github.com/rust-embedded/svd2rust/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ mit asl20 ]; - maintainers = with maintainers; [ newam ]; + maintainers = with lib.maintainers; [ newam ]; }; } diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix index 313d6bbdd3c2..6d08c2c65c7b 100644 --- a/pkgs/by-name/sv/svdtools/package.nix +++ b/pkgs/by-name/sv/svdtools/package.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-sn+Z3/p4Ek/wxwTj6uwDBFP1hFNGDb2EZ7MO0zvPjPk="; - meta = with lib; { + meta = { description = "Tools to handle vendor-supplied, often buggy SVD files"; mainProgram = "svdtools"; homepage = "https://github.com/stm32-rs/svdtools"; changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-rust.md"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ newam ]; + maintainers = with lib.maintainers; [ newam ]; }; } diff --git a/pkgs/by-name/sv/svgbob/package.nix b/pkgs/by-name/sv/svgbob/package.nix index 816367c1afad..7829dc504a36 100644 --- a/pkgs/by-name/sv/svgbob/package.nix +++ b/pkgs/by-name/sv/svgbob/package.nix @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec { mv $out/bin/svgbob_cli $out/bin/svgbob ''; - meta = with lib; { + meta = { description = "Convert your ascii diagram scribbles into happy little SVG"; homepage = "https://github.com/ivanceras/svgbob"; changelog = "https://github.com/ivanceras/svgbob/raw/${version}/Changelog.md"; - license = licenses.asl20; - maintainers = with maintainers; [ cafkafk ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ cafkafk ]; mainProgram = "svgbob"; }; } diff --git a/pkgs/by-name/sv/svix-cli/package.nix b/pkgs/by-name/sv/svix-cli/package.nix index 82915128fcdc..27072fe6708b 100644 --- a/pkgs/by-name/sv/svix-cli/package.nix +++ b/pkgs/by-name/sv/svix-cli/package.nix @@ -39,7 +39,7 @@ buildGoModule rec { ]; meta = with lib; { - description = "A CLI for interacting with the Svix API"; + description = "CLI for interacting with the Svix API"; homepage = "https://github.com/svix/svix-cli/"; license = licenses.gpl3; maintainers = with maintainers; [ techknowlogick ]; diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix index 1c58049e4b43..b4d79f721100 100644 --- a/pkgs/by-name/sv/svix-server/package.nix +++ b/pkgs/by-name/sv/svix-server/package.nix @@ -40,13 +40,13 @@ rustPlatform.buildRustPackage rec { # disable tests because they require postgres and redis to be running doCheck = false; - meta = with lib; { + meta = { mainProgram = "svix-server"; description = "Enterprise-ready webhooks service"; homepage = "https://github.com/svix/svix-webhooks"; changelog = "https://github.com/svix/svix-webhooks/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ techknowlogick ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ techknowlogick ]; broken = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin; # aws-lc-sys currently broken on darwin x86_64 }; } diff --git a/pkgs/by-name/sv/svlint/package.nix b/pkgs/by-name/sv/svlint/package.nix index 9c680b572fe4..2823a4932e8c 100644 --- a/pkgs/by-name/sv/svlint/package.nix +++ b/pkgs/by-name/sv/svlint/package.nix @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec { "svlint" ]; - meta = with lib; { + meta = { description = "SystemVerilog linter"; mainProgram = "svlint"; homepage = "https://github.com/dalance/svlint"; changelog = "https://github.com/dalance/svlint/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ trepetti ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ trepetti ]; }; } diff --git a/pkgs/by-name/sw/sway-launcher-desktop/package.nix b/pkgs/by-name/sw/sway-launcher-desktop/package.nix index 93cc778fc4e9..66ab3118b5ba 100644 --- a/pkgs/by-name/sw/sway-launcher-desktop/package.nix +++ b/pkgs/by-name/sw/sway-launcher-desktop/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { } ''; - meta = with lib; { + meta = { description = "TUI Application launcher with Desktop Entry support"; mainProgram = "sway-launcher-desktop"; longDescription = '' @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/Biont/sway-launcher-desktop"; changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.pyrox0 ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.pyrox0 ]; }; } diff --git a/pkgs/by-name/sw/swaynotificationcenter/package.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix index 565ff0e2e499..e9eb571eea4f 100644 --- a/pkgs/by-name/sw/swaynotificationcenter/package.nix +++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix @@ -32,14 +32,14 @@ pantheon, }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "SwayNotificationCenter"; version = "0.11.0"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayNotificationCenter"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-kRawYbBLVx0ie4t7tChkA8QJShS83fUcGrJSKkxBy8Q="; }; @@ -92,14 +92,14 @@ stdenv.mkDerivation (finalAttrs: rec { command = "${xvfb-run}/bin/xvfb-run swaync --version"; }; - meta = with lib; { + meta = { description = "Simple notification daemon with a GUI built for Sway"; homepage = "https://github.com/ErikReider/SwayNotificationCenter"; - changelog = "https://github.com/ErikReider/SwayNotificationCenter/releases/tag/v${version}"; - license = licenses.gpl3; - platforms = platforms.linux; + changelog = "https://github.com/ErikReider/SwayNotificationCenter/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; mainProgram = "swaync"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ berbiche pedrohlc ]; diff --git a/pkgs/by-name/sw/swiftbar/package.nix b/pkgs/by-name/sw/swiftbar/package.nix index bb7d7ad8ee61..f73d2b08f5e2 100644 --- a/pkgs/by-name/sw/swiftbar/package.nix +++ b/pkgs/by-name/sw/swiftbar/package.nix @@ -34,14 +34,14 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Powerful macOS menu bar customization tool"; homepage = "https://swiftbar.app"; changelog = "https://github.com/swiftbar/SwiftBar/releases/tag/v${version}"; mainProgram = "SwiftBar"; - license = licenses.mit; - platforms = platforms.darwin; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ matteopacini ]; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ matteopacini ]; }; } diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix index e2968a05f31d..9a891c95aa53 100644 --- a/pkgs/by-name/sw/swiftlint/package.nix +++ b/pkgs/by-name/sw/swiftlint/package.nix @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = nix-update-script { }; meta = { - description = "A tool to enforce Swift style and conventions"; + description = "Tool to enforce Swift style and conventions"; homepage = "https://realm.github.io/SwiftLint/"; license = lib.licenses.mit; mainProgram = "swiftlint"; diff --git a/pkgs/by-name/sw/swiftshader/package.nix b/pkgs/by-name/sw/swiftshader/package.nix index 004e600725f1..238e214c382f 100644 --- a/pkgs/by-name/sw/swiftshader/package.nix +++ b/pkgs/by-name/sw/swiftshader/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A high-performance CPU-based implementation of the Vulkan 1.3 graphics API"; + description = "High-performance CPU-based implementation of the Vulkan 1.3 graphics API"; homepage = "https://opensource.google/projects/swiftshader"; license = licenses.asl20; # Should be possible to support Darwin by changing the install phase with diff --git a/pkgs/by-name/sw/switcheroo-control/package.nix b/pkgs/by-name/sw/switcheroo-control/package.nix index f6cff0ba3169..1a45d35ac3fd 100644 --- a/pkgs/by-name/sw/switcheroo-control/package.nix +++ b/pkgs/by-name/sw/switcheroo-control/package.nix @@ -45,13 +45,13 @@ python3Packages.buildPythonApplication rec { "-Dhwdbdir=${placeholder "out"}/etc/udev/hwdb.d" ]; - meta = with lib; { + meta = { description = "D-Bus service to check the availability of dual-GPU"; mainProgram = "switcherooctl"; homepage = "https://gitlab.freedesktop.org/hadess/switcheroo-control/"; changelog = "https://gitlab.freedesktop.org/hadess/switcheroo-control/-/blob/${version}/NEWS"; - license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index 33715336dd4c..bd0e4e231621 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -73,7 +73,7 @@ buildGoModule rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { description = "CLI tool and library for generating a Software Bill of Materials from container images and filesystems"; homepage = "https://github.com/anchore/syft"; changelog = "https://github.com/anchore/syft/releases/tag/v${version}"; @@ -82,8 +82,8 @@ buildGoModule rec { (SBOM) from container images and filesystems. Exceptional for vulnerability detection when used with a scanner tool like Grype. ''; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ developer-guy jk kashw2 diff --git a/pkgs/by-name/sy/sylpheed/package.nix b/pkgs/by-name/sy/sylpheed/package.nix index 26aeb6f93388..9ead50540ca4 100644 --- a/pkgs/by-name/sy/sylpheed/package.nix +++ b/pkgs/by-name/sy/sylpheed/package.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=ac286a71ed78429e16c612161251b9ea90ccd431"; sha256 = "sha256-oLmUShtvO6io3jibKT67eO0O58vEDZEeaB51QTd3UkU="; }) + (fetchurl { + name = "0013-fix-FTBFS-GCC-14.patch"; + url = "https://salsa.debian.org/sylpheed-team/sylpheed/-/raw/22984c6d2bf76b0667256a9e8b660447497e1220/debian/patches/0013-fix-FTBFS-GCC-14.patch?inline=false"; + sha256 = "sha256-ZfQKiOK8pMrN87hrP0/2LxYZZdnaciBoa0khG1Djelo="; + }) ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sy/symfpu/package.nix b/pkgs/by-name/sy/symfpu/package.nix index f4ba9d4f4558..8ea91cb53669 100644 --- a/pkgs/by-name/sy/symfpu/package.nix +++ b/pkgs/by-name/sy/symfpu/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A (concrete or symbolic) implementation of IEEE-754 / SMT-LIB floating-point"; + description = "(concrete or symbolic) implementation of IEEE-754 / SMT-LIB floating-point"; homepage = "https://github.com/martin-cs/symfpu"; license = licenses.gpl3Only; platforms = platforms.unix; diff --git a/pkgs/by-name/sy/synfigstudio/package.nix b/pkgs/by-name/sy/synfigstudio/package.nix index c8dfde12d0c5..1305449b2c69 100644 --- a/pkgs/by-name/sy/synfigstudio/package.nix +++ b/pkgs/by-name/sy/synfigstudio/package.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation { meta = with lib; { description = "2D animation program"; - homepage = "http://www.synfig.org"; + homepage = "https://www.synfig.org"; license = licenses.gpl3Plus; maintainers = [ ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/by-name/sy/synthesia/package.nix b/pkgs/by-name/sy/synthesia/package.nix index 5667962fb0dd..a4a8b5a573d9 100644 --- a/pkgs/by-name/sy/synthesia/package.nix +++ b/pkgs/by-name/sy/synthesia/package.nix @@ -69,7 +69,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = with lib; { - description = "A fun way to learn how to play the piano"; + description = "Fun way to learn how to play the piano"; homepage = "https://synthesiagame.com/"; downloadPage = "https://synthesiagame.com/download"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/sy/sysz/package.nix b/pkgs/by-name/sy/sysz/package.nix index 29efc02e4894..089010d00054 100644 --- a/pkgs/by-name/sy/sysz/package.nix +++ b/pkgs/by-name/sy/sysz/package.nix @@ -34,12 +34,12 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/joehillen/sysz"; description = "Fzf terminal UI for systemctl"; - license = licenses.unlicense; - maintainers = with maintainers; [ hleboulanger ]; - platforms = platforms.unix; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ hleboulanger ]; + platforms = lib.platforms.unix; changelog = "https://github.com/joehillen/sysz/blob/${version}/CHANGELOG.md"; mainProgram = "sysz"; }; diff --git a/pkgs/by-name/t-/t-rex/package.nix b/pkgs/by-name/t-/t-rex/package.nix index 997d56ada495..27feefe81bc3 100644 --- a/pkgs/by-name/t-/t-rex/package.nix +++ b/pkgs/by-name/t-/t-rex/package.nix @@ -31,14 +31,14 @@ rustPlatform.buildRustPackage rec { openssl ]; - meta = with lib; { + meta = { description = "Vector tile server specialized on publishing MVT tiles"; homepage = "https://t-rex.tileserver.ch/"; changelog = "https://github.com/t-rex-tileserver/t-rex/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - teams = [ teams.geospatial ]; + license = lib.licenses.mit; + teams = [ lib.teams.geospatial ]; mainProgram = "t_rex"; - platforms = platforms.unix; + platforms = lib.platforms.unix; broken = true; # see https://github.com/t-rex-tileserver/t-rex/issues/320 }; } diff --git a/pkgs/by-name/ta/tali/package.nix b/pkgs/by-name/ta/tali/package.nix index 475b45b7c95f..04c18c0fd4e4 100644 --- a/pkgs/by-name/ta/tali/package.nix +++ b/pkgs/by-name/ta/tali/package.nix @@ -57,13 +57,13 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "tali"; }; }; - meta = with lib; { + meta = { homepage = "https://gitlab.gnome.org/GNOME/tali"; changelog = "https://gitlab.gnome.org/GNOME/tali/-/blob/${version}/NEWS?ref_type=tags"; description = "Sort of poker with dice and less money"; mainProgram = "tali"; - teams = [ teams.gnome ]; - license = licenses.gpl2Plus; - platforms = platforms.unix; + teams = [ lib.teams.gnome ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix index 887fd5c92410..2d9f980fdda9 100644 --- a/pkgs/by-name/ta/tandoor-recipes/common.nix +++ b/pkgs/by-name/ta/tandoor-recipes/common.nix @@ -11,10 +11,10 @@ rec { yarnHash = "sha256-IVCT1KUhShCXY5ocmOul7DMzTe6ULm32azFE8HES1vc="; - meta = with lib; { + meta = { homepage = "https://tandoor.dev/"; changelog = "https://github.com/TandoorRecipes/recipes/releases/tag/${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ jvanbruegge ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ jvanbruegge ]; }; } diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix index 656a9b158a7c..b4c8ac5cbac5 100644 --- a/pkgs/by-name/ta/tauon/package.nix +++ b/pkgs/by-name/ta/tauon/package.nix @@ -156,13 +156,13 @@ python3Packages.buildPythonApplication rec { install -Dm644 extra/tauonmb{,-symbolic}.svg $out/share/icons/hicolor/scalable/apps ''; - meta = with lib; { + meta = { description = "Linux desktop music player from the future"; mainProgram = "tauon"; homepage = "https://tauonmusicbox.rocks/"; changelog = "https://github.com/Taiko2k/Tauon/releases/tag/v${version}"; - license = licenses.gpl3; - maintainers = with maintainers; [ jansol ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ jansol ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/tc/tcld/package.nix b/pkgs/by-name/tc/tcld/package.nix index eb2f64dc5c39..f34713ab6343 100644 --- a/pkgs/by-name/tc/tcld/package.nix +++ b/pkgs/by-name/tc/tcld/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "The temporal cloud cli."; + description = "Temporal cloud cli"; homepage = "https://www.github.com/temporalio/tcld"; license = lib.licenses.mit; teams = [ lib.teams.mercury ]; diff --git a/pkgs/by-name/te/techmino/package.nix b/pkgs/by-name/te/techmino/package.nix index 9da82feeab1c..af876861ea53 100644 --- a/pkgs/by-name/te/techmino/package.nix +++ b/pkgs/by-name/te/techmino/package.nix @@ -15,7 +15,7 @@ let pname = "techmino"; - description = "A modern Tetris clone with many features"; + description = "Modern Tetris clone with many features"; desktopItem = makeDesktopItem { name = pname; diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix index 78edd65d5096..b8da10b305da 100644 --- a/pkgs/by-name/te/ted/package.nix +++ b/pkgs/by-name/te/ted/package.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An easy rich text processor"; + description = "Easy rich text processor"; longDescription = '' Ted is a text processor running under X Windows on Unix/Linux systems. Ted was developed as a standard easy light weight word processor, having diff --git a/pkgs/by-name/te/teip/package.nix b/pkgs/by-name/te/teip/package.nix index fb976e3e531f..8adf5e5b8c3f 100644 --- a/pkgs/by-name/te/teip/package.nix +++ b/pkgs/by-name/te/teip/package.nix @@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec { --zsh completion/zsh/_teip ''; - meta = with lib; { + meta = { description = "Tool to bypass a partial range of standard input to any command"; mainProgram = "teip"; homepage = "https://github.com/greymd/teip"; changelog = "https://github.com/greymd/teip/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/te/tektoncd-cli/package.nix b/pkgs/by-name/te/tektoncd-cli/package.nix index abecece8ea43..4bfdc93f4f4a 100644 --- a/pkgs/by-name/te/tektoncd-cli/package.nix +++ b/pkgs/by-name/te/tektoncd-cli/package.nix @@ -59,7 +59,7 @@ buildGoModule rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { homepage = "https://tekton.dev"; changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}"; description = "Provides a CLI for interacting with Tekton - tkn"; @@ -69,8 +69,8 @@ buildGoModule rec { Tekton CLI, tkn, together with the core component of Tekton, Tekton Pipelines. ''; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jk mstrangfeld vdemeester diff --git a/pkgs/by-name/te/teler/package.nix b/pkgs/by-name/te/teler/package.nix index 8b2604818705..7bbddc6c7dc5 100644 --- a/pkgs/by-name/te/teler/package.nix +++ b/pkgs/by-name/te/teler/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { # test require internet access doCheck = false; - meta = with lib; { + meta = { description = "Real-time HTTP Intrusion Detection"; longDescription = '' teler is an real-time intrusion detection and threat alert @@ -35,8 +35,8 @@ buildGoModule rec { ''; homepage = "https://github.com/kitabisa/teler"; changelog = "https://github.com/kitabisa/teler/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "teler.app"; }; } diff --git a/pkgs/by-name/te/temporal/package.nix b/pkgs/by-name/te/temporal/package.nix index cf788adb5a66..a8ba6215c880 100644 --- a/pkgs/by-name/te/temporal/package.nix +++ b/pkgs/by-name/te/temporal/package.nix @@ -50,12 +50,12 @@ buildGoModule rec { package = temporal; }; - meta = with lib; { + meta = { description = "Microservice orchestration platform which enables developers to build scalable applications without sacrificing productivity or reliability"; homepage = "https://temporal.io"; changelog = "https://github.com/temporalio/temporal/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ jpds ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jpds ]; mainProgram = "temporal-server"; }; } diff --git a/pkgs/by-name/te/termimage/package.nix b/pkgs/by-name/te/termimage/package.nix index 5d172a96483a..117cdb6916a7 100644 --- a/pkgs/by-name/te/termimage/package.nix +++ b/pkgs/by-name/te/termimage/package.nix @@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec { installManPage termimage.1 ''; - meta = with lib; { + meta = { description = "Display images in your terminal"; homepage = "https://github.com/nabijaczleweli/termimage"; changelog = "https://github.com/nabijaczleweli/termimage/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "termimage"; }; } diff --git a/pkgs/by-name/te/terracognita/package.nix b/pkgs/by-name/te/terracognita/package.nix index 42df437f594d..483d5e1d4387 100644 --- a/pkgs/by-name/te/terracognita/package.nix +++ b/pkgs/by-name/te/terracognita/package.nix @@ -27,12 +27,12 @@ buildGoModule rec { "-X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; - meta = with lib; { + meta = { description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration"; mainProgram = "terracognita"; homepage = "https://github.com/cycloidio/terracognita"; changelog = "https://github.com/cycloidio/terracognita/raw/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/te/terraform-ls/package.nix b/pkgs/by-name/te/terraform-ls/package.nix index cd50d350b84d..5a31714dda31 100644 --- a/pkgs/by-name/te/terraform-ls/package.nix +++ b/pkgs/by-name/te/terraform-ls/package.nix @@ -33,13 +33,13 @@ buildGoModule rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { description = "Terraform Language Server (official)"; mainProgram = "terraform-ls"; homepage = "https://github.com/hashicorp/terraform-ls"; changelog = "https://github.com/hashicorp/terraform-ls/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ mbaillie jk ]; diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix index 68ff44313b95..7cc2e27b7548 100644 --- a/pkgs/by-name/te/terraform-plugin-docs/package.nix +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -51,12 +51,12 @@ buildGoModule rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Generate and validate Terraform plugin/provider documentation"; homepage = "https://github.com/hashicorp/terraform-plugin-docs"; changelog = "https://github.com/hashicorp/terraform-plugin-docs/releases/tag/v${version}"; - license = licenses.mpl20; + license = lib.licenses.mpl20; mainProgram = "tfplugindocs"; - maintainers = with maintainers; [ lewo ]; + maintainers = with lib.maintainers; [ lewo ]; }; } diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index 0831edfc2990..7d610bfb4ede 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -4,29 +4,31 @@ fetchFromGitHub, versionCheckHook, go-mockery, + mockgen, }: buildGoModule (finalAttrs: { pname = "terragrunt"; - version = "0.78.4"; + version = "0.80.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "terragrunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-Xlqq1d6itQx0Y6MQJTY3tsZ8Q2S8EqRbqD1GGdIu9oA="; + hash = "sha256-FgytHWKtXK0tNDFOVOEciEzyVEXLbk9T2Nk8Se35HnY="; }; nativeBuildInputs = [ versionCheckHook go-mockery + mockgen ]; preBuild = '' make generate-mocks ''; - vendorHash = "sha256-sVA2bzQoeDdYRDaAC6DZtF4izuXhlHTUMKNkOIveG7c="; + vendorHash = "sha256-Zgoon6eMUXn2zaxHfJovtWV9Q11rDdkBrYzNqa73DsM="; doCheck = false; diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix index 0f6330a48a4f..c3635e8060bc 100644 --- a/pkgs/by-name/te/terramate/package.nix +++ b/pkgs/by-name/te/terramate/package.nix @@ -35,12 +35,12 @@ buildGoModule rec { "./e2etests/core" ]; - meta = with lib; { + meta = { description = "Adds code generation, stacks, orchestration, change detection, data sharing and more to Terraform"; homepage = "https://github.com/terramate-io/terramate"; changelog = "https://github.com/terramate-io/terramate/releases/tag/v${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ dit7ya asininemonkey ]; diff --git a/pkgs/by-name/te/terrascan/package.nix b/pkgs/by-name/te/terrascan/package.nix index 042843b183e0..f5af04540078 100644 --- a/pkgs/by-name/te/terrascan/package.nix +++ b/pkgs/by-name/te/terrascan/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { # Tests want to download a vulnerable Terraform project doCheck = false; - meta = with lib; { + meta = { description = "Detect compliance and security violations across Infrastructure"; mainProgram = "terrascan"; longDescription = '' @@ -35,7 +35,7 @@ buildGoModule rec { ''; homepage = "https://github.com/accurics/terrascan"; changelog = "https://github.com/tenable/terrascan/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/te/tet/package.nix b/pkgs/by-name/te/tet/package.nix index 017e57547d72..f7bf33c98e13 100644 --- a/pkgs/by-name/te/tet/package.nix +++ b/pkgs/by-name/te/tet/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation ({ meta = { description = "Test Environment Toolkit is used in test applications like The Open Group's UNIX Certification program and the Free Standards Group's LSB Certification program"; - homepage = "http://tetworks.opengroup.org/Products/tet.htm"; + homepage = "https://tetworks.opengroup.org/Products/tet.htm"; license = lib.licenses.artistic1; platforms = lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix index e92ba4b63958..0be38b5c188b 100644 --- a/pkgs/by-name/te/tev/package.nix +++ b/pkgs/by-name/te/tev/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { env.CXXFLAGS = "-include cstdint"; - meta = with lib; { + meta = { description = "High dynamic range (HDR) image comparison tool"; mainProgram = "tev"; longDescription = '' @@ -74,9 +74,9 @@ stdenv.mkDerivation rec { ''; inherit (src.meta) homepage; changelog = "https://github.com/Tom94/tev/releases/tag/v${version}"; - license = licenses.bsd3; - platforms = platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; # needs apple frameworks + SDK fix? see #205247 - maintainers = [ ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/te/texlab/package.nix b/pkgs/by-name/te/texlab/package.nix index 8925f8367fc6..6f355bf2e975 100644 --- a/pkgs/by-name/te/texlab/package.nix +++ b/pkgs/by-name/te/texlab/package.nix @@ -45,16 +45,16 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Implementation of the Language Server Protocol for LaTeX"; homepage = "https://github.com/latex-lsp/texlab"; changelog = "https://github.com/latex-lsp/texlab/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar kira-bruneau ]; - platforms = platforms.all; + platforms = lib.platforms.all; mainProgram = "texlab"; }; } diff --git a/pkgs/by-name/tf/tfmigrate/package.nix b/pkgs/by-name/tf/tfmigrate/package.nix index a03840702747..0b8ba744f031 100644 --- a/pkgs/by-name/tf/tfmigrate/package.nix +++ b/pkgs/by-name/tf/tfmigrate/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "A Terraform / OpenTofu state migration tool for GitOps "; + description = "Terraform / OpenTofu state migration tool for GitOps "; homepage = "https://github.com/minamijoyo/tfmigrate"; changelog = "https://github.com/minamijoyo/tfmigrate/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/tf/tfsec/package.nix b/pkgs/by-name/tf/tfsec/package.nix index a57e58563f83..d4bd6c1441de 100644 --- a/pkgs/by-name/tf/tfsec/package.nix +++ b/pkgs/by-name/tf/tfsec/package.nix @@ -31,12 +31,12 @@ buildGoModule rec { "cmd/tfsec-checkgen" ]; - meta = with lib; { + meta = { description = "Static analysis powered security scanner for terraform code"; homepage = "https://github.com/aquasecurity/tfsec"; changelog = "https://github.com/aquasecurity/tfsec/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab peterromfeldhk ]; diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix index 2b72188f298b..29272bcd14ac 100644 --- a/pkgs/by-name/tf/tfswitch/package.nix +++ b/pkgs/by-name/tf/tfswitch/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "A command line tool to switch between different versions of terraform"; + description = "Command line tool to switch between different versions of terraform"; mainProgram = "tfswitch"; homepage = "https://github.com/warrensbox/terraform-switcher"; license = licenses.mit; diff --git a/pkgs/by-name/tf/tftui/package.nix b/pkgs/by-name/tf/tftui/package.nix index be3d08a35b3e..9090c0961b45 100644 --- a/pkgs/by-name/tf/tftui/package.nix +++ b/pkgs/by-name/tf/tftui/package.nix @@ -46,12 +46,12 @@ python3Packages.buildPythonApplication rec { --add-flags "--disable-usage-tracking" ''; - meta = with lib; { + meta = { description = "Textual UI to view and interact with Terraform state"; homepage = "https://github.com/idoavrah/terraform-tui"; changelog = "https://github.com/idoavrah/terraform-tui/releases/tag/v${version}"; - license = licenses.asl20; - teams = [ teams.bitnomial ]; + license = lib.licenses.asl20; + teams = [ lib.teams.bitnomial ]; mainProgram = "tftui"; }; } diff --git a/pkgs/by-name/tg/tg-archive/package.nix b/pkgs/by-name/tg/tg-archive/package.nix index dfe236ce2ce2..d3971c3ca4ef 100644 --- a/pkgs/by-name/tg/tg-archive/package.nix +++ b/pkgs/by-name/tg/tg-archive/package.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication { ]; meta = { - description = "A tool for exporting Telegram group chats into static websites like mailing list archives"; + description = "Tool for exporting Telegram group chats into static websites like mailing list archives"; homepage = "https://github.com/knadh/tg-archive"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ euxane ]; diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix index c988e11e50b5..c3122f919545 100644 --- a/pkgs/by-name/th/thanos/package.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -50,13 +50,13 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "Highly available Prometheus setup with long term storage capabilities"; homepage = "https://github.com/thanos-io/thanos"; changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "thanos"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ basvandijk anthonyroussel ]; diff --git a/pkgs/by-name/th/thc-hydra/package.nix b/pkgs/by-name/th/thc-hydra/package.nix index 5d974aa26ddf..b0ce1072c6af 100644 --- a/pkgs/by-name/th/thc-hydra/package.nix +++ b/pkgs/by-name/th/thc-hydra/package.nix @@ -69,12 +69,12 @@ stdenv.mkDerivation rec { --add-flags --hydra-path --add-flags "$out/bin/hydra" ''; - meta = with lib; { + meta = { description = "Very fast network logon cracker which support many different services"; homepage = "https://github.com/vanhauser-thc/thc-hydra"; # https://www.thc.org/ changelog = "https://github.com/vanhauser-thc/thc-hydra/raw/v${version}/CHANGES"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ offline ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix index 5fde06c463a9..b85cf0efb7d2 100644 --- a/pkgs/by-name/th/the-way/package.nix +++ b/pkgs/by-name/th/the-way/package.nix @@ -33,14 +33,14 @@ rustPlatform.buildRustPackage rec { done ''; - meta = with lib; { + meta = { description = "Terminal code snippets manager"; mainProgram = "the-way"; homepage = "https://github.com/out-of-cheese-error/the-way"; changelog = "https://github.com/out-of-cheese-error/the-way/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = with lib.licenses; [ mit ]; platforms = lib.platforms.unix; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ figsoda numkem ]; diff --git a/pkgs/by-name/th/theharvester/package.nix b/pkgs/by-name/th/theharvester/package.nix index 3bd47f4d947e..6004621667bd 100644 --- a/pkgs/by-name/th/theharvester/package.nix +++ b/pkgs/by-name/th/theharvester/package.nix @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { runHook postCheck ''; - meta = with lib; { + meta = { description = "Gather E-mails, subdomains and names from different public sources"; longDescription = '' theHarvester is a very simple, yet effective tool designed to be used in the early @@ -72,8 +72,8 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://github.com/laramies/theHarvester"; changelog = "https://github.com/laramies/theHarvester/releases/tag/${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ c0bw3b fab treemo diff --git a/pkgs/by-name/th/thelounge/package.nix b/pkgs/by-name/th/thelounge/package.nix index 2c0114da11c1..3e54f1d3c27e 100644 --- a/pkgs/by-name/th/thelounge/package.nix +++ b/pkgs/by-name/th/thelounge/package.nix @@ -6,7 +6,7 @@ nodejs, yarn, fixup-yarn-lock, - python311, + python3, npmHooks, cctools, sqlite, @@ -39,13 +39,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-csVrgsEy9HjSBXxtgNG0hcBrR9COlcadhMQrw6BWPc4="; }; - # Distutils was deprecated in 3.10, and removed in 3.12. This build needs it. An alternative could be adding - # setuptools, but testing with that and 3.12 still fails. nativeBuildInputs = [ nodejs yarn fixup-yarn-lock - python311 + python3 + python3.pkgs.distutils npmHooks.npmInstallHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ sqlite ]; diff --git a/pkgs/by-name/th/threatest/package.nix b/pkgs/by-name/th/threatest/package.nix index f64a14c5515c..badb6e0e2171 100644 --- a/pkgs/by-name/th/threatest/package.nix +++ b/pkgs/by-name/th/threatest/package.nix @@ -30,12 +30,12 @@ buildGoModule rec { --zsh <($out/bin/threatest completion zsh) ''; - meta = with lib; { + meta = { description = "Framework for end-to-end testing threat detection rules"; mainProgram = "threatest"; homepage = "https://github.com/DataDog/threatest"; changelog = "https://github.com/DataDog/threatest/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix index 713f1ddaa7e4..c214e5f9fb75 100644 --- a/pkgs/by-name/ti/tic-80/package.nix +++ b/pkgs/by-name/ti/tic-80/package.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A free and open source fantasy computer for making, playing and sharing tiny games"; + description = "Free and open source fantasy computer for making, playing and sharing tiny games"; longDescription = '' TIC-80 is a free and open source fantasy computer for making, playing and sharing tiny games. diff --git a/pkgs/by-name/ti/ticker/package.nix b/pkgs/by-name/ti/ticker/package.nix index ee4f302bb61c..6a1b80367232 100644 --- a/pkgs/by-name/ti/ticker/package.nix +++ b/pkgs/by-name/ti/ticker/package.nix @@ -34,12 +34,12 @@ buildGoModule rec { inherit version; }; - meta = with lib; { + meta = { description = "Terminal stock ticker with live updates and position tracking"; homepage = "https://github.com/achannarasappa/ticker"; changelog = "https://github.com/achannarasappa/ticker/releases/tag/v${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ siraben sarcasticadmin ]; diff --git a/pkgs/by-name/ti/tickrs/package.nix b/pkgs/by-name/ti/tickrs/package.nix index d9b682eb2160..e27767f23c9b 100644 --- a/pkgs/by-name/ti/tickrs/package.nix +++ b/pkgs/by-name/ti/tickrs/package.nix @@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; }; - meta = with lib; { + meta = { description = "Realtime ticker data in your terminal"; homepage = "https://github.com/tarkah/tickrs"; changelog = "https://github.com/tarkah/tickrs/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; mainProgram = "tickrs"; }; } diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix index 09a9dcd7dbfc..22e5d10c75ca 100644 --- a/pkgs/by-name/ti/tidy-viewer/package.nix +++ b/pkgs/by-name/ti/tidy-viewer/package.nix @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec { "--skip=build_reader_can_create_reader_without_file_specified" ]; - meta = with lib; { + meta = { description = "Cross-platform CLI csv pretty printer that uses column styling to maximize viewer enjoyment"; mainProgram = "tidy-viewer"; homepage = "https://github.com/alexhallam/tv"; changelog = "https://github.com/alexhallam/tv/blob/${version}/CHANGELOG.md"; - license = licenses.unlicense; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/ti/time-decode/package.nix b/pkgs/by-name/ti/time-decode/package.nix index f7582b35cf51..c919943b7f4f 100644 --- a/pkgs/by-name/ti/time-decode/package.nix +++ b/pkgs/by-name/ti/time-decode/package.nix @@ -32,12 +32,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "time_decode" ]; - meta = with lib; { + meta = { description = "Timestamp and date decoder"; homepage = "https://github.com/digitalsleuth/time_decode"; changelog = "https://github.com/digitalsleuth/time_decode/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "time-decode"; }; } diff --git a/pkgs/by-name/ti/tiny/package.nix b/pkgs/by-name/ti/tiny/package.nix index 3003e119d279..8122623c3856 100644 --- a/pkgs/by-name/ti/tiny/package.nix +++ b/pkgs/by-name/ti/tiny/package.nix @@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional notificationSupport "desktop-notifications"; - meta = with lib; { + meta = { description = "Console IRC client"; homepage = "https://github.com/osa1/tiny"; changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne vyp ]; diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix index fd8c7f19b16f..e9b0ee2a1b89 100644 --- a/pkgs/by-name/tl/tlrc/package.nix +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -26,12 +26,12 @@ rustPlatform.buildRustPackage rec { installShellCompletion completions/{tldr.bash,_tldr,tldr.fish} ''; - meta = with lib; { + meta = { description = "Official tldr client written in Rust"; homepage = "https://github.com/tldr-pages/tlrc"; changelog = "https://github.com/tldr-pages/tlrc/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "tldr"; - maintainers = with maintainers; [ acuteenvy ]; + maintainers = with lib.maintainers; [ acuteenvy ]; }; } diff --git a/pkgs/by-name/tl/tlsx/package.nix b/pkgs/by-name/tl/tlsx/package.nix index 42062b8cd3b8..94cf073b1dd3 100644 --- a/pkgs/by-name/tl/tlsx/package.nix +++ b/pkgs/by-name/tl/tlsx/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { # Tests require network access doCheck = false; - meta = with lib; { + meta = { description = "TLS grabber focused on TLS based data collection"; longDescription = '' A fast and configurable TLS grabber focused on TLS based data @@ -33,7 +33,7 @@ buildGoModule rec { ''; homepage = "https://github.com/projectdiscovery/tlsx"; changelog = "https://github.com/projectdiscovery/tlsx/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/tm/tml/package.nix b/pkgs/by-name/tm/tml/package.nix index af5d73a40524..598f0c462528 100644 --- a/pkgs/by-name/tm/tml/package.nix +++ b/pkgs/by-name/tm/tml/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Tiny markup language for terminal output"; mainProgram = "tml"; homepage = "https://github.com/liamg/tml"; changelog = "https://github.com/liamg/tml/releases/tag/v${version}"; - license = licenses.unlicense; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/to/tockloader/package.nix b/pkgs/by-name/to/tockloader/package.nix index 6fcdded82dc5..b25c57d164a9 100644 --- a/pkgs/by-name/to/tockloader/package.nix +++ b/pkgs/by-name/to/tockloader/package.nix @@ -31,12 +31,12 @@ python3.pkgs.buildPythonApplication rec { runHook postCheck ''; - meta = with lib; { + meta = { description = "Tool for programming Tock onto hardware boards"; mainProgram = "tockloader"; homepage = "https://github.com/tock/tockloader"; changelog = "https://github.com/tock/tockloader/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/to/tome2/package.nix b/pkgs/by-name/to/tome2/package.nix index 59f032905827..d43ec5ca4dcd 100644 --- a/pkgs/by-name/to/tome2/package.nix +++ b/pkgs/by-name/to/tome2/package.nix @@ -11,7 +11,7 @@ let pname = "tome2"; - description = "A dungeon crawler similar to Angband, based on the works of Tolkien"; + description = "Dungeon crawler similar to Angband, based on the works of Tolkien"; desktopItem = makeDesktopItem { desktopName = pname; diff --git a/pkgs/by-name/to/toolbox/package.nix b/pkgs/by-name/to/toolbox/package.nix index dcec72c5eb9e..36a28569ed89 100644 --- a/pkgs/by-name/to/toolbox/package.nix +++ b/pkgs/by-name/to/toolbox/package.nix @@ -51,12 +51,12 @@ buildGoModule rec { install profile.d/toolbox.sh -Dt $out/share/profile.d ''; - meta = with lib; { + meta = { homepage = "https://containertoolbx.org"; changelog = "https://github.com/containers/toolbox/releases/tag/${version}"; description = "Tool for containerized command line environments on Linux"; - license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ urandom ]; mainProgram = "toolbox"; }; } diff --git a/pkgs/by-name/to/toolong/package.nix b/pkgs/by-name/to/toolong/package.nix index 43001174c7e8..43124204e9bf 100644 --- a/pkgs/by-name/to/toolong/package.nix +++ b/pkgs/by-name/to/toolong/package.nix @@ -1,12 +1,12 @@ { lib, - python311Packages, + python3Packages, fetchFromGitHub, testers, toolong, }: -python311Packages.buildPythonApplication { +python3Packages.buildPythonApplication { pname = "toolong"; version = "1.4.0"; pyproject = true; @@ -18,8 +18,8 @@ python311Packages.buildPythonApplication { hash = "sha256-HrmU7HxWKYrbV25Y5CHLw7/7tX8Y5mTsTL1aXGGTSIo="; }; - build-system = [ python311Packages.poetry-core ]; - dependencies = with python311Packages; [ + build-system = [ python3Packages.poetry-core ]; + dependencies = with python3Packages; [ click textual typing-extensions diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix index 099046b2001f..803950787fb6 100644 --- a/pkgs/by-name/to/topgrade/package.nix +++ b/pkgs/by-name/to/topgrade/package.nix @@ -41,12 +41,12 @@ rustPlatform.buildRustPackage rec { installManPage topgrade.8 ''; - meta = with lib; { + meta = { description = "Upgrade all the things"; homepage = "https://github.com/topgrade-rs/topgrade"; changelog = "https://github.com/topgrade-rs/topgrade/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ SuperSandro2000 xyenon ]; diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 2afc14771898..8982061c2f66 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -353,13 +353,13 @@ lib.warnIf (useHardenedMalloc != null) }; }; - meta = with lib; { + meta = { description = "Privacy-focused browser routing traffic through the Tor network"; mainProgram = "tor-browser"; homepage = "https://www.torproject.org/"; changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; - platforms = attrNames sources; - maintainers = with maintainers; [ + platforms = lib.attrNames sources; + maintainers = with lib.maintainers; [ felschr panicgh joachifm @@ -368,13 +368,13 @@ lib.warnIf (useHardenedMalloc != null) # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain # restrictions on redistribution), it's free enough for our purposes. - license = with licenses; [ + license = with lib.licenses; [ mpl20 lgpl21Plus lgpl3Plus free ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } ) diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix index 5ad36ced402f..4682336189a4 100644 --- a/pkgs/by-name/to/totem/package.nix +++ b/pkgs/by-name/to/totem/package.nix @@ -108,13 +108,13 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { homepage = "https://apps.gnome.org/Totem/"; changelog = "https://gitlab.gnome.org/GNOME/totem/-/blob/${version}/NEWS?ref_type=tags"; description = "Movie player for the GNOME desktop based on GStreamer"; - teams = [ teams.gnome ]; - license = licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins - platforms = platforms.linux; + teams = [ lib.teams.gnome ]; + license = lib.licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins + platforms = lib.platforms.linux; # gst-inspect-1.0 is not smart enough for cross compiling broken = stdenv.buildPlatform != stdenv.hostPlatform; }; diff --git a/pkgs/by-name/tr/traceroute/package.nix b/pkgs/by-name/tr/traceroute/package.nix index 6c72db10561f..6ba67fefa912 100644 --- a/pkgs/by-name/tr/traceroute/package.nix +++ b/pkgs/by-name/tr/traceroute/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules ''; - meta = with lib; { + meta = { description = "Tracks the route taken by packets over an IP network"; homepage = "https://traceroute.sourceforge.net/"; changelog = "https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-${version}/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ koral ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ koral ]; + platforms = lib.platforms.linux; mainProgram = "traceroute"; }; } diff --git a/pkgs/by-name/tr/trafficserver/package.nix b/pkgs/by-name/tr/trafficserver/package.nix index d484013d18e7..b4b10ef80581 100644 --- a/pkgs/by-name/tr/trafficserver/package.nix +++ b/pkgs/by-name/tr/trafficserver/package.nix @@ -184,7 +184,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) trafficserver; }; - meta = with lib; { + meta = { homepage = "https://trafficserver.apache.org"; changelog = "https://raw.githubusercontent.com/apache/trafficserver/${version}/CHANGELOG-${version}"; description = "Fast, scalable, and extensible HTTP caching proxy server"; @@ -197,8 +197,8 @@ stdenv.mkDerivation rec { enterprises, Internet service providers (ISPs), backbone providers, and large intranets by maximizing existing and available bandwidth. ''; - license = licenses.asl20; - maintainers = with maintainers; [ midchildan ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ midchildan ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/tr/transgui/package.nix b/pkgs/by-name/tr/transgui/package.nix index fb78b119b537..d2dfc2078473 100644 --- a/pkgs/by-name/tr/transgui/package.nix +++ b/pkgs/by-name/tr/transgui/package.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "A cross platform front-end for the Transmission BitTorrent client"; + description = "Cross platform front-end for the Transmission BitTorrent client"; homepage = "https://sourceforge.net/p/transgui"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ramkromberg ]; diff --git a/pkgs/by-name/tr/transmission-remote-gtk/package.nix b/pkgs/by-name/tr/transmission-remote-gtk/package.nix index 2a806346c698..ff1e00036749 100644 --- a/pkgs/by-name/tr/transmission-remote-gtk/package.nix +++ b/pkgs/by-name/tr/transmission-remote-gtk/package.nix @@ -58,13 +58,13 @@ stdenv.mkDerivation rec { doCheck = false; # Requires network access - meta = with lib; { + meta = { description = "GTK remote control for the Transmission BitTorrent client"; mainProgram = "transmission-remote-gtk"; homepage = "https://github.com/transmission-remote-gtk/transmission-remote-gtk"; changelog = "https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/tag/${version}"; - license = licenses.gpl2; - maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ehmry ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/tr/trashy/package.nix b/pkgs/by-name/tr/trashy/package.nix index 3ed051316e80..a0b2a2ba96f0 100644 --- a/pkgs/by-name/tr/trashy/package.nix +++ b/pkgs/by-name/tr/trashy/package.nix @@ -27,17 +27,17 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/trash completions zsh) \ ''; - meta = with lib; { + meta = { description = "Simple, fast, and featureful alternative to rm and trash-cli"; homepage = "https://github.com/oberblastmeister/trashy"; changelog = "https://github.com/oberblastmeister/trashy/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ oberblastmeister ]; + maintainers = with lib.maintainers; [ oberblastmeister ]; mainProgram = "trash"; # darwin is unsupported due to https://github.com/Byron/trash-rs/issues/8 - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix index ae557127722e..d38dbf568b59 100644 --- a/pkgs/by-name/tr/treedome/package.nix +++ b/pkgs/by-name/tr/treedome/package.nix @@ -72,13 +72,13 @@ rustPlatform.buildRustPackage rec { --set WEBKIT_DISABLE_COMPOSITING_MODE 1 ''; - meta = with lib; { + meta = { description = "Local-first, encrypted, note taking application organized in tree-like structures"; homepage = " https://codeberg.org/solver-orgz/treedome"; - license = licenses.agpl3Plus; + license = lib.licenses.agpl3Plus; platforms = [ "x86_64-linux" ]; mainProgram = "treedome"; - maintainers = with maintainers; [ tengkuizdihar ]; + maintainers = with lib.maintainers; [ tengkuizdihar ]; changelog = "https://codeberg.org/solver-orgz/treedome/releases/tag/${version}"; }; } diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix index b3df7dd19a1a..7d1bfc916c82 100644 --- a/pkgs/by-name/tr/trezor-suite/package.nix +++ b/pkgs/by-name/tr/trezor-suite/package.nix @@ -64,12 +64,12 @@ appimageTools.wrapType2 rec { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { description = "Trezor Suite - Desktop App for managing crypto"; homepage = "https://suite.trezor.io"; changelog = "https://github.com/trezor/trezor-suite/releases/tag/v${version}"; - license = licenses.unfree; - maintainers = with maintainers; [ prusnak ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ prusnak ]; platforms = [ "aarch64-linux" "x86_64-linux" diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix index 1692571a4208..2189f9175021 100644 --- a/pkgs/by-name/tr/trickest-cli/package.nix +++ b/pkgs/by-name/tr/trickest-cli/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "CLI tool to execute Trickest workflows"; homepage = "https://github.com/trickest/trickest-cli"; changelog = "https://github.com/trickest/trickest-cli/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "trickest"; }; } diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix index 56b5c2468148..b1263a4c2bda 100644 --- a/pkgs/by-name/tr/trivy/package.nix +++ b/pkgs/by-name/tr/trivy/package.nix @@ -61,7 +61,7 @@ buildGo124Module rec { version = "Version: ${version}"; }; - meta = with lib; { + meta = { description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI"; homepage = "https://github.com/aquasecurity/trivy"; changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}"; @@ -73,8 +73,8 @@ buildGo124Module rec { application dependencies (Bundler, Composer, npm, yarn, etc.). ''; mainProgram = "trivy"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab jk ]; diff --git a/pkgs/by-name/tr/trrntzip/package.nix b/pkgs/by-name/tr/trrntzip/package.nix index d0f5d813deea..6a2cf689e89d 100644 --- a/pkgs/by-name/tr/trrntzip/package.nix +++ b/pkgs/by-name/tr/trrntzip/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ zlib ]; meta = with lib; { - description = "The goal of the program is to use standard values when creating zips to create identical files over multiple systems"; + description = "Goal of the program is to use standard values when creating zips to create identical files over multiple systems"; longDescription = '' Torrentzip converts zip archives to a standard format with some pre-defined values, sorting the files, and using particular compression diff --git a/pkgs/by-name/tr/trurl/package.nix b/pkgs/by-name/tr/trurl/package.nix index b38e2ad7bd2c..053e58c8b29d 100644 --- a/pkgs/by-name/tr/trurl/package.nix +++ b/pkgs/by-name/tr/trurl/package.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; - meta = with lib; { + meta = { description = "Command line tool for URL parsing and manipulation"; homepage = "https://curl.se/trurl"; changelog = "https://github.com/curl/trurl/releases/tag/trurl-${version}"; - license = licenses.curl; - maintainers = with maintainers; [ christoph-heiss ]; - platforms = platforms.all; + license = lib.licenses.curl; + maintainers = with lib.maintainers; [ christoph-heiss ]; + platforms = lib.platforms.all; mainProgram = "trurl"; }; } diff --git a/pkgs/by-name/ts/tscli/package.nix b/pkgs/by-name/ts/tscli/package.nix index 7573a782e6c1..1d9c088db4ec 100644 --- a/pkgs/by-name/ts/tscli/package.nix +++ b/pkgs/by-name/ts/tscli/package.nix @@ -33,7 +33,7 @@ buildGoModule rec { ''; meta = { - description = "A CLI tool to interact with the Tailscale API"; + description = "CLI tool to interact with the Tailscale API"; homepage = "https://github.com/jaxxstorm/tscli"; changelog = "https://github.com/jaxxstorm/tscli/releases/tag/${src.tag}/CHANGELOG.md"; mainProgram = "tscli"; diff --git a/pkgs/by-name/ts/tsung/package.nix b/pkgs/by-name/ts/tsung/package.nix index a23e464accc1..a67c1eb0bc83 100644 --- a/pkgs/by-name/ts/tsung/package.nix +++ b/pkgs/by-name/ts/tsung/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { --set PERL5LIB "${perlPackages.makePerlPath [ perlPackages.TemplateToolkit ]}" ''; - meta = with lib; { + meta = { homepage = "http://tsung.erlang-projects.org/"; changelog = "https://github.com/processone/tsung/blob/v${version}/CHANGELOG.md"; description = "High-performance benchmark framework for various protocols including HTTP, XMPP, LDAP, etc"; @@ -53,8 +53,8 @@ stdenv.mkDerivation rec { can currently be used to stress HTTP, WebDAV, SOAP, PostgreSQL, MySQL, AMQP, MQTT, LDAP and Jabber/XMPP servers. ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ uskudnik ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ uskudnik ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index a2d37d182987..168b4e394f0f 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-dr/hT8mVUlO0pX/OGqIqPDevflNVPD88epLZsW772Os="; - meta = with lib; { + meta = { description = "CLI tool to manage todo lists in todo.txt format"; homepage = "https://github.com/VladimirMarkelov/ttdl"; changelog = "https://github.com/VladimirMarkelov/ttdl/blob/v${version}/changelog"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ _3JlOy-PYCCKUi ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; mainProgram = "ttdl"; }; } diff --git a/pkgs/by-name/tu/tuckr/package.nix b/pkgs/by-name/tu/tuckr/package.nix index 3251db7cc3a1..9b6a8d6f7a13 100644 --- a/pkgs/by-name/tu/tuckr/package.nix +++ b/pkgs/by-name/tu/tuckr/package.nix @@ -20,12 +20,12 @@ rustPlatform.buildRustPackage rec { doCheck = false; # test result: FAILED. 5 passed; 3 failed; - meta = with lib; { + meta = { description = "Super powered replacement for GNU Stow"; homepage = "https://github.com/RaphGL/Tuckr"; changelog = "https://github.com/RaphGL/Tuckr/releases/tag/${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ mimame ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ mimame ]; mainProgram = "tuckr"; }; } diff --git a/pkgs/by-name/tu/tunnelgraf/package.nix b/pkgs/by-name/tu/tunnelgraf/package.nix index bff78ab58d49..7a479b098ba5 100644 --- a/pkgs/by-name/tu/tunnelgraf/package.nix +++ b/pkgs/by-name/tu/tunnelgraf/package.nix @@ -43,12 +43,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "tunnelgraf" ]; - meta = with lib; { + meta = { description = "Tool to manage SSH tunnel hops to many endpoints"; homepage = "https://github.com/denniswalker/tunnelgraf"; changelog = "https://github.com/denniswalker/tunnelgraf/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "tunnelgraf"; }; } diff --git a/pkgs/by-name/tu/turses/package.nix b/pkgs/by-name/tu/turses/package.nix index bd8a3bb27806..c6154d86df83 100644 --- a/pkgs/by-name/tu/turses/package.nix +++ b/pkgs/by-name/tu/turses/package.nix @@ -92,13 +92,13 @@ buildPythonPackage rec { rm -rf $TMP_TURSES ''; - meta = with lib; { + meta = { description = "Twitter client for the console"; homepage = "https://github.com/louipc/turses"; changelog = "https://github.com/louipc/turses/blob/v${version}/HISTORY.rst"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ]; mainProgram = "turses"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 5f73b0da7adc..9dd31dbe9039 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -34,13 +34,13 @@ appimageTools.wrapType2 rec { allowedVersions = ".+\\.[0-9]{6}\\..+"; }; - meta = with lib; { + meta = { description = "Tuta official desktop client"; homepage = "https://tuta.com/"; changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}"; - license = licenses.gpl3Only; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "tutanota-desktop"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/tv/tv/package.nix b/pkgs/by-name/tv/tv/package.nix index f345d8474f24..8eee130919db 100644 --- a/pkgs/by-name/tv/tv/package.nix +++ b/pkgs/by-name/tv/tv/package.nix @@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-pg8u+1C68ilg0uhszQnsN1bRbniJd39yQHujerQx+mI="; - meta = with lib; { + meta = { description = "Format json into table view"; mainProgram = "tv"; homepage = "https://github.com/uzimaru0000/tv"; changelog = "https://github.com/uzimaru0000/tv/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/tw/twspace-dl/package.nix b/pkgs/by-name/tw/twspace-dl/package.nix index 32bcf6f2e21a..64c285493888 100644 --- a/pkgs/by-name/tw/twspace-dl/package.nix +++ b/pkgs/by-name/tw/twspace-dl/package.nix @@ -28,12 +28,12 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "twspace_dl" ]; - meta = with lib; { + meta = { description = "Python module to download twitter spaces"; homepage = "https://github.com/HoloArchivists/twspace-dl"; changelog = "https://github.com/HoloArchivists/twspace-dl/releases/tag/${version}"; - license = licenses.gpl2Only; - maintainers = [ ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ ]; mainProgram = "twspace_dl"; }; } diff --git a/pkgs/by-name/tw/twtxt/package.nix b/pkgs/by-name/tw/twtxt/package.nix index 0725ae0b53db..2f606414f252 100644 --- a/pkgs/by-name/tw/twtxt/package.nix +++ b/pkgs/by-name/tw/twtxt/package.nix @@ -35,12 +35,12 @@ python3.pkgs.buildPythonApplication rec { "test_tweet_relative_datetime" ]; - meta = with lib; { + meta = { description = "Decentralised, minimalist microblogging service for hackers"; homepage = "https://github.com/buckket/twtxt"; changelog = "https://github.com/buckket/twtxt/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ siraben ]; mainProgram = "twtxt"; }; } diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix new file mode 100644 index 000000000000..f2abcecb006d --- /dev/null +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -0,0 +1,56 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + unstableGitUpdater, +}: + +buildGoModule { + pname = "typescript-go"; + version = "0-unstable-2025-05-23"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "typescript-go"; + rev = "1b88303de8ad861566d479b0bcf5b88874494536"; + hash = "sha256-qxP8MhUK9ww3yB0ko2K6GPUfY1bcfGL3u5qRACf9ZK0="; + fetchSubmodules = false; + }; + + vendorHash = "sha256-SoBlxQfMg59UOO+99HPeKqEPxD2p7JauLMTpQ7Jl03s="; + + ldflags = [ + "-s" + "-w" + ]; + + env.CGO_ENABLED = 0; + + subPackages = [ + "cmd/tsgo" + ]; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + version="$("$out/bin/tsgo" --version)" + [[ "$version" == *"7.0.0"* ]] + + runHook postInstallCheck + ''; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = { + description = "Go implementation of TypeScript"; + homepage = "https://github.com/microsoft/typescript-go"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + kachick + ]; + mainProgram = "tsgo"; + }; +} diff --git a/pkgs/by-name/ty/typeshare/package.nix b/pkgs/by-name/ty/typeshare/package.nix index e6cea0420f30..14d2260f61c5 100644 --- a/pkgs/by-name/ty/typeshare/package.nix +++ b/pkgs/by-name/ty/typeshare/package.nix @@ -31,15 +31,15 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/typeshare completions zsh) ''; - meta = with lib; { + meta = { description = "Command Line Tool for generating language files with typeshare"; mainProgram = "typeshare"; homepage = "https://github.com/1password/typeshare"; changelog = "https://github.com/1password/typeshare/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/by-name/ty/typship/package.nix b/pkgs/by-name/ty/typship/package.nix index 5b26a4343122..68b0e8b4a6d2 100644 --- a/pkgs/by-name/ty/typship/package.nix +++ b/pkgs/by-name/ty/typship/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { }; meta = { - description = "A Typst package CLI tool"; + description = "Typst package CLI tool"; homepage = "https://github.com/sjfhsjfh/typship"; license = lib.licenses.mit; changelog = "https://github.com/sjfhsjfh/typship/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index c44d84075025..078f44f4d80a 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "typstyle"; - version = "0.13.9"; + version = "0.13.10"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; tag = "v${finalAttrs.version}"; - hash = "sha256-FQ/YBjhFaG9PGb8H3LnOlDcgWrYMy1VvFCHJlLEH32k="; + hash = "sha256-q1WnpjN9Ue0yTm6q5hmcVrDj5oxUhyY71GiiVn1QcpM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-btybQpV5Rl9qgd6+4U4smGpr1RqMlXN82m+N7nni2yA="; + cargoHash = "sha256-Ov+RpV/ONjY/zc8PbIo/TXS3TzJUokaccrFfTEjpxok="; # Disabling tests requiring network access checkFlags = [ diff --git a/pkgs/by-name/tz/tzf-rs/package.nix b/pkgs/by-name/tz/tzf-rs/package.nix index 65c380b832e5..0bd8349f0a32 100644 --- a/pkgs/by-name/tz/tzf-rs/package.nix +++ b/pkgs/by-name/tz/tzf-rs/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "A fast timezone finder for Rust"; + description = "Fast timezone finder for Rust"; homepage = "https://github.com/ringsaturn/tzf-rs"; changelog = "https://github.com/ringsaturn/tzf-rs/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/u-/u-root/package.nix b/pkgs/by-name/u-/u-root/package.nix index df55883dd276..c61bf39ef673 100644 --- a/pkgs/by-name/u-/u-root/package.nix +++ b/pkgs/by-name/u-/u-root/package.nix @@ -55,7 +55,7 @@ buildGoModule (finalAttrs: { }; meta = { - description = "A fully Go userland with Linux bootloaders"; + description = "Fully Go userland with Linux bootloaders"; longDescription = '' u-root can create a one-binary root file system (initramfs) containing a busybox-like set of tools written in Go. diff --git a/pkgs/by-name/ub/ubridge/package.nix b/pkgs/by-name/ub/ubridge/package.nix index d28cff1b1799..3ff1884291f9 100644 --- a/pkgs/by-name/ub/ubridge/package.nix +++ b/pkgs/by-name/ub/ubridge/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Bridge for UDP tunnels, Ethernet, TAP, and VMnet interfaces"; longDescription = '' uBridge is a simple application to create user-land bridges between @@ -53,12 +53,12 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/GNS3/ubridge"; changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; mainProgram = "ubridge"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ primeos anthonyroussel ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/uc/uchecker/package.nix b/pkgs/by-name/uc/uchecker/package.nix index 883979bd9319..98f266b0d2fe 100644 --- a/pkgs/by-name/uc/uchecker/package.nix +++ b/pkgs/by-name/uc/uchecker/package.nix @@ -39,12 +39,12 @@ python3.pkgs.buildPythonApplication rec { "uchecker" ]; - meta = with lib; { + meta = { description = "Simple tool to detect outdated shared libraries"; homepage = "https://github.com/cloudlinux/kcare-uchecker"; changelog = "https://github.com/cloudlinux/kcare-uchecker/releases/tag/v${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "uchecker"; }; } diff --git a/pkgs/by-name/ud/udp2raw/package.nix b/pkgs/by-name/ud/udp2raw/package.nix index 28f7b6bc10c6..9dbb322f3f14 100644 --- a/pkgs/by-name/ud/udp2raw/package.nix +++ b/pkgs/by-name/ud/udp2raw/package.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/udp2raw" --prefix PATH : "${lib.makeBinPath [ iptables ]}" ''; - meta = with lib; { + meta = { homepage = "https://github.com/wangyu-/udp2raw"; description = "Tunnel which turns UDP traffic into encrypted UDP/FakeTCP/ICMP traffic by using a raw socket"; mainProgram = "udp2raw"; - license = licenses.mit; + license = lib.licenses.mit; changelog = "https://github.com/wangyu-/udp2raw/releases/tag/${version}"; - maintainers = with maintainers; [ chvp ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ chvp ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ud/udpx/package.nix b/pkgs/by-name/ud/udpx/package.nix index eca62eced932..b5ed4bcdb78a 100644 --- a/pkgs/by-name/ud/udpx/package.nix +++ b/pkgs/by-name/ud/udpx/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Single-packet UDP scanner"; mainProgram = "udpx"; homepage = "https://github.com/nullt3r/udpx"; changelog = "https://github.com/nullt3r/udpx/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix index 47a22f5b1761..f6228fdcedf6 100644 --- a/pkgs/by-name/un/unblob/package.nix +++ b/pkgs/by-name/un/unblob/package.nix @@ -14,11 +14,13 @@ lziprecover, lzop, p7zip, + partclone, sasquatch, sasquatch-v4be, simg2img, ubi_reader, unar, + upx, zstd, versionCheckHook, }: @@ -37,13 +39,14 @@ let ubi_reader simg2img unar + upx zstd lz4 - ]; + ] ++ lib.optional stdenvNoCC.isLinux partclone; in python3.pkgs.buildPythonApplication rec { pname = "unblob"; - version = "25.4.14"; + version = "25.5.26"; pyproject = true; disabled = python3.pkgs.pythonOlder "3.9"; @@ -51,14 +54,14 @@ python3.pkgs.buildPythonApplication rec { owner = "onekey-sec"; repo = "unblob"; tag = version; - hash = "sha256-kWZGQX8uSKdFW+uauunHcruXhJ5XpBfyDY7gPyWGK90="; + hash = "sha256-vTakXZFAcD3cmd+y4CwYg3X4O4NmtOzuqMLWLMX2Duk="; forceFetchGit = true; fetchLFS = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-lGsDax7+CUACeYChDqdPsVbKE/hH94CPek6UBVz1eqs="; + hash = "sha256-NirDPuAcKuNquMs9mBZoEkQf+QJ+cMd7JXjj1anB9Zw="; }; strictDeps = true; diff --git a/pkgs/by-name/un/uncover/package.nix b/pkgs/by-name/un/uncover/package.nix index f277cd9ca423..2cb350cf6750 100644 --- a/pkgs/by-name/un/uncover/package.nix +++ b/pkgs/by-name/un/uncover/package.nix @@ -31,7 +31,7 @@ buildGoModule rec { versionCheckProgramArg = "-version"; - meta = with lib; { + meta = { description = "API wrapper to search for exposed hosts"; longDescription = '' uncover is a go wrapper using APIs of well known search engines to quickly @@ -41,8 +41,8 @@ buildGoModule rec { ''; homepage = "https://github.com/projectdiscovery/uncover"; changelog = "https://github.com/projectdiscovery/uncover/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "uncover"; }; } diff --git a/pkgs/by-name/un/unflac/package.nix b/pkgs/by-name/un/unflac/package.nix index ad7c1c925408..067dd072f448 100644 --- a/pkgs/by-name/un/unflac/package.nix +++ b/pkgs/by-name/un/unflac/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "A command line tool for fast frame accurate audio image + cue sheet splitting"; + description = "Command line tool for fast frame accurate audio image + cue sheet splitting"; homepage = "https://sr.ht/~ft/unflac/"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/by-name/un/uni/package.nix b/pkgs/by-name/un/uni/package.nix index 9b6b291a724e..b3a8e07286ec 100644 --- a/pkgs/by-name/un/uni/package.nix +++ b/pkgs/by-name/un/uni/package.nix @@ -23,12 +23,12 @@ buildGoModule rec { "-X=main.version=${version}" ]; - meta = with lib; { + meta = { homepage = "https://github.com/arp242/uni"; description = "Query the Unicode database from the commandline, with good support for emojis"; changelog = "https://github.com/arp242/uni/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ chvp ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ chvp ]; mainProgram = "uni"; }; } diff --git a/pkgs/by-name/un/unifi-protect-backup/package.nix b/pkgs/by-name/un/unifi-protect-backup/package.nix index 481a5887bfc8..3cd927b62176 100644 --- a/pkgs/by-name/un/unifi-protect-backup/package.nix +++ b/pkgs/by-name/un/unifi-protect-backup/package.nix @@ -50,12 +50,12 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Python tool to backup unifi event clips in realtime"; homepage = "https://github.com/ep1cman/unifi-protect-backup"; changelog = "https://github.com/ep1cman/unifi-protect-backup/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - teams = [ teams.helsinki-systems ]; + license = lib.licenses.mit; + teams = [ lib.teams.helsinki-systems ]; mainProgram = "unifi-protect-backup"; }; } diff --git a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix index 1ac3eac42581..363aec592a94 100644 --- a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix +++ b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "A game based on K-Shoot MANIA and Sound Voltex"; + description = "Game based on K-Shoot MANIA and Sound Voltex"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sako ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/un/unpaper/package.nix b/pkgs/by-name/un/unpaper/package.nix index d88104d2f379..ef5e17f08100 100644 --- a/pkgs/by-name/un/unpaper/package.nix +++ b/pkgs/by-name/un/unpaper/package.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { inherit (nixosTests) paperless; }; - meta = with lib; { + meta = { homepage = "https://www.flameeyes.eu/projects/unpaper"; changelog = "https://github.com/unpaper/unpaper/blob/unpaper-${version}/NEWS"; description = "Post-processing tool for scanned sheets of paper"; - license = licenses.gpl2Only; - platforms = platforms.all; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.all; mainProgram = "unpaper"; - maintainers = [ maintainers.rycee ]; + maintainers = [ lib.maintainers.rycee ]; }; } diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix index a8800efb688c..f8a1515b7c1f 100644 --- a/pkgs/by-name/un/unpoller/package.nix +++ b/pkgs/by-name/un/unpoller/package.nix @@ -26,11 +26,11 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) unpoller; }; - meta = with lib; { + meta = { description = "Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus"; homepage = "https://github.com/unpoller/unpoller"; changelog = "https://github.com/unpoller/unpoller/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ Frostman ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Frostman ]; }; } diff --git a/pkgs/by-name/un/unstructured-api/package.nix b/pkgs/by-name/un/unstructured-api/package.nix index 4cd47d26c13b..a6e0bc77c337 100644 --- a/pkgs/by-name/un/unstructured-api/package.nix +++ b/pkgs/by-name/un/unstructured-api/package.nix @@ -181,11 +181,11 @@ stdenvNoCC.mkDerivation { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "open-source toolkit designed to make it easy to prepare unstructured data like PDFs, HTML and Word Documents for downstream data science tasks"; homepage = "https://github.com/Unstructured-IO/unstructured-api"; changelog = "https://github.com/Unstructured-IO/unstructured-api/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; }; } diff --git a/pkgs/by-name/up/uptime-kuma/package.nix b/pkgs/by-name/up/uptime-kuma/package.nix index 1c0b8a6737df..0eab3ad985fa 100644 --- a/pkgs/by-name/up/uptime-kuma/package.nix +++ b/pkgs/by-name/up/uptime-kuma/package.nix @@ -46,13 +46,13 @@ buildNpmPackage rec { passthru.tests.uptime-kuma = nixosTests.uptime-kuma; - meta = with lib; { + meta = { description = "Fancy self-hosted monitoring tool"; mainProgram = "uptime-kuma-server"; homepage = "https://github.com/louislam/uptime-kuma"; changelog = "https://github.com/louislam/uptime-kuma/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ julienmalka ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ julienmalka ]; # FileNotFoundError: [Errno 2] No such file or directory: 'xcrun' broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/ur/uriparser/package.nix b/pkgs/by-name/ur/uriparser/package.nix index 721ea8182dc6..dbfe694b211d 100644 --- a/pkgs/by-name/ur/uriparser/package.nix +++ b/pkgs/by-name/ur/uriparser/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ gtest ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - meta = with lib; { + meta = { changelog = "https://github.com/uriparser/uriparser/blob/uriparser-${version}/ChangeLog"; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { API documentation is available on uriparser website. ''; homepage = "https://uriparser.github.io/"; - license = licenses.bsd3; - maintainers = with maintainers; [ bosu ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bosu ]; mainProgram = "uriparse"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ur/url-parser/package.nix b/pkgs/by-name/ur/url-parser/package.nix index 5b51ff56362b..36ef2165ca4a 100644 --- a/pkgs/by-name/ur/url-parser/package.nix +++ b/pkgs/by-name/ur/url-parser/package.nix @@ -26,12 +26,12 @@ buildGoModule rec { "main.BuildDate=1970-01-01" ]; - meta = with lib; { + meta = { description = "Simple command-line URL parser"; homepage = "https://github.com/thegeeklab/url-parser"; changelog = "https://github.com/thegeeklab/url-parser/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ doronbehar ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; mainProgram = "url-parser"; }; } diff --git a/pkgs/by-name/us/usbkvm/package.nix b/pkgs/by-name/us/usbkvm/package.nix index f24a2d707a04..24a6b584e2ea 100644 --- a/pkgs/by-name/us/usbkvm/package.nix +++ b/pkgs/by-name/us/usbkvm/package.nix @@ -28,7 +28,7 @@ let inherit version; inherit src; - sourceRoot = "source/ms-tools"; + sourceRoot = "${src.name}/ms-tools"; vendorHash = null; # dependencies are vendored in the release tarball buildInputs = [ @@ -92,7 +92,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/carrotIndustries/usbkvm"; - description = "An open-source USB KVM (Keyboard, Video and Mouse) adapter"; + description = "Open-source USB KVM (Keyboard, Video and Mouse) adapter"; changelog = "https://github.com/carrotIndustries/usbkvm/releases/tag/v${version}"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ lschuermann ]; diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix index 5ba51b7a63f3..4ea75be06396 100644 --- a/pkgs/by-name/us/userborn/package.nix +++ b/pkgs/by-name/us/userborn/package.nix @@ -42,12 +42,12 @@ rustPlatform.buildRustPackage rec { }; }; - meta = with lib; { + meta = { homepage = "https://github.com/nikstur/userborn"; description = "Declaratively bear (manage) Linux users and groups"; changelog = "https://github.com/nikstur/userborn/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - platforms = platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ nikstur ]; mainProgram = "userborn"; }; diff --git a/pkgs/by-name/ut/utf8cpp/package.nix b/pkgs/by-name/ut/utf8cpp/package.nix index 4ab4fe494edc..e6590b444a49 100644 --- a/pkgs/by-name/ut/utf8cpp/package.nix +++ b/pkgs/by-name/ut/utf8cpp/package.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { homepage = "https://github.com/nemtrif/utfcpp"; changelog = "https://github.com/nemtrif/utfcpp/releases/tag/v${version}"; description = "UTF-8 with C++ in a Portable Way"; - license = licenses.boost; - maintainers = with maintainers; [ jobojeha ]; - platforms = platforms.all; + license = lib.licenses.boost; + maintainers = with lib.maintainers; [ jobojeha ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ut/utm/package.nix b/pkgs/by-name/ut/utm/package.nix index 4e6c40ed5b2d..f7780c1606d3 100644 --- a/pkgs/by-name/ut/utm/package.nix +++ b/pkgs/by-name/ut/utm/package.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Full featured system emulator and virtual machine host for iOS and macOS"; longDescription = '' UTM is a full featured system emulator and virtual machine host for iOS @@ -63,10 +63,10 @@ stdenvNoCC.mkDerivation rec { homepage = "https://mac.getutm.app/"; changelog = "https://github.com/utmapp/utm/releases/tag/v${version}"; mainProgram = "UTM"; - license = licenses.asl20; - platforms = platforms.darwin; # 11.3 is the minimum supported version as of UTM 4. - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + platforms = lib.platforms.darwin; # 11.3 is the minimum supported version as of UTM 4. + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ rrbutani wegank ]; diff --git a/pkgs/by-name/uu/uudeview/package.nix b/pkgs/by-name/uu/uudeview/package.nix index 511ccd0efd1b..211a70b7ff11 100644 --- a/pkgs/by-name/uu/uudeview/package.nix +++ b/pkgs/by-name/uu/uudeview/package.nix @@ -1,19 +1,21 @@ { lib, stdenv, - fetchurl, - fetchpatch, + fetchFromGitHub, tcl, tk, + autoreconfHook, }: stdenv.mkDerivation rec { pname = "uudeview"; - version = "0.5.20"; + version = "0.5.20-unstable-2025-03-20"; - src = fetchurl { - url = "http://www.fpx.de/fp/Software/UUDeview/download/uudeview-${version}.tar.gz"; - sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4"; + src = fetchFromGitHub { + owner = "hannob"; + repo = "uudeview"; + rev = "7640bc56aa5016cdc9c139eb1ab3ec874e47c744"; + hash = "sha256-IdHxkrXe+2I+aJpZ0bhimXq4xEXE9HDXrL5DtCs7MKk="; }; buildInputs = [ @@ -21,22 +23,13 @@ stdenv.mkDerivation rec { tk ]; + nativeBuildInputs = [ autoreconfHook ]; + configureFlags = [ "--enable-tk=${tk.dev}" "--enable-tcl=${tcl}" ]; - patches = [ - # https://wiki.tcl.tk/3577 - ./matherr.patch - # format hardening - (fetchpatch { - url = "https://raw.githubusercontent.com/OpenMandrivaAssociation/uudeview/master/uudeview-0.5.20-fix-str-fmt.patch"; - sha256 = "1biipck60mhpd0j6jwizaisvqa8alisw1dpfqm6zf7ic5b93hmfw"; - extraPrefix = ""; - }) - ]; - postPatch = '' substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish" ''; diff --git a/pkgs/by-name/uw/uwhoisd/package.nix b/pkgs/by-name/uw/uwhoisd/package.nix index 3eac31c31aee..c14678502250 100644 --- a/pkgs/by-name/uw/uwhoisd/package.nix +++ b/pkgs/by-name/uw/uwhoisd/package.nix @@ -38,11 +38,11 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - meta = with lib; { + meta = { description = "Universal WHOIS proxy server"; homepage = "https://github.com/Lookyloo/uwhoisd"; changelog = "https://github.com/Lookyloo/uwhoisd/blob/${version}/ChangeLog"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 43c87dd85fb3..3e3d9bf4e803 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -35,7 +35,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs build.sh substituteInPlace build.sh \ - --replace "-L/usr/local/lib " "" + --replace "-L/usr/local/lib " "" \ + --replace "$(brew --prefix)/lib/libSDL2.a " "" \ + --replace "--static-libs" "--libs" \ + --replace " | sed -e 's/-lSDL2 //'" "" ''; buildPhase = '' @@ -68,6 +71,5 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ ]; mainProgram = "uxnemu"; inherit (SDL2.meta) platforms; - broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index 2b1544c24ac4..f1e1788d87b7 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,12 +9,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20250602083629"; + version = "20250605152911"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-LdB4BUHDpPoA0c8yoZX9gZhaY97t4DfkR37y32yHlvk="; + hash = "sha256-WmBRTr1DHsYgw1XBYCgJAqIvgoW+oqMHe7Ifh7pSG1I="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index 0d266543990b..008eb83705e3 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { }; meta = { - description = "The world's fastest OpenAPI & Swagger linter"; + description = "World's fastest OpenAPI & Swagger linter"; homepage = "https://quobix.com/vacuum"; changelog = "https://github.com/daveshanley/vacuum/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix index 8718efca779f..af436434833b 100644 --- a/pkgs/by-name/va/vals/package.nix +++ b/pkgs/by-name/va/vals/package.nix @@ -35,12 +35,12 @@ buildGoModule rec { command = "vals version"; }; - meta = with lib; { + meta = { description = "Helm-like configuration values loader with support for various sources"; mainProgram = "vals"; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://github.com/helmfile/vals"; changelog = "https://github.com/helmfile/vals/releases/v${version}"; - maintainers = with maintainers; [ stehessel ]; + maintainers = with lib.maintainers; [ stehessel ]; }; } diff --git a/pkgs/by-name/va/vangers/package.nix b/pkgs/by-name/va/vangers/package.nix index 41f8ead4f737..0143ae4261b9 100644 --- a/pkgs/by-name/va/vangers/package.nix +++ b/pkgs/by-name/va/vangers/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ''; meta = { - description = "The video game that combines elements of the racing and role-playing genres"; + description = "Video game that combines elements of the racing and role-playing genres"; homepage = "https://github.com/KranX/Vangers"; mainProgram = "vangers"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/va/variant-lite/package.nix b/pkgs/by-name/va/variant-lite/package.nix index 4e8374440c6e..b667c14a101b 100644 --- a/pkgs/by-name/va/variant-lite/package.nix +++ b/pkgs/by-name/va/variant-lite/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "A C++17-like variant, a type-safe union for C++98, C++11 and later in a single-file header-only library"; + description = "C++17-like variant, a type-safe union for C++98, C++11 and later in a single-file header-only library"; homepage = "https://github.com/martinmoene/variant-lite"; changelog = "https://github.com/martinmoene/variant-lite/blob/v${finalAttrs.version}/CHANGES.txt"; license = lib.licenses.boost; diff --git a/pkgs/by-name/va/vault-ssh-plus/package.nix b/pkgs/by-name/va/vault-ssh-plus/package.nix index 0fa3a0658513..71bbb58bd362 100644 --- a/pkgs/by-name/va/vault-ssh-plus/package.nix +++ b/pkgs/by-name/va/vault-ssh-plus/package.nix @@ -39,12 +39,12 @@ buildGoModule rec { version = "v${version}"; }; - meta = with lib; { + meta = { homepage = "https://github.com/isometry/vault-ssh-plus"; changelog = "https://github.com/isometry/vault-ssh-plus/releases/tag/v${version}"; description = "Automatically use HashiCorp Vault SSH Client Key Signing with ssh(1)"; mainProgram = "vssh"; - license = licenses.mit; - maintainers = with maintainers; [ lesuisse ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lesuisse ]; }; } diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix index 891c9d16be2a..03e333ae062b 100644 --- a/pkgs/by-name/va/vault/package.nix +++ b/pkgs/by-name/va/vault/package.nix @@ -66,13 +66,13 @@ buildGoModule rec { ; }; - meta = with lib; { + meta = { homepage = "https://www.vaultproject.io/"; description = "Tool for managing secrets"; changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md"; - license = licenses.bsl11; + license = lib.licenses.bsl11; mainProgram = "vault"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ rushmorem lnl7 offline diff --git a/pkgs/by-name/va/vaultwarden/package.nix b/pkgs/by-name/va/vaultwarden/package.nix index 077791d40554..b754b72c0ff1 100644 --- a/pkgs/by-name/va/vaultwarden/package.nix +++ b/pkgs/by-name/va/vaultwarden/package.nix @@ -51,12 +51,12 @@ rustPlatform.buildRustPackage rec { updateScript = callPackage ./update.nix { }; }; - meta = with lib; { + meta = { description = "Unofficial Bitwarden compatible server written in Rust"; homepage = "https://github.com/dani-garcia/vaultwarden"; changelog = "https://github.com/dani-garcia/vaultwarden/releases/tag/${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ dotlambda SuperSandro2000 ]; diff --git a/pkgs/by-name/va/vaultwarden/webvault.nix b/pkgs/by-name/va/vaultwarden/webvault.nix index 5e306c9860b0..dcd98cad345e 100644 --- a/pkgs/by-name/va/vaultwarden/webvault.nix +++ b/pkgs/by-name/va/vaultwarden/webvault.nix @@ -56,12 +56,12 @@ buildNpmPackage rec { tests = nixosTests.vaultwarden; }; - meta = with lib; { + meta = { description = "Integrates the web vault into vaultwarden"; homepage = "https://github.com/dani-garcia/bw_web_builds"; changelog = "https://github.com/dani-garcia/bw_web_builds/releases/tag/v${version}"; - platforms = platforms.all; - license = licenses.gpl3Plus; + platforms = lib.platforms.all; + license = lib.licenses.gpl3Plus; inherit (vaultwarden.meta) maintainers; }; } diff --git a/pkgs/by-name/vc/vcsh/package.nix b/pkgs/by-name/vc/vcsh/package.nix index 7e1af72cbfd5..69bde561ce61 100644 --- a/pkgs/by-name/vc/vcsh/package.nix +++ b/pkgs/by-name/vc/vcsh/package.nix @@ -38,16 +38,16 @@ stdenv.mkDerivation rec { "man" ]; - meta = with lib; { + meta = { description = "Version Control System for $HOME"; homepage = "https://github.com/RichiH/vcsh"; changelog = "https://github.com/RichiH/vcsh/blob/v${version}/changelog"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ttuegel alerque ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "vcsh"; }; } diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix index 50829eaca45e..77dc996b04fe 100644 --- a/pkgs/by-name/ve/veilid/package.nix +++ b/pkgs/by-name/ve/veilid/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "veilid"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitLab { owner = "veilid"; repo = "veilid"; rev = "v${version}"; - hash = "sha256-bKll7VB6LjkmmhN5lmjcSeP2zZbyWnl4XiZbZe3tKgg="; + hash = "sha256-SEmXZvv6951Ln87/sRQwr4FgGRSvowGyeyApfF+JnJ4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-505gf4P/Hlo8KFynhAQdBagzEqGXhydhTTknat/jWmk="; + cargoHash = "sha256-2fZAds4wNLd/mWh7EWpP2hqspBfAtTHIEe+dFag7Lw4="; nativeBuildInputs = [ capnproto diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix index c953ee711cb7..f8a3bc3a2cf7 100644 --- a/pkgs/by-name/ve/velero/package.nix +++ b/pkgs/by-name/ve/velero/package.nix @@ -6,21 +6,21 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "velero"; version = "1.16.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KfVMWoBScpHINmT5PlnPY+I5Ec1NRgEXKMtL0M7WyhE="; }; ldflags = [ "-s" "-w" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v${version}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v${finalAttrs.version}" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" @@ -38,7 +38,7 @@ buildGoModule rec { doCheck = false; # Tests expect a running cluster see https://github.com/vmware-tanzu/velero/tree/main/test/e2e doInstallCheck = true; installCheckPhase = '' - $out/bin/velero version --client-only | grep ${version} > /dev/null + $out/bin/velero version --client-only | grep ${finalAttrs.version} > /dev/null ''; nativeBuildInputs = [ installShellFiles ]; @@ -48,14 +48,14 @@ buildGoModule rec { installShellCompletion velero.{bash,zsh} ''; - meta = with lib; { - description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; + meta = { + description = "Utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; homepage = "https://velero.io/"; - changelog = "https://github.com/vmware-tanzu/velero/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ - maintainers.mbode - maintainers.bryanasdev000 + changelog = "https://github.com/vmware-tanzu/velero/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + mbode + bryanasdev000 ]; }; -} +}) diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix index 6af10dc7ac16..3f2cd1cecc74 100644 --- a/pkgs/by-name/ve/veloren/package.nix +++ b/pkgs/by-name/ve/veloren/package.nix @@ -101,7 +101,7 @@ rustPlatform.buildRustPackage { ''; meta = with lib; { - description = "An open world, open source voxel RPG"; + description = "Open world, open source voxel RPG"; homepage = "https://www.veloren.net"; license = licenses.gpl3; mainProgram = "veloren-voxygen"; diff --git a/pkgs/by-name/ve/veridian/package.nix b/pkgs/by-name/ve/veridian/package.nix new file mode 100644 index 000000000000..c9f6d5149ed7 --- /dev/null +++ b/pkgs/by-name/ve/veridian/package.nix @@ -0,0 +1,81 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + + cmake, + makeWrapper, + pkg-config, + + boost, + fmt_11, + openssl, + sv-lang, + mimalloc, + + verible, + verilator, +}: +rustPlatform.buildRustPackage { + pname = "veridian"; + version = "0-unstable-2024-12-25"; + + src = fetchFromGitHub { + owner = "vivekmalneedi"; + repo = "veridian"; + rev = "d094c9d2fa9745b2c4430eef052478c64d5dd3b6"; + hash = "sha256-3KjUunXTqdesvgDSeQMoXL0LRGsGQXZJGDt+xLWGovM="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-qJQD9HjSrrHdppbLNgLnXCycgzbmPePydZve3A8zGtU="; + + buildFeatures = [ "slang" ]; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + cmake + makeWrapper + pkg-config + ]; + + buildInputs = [ + boost + fmt_11 + openssl + sv-lang + mimalloc + ]; + + # the tests also need these to be on the PATH + nativeCheckInputs = [ + verible + verilator + ]; + + postInstall = + let + runtimePathDeps = [ + verible + verilator + ]; + in + '' + wrapProgram $out/bin/veridian \ + --prefix PATH : ${lib.makeBinPath runtimePathDeps} + ''; + + env = { + OPENSSL_NO_VENDOR = "1"; + RUSTFLAGS = "-C link-args=-lmimalloc"; + # this is needed so that veridian doesn't try to build the sv-lang package itself + SLANG_INSTALL_PATH = sv-lang; + }; + + meta = { + description = "SystemVerilog Language Server"; + homepage = "https://github.com/vivekmalneedi/veridian"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.hakan-demirli ]; + }; +} diff --git a/pkgs/by-name/vh/vhs/package.nix b/pkgs/by-name/vh/vhs/package.nix index bfd2c5e04626..0bda86473b72 100644 --- a/pkgs/by-name/vh/vhs/package.nix +++ b/pkgs/by-name/vh/vhs/package.nix @@ -52,13 +52,13 @@ buildGoModule rec { --zsh <($out/bin/vhs completion zsh) ''; - meta = with lib; { + meta = { description = "Tool for generating terminal GIFs with code"; mainProgram = "vhs"; homepage = "https://github.com/charmbracelet/vhs"; changelog = "https://github.com/charmbracelet/vhs/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ maaslalani penguwin ]; diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 2cb333913c17..62fab4ed0ae6 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.117.1"; + version = "1.118.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y3Ai5e9bJnGlWfxOMWMhesJ/eHrklSbR+YmR1EgzFS0="; + hash = "sha256-a84n9fuGdiG0o/1/9q3etTwoFbOL01y88ubTI/yIIBA="; }; vendorHash = null; @@ -78,8 +78,11 @@ buildGoModule (finalAttrs: { __darwinAllowLocalNetworking = true; - passthru.tests = { - inherit (nixosTests) victoriametrics; + passthru = { + tests = { + inherit (nixosTests) victoriametrics; + }; + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/by-name/vi/victoriametrics/update.sh b/pkgs/by-name/vi/victoriametrics/update.sh new file mode 100755 index 000000000000..84f2f275740e --- /dev/null +++ b/pkgs/by-name/vi/victoriametrics/update.sh @@ -0,0 +1,13 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq nix-update + +set -ex + +curl_github() { + curl -L ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@" +} + +latestRelease=$(curl_github https://api.github.com/repos/VictoriaMetrics/VictoriaMetrics/releases/latest | jq -r ".tag_name") +latestVersion="$(expr "$latestRelease" : 'v\(.*\)')" + +nix-update --version "$latestVersion" victoriametrics diff --git a/pkgs/by-name/vi/vieb/package.nix b/pkgs/by-name/vi/vieb/package.nix index a292c7865065..a68bd332c639 100644 --- a/pkgs/by-name/vi/vieb/package.nix +++ b/pkgs/by-name/vi/vieb/package.nix @@ -65,15 +65,15 @@ buildNpmPackage rec { distPhase = ":"; # disable useless $out/tarballs directory - meta = with lib; { + meta = { homepage = "https://vieb.dev/"; changelog = "https://github.com/Jelmerro/Vieb/releases/tag/${version}"; description = "Vim Inspired Electron Browser"; mainProgram = "vieb"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ tejing ]; - platforms = platforms.unix; - license = licenses.gpl3Plus; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix index cc76b1097b16..542cd901e8c6 100644 --- a/pkgs/by-name/vi/vifm/package.nix +++ b/pkgs/by-name/vi/vifm/package.nix @@ -23,11 +23,11 @@ let in stdenv.mkDerivation rec { pname = if isFullPackage then "vifm-full" else "vifm"; - version = "0.14.2"; + version = "0.14.3"; src = fetchurl { url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; - hash = "sha256-zRsF0lQ832gp1gsjvCJcb94T0+98EAj4IbkgmDfx4rA="; + hash = "sha256-Fqm+EQjWpaCen5R/clY3XlGbpB6+lHNlmyBzn9vzRA4="; }; nativeBuildInputs = [ @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { patchShebangs --build src/helpztags ''; + enableParallelBuilding = true; + postFixup = let path = lib.makeBinPath [ @@ -67,12 +69,12 @@ stdenv.mkDerivation rec { ignoredVersions = "beta"; }; - meta = with lib; { + meta = { description = "Vi-like file manager${lib.optionalString isFullPackage "; Includes support for optional features"}"; mainProgram = "vifm"; - maintainers = with maintainers; [ raskin ]; - platforms = if mediaSupport then platforms.linux else platforms.unix; - license = licenses.gpl2; + maintainers = with lib.maintainers; [ raskin ]; + platforms = if mediaSupport then lib.platforms.linux else lib.platforms.unix; + license = lib.licenses.gpl2; downloadPage = "https://vifm.info/downloads.shtml"; homepage = "https://vifm.info/"; changelog = "https://github.com/vifm/vifm/blob/v${version}/ChangeLog"; diff --git a/pkgs/by-name/vi/vimcats/package.nix b/pkgs/by-name/vi/vimcats/package.nix index bfec5d72a56f..32eccfc5777a 100644 --- a/pkgs/by-name/vi/vimcats/package.nix +++ b/pkgs/by-name/vi/vimcats/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { passthru.tests.version = testers.testVersion { package = vimcats; }; meta = with lib; { - description = "A CLI to generate vim/nvim help doc from LuaCATS. Forked from lemmy-help"; + description = "CLI to generate vim/nvim help doc from LuaCATS. Forked from lemmy-help"; longDescription = '' `vimcats` is a LuaCATS parser as well as a CLI which takes that parsed tree and converts it into vim help docs. It is a fork of lemmy-help that aims to support more recent LuaCATS features. diff --git a/pkgs/by-name/vi/vimix-cursors/package.nix b/pkgs/by-name/vi/vimix-cursors/package.nix index 665938ae02e4..b55a999ec03e 100644 --- a/pkgs/by-name/vi/vimix-cursors/package.nix +++ b/pkgs/by-name/vi/vimix-cursors/package.nix @@ -2,8 +2,8 @@ lib, fetchFromGitHub, stdenvNoCC, + cairosvg, inkscape, - python3Packages, xcursorgen, }: stdenvNoCC.mkDerivation { @@ -18,8 +18,8 @@ stdenvNoCC.mkDerivation { }; nativeBuildInputs = [ + cairosvg inkscape - python3Packages.cairosvg xcursorgen ]; diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix index 9babd3729e7f..f2ea4e54f62f 100644 --- a/pkgs/by-name/vi/vintagestory/package.nix +++ b/pkgs/by-name/vi/vintagestory/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.20.9"; + version = "1.20.11"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-pia2Dv0FY28nkATOk60GqiAEnZmxgZvZfvkM8U/bZzU="; + hash = "sha256-IOreg6j/jLhOK8jm2AgSnYQrql5R6QxsshvPs8OUcQA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vi/vis/package.nix b/pkgs/by-name/vi/vis/package.nix index edf173026d90..f2c64626a78c 100644 --- a/pkgs/by-name/vi/vis/package.nix +++ b/pkgs/by-name/vi/vis/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A vim like editor"; + description = "Vim like editor"; homepage = "https://github.com/martanne/vis"; license = licenses.isc; maintainers = with maintainers; [ ramkromberg ]; diff --git a/pkgs/by-name/vi/vitess/package.nix b/pkgs/by-name/vi/vitess/package.nix index 17cb7e380973..6bfeda989da9 100644 --- a/pkgs/by-name/vi/vitess/package.nix +++ b/pkgs/by-name/vi/vitess/package.nix @@ -25,11 +25,11 @@ buildGoModule rec { # integration tests require access to syslog and root doCheck = false; - meta = with lib; { + meta = { homepage = "https://vitess.io/"; changelog = "https://github.com/vitessio/vitess/releases/tag/v${version}"; description = "Database clustering system for horizontal scaling of MySQL"; - license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ urandom ]; }; } diff --git a/pkgs/by-name/vk/vkd3d-proton/package.nix b/pkgs/by-name/vk/vkd3d-proton/package.nix index d5e274cea8cd..6c865a3908bf 100644 --- a/pkgs/by-name/vk/vkd3d-proton/package.nix +++ b/pkgs/by-name/vk/vkd3d-proton/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/HansKristian-Work/vkd3d-proton"; - description = "A fork of VKD3D, which aims to implement the full Direct3D 12 API on top of Vulkan"; + description = "Fork of VKD3D, which aims to implement the full Direct3D 12 API on top of Vulkan"; license = with lib.licenses; [ lgpl21Plus ]; maintainers = with lib.maintainers; [ ]; inherit (wine.meta) platforms; diff --git a/pkgs/by-name/vo/volatility2-bin/package.nix b/pkgs/by-name/vo/volatility2-bin/package.nix index 288d198e338e..971b4425b671 100644 --- a/pkgs/by-name/vo/volatility2-bin/package.nix +++ b/pkgs/by-name/vo/volatility2-bin/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://volatilityfoundation.org/"; mainProgram = "volatility2"; - description = "An advanced memory forensics framework"; + description = "Advanced memory forensics framework"; platforms = [ "x86_64-linux" "x86_64-darwin" diff --git a/pkgs/by-name/vo/volk_2/package.nix b/pkgs/by-name/vo/volk_2/package.nix index 57b849fcc28b..fa32bf920a60 100644 --- a/pkgs/by-name/vo/volk_2/package.nix +++ b/pkgs/by-name/vo/volk_2/package.nix @@ -3,7 +3,7 @@ lib, fetchFromGitHub, cmake, - python311, + python3, enableModTool ? true, removeReferencesTo, fetchpatch, @@ -49,10 +49,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - # This version of the project wasn't updated to use Python 3.12 which - # doesn't include the deprecated distutils module. - python311 - python311.pkgs.mako + python3 + python3.pkgs.mako + python3.pkgs.distutils removeReferencesTo ]; diff --git a/pkgs/by-name/vo/vouch-proxy/package.nix b/pkgs/by-name/vo/vouch-proxy/package.nix index 1104b041708e..0eb9aeb3072b 100644 --- a/pkgs/by-name/vo/vouch-proxy/package.nix +++ b/pkgs/by-name/vo/vouch-proxy/package.nix @@ -27,16 +27,16 @@ buildGoModule rec { export VOUCH_ROOT=$PWD ''; - meta = with lib; { + meta = { homepage = "https://github.com/vouch/vouch-proxy"; description = "SSO and OAuth / OIDC login solution for NGINX using the auth_request module"; changelog = "https://github.com/vouch/vouch-proxy/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ leona erictapen ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "vouch-proxy"; }; } diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix index db0d6dba2d7d..aee881ac119a 100644 --- a/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -74,8 +74,8 @@ buildNpmPackage rec { fi ''; - meta = with lib; { - description = "A DAP-compatible JavaScript debugger"; + meta = { + description = "DAP-compatible JavaScript debugger"; longDescription = '' This is a [DAP](https://microsoft.github.io/debug-adapter-protocol/)-based JavaScript debugger. It debugs Node.js, Chrome, Edge, WebView2, VS Code @@ -86,7 +86,7 @@ buildNpmPackage rec { homepage = "https://github.com/microsoft/vscode-js-debug"; changelog = "https://github.com/microsoft/vscode-js-debug/blob/v${version}/CHANGELOG.md"; mainProgram = "js-debug"; - license = licenses.mit; - maintainers = with maintainers; [ zeorin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ zeorin ]; }; } diff --git a/pkgs/by-name/vs/vst2-sdk/package.nix b/pkgs/by-name/vs/vst2-sdk/package.nix index bf16ba8025f7..373ec52d4f4a 100644 --- a/pkgs/by-name/vs/vst2-sdk/package.nix +++ b/pkgs/by-name/vs/vst2-sdk/package.nix @@ -16,7 +16,7 @@ fetchzip rec { ''; meta = { - description = "The VST2 source development kit"; + description = "VST2 source development kit"; longDescription = '' VST2 is proprietary, and deprecated by Steinberg. As such, it should only be used for legacy reasons. diff --git a/pkgs/by-name/vt/vt-cli/package.nix b/pkgs/by-name/vt/vt-cli/package.nix index 0ca91305822d..e61b557d3e0e 100644 --- a/pkgs/by-name/vt/vt-cli/package.nix +++ b/pkgs/by-name/vt/vt-cli/package.nix @@ -23,12 +23,12 @@ buildGoModule rec { subPackages = [ "vt" ]; - meta = with lib; { + meta = { description = "VirusTotal Command Line Interface"; homepage = "https://github.com/VirusTotal/vt-cli"; changelog = "https://github.com/VirusTotal/vt-cli/releases/tag/${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "vt"; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with lib.maintainers; [ dit7ya ]; }; } diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix index d8a5c60284ca..6d14b4d789d3 100644 --- a/pkgs/by-name/vt/vte/package.nix +++ b/pkgs/by-name/vt/vte/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.80.1"; + version = "0.80.2"; outputs = [ "out" @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - hash = "sha256-DNvQ6YOv2dIuBl4yOnQxYAcr9ktFPgCxXtvm8tzdpGw="; + hash = "sha256-siW+vQQ2M71JHy6hcTdNDz+d5i3+wHZTBTvAjE+s5G8="; }; patches = [ diff --git a/pkgs/by-name/vu/vultr-cli/package.nix b/pkgs/by-name/vu/vultr-cli/package.nix index 5f8c67d2a1bf..50b611abd1da 100644 --- a/pkgs/by-name/vu/vultr-cli/package.nix +++ b/pkgs/by-name/vu/vultr-cli/package.nix @@ -33,12 +33,12 @@ buildGoModule rec { --zsh <($out/bin/vultr-cli completion zsh) ''; - meta = with lib; { + meta = { description = "Official command line tool for Vultr services"; homepage = "https://github.com/vultr/vultr-cli"; changelog = "https://github.com/vultr/vultr-cli/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ Br1ght0ne ]; mainProgram = "vultr-cli"; }; } diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index b40a86a96d16..0661cc3cd415 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -78,12 +78,12 @@ python3.pkgs.buildPythonApplication rec { "test_parser" ]; - meta = with lib; { + meta = { description = "Tool for collecting vulnerability data from various sources"; homepage = "https://github.com/anchore/vunnel"; changelog = "https://github.com/anchore/vunnel/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "vunnel"; }; } diff --git a/pkgs/by-name/vz/vzic/package.nix b/pkgs/by-name/vz/vzic/package.nix index 4e645e096bbf..48ac5341b843 100644 --- a/pkgs/by-name/vz/vzic/package.nix +++ b/pkgs/by-name/vz/vzic/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/libical/vzic"; - description = "A program to convert the IANA timezone database files into VTIMEZONE files compatible with the iCalendar specification"; + description = "Program to convert the IANA timezone database files into VTIMEZONE files compatible with the iCalendar specification"; changelog = "https://github.com/libical/vzic/blob/${src.rev}/ChangeLog"; mainProgram = "vzic"; license = with lib.licenses; [ gpl2Plus ]; diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix index e20fffde7614..c589db734015 100644 --- a/pkgs/by-name/w3/w3m/package.nix +++ b/pkgs/by-name/w3/w3m/package.nix @@ -125,13 +125,13 @@ stdenv.mkDerivation rec { command = "w3m -version"; }; - meta = with lib; { + meta = { homepage = "https://w3m.sourceforge.net/"; changelog = "https://github.com/tats/w3m/blob/v${version}/ChangeLog"; description = "Text-mode web browser"; - maintainers = with maintainers; [ anthonyroussel ]; - platforms = platforms.unix; - license = licenses.mit; + maintainers = with lib.maintainers; [ anthonyroussel ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; mainProgram = "w3m"; }; } diff --git a/pkgs/by-name/wa/waf-tester/package.nix b/pkgs/by-name/wa/waf-tester/package.nix index f07758b17591..ab237d8f1459 100644 --- a/pkgs/by-name/wa/waf-tester/package.nix +++ b/pkgs/by-name/wa/waf-tester/package.nix @@ -31,12 +31,12 @@ buildGoModule rec { version = "waf-tester ${version}, commit none, built at unknown by unknown"; }; - meta = with lib; { + meta = { description = "Tool to test Web Application Firewalls (WAFs)"; mainProgram = "waf-tester"; homepage = "https://github.com/jreisinger/waf-tester"; changelog = "https://github.com/jreisinger/waf-tester/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/wa/wafw00f/package.nix b/pkgs/by-name/wa/wafw00f/package.nix index 1065c0f4f508..56fb0ced4e5d 100644 --- a/pkgs/by-name/wa/wafw00f/package.nix +++ b/pkgs/by-name/wa/wafw00f/package.nix @@ -28,12 +28,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "wafw00f" ]; - meta = with lib; { + meta = { description = "Tool to identify and fingerprint Web Application Firewalls (WAF)"; homepage = "https://github.com/EnableSecurity/wafw00f"; changelog = "https://github.com/EnableSecurity/wafw00f/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "wafw00f"; }; } diff --git a/pkgs/by-name/wa/wallabag/package.nix b/pkgs/by-name/wa/wallabag/package.nix index 8507debfb3f9..747ec30795df 100644 --- a/pkgs/by-name/wa/wallabag/package.nix +++ b/pkgs/by-name/wa/wallabag/package.nix @@ -42,17 +42,17 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "wallabag is a self hostable application for saving web pages"; longDescription = '' wallabag is a self-hostable PHP application allowing you to not miss any content anymore. Click, save and read it when you can. It extracts content so that you can read it when you have time. ''; - license = licenses.mit; - homepage = "http://wallabag.org"; + license = lib.licenses.mit; + homepage = "https://wallabag.org"; changelog = "https://github.com/wallabag/wallabag/releases/tag/${version}"; - maintainers = with maintainers; [ schneefux ]; - platforms = platforms.all; + maintainers = with lib.maintainers; [ schneefux ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/wa/watchdogd/package.nix b/pkgs/by-name/wa/watchdogd/package.nix index a725a78f7278..d66f8da8057f 100644 --- a/pkgs/by-name/wa/watchdogd/package.nix +++ b/pkgs/by-name/wa/watchdogd/package.nix @@ -32,12 +32,12 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) watchdogd; }; - meta = with lib; { + meta = { description = "Advanced system & process supervisor for Linux"; homepage = "https://troglobit.com/watchdogd.html"; changelog = "https://github.com/troglobit/watchdogd/releases/tag/${version}"; - license = licenses.isc; - platforms = platforms.linux; - maintainers = with maintainers; [ vifino ]; + license = lib.licenses.isc; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ vifino ]; }; } diff --git a/pkgs/by-name/wa/wavpack/package.nix b/pkgs/by-name/wa/wavpack/package.nix index 3dbe41e1d949..18618982b0fe 100644 --- a/pkgs/by-name/wa/wavpack/package.nix +++ b/pkgs/by-name/wa/wavpack/package.nix @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { "man" ]; - meta = with lib; { + meta = { description = "Hybrid audio compression format"; homepage = "https://www.wavpack.com/"; changelog = "https://github.com/dbry/WavPack/releases/tag/${version}"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ codyopel ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ codyopel ]; }; } diff --git a/pkgs/by-name/wa/wayvnc/package.nix b/pkgs/by-name/wa/wayvnc/package.nix index f19832b77740..62e82dba79af 100644 --- a/pkgs/by-name/wa/wayvnc/package.nix +++ b/pkgs/by-name/wa/wayvnc/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { description = "VNC server for wlroots based Wayland compositors"; longDescription = '' This is a VNC server for wlroots based Wayland compositors. It attaches @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { mainProgram = "wayvnc"; inherit (src.meta) homepage; changelog = "https://github.com/any1/wayvnc/releases/tag/v${version}"; - license = licenses.isc; - platforms = platforms.linux; - maintainers = with maintainers; [ nickcao ]; + license = lib.licenses.isc; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ nickcao ]; }; } diff --git a/pkgs/by-name/wb/wbg/package.nix b/pkgs/by-name/wb/wbg/package.nix index 47f8ac7844d4..c20f6ecbc9ac 100644 --- a/pkgs/by-name/wb/wbg/package.nix +++ b/pkgs/by-name/wb/wbg/package.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { "-Wno-error=maybe-uninitialized" ]; - meta = with lib; { + meta = { description = "Wallpaper application for Wayland compositors"; homepage = "https://codeberg.org/dnkl/wbg"; changelog = "https://codeberg.org/dnkl/wbg/releases/tag/${version}"; - license = licenses.isc; - maintainers = with maintainers; [ ]; - platforms = with platforms; linux; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; mainProgram = "wbg"; }; } diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix index 767b2c0c7dd2..efa8b6dcc26d 100644 --- a/pkgs/by-name/wc/wchisp/package.nix +++ b/pkgs/by-name/wc/wchisp/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { }; meta = { - description = "A command-line implementation of WCHISPTool, for flashing ch32 MCUs"; + description = "Command-line implementation of WCHISPTool, for flashing ch32 MCUs"; homepage = "https://ch32-rs.github.io/wchisp/"; changelog = "https://github.com/ch32-rs/wchisp/releases/tag/v${version}"; license = with lib.licenses; [ gpl2Only ]; diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index 56672781d455..a4a2aa14632d 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "A Beautiful Private and Secure Desktop Investment Tracking Application"; + description = "Beautiful Private and Secure Desktop Investment Tracking Application"; homepage = "https://wealthfolio.app/"; license = lib.licenses.agpl3Only; mainProgram = "wealthfolio"; diff --git a/pkgs/by-name/we/webanalyze/package.nix b/pkgs/by-name/we/webanalyze/package.nix index 906a94e6cc42..ecd0525d747a 100644 --- a/pkgs/by-name/we/webanalyze/package.nix +++ b/pkgs/by-name/we/webanalyze/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { vendorHash = "sha256-XPOsC+HoLytgv1fhAaO5HYSvuOP6OhjLyOYTfiD64QI="; - meta = with lib; { + meta = { description = "Tool to uncover technologies used on websites"; homepage = "https://github.com/rverton/webanalyze"; changelog = "https://github.com/rverton/webanalyze/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "webanalyze"; }; } diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix index e61cb8d5deee..244def175a97 100644 --- a/pkgs/by-name/we/webcord/package.nix +++ b/pkgs/by-name/we/webcord/package.nix @@ -80,7 +80,7 @@ buildNpmPackage rec { passthru.updateScript = ./update.sh; meta = { - description = "A Discord and SpaceBar electron-based client implemented without Discord API"; + description = "Discord and SpaceBar electron-based client implemented without Discord API"; homepage = "https://github.com/SpacingBat3/WebCord"; downloadPage = "https://github.com/SpacingBat3/WebCord/releases"; changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}"; diff --git a/pkgs/by-name/we/websecprobe/package.nix b/pkgs/by-name/we/websecprobe/package.nix index 893954cd77db..8b9a59dfd1ed 100644 --- a/pkgs/by-name/we/websecprobe/package.nix +++ b/pkgs/by-name/we/websecprobe/package.nix @@ -28,13 +28,13 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "WebSecProbe" ]; - meta = with lib; { + meta = { description = "Web Security Assessment Tool"; homepage = "https://github.com/spyboy-productions/WebSecProbe/"; changelog = "https://github.com/spyboy-productions/WebSecProbe/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "websecprobe"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/we/websocat/package.nix b/pkgs/by-name/we/websocat/package.nix index f00d2aef05f3..f0cb9eea6b99 100644 --- a/pkgs/by-name/we/websocat/package.nix +++ b/pkgs/by-name/we/websocat/package.nix @@ -53,12 +53,12 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - meta = with lib; { + meta = { description = "Command-line client for WebSockets (like netcat/socat)"; homepage = "https://github.com/vi/websocat"; changelog = "https://github.com/vi/websocat/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thoughtpolice Br1ght0ne ]; diff --git a/pkgs/by-name/we/websploit/package.nix b/pkgs/by-name/we/websploit/package.nix index aafccf28a69e..f6f7cb1e79c2 100644 --- a/pkgs/by-name/we/websploit/package.nix +++ b/pkgs/by-name/we/websploit/package.nix @@ -32,12 +32,12 @@ python3.pkgs.buildPythonApplication rec { "websploit" ]; - meta = with lib; { + meta = { description = "High level MITM framework"; homepage = "https://github.com/f4rih/websploit"; changelog = "https://github.com/f4rih/websploit/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ emilytrau ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ emilytrau ]; mainProgram = "websploit"; }; } diff --git a/pkgs/by-name/we/weggli/package.nix b/pkgs/by-name/we/weggli/package.nix index 2f12a878274e..4ba092e2ac1e 100644 --- a/pkgs/by-name/we/weggli/package.nix +++ b/pkgs/by-name/we/weggli/package.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage rec { version = "weggli ${version}"; }; - meta = with lib; { + meta = { description = "Weggli is a fast and robust semantic search tool for C and C++ codebases"; homepage = "https://github.com/weggli-rs/weggli"; changelog = "https://github.com/weggli-rs/weggli/releases/tag/v${version}"; mainProgram = "weggli"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ arturcygan mfrw ]; diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix index 0cde796af895..2afddc259ab2 100644 --- a/pkgs/by-name/we/wemeet/package.nix +++ b/pkgs/by-name/we/wemeet/package.nix @@ -45,13 +45,13 @@ let wemeet-wayland-screenshare = stdenv.mkDerivation { pname = "wemeet-wayland-screenshare"; - version = "0-unstable-2025-01-06"; + version = "0-unstable-2025-05-31"; src = fetchFromGitHub { owner = "xuwd1"; repo = "wemeet-wayland-screenshare"; - rev = "ab226c63380c4233e2f490ba17e6ea8f393999e2"; - hash = "sha256-nBkbyy0VGOaPNVsEA02bSlTI6eQoVr/QVpEEpCuFdUw="; + rev = "7f338966e162612b09d838512b11af5901414d05"; + hash = "sha256-UtPcgEa+9KrF4CblC8D4oClvVJs+a5DWtwH/fD7puVs="; fetchSubmodules = true; }; @@ -83,8 +83,8 @@ let }; }; + # for mitigating file transfer crashes libwemeetwrap = stdenv.mkDerivation { - # for mitigating file transfer crashes pname = "libwemeetwrap"; version = "0-unstable-2023-12-14"; @@ -96,9 +96,7 @@ let dontWrapQtApps = true; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl diff --git a/pkgs/by-name/wf/wf-recorder/package.nix b/pkgs/by-name/wf/wf-recorder/package.nix index c52dc85fa9a5..94957e0b341b 100644 --- a/pkgs/by-name/wf/wf-recorder/package.nix +++ b/pkgs/by-name/wf/wf-recorder/package.nix @@ -53,13 +53,13 @@ stdenv.mkDerivation rec { libgbm ]; - meta = with lib; { + meta = { description = "Utility program for screen recording of wlroots-based compositors"; inherit (src.meta) homepage; changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ dywedir ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dywedir ]; + platforms = lib.platforms.linux; mainProgram = "wf-recorder"; }; } diff --git a/pkgs/by-name/wg/wg-access-server/package.nix b/pkgs/by-name/wg/wg-access-server/package.nix index b77bc0acab69..e93eb4db7c74 100644 --- a/pkgs/by-name/wg/wg-access-server/package.nix +++ b/pkgs/by-name/wg/wg-access-server/package.nix @@ -66,7 +66,7 @@ buildGoModule rec { }; meta = with lib; { - description = "An all-in-one WireGuard VPN solution with a web ui for connecting devices"; + description = "All-in-one WireGuard VPN solution with a web ui for connecting devices"; homepage = "https://github.com/freifunkMUC/wg-access-server"; license = licenses.mit; maintainers = with maintainers; [ xanderio ]; diff --git a/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix index 8577be591b41..e21a419b5206 100644 --- a/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix +++ b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication { vobject ]; - meta = with lib; { + meta = { homepage = "https://github.com/KnugiHK/Whatsapp-Chat-Exporter"; description = "WhatsApp database parser"; changelog = "https://github.com/KnugiHK/Whatsapp-Chat-Exporter/releases/tag/${version}"; @@ -36,9 +36,9 @@ python3Packages.buildPythonApplication { you the history of your WhatsApp conversations inHTML and JSON. Android Backup Crypt12, Crypt14 and Crypt15 supported. ''; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "wtsexporter"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ bbenno EstebanMacanek ]; diff --git a/pkgs/by-name/wh/whatsapp-for-mac/package.nix b/pkgs/by-name/wh/whatsapp-for-mac/package.nix index 674b2322e0e2..e38f52ffd13e 100644 --- a/pkgs/by-name/wh/whatsapp-for-mac/package.nix +++ b/pkgs/by-name/wh/whatsapp-for-mac/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "whatsapp-for-mac"; - version = "2.24.23.82"; + version = "2.25.16.81"; src = fetchzip { extension = "zip"; name = "WhatsApp.app"; url = "https://web.whatsapp.com/desktop/mac_native/release/?version=${finalAttrs.version}&extension=zip&configuration=Release&branch=relbranch"; - hash = "sha256-FnXW3l4JUdJkDQ7eASlDeUzRdZ2N5l3WvEKcuBuE0nY="; + hash = "sha256-CZcMYWyBpusM+NUlMC2du01cq3uqXvMiIdOienLn/nM="; }; dontConfigure = true; diff --git a/pkgs/by-name/wh/whoogle-search/package.nix b/pkgs/by-name/wh/whoogle-search/package.nix index d6eaf4bdb742..68706f230c80 100644 --- a/pkgs/by-name/wh/whoogle-search/package.nix +++ b/pkgs/by-name/wh/whoogle-search/package.nix @@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec { meta = { homepage = "https://github.com/benbusby/whoogle-search"; - description = "A self-hosted, ad-free, privacy-respecting metasearch engine"; + description = "Self-hosted, ad-free, privacy-respecting metasearch engine"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ malte-v ]; mainProgram = "whoogle-search"; diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix index e91f348c20f9..8a7bb56adeb9 100644 --- a/pkgs/by-name/wi/widelands/package.nix +++ b/pkgs/by-name/wi/widelands/package.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { installManPage ../xdg/widelands.6 ''; - meta = with lib; { + meta = { description = "RTS with multiple-goods economy"; homepage = "https://widelands.org/"; longDescription = '' @@ -102,12 +102,12 @@ stdenv.mkDerivation rec { ''; changelog = "https://github.com/widelands/widelands/releases/tag/v${version}"; mainProgram = "widelands"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ raskin jcumming ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; hydraPlatforms = [ ]; }; } diff --git a/pkgs/by-name/wi/wiki-tui/package.nix b/pkgs/by-name/wi/wiki-tui/package.nix index 7257c65b558e..fbe5e76b571d 100644 --- a/pkgs/by-name/wi/wiki-tui/package.nix +++ b/pkgs/by-name/wi/wiki-tui/package.nix @@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Pe6mNbn4GFjhpFZeWMlaRt7Bj5BLiIy789hXWkII2ps="; - meta = with lib; { + meta = { description = "Simple and easy to use Wikipedia Text User Interface"; homepage = "https://github.com/builditluc/wiki-tui"; changelog = "https://github.com/Builditluc/wiki-tui/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lom builditluc matthiasbeyer diff --git a/pkgs/by-name/wi/win2xcur/package.nix b/pkgs/by-name/wi/win2xcur/package.nix index f93b064d00e6..1cd7486439c6 100644 --- a/pkgs/by-name/wi/win2xcur/package.nix +++ b/pkgs/by-name/wi/win2xcur/package.nix @@ -20,11 +20,11 @@ python3Packages.buildPythonPackage rec { wand ]; - meta = with lib; { + meta = { description = "Tools that convert cursors between the Windows (*.cur, *.ani) and Xcursor format"; homepage = "https://github.com/quantum5/win2xcur"; changelog = "https://github.com/quantum5/win2xcur/releases/tag/v${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ teatwig ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ teatwig ]; }; } diff --git a/pkgs/by-name/wi/wishlist/package.nix b/pkgs/by-name/wi/wishlist/package.nix index cbb5a316614f..70e6459f27f1 100644 --- a/pkgs/by-name/wi/wishlist/package.nix +++ b/pkgs/by-name/wi/wishlist/package.nix @@ -25,12 +25,12 @@ buildGoModule rec { "-X=main.Version=${version}" ]; - meta = with lib; { + meta = { description = "Single entrypoint for multiple SSH endpoints"; homepage = "https://github.com/charmbracelet/wishlist"; changelog = "https://github.com/charmbracelet/wishlist/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ caarlos0 penguwin ]; diff --git a/pkgs/by-name/wi/witness/package.nix b/pkgs/by-name/wi/witness/package.nix index 39e7cb72aae3..51bb59b5cc35 100644 --- a/pkgs/by-name/wi/witness/package.nix +++ b/pkgs/by-name/wi/witness/package.nix @@ -52,7 +52,7 @@ buildGoModule rec { version = "v${version}"; }; - meta = with lib; { + meta = { description = "Pluggable framework for software supply chain security. Witness prevents tampering of build materials and verifies the integrity of the build process from source to target"; longDescription = '' Witness prevents tampering of build materials and verifies the integrity @@ -66,8 +66,8 @@ buildGoModule rec { mainProgram = "witness"; homepage = "https://github.com/testifysec/witness"; changelog = "https://github.com/testifysec/witness/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fkautz jk ]; diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix index 6be3a80dbc25..050076e10d28 100644 --- a/pkgs/by-name/wi/wivrn/package.nix +++ b/pkgs/by-name/wi/wivrn/package.nix @@ -188,7 +188,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "An OpenXR streaming application to a standalone headset"; + description = "OpenXR streaming application to a standalone headset"; homepage = "https://github.com/WiVRn/WiVRn/"; changelog = "https://github.com/WiVRn/WiVRn/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/wl/wl-clipboard-rs/package.nix b/pkgs/by-name/wl/wl-clipboard-rs/package.nix index 2fc26e2c3836..29f59538cc6d 100644 --- a/pkgs/by-name/wl/wl-clipboard-rs/package.nix +++ b/pkgs/by-name/wl/wl-clipboard-rs/package.nix @@ -75,17 +75,17 @@ rustPlatform.buildRustPackage rec { --zsh target/completions/_wl-paste ''; - meta = with lib; { + meta = { description = "Command-line copy/paste utilities for Wayland, written in Rust"; homepage = "https://github.com/YaLTeR/wl-clipboard-rs"; changelog = "https://github.com/YaLTeR/wl-clipboard-rs/blob/v${version}/CHANGELOG.md"; - platforms = platforms.linux; - license = with licenses; [ + platforms = lib.platforms.linux; + license = with lib.licenses; [ asl20 mit ]; mainProgram = "wl-clip"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ thiagokokada donovanglover ]; diff --git a/pkgs/by-name/wl/wl-crosshair/package.nix b/pkgs/by-name/wl/wl-crosshair/package.nix index adf8d08bf3ca..e1a00e98e408 100644 --- a/pkgs/by-name/wl/wl-crosshair/package.nix +++ b/pkgs/by-name/wl/wl-crosshair/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { ''; meta = { - description = "A crosshair overlay for wlroots compositor"; + description = "Crosshair overlay for wlroots compositor"; homepage = "https://github.com/lelgenio/wl-crosshair"; license = lib.licenses.unfree; # didn't found a license mainProgram = "wl-crosshair"; diff --git a/pkgs/by-name/wl/wlsunset/package.nix b/pkgs/by-name/wl/wlsunset/package.nix index c79382a36a4e..e46433eb715d 100644 --- a/pkgs/by-name/wl/wlsunset/package.nix +++ b/pkgs/by-name/wl/wlsunset/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { wayland-protocols ]; - meta = with lib; { + meta = { description = "Day/night gamma adjustments for Wayland"; longDescription = '' Day/night gamma adjustments for Wayland compositors supporting @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://sr.ht/~kennylevinsen/wlsunset/"; changelog = "https://git.sr.ht/~kennylevinsen/wlsunset/refs/${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ primeos ]; mainProgram = "wlsunset"; }; } diff --git a/pkgs/by-name/wo/wob/package.nix b/pkgs/by-name/wo/wob/package.nix index 9c1ab6114cf3..dd01c61248aa 100644 --- a/pkgs/by-name/wo/wob/package.nix +++ b/pkgs/by-name/wo/wob/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { mesonFlags = lib.optional stdenv.hostPlatform.isLinux "-Dseccomp=enabled"; - meta = with lib; { + meta = { inherit (src.meta) homepage; description = "Lightweight overlay bar for Wayland"; longDescription = '' @@ -53,9 +53,9 @@ stdenv.mkDerivation rec { inspired by xob. ''; changelog = "https://github.com/francma/wob/releases/tag/${version}"; - license = licenses.isc; - maintainers = with maintainers; [ primeos ]; - platforms = platforms.linux; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ primeos ]; + platforms = lib.platforms.linux; mainProgram = "wob"; }; } diff --git a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix index 31f5d450ff34..73e5abc30e12 100644 --- a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix +++ b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix @@ -32,12 +32,12 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = woodpecker-plugin-git; }; - meta = with lib; { + meta = { description = "Woodpecker plugin for cloning Git repositories"; homepage = "https://woodpecker-ci.org/"; changelog = "https://github.com/woodpecker-ci/plugin-git/releases/tag/${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "plugin-git"; - maintainers = with maintainers; [ ambroisie ]; + maintainers = with lib.maintainers; [ ambroisie ]; }; } diff --git a/pkgs/by-name/wo/wormhole-william/package.nix b/pkgs/by-name/wo/wormhole-william/package.nix index aedb6c88177a..042627610880 100644 --- a/pkgs/by-name/wo/wormhole-william/package.nix +++ b/pkgs/by-name/wo/wormhole-william/package.nix @@ -37,12 +37,12 @@ buildGoModule rec { --zsh <($out/bin/wormhole-william shell-completion zsh) ''; - meta = with lib; { + meta = { homepage = "https://github.com/psanford/wormhole-william"; description = "End-to-end encrypted file transfers"; changelog = "https://github.com/psanford/wormhole-william/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ psanford ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ psanford ]; mainProgram = "wormhole-william"; }; } diff --git a/pkgs/by-name/wp/wp-cli/package.nix b/pkgs/by-name/wp/wp-cli/package.nix index c2ce0e6a9d3f..cdd3f8eb5f00 100644 --- a/pkgs/by-name/wp/wp-cli/package.nix +++ b/pkgs/by-name/wp/wp-cli/package.nix @@ -75,13 +75,13 @@ stdenv.mkDerivation (finalAttrs: { $out/bin/wp --info ''; - meta = with lib; { + meta = { description = "Command line interface for WordPress"; homepage = "https://wp-cli.org"; - changelog = "https://github.com/wp-cli/wp-cli/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; + changelog = "https://github.com/wp-cli/wp-cli/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ peterhoeg ]; + platforms = lib.platforms.all; mainProgram = "wp"; }; }) diff --git a/pkgs/by-name/ws/wsl-vpnkit/package.nix b/pkgs/by-name/ws/wsl-vpnkit/package.nix index 22d4b341d496..ee3eeb5a39cb 100644 --- a/pkgs/by-name/ws/wsl-vpnkit/package.nix +++ b/pkgs/by-name/ws/wsl-vpnkit/package.nix @@ -75,12 +75,12 @@ resholve.mkDerivation { }; }; - meta = with lib; { + meta = { description = "Provides network connectivity to Windows Subsystem for Linux (WSL) when blocked by VPN"; homepage = "https://github.com/sakai135/wsl-vpnkit"; changelog = "https://github.com/sakai135/wsl-vpnkit/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ terlar ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ terlar ]; mainProgram = "wsl-vpnkit"; }; } diff --git a/pkgs/by-name/ws/wslu/package.nix b/pkgs/by-name/ws/wslu/package.nix index 43fb9cbbfafc..ecd287cf3873 100644 --- a/pkgs/by-name/ws/wslu/package.nix +++ b/pkgs/by-name/ws/wslu/package.nix @@ -34,12 +34,12 @@ stdenv.mkDerivation rec { "PREFIX=" ]; - meta = with lib; { + meta = { description = "Collection of utilities for Windows Subsystem for Linux"; homepage = "https://github.com/wslutilities/wslu"; changelog = "https://github.com/wslutilities/wslu/releases/tag/v${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ jamiemagee ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ jamiemagee ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/wt/wtfutil/package.nix b/pkgs/by-name/wt/wtfutil/package.nix index d4f638264b13..49066e647a2b 100644 --- a/pkgs/by-name/wt/wtfutil/package.nix +++ b/pkgs/by-name/wt/wtfutil/package.nix @@ -50,16 +50,16 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Personal information dashboard for your terminal"; homepage = "https://wtfutil.com/"; changelog = "https://github.com/wtfutil/wtf/raw/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ xiaoxiangmoe kalbasit ]; mainProgram = "wtfutil"; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/wu/wush/package.nix b/pkgs/by-name/wu/wush/package.nix index 884c0e590143..9990bd6ed676 100644 --- a/pkgs/by-name/wu/wush/package.nix +++ b/pkgs/by-name/wu/wush/package.nix @@ -25,12 +25,12 @@ buildGoModule { env.CGO_ENABLED = 0; - meta = with lib; { + meta = { homepage = "https://github.com/coder/wush"; description = "Transfer files between computers via WireGuard"; changelog = "https://github.com/coder/wush/releases/tag/v${version}"; - license = licenses.cc0; + license = lib.licenses.cc0; mainProgram = "wush"; - maintainers = with maintainers; [ abbe ]; + maintainers = with lib.maintainers; [ abbe ]; }; } diff --git a/pkgs/by-name/wv/wvdial/package.nix b/pkgs/by-name/wv/wvdial/package.nix index c71addca1a9b..6ca28d07665d 100644 --- a/pkgs/by-name/wv/wvdial/package.nix +++ b/pkgs/by-name/wv/wvdial/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ]; meta = { - description = "A dialer that automatically recognises the modem"; + description = "Dialer that automatically recognises the modem"; homepage = "https://gitea.osmocom.org/retronetworking/wvdial"; license = lib.licenses.lgpl2; maintainers = with lib.maintainers; [ flokli ]; diff --git a/pkgs/by-name/wy/wyoming-faster-whisper/package.nix b/pkgs/by-name/wy/wyoming-faster-whisper/package.nix index eed7fed90f28..654491f0bbba 100644 --- a/pkgs/by-name/wy/wyoming-faster-whisper/package.nix +++ b/pkgs/by-name/wy/wyoming-faster-whisper/package.nix @@ -37,12 +37,12 @@ python3Packages.buildPythonApplication rec { # no tests doCheck = false; - meta = with lib; { + meta = { changelog = "https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v${version}"; description = "Wyoming Server for Faster Whisper"; homepage = "https://github.com/rhasspy/wyoming-faster-whisper"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; mainProgram = "wyoming-faster-whisper"; }; } diff --git a/pkgs/by-name/wy/wyoming-openwakeword/package.nix b/pkgs/by-name/wy/wyoming-openwakeword/package.nix index 83339d62cee5..3bd4d66c7431 100644 --- a/pkgs/by-name/wy/wyoming-openwakeword/package.nix +++ b/pkgs/by-name/wy/wyoming-openwakeword/package.nix @@ -37,12 +37,12 @@ python3Packages.buildPythonApplication rec { "wyoming_openwakeword" ]; - meta = with lib; { + meta = { changelog = "https://github.com/rhasspy/wyoming-openwakeword/blob/v${version}/CHANGELOG.md"; description = "Open source voice assistant toolkit for many human languages"; homepage = "https://github.com/rhasspy/wyoming-openwakeword"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; mainProgram = "wyoming-openwakeword"; }; } diff --git a/pkgs/by-name/xa/xandikos/package.nix b/pkgs/by-name/xa/xandikos/package.nix index 0a686691caa3..e522d56bee4e 100644 --- a/pkgs/by-name/xa/xandikos/package.nix +++ b/pkgs/by-name/xa/xandikos/package.nix @@ -39,12 +39,12 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Lightweight CalDAV/CardDAV server"; homepage = "https://github.com/jelmer/xandikos"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; changelog = "https://github.com/jelmer/xandikos/blob/v${version}/NEWS"; - maintainers = with maintainers; [ _0x4A6F ]; + maintainers = with lib.maintainers; [ _0x4A6F ]; mainProgram = "xandikos"; }; } diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix index 68267014c683..61b25b6c15f2 100644 --- a/pkgs/by-name/xa/xar/package.nix +++ b/pkgs/by-name/xa/xar/package.nix @@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/apple-oss-distributions/xar"; - description = "An easily extensible archive format"; + description = "Easily extensible archive format"; license = lib.licenses.bsd3; maintainers = lib.attrValues { inherit (lib.maintainers) tie; }; teams = [ lib.teams.darwin ]; diff --git a/pkgs/by-name/xc/xcat/package.nix b/pkgs/by-name/xc/xcat/package.nix index 085b9f874f7b..4c55b587b193 100644 --- a/pkgs/by-name/xc/xcat/package.nix +++ b/pkgs/by-name/xc/xcat/package.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; pythonImportsCheck = [ "xcat" ]; - meta = with lib; { + meta = { description = "XPath injection tool"; mainProgram = "xcat"; longDescription = '' @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://github.com/orf/xcat"; changelog = "https://github.com/orf/xcat/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/xc/xcowsay/package.nix b/pkgs/by-name/xc/xcowsay/package.nix index 0802fe96c877..9d002fbcdbb2 100644 --- a/pkgs/by-name/xc/xcowsay/package.nix +++ b/pkgs/by-name/xc/xcowsay/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.doof.me.uk/xcowsay"; + homepage = "https://www.doof.me.uk/xcowsay"; description = "Tool to display a cute cow and messages"; license = licenses.gpl3Plus; maintainers = with maintainers; [ das_j ]; diff --git a/pkgs/by-name/xc/xcrawl3r/package.nix b/pkgs/by-name/xc/xcrawl3r/package.nix index 90dabee0168c..c81aba9fd2d5 100644 --- a/pkgs/by-name/xc/xcrawl3r/package.nix +++ b/pkgs/by-name/xc/xcrawl3r/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "CLI utility to recursively crawl webpages"; homepage = "https://github.com/hueristiq/xcrawl3r"; changelog = "https://github.com/hueristiq/xcrawl3r/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "xcrawl3r"; }; } diff --git a/pkgs/by-name/xe/xed/package.nix b/pkgs/by-name/xe/xed/package.nix index 1bb99548bb5e..a880dbb718e2 100644 --- a/pkgs/by-name/xe/xed/package.nix +++ b/pkgs/by-name/xe/xed/package.nix @@ -4,56 +4,92 @@ fetchFromGitHub, python3Packages, llvmPackages, + installShellFiles, + nix-update-script, }: let # mbuild is a custom build system used only to build xed mbuild = python3Packages.buildPythonPackage rec { pname = "mbuild"; - version = "2022.07.28"; + version = "2024.11.04"; src = fetchFromGitHub { owner = "intelxed"; repo = "mbuild"; - rev = "v${version}"; - sha256 = "sha256-nVHHiaPbf+b+RntjUGjLLGS53e6c+seXIBx7AcTtiWU="; + tag = "v${version}"; + hash = "sha256-iQVykBG3tEPxI1HmqBkvO1q+K8vi64qBfVC63/rcTOk="; + }; + + meta = { + description = "Python-based build system used for building XED"; + homepage = "https://github.com/intelxed/mbuild"; + license = lib.licenses.asl20; }; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xed"; - version = "2024.02.22"; + version = "2025.03.02"; src = fetchFromGitHub { owner = "intelxed"; repo = "xed"; - rev = "v${version}"; - sha256 = "sha256-LF4iJ1/Z3OifCiir/kU3ufZqtiRLeaJeAwuBqP2BCF4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-shQYgbUC06+x+3TNdOJA6y6Wea/8lqexkgBWk3AOOMA="; }; + postPatch = '' + patchShebangs mfile.py + ''; + nativeBuildInputs = [ mbuild + installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.bintools ]; buildPhase = '' - patchShebangs mfile.py + runHook preBuild # this will build, test and install ./mfile.py test --prefix $out - ./mfile.py examples - mkdir -p $out/bin - cp ./obj/wkit/examples/obj/xed $out/bin/ + + runHook postBuild ''; - dontInstall = true; # already installed during buildPhase + checkPhase = '' + runHook preCheck - meta = with lib; { + ./mfile.py examples + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + installBin obj/wkit/examples/obj/xed + + runHook postInstall + ''; + + passthru = { + inherit mbuild; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "mbuild" + ]; + }; + }; + + meta = { broken = stdenv.hostPlatform.isAarch64; description = "Intel X86 Encoder Decoder (Intel XED)"; homepage = "https://intelxed.github.io/"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ arturcygan ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ arturcygan ]; }; -} +}) diff --git a/pkgs/by-name/xe/xeol/package.nix b/pkgs/by-name/xe/xeol/package.nix index 33d5ee2ff070..4ae000b5cb52 100644 --- a/pkgs/by-name/xe/xeol/package.nix +++ b/pkgs/by-name/xe/xeol/package.nix @@ -29,12 +29,12 @@ buildGoModule rec { "-X=main.gitDescription=${src.rev}" ]; - meta = with lib; { + meta = { description = "Scanner for end-of-life (EOL) software and dependencies in container images, filesystems, and SBOMs"; homepage = "https://github.com/xeol-io/xeol"; changelog = "https://github.com/xeol-io/xeol/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "xeol"; }; } diff --git a/pkgs/by-name/xf/xfig/package.nix b/pkgs/by-name/xf/xfig/package.nix index f53ccd161b1f..f88b70103928 100644 --- a/pkgs/by-name/xf/xfig/package.nix +++ b/pkgs/by-name/xf/xfig/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { changelog = "https://sourceforge.net/p/mcj/xfig/ci/${version}/tree/CHANGES"; description = "Interactive drawing tool for X11"; mainProgram = "xfig"; diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix index 73e497710209..f4eb72204ff7 100644 --- a/pkgs/by-name/xi/xiu/package.nix +++ b/pkgs/by-name/xi/xiu/package.nix @@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; - meta = with lib; { + meta = { description = "Simple, high performance and secure live media server in pure Rust (RTMP[cluster]/RTSP/WebRTC[whip/whep]/HTTP-FLV/HLS"; homepage = "https://github.com/harlanc/xiu"; changelog = "https://github.com/harlanc/xiu/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ cafkafk ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ cafkafk ]; mainProgram = "xiu"; }; } diff --git a/pkgs/by-name/xm/xmind/package.nix b/pkgs/by-name/xm/xmind/package.nix index 52d03207c56a..b8b566917a60 100644 --- a/pkgs/by-name/xm/xmind/package.nix +++ b/pkgs/by-name/xm/xmind/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xmind"; - version = "25.01.01061-202501070800"; + version = "25.04.03523-202505300040"; src = fetchurl { url = "https://dl3.xmind.app/Xmind-for-Linux-amd64bit-${finalAttrs.version}.deb"; - hash = "sha256-Mp2aC/yHoB29t9QY4Tnbgn//J8Gordt5S1JrJn0BvXg="; + hash = "sha256-0Z6ygpIhu32pyXH2q0QE1oBu+SD7U8T0rFBk2icnoeM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xn/xnlinkfinder/package.nix b/pkgs/by-name/xn/xnlinkfinder/package.nix index 663f659aadd3..3aae5a3ad5c2 100644 --- a/pkgs/by-name/xn/xnlinkfinder/package.nix +++ b/pkgs/by-name/xn/xnlinkfinder/package.nix @@ -44,12 +44,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "xnLinkFinder" ]; - meta = with lib; { + meta = { description = "Tool to discover endpoints, potential parameters, and a target specific wordlist for a given target"; homepage = "https://github.com/xnl-h4ck3r/xnLinkFinder"; changelog = "https://github.com/xnl-h4ck3r/xnLinkFinder/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "xnLinkFinder"; }; } diff --git a/pkgs/by-name/xo/xortool/package.nix b/pkgs/by-name/xo/xortool/package.nix index b570a909e5f0..4ff1df19365c 100644 --- a/pkgs/by-name/xo/xortool/package.nix +++ b/pkgs/by-name/xo/xortool/package.nix @@ -28,11 +28,11 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "xortool" ]; - meta = with lib; { + meta = { description = "Tool to analyze multi-byte XOR cipher"; homepage = "https://github.com/hellman/xortool"; changelog = "https://github.com/hellman/xortool/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/xp/xpano/package.nix b/pkgs/by-name/xp/xpano/package.nix index 423d2cd20a87..5eb825e97099 100644 --- a/pkgs/by-name/xp/xpano/package.nix +++ b/pkgs/by-name/xp/xpano/package.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation rec { "-DXPANO_INSTALL_DESKTOP_FILES=ON" ]; - meta = with lib; { + meta = { description = "Panorama stitching tool"; mainProgram = "Xpano"; homepage = "https://krupkat.github.io/xpano/"; changelog = "https://github.com/krupkat/xpano/releases/tag/v${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ krupkat ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ krupkat ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 67c153fb2983..ceca00e58643 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -141,17 +141,17 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Cross-platform shell connection hub and remote file manager"; homepage = "https://github.com/xpipe-io/${pname}"; downloadPage = "https://github.com/xpipe-io/${pname}/releases/latest"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; changelog = "https://github.com/xpipe-io/${pname}/releases/tag/${version}"; license = [ - licenses.asl20 - licenses.unfree + lib.licenses.asl20 + lib.licenses.unfree ]; - maintainers = with maintainers; [ crschnick ]; + maintainers = with lib.maintainers; [ crschnick ]; platforms = [ "x86_64-linux" ]; mainProgram = pname; }; diff --git a/pkgs/by-name/xs/xsubfind3r/package.nix b/pkgs/by-name/xs/xsubfind3r/package.nix index c70444ee16c6..69262896eec8 100644 --- a/pkgs/by-name/xs/xsubfind3r/package.nix +++ b/pkgs/by-name/xs/xsubfind3r/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "CLI utility to find subdomains from curated passive online sources"; homepage = "https://github.com/hueristiq/xsubfind3r"; changelog = "https://github.com/hueristiq/xsubfind3r/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "xsubfind3r"; }; } diff --git a/pkgs/by-name/xu/xurls/package.nix b/pkgs/by-name/xu/xurls/package.nix index b507226e60d6..3b9dc3f1f9c2 100644 --- a/pkgs/by-name/xu/xurls/package.nix +++ b/pkgs/by-name/xu/xurls/package.nix @@ -1,31 +1,32 @@ { - buildGoModule, lib, + buildGoModule, fetchFromGitHub, }: -buildGoModule { +buildGoModule (finalAttrs: { pname = "xurls"; - version = "2.5.0-unstable-2024-11-03"; + version = "2.6.0"; src = fetchFromGitHub { owner = "mvdan"; repo = "xurls"; - rev = "7c973a26c7bd6ecd8d86bb435d93ff98df2710fa"; - sha256 = "sha256-jZmlM9rs+N0ks7msmb3eJ96aTYp0qUo/1bgLAgHnvSo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-cfiMrJuzm5wpVKSyhta4ovARbp5B6K30l3+I/KOsZM4="; }; - vendorHash = "sha256-W6Z1E6a+qBdOuyHoiT6YA+CAJHBJ0FTYH8AntiKvVBY="; + vendorHash = "sha256-Bks47kusGgVsbNiLq3QxP/dhIp72HGYeMhdifFwY340="; ldflags = [ "-s" "-w" ]; - meta = with lib; { + meta = { description = "Extract urls from text"; homepage = "https://github.com/mvdan/xurls"; - maintainers = with maintainers; [ koral ]; - license = licenses.bsd3; + mainProgram = "xurls"; + maintainers = with lib.maintainers; [ koral ]; + license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/by-name/xv/xva-img/package.nix b/pkgs/by-name/xv/xva-img/package.nix index 64b3c36e9212..13cf40683e32 100644 --- a/pkgs/by-name/xv/xva-img/package.nix +++ b/pkgs/by-name/xv/xva-img/package.nix @@ -1,25 +1,29 @@ { - stdenv, lib, + stdenv, cmake, fetchFromGitHub, openssl, + xxHash, }: stdenv.mkDerivation rec { pname = "xva-img"; - version = "1.4.2"; + version = "1.5"; src = fetchFromGitHub { owner = "eriklax"; repo = "xva-img"; - rev = version; - sha256 = "sha256-QHCKGsHSMT2P64No1IUCjenm1XZMSgEvsJGJOyHFZS8="; + tag = version; + hash = "sha256-YyWfN6VcEABmzHkkoA/kRehLum1UxsNJ58XBs1pl+c8="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + xxHash + ]; meta = { maintainers = with lib.maintainers; [ willibutz ]; diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix index 03d0655b1fd5..831c2589c255 100644 --- a/pkgs/by-name/ya/yaml-language-server/package.nix +++ b/pkgs/by-name/ya/yaml-language-server/package.nix @@ -1,28 +1,28 @@ { lib, + stdenv, fetchFromGitHub, fetchYarnDeps, fixup-yarn-lock, makeWrapper, nodejs, writableTmpDirAsHomeHook, - stdenv, yarn, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yaml-language-server"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "yaml-language-server"; - tag = version; - hash = "sha256-YGPktMZxYi6eihCDc8JIfN/Ht2uu3wGKoKPJWlDKu+g="; + tag = finalAttrs.version; + hash = "sha256-HBhoadWIebeuHZXSdnFiPMSmDla77yhrTNMdz8si88c="; }; offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-2OVxvvijnfB8Bytgoaybyx4p66nD/aahtyjxLf8womE="; }; @@ -72,11 +72,11 @@ stdenv.mkDerivation rec { ''; meta = { - changelog = "https://github.com/redhat-developer/yaml-language-server/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/redhat-developer/yaml-language-server/blob/${finalAttrs.src.rev}/CHANGELOG.md"; description = "Language Server for YAML Files"; homepage = "https://github.com/redhat-developer/yaml-language-server"; license = lib.licenses.mit; mainProgram = "yaml-language-server"; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix index cadab5c8ba7d..937b4c764616 100644 --- a/pkgs/by-name/ya/yamlfmt/package.nix +++ b/pkgs/by-name/ya/yamlfmt/package.nix @@ -30,12 +30,12 @@ buildGoModule rec { package = yamlfmt; }; - meta = with lib; { + meta = { description = "Extensible command line tool or library to format yaml files"; homepage = "https://github.com/google/yamlfmt"; changelog = "https://github.com/google/yamlfmt/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ sno2wman ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sno2wman ]; mainProgram = "yamlfmt"; }; } diff --git a/pkgs/by-name/ya/yamlpath/package.nix b/pkgs/by-name/ya/yamlpath/package.nix index 9f5fa770d681..36d46665e8a1 100644 --- a/pkgs/by-name/ya/yamlpath/package.nix +++ b/pkgs/by-name/ya/yamlpath/package.nix @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { "yamlpath" ]; - meta = with lib; { + meta = { description = "Command-line processors for YAML/JSON/Compatible data"; homepage = "https://github.com/wwkimball/yamlpath"; changelog = "https://github.com/wwkimball/yamlpath/releases/tag/v${version}"; @@ -45,8 +45,8 @@ python3.pkgs.buildPythonApplication rec { Command-line get/set/merge/validate/scan/convert/diff processors for YAML/JSON/Compatible data using powerful, intuitive, command-line friendly syntax ''; - license = licenses.isc; - maintainers = with maintainers; [ Flakebi ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ Flakebi ]; # No support for ruamel.yaml > 0.17.21 # https://github.com/wwkimball/yamlpath/issues/217 diff --git a/pkgs/by-name/ya/yara/package.nix b/pkgs/by-name/ya/yara/package.nix index 34574c744c14..2e9417d235b5 100644 --- a/pkgs/by-name/ya/yara/package.nix +++ b/pkgs/by-name/ya/yara/package.nix @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { doCheck = enableStatic; - meta = with lib; { + meta = { description = "Tool to perform pattern matching for malware-related tasks"; homepage = "http://Virustotal.github.io/yara/"; changelog = "https://github.com/VirusTotal/yara/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "yara"; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix index cc3a5581b56a..1968875a61e6 100644 --- a/pkgs/by-name/ya/yarr/package.nix +++ b/pkgs/by-name/ya/yarr/package.nix @@ -42,13 +42,13 @@ buildGoModule rec { tests = lib.optionalAttrs stdenv.hostPlatform.isLinux nixosTests.yarr; }; - meta = with lib; { + meta = { description = "Yet another rss reader"; mainProgram = "yarr"; homepage = "https://github.com/nkanaev/yarr"; changelog = "https://github.com/nkanaev/yarr/blob/v${version}/doc/changelog.txt"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sikmir christoph-heiss ]; diff --git a/pkgs/by-name/ya/yatas/package.nix b/pkgs/by-name/ya/yatas/package.nix index bd3e776c0cec..d9b9b23854e8 100644 --- a/pkgs/by-name/ya/yatas/package.nix +++ b/pkgs/by-name/ya/yatas/package.nix @@ -17,12 +17,12 @@ buildGoModule rec { vendorHash = "sha256-zp5EVJe5Q6o6C0CZ8u+oEFEOy0NU5SgVN+cSc6A/jZ4="; - meta = with lib; { + meta = { description = "Tool to audit AWS infrastructure for misconfiguration or potential security issues"; homepage = "https://github.com/padok-team/YATAS"; changelog = "https://github.com/padok-team/YATAS/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "yatas"; }; } diff --git a/pkgs/by-name/ya/yazi/plugins/restore/default.nix b/pkgs/by-name/ya/yazi/plugins/restore/default.nix index f5ed65cfde5b..d24769c725c2 100644 --- a/pkgs/by-name/ya/yazi/plugins/restore/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/restore/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "restore.yazi"; - version = "25.5.28-unstable-2025-05-30"; + version = "25.5.31-unstable-2025-06-05"; src = fetchFromGitHub { owner = "boydaihungst"; repo = "restore.yazi"; - rev = "86dff4319ace07da83c235ccab7a14bc0853a03a"; - hash = "sha256-7hMFTeNghXIf3Db2AtguIzLkWbXYtJNwGkFdymDr35s="; + rev = "b7c33766e0bc4bbbb99e8e934be90e3beb881d29"; + hash = "sha256-qtthY7eySqXoA3TARubZF0SsYkkLEgkjdtPUxR5ro0I="; }; meta = { diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix index c7e2b7c5ee8b..fb197529abfe 100644 --- a/pkgs/by-name/yg/yggdrasil/package.nix +++ b/pkgs/by-name/yg/yggdrasil/package.nix @@ -35,7 +35,7 @@ buildGoModule rec { passthru.tests.basic = nixosTests.yggdrasil; meta = with lib; { - description = "An experiment in scalable routing as an encrypted IPv6 overlay network"; + description = "Experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; license = licenses.lgpl3; maintainers = with maintainers; [ diff --git a/pkgs/by-name/yg/ygot/package.nix b/pkgs/by-name/yg/ygot/package.nix index f142dc8819d4..853f88a322a3 100644 --- a/pkgs/by-name/yg/ygot/package.nix +++ b/pkgs/by-name/yg/ygot/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "ygot"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "openconfig"; repo = "ygot"; tag = "v${finalAttrs.version}"; - hash = "sha256-jhPo3K6Q/LcfMkp2jaFwHGoFJSMdBNFidVU3A42Locw="; + hash = "sha256-rn5/eq8S2pu+3KYaB1gqN2uwA/pzFJjgX5pyXDE2eEA="; }; - vendorHash = "sha256-MxyjO/uptmBXz+JWgRcP/SWeEWyz9pNA9eM4Rul45cM="; + vendorHash = "sha256-AgSKfy8Dbc5fRhJ2oskmkShL/mHb2FKkGZoqPyagLfE="; excludedPackages = [ "demo/*" diff --git a/pkgs/by-name/yl/yle-dl/package.nix b/pkgs/by-name/yl/yle-dl/package.nix index 25579121bce6..d2b258ae75f1 100644 --- a/pkgs/by-name/yl/yle-dl/package.nix +++ b/pkgs/by-name/yl/yle-dl/package.nix @@ -48,13 +48,13 @@ python3Packages.buildPythonApplication rec { command = "yle-dl -h"; }; - meta = with lib; { + meta = { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; homepage = "https://aajanki.github.io/yle-dl/"; changelog = "https://github.com/aajanki/yle-dl/blob/${version}/ChangeLog"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dezgeg ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dezgeg ]; + platforms = lib.platforms.unix; mainProgram = "yle-dl"; }; } diff --git a/pkgs/by-name/yo/yor/package.nix b/pkgs/by-name/yo/yor/package.nix index 84f5eb42427b..8025137a2bc1 100644 --- a/pkgs/by-name/yo/yor/package.nix +++ b/pkgs/by-name/yo/yor/package.nix @@ -33,11 +33,11 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Extensible auto-tagger for your IaC files. The ultimate way to link entities in the cloud back to the codified resource which created it"; homepage = "https://github.com/bridgecrewio/yor"; changelog = "https://github.com/bridgecrewio/yor/releases/tag/${version}"; - license = licenses.asl20; - maintainers = [ maintainers.ivankovnatsky ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.ivankovnatsky ]; }; } diff --git a/pkgs/by-name/yo/you-get/package.nix b/pkgs/by-name/yo/you-get/package.nix index 2e4b9087713b..c9a32a82e0db 100644 --- a/pkgs/by-name/yo/you-get/package.nix +++ b/pkgs/by-name/yo/you-get/package.nix @@ -42,12 +42,12 @@ python3.pkgs.buildPythonApplication rec { "you_get" ]; - meta = with lib; { + meta = { description = "Tiny command line utility to download media contents from the web"; homepage = "https://you-get.org"; changelog = "https://github.com/soimort/you-get/raw/v${version}/CHANGELOG.rst"; - license = licenses.mit; - maintainers = with maintainers; [ ryneeverett ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ryneeverett ]; mainProgram = "you-get"; }; } diff --git a/pkgs/by-name/yo/youki/package.nix b/pkgs/by-name/yo/youki/package.nix index 66aa0c0940cd..8c8d1994fc60 100644 --- a/pkgs/by-name/yo/youki/package.nix +++ b/pkgs/by-name/yo/youki/package.nix @@ -56,13 +56,13 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-nRlvvr73glmpFsWb2Pi1icZl7d85/8iX2rHnNXv4ep8="; - meta = with lib; { + meta = { description = "Container runtime written in Rust"; homepage = "https://containers.github.io/youki/"; changelog = "https://github.com/containers/youki/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ builditluc ]; - platforms = platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ builditluc ]; + platforms = lib.platforms.linux; mainProgram = "youki"; }; } diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index ab07b43ded8f..20e51cf80293 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -4,18 +4,18 @@ ffmpeg, lib, versionCheckHook, - nix-update-script, }: + python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2025.05.23"; + version = "2025.06.01.post1"; pyproject = true; src = fetchFromGitHub { owner = "jmbannon"; repo = "ytdl-sub"; tag = version; - hash = "sha256-296lizseyBJdpu80MnquPB1ldGgpAcey3iDwiaLqpOQ="; + hash = "sha256-qwsUb9w/eeNO1mGYpnwkWgH5AfcUm7Y7DtkWep8SAcA="; }; postPatch = '' @@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = ./update.sh; meta = { homepage = "https://github.com/jmbannon/ytdl-sub"; diff --git a/pkgs/by-name/yt/ytdl-sub/update.sh b/pkgs/by-name/yt/ytdl-sub/update.sh new file mode 100755 index 000000000000..dde9badd3023 --- /dev/null +++ b/pkgs/by-name/yt/ytdl-sub/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nix-update + +version=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sfL "https://api.github.com/repos/jmbannon/ytdl-sub/releases/latest" | jq -r .tag_name) +nix-update --version="$version" ytdl-sub diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix index 89afe420b2c1..154981166927 100644 --- a/pkgs/by-name/yt/ytmdesktop/package.nix +++ b/pkgs/by-name/yt/ytmdesktop/package.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/ytmdesktop/ytmdesktop/tag/v${finalAttrs.version}"; - description = "A Desktop App for YouTube Music"; + description = "Desktop App for YouTube Music"; downloadPage = "https://github.com/ytmdesktop/ytmdesktop/releases"; homepage = "https://ytmdesktop.app/"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/z8/z88dk/package.nix b/pkgs/by-name/z8/z88dk/package.nix index 2896135dbb15..80dab21136ee 100644 --- a/pkgs/by-name/z8/z88dk/package.nix +++ b/pkgs/by-name/z8/z88dk/package.nix @@ -25,7 +25,7 @@ let hash = "sha256-NbQIy9d4ZcMnRJJApPBSej+W6e/aJ8rkb5E7rD7GVgs="; }; meta = { - description = "A date object with as little code as possible (and rw accessors)"; + description = "Date object with as little code as possible (and rw accessors)"; license = with lib.licenses; [ artistic1 gpl1Plus diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index 534effaa4ef2..9f44fc65c395 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -21,8 +21,16 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "bol-van"; repo = "zapret"; + + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse --short HEAD > $out/COMMIT + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + tag = "v${finalAttrs.version}"; - hash = "sha256-OeOnzqYyRAQNRtjtPHwzDL/csuTAUgIRJKsPVr3iBac="; + hash = "sha256-cwwj0xGEiR3sg2WheurtQo6Hy5JAARcZJNHEHMfAoOE="; }; buildInputs = [ @@ -31,12 +39,17 @@ stdenv.mkDerivation (finalAttrs: { libnetfilter_queue libnfnetlink ]; + nativeBuildInputs = [ iptables nftables gawk ]; + preBuild = '' + makeFlagsArray+=("CFLAGS=-DZAPRET_GH_VER=${finalAttrs.src.tag} -DZAPRET_GH_HASH=`cat $src/COMMIT`") + ''; + makeFlags = [ "TGT=${placeholder "out"}/bin" ]; installPhase = '' @@ -88,12 +101,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "DPI bypass multi platform"; homepage = "https://github.com/bol-van/zapret"; - changelog = "https://github.com/bol-van/zapret/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/bol-van/zapret/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nishimara ]; mainProgram = "zapret"; - - # probably gonna work on darwin, but untested - broken = stdenv.hostPlatform.isDarwin; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/zb/zbctl/package.nix b/pkgs/by-name/zb/zbctl/package.nix index f5c72fb60ffc..4e04d7b42474 100644 --- a/pkgs/by-name/zb/zbctl/package.nix +++ b/pkgs/by-name/zb/zbctl/package.nix @@ -34,18 +34,18 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Command line interface to interact with Camunda 8 and Zeebe"; homepage = "https://docs.camunda.io/docs/apis-clients/cli-client/"; downloadPage = "https://github.com/camunda/zeebe/releases"; changelog = "https://github.com/camunda/zeebe/releases/tag/${version}"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.asl20; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.asl20; platforms = [ "x86_64-darwin" "x86_64-linux" ]; - maintainers = with maintainers; [ thetallestjj ]; + maintainers = with lib.maintainers; [ thetallestjj ]; longDescription = '' A command line interface for Camunda Platform 8 designed to create and read resources inside a Zeebe broker. It can be used for regular development and maintenance tasks such as: diff --git a/pkgs/by-name/ze/zed/package.nix b/pkgs/by-name/ze/zed/package.nix index 72db6bcb5d4c..fc0e86e9647c 100644 --- a/pkgs/by-name/ze/zed/package.nix +++ b/pkgs/by-name/ze/zed/package.nix @@ -40,12 +40,12 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "Novel data lake based on super-structured data"; homepage = "https://zed.brimdata.io"; changelog = "https://github.com/brimdata/zed/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dit7ya knl ]; diff --git a/pkgs/by-name/ze/zeek/package.nix b/pkgs/by-name/ze/zeek/package.nix index 67bf7bbb9b1f..95ae96c323f6 100644 --- a/pkgs/by-name/ze/zeek/package.nix +++ b/pkgs/by-name/ze/zeek/package.nix @@ -107,15 +107,15 @@ stdenv.mkDerivation rec { inherit broker; }; - meta = with lib; { + meta = { description = "Network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES"; - license = licenses.bsd3; - maintainers = with maintainers; [ + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ pSub tobim ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ze/zeekscript/package.nix b/pkgs/by-name/ze/zeekscript/package.nix index 476fc11018a7..fc81ec1b707c 100644 --- a/pkgs/by-name/ze/zeekscript/package.nix +++ b/pkgs/by-name/ze/zeekscript/package.nix @@ -31,12 +31,12 @@ python3.pkgs.buildPythonApplication rec { "zeekscript" ]; - meta = with lib; { + meta = { description = "Zeek script formatter and analyzer"; homepage = "https://github.com/zeek/zeekscript"; changelog = "https://github.com/zeek/zeekscript/blob/v${version}/CHANGES"; - license = licenses.bsd3; - maintainers = with maintainers; [ + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab tobim ]; diff --git a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix index 8e3e5a1afd4a..9d2f78e2c6c3 100644 --- a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = { - description = "A Zenoh plug-in that allows to integrate and/or route MQTT pub/sub with Eclipse Zenoh"; + description = "Zenoh plug-in that allows to integrate and/or route MQTT pub/sub with Eclipse Zenoh"; homepage = "https://github.com/eclipse-zenoh/zenoh-plugin-mqtt"; license = with lib.licenses; [ epl20 diff --git a/pkgs/by-name/ze/zeronsd/package.nix b/pkgs/by-name/ze/zeronsd/package.nix index 0c1cc9f88052..660de91c614d 100644 --- a/pkgs/by-name/ze/zeronsd/package.nix +++ b/pkgs/by-name/ze/zeronsd/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with lib; { - description = "A DNS server for ZeroTier users"; + description = "DNS server for ZeroTier users"; homepage = "https://github.com/zerotier/zeronsd"; license = licenses.bsd3; maintainers = [ maintainers.dstengele ]; diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix index cf39cf4c7cf0..e6c74f488de1 100644 --- a/pkgs/by-name/ze/zerotierone/package.nix +++ b/pkgs/by-name/ze/zerotierone/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - sourceRoot = "source/rustybits"; + sourceRoot = "${src.name}/rustybits"; hash = "sha256-CSpm4zBWKhcrM/KXGU6/51NSQ6hzpT44D2J+QETBtpQ="; # REMOVEME when https://github.com/NixOS/nixpkgs/pull/300532 is merged diff --git a/pkgs/by-name/zf/zfind/package.nix b/pkgs/by-name/zf/zfind/package.nix index f0017eb84c8c..e14026cb1347 100644 --- a/pkgs/by-name/zf/zfind/package.nix +++ b/pkgs/by-name/zf/zfind/package.nix @@ -22,7 +22,7 @@ buildGoModule rec { "main.appVersion=${version}" ]; - meta = with lib; { + meta = { description = "CLI for file search with SQL like syntax."; longDescription = '' zfind allows you to search for files, including inside tar, zip, 7z and rar archives. @@ -30,8 +30,8 @@ buildGoModule rec { ''; homepage = "https://github.com/laktak/zfind"; changelog = "https://github.com/laktak/zfind/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "zfind"; - maintainers = with maintainers; [ eeedean ]; + maintainers = with lib.maintainers; [ eeedean ]; }; } diff --git a/pkgs/by-name/zf/zfs-autobackup/package.nix b/pkgs/by-name/zf/zfs-autobackup/package.nix index cb5962321e37..fd1b5e60675d 100644 --- a/pkgs/by-name/zf/zfs-autobackup/package.nix +++ b/pkgs/by-name/zf/zfs-autobackup/package.nix @@ -23,11 +23,11 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "zfs_autobackup" ]; - meta = with lib; { + meta = { description = "ZFS backup, replicationand snapshot tool"; homepage = "https://github.com/psy0rz/zfs_autobackup"; changelog = "https://github.com/psy0rz/zfs_autobackup/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/zi/zigbee2mqtt_1/package.nix b/pkgs/by-name/zi/zigbee2mqtt_1/package.nix index 91485153133b..235a25af498e 100644 --- a/pkgs/by-name/zi/zigbee2mqtt_1/package.nix +++ b/pkgs/by-name/zi/zigbee2mqtt_1/package.nix @@ -31,18 +31,18 @@ buildNpmPackage rec { passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt_1; passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { changelog = "https://github.com/Koenkk/zigbee2mqtt/releases/tag/${version}"; description = "Zigbee to MQTT bridge using zigbee-shepherd"; homepage = "https://github.com/Koenkk/zigbee2mqtt"; - license = licenses.gpl3; + license = lib.licenses.gpl3; longDescription = '' Allows you to use your Zigbee devices without the vendor's bridge or gateway. It bridges events and allows you to control your Zigbee devices via MQTT. In this way you can integrate your Zigbee devices with whatever smart home infrastructure you are using. ''; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ sweber hexa ]; diff --git a/pkgs/by-name/zi/zile/package.nix b/pkgs/by-name/zi/zile/package.nix index c90fdfba6c5a..9cf7036183ab 100644 --- a/pkgs/by-name/zi/zile/package.nix +++ b/pkgs/by-name/zi/zile/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro. gl_cv_func_fstatat_zero_flag = "yes"; - meta = with lib; { + meta = { homepage = "https://www.gnu.org/software/zile/"; changelog = "https://git.savannah.gnu.org/cgit/zile.git/plain/NEWS?h=v${version}"; description = "Zile Implements Lua Editors"; @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { Lossy Emacs. Zile has been written to be as similar as possible to Emacs; every Emacs user should feel at home. ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ pSub ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ pSub ]; + platforms = lib.platforms.unix; mainProgram = "zile"; }; } diff --git a/pkgs/by-name/zi/zim/package.nix b/pkgs/by-name/zi/zim/package.nix index 63d15210ffb2..8330816d8e55 100644 --- a/pkgs/by-name/zi/zim/package.nix +++ b/pkgs/by-name/zi/zim/package.nix @@ -66,12 +66,12 @@ python3Packages.buildPythonApplication rec { ${python3Packages.python.interpreter} test.py ''; - meta = with lib; { + meta = { description = "Desktop wiki"; homepage = "https://zim-wiki.org/"; changelog = "https://github.com/zim-desktop-wiki/zim-desktop-wiki/blob/${version}/CHANGELOG.md"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ pSub ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ pSub ]; mainProgram = "zim"; broken = stdenv.hostPlatform.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 }; diff --git a/pkgs/by-name/zi/zimfw/package.nix b/pkgs/by-name/zi/zimfw/package.nix index 09f57daac283..5848dac14772 100644 --- a/pkgs/by-name/zi/zimfw/package.nix +++ b/pkgs/by-name/zi/zimfw/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "The Zsh configuration framework with blazing speed and modular extensions"; + description = "Zsh configuration framework with blazing speed and modular extensions"; homepage = "https://zimfw.sh"; license = licenses.mit; maintainers = [ maintainers.joedevivo ]; diff --git a/pkgs/by-name/zi/zine/package.nix b/pkgs/by-name/zi/zine/package.nix index d592b14611f7..fb9ebf1f2cd3 100644 --- a/pkgs/by-name/zi/zine/package.nix +++ b/pkgs/by-name/zi/zine/package.nix @@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec { openssl ]; - meta = with lib; { + meta = { description = "Simple and opinionated tool to build your own magazine"; homepage = "https://github.com/zineland/zine"; changelog = "https://github.com/zineland/zine/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dit7ya figsoda ]; diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index 2bc70110809f..46186f60ea81 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -29,18 +29,18 @@ in stdenv.mkDerivation (finalAttrs: { pname = "zipline"; - version = "4.1.0"; + version = "4.1.2"; src = fetchFromGitHub { owner = "diced"; repo = "zipline"; tag = "v${finalAttrs.version}"; - hash = "sha256-5qa2K17RmWHO5mrkz/Imoxv4ODEaJow3BMUBNzl7Dg8="; + hash = "sha256-xxe64tGxZ2Udr+p21CKTZCHJ19ZOsdgPLlil+v+j5j4="; }; pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-xFe1Fdsp8Tpz0r+xvPSYuPR8gXTts6iWTq0a9u+Xh3U="; + hash = "sha256-O8RLaKff4Dj/JDeUOyf7GtcFcOu/aOuclyaZmVqVi5s="; }; buildInputs = [ vips ]; diff --git a/pkgs/by-name/zi/zita-resampler/package.nix b/pkgs/by-name/zi/zita-resampler/package.nix index 3f812c470350..274080edc871 100644 --- a/pkgs/by-name/zi/zita-resampler/package.nix +++ b/pkgs/by-name/zi/zita-resampler/package.nix @@ -4,13 +4,13 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zita-resampler"; - version = "1.8.0"; + version = "1.11.2"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-5XRPI8VN0Vs/eDpoe9h57uKmkKRUWhW0nEzwN6pGSqI="; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-resampler-${finalAttrs.version}.tar.xz"; + hash = "sha256-qlxU5pYGmvJvPx/tSpYxE8wSN83f1XrlhCq8sazVSSw="; }; makeFlags = [ @@ -21,24 +21,17 @@ stdenv.mkDerivation rec { postPatch = '' cd source - substituteInPlace Makefile \ - --replace 'ldconfig' "" '' + lib.optionalString (!stdenv.hostPlatform.isx86_64) '' substituteInPlace Makefile \ - --replace '-DENABLE_SSE2' "" + --replace-fail '-DENABLE_SSE2' "" ''; - fixupPhase = '' - ln -s $out/lib/libzita-resampler.so.$version $out/lib/libzita-resampler.so.1 - ''; - meta = { description = "Resample library by Fons Adriaensen"; - version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index 4a41f7e0b07c..8ea79dc39004 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zizmor"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "zizmorcore"; repo = "zizmor"; tag = "v${finalAttrs.version}"; - hash = "sha256-llxIuWgaRNJsl/piQ1BMqvE2MKnSnR5qxjLFqZ5z13I="; + hash = "sha256-nBeoPbabqE5aCccvioZJo0IosdMN+iKqgaFu0krzRA8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OVGaHLA/VzF8wGrWrHaKpYDcp4ZeR9mf2s5I+u5ddcs="; + cargoHash = "sha256-PQ3ij90raSV6o1EEvf2sw3lmMfX3t/ni8RmUAwo8epk="; nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles diff --git a/pkgs/by-name/zk/zkar/package.nix b/pkgs/by-name/zk/zkar/package.nix index c541c980dc4a..a31fde198a15 100644 --- a/pkgs/by-name/zk/zkar/package.nix +++ b/pkgs/by-name/zk/zkar/package.nix @@ -22,12 +22,12 @@ buildGoModule rec { "-w" ]; - meta = with lib; { + meta = { description = "Java serialization protocol analysis tool"; homepage = "https://github.com/phith0n/zkar"; changelog = "https://github.com/phith0n/zkar/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "zkar"; }; } diff --git a/pkgs/by-name/zl/zluda/package.nix b/pkgs/by-name/zl/zluda/package.nix index c13e0440e4f9..7ffb292133af 100644 --- a/pkgs/by-name/zl/zluda/package.nix +++ b/pkgs/by-name/zl/zluda/package.nix @@ -55,6 +55,11 @@ rustPlatform.buildRustPackage rec { # xtask doesn't support passing --target, but nix hooks expect the folder structure from when it's set env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.cargoShortTarget; + # Future packagers: + # This is a fix for https://github.com/NixOS/nixpkgs/issues/390469. Ideally + # ZLUDA should configure this automatically. Therefore, on every new update, + # please try removing this line and see if ZLUDA builds. + env.CMAKE_BUILD_TYPE = "Release"; preConfigure = '' # disable test written for windows only: https://github.com/vosen/ZLUDA/blob/774f4bcb37c39f876caf80ae0d39420fa4bc1c8b/zluda_inject/tests/inject.rs#L55 diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix index 9014dec615c5..2d59b4a35f00 100644 --- a/pkgs/by-name/zo/zola/package.nix +++ b/pkgs/by-name/zo/zola/package.nix @@ -44,13 +44,13 @@ rustPlatform.buildRustPackage rec { passthru.tests.version = testers.testVersion { package = zola; }; - meta = with lib; { + meta = { description = "Fast static site generator with everything built-in"; mainProgram = "zola"; homepage = "https://www.getzola.org/"; changelog = "https://github.com/getzola/zola/raw/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dandellion dywedir _0x4A6F diff --git a/pkgs/by-name/zo/zookeeper/package.nix b/pkgs/by-name/zo/zookeeper/package.nix index 192cba33efcd..7e0cad01d7e3 100644 --- a/pkgs/by-name/zo/zookeeper/package.nix +++ b/pkgs/by-name/zo/zookeeper/package.nix @@ -50,17 +50,17 @@ stdenv.mkDerivation rec { inherit jre; }; - meta = with lib; { + meta = { homepage = "https://zookeeper.apache.org"; description = "Apache Zookeeper"; changelog = "https://zookeeper.apache.org/doc/r${version}/releasenotes.html"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nathan-gs pradeepchhetri ztzg ]; - platforms = platforms.unix; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + platforms = lib.platforms.unix; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; } diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix index 6d59e9786ea5..bcd33cc1d65f 100644 --- a/pkgs/by-name/zo/zoxide/package.nix +++ b/pkgs/by-name/zo/zoxide/package.nix @@ -40,12 +40,12 @@ rustPlatform.buildRustPackage rec { --zsh contrib/completions/_zoxide ''; - meta = with lib; { + meta = { description = "Fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; changelog = "https://github.com/ajeetdsouza/zoxide/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ ysndr cole-h SuperSandro2000 diff --git a/pkgs/by-name/zp/zps/package.nix b/pkgs/by-name/zp/zps/package.nix index 9408d844e349..065642d495db 100644 --- a/pkgs/by-name/zp/zps/package.nix +++ b/pkgs/by-name/zp/zps/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { --replace Exec=zps Exec=$out/zps \ ''; - meta = with lib; { + meta = { description = "Small utility for listing and reaping zombie processes on GNU/Linux"; homepage = "https://github.com/orhun/zps"; changelog = "https://github.com/orhun/zps/releases/tag/${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ figsoda ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ figsoda ]; + platforms = lib.platforms.linux; mainProgram = "zps"; }; } diff --git a/pkgs/by-name/zr/zrok/package.nix b/pkgs/by-name/zr/zrok/package.nix index 25a768202ccf..5e8c89cc9309 100644 --- a/pkgs/by-name/zr/zrok/package.nix +++ b/pkgs/by-name/zr/zrok/package.nix @@ -18,15 +18,15 @@ let hash = { - x86_64-linux = "sha256-3W6y79GXhBzy4YTafUuct6kWc6yvVdhJGL+Byg+AXog="; - aarch64-linux = "sha256-qhl+yT1lAf/xXhEoMZ7lkGZWKnwI0ANQrHO1BHcGrfo="; - armv7l-linux = "sha256-EYbvN+Z7KFVoJk1KNljgypjbBnJJ4dM+YFl8RQri5jw="; + x86_64-linux = "sha256-Ewez2QUsIAmxyjxR8wvt7UJpXVHjIb8s6gGF1YNgrec="; + aarch64-linux = "sha256-5hZaOqnTYWeUJXGObzUZMqE62ZgNvJ9Wi8shVng10l8="; + armv7l-linux = "sha256-MOM0OS2/mhYaxowsBVnZH0poR+wXsbjsJKldU/nAfjU="; } .${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "zrok"; - version = "0.4.46"; + version = "1.0.4"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; diff --git a/pkgs/by-name/zs/zs/package.nix b/pkgs/by-name/zs/zs/package.nix index 9f6a293f0381..84e49f4e4db3 100644 --- a/pkgs/by-name/zs/zs/package.nix +++ b/pkgs/by-name/zs/zs/package.nix @@ -35,12 +35,12 @@ buildGoModule rec { --zsh <($out/bin/zs completion zsh) ''; - meta = with lib; { + meta = { description = "Extremely minimal static site generator written in Go"; homepage = "https://git.mills.io/prologic/zs"; changelog = "https://git.mills.io/prologic/zs/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ adtya ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ adtya ]; mainProgram = "zs"; }; } diff --git a/pkgs/by-name/zs/zsh-history/package.nix b/pkgs/by-name/zs/zsh-history/package.nix deleted file mode 100644 index e9b7f80eb0d6..000000000000 --- a/pkgs/by-name/zs/zsh-history/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, - installShellFiles, - nixosTests, -}: - -buildGoModule { - pname = "zsh-history"; - version = "2019-12-10"; - - src = fetchFromGitHub { - owner = "b4b4r07"; - repo = "history"; - rev = "8da016bd91b0c2eb53c9980f00eee6abdbb097e2"; - sha256 = "13n643ik1zjvpk8h9458yd9ffahhbdnigmbrbmpn7b7g23wqqsi3"; - }; - - vendorHash = "sha256-n5QFN1B2GjbzylFuW9Y4r0+ioIJlfKwcGK8X3ZwKLI8="; - - nativeBuildInputs = [ installShellFiles ]; - - doCheck = false; - - postInstall = '' - install -d $out/share - cp -r "$NIX_BUILD_TOP/source/misc/"* "$out/share" - installShellCompletion --zsh --name _history $out/share/zsh/completions/_history - ''; - - passthru.tests = { - zsh-history-shell-integration = nixosTests.zsh-history; - }; - - meta = with lib; { - description = "CLI to provide enhanced history for your ZSH shell"; - homepage = "https://github.com/b4b4r07/history"; - license = licenses.mit; - maintainers = [ ]; - mainProgram = "history"; - }; -} diff --git a/pkgs/by-name/zs/zsh-wd/package.nix b/pkgs/by-name/zs/zsh-wd/package.nix index 07569ac9ce9f..e55aedc79ee2 100644 --- a/pkgs/by-name/zs/zsh-wd/package.nix +++ b/pkgs/by-name/zs/zsh-wd/package.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { installShellCompletion --zsh _wd.sh ''; - meta = with lib; { + meta = { description = "Jump to custom directories in zsh"; longDescription = '' `wd` (warp directory) lets you jump to custom directories in zsh, without @@ -34,9 +34,9 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://github.com/mfaerevaag/wd"; changelog = "https://github.com/mfaerevaag/wd/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ maintainers.zimeg ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.zimeg ]; mainProgram = "wd"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/zs/zsh-zhooks/package.nix b/pkgs/by-name/zs/zsh-zhooks/package.nix index 047cd75ef61e..33ac4f1d4106 100644 --- a/pkgs/by-name/zs/zsh-zhooks/package.nix +++ b/pkgs/by-name/zs/zsh-zhooks/package.nix @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation { ''; meta = { - description = "A tool for displaying the code for all Zsh hook functions"; + description = "Tool for displaying the code for all Zsh hook functions"; homepage = "https://github.com/agkozak/zhooks"; license = lib.licenses.mit; longDescription = '' diff --git a/pkgs/by-name/zs/zsh/package.nix b/pkgs/by-name/zs/zsh/package.nix index 9b6d6517503a..f08b7bb61bb1 100644 --- a/pkgs/by-name/zs/zsh/package.nix +++ b/pkgs/by-name/zs/zsh/package.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation { passthru = { shellPath = "/bin/zsh"; tests = { - inherit (nixosTests) zsh-history oh-my-zsh; + inherit (nixosTests) oh-my-zsh; }; }; } diff --git a/pkgs/by-name/zt/ztools/package.nix b/pkgs/by-name/zt/ztools/package.nix index 52477e2c9874..1baf1fe466c8 100644 --- a/pkgs/by-name/zt/ztools/package.nix +++ b/pkgs/by-name/zt/ztools/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "An essential set of Z-machine tools for interpreter authors, experienced Inform programmers, and Z-code hackers."; + description = "Essential set of Z-machine tools for interpreter authors, experienced Inform programmers, and Z-code hackers"; homepage = "http://inform-fiction.org/zmachine/ztools.html"; license = lib.licenses.cc-by-sa-40; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/zu/zulip-term/package.nix b/pkgs/by-name/zu/zulip-term/package.nix index 45b1a8a565da..d8e3da694844 100644 --- a/pkgs/by-name/zu/zulip-term/package.nix +++ b/pkgs/by-name/zu/zulip-term/package.nix @@ -78,11 +78,11 @@ buildPythonApplication rec { (lib.makeBinPath [ libnotify ]) ]; - meta = with lib; { + meta = { description = "Zulip's official terminal client"; homepage = "https://github.com/zulip/zulip-terminal"; changelog = "https://github.com/zulip/zulip-terminal/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/by-name/zx/zxfer/package.nix b/pkgs/by-name/zx/zxfer/package.nix index d44eb8947779..621e4455df13 100644 --- a/pkgs/by-name/zx/zxfer/package.nix +++ b/pkgs/by-name/zx/zxfer/package.nix @@ -77,11 +77,11 @@ resholve.mkDerivation rec { execer = [ "cannot:${rsync}/bin/rsync" ]; }; - meta = with lib; { + meta = { description = "Popular script for managing ZFS snapshot replication"; homepage = "https://github.com/allanjude/zxfer"; changelog = "https://github.com/allanjude/zxfer/releases/tag/v${version}"; - license = licenses.bsd2; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ urandom ]; mainProgram = "zxfer"; }; diff --git a/pkgs/by-name/zy/zydis/package.nix b/pkgs/by-name/zy/zydis/package.nix index f02b1e6b1713..e358c8b9a1d3 100644 --- a/pkgs/by-name/zy/zydis/package.nix +++ b/pkgs/by-name/zy/zydis/package.nix @@ -34,15 +34,15 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ python3 ]; passthru = { inherit zycore; }; - meta = with lib; { + meta = { homepage = "https://zydis.re/"; changelog = "https://github.com/zyantific/zydis/releases/tag/v${version}"; description = "Fast and lightweight x86/x86-64 disassembler library"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jbcrail athre0z ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/zz/zziplib/package.nix b/pkgs/by-name/zz/zziplib/package.nix index 867c3a3e890f..effdb4b4bd4e 100644 --- a/pkgs/by-name/zz/zziplib/package.nix +++ b/pkgs/by-name/zz/zziplib/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "-DBUILDTESTS=OFF" ]; - meta = with lib; { + meta = { homepage = "https://github.com/gdraheim/zziplib"; changelog = "https://github.com/gdraheim/zziplib/blob/${version}/ChangeLog"; description = "Library to extract data from files archived in a zip file"; @@ -59,11 +59,11 @@ stdenv.mkDerivation rec { The implementation is based only on the (free) subset of compression with the zlib algorithm which is actually used by the zip/unzip tools. ''; - license = with licenses; [ + license = with lib.licenses; [ lgpl2Plus mpl11 ]; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/elm/packages/ghc9_6/default.nix b/pkgs/development/compilers/elm/packages/ghc9_6/default.nix index c9ad34e70a81..e3e030c7610d 100644 --- a/pkgs/development/compilers/elm/packages/ghc9_6/default.nix +++ b/pkgs/development/compilers/elm/packages/ghc9_6/default.nix @@ -38,6 +38,10 @@ pkgs.haskell.packages.ghc96.override { inherit fetchElmDeps; elmVersion = elmPkgs.elm.version; + + # Fix TLS issues + # see https://github.com/elm/compiler/pull/2325 + tls = self.callPackage ./tls-1.9.0.nix { }; }; in elmPkgs diff --git a/pkgs/development/compilers/elm/packages/ghc9_6/tls-1.9.0.nix b/pkgs/development/compilers/elm/packages/ghc9_6/tls-1.9.0.nix new file mode 100644 index 000000000000..e7d5acd58026 --- /dev/null +++ b/pkgs/development/compilers/elm/packages/ghc9_6/tls-1.9.0.nix @@ -0,0 +1,79 @@ +{ + mkDerivation, + asn1-encoding, + asn1-types, + async, + base, + bytestring, + cereal, + crypton, + crypton-x509, + crypton-x509-store, + crypton-x509-validation, + data-default-class, + gauge, + hourglass, + lib, + memory, + mtl, + network, + QuickCheck, + tasty, + tasty-quickcheck, + transformers, + unix-time, +}: +mkDerivation { + pname = "tls"; + version = "1.9.0"; + sha256 = "5605b9cbe0903b100e9de72800641453f74bf5dade6176dbe10b34ac9353433e"; + libraryHaskellDepends = [ + asn1-encoding + asn1-types + async + base + bytestring + cereal + crypton + crypton-x509 + crypton-x509-store + crypton-x509-validation + data-default-class + memory + mtl + network + transformers + unix-time + ]; + testHaskellDepends = [ + asn1-types + async + base + bytestring + crypton + crypton-x509 + crypton-x509-validation + data-default-class + hourglass + QuickCheck + tasty + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + asn1-types + async + base + bytestring + crypton + crypton-x509 + crypton-x509-validation + data-default-class + gauge + hourglass + QuickCheck + tasty-quickcheck + ]; + homepage = "https://github.com/haskell-tls/hs-tls"; + description = "TLS/SSL protocol native implementation (Server and Client)"; + license = lib.licenses.bsd3; +} diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix index a4eda45eb028..1aba286411bd 100644 --- a/pkgs/development/compilers/gcc/all.nix +++ b/pkgs/development/compilers/gcc/all.nix @@ -2,10 +2,9 @@ lib, stdenv, pkgs, + targetPackages, callPackage, isl_0_20, - libcCross, - threadsCross, noSysDirs, lowPrio, wrapCC, @@ -27,9 +26,15 @@ let reproducibleBuild = true; profiledCompiler = false; libcCross = - if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then args.libcCross else null; + if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then + targetPackages.libc or pkgs.libc + else + null; threadsCross = - if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then threadsCross else { }; + if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then + targetPackages.threads or pkgs.threads + else + { }; isl = if stdenv.hostPlatform.isDarwin then null else isl_0_20; # do not allow version skew when cross-building gcc # diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 38f17692cefa..fe1a77f0ef01 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -38,7 +38,7 @@ enablePlugin ? (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform), # Whether to support user-supplied plug-ins name ? "gcc", libcCross ? null, - threadsCross ? null, # for MinGW + threadsCross ? { }, # for MinGW withoutTargetLibc ? false, flex, gnused ? null, diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index cf16461958e3..2c8444823d00 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -8,7 +8,7 @@ mailcap, buildPackages, pkgsBuildTarget, - threadsCross, + targetPackages, testers, skopeo, buildGo123Module, @@ -27,11 +27,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.9"; + version = "1.23.10"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-CPZBlUdWPtnnA30SuciQlnfHL3X2LvhYh+2dv0m40t0="; + hash = "sha256-gAp64b/xeaIntlOi9kRRfIAEQ7i0q/MnOvXhy3ET3lk="; }; strictDeps = true; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { depsBuildTarget = lib.optional isCross targetCC; - depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows targetPackages.threads.package; postPatch = '' patchShebangs . diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 51cdecec738c..ac8828d873a4 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -8,7 +8,7 @@ mailcap, buildPackages, pkgsBuildTarget, - threadsCross, + targetPackages, testers, skopeo, buildGo124Module, @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { depsBuildTarget = lib.optional isCross targetCC; - depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows targetPackages.threads.package; postPatch = '' patchShebangs . diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch deleted file mode 100644 index bd545d50948f..000000000000 --- a/pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch +++ /dev/null @@ -1,23 +0,0 @@ -Starting from go1.14, go verifes that vendor/modules.txt matches the requirements -and replacements listed in the main module go.mod file, and it is a hard failure if -vendor/modules.txt is missing. - -Relax module consistency checks and switch back to pre go1.14 behaviour if -vendor/modules.txt is missing regardless of go version requirement in go.mod. - -This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 -See https://github.com/golang/go/issues/37948 for discussion. - -diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go -index b2cb44100e..05bf3829d5 100644 ---- a/src/cmd/go/internal/modload/vendor.go -+++ b/src/cmd/go/internal/modload/vendor.go -@@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, modFiles []*modfile.File, m - panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes))) - } - index := indexes[0] -- if gover.Compare(index.goVersion, "1.14") < 0 { -+ if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index d94d28c9b387..cf4118e0935d 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -2,9 +2,9 @@ lowPrio, newScope, pkgs, + targetPackages, lib, stdenv, - preLibcCrossHeaders, libxcrypt, substitute, replaceVars, @@ -255,7 +255,7 @@ let bintoolsNoLibc = wrapBintoolsWith { bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; + libc = targetPackages.preLibcHeaders; }; bintools = wrapBintoolsWith { bintools = tools.bintools-unwrapped; }; diff --git a/pkgs/development/compilers/llvm/common/tblgen.nix b/pkgs/development/compilers/llvm/common/tblgen.nix index 49cbcb0af2ca..2c2d541d36a9 100644 --- a/pkgs/development/compilers/llvm/common/tblgen.nix +++ b/pkgs/development/compilers/llvm/common/tblgen.nix @@ -55,11 +55,11 @@ let else src; - self = stdenv.mkDerivation (finalAttrs: rec { + self = stdenv.mkDerivation (finalAttrs: { inherit pname version patches; src = src'; - sourceRoot = "${src.name}/llvm"; + sourceRoot = "${finalAttrs.src.name}/llvm"; postPatch = '' ( diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index 865b7b37180a..11a74cee28dc 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.4.7"; - hash = "sha256-bsyxsGpN2c6jFNvnDHYtPUdlRxy26/kludowiXi/+Yg="; + version = "8.4.8"; + hash = "sha256-NlacZN0UmeVwxDZgO2Qe7nzeSvV2r3hll9DucRs6Ooo="; } ); in diff --git a/pkgs/development/interpreters/racket/manifest.json b/pkgs/development/interpreters/racket/manifest.json deleted file mode 100644 index 022680c991ab..000000000000 --- a/pkgs/development/interpreters/racket/manifest.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "version": "8.16", - "full": { - "filename": "racket-8.16-src.tgz", - "sha256": "b233a968f4a561f7b005ce06f2c4c29428562f308c1a04d28e2e2286f6b945c3" - }, - "minimal": { - "filename": "racket-minimal-8.16-src.tgz", - "sha256": "4e727db75574ab11d6bec7af5e5d72a084fa7f662e200c35d5bc200772f5ce96" - } -} diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index b500d4dea89c..6a3fd947024a 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -30,7 +30,7 @@ libiconv, }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "spidermonkey"; inherit version; diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index 187a9c8470ab..b33ebe91bece 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -43,7 +43,7 @@ buildPythonApplication rec { dontWrapPythonPrograms = true; meta = with lib; { - homepage = "http://github.com/CxxTest/cxxtest"; + homepage = "https://github.com/CxxTest/cxxtest"; description = "Unit testing framework for C++"; mainProgram = "cxxtestgen"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/hyphen/dictionaries.nix b/pkgs/development/libraries/hyphen/dictionaries.nix index 01303652017a..34fe0729643f 100644 --- a/pkgs/development/libraries/hyphen/dictionaries.nix +++ b/pkgs/development/libraries/hyphen/dictionaries.nix @@ -44,7 +44,7 @@ let install -m644 "hyph_${dictFileName}.dic" "$out/share/hyphen" # docs install -dm755 "$out/share/doc/" - install -m644 "README_hyph_${readmeFileName}.txt" "$out/share/doc/${pname}.txt" + install -m644 "README_${readmeFileName}.txt" "$out/share/doc/${pname}.txt" runHook postInstall ''; }; @@ -84,7 +84,7 @@ rec { shortName = "de-de"; shortDescription = "German (Germany)"; dictFileName = "de_DE"; - readmeFileName = "de"; + readmeFileName = "hyph_de"; }; de_AT = de-at; @@ -93,7 +93,7 @@ rec { shortName = "de-at"; shortDescription = "German (Austria)"; dictFileName = "de_AT"; - readmeFileName = "de"; + readmeFileName = "hyph_de"; }; de_CH = de-ch; @@ -102,6 +102,17 @@ rec { shortName = "de-ch"; shortDescription = "German (Switzerland)"; dictFileName = "de_CH"; - readmeFileName = "de"; + readmeFileName = "hyph_de"; + }; + + # RUSSIAN + + ru_RU = ru-ru; + ru-ru = mkDictFromLibreofficeGit { + subdir = "ru_RU"; + shortName = "ru-ru"; + shortDescription = "Russian (Russia)"; + dictFileName = "ru_RU"; + readmeFileName = "ru_RU"; }; } diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 434010957d98..3e94d49772a0 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -1,12 +1,13 @@ { lib, - stdenv, + stdenvNoCC, fetchurl, unzip, jre, jre8, genericUpdater, writeShellScript, + makeWrapper, common-updater-scripts, gnused, }: @@ -27,7 +28,7 @@ let license ? lib.licenses.mpl20, updateScript ? null, }: - stdenv.mkDerivation ( + stdenvNoCC.mkDerivation ( finalAttrs: let mainProgram = if prog == null then pname else prog; @@ -36,21 +37,35 @@ let { inherit pname version src; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ + unzip + makeWrapper + ]; - buildCommand = '' - unzip $src -d $out - mkdir -p $out/bin $out/share $out/share/java - cp -s "$out"/*.jar "$out/share/java/" # */ - rm -rf $out/notices - mv $out/doc $out/share - cat > $out/bin/${mainProgram} < +Date: Thu, 5 Jun 2025 03:45:50 +0200 +Subject: [PATCH] Fix CVE-2011-10007 + +--- + lib/File/Find/Rule.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/File/Find/Rule.pm b/lib/File/Find/Rule.pm +index feccc76..d4dc475 100644 +--- a/lib/File/Find/Rule.pm ++++ b/lib/File/Find/Rule.pm +@@ -420,7 +420,7 @@ sub grep { + + $self->exec( sub { + local *FILE; +- open FILE, $_ or return; ++ open FILE, '<', $_ or return; + local ($_, $.); + while () { + for my $p (@pattern) { +-- +2.49.0 + diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix new file mode 100644 index 000000000000..563dbb624bae --- /dev/null +++ b/pkgs/development/python-modules/aioamazondevices/default.nix @@ -0,0 +1,55 @@ +{ + aiohttp, + babel, + beautifulsoup4, + buildPythonPackage, + colorlog, + fetchFromGitHub, + httpx, + lib, + orjson, + poetry-core, + pytest-cov-stub, + pytestCheckHook, + yarl, +}: + +buildPythonPackage rec { + pname = "aioamazondevices"; + version = "3.0.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chemelli74"; + repo = "aioamazondevices"; + tag = "v${version}"; + hash = "sha256-CgIkrq5Eni7Iva/bzlcbj1/mqtKPA4mknHC/fQzL7RU="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + babel + beautifulsoup4 + colorlog + httpx + orjson + yarl + ]; + + pythonImportsCheck = [ "aioamazondevices" ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/chemelli74/aioamazondevices/blob/${src.tag}/CHANGELOG.md"; + description = "Python library to control Amazon devices"; + homepage = "https://github.com/chemelli74/aioamazondevices"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/aioimmich/default.nix b/pkgs/development/python-modules/aioimmich/default.nix new file mode 100644 index 000000000000..fcb666d1357c --- /dev/null +++ b/pkgs/development/python-modules/aioimmich/default.nix @@ -0,0 +1,54 @@ +{ + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + lib, + mashumaro, + pytest-asyncio, + pytestCheckHook, + setuptools, + syrupy, +}: + +buildPythonPackage rec { + pname = "aioimmich"; + version = "0.9.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mib1185"; + repo = "aioimmich"; + tag = "v${version}"; + hash = "sha256-s2W/Z/psCLvd7zMsaaYi3ZIcEuuRSpyRSvUUfIPe8a4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail setuptools==80.9.0 setuptools + ''; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + mashumaro + ]; + + pythonImportsCheck = [ "aioimmich" ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + syrupy + ]; + + meta = { + changelog = "https://github.com/mib1185/aioimmich/releases/tag/${src.tag}"; + description = "Asynchronous library to fetch albums and assests from immich"; + homepage = "https://github.com/mib1185/aioimmich"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 2bbe891870ef..de7f25e359e7 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.51.0"; + version = "0.52.2"; pyproject = true; src = fetchFromGitHub { owner = "anthropics"; repo = "anthropic-sdk-python"; tag = "v${version}"; - hash = "sha256-gD3qZpPKtKZtuoGqnKVgFp0gCxpL0Aq5NGFCMk+z3cQ="; + hash = "sha256-vCIS2NDsScKESfYFHDTSRLb9ZhUsrEPHyfuubrbc+44="; }; postPatch = '' diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index c9bc2f65a692..5f1192f21c1a 100644 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -11,13 +11,14 @@ requests-kerberos, requests-oauthlib, six, + typing-extensions, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.41.21"; + version = "4.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,10 +27,10 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = "atlassian-python-api"; tag = version; - hash = "sha256-m8B6t9tTlef8cdsh/wnsc0iyNLsB0RYjUhq/bA9MeII="; + hash = "sha256-iF4gjF/5QbdjJKCWMdElc+gdIy2+D7TV6gpoPZsTv14="; }; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 deprecated jmespath @@ -39,6 +40,7 @@ buildPythonPackage rec { requests-kerberos requests-oauthlib six + typing-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/azure-keyvault-securitydomain/default.nix b/pkgs/development/python-modules/azure-keyvault-securitydomain/default.nix new file mode 100644 index 000000000000..419a82400344 --- /dev/null +++ b/pkgs/development/python-modules/azure-keyvault-securitydomain/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + wheel, + azure-core, + isodate, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "azure-keyvault-securitydomain"; + version = "1.0.0b1"; + pyproject = true; + + src = fetchPypi { + pname = "azure_keyvault_securitydomain"; + inherit version; + hash = "sha256-MpGhked4qUfkso7QEyeJKpOu3PjgoN1nTPEWyxEEN3Y="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + azure-core + isodate + typing-extensions + ]; + + pythonImportsCheck = [ + "azure.keyvault.securitydomain" + ]; + + meta = { + description = "Microsoft Corporation Azure Keyvault Securitydomain Client Library for Python"; + homepage = "https://pypi.org/project/azure-keyvault-securitydomain/1.0.0b1/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ katexochen ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index a466e490a2a2..43d6f2fa3951 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "35.0.0"; + version = "36.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_containerservice"; inherit version; - hash = "sha256-caFJs9ZcK8XJyceEOhH4HDofth6hhzJv6qlK087j3HQ="; + hash = "sha256-l/PnbSs6auieHmxzmEjx4OB1jHKCqjNNV7MAhvbzbJ8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 5504636c0443..cffea93f11fb 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "9.1.0"; + version = "9.2.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-Hp/UBsDJ7iYn9aNx8BL4dzQvf8bzOyVk/NFNbwZjzQ8="; + pname = "azure_mgmt_recoveryservicesbackup"; + inherit version; + hash = "sha256-xAKz4ipsOHnfVrw34AYxQsM1LFECWZ/xAtGYJPGzKyk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index e13baadc1fbf..656c1ddd798d 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-storage"; - version = "22.2.0"; + version = "23.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_storage"; inherit version; - hash = "sha256-f+1DPSROJ20G3fNPn6e5uHE08IX8Y0YBr1tn8qAITYY="; + hash = "sha256-HFlU1Zvdy5edBbxJ5DFxam4rL3VpCblrp8QyYQcq/L8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bagit/default.nix b/pkgs/development/python-modules/bagit/default.nix index 6742f35877c4..28e4bb4b41ab 100644 --- a/pkgs/development/python-modules/bagit/default.nix +++ b/pkgs/development/python-modules/bagit/default.nix @@ -5,24 +5,28 @@ gettext, mock, pytestCheckHook, + setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "bagit"; - version = "1.8.1"; - format = "setuptools"; + version = "1.9b2"; + pyproject = true; + build-system = [ + setuptools + setuptools-scm + ]; src = fetchFromGitHub { owner = "LibraryOfCongress"; repo = "bagit-python"; rev = "v${version}"; - hash = "sha256-t01P7MPWgOrktuW2zF0TIzt6u/jkLmrpD2OnqawhJaI="; + hash = "sha256-IkRMsCrtX8nS0nrxs5B9csMq1YrI75QLDuT8eTPILkw="; }; nativeBuildInputs = [ gettext - setuptools-scm ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 816e6516e1fd..c1f028ec4635 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.38.30"; + version = "1.38.31"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-dSwG+AEjONb1mSiArcRn41ljisLIusmiFE3dA/Scyds="; + hash = "sha256-ApPlSjB6qaMXhT3k0YZPFtv/r8By6SIxcmw2cRO9ho4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/breezy/Cargo.lock b/pkgs/development/python-modules/breezy/Cargo.lock index 582919223ddf..db5dbd76c7e8 100644 --- a/pkgs/development/python-modules/breezy/Cargo.lock +++ b/pkgs/development/python-modules/breezy/Cargo.lock @@ -19,7 +19,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "breezy" -version = "3.3.10" +version = "3.3.12" dependencies = [ "pyo3", ] @@ -50,9 +50,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.171" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "memchr" @@ -71,9 +71,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.1" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "portable-atomic" @@ -83,9 +83,9 @@ checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -193,7 +193,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rio-py" -version = "3.3.10" +version = "3.3.12" dependencies = [ "lazy_static", "pyo3", @@ -202,9 +202,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.100" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index a0b6b806c81d..67a8ff0b944c 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "breezy"; - version = "3.3.10"; + version = "3.3.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = "breezy"; rev = "brz-${version}"; - hash = "sha256-AzMDab8SUJ8JJukqxVsqf7HdCTcVMLyFFTInPwAmSqs="; + hash = "sha256-V/SnzpslFGjISg+YxViFa+Lpnn0+9enPA3xmvwfXnUM="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; diff --git a/pkgs/development/python-modules/certbot-dns-inwx/default.nix b/pkgs/development/python-modules/certbot-dns-inwx/default.nix index d04b7b04391f..b7627f60f3ce 100644 --- a/pkgs/development/python-modules/certbot-dns-inwx/default.nix +++ b/pkgs/development/python-modules/certbot-dns-inwx/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "certbot-dns-inwx"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; src = fetchFromGitHub { owner = "oGGy990"; repo = "certbot-dns-inwx"; tag = "v${version}"; - hash = "sha256-9dDSJcXlPq065CloaszwutUXsGn+Y9fIeTiGmiXGonY="; + hash = "sha256-x4wDg36J9MvXXHBxUMCoHO3p6c3FKBBB879CpxG/1NA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/conjure-python-client/default.nix b/pkgs/development/python-modules/conjure-python-client/default.nix new file mode 100644 index 000000000000..4856b050ace9 --- /dev/null +++ b/pkgs/development/python-modules/conjure-python-client/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + requests, + pytestCheckHook, + pyyaml, +}: + +buildPythonPackage rec { + version = "3.0.0"; + pname = "conjure-python-client"; + pyproject = true; + + src = fetchFromGitHub { + owner = "palantir"; + repo = "conjure-python-client"; + tag = "${version}"; + hash = "sha256-Ux4yn/fvfiW1mPir1lT+l9bKUnh7CNU6qNTac046H74="; + }; + + # https://github.com/palantir/conjure-python-client/blob/3.0.0/setup.py#L57 + postPatch = '' + echo '__version__ = "${version}"' > ./conjure_python_client/_version.py + ''; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + nativeCheckInputs = [ + pytestCheckHook + pyyaml + ]; + + # some tests depend on a code generator that isn't available in nixpkgs + # https://github.com/palantir/conjure-python-client/blob/3.0.0/CONTRIBUTING.md?plain=1#L23 + disabledTestPaths = [ + "test/conjure/test_conjure_repr.py" + "test/integration_test" + "test/serde/test_decode_union.py" + ]; + + pythonImportsCheck = [ "conjure_python_client" ]; + + meta = { + description = "Python client and JSON encoders for use with generated Conjure clients"; + homepage = "https://github.com/palantir/conjure-python-client"; + changelog = "https://github.com/palantir/conjure-python-client/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ alkasm ]; + }; +} diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix index 8fdaa2bea823..a531db631783 100644 --- a/pkgs/development/python-modules/craft-grammar/default.nix +++ b/pkgs/development/python-modules/craft-grammar/default.nix @@ -25,12 +25,14 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - dependencies = [ overrides ]; + dependencies = [ + overrides + pydantic + ]; pythonImportsCheck = [ "craft_grammar" ]; nativeCheckInputs = [ - pydantic pytestCheckHook pyyaml ]; diff --git a/pkgs/development/python-modules/cypari/default.nix b/pkgs/development/python-modules/cypari/default.nix new file mode 100644 index 000000000000..da8e988829ad --- /dev/null +++ b/pkgs/development/python-modules/cypari/default.nix @@ -0,0 +1,80 @@ +{ + lib, + python, + buildPythonPackage, + fetchFromGitHub, + fetchurl, + setuptools, + cython, + bash, + perl, + gnum4, + texliveBasic, +}: + +let + pariVersion = "2.15.4"; + gmpVersion = "6.3.0"; + + pariSrc = fetchurl { + url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor pariVersion}/pari-${pariVersion}.tar.gz"; + hash = "sha256-w1Rb/uDG37QLd/tLurr5mdguYAabn20ovLbPAEyMXA8="; + }; + + gmpSrc = fetchurl { + url = "https://ftp.gnu.org/gnu/gmp/gmp-${gmpVersion}.tar.bz2"; + hash = "sha256-rCghGnz7YJuuLiyNYFjWbI/pZDT3QM9v4uR7AA0cIMs="; + }; +in +buildPythonPackage rec { + pname = "cypari"; + version = "2.5.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "3-manifolds"; + repo = "CyPari"; + tag = "${version}_as_released"; + hash = "sha256-RJ9O1KsDHmMkTCIFUrcSUkA5ijTsxmoI939QCsCib0Y="; + }; + + postPatch = '' + substituteInPlace ./setup.py \ + --replace-fail "/bin/bash" "${lib.getExe bash}" + # final character is stripped from PARI error messages for some reason + substituteInPlace ./cypari/handle_error.pyx \ + --replace-fail "not a function in function call" "not a function in function cal" + ln -s ${pariSrc} ${pariSrc.name} + ln -s ${gmpSrc} ${gmpSrc.name} + ''; + + build-system = [ + setuptools + cython + ]; + + NIX_LDFLAGS = "-lc"; + + nativeBuildInputs = [ + gnum4 + perl + texliveBasic + ]; + + pythonImportsCheck = [ "cypari" ]; + + checkPhase = '' + runHook preCheck + rm -r cypari + ${python.interpreter} -m cypari.test + runHook postCheck + ''; + + meta = { + description = "Sage's PARI extension, modified to stand alone"; + homepage = "https://github.com/3-manifolds/CyPari"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ noiioiu ]; + changelog = "https://github.com/3-manifolds/CyPari/releases/tag/${src.tag}"; + }; +} diff --git a/pkgs/development/python-modules/devpi-ldap/default.nix b/pkgs/development/python-modules/devpi-ldap/default.nix new file mode 100644 index 000000000000..894819670e38 --- /dev/null +++ b/pkgs/development/python-modules/devpi-ldap/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + devpi-server, + fetchFromGitHub, + ldap3, + mock, + pytest-cov-stub, + pytest-flake8, + pytestCheckHook, + pythonOlder, + pyyaml, + setuptools, + webtest, +}: + +buildPythonPackage rec { + pname = "devpi-ldap"; + version = "2.1.1-unstable-2023-11-28"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "devpi"; + repo = "devpi-ldap"; + rev = "281a21d4e8d11bfec7dca2cf23fa39660a6d5796"; + hash = "sha256-vwX0bOb2byN3M6iBk0tZJy8H39fjwBYvA0Nxi7OTzFQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + devpi-server + pyyaml + ldap3 + ]; + + nativeCheckInputs = [ + devpi-server + mock + pytest-cov-stub + pytest-flake8 + pytestCheckHook + webtest + ]; + + pythonImportsCheck = [ "devpi_ldap" ]; + + meta = { + homepage = "https://github.com/devpi/devpi-ldap"; + description = "LDAP authentication for devpi-server"; + changelog = "https://github.com/devpi/devpi-ldap/blob/main/CHANGELOG.rst"; + license = lib.licenses.mit; # according to its setup.py + maintainers = with lib.maintainers; [ confus ]; + }; +} diff --git a/pkgs/development/python-modules/fxrays/default.nix b/pkgs/development/python-modules/fxrays/default.nix new file mode 100644 index 000000000000..b7859e624117 --- /dev/null +++ b/pkgs/development/python-modules/fxrays/default.nix @@ -0,0 +1,42 @@ +{ + lib, + python, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cython, +}: + +buildPythonPackage rec { + pname = "fxrays"; + version = "1.3.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "3-manifolds"; + repo = "FXrays"; + tag = "${version}_as_released"; + hash = "sha256-IwEY54zDXqMci7WRvhueDJidTsbMwv6eqQSGZzFOtnQ"; + }; + + build-system = [ + setuptools + cython + ]; + + pythonImportsCheck = [ "FXrays" ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m FXrays.test + runHook postCheck + ''; + + meta = { + description = "Computes extremal rays of polyhedral cones with filtering"; + changelog = "https://github.com/3-manifolds/FXrays/releases/tag/${src.tag}"; + homepage = "https://github.com/3-manifolds/FXrays"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ noiioiu ]; + }; +} diff --git a/pkgs/development/python-modules/giturlparse/default.nix b/pkgs/development/python-modules/giturlparse/default.nix new file mode 100644 index 000000000000..6dfd53352672 --- /dev/null +++ b/pkgs/development/python-modules/giturlparse/default.nix @@ -0,0 +1,35 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + setuptools, + unittestCheckHook, +}: +buildPythonPackage rec { + pname = "giturlparse"; + version = "0.12.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nephila"; + repo = "giturlparse"; + tag = version; + hash = "sha256-VqlsqMLwOtaciBWXphmFAMwtfkWBBNaL1Sdcc8Ltq7k="; + }; + + build-system = [ + setuptools + ]; + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ "giturlparse" ]; + + meta = { + description = "Parse & rewrite git urls (supports GitHub, Bitbucket, Assembla ...)"; + homepage = "https://github.com/nephila/giturlparse"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ yajo ]; + }; +} diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 325dfebbbd41..a2fec769a594 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { gpl3Only mit ]; - homepage = "http://ipi-code.org/"; + homepage = "https://ipi-code.org/"; platforms = platforms.linux; maintainers = [ maintainers.sheepforce ]; }; diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index e081e6e9d02b..003a4e59013e 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "InfluxDB client library"; homepage = "https://github.com/influxdata/influxdb-client-python"; - changelog = "https://github.com/influxdata/influxdb-client-python/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/influxdata/influxdb-client-python/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index bab4a43bdfd6..1006dee4835a 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.11.1"; + version = "1.11.2"; pyproject = true; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - hash = "sha256-voAD6ZrUL2Vjx3jMYECEhPtdffsXlSuU2wWu3S8NoYs="; + hash = "sha256-P2fb45wct87QS5RshNKMAxCU7Lkx1DAC/nRRhYtREQo="; }; # drop pynpm which tries to install node_modules diff --git a/pkgs/development/python-modules/knot-floer-homology/default.nix b/pkgs/development/python-modules/knot-floer-homology/default.nix new file mode 100644 index 000000000000..b483f3146bf3 --- /dev/null +++ b/pkgs/development/python-modules/knot-floer-homology/default.nix @@ -0,0 +1,42 @@ +{ + lib, + python, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cython, +}: + +buildPythonPackage rec { + pname = "knot-floer-homology"; + version = "1.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "3-manifolds"; + repo = "knot_floer_homology"; + tag = "${version}_as_released"; + hash = "sha256-Gw9k9AaUVTBzE+ERUH8VgS//aVT03DdKozpL8xLG4No="; + }; + + build-system = [ + setuptools + cython + ]; + + pythonImportsCheck = [ "knot_floer_homology" ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m knot_floer_homology.test + runHook postCheck + ''; + + meta = { + description = "Python wrapper for Zoltán Szabó's HFK Calculator"; + changelog = "https://github.com/3-manifolds/knot_floer_homology/releases/tag/${src.tag}"; + homepage = "https://github.com/3-manifolds/knot_floer_homology"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ noiioiu ]; + }; +} diff --git a/pkgs/development/python-modules/langchain-anthropic/default.nix b/pkgs/development/python-modules/langchain-anthropic/default.nix index 7a7f95ad5e5a..25bfd22922b7 100644 --- a/pkgs/development/python-modules/langchain-anthropic/default.nix +++ b/pkgs/development/python-modules/langchain-anthropic/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "langchain-anthropic"; - version = "0.3.13"; + version = "0.3.15"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-anthropic==${version}"; - hash = "sha256-CloIxDPnBnKDUeS4psRvpz8ifK/xR/U62wG+ORHginM="; + hash = "sha256-GOD6pMuUDCfrQ6MP+/HXZIg5wHUDRysosEjXjewY/9M="; }; sourceRoot = "${src.name}/libs/partners/anthropic"; @@ -52,7 +52,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit_tests" ]; + disabledTestPaths = [ + "tests/integration_tests" + ]; pythonImportsCheck = [ "langchain_anthropic" ]; diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix index 7c6bb1762386..2b3862edd3ee 100644 --- a/pkgs/development/python-modules/langchain-tests/default.nix +++ b/pkgs/development/python-modules/langchain-tests/default.nix @@ -10,6 +10,10 @@ httpx, langchain-core, syrupy, + pytest-benchmark, + pytest-codspeed, + pytest-recording, + vcrpy, # buildInputs pytest, @@ -26,14 +30,14 @@ buildPythonPackage rec { pname = "langchain-tests"; - version = "0.3.19"; + version = "0.3.20"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-tests==${version}"; - hash = "sha256-DSTngWRFseJ6kSAY7Lxxkh77QFr0jhHxG3mH89QmdxA="; + hash = "sha256-RMuxWA/n8d71FReFKO3Y/5P0MYk4aZ5WU2/TRxf9UuE="; }; sourceRoot = "${src.name}/libs/standard-tests"; @@ -51,8 +55,12 @@ buildPythonPackage rec { httpx langchain-core pytest-asyncio + pytest-benchmark + pytest-codspeed + pytest-recording pytest-socket syrupy + vcrpy ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/low-index/default.nix b/pkgs/development/python-modules/low-index/default.nix new file mode 100644 index 000000000000..7d21f3602b02 --- /dev/null +++ b/pkgs/development/python-modules/low-index/default.nix @@ -0,0 +1,38 @@ +{ + lib, + python, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "low-index"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "3-manifolds"; + repo = "low_index"; + tag = "v${version}_as_released"; + hash = "sha256-T8hzC9ulikQ1pUdbXgjuKAX5oMJEycPvXWv74rCkQGY="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "low_index" ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m low_index.test + runHook postCheck + ''; + + meta = { + description = "Enumerates low index subgroups of a finitely presented group"; + changelog = "https://github.com/3-manifolds/low_index/releases/tag/${src.tag}"; + homepage = "https://github.com/3-manifolds/low_index"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ noiioiu ]; + }; +} diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 71be18913927..d4cc8603e4cf 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + installShellFiles, # build-system setuptools, @@ -88,6 +89,10 @@ buildPythonPackage rec { dilation = [ noiseprotocol ]; }; + nativeBuildInputs = [ + installShellFiles + ]; + nativeCheckInputs = [ magic-wormhole-mailbox-server @@ -101,6 +106,10 @@ buildPythonPackage rec { postInstall = '' install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1 + installShellCompletion --cmd ${meta.mainProgram} \ + --bash wormhole_complete.bash \ + --fish wormhole_complete.fish \ + --zsh wormhole_complete.zsh ''; meta = { diff --git a/pkgs/development/python-modules/markitdown/default.nix b/pkgs/development/python-modules/markitdown/default.nix index 244f9ce8e1ed..565602f2feff 100644 --- a/pkgs/development/python-modules/markitdown/default.nix +++ b/pkgs/development/python-modules/markitdown/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, hatchling, beautifulsoup4, + defusedxml, ffmpeg-headless, magika, mammoth, @@ -29,14 +30,14 @@ buildPythonPackage rec { pname = "markitdown"; - version = "0.1.1"; + version = "0.1.2"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "markitdown"; tag = "v${version}"; - hash = "sha256-siXam2a+ryyLBbciQgjd9k6zC8r46LbzjPMoc1dG0wk="; + hash = "sha256-7T5cuFBivazKlUk3OKXKKU3YazRAfGRt9O+gCYX3ciQ="; }; sourceRoot = "${src.name}/packages/markitdown"; @@ -45,6 +46,7 @@ buildPythonPackage rec { dependencies = [ beautifulsoup4 + defusedxml ffmpeg-headless lxml magika diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix index 84012235da7f..2abb98854bdf 100644 --- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8="; }; - sourceRoot = "source/packages/abstractions/"; + sourceRoot = "${src.name}/packages/abstractions/"; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix index b90aac7a5bde..49a6c420de00 100644 --- a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8="; }; - sourceRoot = "source/packages/authentication/azure/"; + sourceRoot = "${src.name}/packages/authentication/azure/"; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix index 3134ce73404f..dd0eb55a7dbb 100644 --- a/pkgs/development/python-modules/microsoft-kiota-http/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8="; }; - sourceRoot = "source/packages/http/httpx/"; + sourceRoot = "${src.name}/packages/http/httpx/"; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix index f0ee6795a957..3436f98d41e6 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8="; }; - sourceRoot = "source/packages/serialization/form/"; + sourceRoot = "${src.name}/packages/serialization/form/"; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix index 1aa456403807..d7aef7c3100e 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8="; }; - sourceRoot = "source/packages/serialization/json/"; + sourceRoot = "${src.name}/packages/serialization/json/"; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix index 54f9fb76d560..eee939de8263 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8="; }; - sourceRoot = "source/packages/serialization/multipart/"; + sourceRoot = "${src.name}/packages/serialization/multipart/"; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix index 25cfd055ac04..4fc7fb84b474 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8="; }; - sourceRoot = "source/packages/serialization/text/"; + sourceRoot = "${src.name}/packages/serialization/text/"; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix index a85dab5d93e3..e5b34b7b70f1 100644 --- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { cachecontrol gitpython mkdocs - ]; + ] ++ cachecontrol.optional-dependencies.filecache; nativeCheckInputs = [ feedparser diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 55130de6c032..04adbb7e0bfc 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -226,8 +226,8 @@ rec { "sha256-E/vP9Z9Cd6QZDJ2es245eXiUjTSsV1XNN9qNnIbXJ7E="; mypy-boto3-cloudformation = - buildMypyBoto3Package "cloudformation" "1.38.0" - "sha256-VjOZFmwH6R4GlfseWBA6JIsr7g214sPwcVV3bdYxGAU="; + buildMypyBoto3Package "cloudformation" "1.38.31" + "sha256-9BhSMfqrl7+1CyXcEyMzPGMKCS/6jBU1byERb8kqf0I="; mypy-boto3-cloudfront = buildMypyBoto3Package "cloudfront" "1.38.12" @@ -762,8 +762,8 @@ rec { "sha256-PKOF/jd1Wjz8lCwbCd4cfHeStkvcDhQu7a7bpHaizgU="; mypy-boto3-kms = - buildMypyBoto3Package "kms" "1.38.0" - "sha256-s1D6mzq5T7G8jm2nxUr7Kq6QeT3oDBOF4yafahD+fq4="; + buildMypyBoto3Package "kms" "1.38.31" + "sha256-hCN7Docv7FRJrUW1JveU8v68OFl97PQ+xQRICQ8D9rY="; mypy-boto3-lakeformation = buildMypyBoto3Package "lakeformation" "1.38.0" @@ -1398,8 +1398,8 @@ rec { "sha256-ndTROc1T2APmQHL7EsSeU3XxWPYzp1e32tzqe4UDs/8="; mypy-boto3-wafv2 = - buildMypyBoto3Package "wafv2" "1.38.0" - "sha256-j50nk+lk4EaSjKHQ94ZWz0euxQSubBx3pTRSRObxBtc="; + buildMypyBoto3Package "wafv2" "1.38.31" + "sha256-mWZAUafk2fNj9Se9q06vAKSswzLFqeqnt7e5mncqhdM="; mypy-boto3-wellarchitected = buildMypyBoto3Package "wellarchitected" "1.38.0" diff --git a/pkgs/development/python-modules/newspaper3k/default.nix b/pkgs/development/python-modules/newspaper3k/default.nix new file mode 100644 index 000000000000..d3db2a05831a --- /dev/null +++ b/pkgs/development/python-modules/newspaper3k/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + feedparser, + requests, + pillow, + tldextract, + lxml, + lxml-html-clean, + beautifulsoup4, + python-dateutil, +}: + +buildPythonPackage rec { + pname = "newspaper3k"; + version = "0.2.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-nxvT4ftI9ADHFav4dcx7Cme33c2H9Qya7rj8u72QBPs="; + }; + + dependencies = [ + feedparser + requests + pillow + tldextract + lxml + lxml-html-clean + beautifulsoup4 + python-dateutil + ]; + + pythonImportsCheck = [ "newspaper" ]; + + meta = { + description = "Simplified python article discovery & extraction"; + homepage = "https://pypi.org/project/newspaper3k"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ emaryn ]; + }; +} diff --git a/pkgs/development/python-modules/nominal-api-protos/default.nix b/pkgs/development/python-modules/nominal-api-protos/default.nix new file mode 100644 index 000000000000..59d978720958 --- /dev/null +++ b/pkgs/development/python-modules/nominal-api-protos/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + protobuf, +}: + +buildPythonPackage rec { + pname = "nominal-api-protos"; + version = "0.708.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "nominal_api_protos"; + hash = "sha256-EYyBRmmCq4OA6xgf4JpajUtlJClkxxPn48Wmmy2mqN4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ protobuf ]; + + pythonImportsCheck = [ "nominal_api_protos" ]; + + meta = { + description = "Generated protobuf client for the Nominal API"; + homepage = "https://pypi.org/project/nominal-api-protos/"; + maintainers = with lib.maintainers; [ alkasm ]; + license = lib.licenses.unfree; + }; +} diff --git a/pkgs/development/python-modules/nominal-api/default.nix b/pkgs/development/python-modules/nominal-api/default.nix new file mode 100644 index 000000000000..23973567b65f --- /dev/null +++ b/pkgs/development/python-modules/nominal-api/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + requests, + conjure-python-client, +}: + +buildPythonPackage rec { + pname = "nominal-api"; + version = "0.708.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "nominal_api"; + hash = "sha256-gaMQ4bLhdBkDTUoHP5Cb0vS5emNcYga5eTvV2TEWQiU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + requests + conjure-python-client + ]; + + pythonImportsCheck = [ "nominal_api" ]; + + meta = { + description = "Generated conjure client for the Nominal API"; + homepage = "https://pypi.org/project/nominal-api/"; + maintainers = with lib.maintainers; [ alkasm ]; + license = lib.licenses.unfree; + }; +} diff --git a/pkgs/development/python-modules/nominal/default.nix b/pkgs/development/python-modules/nominal/default.nix new file mode 100644 index 000000000000..72bed6396d8f --- /dev/null +++ b/pkgs/development/python-modules/nominal/default.nix @@ -0,0 +1,75 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + requests, + nominal-api, + nominal-api-protos, + python-dateutil, + conjure-python-client, + pandas, + typing-extensions, + click, + pyyaml, + tabulate, + ffmpeg-python, + pytest-cov-stub, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "nominal"; + version = "1.59.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nominal-io"; + repo = "nominal-client"; + tag = "v${version}"; + hash = "sha256-wWy7i9lWZzDCx3cPyViLp7r7hSSDQbqdSUABX7L0LSE="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + requests + conjure-python-client + nominal-api + python-dateutil + pandas + typing-extensions + click + pyyaml + tabulate + ffmpeg-python + ]; + + optional-dependencies = { + protos = [ nominal-api-protos ]; + # tdms = [ nptdms ]; nptdms is not in nixpkgs + }; + + nativeCheckInputs = [ + nominal-api-protos + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nominal" + "nominal.core" + ]; + + disabledTestPaths = [ + "tests/cli/test_auth.py::test_good_request" + ]; + + meta = { + description = "Automate Nominal workflows in Python"; + homepage = "https://github.com/nominal-io/nominal-client"; + changelog = "https://github.com/nominal-io/nominal-client/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ alkasm ]; + }; +} diff --git a/pkgs/development/python-modules/oca-port/default.nix b/pkgs/development/python-modules/oca-port/default.nix index 70720e3e130a..71194b3233c0 100644 --- a/pkgs/development/python-modules/oca-port/default.nix +++ b/pkgs/development/python-modules/oca-port/default.nix @@ -1,33 +1,35 @@ { buildPythonPackage, click, - fetchPypi, + fetchFromGitHub, gitpython, + giturlparse, lib, nix-update-script, requests, setuptools-scm, - setuptools, }: buildPythonPackage rec { pname = "oca-port"; version = "0.18"; - format = "pyproject"; + pyproject = true; - src = fetchPypi { + src = fetchFromGitHub { inherit version; - pname = "oca_port"; - hash = "sha256-JqSnt23SQSyh/7hKAy04k/ocpAN61qQ+VebQv5Ddbjk="; + owner = "OCA"; + repo = "oca-port"; + tag = "v${version}"; + hash = "sha256-r32ePlbg0GjryB5HDx0nQTq71lG/o+4sUFRdKW/K5ys="; }; - nativeBuildInputs = [ - setuptools + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ click + giturlparse gitpython requests ]; @@ -36,10 +38,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "oca_port" ]; - meta = with lib; { + meta = { description = "Tool helping to port an addon or missing commits of an addon from one branch to another"; homepage = "https://github.com/OCA/oca-port"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ yajo ]; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ yajo ]; }; } diff --git a/pkgs/development/python-modules/pip-install-test/default.nix b/pkgs/development/python-modules/pip-install-test/default.nix new file mode 100644 index 000000000000..81b596ac3fe9 --- /dev/null +++ b/pkgs/development/python-modules/pip-install-test/default.nix @@ -0,0 +1,24 @@ +{ + lib, + buildPythonPackage, + fetchPypi, +}: + +buildPythonPackage rec { + pname = "pip-install-test"; + version = "0.5"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wzxGztmGW1mWPoblSQGUdSC9tzv5GEnN27AAdCWYu2c="; + }; + + pythonImportsCheck = [ "pip_install_test" ]; + + meta = { + description = "Minimal stub package to test success of pip install"; + homepage = "https://pypi.org/project/pip-install-test"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ emaryn ]; + }; +} diff --git a/pkgs/development/python-modules/plink/default.nix b/pkgs/development/python-modules/plink/default.nix new file mode 100644 index 000000000000..062d438058a4 --- /dev/null +++ b/pkgs/development/python-modules/plink/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + sphinx, + tkinter, +}: + +buildPythonPackage rec { + pname = "plink"; + version = "2.4.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "3-manifolds"; + repo = "plink"; + tag = "${version}_as_released"; + hash = "sha256-+WUyQvQY9Fx47GikzJ4gcCpSIjvk5756FP0bDdF6Ack="; + }; + + build-system = [ + setuptools + sphinx + ]; + + dependencies = [ tkinter ]; + + pythonImportsCheck = [ "plink" ]; + + meta = { + description = "Full featured Tk-based knot and link editor"; + mainProgram = "plink"; + homepage = "https://3-manifolds.github.io/PLink"; + changelog = "https://github.com/3-manifolds/PLink/releases/tag/${src.tag}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ noiioiu ]; + }; +} diff --git a/pkgs/development/python-modules/polyswarm-api/default.nix b/pkgs/development/python-modules/polyswarm-api/default.nix index 4ffa74130384..ac78677fa4c5 100644 --- a/pkgs/development/python-modules/polyswarm-api/default.nix +++ b/pkgs/development/python-modules/polyswarm-api/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "polyswarm-api"; - version = "3.12.0"; + version = "3.13.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "polyswarm"; repo = "polyswarm-api"; tag = version; - hash = "sha256-LM+8U7gEo16e8vuFuheonLB685zeNEm736UVXgmtPDw="; + hash = "sha256-Mu/Gfs6Iy24xUQ1yvRAR3TXio30FHMVpTel99YtRtyg="; }; pythonRelaxDeps = [ "future" ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index db8b08db1f00..cec383469045 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250603"; + version = "1.0.2.20250606"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yilOA8vKLb7Q1KTAM7+iO5HIkphALi+BL64RdXIpcX4="; + hash = "sha256-N4Lp8bRrD18DvSyg0Ye9wV/T1w2prNjHEdVDSq0wJoM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/py-machineid/default.nix b/pkgs/development/python-modules/py-machineid/default.nix index 9c634e6a1ab6..332ff82cd9bf 100644 --- a/pkgs/development/python-modules/py-machineid/default.nix +++ b/pkgs/development/python-modules/py-machineid/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "py-machineid"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WnSoEOOLV7BDsUXHVsHmrBYVKct9g/4gCZ/LmGrMV3s="; + hash = "sha256-VRXV+XeQc9DKouiq8VoP3QrUJH/QuG2cRHQxyW0+NGc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 386fd25c22c8..c677b9a4654a 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -11,6 +11,7 @@ cython, ninja, meson-python, + pyproject-metadata, fontconfig, freetype, @@ -29,7 +30,7 @@ buildPythonPackage rec { pname = "pygame-ce"; - version = "2.5.3"; + version = "2.5.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +39,7 @@ buildPythonPackage rec { owner = "pygame-community"; repo = "pygame-ce"; tag = version; - hash = "sha256-Vl9UwCknbMHdsB1wwo/JqybWz3UbAMegIcO0GpiCxig="; + hash = "sha256-joMc3QaQNbZ65pBJ7r5D6lWAGW9eM+e0k/ozOHfQL4U="; # Unicode files cause different checksums on HFS+ vs. other filesystems postFetch = "rm -rf $out/docs/reST"; }; @@ -65,8 +66,10 @@ buildPythonPackage rec { postPatch = '' + # "pyproject-metadata!=0.9.1" was pinned due to https://github.com/pygame-community/pygame-ce/pull/3395 # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015) substituteInPlace pyproject.toml \ + --replace-fail '"pyproject-metadata!=0.9.1",' '"pyproject-metadata",' \ --replace-fail '"meson<=1.7.0",' '"meson",' \ --replace-fail '"meson-python<=0.17.1",' '"meson-python",' \ --replace-fail '"ninja<=1.12.1",' "" \ @@ -92,6 +95,7 @@ buildPythonPackage rec { setuptools ninja meson-python + pyproject-metadata ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index 4b6132f16455..e045ccf5af53 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pygame-gui"; - version = "0613"; + version = "0614"; pyproject = true; # nixpkgs-update: no auto update @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "MyreMylar"; repo = "pygame_gui"; tag = "v_${version}"; - hash = "sha256-vLDl3VcrjjWpw4hLuKmomK6EykF1VK1CGLkEqjNUQ/Q="; + hash = "sha256-wLvWaJuXMXk7zOaSZfIpsXhQt+eCjOtlh8IRuKbR75o="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix index 55430ffafc65..22da96bb17b0 100644 --- a/pkgs/development/python-modules/pyiskra/default.nix +++ b/pkgs/development/python-modules/pyiskra/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyiskra"; - version = "0.1.19"; + version = "0.1.21"; pyproject = true; src = fetchFromGitHub { owner = "Iskramis"; repo = "pyiskra"; tag = "v${version}"; - hash = "sha256-M44dXA4hBlyRvIwgIolxaGE8QmystPoEGX3ongvLB04="; + hash = "sha256-ZFva7pyilMjvgRfsDhnsLGKRjl9Jf4vdFfK4RFb3sSE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyobjc-core/default.nix b/pkgs/development/python-modules/pyobjc-core/default.nix index 5dd7959940ca..4f5c0f3a1e13 100644 --- a/pkgs/development/python-modules/pyobjc-core/default.nix +++ b/pkgs/development/python-modules/pyobjc-core/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg="; }; - sourceRoot = "source/pyobjc-core"; + sourceRoot = "${src.name}/pyobjc-core"; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix index 004757337266..e6904460f4d1 100644 --- a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix +++ b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg="; }; - sourceRoot = "source/pyobjc-framework-Cocoa"; + sourceRoot = "${src.name}/pyobjc-framework-Cocoa"; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyrender/default.nix b/pkgs/development/python-modules/pyrender/default.nix index 1399a21b6fdb..04bbda7aa8ef 100644 --- a/pkgs/development/python-modules/pyrender/default.nix +++ b/pkgs/development/python-modules/pyrender/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, @@ -16,6 +17,7 @@ six, trimesh, pytestCheckHook, + mesa, }: buildPythonPackage rec { @@ -77,10 +79,16 @@ buildPythonPackage rec { env.PYOPENGL_PLATFORM = "egl"; # enables headless rendering during check - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = + [ + pytestCheckHook + ] + ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) [ + mesa.llvmpipeHook + ]; - disabledTestPaths = [ - # does not work inside sandbox, no GPU + disabledTestPaths = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform mesa.llvmpipeHook) [ + # requires opengl context "tests/unit/test_offscreen.py" ]; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 8e35b08b12ea..9a341c0eb418 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "25.4.1"; + version = "25.5.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ansible"; repo = "pytest-ansible"; tag = "v${version}"; - hash = "sha256-AJU7jGO/fN5R0ZVb/WhiXZKEZF4Z2ibhIBs+267lSSk="; + hash = "sha256-k6JFaB5VbUCwknN8SkNotdPRvSvW1tFmTx5p3hGfesg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-djvulibre/default.nix b/pkgs/development/python-modules/python-djvulibre/default.nix index 235e12246730..c505e132ee07 100644 --- a/pkgs/development/python-modules/python-djvulibre/default.nix +++ b/pkgs/development/python-modules/python-djvulibre/default.nix @@ -1,44 +1,41 @@ { lib, - buildPythonPackage, + python3Packages, fetchFromGitHub, - cython, djvulibre, ghostscript_headless, - packaging, pkg-config, - setuptools, unittestCheckHook, - wheel, }: -buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "python-djvulibre"; - version = "0.9.1"; + version = "0.9.3"; pyproject = true; src = fetchFromGitHub { owner = "FriedrichFroebel"; repo = "python-djvulibre"; tag = version; - hash = "sha256-5jOJyVPGJvR4YgxgJgyN47/OzsK3ASJXfn1Gt9y8rbs="; + hash = "sha256-ntDRntNxVchZm+i+qBbiZlfHAXJRKMin9Hi+BoJQjTM="; }; - nativeBuildInputs = [ - cython - packaging + build-system = [ + python3Packages.cython + djvulibre + ghostscript_headless pkg-config - setuptools - wheel + python3Packages.setuptools ]; - buildInputs = [ + dependencies = with python3Packages; [ djvulibre ghostscript_headless ]; preCheck = '' rm -rf djvu + rm -rf tests/examples ''; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/replicate/default.nix b/pkgs/development/python-modules/replicate/default.nix index 492de6662f8b..6956900433b5 100644 --- a/pkgs/development/python-modules/replicate/default.nix +++ b/pkgs/development/python-modules/replicate/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "replicate"; - version = "1.0.4"; + version = "1.0.7"; pyproject = true; src = fetchFromGitHub { owner = "replicate"; repo = "replicate-python"; tag = version; - hash = "sha256-VXJBArFzVPls0ZWL8o6hkOiTtjYRxkdNDiWCPN/hW48="; + hash = "sha256-zl7b6zg5igyFvx5Qw0cjIiY25xivpTucc2NcP1IkFUI="; }; build-system = [ setuptools ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = { description = "Python client for Replicate"; homepage = "https://replicate.com/"; - changelog = "https://github.com/replicate/replicate-python/releases/tag/${version}"; + changelog = "https://github.com/replicate/replicate-python/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jokatzke ]; }; diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index a133e157ffe0..485420779a1d 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "robotframework"; - version = "7.2.2"; + version = "7.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "robotframework"; tag = "v${version}"; - hash = "sha256-Kl+XjGTTiEesVi7aZJMBQQklw83ROrpaWziq+8puZKg="; + hash = "sha256-Hj1ZIWH0GSLJiO2AEQnGkVGbnw0h1zEorE/J1al3NWM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix index 1660a2b56389..f2f987261b15 100644 --- a/pkgs/development/python-modules/sagemaker-core/default.nix +++ b/pkgs/development/python-modules/sagemaker-core/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sagemaker-core"; - version = "1.0.34"; + version = "1.0.36"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-core"; tag = "v${version}"; - hash = "sha256-ZkV4SfJS+3otrzYFZH7lt/tBsFTbfss9Yt7OKgl3fSQ="; + hash = "sha256-3nsBzpkreyavjZoyA96DWK9lV9YrOB6SyrpLFqX4ZP8="; }; build-system = [ diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix index 55daa60befe2..b47cef41fc9c 100644 --- a/pkgs/development/python-modules/simplekv/default.nix +++ b/pkgs/development/python-modules/simplekv/default.nix @@ -1,12 +1,21 @@ { lib, buildPythonPackage, - dulwich, fetchFromGitHub, - mock, - pytestCheckHook, pythonOlder, setuptools, + + # optional dependencies + azure-storage-blob, + boto3, + dulwich, + google-cloud-storage, + pymongo, + redis, + + # testing + mock, + pytestCheckHook, six, }: @@ -26,12 +35,11 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ - dulwich + nativeCheckInputs = [ mock pytestCheckHook six - ]; + ] ++ optional-dependencies.git; pythonImportsCheck = [ "simplekv" ]; @@ -40,11 +48,28 @@ buildPythonPackage rec { "test_concurrent_mkdir" ]; + optional-dependencies = { + amazon = [ boto3 ]; + azure = [ azure-storage-blob ]; + google = [ google-cloud-storage ]; + redis = [ redis ]; + mongodb = [ pymongo ]; + git = [ dulwich ]; + /* + Additional potential dependencies not exposed here: + sqlalchemy: Our version is too new for simplekv + appengine-python-standard: Not packaged in nixpkgs + */ + }; + meta = with lib; { description = "Simple key-value store for binary data"; homepage = "https://github.com/mbr/simplekv"; changelog = "https://github.com/mbr/simplekv/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ + fab + bbenne10 + ]; }; } diff --git a/pkgs/development/python-modules/snappy-15-knots/default.nix b/pkgs/development/python-modules/snappy-15-knots/default.nix new file mode 100644 index 000000000000..ec26a0bc8534 --- /dev/null +++ b/pkgs/development/python-modules/snappy-15-knots/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + snappy-manifolds, +}: + +buildPythonPackage rec { + pname = "snappy-15-knots"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "3-manifolds"; + repo = "snappy_15_knots"; + tag = "${version}_as_released"; + hash = "sha256-fhJhHZFf4XuW/0V6LOuV4qoFWke3oFP0KArDpXLWh9g="; + }; + + build-system = [ setuptools ]; + + dependencies = [ snappy-manifolds ]; + + pythonImportsCheck = [ "snappy_15_knots" ]; + + meta = with lib; { + description = "Database of snappy manifolds"; + homepage = "https://snappy.computop.org"; + changelog = "https://github.com/3-manifolds/snappy_15_knots/releases/tag/${src.tag}"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ noiioiu ]; + }; +} diff --git a/pkgs/development/python-modules/snappy-manifolds/default.nix b/pkgs/development/python-modules/snappy-manifolds/default.nix new file mode 100644 index 000000000000..b5fb336f3b63 --- /dev/null +++ b/pkgs/development/python-modules/snappy-manifolds/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "snappy-manifolds"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "3-manifolds"; + repo = "snappy_manifolds"; + tag = "${version}_as_released"; + hash = "sha256-vxG3z6zWzG4S11fBxYGn4/c2f2sWOCIrzT+R27TR144="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "snappy_manifolds" ]; + + meta = { + description = "Database of snappy manifolds"; + changelog = "https://github.com/3-manifolds/snappy_manifolds/releases/tag/${src.tag}"; + homepage = "https://snappy.computop.org"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ noiioiu ]; + }; +} diff --git a/pkgs/development/python-modules/spherogram/default.nix b/pkgs/development/python-modules/spherogram/default.nix new file mode 100644 index 000000000000..0e4a3da679d5 --- /dev/null +++ b/pkgs/development/python-modules/spherogram/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cython, + networkx, + decorator, + knot-floer-homology, + snappy-manifolds, + snappy-15-knots, +}: + +buildPythonPackage rec { + pname = "spherogram"; + version = "2.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "3-manifolds"; + repo = "spherogram"; + tag = "${version}_as_released"; + hash = "sha256-uqc+3xS4xulXR0tZlNuyC5Zz5OztR6c4PZWpsvU+4Pw="; + }; + + build-system = [ + setuptools + cython + ]; + + dependencies = [ + networkx + decorator + snappy-manifolds + knot-floer-homology + ]; + + optional-dependencies.snappy-15-knots = [ snappy-15-knots ]; + + pythonImportsCheck = [ "spherogram" ]; + + meta = { + description = "Spherical diagrams for 3-manifold topology"; + homepage = "https://snappy.computop.org/spherogram.html"; + changelog = "https://github.com/3-manifolds/Spherogram/releases/tag/${src.tag}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ noiioiu ]; + }; +} diff --git a/pkgs/development/python-modules/starlette-admin/default.nix b/pkgs/development/python-modules/starlette-admin/default.nix index 5ff77b3a6488..46c0825ce59b 100644 --- a/pkgs/development/python-modules/starlette-admin/default.nix +++ b/pkgs/development/python-modules/starlette-admin/default.nix @@ -32,42 +32,16 @@ buildPythonPackage rec { pname = "starlette-admin"; - version = "0.14.1"; + version = "0.15.0"; pyproject = true; src = fetchFromGitHub { owner = "jowilf"; repo = "starlette-admin"; - rev = version; - hash = "sha256-DoYD8Hc5pd68+BhASw3mwwCdhu0vYHiELjVmVwU8FHs="; + tag = version; + hash = "sha256-R9ZRrJaBp1joT3DtymvS+Ac0MzEUFYFovgxMW0njsT0="; }; - # recreates https://github.com/jowilf/starlette-admin/pull/630 which cannot be cherry-picked - postPatch = '' - test_files_to_fix=( - tests/mongoengine/test_auth.py - tests/odmantic/test_async_engine.py - tests/odmantic/test_auth.py - tests/odmantic/test_sync_engine.py - tests/sqla/test_async_engine.py - tests/sqla/test_auth.py - tests/sqla/test_multiple_pks.py - tests/sqla/test_sqla_and_pydantic.py - tests/sqla/test_sqla_utils.py - tests/sqla/test_sqlmodel.py - tests/sqla/test_sync_engine.py - tests/sqla/test_view_serialization.py - tests/test_auth.py - ) - substituteInPlace "''${test_files_to_fix[@]}" \ - --replace-fail \ - 'from httpx import AsyncClient' \ - 'from httpx import AsyncClient, ASGITransport' \ - --replace-fail \ - 'AsyncClient(app=app,' \ - 'AsyncClient(transport=ASGITransport(app=app),' - ''; - build-system = [ hatchling ]; dependencies = [ @@ -122,6 +96,8 @@ buildPythonPackage rec { [ # odmantic is not packaged "tests/odmantic" + # beanie is not packaged + "tests/beanie" # needs mongodb running on port 27017 "tests/mongoengine" ] @@ -146,7 +122,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast, beautiful and extensible administrative interface framework for Starlette & FastApi applications"; homepage = "https://github.com/jowilf/starlette-admin"; - changelog = "https://github.com/jowilf/starlette-admin/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/jowilf/starlette-admin/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ pbsds ]; }; diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index f6c58350610b..61ec354edeb8 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "System for controlling process state under UNIX"; - homepage = "http://supervisord.org/"; + homepage = "https://supervisord.org/"; changelog = "https://github.com/Supervisor/supervisor/blob/${version}/CHANGES.rst"; license = licenses.free; # http://www.repoze.org/LICENSE.txt maintainers = with maintainers; [ zimbatm ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 8e6704319bac..fc2ae250a34d 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1393"; + version = "3.0.1394"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-cw+H8CvyCWbhYvNkGFesSqqhHwlUg3oHCKn9Vtll3JA="; + hash = "sha256-yX+57zIrz7o8wBPOcB7Kuifq9Z426pKa1/0/e3UHgDQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix index 924464439578..cffd4d5483f2 100644 --- a/pkgs/development/python-modules/textx/default.nix +++ b/pkgs/development/python-modules/textx/default.nix @@ -85,7 +85,7 @@ let meta = with lib; { inherit (textx.meta) license maintainers; description = "Sample textX language for testing"; - homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot; + homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot; }; }; @@ -108,7 +108,7 @@ let meta = with lib; { inherit (textx.meta) license maintainers; description = "Sample textX language for testing"; - homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot; + homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot; }; }; @@ -128,7 +128,7 @@ let meta = with lib; { inherit (textx.meta) license maintainers; description = "Sample textX language for testing"; - homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot; + homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot; }; }; @@ -148,7 +148,7 @@ let meta = with lib; { inherit (textx.meta) license maintainers; description = "Sample textX language for testing"; - homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot; + homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot; }; }; @@ -168,7 +168,7 @@ let meta = with lib; { inherit (textx.meta) license maintainers; description = "Sample textX sub-command for testing"; - homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot; + homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot; }; }; in diff --git a/pkgs/development/python-modules/validator-collection/default.nix b/pkgs/development/python-modules/validator-collection/default.nix index 19ed6d8df010..f21a13bc81de 100644 --- a/pkgs/development/python-modules/validator-collection/default.nix +++ b/pkgs/development/python-modules/validator-collection/default.nix @@ -3,58 +3,10 @@ buildPythonPackage, fetchFromGitHub, setuptools, - alabaster, - attrs, - babel, - certifi, - cffi, - chardet, - colorama, - coverage, - docutils, - filelock, - html5lib, - idna, - imagesize, - isort, - jinja2, + simplejson, jsonschema, - lazy-object-proxy, - markupsafe, - mccabe, - more-itertools, - packaging, - pkginfo, - pluggy, - py, - py-cpuinfo, - pycparser, pyfakefs, - pygments, - pyparsing, - pytest, - pytest-benchmark, - pytest-cov-stub, - pytz, - readme-renderer, - requests, - requests-toolbelt, - restview, - six, - snowballstemmer, - sphinx, - sphinx-rtd-theme, - sphinx-tabs, - sphinxcontrib-websupport, - toml, pytestCheckHook, - tox, - tqdm, - twine, - urllib3, - virtualenv, - webencodings, - wrapt, pythonOlder, }: @@ -74,61 +26,16 @@ buildPythonPackage rec { build-system = [ setuptools ]; + # listed in setup.py, the requirements.txt is _full_ of dev junk dependencies = [ - alabaster - attrs - babel - certifi - cffi - chardet - colorama - coverage - docutils - filelock - html5lib - idna - imagesize - isort - jinja2 jsonschema - lazy-object-proxy - markupsafe - mccabe - more-itertools - packaging - pkginfo - pluggy - py - py-cpuinfo - pycparser - pyfakefs - pygments - pyparsing - pytest - pytest-benchmark - pytest-cov-stub - pytz - readme-renderer - requests - requests-toolbelt - restview - six - snowballstemmer - sphinx - sphinx-rtd-theme - sphinx-tabs - sphinxcontrib-websupport - toml - tox - tqdm - twine - urllib3 - virtualenv - webencodings - wrapt + simplejson # optional but preferred ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pyfakefs + ]; pythonImportsCheck = [ "validator_collection" ]; diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix index 419e05188930..7dc54dc30748 100644 --- a/pkgs/development/python-modules/xstatic-bootbox/default.nix +++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "http://bootboxjs.com"; + homepage = "https://bootboxjs.com"; description = "Bootboxjs packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 170c1705bd34..3bfc729b15ed 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -58,8 +58,8 @@ let finds structures that satisfy them. Structures are displayed graphically, and their appearance can be customized for the domain at hand. ''; - homepage = "http://alloytools.org/"; - downloadPage = "http://alloytools.org/download.html"; + homepage = "https://alloytools.org/"; + downloadPage = "https://alloytools.org/download.html"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 38dff810651d..a268b255c2d4 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.40.0"; + version = "1.40.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-4gn8bbzI+NerU8Bdi6FxLB/Kg1JaDBiZkR98zMRvTkw="; + hash = "sha256-+LHS+Syyy/jsk5G16qBhvv+/kjEACnxjl2q9YrrdPYE="; }; outputs = [ diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index ab7370d0d55f..91b5a1b967af 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -12,35 +12,35 @@ }, "34": { "hashes": { - "aarch64-darwin": "5d9bba193dd522548da5c9289eae79016f053cefad77d0540e8412f1318462a8", - "aarch64-linux": "65e4c5fbbf452378664777696727384853ca4de699da7c84ac39463d8d0e7de9", - "armv7l-linux": "cd3dbedf798ddfcd28f3931b8d2214ee49af8a753c21b16d4068edad44dba2ef", + "aarch64-darwin": "56c27f79c298bd21f6a0434b70776633ce9971667edf22783b4b3f0051646248", + "aarch64-linux": "2172a9fa02331ba9c645dd6a6c5c6c07235e902c0aebb61b123d2f6c3ea0121f", + "armv7l-linux": "03514c1e42d4215972add90eb828221aec29278113ecf6761ec014aee92b3c4e", "headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6", - "x86_64-darwin": "8171d8f26305eb01001ddb2d8ff6c922a6142378e1cdac8d5cc72f727bd4e6b6", - "x86_64-linux": "0ad6461a74c6bb7ef076ee4b2f5c22801ea1efb585d716b01ba499d9158d34e5" + "x86_64-darwin": "fb13c7bf7f01529e0084433166f6b66b149407d8f950ca176fde20f023ee64b6", + "x86_64-linux": "da78b040068b6f0d41b3ccc5e5d26f1130bcdeba83f23ebbdae416c26bcf80e2" }, - "version": "34.5.7" + "version": "34.5.8" }, "35": { "hashes": { - "aarch64-darwin": "03b2926356c6cf8718b2d62ee8dd1eaa0812c1f44c5a751c332401dd2867aa47", - "aarch64-linux": "9e98b01d5c6611437e8eecece093307e3e59733bb64c068fc3f9bd226b92238d", - "armv7l-linux": "3072f6865c6f0202d4059224cb43ecab27f03852025addf09a4fa1b6606cb80c", - "headers": "0wspga950dap8wk6ak2idsmp8irjn4xaxq431vxr5ik6r07zn89b", - "x86_64-darwin": "3cfff8110bd11d2b3c342b56674d3fd5863698d8413a2a97be80169f61e23ddf", - "x86_64-linux": "4e9d927a8edecf59dde02b98fe6bfde64814141898650ca1c69820ae0edbcfa4" + "aarch64-darwin": "3d2759f9ba2201a22c9ea2bc2cc2b2392d00b5584a613c82f0fe2493b2c7c108", + "aarch64-linux": "d3338afa395d2eb9eef1a96278e6ced8aeec87c59e3eff754efdc02325b27c2f", + "armv7l-linux": "d73dbb4e39f21d8fcca98b59b278a3ea53728f5d0c469dcf0b88a67b4b2b50c3", + "headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp", + "x86_64-darwin": "87b6abd92012904e2b8cf96062657e4ab9b93d60194da88f44b7d84ca281e847", + "x86_64-linux": "8eeaaf8035e471d4c0f4519765feb383c164168d95659d349f36d906dec02fb5" }, - "version": "35.5.0" + "version": "35.5.1" }, "36": { "hashes": { - "aarch64-darwin": "2b51b3001a0e79d9130a379d5276b87c22c054ddf4f19413fd9e0aa2983b4a9e", - "aarch64-linux": "0e68a05932d1c662ec8c33a2773aea5575eae1081514cf6ce1c4efe331b772bf", - "armv7l-linux": "216d0c8b6a76ef78e7c3b82a45cda251e5d6b038de89bc62f32a7317590d3995", - "headers": "1s0didlyil9vzxjkmnf49h7k99319l71m37fdz6zj45v5dnqqj7g", - "x86_64-darwin": "460d54a596a3a8a04c6414fb7866e453b7075c1a848bc3230aa01b6d566e8b03", - "x86_64-linux": "d124c39544faf125f45f3adccf83e53ca23589d9f35115f69644cfc5c8133e4e" + "aarch64-darwin": "33744982d4f182df72b8b22c20fc83942a1bdadcd2358deb83000ca578dd767d", + "aarch64-linux": "27bf37e1cecc7683575140730cbcd4e1b0847bace2d5a705c69e6d1bcd1c0f4c", + "armv7l-linux": "5953b7f3747d657334b07bc47971cdbfa1b37ef807e21ef5001637aaaa43f635", + "headers": "0zww9rwrvi6g5vjpmxsvp1cqqkmx9rnl6yzwba8kyvyapk5daz8d", + "x86_64-darwin": "4d33e24a87df1f839053eba4dc8500026df46cc62b7e57c39d5ec2edecddab91", + "x86_64-linux": "d2ef32b2bff3fe2594774fca81abda8d617d5f6c0c40529e39900296309e4a3c" }, - "version": "36.3.2" + "version": "36.4.0" } } diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index cdaaf85176c2..cfed30b50ec1 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -12,35 +12,35 @@ }, "34": { "hashes": { - "aarch64-darwin": "f8d82b6fde28011e3fd75410fe0d9141deeac78a9a3754f3e9e517b485f75b52", - "aarch64-linux": "1a65ef666f61c695bf92c7beb52ea9ec70e105d822363ade0998277d19e5cd01", - "armv7l-linux": "bfa62551c5ef52f907ebb52004504b083a075d6f6582c1ef41dd180873d86518", + "aarch64-darwin": "a3078146762ff67f27dd97470a9d2b4b5a04c182c6fcc5c949303e9a666b8d73", + "aarch64-linux": "b0a9aa381fb4b12822408d8ca668b64cbc67c1b18b8a4e5dedd2d0ad7b3513f9", + "armv7l-linux": "61a62d8b3d5604a098dc03cac7c89a325ff478d896921e286aabfd22735c64b1", "headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6", - "x86_64-darwin": "5dff162e53b4c5200b581cd4e3d93a9d5aec31bd3d69b7ede7d2a697daee7f97", - "x86_64-linux": "8fad178d82cc5e65fa18061f213f6d071e2ae1d773824e18703006dab18acf95" + "x86_64-darwin": "aa2ac2aa0dbe410ca152e85ceaf5baeb2cccb28bac7b52b866468edd5e6eb113", + "x86_64-linux": "1a6b534f65c47d2e839f5da0efeeb449cebe622e731b624ccc8c91f493eeec4f" }, - "version": "34.5.7" + "version": "34.5.8" }, "35": { "hashes": { - "aarch64-darwin": "511a3c6a6b6032985224bcbc1c4884f8673f7573bde7f3919e9797d6645b53c4", - "aarch64-linux": "25923b319e958285847d4e5c154eb7877b49380042a20c781185d8b6eb558afa", - "armv7l-linux": "d67750b53d37699ade36ebe1912bd72b64af6e825d2d0ac5095531a0b84b191d", - "headers": "0wspga950dap8wk6ak2idsmp8irjn4xaxq431vxr5ik6r07zn89b", - "x86_64-darwin": "c995faf74d2d7e5b6000b8a1e9551d60e396a19a29796608a090417388a9dd1a", - "x86_64-linux": "a1ef549561d64a9d10c1e658f8e86cd735d4261f0c4fc871d8c342240c23d9e0" + "aarch64-darwin": "20f78c2d699cdfb676afe06984bce966be143755e5be6b36a7a16ceb950861d4", + "aarch64-linux": "1f5442d17ad795ff7e8132b20d0e31dc6c9b275a86011f9827cc1b37c9d7a191", + "armv7l-linux": "a384606f04e08ce777d0eb4810cbcda036c4c94fb4ccf5388f9a65a565b28c65", + "headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp", + "x86_64-darwin": "efbc881a7599c5f250f57193d98ad08124e9f678467bc3c0977b694d3a557862", + "x86_64-linux": "1929735f9c3c862bad6ed90edce811f25a38daa9e9a77d49c8d39ce309fd499d" }, - "version": "35.5.0" + "version": "35.5.1" }, "36": { "hashes": { - "aarch64-darwin": "dbbfe5a72cdce199204c32039e5cf38992dd4a5bde95d9a1f351a130fadde340", - "aarch64-linux": "ffacf585beb157ab6e2607ac0d288d8cac979f73f08355a50c2244a700272ec1", - "armv7l-linux": "d7e290f616e8a7ba2d3b9463939e7b48e3b7f49727483424f3b06ecf7d1bebc6", - "headers": "1s0didlyil9vzxjkmnf49h7k99319l71m37fdz6zj45v5dnqqj7g", - "x86_64-darwin": "d1dbd94952411b0663f9da05c1c5938d87f4498c798b4b90c7db21bc311329f1", - "x86_64-linux": "54296abbcc99416528555113ec0871f230eef5492304827a1208591457d6968a" + "aarch64-darwin": "54580cb9d22b469c6eedb5a95b0f499c90e5efb79939dbe401a92461bf2ffda2", + "aarch64-linux": "05499a412299c811357250d00beb26c72e0e8abe9bb1c2dbbc23262399821a9e", + "armv7l-linux": "4296a52873910c65612e45eba86a6967033b4ee5442eb97ffb8d311eab0e5b1e", + "headers": "0zww9rwrvi6g5vjpmxsvp1cqqkmx9rnl6yzwba8kyvyapk5daz8d", + "x86_64-darwin": "971dcef573297e05befc8c8618ea5ac38501945e9cee5bf7d49e5a66718cf7b5", + "x86_64-linux": "215623fd1736752f70a273a2ea591a8ce0a63a3c4305866cc30c80505aadc5ca" }, - "version": "36.3.2" + "version": "36.4.0" } } diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index f181728bc62c..d2e91a284230 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -57,10 +57,10 @@ }, "src/electron": { "args": { - "hash": "sha256-V393R2leEFjj337xVnqo9hlSn7rq44n2PnLcaUrYQ4M=", + "hash": "sha256-ABlVuW0EUsFUyuIaugoI09EsHF+g7fxRSS/bOaOAkjg=", "owner": "electron", "repo": "electron", - "tag": "v34.5.7" + "tag": "v34.5.8" }, "fetcher": "fetchFromGitHub" }, @@ -1274,7 +1274,7 @@ "electron_yarn_hash": "0gh5bcsh23s3rqxqc2l3jz5vjb553sk0a1jycn94zm821pc3csd2", "modules": "132", "node": "20.19.1", - "version": "34.5.7" + "version": "34.5.8" }, "35": { "chrome": "134.0.6998.205", @@ -1334,10 +1334,10 @@ }, "src/electron": { "args": { - "hash": "sha256-+Kj09hzwmAs5UvzV2wkBY4pPJDDNNmdIcjWXAbfrwz0=", + "hash": "sha256-jIEeMTY8D4o2cCmk2RupGKu9HTVFjNI+90QZlXNrOWM=", "owner": "electron", "repo": "electron", - "tag": "v35.5.0" + "tag": "v35.5.1" }, "fetcher": "fetchFromGitHub" }, @@ -2583,10 +2583,10 @@ "electron_yarn_hash": "1p9gs8s1zhwxvvmi9zb76k5nn1wly4yq0i12ibr0wvw5ls8bbars", "modules": "133", "node": "22.15.1", - "version": "35.5.0" + "version": "35.5.1" }, "36": { - "chrome": "136.0.7103.115", + "chrome": "136.0.7103.149", "chromium": { "deps": { "gn": { @@ -2596,15 +2596,15 @@ "version": "2025-03-24" } }, - "version": "136.0.7103.115" + "version": "136.0.7103.149" }, "chromium_npm_hash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=", "deps": { "src": { "args": { - "hash": "sha256-yUWNV65TshvAMaz1kGOUQuy+J5vXPryjisGN3MxTU9Q=", + "hash": "sha256-qu3+U2o7N0MSx+nifQMAfSEjxTDIBSz/DNkEZdo5uFw=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "tag": "136.0.7103.115", + "tag": "136.0.7103.149", "url": "https://chromium.googlesource.com/chromium/src.git" }, "fetcher": "fetchFromGitiles" @@ -2643,10 +2643,10 @@ }, "src/electron": { "args": { - "hash": "sha256-bMQJfOkWRFE7Qg4kHiwkNcuXOSWU0EzEGSo8U1SuGTQ=", + "hash": "sha256-DwV8hZ6iK1Pc0j/86UnrkJ6FhOXD3eCBiOk5Y14N4jg=", "owner": "electron", "repo": "electron", - "tag": "v36.3.2" + "tag": "v36.4.0" }, "fetcher": "fetchFromGitHub" }, @@ -3898,8 +3898,8 @@ }, "src/v8": { "args": { - "hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go=", - "rev": "5297e56d91816747d539abca52b578e5832135f0", + "hash": "sha256-COlRcmBtuP/XBe9j4Qxikkz7ZSwcQhcWVe5+I0++OOk=", + "rev": "150f01318cda02f1ef63dd79672eae6c81dd3301", "url": "https://chromium.googlesource.com/v8/v8.git" }, "fetcher": "fetchFromGitiles" @@ -3908,6 +3908,6 @@ "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs", "modules": "135", "node": "22.15.1", - "version": "36.3.2" + "version": "36.4.0" } } diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix index 61918c6b7a95..4ca7e57522da 100644 --- a/pkgs/development/tools/ilspycmd/default.nix +++ b/pkgs/development/tools/ilspycmd/default.nix @@ -8,14 +8,14 @@ autoSignDarwinBinariesHook, glibcLocales, }: -buildDotnetModule (finalAttrs: rec { +buildDotnetModule (finalAttrs: { pname = "ilspycmd"; version = "9.0-preview3"; src = fetchFromGitHub { owner = "icsharpcode"; repo = "ILSpy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-7cPXFaEKr76GtqcNsKx7tstRUeTpSTF8ggxbyEnQa9M="; }; diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index 1da47d6c51c5..0d42c1cf02e8 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -1,43 +1,44 @@ { lib, - mkDerivation, - fetchFromBitbucket, + stdenv, + fetchFromGitHub, docutils, bison, flex, - qmake, - qtbase, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xxdiff"; - version = "5.0b1"; + version = "5.1-unstable-2025-03-21"; - src = fetchFromBitbucket { + src = fetchFromGitHub { owner = "blais"; - repo = pname; - rev = "5e5f885dfc43559549a81c59e9e8c9525306356a"; - sha256 = "0gbvxrkwkbvag3298j89smszghpr8ilxxfb0cvsknfqdf15b296w"; + repo = "xxdiff"; + rev = "a5593c1c675fb79d0ec2b6e353abba1fb0179aa7"; + hash = "sha256-nRXvqhO128XsAFy4KrsrSYKpzWnciXGJV6QkuqRa07w="; }; nativeBuildInputs = [ bison docutils flex - qmake + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; - buildInputs = [ qtbase ]; + buildInputs = [ libsForQt5.qtbase ]; dontUseQmakeConfigure = true; # c++11 and above is needed for building with Qt 5.9+ env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' - substituteInPlace xxdiff.pro --replace ../bin ./bin + substituteInPlace xxdiff.pro \ + --replace-fail "../bin" "./bin" ''; preConfigure = '' @@ -47,21 +48,21 @@ mkDerivation rec { installPhase = '' runHook preInstall - install -Dm555 -t $out/bin ./bin/xxdiff - install -Dm444 -t $out/share/doc/${pname} ${src}/README + install -Dm555 -t $out/bin ./bin/xxdiff + install -Dm444 -t $out/share/doc/xxdiff ${finalAttrs.src}/README.rst runHook postInstall ''; - meta = with lib; { + meta = { description = "Graphical file and directories comparator and merge tool"; mainProgram = "xxdiff"; homepage = "http://furius.ca/xxdiff/"; - license = licenses.gpl2; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ pSub raskin ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix deleted file mode 100644 index 873314138265..000000000000 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitLab, - cmake, - luajit, - SDL2, - SDL2_image, - SDL2_ttf, - physfs, - fetchpatch, - openal, - libmodplug, - libvorbis, - solarus, - qtbase, - qttools, - glm, -}: - -mkDerivation rec { - pname = "solarus-quest-editor"; - version = "1.6.4"; - - src = fetchFromGitLab { - owner = "solarus-games"; - repo = pname; - rev = "v${version}"; - sha256 = "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn"; - }; - - patches = [ - (fetchpatch { - url = "https://gitlab.com/solarus-games/solarus-quest-editor/-/commit/81d5c7f1602cf355684d70a5e3449fefccfc44b8.patch"; - sha256 = "tVUxkkDp2PcOHGy4dGvUcYj9gF7k4LN21VuxohCw9NE="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - luajit - SDL2 - SDL2_image - SDL2_ttf - physfs - openal - libmodplug - libvorbis - solarus - qtbase - qttools - glm - ]; - - meta = with lib; { - description = "Editor for the Zelda-like ARPG game engine, Solarus"; - mainProgram = "solarus-quest-editor"; - longDescription = '' - Solarus is a game engine for Zelda-like ARPG games written in lua. - Many full-fledged games have been writen for the engine. - Games can be created easily using the editor. - ''; - homepage = "https://www.solarus-games.org"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 8e1d69a26acf..ab520dea5da0 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -2,18 +2,17 @@ lib, stdenv, + writableTmpDirAsHomeHook, buildEnv, cargo, fetchFromGitHub, - fetchYarnDeps, installShellFiles, lame, mpv-unwrapped, ninja, nixosTests, nodejs, - nodejs-slim, - fixup-yarn-lock, + jq, protobuf, python3, qt6, @@ -21,6 +20,7 @@ rustPlatform, writeShellScriptBin, yarn, + yarn-berry_4, swift, @@ -28,93 +28,55 @@ }: let + yarn-berry = yarn-berry_4; + pname = "anki"; - version = "24.11"; - rev = "87ccd24efd0ea635558b1679614b6763e4f514eb"; + version = "25.02.5"; + rev = "29192d156ae60d6ce35e80ccf815a8331c9db724"; + + srcHash = "sha256-lx3tK57gcQpwmiqUzO6iU7sE31LPFp6s80prYaB2jHE="; + cargoHash = "sha256-BPCfeUiZ23FdZaF+zDUrRZchauNZWQ3gSO+Uo9WRPes="; + yarnHash = "sha256-3G+9N3xOzog3XDCKDQJCY/6CB3i6oXixRgxEyv7OG3U="; src = fetchFromGitHub { owner = "ankitects"; repo = "anki"; rev = version; - hash = "sha256-pAQBl5KbTu7LD3gKBaiyn4QiWeGYoGmxD3sDJfCZVdA="; + hash = srcHash; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-4V75+jS250XfUH6B4VBxtL2t308nyKzhDoq86kq6rp4="; + hash = cargoHash; }; - yarnOfflineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-4KQKWwlr+FuUmomKO3TEoDoSStjnyLutDxCfqGr6jzk="; - }; + # a wrapper for yarn to skip 'install' + # We do this because we need to patchShebangs after install, so we do it + # ourselves beforehand. + # We also, confusingly, have to use yarn-berry to handle the lockfile (anki's + # lockfile is too new for yarn), but have to use 'yarn' here, because anki's + # build system uses yarn-1 style flags and such. + # I think what's going on here is that yarn-1 in anki's normal build system + # ends up noticing the yarn-file is too new and shelling out to yarn-berry + # itself. + noInstallYarn = writeShellScriptBin "yarn" '' + [[ "$1" == "install" ]] && exit 0 + exec ${yarn}/bin/yarn "$@" + ''; anki-build-python = python3.withPackages (ps: with ps; [ mypy-protobuf ]); - # anki shells out to git to check its revision, and also to update submodules - # We don't actually need the submodules, so we stub that out - fakeGit = writeShellScriptBin "git" '' - case "$*" in - "rev-parse --short=8 HEAD") - echo ${builtins.substring 0 8 rev} - ;; - *"submodule update "*) - exit 0 - ;; - *) - echo "Unrecognized git: $@" - exit 1 - ;; - esac - ''; - - # We don't want to run pip-sync, it does network-io - fakePipSync = writeShellScriptBin "pip-sync" '' - exit 0 - ''; - - offlineYarn = writeShellScriptBin "yarn" '' - [[ "$1" == "install" ]] && exit 0 - exec ${yarn}/bin/yarn --offline "$@" - ''; - pyEnv = buildEnv { name = "anki-pyenv-${version}"; paths = with python3.pkgs; [ pip - fakePipSync anki-build-python ]; pathsToLink = [ "/bin" ]; }; - - # https://discourse.nixos.org/t/mkyarnpackage-lockfile-has-incorrect-entry/21586/3 - anki-nodemodules = stdenv.mkDerivation { - pname = "anki-nodemodules"; - - inherit version src yarnOfflineCache; - - nativeBuildInputs = [ - nodejs-slim - fixup-yarn-lock - yarn - ]; - - configurePhase = '' - export HOME=$NIX_BUILD_TOP - yarn config --offline set yarn-offline-mirror $yarnOfflineCache - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/ - ''; - - installPhase = '' - mv node_modules $out - ''; - }; in -python3.pkgs.buildPythonApplication { +python3.pkgs.buildPythonApplication rec { inherit pname version; outputs = [ @@ -131,19 +93,26 @@ python3.pkgs.buildPythonApplication { ./patches/skip-formatting-python-code.patch ]; - inherit cargoDeps yarnOfflineCache; + inherit cargoDeps; + + missingHashes = ./missing-hashes.json; + yarnOfflineCache = yarn-berry.fetchYarnBerryDeps { + inherit missingHashes; + yarnLock = "${src}/yarn.lock"; + hash = yarnHash; + }; nativeBuildInputs = [ - fakeGit - offlineYarn - fixup-yarn-lock - cargo installShellFiles + jq ninja + nodejs qt6.wrapQtAppsHook rsync rustPlatform.cargoSetupHook + writableTmpDirAsHomeHook + yarn-berry_4.yarnBerryConfigHook ] ++ lib.optional stdenv.hostPlatform.isDarwin swift; buildInputs = [ @@ -227,10 +196,11 @@ python3.pkgs.buildPythonApplication { # Activate optimizations RELEASE = true; + # https://github.com/ankitects/anki/blob/24.11/docs/linux.md#packaging-considerations + OFFLINE_BUILD = "1"; NODE_BINARY = lib.getExe nodejs; PROTOC_BINARY = lib.getExe protobuf; PYTHON_BINARY = lib.getExe python3; - YARN_BINARY = lib.getExe offlineYarn; }; buildPhase = '' @@ -240,19 +210,17 @@ python3.pkgs.buildPythonApplication { mkdir -p out/pylib/anki .git echo ${builtins.substring 0 8 rev} > out/buildhash - touch out/env - touch .git/HEAD ln -vsf ${pyEnv} ./out/pyenv - rsync --chmod +w -avP ${anki-nodemodules}/ out/node_modules/ - ln -vsf out/node_modules node_modules - export HOME=$NIX_BUILD_TOP - yarn config --offline set yarn-offline-mirror $yarnOfflineCache - fixup-yarn-lock yarn.lock + mv node_modules out + # Run everything else patchShebangs ./ninja - PIP_USER=1 ./ninja build wheels + + # Necessary for yarn to not complain about 'corepack' + jq 'del(.packageManager)' package.json > package.json.tmp && mv package.json.tmp package.json + YARN_BINARY="${lib.getExe noInstallYarn}" PIP_USER=1 ./ninja build wheels ''; # mimic https://github.com/ankitects/anki/blob/76d8807315fcc2675e7fa44d9ddf3d4608efc487/build/ninja_gen/src/python.rs#L232-L250 diff --git a/pkgs/games/anki/missing-hashes.json b/pkgs/games/anki/missing-hashes.json new file mode 100644 index 000000000000..8bdf63335cca --- /dev/null +++ b/pkgs/games/anki/missing-hashes.json @@ -0,0 +1,109 @@ +{ + "@dprint/darwin-arm64@npm:0.47.4": "67db15f5ae385010d1d80435c1b856ffe461739ab5e9bfb9972d21ef627f610b4aae40d7c53985ddff7d1109e8fc3c283c5a3c0d529b4b010e690577b7d0a36d", + "@dprint/darwin-x64@npm:0.47.4": "fcbbb05193c9174eec7491f2bc4551681099c9930c6ec1bab96699031d6bc83a417e07d332c8e1b4881d18a2814dfa08b1723066ead0d2e93833300ada81ea3a", + "@dprint/linux-arm64-glibc@npm:0.47.4": "9c3d6afd31938f51fe1da6b6aa8f4007c674667ee51edffa8ed92f9ea343b08b3df779f5b4d843363eb656df164ecc2f337b929446e5e9151a1c783d42fef03e", + "@dprint/linux-arm64-musl@npm:0.47.4": "af08edd5fed8725daf6cc49ca5bad03bc6e550d7fa42b596fd3fdc2c5b15013f83a4ae36ee0986934170e18148baf5c4f12c414fba09360624e1cdcf957121f1", + "@dprint/linux-x64-glibc@npm:0.47.4": "215c4033a6f8b0f73cbce552c9e0b39a16169a82088b293bc14b54fc5115de8ecb4f703c943cbf0f9c10375396ff9aed510ed2476723fd31f767c51b408457ab", + "@dprint/linux-x64-musl@npm:0.47.4": "c8b4c979a92fe897220877b40d59aa6e899ca2a39ce5368ba181ef3c3a376a119f4608b2a5e5271d1d811e055882cad86b890abd91970a32fb32ecfb5bbebdd7", + "@dprint/win32-arm64@npm:0.47.4": "5278a87a006758a9fe2b870a571895a6b19afb938cff35a180f192413ddfb8a4b612fcd1817c92e03dc0b587ed0c8ff750213c59d60ef3f0d02a4e2a4c938c5a", + "@dprint/win32-x64@npm:0.47.4": "5c5737f28ca10e51f3a548ad0160868a0b643f56a32eae5c8c151944ff47cb79aa109630c1ecf458233c2a3b521d5d284d3a25b60bbcd38885e7908f0db25d16", + "@esbuild/aix-ppc64@npm:0.19.12": "0740fd9160dffa94e55cd58d2f9faf4624a2be68d2696376d5c60cfced508809275eac76315796a1aef8daf3b0975b0df0f2d94de10c14c3f40087b7c6eeb047", + "@esbuild/aix-ppc64@npm:0.21.5": "1f48fea96ab4fbc2921756361bc8a0c4d0690f14dc2298a357aa3d436bcd1cd646d490e5d71c4e0fb46b9e04401bc93153d6886456dd0665b6758be643c95a16", + "@esbuild/android-arm64@npm:0.18.20": "8c1aa2455aab70b61c19e5d818ce418090a6a300619df48000a10ba0caf4649b388d4d039771a5b012621246dcb5ff9bd6b86c98ad74b62caa0e26e821870456", + "@esbuild/android-arm64@npm:0.19.12": "29d94e32a47af3ae1cc7c0364b00b3145db0b16539bd8d30356bb3a8769499867a7a3f1bc070f10a63cdb33c29752a43f3e4d4594a316e7d179e82bf12edf47c", + "@esbuild/android-arm64@npm:0.21.5": "7a4831b0886c165ed671f0094dcd491235fe503364a261379c84e2225a3c3230a06bce1d3a02316fa8a040b0ffede56c617746dc3b5550549ae3fb07095bb20d", + "@esbuild/android-arm@npm:0.18.20": "c38427fdc325049c8d73237693c637f829de68293d853c41e9ac1ef70773fc6099ab6008194216f89e1f22855fdf7e6ef8f01ee46353fcbc3bea387ab592cfe0", + "@esbuild/android-arm@npm:0.19.12": "f6784506ff94332d1332536cfcabe54dacb6ddc0ce285cdc3d00bb30a71c5dc57b81e3552354c59fe992d6dbc0f66eb8040d18cba76d44ee9cd7b7ed2a3feece", + "@esbuild/android-arm@npm:0.21.5": "9fa871018a9f2198f40fde2c672fcb1b9d3ab5ee602644ea4cf68c548ee2c0b6c60ad851ce85219f84886fd29757d8c49bac28ea48a2a16708a088e32dfe673a", + "@esbuild/android-x64@npm:0.18.20": "751957e816cf676117fbec20ab530fe2ce818492fbf32c8f6d9bb24e5963b54395b903adab95f6b874e4191845177f8e9cdd771f6b42298552b8573a5f24a150", + "@esbuild/android-x64@npm:0.19.12": "6253d60665402e38a080c101651c6e1617002b7aa53ed7a81f33d89fd5f99f37f11757bdd534faa3bf115dacf4723412a7cda532abdf0458bb478340772ba8d1", + "@esbuild/android-x64@npm:0.21.5": "24e477ccdaf1437cabe8710bc052a13b975a53617094a225e39823a1c562a71ef975d860ab895c129a813302495d85387143e27068e62fc897a2ac0335e4a2f6", + "@esbuild/darwin-arm64@npm:0.18.20": "16b1feeec7b1523da839e834e77f85a722bda5f2a9fb6800455e55684bd59bc11f8988b91ffefdb5ba3f4e8c1d7958f58413c74c729de92c26e31e0c326f658e", + "@esbuild/darwin-arm64@npm:0.19.12": "d934b758e8d6f7c69660f699a627963742a79dd5a917855c878700cc70eda3e629461e1fc69f8bb7242c15ec84f015e40f6877acd599604b784190514de4717f", + "@esbuild/darwin-arm64@npm:0.21.5": "67b0e4ebc870d0babb6721328f02b0e75eca5ee8f176220fa194ac5897ce76a27aa4f6d724389a74e1517670f70e766fe03c30875fdebeee5b1f7b22e99c5a1f", + "@esbuild/darwin-x64@npm:0.18.20": "a80288dea978a549e4fc42a3b1f0a1bc5f6341bbde3788b6b9fd6b9ba6ffd92a0b61cfe608543a8455d292d00094abbe7dc51bcd6487c9dc796a2e543299a9c4", + "@esbuild/darwin-x64@npm:0.19.12": "a436c4b3037a6a68c2b11fe487057c2cd4579363d94562d026a6d1a58eaf019c6ea94ba109e0b0a0597526fb6d2244d261fb7e6a18648f375ec90898b8bc14d6", + "@esbuild/darwin-x64@npm:0.21.5": "a4b6df47edf4b1e91eeca9d7af18f538e25615e00763709a4cc24a8918e7ac93b9bfc2ef9f44086f16257d05ad99e23c1213a7a1397475d1a78f0a1e773af89a", + "@esbuild/freebsd-arm64@npm:0.18.20": "72b69f1ba7fe6e8b7708809054cd96e9af3fd0bd561ce414c3bf7638abab15f7efc3782060dc7aa56dd4d1fcd43204355f2e0182a356d105a44e7c2efdec470c", + "@esbuild/freebsd-arm64@npm:0.19.12": "527060fd8bc2c9771d861a9a62935605e190dc17f454408fd87afc7d2fafe2a35cbca5cb171aaeab28cce187a21e5e2bfd607014e229360a8b4fa32438393203", + "@esbuild/freebsd-arm64@npm:0.21.5": "a4cf357807f2ea445b5191b8e5488070b567e2b534dba24ce6f8f1a332598ee0b9ffa41b3b0e55cd0cf57e2b56f0f1d84413faba182b81cb43bf19edf58a7654", + "@esbuild/freebsd-x64@npm:0.18.20": "b2cdcd81f3f7cd7be2f72c38790698993a6853ad241193bf085c2ad5d2df1495478a9d67a2282a54efeee3b827c26a412795b8064e19321c7aaf59ffc34f293f", + "@esbuild/freebsd-x64@npm:0.19.12": "b4d54892b0eec50f259fa6ab5527a5b4e48e1c68351d2c8febf60835bb5ac957564d2ab2ddf16ee66335b58a69ec367f48b125fb9646f8a39a11e1248c579501", + "@esbuild/freebsd-x64@npm:0.21.5": "8957c1345196e5dabd7d9f290b5292161f5d9955f269051fa7873118cfb5a20c31d70771ea3560b513f879d0948ba32fba915fb1b387571c4fbbb1fbeaf2dd87", + "@esbuild/linux-arm64@npm:0.18.20": "08216b531dc42e48abb6754f2b4f7f633055cd666ceb77c220c61c25aa84479b36ddeab25ecc23cf22965354314b84cabf1e8408a5cb1ba57b8343475613a782", + "@esbuild/linux-arm64@npm:0.19.12": "23dd17cd5b3f3d64726baa5632bd8079059ebf8419e3f9e82d900f8c781a7788980f6e6d1a604c1d84bd539f555227559f4916d52e2447a30f5886bbf1ed486c", + "@esbuild/linux-arm64@npm:0.21.5": "1b95b17ed94eb977e38ea9130e677551b7cf0ccccdb3f23a9f8b59b5d67400817c2a417e4f043295bd3f67796853da2a1b1a8ca201ffe745efb40a144dfdc99c", + "@esbuild/linux-arm@npm:0.18.20": "8fc75953ddebd11be542a224e0c73971e83556272d75d3f4023bebf4b0658a68314ee5721eb5dfabffb9ca9afcd7ae5404425f3d56cc6363c68bffa86f08fac3", + "@esbuild/linux-arm@npm:0.19.12": "76b9b411ba41320d57632347d1a09db7e745aec425db2cffe1c6467928c8d67bc122b544aa7fcbdca74a32262bfe0d48aa479931f6943bd84434389fada189a0", + "@esbuild/linux-arm@npm:0.21.5": "6bfcd098ada5e6117d028777e5cc58456c2f570157fa0a0dce30c9d05b8389b86f74bf6b862534bf6994d342946c98b6774e1820880fd289765864b668e94c17", + "@esbuild/linux-ia32@npm:0.18.20": "563d35963cfb7b94fec9e22986a4edfa8fd4f6d6d82fa6be1833eb7c50b996cdc9b53a656e2ccf02dc2ecc8676748b02d77ad20afbaf087ef802e562790390fa", + "@esbuild/linux-ia32@npm:0.19.12": "be7a5294d9387fe09e154c5c771761291ce2278c2e04d36396f737736d185ab4a23d97830afaec67bb593549745ba9e240ac86b0ad4c0e0044e553c408105aed", + "@esbuild/linux-ia32@npm:0.21.5": "73c249c9918f0c9a9268ffe14fe745f5e7564b309dcea213da08a5e4367ffdfc8df4b004c70f80269dce0f653a3280cfdd8bf9a7a616b5b60649e4faea6e69b5", + "@esbuild/linux-loong64@npm:0.18.20": "8a728161c3221ecc35e8d55f700d065e59fefbed5130feea6e3975f1e209cc8c31de55d908ff4abf29ec2d37e88e22f9b2590e9764e72a47825610b104a39374", + "@esbuild/linux-loong64@npm:0.19.12": "964386dd94bdd05383e6a8223a6af222a113bef78e4c8f7a77684c9c2e56c30d876c502ce4d28b4d91d21c402cdd491eb1e62bb72448c7077276c4714b299263", + "@esbuild/linux-loong64@npm:0.21.5": "60977efe24b3b6e1461d49da07dd57c1234992b9d2e6ac7d0dedfee538321d42be25e496ffb193121d3a6c6ca6ea6722b880e95695824dcc6643a3d9426b2296", + "@esbuild/linux-mips64el@npm:0.18.20": "e5d99e6c151323ea3ca5ddd6cbaab9bde45424932282adce064d90ad4e26fcaef1adce54b01734641616f65b89f1a5a69a715a9d05368b7c496a46c9ccca4744", + "@esbuild/linux-mips64el@npm:0.19.12": "5608d554f1db3311315eb29780e312e66d106d41ad53fb3458e201fbbddda198836fc4ca04314f7ae4e61462214c92494928804abab0759a384adff773da40d0", + "@esbuild/linux-mips64el@npm:0.21.5": "20fb6c8f6e58f66cd4351034858b2ad85bda4144576b180979305cfabed43780a71934e9f176e476c719f14e37253b231a43d46638ad232989d5f4dd72ec6b75", + "@esbuild/linux-ppc64@npm:0.18.20": "aebef9d269b964698128199821c8b1d9a45ca1898656d12add3f52cd335b098923565b7ef3bdea37297b14991f56f6b351681229d153904819b767ccc3af97db", + "@esbuild/linux-ppc64@npm:0.19.12": "7523a8c6b4b46324698b6aecfc661b369326099ebf72a36562ce69d8a6e2158cbe1d9af6d2588f130000c49875b719910df4b426885fcbac1065af590c1cd985", + "@esbuild/linux-ppc64@npm:0.21.5": "69f2ef1d127f48bc14cec479ae1a96dbf5fea651e0a3f148486f73495d2acb91acdaa164cd80648844916f05e7f9f9665a1864dd394e7f9acf96bea70937e6b5", + "@esbuild/linux-riscv64@npm:0.18.20": "3eb88a207ea74ed6a2cce3a3d91ce590b508fe673e0bdc5f72f58babd32ccd0fa79908f64ee25ce82bddc7a29d47a603c5522637d23cdad52d1ee4b6ba34b3cb", + "@esbuild/linux-riscv64@npm:0.19.12": "da7aedccce7377c1991a3bfce3767a41c2bd688a361ff5df9a16b56874d1bd198c4fa70ca15bd7234497ea5ff9a44ddbbece95733a1dbd9f43918b4bf27fb76c", + "@esbuild/linux-riscv64@npm:0.21.5": "60c749d87c0f67cc67c5cc0d82aa597b7a807bc52510a16960337433bdbc8fa9f3c46eba98080106c0971e404e2250ca11c441bb4ae5b7a7d78b4095e3a70363", + "@esbuild/linux-s390x@npm:0.18.20": "77172f6572740cda637f5beed73b3ff6bda8648b4c3632290dbfead82b3ff2f8431bdc3b43f2c7af881151b172eea086db24669658c4f9711f20366da21aace5", + "@esbuild/linux-s390x@npm:0.19.12": "5f55ca2284c1cd1034a0bdf1ded7d38f43539f028fd58ec157f36fd89701f5fd0d0d45514b82c4199e3bd16049635a3a16c96a694f5a8d9c8a40429ad3e2172e", + "@esbuild/linux-s390x@npm:0.21.5": "a14ff0484b962b374fd1e4662a53f8dd8999ba39fcf891f15631dfb2802c8d18893d6e366c42d28d55885e5804b7d6252c0e3cee038c241285c9b537ef12b4ae", + "@esbuild/linux-x64@npm:0.18.20": "9d438aec79e046e3527217fee95f39985e6e2df8c4390c9398ee24a6bff3f15e8f5fc2d5cc6564b1e182f864a99d8fd83818f880dba9616a2dcea6c7f16a57c5", + "@esbuild/linux-x64@npm:0.19.12": "401ff8f1d6d5ae6ebdd0d8e24cef86ba1c3adc4fac2014033c8e690331495cb57922e31cdaa96619e2b190a5bfc88ae8b90b1cd3a59952969a29da418bda58b1", + "@esbuild/linux-x64@npm:0.21.5": "9e5663fcace9c8456e9934a9ed6e7428db4080024eef3bfeaf82d476120bd881382c958be2785463d6b44467b3d3f870d6cce09a9cb37bcef19afeb97814d674", + "@esbuild/netbsd-x64@npm:0.18.20": "2523c64d41b2d8252f5f8f11fb5f8438d4e9fcbc5856e8644fb79b1c18175144b4c36c5a62306064639e444e938cd4641248dfdc167b15af26d72d90a1217898", + "@esbuild/netbsd-x64@npm:0.19.12": "0e4b3ae706cb82356e20862ec0066e9eb61bc7f7bf3cc09da27a72fa5790a59f5256f4e2cd255aac6023a37036c8ad805d51498dbd56fe7d913711858d3c8ebc", + "@esbuild/netbsd-x64@npm:0.21.5": "3cb6115c4557d653c7ad6d2be5b4ed7a688b14d85b7b7108a1a57dda0b2cca3f8ed13560fa6639da8788f860b75eb714a17cfb7ba8f967e93bdf40c9b3a1cde1", + "@esbuild/openbsd-x64@npm:0.18.20": "3e04b67db2a5ae3440dea5a0dddc6744cea6bc05bd7ce7b64ff4350efb16e804e701a14875199d62018e8322891dde4ba04ea7d6717556d6cc12e4178a1d7159", + "@esbuild/openbsd-x64@npm:0.19.12": "f55049053a978c178bf1d7f4857af395afa9b7708410707eef8149f42adc3ed6d72088419cc17f75f1b7be4991ad28007fe298be84f95ca4e02d28bac1b518c7", + "@esbuild/openbsd-x64@npm:0.21.5": "1caf0b502d6e2612ffd3e62589de2b9cd48cd742818746011d437e2d5787df4984f7c17b7a536aa20f12d04e519c859d755a7b57e6db0ed277054bd9c1036e85", + "@esbuild/sunos-x64@npm:0.18.20": "921cbdd363e622d854e83b9e868ccad05b0f0c09cb181e59f6ae1b74ddd6023974d1cba9116c56cc819d15063bf5a5bffa67c23a19b5b60b5a099ce1d9ec419d", + "@esbuild/sunos-x64@npm:0.19.12": "da944741c1d6c8d814633445f068b27cdff337f309513982125f633d7365154ba6073719ba4389e471479886841d0152f37426f5bd890b7a8c33b89b7f775c82", + "@esbuild/sunos-x64@npm:0.21.5": "676da7301c7c600bb7de2523ecf5d877128da3c125fd8136533f5be38ca15d9f800b2fbbd396ca37d44c5daa51b8124d8a4728bb18245cd2becb3191b897c45a", + "@esbuild/win32-arm64@npm:0.18.20": "9de26948654e871289a5b6a5ef0c238ca92b0973b00eea692689edd278a9e791ac2220e33cfc24eca673212571242c08e041cd0a97087b247716d9538609f68d", + "@esbuild/win32-arm64@npm:0.19.12": "c9e6922908588569a8cf396ab0c5230cd1634db77039cb635d83eb825eba64a4ac3e19f28917185495d9d7b043161bfbd4cd49eb7d3592b88cf4594d9d628d08", + "@esbuild/win32-arm64@npm:0.21.5": "9b2ab87429efd3c2697dc5c7948ea57b57757b6e4709469e773b73cd5fe4b7fda5912073f4c3bdf9d0346b8f3ae443367a63bcd51de24fb81b9f592712eb3366", + "@esbuild/win32-ia32@npm:0.18.20": "98d18afeb689679b73ee823b297d8fb160e97fb183cd5f39d716b787465c024b0489bebaec96e37157cfb10d5296e803070e90f07eaf9235a2afb041d25e9e31", + "@esbuild/win32-ia32@npm:0.19.12": "71487cca9ac6cce6bf214be36e5c6aa1eaac49a2bcd538fafb6168fecbbe2624edf2a057be531b5393c4e2672b24bd316a872cc081df1d9c06e3a12704662675", + "@esbuild/win32-ia32@npm:0.21.5": "c1fe3276507d82202c464cd4809e67e6f151e29ed9de05c32d086dfe30207db15e646911ebc7f50df659891bfee292a25062792c589c2ff769be238c6b5fb8be", + "@esbuild/win32-x64@npm:0.18.20": "b019d085b43c247251b8d3791fa8f3251851d34cfce54bbe8b15a3a73efb1bc903e884551c8a821d5e681a48bc91c80a6f7e394762b938a266d8b602b13664ee", + "@esbuild/win32-x64@npm:0.19.12": "33341d6ae7d0682fb679170c91efa3933fc58dfe3d2f95c19b9856db55af6c8af4785f3669f3de34907ab222b2a6a201a8557213bd37dcc8406593e9eddbaa3c", + "@esbuild/win32-x64@npm:0.21.5": "5d7b28baa9c22684d35ec0515f6d36f8f583f26733c8e84c7f78edf17b8a7d133819267486f2fd66f20ca3a810896f11c3c81106d745040c2f07ade314846bf1", + "@parcel/watcher-android-arm64@npm:2.4.1": "88cb813d54227fc25e487f00497cdd58974a07e1c22a5cc7cf922983d908b460e0876ec0c9acf333a5b6f5623dc50729f8b92612970bfbd5a12d4e5cffc025ff", + "@parcel/watcher-darwin-arm64@npm:2.4.1": "342502e0f175dbd0649f2edffc9f7d76823668e12184a62d8e542df454a067bcade1cfd298975bf7238a7575a9d721c6d7ccb0e8c9102dca5394c9fef2349561", + "@parcel/watcher-darwin-x64@npm:2.4.1": "175868753e64ea7bc70993a05a34694e8ad85d9d4a08bf9a36573925777369a0701f2971d6ff14f9ed525c9b7725ce40629cad97fd7c67dc653f247884d99a62", + "@parcel/watcher-freebsd-x64@npm:2.4.1": "844f009d836628ff11119c885bf490077f36a24800ccc2fe8d5acf88c59d29d2495ab5773d1960bc568e9225a4c91147c7804dce2eaace86f3ac619fb0357a44", + "@parcel/watcher-linux-arm-glibc@npm:2.4.1": "f75d589f7403934c39f01c51e89b0d2e43a07041b6d9b7bb14078971cc520a8cb2ca296f6bf19d68335db433fb4bdf7bfd5f445a2a0cebf763e2cc47cd0ecc0c", + "@parcel/watcher-linux-arm64-glibc@npm:2.4.1": "9831629227633c577dc9b3abc3cc7b6c1c5c3635128663cff1658f6cf4546f8ab7803e20f2e33243a566234edcb7591c4a900e2df5a6bed35f4d4b6e19875f04", + "@parcel/watcher-linux-arm64-musl@npm:2.4.1": "b2b1106f5403cbaf3953a8bd99ff82498b7f399ef9ec6e26701e8734db8bffeaeb83b373e71cf71fd936dbf1a0143c72248d94b3eebaced03dc25e529930b945", + "@parcel/watcher-linux-x64-glibc@npm:2.4.1": "fd0e4b06aa26f631b95fc3034d32c83dcce1818c57842ba2c29d79a15b9afa096fd5afc2cd099bb148e4816c3944b831ed1efa421c06317b9e0807664a852556", + "@parcel/watcher-linux-x64-musl@npm:2.4.1": "b7cb299eaeb400e92b0a0a19a343905fe5c4152a12535c9e414a0aa0d6a1151dc9a8b254598be2d82ccee902e9132a4b7a2bee4df85d8f8219d95083daf87d35", + "@parcel/watcher-win32-arm64@npm:2.4.1": "35fc4e90eb74a4e583377821775d5f90269deeaa61221fbb69127b3151279a37d4038df91beb38e51367ebb9d92f6b0295b58c0e4a7ac3ecc0adb0f27c935c69", + "@parcel/watcher-win32-ia32@npm:2.4.1": "0b12602039c1ebb6ea711bde1996ca66d814668a02d33b2b949c66111de9e3fbc6f4d8b9b6c985affa1eafa6089b4c13b0e0db8f8d3a7a2d19849c7d7f639f1c", + "@parcel/watcher-win32-x64@npm:2.4.1": "56f160729dc8c47d940187b4a2e9a4100be77fc2acc2dd5e4cb527d036676eecba454548cf00fb6d7c44757e42d77dc4d2d8ff19c1ce64759a7fde2097aa6bfe", + "@rollup/rollup-android-arm-eabi@npm:4.31.0": "c737cb26689f9d34357921d15ee6a7261e5d7cc068dbb93a36c2f40c34a59bd8721e7bb392943a212ecfb97d9326ced8254469e39e9d6b012db636269eb66577", + "@rollup/rollup-android-arm64@npm:4.31.0": "94957eda1ab8894a6fdf0b1772bc00e7563f2e520179542dfdd6f9797bbb9cde164693b29439da631fd8ee6b5117c36ea7ba7ad8ab43d1747c296b22d6c09cad", + "@rollup/rollup-darwin-arm64@npm:4.31.0": "2b408eef19930929008806adc87f29bb9cacbbea1f32770be339281d72a5bbc52a88da1269a34b88052a0037a0b2b61e70daf166ed9d3c982b4fb4bd606ad020", + "@rollup/rollup-darwin-x64@npm:4.31.0": "9e7bc70cfd1ccbdddad3016d9fd36616c8a71725f9c47bbdad1f3ef40b656f7db90f02c88a4724b399f8a46555e4f90c4880d5eea0f12fdeba2f71a555077db5", + "@rollup/rollup-freebsd-arm64@npm:4.31.0": "3e149a14c1930b539e1d0a733bc2582bc5e84a5906723b5ac0384d46c43861a05120dd4566bb4f1efca8f930fd1f0eb78646587fc3c0cc32606d32ce6fb7bb13", + "@rollup/rollup-freebsd-x64@npm:4.31.0": "fe381b185187a5c2e8383920090bcec0c1273d058cc113eba23a70bc9f49cbadacd92c2a6255d345971bd2cf283941f623b00035d051758f743cf3207c233b54", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.31.0": "7bfe07f535125f59cc12fc0af162b9bae4400a364f5e2b1eae44377904deb3dc1c558048a0a8b059be1a54e609a7597c109f0a26a2a0baaf21a5539a331d14f4", + "@rollup/rollup-linux-arm-musleabihf@npm:4.31.0": "a1bb7593a83e2c2dbd32e8a3447e68ac43874a46aaa501c63a533695c47b66c7156527951bd84ad53c73a3155b5b50fd658c0aacad8790b6e4c03c0a83c94cad", + "@rollup/rollup-linux-arm64-gnu@npm:4.31.0": "e2e85814bcbaeb8b39e17ee5f8510c8856c5cc4c2ec1787245e8f8e0531563e36844549b02956b881d5aa9405e838a7d1b1697c305c394a57889c0b1c521c064", + "@rollup/rollup-linux-arm64-musl@npm:4.31.0": "00d8411e0516b298913d19dc2f4991ee184a4799b041f9c2a2eae5cf91f3aa315a4cc69d51d04c2540bfe0793b628af105d8df419ba541dba24981ccdc1a372a", + "@rollup/rollup-linux-loongarch64-gnu@npm:4.31.0": "ea1e4d813a12e8e9eda908d705dbf013835034a95cb63046a3bc15d43a6bf9812034d3779ab01c5ec87338ff1115ea86c6af2383efa4485b18da1423c68c3b79", + "@rollup/rollup-linux-powerpc64le-gnu@npm:4.31.0": "903350e968edd4d9fcb4c53831672ff5980f4d58c32a1b34e2c6446d0ae965d522173a82d9dccdf040805f82507b05e3c7e629782e56ccc51c78e01bc0b02dc2", + "@rollup/rollup-linux-riscv64-gnu@npm:4.31.0": "02bf4d53b6edc386103fdfaa6f1c774b1859e61146a305f3a0942159902b829ba67fbb6a6dbf914ed77fa7ae20826f601d11de79f033b37666077f26ccc0bfb6", + "@rollup/rollup-linux-s390x-gnu@npm:4.31.0": "bd6a2a45d36e11a80d4675c6427eafbe85165ffdac4c75945c89c650897ac8c582b57b76e0a69a39c09ba06c58edd865e4d8a54e1c7a245d2c192db465ae2c55", + "@rollup/rollup-linux-x64-gnu@npm:4.31.0": "6100d9bd7a0de95a54b3ad15d953ea74bef4c9c4424c24c5187ee1641f81d8fcaa30e48d16faeec0957e3a48517fcf78486e47fedc277f8f26fb6fbc7619df4b", + "@rollup/rollup-linux-x64-musl@npm:4.31.0": "b9a94514d6606e8b320ecad50f7c4142b86bb688aa1e87f076a462f76488000a90b8f75db01250cc17b540a70f231ab4064e79b79b66a2c7ad76c224d30b05e3", + "@rollup/rollup-win32-arm64-msvc@npm:4.31.0": "d0fee5e492f22df8885e0dcf2eccc2b8424c926050b1506d5a59fb97388de9ac5bd149a20d8521cf379cc3a46af92cb5de5d15cf749e648062f9f6ebf17e5754", + "@rollup/rollup-win32-ia32-msvc@npm:4.31.0": "c0e4d6f7cde9fc9a28eff19c04a96807a76d911141bb9fbe2a41d7ba394f4ebf334d3cd9b712c086498cd5de73ab2f2d1c12e6d22b08178ea4ede84474c656b8", + "@rollup/rollup-win32-x64-msvc@npm:4.31.0": "c3c397ddceb47db9631887caed7ec437b3bb9d1ff0de24440614720d3fe322a0c712617b869177fc37c2386430bad2e92cc3735a52ef579e25c9aded76f75580" +} diff --git a/pkgs/games/rott/default.nix b/pkgs/games/rott/default.nix deleted file mode 100644 index f9d39a527daa..000000000000 --- a/pkgs/games/rott/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - writeShellScript, - SDL, - SDL_mixer, - makeDesktopItem, - copyDesktopItems, - runtimeShell, - buildShareware ? false, -}: - -let - # Allow the game to be launched from a user's PATH and load the game data from the user's home directory. - launcher = writeShellScript "rott" '' - set -eEuo pipefail - dir=$HOME/.rott/data - test -e $dir || mkdir -p $dir - cd $dir - exec @out@/libexec/rott "$@" - ''; - -in -stdenv.mkDerivation rec { - pname = "rott"; - version = "1.1.2"; - - src = fetchurl { - url = "https://icculus.org/rott/releases/${pname}-${version}.tar.gz"; - sha256 = "1zr7v5dv2iqx40gzxbg8mhac7fxz3kqf28y6ysxv1xhjqgl1c98h"; - }; - - nativeBuildInputs = [ copyDesktopItems ]; - - buildInputs = [ - SDL - SDL_mixer - ]; - - sourceRoot = "rott-${version}/rott"; - - makeFlags = [ - "SHAREWARE=${if buildShareware then "1" else "0"}" - ]; - - installPhase = '' - runHook preInstall - - install -Dm555 -t $out/libexec rott - install -Dm555 ${launcher} $out/bin/${launcher.name} - substituteInPlace $out/bin/rott --subst-var out - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = "rott"; - exec = "rott"; - desktopName = "Rise of the Triad: ${if buildShareware then "The HUNT Begins" else "Dark War"}"; - categories = [ "Game" ]; - }) - ]; - - meta = with lib; { - description = "SDL port of Rise of the Triad"; - mainProgram = "rott"; - homepage = "https://icculus.org/rott/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ sander ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix deleted file mode 100644 index 90b988de4796..000000000000 --- a/pkgs/games/solarus/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitLab, - cmake, - luajit, - SDL2, - SDL2_image, - SDL2_ttf, - physfs, - glm, - openal, - libmodplug, - libvorbis, - qtbase, - qttools, -}: - -mkDerivation rec { - pname = "solarus"; - version = "1.6.4"; - - src = fetchFromGitLab { - owner = "solarus-games"; - repo = pname; - rev = "v${version}"; - sha256 = "sbdlf+R9OskDQ5U5rqUX2gF8l/fj0sDJv6BL7H1I1Ng="; - }; - - outputs = [ - "out" - "lib" - "dev" - ]; - - nativeBuildInputs = [ - cmake - qttools - ]; - buildInputs = [ - luajit - SDL2 - SDL2_image - SDL2_ttf - physfs - openal - libmodplug - libvorbis - qtbase - glm - ]; - - cmakeFlags = [ - (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGLM_ENABLE_EXPERIMENTAL") - ]; - - preFixup = '' - mkdir $lib/ - mv $out/lib $lib - ''; - - meta = with lib; { - description = "Zelda-like ARPG game engine"; - longDescription = '' - Solarus is a game engine for Zelda-like ARPG games written in lua. - Many full-fledged games have been writen for the engine. - ''; - homepage = "https://www.solarus-games.org"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/os-specific/linux/ajantv2/default.nix b/pkgs/os-specific/linux/ajantv2/default.nix index 47f13f70732f..ba298dc278ee 100644 --- a/pkgs/os-specific/linux/ajantv2/default.nix +++ b/pkgs/os-specific/linux/ajantv2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "ajantv2-module-${libajantv2.version}-${kernel.version}"; inherit (libajantv2) src; - sourceRoot = "source/driver/linux"; + sourceRoot = "${libajantv2.src.name}/driver/linux"; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 59806318a23e..3e291917ed11 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -2,10 +2,10 @@ lib, stdenv, buildPackages, + pkgs, newScope, overrideCC, stdenvNoLibc, - libcCross, }: lib.makeScope newScope ( @@ -31,9 +31,9 @@ lib.makeScope newScope ( else buildPackages.gccWithoutTargetLibc.override (old: { bintools = old.bintools.override { - libc = libcCross; + libc = pkgs.libc; }; - libc = libcCross; + libc = pkgs.libc; }) ); diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 68ca82a57dfb..5f0d784f6c45 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://www.nlnetlabs.nl"; + homepage = "https://www.nlnetlabs.nl"; description = "Authoritative only, high performance, simple and open source name server"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index f013ba355905..8d542562e43a 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -11,13 +11,13 @@ }: buildGoModule rec { pname = "headscale"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; tag = "v${version}"; - hash = "sha256-BzCcOUousbw+PrYM7SGDtJuTGvhpsTNOF2kQZEl6z84="; + hash = "sha256-LnS6K3U4RgRRV4i92zcRZtLJF1QdbORQP9ZIis9u6rk="; }; vendorHash = "sha256-dR8xmUIDMIy08lhm7r95GNNMAbXv4qSH3v9HR40HlNk="; diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 54e0c8624d94..095358d55656 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -19,6 +19,7 @@ srcOverride ? callPackage ./source.nix { inherit patches; }, gemset ? ./. + "/gemset.nix", yarnHash ? srcOverride.yarnHash, + yarnMissingHashes ? srcOverride.yarnMissingHashes, }: stdenv.mkDerivation rec { @@ -36,9 +37,11 @@ stdenv.mkDerivation rec { pname = "${pname}-modules"; inherit src version; + missingHashes = yarnMissingHashes; yarnOfflineCache = yarn-berry.fetchYarnBerryDeps { inherit src; hash = yarnHash; + missingHashes = yarnMissingHashes; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index b1c8389786c1..4dcc524f01b3 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -19,4 +19,5 @@ in // { inherit version; yarnHash = "sha256-IC4d/skIHEzJPuKlq4rMAqV+ydqquA6toq4WWCfuDxo="; + yarnMissingHashes = null; } diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh index 330e53676b7a..ca1c52d77872 100755 --- a/pkgs/servers/mastodon/update.sh +++ b/pkgs/servers/mastodon/update.sh @@ -102,6 +102,7 @@ in // { inherit version; yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + yarnMissingHashes = null; } EOF SOURCE_DIR="$(nix-build --no-out-link -E '(import {}).callPackage ./source.nix {}')" diff --git a/pkgs/servers/mobilizon/0001-fix-version.patch b/pkgs/servers/mobilizon/0001-fix-version.patch deleted file mode 100644 index 8bf6b2dcda86..000000000000 --- a/pkgs/servers/mobilizon/0001-fix-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/mix.exs b/mix.exs -index 8338abf8..883e6987 100644 ---- a/mix.exs -+++ b/mix.exs -@@ -1,7 +1,7 @@ - defmodule Mobilizon.Mixfile do - use Mix.Project - -- @version "5.1.0" -+ @version "5.1.2" - - def project do - [ diff --git a/pkgs/servers/mobilizon/0002-fix-media-proxy.patch b/pkgs/servers/mobilizon/0002-fix-media-proxy.patch deleted file mode 100644 index 9641dd3d60ac..000000000000 --- a/pkgs/servers/mobilizon/0002-fix-media-proxy.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/lib/web/proxy/reverse_proxy.ex b/lib/web/proxy/reverse_proxy.ex -index 8a78ef27..788ccc30 100644 ---- a/lib/web/proxy/reverse_proxy.ex -+++ b/lib/web/proxy/reverse_proxy.ex -@@ -187,9 +187,13 @@ defmodule Mobilizon.Web.ReverseProxy do - @spec response(Plug.Conn.t(), any(), String.t(), pos_integer(), list(tuple()), Keyword.t()) :: - Plug.Conn.t() - defp response(conn, client, url, status, headers, opts) do -+ headers = build_resp_headers(headers, opts) -+ # Fix HTTP/1.1 protocol violation: content-length can't be combined with chunked encoding -+ headers = Enum.reject(headers, fn {k, _} -> k == "content-length" end) -+ - result = - conn -- |> put_resp_headers(build_resp_headers(headers, opts)) -+ |> put_resp_headers(headers) - |> send_chunked(status) - |> chunk_reply(client, opts) - \ No newline at end of file diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix index 1bf19e3245d4..813dcb1da927 100644 --- a/pkgs/servers/mobilizon/common.nix +++ b/pkgs/servers/mobilizon/common.nix @@ -2,13 +2,13 @@ rec { pname = "mobilizon"; - version = "5.1.2"; + version = "5.1.4"; src = fetchFromGitLab { domain = "framagit.org"; - owner = "framasoft"; + owner = "kaihuri"; repo = pname; tag = version; - sha256 = "sha256-5xHLk5/ogtRN3mfJPP1/gIVlALerT9KEUHjLA2Ou3aM="; + sha256 = "sha256-rtYb9wptP1wAaQrK60apjjSCqtfolXag6QgRYf6pwzQ="; }; } diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index cfe9d710ab17..61dd5c7f8dfa 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -20,19 +20,6 @@ in mixRelease rec { inherit (common) pname version src; - patches = [ - # Version 5.1.2 failed to bump their internal package version, - # which causes issues with static file serving in the NixOS module. - ./0001-fix-version.patch - # Mobilizon uses chunked Transfer-Encoding for the media proxy but also - # sets the Content-Length header. This is a HTTP/1.1 protocol violation - # and results in nginx >=1.24 rejecting the response with this error: - # 'upstream sent "Content-Length" and "Transfer-Encoding" headers at the same - # time while reading response header from upstream' - # Upstream PR: https://framagit.org/framasoft/mobilizon/-/merge_requests/1604 - ./0002-fix-media-proxy.patch - ]; - nativeBuildInputs = [ git cmake @@ -157,8 +144,8 @@ mixRelease rec { updateScript = writeShellScriptBin "update.sh" '' set -eou pipefail - ${mix2nix}/bin/mix2nix '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix - ${nixfmt-rfc-style}/bin/nixfmt pkgs/servers/mobilizon/mix.nix + ${lib.getExe mix2nix} '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix + ${lib.getExe nixfmt-rfc-style} pkgs/servers/mobilizon/mix.nix ''; elixirPackage = beamPackages.elixir; }; diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix index c08bf51ece9e..23b83bc16d7f 100644 --- a/pkgs/servers/mobilizon/frontend.nix +++ b/pkgs/servers/mobilizon/frontend.nix @@ -11,7 +11,7 @@ in buildNpmPackage { inherit (common) pname version src; - npmDepsHash = "sha256-oOV4clyUzKTdAMCKghWS10X9Nug9j8mil/vXcFhZ6Z0="; + npmDepsHash = "sha256-vf8qEXMZ+TGqKjDN7LjUyOm98EQqweW6NKdJuNoMuVc="; nativeBuildInputs = [ imagemagick ]; diff --git a/pkgs/servers/pingvin-share/backend.nix b/pkgs/servers/web-apps/pingvin-share/backend.nix similarity index 93% rename from pkgs/servers/pingvin-share/backend.nix rename to pkgs/servers/web-apps/pingvin-share/backend.nix index 0fe2cddcefdf..787f9b4870c9 100644 --- a/pkgs/servers/pingvin-share/backend.nix +++ b/pkgs/servers/web-apps/pingvin-share/backend.nix @@ -31,7 +31,7 @@ buildNpmPackage { prisma ]; - npmDepsHash = "sha256-o++v2dy9Cq2DW1owY8ea2wRr8wxr0bzuswd3ljM5Rbg="; + npmDepsHash = "sha256-bc2suSGa7YTonIhUxEtNzdIUeUBubwJ6upW2tydVCnU="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/web-apps/pingvin-share/default.nix similarity index 79% rename from pkgs/servers/pingvin-share/default.nix rename to pkgs/servers/web-apps/pingvin-share/default.nix index d230a01ca261..08a1907646b7 100644 --- a/pkgs/servers/pingvin-share/default.nix +++ b/pkgs/servers/web-apps/pingvin-share/default.nix @@ -5,12 +5,12 @@ }: let - version = "1.11.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "stonith404"; repo = "pingvin-share"; rev = "v${version}"; - hash = "sha256-ye26VyfeKcQk1gTLxVqsYmrqK0nqmU2Cl+fIrWdryLQ="; + hash = "sha256-FWc0Yo2Phh8ee5izHj0ol1pwLSVJgIqyeaJo1o4drsM="; }; in diff --git a/pkgs/servers/pingvin-share/frontend.nix b/pkgs/servers/web-apps/pingvin-share/frontend.nix similarity index 92% rename from pkgs/servers/pingvin-share/frontend.nix rename to pkgs/servers/web-apps/pingvin-share/frontend.nix index 92035856fbde..bf320dd95531 100644 --- a/pkgs/servers/pingvin-share/frontend.nix +++ b/pkgs/servers/web-apps/pingvin-share/frontend.nix @@ -23,7 +23,7 @@ buildNpmPackage { buildInputs = [ vips ]; nativeBuildInputs = [ pkg-config ]; - npmDepsHash = "sha256-OLlh1YLS+fKw9Mcc2y724+WyK/j80McM2nGDLf2UzPA="; + npmDepsHash = "sha256-ykq98Bd67TY/t8JYraii7XnCIoSLk454decdHpQGorw="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 6239be5aa87c..7fa515e857f1 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -242,7 +242,7 @@ self: super: buildPackages.stdenv.cc ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - (xorg.buildPackages.stdenv.cc.libc.static or null) + (xorg.buildPackages.libc.static or null) ]; preConfigure = '' sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix index 1305cd7183f4..d689e49b43e1 100644 --- a/pkgs/shells/nushell/plugins/default.nix +++ b/pkgs/shells/nushell/plugins/default.nix @@ -22,6 +22,7 @@ lib.makeScope newScope ( }; skim = callPackage ./skim.nix { }; semver = callPackage ./semver.nix { }; + hcl = callPackage ./hcl.nix { }; } // lib.optionalAttrs config.allowAliases { regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release."; diff --git a/pkgs/shells/nushell/plugins/hcl.nix b/pkgs/shells/nushell/plugins/hcl.nix new file mode 100644 index 000000000000..b0bbe819fb7e --- /dev/null +++ b/pkgs/shells/nushell/plugins/hcl.nix @@ -0,0 +1,36 @@ +{ + stdenv, + lib, + rustPlatform, + pkg-config, + nix-update-script, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "nushell_plugin_hcl"; + version = "0.104.1"; + + src = fetchFromGitHub { + repo = "nu_plugin_hcl"; + owner = "Yethal"; + tag = version; + hash = "sha256-AGTrSLVzbnzMQ2oUuD8Lq4phRt404lSRPiU8Oh9KBG0="; + }; + useFetchCargoVendor = true; + cargoHash = "sha256-5bxE+wN3uAbJSIh0wFS/KA5iTyFiSvFWmj14S/Fmkec="; + + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; + cargoBuildFlags = [ "--package nu_plugin_hcl" ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Nushell plugin for parsing Hashicorp Configuration Language files"; + mainProgram = "nu_plugin_hcl"; + homepage = "https://github.com/Yethal/nu_plugin_hcl"; + license = licenses.mit; + maintainers = with maintainers; [ yethal ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 49f0ff040a41..d7f4145ed3b9 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -132,7 +132,7 @@ let bintools = prevStage.darwin.binutils; isClang = true; - libc = prevStage.darwin.libSystem; + inherit (prevStage) libc; inherit (prevStage.llvmPackages) libcxx; inherit lib; @@ -181,6 +181,7 @@ let inherit lib; stdenvNoCC = prevStage.ccWrapperStdenv or thisStdenv; curl = bootstrapTools; + inherit (config) rewriteURL; }; inherit cc; @@ -581,7 +582,10 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check assert allDeps isFromNixpkgs [ (sdkPackagesNoCC prevStage) - { inherit (prevStage.darwin) binutils libSystem; } + { + inherit (prevStage.darwin) binutils libSystem; + inherit (prevStage) libc; + } ]; stageFun prevStage { @@ -1259,6 +1263,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check assert isBuiltByNixpkgsCompiler prevStage.darwin.sigtool; assert isFromNixpkgs prevStage.darwin.libSystem; + assert isFromNixpkgs prevStage.libc; assert isFromNixpkgs prevStage.darwin.binutils-unwrapped; assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.clang-unwrapped; diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index c0a6f7e8ea08..f2cb2e5e0b29 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -399,6 +399,7 @@ let fetchurlBoot = import ../../build-support/fetchurl { inherit lib stdenvNoCC; inherit (prevStage) curl; + inherit (config) rewriteURL; }; stdenv = import ../generic { inherit diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 7682419db9d6..2cccf5afb3bf 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -158,8 +158,6 @@ let isFromBootstrapFiles = true; }; - getLibc = stage: stage.${localSystem.libc}; - # This function builds the various standard environments used during # the bootstrap. In all stages, we build an stdenv and the package # set that can be built with that stdenv. @@ -190,6 +188,7 @@ let fetchurlBoot = import ../../build-support/fetchurl/boot.nix { inherit system; + inherit (config) rewriteURL; }; cc = @@ -206,7 +205,7 @@ let cc = prevStage.gcc-unwrapped; bintools = prevStage.binutils; isGNU = true; - libc = getLibc prevStage; + inherit (prevStage) libc; inherit lib; inherit (prevStage) coreutils gnugrep; stdenvNoCC = prevStage.ccWrapperStdenv; @@ -220,7 +219,7 @@ let postFixup = (a.postFixup or "") + '' - echo "--sysroot=${lib.getDev (getLibc prevStage)}" >> $out/nix-support/cc-cflags + echo "--sysroot=${lib.getDev prevStage.libc}" >> $out/nix-support/cc-cflags ''; } ); @@ -292,9 +291,13 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check nativeTools = false; nativeLibc = false; expand-response-params = ""; - libc = getLibc self; inherit lib; - inherit (self) stdenvNoCC coreutils gnugrep; + inherit (self) + stdenvNoCC + coreutils + gnugrep + libc + ; bintools = bootstrapTools; runtimeShell = "${bootstrapTools}/bin/bash"; }; @@ -319,6 +322,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # previous stage0 stdenv: assert isFromBootstrapFiles prevStage.binutils.bintools; assert isFromBootstrapFiles prevStage."${localSystem.libc}"; + assert isFromBootstrapFiles prevStage.libc; assert isFromBootstrapFiles prevStage.gcc-unwrapped; assert isFromBootstrapFiles prevStage.coreutils; assert isFromBootstrapFiles prevStage.gnugrep; @@ -338,7 +342,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check binutils ; - ${localSystem.libc} = getLibc prevStage; + ${localSystem.libc} = prevStage.${localSystem.libc}; # A threaded perl build needs glibc/libpthread_nonshared.a, # which is not included in bootstrapTools, so disable threading. @@ -373,6 +377,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check prevStage: assert isBuiltByBootstrapFilesCompiler prevStage.binutils-unwrapped; assert isFromBootstrapFiles prevStage."${localSystem.libc}"; + assert isFromBootstrapFiles prevStage.libc; assert isFromBootstrapFiles prevStage.gcc-unwrapped; assert isFromBootstrapFiles prevStage.coreutils; assert isFromBootstrapFiles prevStage.gnugrep; @@ -392,7 +397,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check perl patchelf ; - ${localSystem.libc} = getLibc prevStage; + ${localSystem.libc} = prevStage.${localSystem.libc}; gmp = super.gmp.override { cxx = false; }; # This stage also rebuilds binutils which will of course be used only in the next stage. # We inherit this until stage3, in stage4 it will be rebuilt using the adjacent bash/runtimeShell pkg. @@ -483,6 +488,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # previous stage1 stdenv: assert isBuiltByBootstrapFilesCompiler prevStage.binutils-unwrapped; assert isFromBootstrapFiles prevStage."${localSystem.libc}"; + assert isFromBootstrapFiles prevStage.libc; assert isBuiltByBootstrapFilesCompiler prevStage.gcc-unwrapped; assert isFromBootstrapFiles prevStage.coreutils; assert isFromBootstrapFiles prevStage.gnugrep; @@ -507,6 +513,9 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check doCheck = false; }); + # Avoids infinite recursion, as this is in the build-time dependencies of libc. + libiconv = self.libcIconv prevStage.libc; + # We need libidn2 and its dependency libunistring as glibc dependency. # To avoid the cycle, we build against bootstrap libc, nuke references, # and use the result as input for our final glibc. We also pass this pair @@ -537,7 +546,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check binutils = prevStage.binutils.override { # Rewrap the binutils with the new glibc, so both the next # stage's wrappers use it. - libc = getLibc self; + inherit (self) libc; # Unfortunately, when building gcc in the next stage, its LTO plugin # would use the final libc but `ld` would use the bootstrap one, @@ -556,8 +565,8 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check mkdir -p "$out"/bin cp -a '${prevStage.bintools.bintools}'/bin/* "$out"/bin/ chmod +w "$out"/bin/ld.bfd - patchelf --set-interpreter '${getLibc self}'/lib/ld*.so.? \ - --set-rpath "${getLibc self}/lib:$(patchelf --print-rpath "$out"/bin/ld.bfd)" \ + patchelf --set-interpreter '${self.libc}'/lib/ld*.so.? \ + --set-rpath "${self.libc}/lib:$(patchelf --print-rpath "$out"/bin/ld.bfd)" \ "$out"/bin/ld.bfd ''; }; @@ -588,6 +597,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # previous stage2 stdenv: assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped; assert isBuiltByNixpkgsCompiler prevStage.${localSystem.libc}; + assert isBuiltByNixpkgsCompiler prevStage.libc; assert isBuiltByBootstrapFilesCompiler prevStage.gcc-unwrapped; assert isFromBootstrapFiles prevStage.coreutils; assert isFromBootstrapFiles prevStage.gnugrep; @@ -624,7 +634,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check gmp = super.gmp.override { cxx = false; }; } // { - ${localSystem.libc} = getLibc prevStage; + ${localSystem.libc} = prevStage.${localSystem.libc}; gcc-unwrapped = (super.gcc-unwrapped.override ( commonGccOverrides @@ -660,6 +670,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # previous stage3 stdenv: assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped; assert isBuiltByNixpkgsCompiler prevStage.${localSystem.libc}; + assert isBuiltByNixpkgsCompiler prevStage.libc; assert isBuiltByNixpkgsCompiler prevStage.gcc-unwrapped; assert isFromBootstrapFiles prevStage.coreutils; assert isFromBootstrapFiles prevStage.gnugrep; @@ -683,7 +694,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check libidn2 libunistring ; - ${localSystem.libc} = getLibc prevStage; + ${localSystem.libc} = prevStage.${localSystem.libc}; # Since this is the first fresh build of binutils since stage2, our own runtimeShell will be used. binutils = super.binutils.override { # Build expand-response-params with last stage like below @@ -701,13 +712,13 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check inherit (prevStage) expand-response-params; cc = prevStage.gcc-unwrapped; bintools = self.binutils; - libc = getLibc self; inherit lib; inherit (self) stdenvNoCC coreutils gnugrep runtimeShell + libc ; fortify-headers = self.fortify-headers; }; @@ -735,6 +746,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # which applies here as well. assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped; assert isBuiltByNixpkgsCompiler prevStage.${localSystem.libc}; + assert isBuiltByNixpkgsCompiler prevStage.libc; assert isBuiltByNixpkgsCompiler prevStage.gcc-unwrapped; assert isBuiltByNixpkgsCompiler prevStage.coreutils; assert isBuiltByNixpkgsCompiler prevStage.gnugrep; @@ -842,7 +854,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check libunistring ] # More complicated cases - ++ (map (x: lib.getOutput x (getLibc prevStage)) [ + ++ (map (x: lib.getOutput x (prevStage.libc)) [ "out" "dev" "bin" @@ -892,7 +904,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check libunistring ; inherit (prevStage.gnugrep) pcre2; - ${localSystem.libc} = getLibc prevStage; + ${localSystem.libc} = prevStage.${localSystem.libc}; # Hack: avoid libidn2.{bin,dev} referencing bootstrap tools. There's a logical cycle. libidn2 = import ../../development/libraries/libidn2/no-bootstrap-reference.nix { @@ -924,6 +936,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # which applies here as well. assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped; assert isBuiltByNixpkgsCompiler prevStage.${localSystem.libc}; + assert isBuiltByNixpkgsCompiler prevStage.libc; assert isBuiltByNixpkgsCompiler prevStage.gcc-unwrapped; assert isBuiltByNixpkgsCompiler prevStage.coreutils; assert isBuiltByNixpkgsCompiler prevStage.gnugrep; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 61c44f0bfecb..6a1507df734d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -3,9 +3,12 @@ }: let - inherit (pkgs) lib stdenv config; - - libc = pkgs.stdenv.cc.libc; + inherit (pkgs) + lib + stdenv + config + libc + ; patchelf = pkgs.patchelf.overrideAttrs (previousAttrs: { NIX_CFLAGS_COMPILE = (previousAttrs.NIX_CFLAGS_COMPILE or [ ]) ++ [ diff --git a/pkgs/tools/admin/meraki-cli/default.nix b/pkgs/tools/admin/meraki-cli/default.nix index 30d8dc648c8c..d164234b8eed 100644 --- a/pkgs/tools/admin/meraki-cli/default.nix +++ b/pkgs/tools/admin/meraki-cli/default.nix @@ -8,12 +8,13 @@ buildPythonApplication, pytestCheckHook, requests-mock, + setuptools, }: buildPythonApplication rec { pname = "meraki-cli"; version = "1.5.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "meraki_cli"; @@ -29,18 +30,19 @@ buildPythonApplication rec { "TestUpgrade" ]; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ argcomplete jinja2 meraki rich ]; - nativeBuildInputs = [ - pytestCheckHook - ]; - nativeCheckInputs = [ + pytestCheckHook requests-mock ]; diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 6f85173e76e3..4e4b536e998d 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,16 +1,16 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.173.0"; + version = "3.174.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.173.0-linux-x64.tar.gz"; - sha256 = "0pjiwblw89r615lbfkmwhcyszbn6gk519rkia92phnx6absf7zfa"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.174.0-linux-x64.tar.gz"; + sha256 = "08ancj87d25dpfbm0hidvv1if4jnr1b5186wwhs6pq7xkifk7j6z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.38.0-linux-amd64.tar.gz"; - sha256 = "046cqacl3lsrjdrgcc9mzr58dimgcsb2dbcradfsz2x2pg9r4i04"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.39.0-linux-amd64.tar.gz"; + sha256 = "0zmylykkr6gfyr9zvi29qn753kn7927y2zwy5781jgidqz2srxqx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.1.0-linux-amd64.tar.gz"; @@ -21,32 +21,32 @@ sha256 = "1ly3rxvfwjjbywbiv3q858qv9mbikyf89byr1x3y8w8wc50sxhyh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.3-linux-amd64.tar.gz"; - sha256 = "1fapykfy2jzgygydgmvrlv54bnh1r1xhmvhp70fbz1z6nr7sh89x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.4-linux-amd64.tar.gz"; + sha256 = "1xrhiknhi5hvhq33hzjybz52yyfxrvapc24yh1va1d29dr3cj9m6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.21.0-linux-amd64.tar.gz"; - sha256 = "1wj2jkxq6a02c1ibj2gfnkyvlj45p151xh2cnp8s7l9pfi7svcvs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.22.0-linux-amd64.tar.gz"; + sha256 = "157pd0gn64nwym37qxs0klaxlf8vd6bm31msmgdyfj81i7d0a0kp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.81.0-linux-amd64.tar.gz"; - sha256 = "1nzphkx9kvnw341ssbwr289nn867xndjzgjrw807nijp94900pv8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.82.1-linux-amd64.tar.gz"; + sha256 = "06gsifpbf92lyrrjg82akp3iw2n6s8sbh19j6q7218w51lqv1llq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-linux-amd64.tar.gz"; sha256 = "0jlaj3pz5j0hgnqdg2b1xw9cwlr4i5pvir8flhwvw222nsah15yv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.9.0-linux-amd64.tar.gz"; - sha256 = "0arg0vvwman2gx4fy9y320y055piyyyl62yjbxj3scw31wzysp5w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.0-linux-amd64.tar.gz"; + sha256 = "1wn62hc40zvzr6lh81ha0668y89kfdy67nmc6vpb4jwbr5s8zdvi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.23.0-linux-amd64.tar.gz"; sha256 = "05xlk5nsz2b2vv88r42a5zgcm4iq4nic920fjrx1wz00q64bacwz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.0-linux-amd64.tar.gz"; - sha256 = "1g553pbvrgcrxfh5z6dxy4vd1j3im19a070jp9krmqrjzincpbbk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.1-linux-amd64.tar.gz"; + sha256 = "1r28zsxhjyi1c9nrr8g98m7sp6fpr2pfszsifi2hrji4ffm3c842"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-linux-amd64.tar.gz"; @@ -57,8 +57,8 @@ sha256 = "1ccjfr1v88hc2x845z7h3bxkgxqn6f134d422qdz9bgqdlyrr2dk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.45.0-linux-amd64.tar.gz"; - sha256 = "1h78r8m93cgdl85xygdya89ws7jdkgnbkj6hk9mc5gbkj2i4img2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.46.0-linux-amd64.tar.gz"; + sha256 = "0janqzfw9q787j2dcmkiqfh1fi9h7c3p8l2wwhz8sxd4v4av1zwh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.7.0-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "176bpdyhmwb2pyi4k1dc25agpm4spfndjhg1yjwfv3qvlgnzsnlq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.32.1-linux-amd64.tar.gz"; - sha256 = "19vi9dph5h2fawy7smh2pyiwgadsdji6i3bsk88zw9x7jiz3vhkx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.33.0-linux-amd64.tar.gz"; + sha256 = "0kj8shqi51q3055kq6r45pcy9wc5ygd97nv31cz0pcki4pgnx90s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-linux-amd64.tar.gz"; @@ -113,8 +113,8 @@ sha256 = "1macxvx93713r38gmx0430sg1ca34rwz6b2rfsp865cha7hpjpfk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.1-linux-amd64.tar.gz"; - sha256 = "07s4xmsqjja79pzdh3vj3fq6q3yhnds7xp08x9yzc964c9kzndzs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.2-linux-amd64.tar.gz"; + sha256 = "0j73752fpljn2gydw1jzp8dknrvx2qcldjjqmd7yigf9spbnagj5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-linux-amd64.tar.gz"; @@ -163,12 +163,12 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.173.0-darwin-x64.tar.gz"; - sha256 = "0lzabzp1v888vq0gw5y6wkndx531kd2gxixdqd6a222pmysbhw59"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.174.0-darwin-x64.tar.gz"; + sha256 = "0lw460xwhxl2mvvn5j3wb1wk3g3a7k8n7s9qmgs2mnyrc6a7l039"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.38.0-darwin-amd64.tar.gz"; - sha256 = "1g0b1c35n1hdbyw8amkh3j3dgigxj418hdb7cv3q0mab14p47rxj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.39.0-darwin-amd64.tar.gz"; + sha256 = "14z6lbqfzx1qg2m7cmk5fax6gxnqchm6pqkjrkwkz1z9ai5wsig7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.1.0-darwin-amd64.tar.gz"; @@ -179,32 +179,32 @@ sha256 = "0m5mfhf67kv2f11c30mn6x9jr3l0gwz29sgs8zi11aa2vw5f0j0g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.3-darwin-amd64.tar.gz"; - sha256 = "11288q3k3dq20kggcxif4xv06zk7x2x5xwcj5swr6la7cjq2wvpr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.4-darwin-amd64.tar.gz"; + sha256 = "1azx9saxgrama9mpjkbkgbg4w29ybp1b7cjsiajv0wnrfjfbmlsk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.21.0-darwin-amd64.tar.gz"; - sha256 = "1z3mqcxv7xkl8bamgjfq2jlfday0prbfj26hgbs1xgdq9p571x3r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.22.0-darwin-amd64.tar.gz"; + sha256 = "1qs9qfiqplhbhd0hva7vlr2mg0kgfl91x41sfa43dpn1bhhzgd7w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.81.0-darwin-amd64.tar.gz"; - sha256 = "0nhs9nj5fj2pbvvrygq1prglfsk0hr2mspc92743n6mn93k32vb8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.82.1-darwin-amd64.tar.gz"; + sha256 = "0i2gvwv0qhcvnfrm65p5qa82sax2my2dsnhk6n1bxq1f7hxn7rqp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-darwin-amd64.tar.gz"; sha256 = "1nvznxmdpb92s7c3fi8arz8kyzwdnvhhy8j4j9s5sqw5bn13bm3a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.9.0-darwin-amd64.tar.gz"; - sha256 = "1y8k69ynnjkqr7vwcnv6vgirnlgixplnzzq87ywb592lh7vp9b94"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.0-darwin-amd64.tar.gz"; + sha256 = "1dwn0xjr0p6rd2r5x59flscfg911xaahp3bvhbkrz8pgkkg6ygcz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.23.0-darwin-amd64.tar.gz"; sha256 = "1596zgpi09c14xghcby80fijy743pc68vs2xpdy6xbcm4k29srqn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.0-darwin-amd64.tar.gz"; - sha256 = "1b4ivxds2s03xl65qiinw1vx4phjn2bplxhyl0aw0h0g1155h8j3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.1-darwin-amd64.tar.gz"; + sha256 = "1972648yj3pj7l0na2hflv9hy1s8fhg7166kraim8mnmm8ngzgbk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-darwin-amd64.tar.gz"; @@ -215,8 +215,8 @@ sha256 = "0w71myfi4j5kwqrdjf7s8674m7zbfzpk2lz10iyhdr404jawb7rg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.45.0-darwin-amd64.tar.gz"; - sha256 = "0nxz9qgmf9i5zp7am8ca1w9dv0m5vw1y84q6aisbrsi04qlkc9z3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.46.0-darwin-amd64.tar.gz"; + sha256 = "0cxx27nhi8z3k2bqabdy0kkb6l2vlr78fv4yn2g2nxp1pdkjh77q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.7.0-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "049y0l7hyng3kqkh5hkxzw6k743dy1zik0xgbyv3iarg8gxi6yb8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.32.1-darwin-amd64.tar.gz"; - sha256 = "0y3kdll7dw9k2szfyc76diljxcf8ppaaq4gjl3fxnrha44wvpcq7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.33.0-darwin-amd64.tar.gz"; + sha256 = "1xhy4va19y8ybgzcby4gy2ndwm8z49qd6hx9mzh42ra6wkrfrrvh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-darwin-amd64.tar.gz"; @@ -271,8 +271,8 @@ sha256 = "0c2gqgf9d47ffpljq9h0z3m9gljw2b9fnav68mskh0cak8zgfhlz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.1-darwin-amd64.tar.gz"; - sha256 = "17m6qcpkhavgprqbskad5ky3zs9230bpiadmz3y552z4yci4pmdk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.2-darwin-amd64.tar.gz"; + sha256 = "1pfkqfviizl1n0kvnm90r02vrnmda0k4a7bhy52dask4vvb3g387"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-darwin-amd64.tar.gz"; @@ -321,12 +321,12 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.173.0-linux-arm64.tar.gz"; - sha256 = "1v9pjapx7qh3qdngsy7hjb7lyq0sv8hcyw2vlm3ar6xmz1fgzxw4"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.174.0-linux-arm64.tar.gz"; + sha256 = "0yarz9f8rvw5m97nsg4z2ar7hf5myz3wcf5prsj6v80w19igdmwz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.38.0-linux-arm64.tar.gz"; - sha256 = "1zzg4igsqnnrv4wby9bl3z63am6wayw8kyaf51qz6napp4skwqby"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.39.0-linux-arm64.tar.gz"; + sha256 = "1z72zkrpa0mz15q22r7vrkgb5yy8nfs6pp74flvr0alf4119gi49"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.1.0-linux-arm64.tar.gz"; @@ -337,32 +337,32 @@ sha256 = "0vfspacdpkal3rmnq33vqrn7iwc3havpyqzwl4xnr5ndrizf8afn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.3-linux-arm64.tar.gz"; - sha256 = "1087l6716vy72dcm648g36mlnvx7m3nw778bby8azy5almq4v9nr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.4-linux-arm64.tar.gz"; + sha256 = "1g10k6qzbk2ajbm31j4hmc8pzv8qb913jc0w9hvxwm2aqv7xklqi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.21.0-linux-arm64.tar.gz"; - sha256 = "1jgj636a6g7gyz0pq5m2drk99f8dczzzpx48mr7mxglqv0h9c8sr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.22.0-linux-arm64.tar.gz"; + sha256 = "1rhj8fadp3q6i975kbr1r17i7lzwg9wr6v0pc6vmw93w2hsgplan"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.81.0-linux-arm64.tar.gz"; - sha256 = "19z7v1fazcv4wsybhsn0x2allrfpsw3drm8wh7lh5kdzcphw9agi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.82.1-linux-arm64.tar.gz"; + sha256 = "0n9n27g1lvpwqzpaargxqnyi2jj6cvlbcbzd8d56vcx0k8bals84"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-linux-arm64.tar.gz"; sha256 = "17ali0a6dwrmwka319ld7vwlrkhxic6yim21niphcda9gi9v1cs9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.9.0-linux-arm64.tar.gz"; - sha256 = "0wwv7zs4pmnwdy3hzijhihi96jdjv4wdm4ky1wj8krwpbhw7kjl3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.0-linux-arm64.tar.gz"; + sha256 = "0bqqng9mpv7k6npdq01w058ram5zmfvand39s075hh73xc6hp5c5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.23.0-linux-arm64.tar.gz"; sha256 = "094fp0y2a4phd6zk7hz0x6iynpshh3sx6z9wyi2swacddjj646cx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.0-linux-arm64.tar.gz"; - sha256 = "06gvjl7vyws1bdndjxnhy078mc4pfd4vdvnp0lsni3dzy6s87ls3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.1-linux-arm64.tar.gz"; + sha256 = "15rw8fsmg3ndp1gxcg6c3m09bq1wwn0bi7a6fb8y506s21bi6sfj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-linux-arm64.tar.gz"; @@ -373,8 +373,8 @@ sha256 = "0mazlc88jcbpikvdcph0qk64riq5lfkcypgbsmckwz0ij9y7x15h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.45.0-linux-arm64.tar.gz"; - sha256 = "0vh94fsv4jfam7ynaxqay0ilxmx1rxx95dh9sxymr5bhrn1vjr6k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.46.0-linux-arm64.tar.gz"; + sha256 = "1vxvwxp7z45nzlahqkfi8ywy5lvkmmy64mf2byg582mxzvkcpsjc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.7.0-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "0zqyfn995lxmfiji9di44wgz0jmc9adf63pmhjzsi5kqfw5irrkw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.32.1-linux-arm64.tar.gz"; - sha256 = "0qs5vvdjfmpvnx1ap3jpmd8lvwvhz2lmgbwygpbb7ddzxshpmfi9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.33.0-linux-arm64.tar.gz"; + sha256 = "0bgd6vk0yqiwfibkhabcxh9kqpyq23b4blzai8cql6f06mffzlrd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-linux-arm64.tar.gz"; @@ -429,8 +429,8 @@ sha256 = "1sy9nkilsmvwd9bv8s65x32vfyc8b1qbwj6jnrdjk1y3a2sm1f81"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.1-linux-arm64.tar.gz"; - sha256 = "0xhlgdh05i5la27d4440n87kfv4rv9aragqrijw3wyw0fd0zy50s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.2-linux-arm64.tar.gz"; + sha256 = "12j121fv3n2p54cmqjbx7yc7p8hqi7sb7bf4pcz6v1mmzxfsfz1c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-linux-arm64.tar.gz"; @@ -479,12 +479,12 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.173.0-darwin-arm64.tar.gz"; - sha256 = "1qjmjf1kq6cnjqqdgka11vsk48iqkzs1wckksacl8w5inx1cflkc"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.174.0-darwin-arm64.tar.gz"; + sha256 = "0pbc1gk453g12p0x79d4gl8f9bcirqs6my28fxdhn36b565l0q2r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.38.0-darwin-arm64.tar.gz"; - sha256 = "0z35yjjpwas3yzr0zj4z9jigx6b6mmip7xzv6lbr3a08g6fly6nz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.39.0-darwin-arm64.tar.gz"; + sha256 = "0mbyiyasc6z4acyh6a29xbxd269pdbinarxi4g4czvvg2vd76fi1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.1.0-darwin-arm64.tar.gz"; @@ -495,32 +495,32 @@ sha256 = "1wm2kjbclb31np0hb2a5y0v9cpk5pv3bysf0g5wk8pfr1gnaigpa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.3-darwin-arm64.tar.gz"; - sha256 = "01j87fv5i7n9wwp0r8hxscp4gn8hssi0l9a7q90g89ffb18y878x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.4-darwin-arm64.tar.gz"; + sha256 = "0hzl05y19gzr7wdd4myqlmdnx9ax7a0pz6h9s787gpmw4gjnv861"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.21.0-darwin-arm64.tar.gz"; - sha256 = "16b1d99k9p34xjl6vjampa1lwhwjw2y38fkds8d15cvg1z725ypf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.22.0-darwin-arm64.tar.gz"; + sha256 = "0lj9wv18fjsv6xwszzyizibkaf2g4s19rjmldzb034xbdq8jpqbz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.81.0-darwin-arm64.tar.gz"; - sha256 = "124alv879949ab2g0a3l0ji5bn047wdz5hb11g8rpaq11378cmlq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.82.1-darwin-arm64.tar.gz"; + sha256 = "17m7p7n25fymhs7dgsgxakq3cnp15ncqc69alsxhi2n6f5nzhxks"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-darwin-arm64.tar.gz"; sha256 = "099z1by8w9vgna544d8q1v3gnp3jbssj01k75kck2sm13954idli"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.9.0-darwin-arm64.tar.gz"; - sha256 = "0ivjp7sq86gyy38vmy3cmbl1b3zwzij5dxwh6ffp5jf6bazm76wr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.0-darwin-arm64.tar.gz"; + sha256 = "1j3anypzdv3qicg5nagn6zckxr877f39kzazdi0slki9cpwnzkhi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.23.0-darwin-arm64.tar.gz"; sha256 = "1drmnhr9svpyj4pxi1czwc3qn4ha78lcb7sqwfwa428h0m0appms"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.0-darwin-arm64.tar.gz"; - sha256 = "0fxdprj20k532qvma5gcz0fl9bvf6rwz0n5ax96ar45m5i6wrmww"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.1-darwin-arm64.tar.gz"; + sha256 = "0gv7dsk35hhbfs2xx15x6mmdvbizfivnfa2ycpk38f2ihjbn5sdl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-darwin-arm64.tar.gz"; @@ -531,8 +531,8 @@ sha256 = "1z6j18n9w9gh7zw2d76ra623miqc0dy4gf3p61x3iqhid2znc5pl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.45.0-darwin-arm64.tar.gz"; - sha256 = "0r57qxq26fka8i1gl71xsjc0pbnaj2yj5nqrac9yzr5qvb84k0c0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.46.0-darwin-arm64.tar.gz"; + sha256 = "1zj4qmvv7r4f19hdk8lxm7h28vprnwyih3h45si7dbifm311gdl1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.7.0-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "0lcx81s0qa13cnkm1sh640a15z650vsqxi5a59zgzq6b0r151h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.32.1-darwin-arm64.tar.gz"; - sha256 = "07pwsqr2vql3gq7k6qyl26saaykc6qqhxjh5smbkx5blil9bgc5s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.33.0-darwin-arm64.tar.gz"; + sha256 = "0a4vidalqzfnkwdnyalmm5p8vwq91qfbqiw6dpcjmhi4airi2ilj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-darwin-arm64.tar.gz"; @@ -587,8 +587,8 @@ sha256 = "07mmlcralx8qq5zvjlhlnp8a9vqkm78316aclhs5ys3l1xmhj6j6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.1-darwin-arm64.tar.gz"; - sha256 = "0my26549lzvc4j7c3xmp6z82qj126x8sx9cj1rz8a7alawn1v5b0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.2-darwin-arm64.tar.gz"; + sha256 = "1braby52wys2ddfbb99yhhn6n3izr4sc70b7jl6ryrb6b17qqk0f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix index 23341215e279..c87a32d9715d 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -1,78 +1,40 @@ { lib, stdenv, - fetchgit, fetchFromGitHub, pkg-config, ibus, ibus-table, python3, cmake, + writableTmpDirAsHomeHook, }: let src = fetchFromGitHub { - owner = "definite"; + owner = "mike-fabian"; repo = "ibus-table-chinese"; - rev = "3380c96b5230721e9b80685a719508c505b8137a"; - hash = "sha256-Ymzkim1k6KQxcSX2LaczRsxV2DYCFxIWI5xulmhOrw8="; - }; - - cmakeFedoraSrc = fetchgit { - url = "https://pagure.io/cmake-fedora.git"; - rev = "7d5297759aef4cd086bdfa30cf6d4b2ad9446992"; - hash = "sha256-9uQbQ9hbiT+IpYh7guA4IOOIiLeeYuWc2EntePuWqVc="; + rev = "3a416012f3b898fe17225925f59d0672a8a0c0db"; + sha256 = "sha256-KA4jRSlQ78IeP7od3VtgdR58Z/6psNkMCVwvg3vhFIM="; }; in stdenv.mkDerivation { pname = "ibus-table-chinese"; - version = "1.8.3"; + version = "1.8.12"; - srcs = [ - src - cmakeFedoraSrc - ]; + inherit src; - sourceRoot = src.name; - - postUnpack = '' - chmod u+w -R ${cmakeFedoraSrc.name} - mv ${cmakeFedoraSrc.name}/* source/cmake-fedora - ''; - - preConfigure = '' - # cmake script needs ./Modules folder to link to cmake-fedora - ln -s cmake-fedora/Modules ./ - ''; - - # Fails when writing to /prj_info.cmake in https://pagure.io/cmake-fedora/blob/master/f/Modules/ManageVersion.cmake - cmakeFlags = [ - "-DPRJ_INFO_CMAKE_FILE=/dev/null" - "-DPRJ_DOC_DIR=REPLACE" - "-DDATA_DIR=share" - ]; - # Must replace PRJ_DOC_DIR with actual share/ folder for ibus-table-chinese - # Otherwise it tries to write to /ibus-table-chinese if not defined (!) postConfigure = '' - substituteInPlace cmake_install.cmake --replace '/build/source/REPLACE' $out/share/ibus-table-chinese + substituteInPlace cmake_install.cmake --replace-fail /var/empty $out + substituteInPlace CMakeLists.txt --replace-fail /var/empty $out ''; # Fails otherwise with "no such file or directory: .txt" dontUseCmakeBuildDir = true; - # Fails otherwise sometimes with - # FileExistsError: [Errno 17] File exists: '/build/tmp.BfVAUM4llr/ibus-table-chinese/.local/share/ibus-table' - enableParallelBuilding = false; - - preBuild = '' - export HOME=$(mktemp -d)/ibus-table-chinese - ''; - - postFixup = '' - rm -rf $HOME - ''; nativeBuildInputs = [ cmake pkg-config + writableTmpDirAsHomeHook ]; buildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9dca50e96b91..81a23b6edbdc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -320,7 +320,6 @@ mapAliases { autoadb = throw "'autoadb' has been removed due to lack of maintenance upstream"; # Added 2025-01-25 avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2024-10-17 avr-sim = throw "'avr-sim' has been removed as it was broken and unmaintained. Possible alternatives are 'simavr', SimulAVR and AVRStudio."; # Added 2025-05-31 - avrlibcCross = avrlibc; # Added 2024-09-06 axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17 awesome-4-0 = awesome; # Added 2022-05-05 aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11 @@ -341,6 +340,7 @@ mapAliases { betterbird = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15 + bitbucket-server-cli = throw "bitbucket-server-cli has been removed due to lack of maintenance upstream."; # Added 2025-05-27 bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15 bird = throw "The bird alias was ambiguous and has been removed for the time being. Please explicitly choose bird2 or bird3."; # Added 2025-01-11 @@ -1247,6 +1247,7 @@ mapAliases { minetestserver = luanti-server; # Added 2024-11-11 minetest-touch = luanti-client; # Added 2024-08-12 minizip2 = pkgs.minizip-ng; # Added 2022-12-28 + mmsd = throw "'mmsd' has been removed due to being unmaintained upstream. Consider using 'mmsd-tng' instead"; # Added 2025-06-07 mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17 mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17 mod_python = throw "'mod_python' has been renamed to/replaced by 'apacheHttpdPackages.mod_python'"; # Converted to throw 2024-10-17 @@ -1285,6 +1286,7 @@ mapAliases { ### N ### + n2048 = throw "'n2048' has been removed due to lack of maintenance upstream. Consider using '_2048-in-terminal'."; # Added 2025-06-07 ncdu_2 = ncdu; # Added 2022-07-22 neocities-cli = neocities; # Added 2024-07-31 neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28 @@ -1659,8 +1661,6 @@ mapAliases { radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17 radicale2 = throw "'radicale2' was removed because it was broken. Use 'radicale' (version 3) instead"; # Added 2024-11-29 radicale3 = radicale; # Added 2024-11-29 - radicle-cli = throw "'radicle-cli' was removed in favor of 'radicle-node'"; # Added 2024-05-04 - radicle-upstream = throw "'radicle-upstream' was sunset, see "; # Added 2024-05-04 railway-travel = diebahn; # Added 2024-04-01 rambox-pro = rambox; # Added 2022-12-12 rapidjson-unstable = lib.warnOnInstantiate "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28 @@ -1955,7 +1955,6 @@ mapAliases { ubootBeagleboneBlack = throw "'ubootBeagleboneBlack' has been renamed to/replaced by 'ubootAmx335xEVM'"; # Converted to throw 2024-10-17 ubuntu_font_family = ubuntu-classic; # Added 2024-02-19 uclibc = uclibc-ng; # Added 2022-06-16 - uclibcCross = uclibc-ng; # Added 2022-06-16 unicap = "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17 unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2024-10-17 uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; @@ -2138,6 +2137,7 @@ mapAliases { zinc = zincsearch; # Added 2023-05-28 zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10 zkg = throw "'zkg' has been replaced by 'zeek'"; + zsh-history = throw "'zsh-history' has been removed as it was unmaintained"; # Added 2025-04-17 zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91e9769d22e0..b20f87db9d05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -274,6 +274,8 @@ with pkgs; '' ); + alacritty-graphics = callPackage ../by-name/al/alacritty/package.nix { withGraphics = true; }; + # addDriverRunpath is the preferred package name, as this enables # many more scenarios than just opengl now. aocd = with python3Packages; toPythonApplication aocd; @@ -626,6 +628,7 @@ with pkgs; makeOverridable (import ../build-support/fetchurl) { inherit lib stdenvNoCC buildPackages; inherit cacert; + inherit (config) rewriteURL; curl = buildPackages.curlMinimal.override (old: rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; @@ -1261,8 +1264,6 @@ with pkgs; withpcre2 = false; }; - bitbucket-server-cli = callPackage ../applications/version-management/bitbucket-server-cli { }; - bump2version = with python3Packages; toPythonApplication bump2version; cgit = callPackage ../applications/version-management/cgit { }; @@ -2246,7 +2247,7 @@ with pkgs; stdenv = gcc14Stdenv; }; - hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { }; + hyprshade = python3Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { }; hyprlandPlugins = recurseIntoAttrs ( callPackage ../applications/window-managers/hyprwm/hyprland-plugins { } @@ -3303,8 +3304,6 @@ with pkgs; hotdoc = python3Packages.callPackage ../development/tools/hotdoc { }; - hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { }; - hpccm = with python3Packages; toPythonApplication hpccm; hqplayer-desktop = qt6Packages.callPackage ../applications/audio/hqplayer-desktop { }; @@ -3580,26 +3579,26 @@ with pkgs; nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; - nodejs = hiPrio nodejs_22; + nodejs = nodejs_22; nodejs-slim = nodejs-slim_22; - corepack = hiPrio corepack_22; + corepack = corepack_22; nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; }; - corepack_20 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_20; }); + corepack_20 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_20; }; nodejs_22 = callPackage ../development/web/nodejs/v22.nix { }; nodejs-slim_22 = callPackage ../development/web/nodejs/v22.nix { enableNpm = false; }; - corepack_22 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_22; }); + corepack_22 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_22; }; nodejs_24 = callPackage ../development/web/nodejs/v24.nix { }; nodejs-slim_24 = callPackage ../development/web/nodejs/v24.nix { enableNpm = false; }; - corepack_24 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_24; }); + corepack_24 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_24; }; # Update this when adding the newest nodejs major version! nodejs_latest = nodejs_24; nodejs-slim_latest = nodejs-slim_24; - corepack_latest = hiPrio corepack_24; + corepack_latest = corepack_24; buildNpmPackage = callPackage ../build-support/node/build-npm-package { }; @@ -5175,7 +5174,7 @@ with pkgs; gccWithoutTargetLibc = assert stdenv.targetPlatform != stdenv.hostPlatform; let - libcCross1 = binutilsNoLibc.libc; + libc1 = binutilsNoLibc.libc; in wrapCCWith { cc = gccFun { @@ -5190,7 +5189,7 @@ with pkgs; withoutTargetLibc = true; langCC = false; - libcCross = libcCross1; + libcCross = libc1; targetPackages.stdenv.cc.bintools = binutilsNoLibc; enableShared = stdenv.targetPlatform.hasSharedLibraries @@ -5201,7 +5200,7 @@ with pkgs; && !(stdenv.targetPlatform.useLLVM or false); }; bintools = binutilsNoLibc; - libc = libcCross1; + libc = libc1; extraPackages = [ ]; }; @@ -6142,7 +6141,7 @@ with pkgs; libcxx ? null, extraPackages ? lib.optional ( cc.isGNU or false && stdenv.targetPlatform.isMinGW - ) threadsCross.package, + ) targetPackages.threads.package, nixSupport ? { }, ... }@extraArgs: @@ -6182,7 +6181,7 @@ with pkgs; wrapBintoolsWith = { bintools, - libc ? if stdenv.targetPlatform != stdenv.hostPlatform then libcCross else stdenv.cc.libc, + libc ? targetPackages.libc or pkgs.libc, ... }@extraArgs: callPackage ../build-support/bintools-wrapper ( @@ -6664,8 +6663,7 @@ with pkgs; wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix { }; - racket = callPackage ../development/interpreters/racket { }; - racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { + racket-minimal = callPackage ../by-name/ra/racket/minimal.nix { stdenv = stdenvAdapters.makeStaticLibraries stdenv; }; @@ -7001,7 +6999,7 @@ with pkgs; }); binutilsNoLibc = wrapBintoolsWith { bintools = binutils-unwrapped; - libc = preLibcCrossHeaders; + libc = targetPackages.preLibcHeaders; }; libbfd = callPackage ../development/tools/misc/binutils/libbfd.nix { }; @@ -7055,7 +7053,7 @@ with pkgs; null; bintoolsNoLibc = wrapBintoolsWith { bintools = bintools-unwrapped; - libc = preLibcCrossHeaders; + libc = targetPackages.preLibcHeaders; }; bintools = wrapBintoolsWith { bintools = bintools-unwrapped; @@ -8155,9 +8153,21 @@ with pkgs; withMinecraftPatch = true; }; - glibc = callPackage ../development/libraries/glibc { - stdenv = gccStdenv; # doesn't compile without gcc - }; + glibc = callPackage ../development/libraries/glibc ( + if stdenv.hostPlatform != stdenv.buildPlatform then + { + stdenv = gccCrossLibcStdenv; # doesn't compile without gcc + libgcc = callPackage ../development/libraries/gcc/libgcc { + gcc = gccCrossLibcStdenv.cc; + glibc = glibc.override { libgcc = null; }; + stdenvNoLibs = gccCrossLibcStdenv; + }; + } + else + { + stdenv = gccStdenv; # doesn't compile without gcc + } + ); mtrace = callPackage ../development/libraries/glibc/mtrace.nix { }; @@ -8168,96 +8178,81 @@ with pkgs; withGd = true; }; - # Being redundant to avoid cycles on boot. TODO: find a better way - glibcCross = callPackage ../development/libraries/glibc { - stdenv = gccCrossLibcStdenv; # doesn't compile without gcc - libgcc = callPackage ../development/libraries/gcc/libgcc { - gcc = gccCrossLibcStdenv.cc; - glibc = glibcCross.override { libgcc = null; }; - stdenvNoLibs = gccCrossLibcStdenv; - }; - }; - - muslCross = musl.override { - stdenv = stdenvNoLibc; - }; + musl = callPackage ../by-name/mu/musl/package.nix ( + lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { + stdenv = stdenvNoLibc; + } + ); # These are used when building compiler-rt / libgcc, prior to building libc. - preLibcCrossHeaders = + preLibcHeaders = let - inherit (stdenv.targetPlatform) libc; + inherit (stdenv.hostPlatform) libc; in - if stdenv.targetPlatform.isMinGW then - targetPackages.windows.mingw_w64_headers or windows.mingw_w64_headers + if stdenv.hostPlatform.isMinGW then + windows.mingw_w64_headers or fallback else if libc == "nblibc" then - targetPackages.netbsd.headers or netbsd.headers + netbsd.headers else null; # We can choose: - libcCrossChooser = - name: - # libc is hackily often used from the previous stage. This `or` - # hack fixes the hack, *sigh*. - if name == null then + libc = + let + inherit (stdenv.hostPlatform) libc; + # libc is hackily often used from the previous stage. This `or` + # hack fixes the hack, *sigh*. + in + if libc == null then null - else if name == "glibc" then - targetPackages.glibcCross or glibcCross - else if name == "bionic" then - targetPackages.bionic or bionic - else if name == "uclibc" then - targetPackages.uclibc or uclibc - else if name == "avrlibc" then - targetPackages.avrlibc or avrlibc - else if name == "newlib" && stdenv.targetPlatform.isMsp430 then - targetPackages.msp430Newlib or msp430Newlib - else if name == "newlib" && stdenv.targetPlatform.isVc4 then - targetPackages.vc4-newlib or vc4-newlib - else if name == "newlib" && stdenv.targetPlatform.isOr1k then - targetPackages.or1k-newlib or or1k-newlib - else if name == "newlib" then - targetPackages.newlib or newlib - else if name == "newlib-nano" then - targetPackages.newlib-nano or newlib-nano - else if name == "musl" then - targetPackages.muslCross or muslCross - else if name == "msvcrt" then - targetPackages.windows.mingw_w64 or windows.mingw_w64 - else if name == "ucrt" then - targetPackages.windows.mingw_w64 or windows.mingw_w64 - else if name == "libSystem" then - if stdenv.targetPlatform.useiOSPrebuilt then - targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries - else - targetPackages.darwin.libSystem or darwin.libSystem - else if name == "fblibc" then - targetPackages.freebsd.libc or freebsd.libc - else if name == "oblibc" then - targetPackages.openbsd.libc or openbsd.libc - else if name == "nblibc" then - targetPackages.netbsd.libc or netbsd.libc - else if name == "wasilibc" then - targetPackages.wasilibc or wasilibc - else if name == "relibc" then - targetPackages.relibc or relibc + else if libc == "glibc" then + glibc + else if libc == "bionic" then + bionic + else if libc == "uclibc" then + uclibc + else if libc == "avrlibc" then + avrlibc + else if libc == "newlib" && stdenv.hostPlatform.isMsp430 then + msp430Newlib + else if libc == "newlib" && stdenv.hostPlatform.isVc4 then + vc4-newlib + else if libc == "newlib" && stdenv.hostPlatform.isOr1k then + or1k-newlib + else if libc == "newlib" then + newlib + else if libc == "newlib-nano" then + newlib-nano + else if libc == "musl" then + musl + else if libc == "msvcrt" then + windows.mingw_w64 + else if libc == "ucrt" then + windows.mingw_w64 + else if libc == "libSystem" then + if stdenv.hostPlatform.useiOSPrebuilt then darwin.iosSdkPkgs.libraries else darwin.libSystem + else if libc == "fblibc" then + freebsd.libc + else if libc == "oblibc" then + openbsd.libc + else if libc == "nblibc" then + netbsd.libc + else if libc == "wasilibc" then + wasilibc + else if libc == "relibc" then + relibc else if name == "llvm" then - targetPackages.llvmPackages_20.libc or llvmPackages_20.libc + llvmPackages_20.libc else - throw "Unknown libc ${name}"; + throw "Unknown libc ${libc}"; - libcCross = - if stdenv.targetPlatform == stdenv.buildPlatform then - null - else - libcCrossChooser stdenv.targetPlatform.libc; - - threadsCross = - lib.optionalAttrs (stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)) + threads = + lib.optionalAttrs (stdenv.hostPlatform.isMinGW && !(stdenv.hostPlatform.useLLVM or false)) { # other possible values: win32 or posix model = "mcf"; # For win32 or posix set this to null - package = targetPackages.windows.mcfgthreads or windows.mcfgthreads; + package = windows.mcfgthreads; }; wasilibc = callPackage ../development/libraries/wasilibc { @@ -8571,8 +8566,6 @@ with pkgs; json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml; - kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { }; - keybinder = callPackage ../development/libraries/keybinder { automake = automake111x; lua = lua5_1; @@ -8775,7 +8768,7 @@ with pkgs; "fblibc" ] then - libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libcCross else stdenv.cc.libc) + libcIconv pkgs.libc else if stdenv.hostPlatform.isDarwin then darwin.libiconv else @@ -8801,7 +8794,7 @@ with pkgs; "musl" ] then - lib.getBin stdenv.cc.libc + lib.getBin libc else if stdenv.hostPlatform.isDarwin then lib.getBin libiconv else if stdenv.hostPlatform.isFreeBSD then @@ -9295,7 +9288,7 @@ with pkgs; physfs ; - pingvin-share = callPackage ../servers/pingvin-share { }; + pingvin-share = callPackage ../servers/web-apps/pingvin-share { }; pipelight = callPackage ../tools/misc/pipelight { stdenv = stdenv_32bit; @@ -9582,7 +9575,7 @@ with pkgs; simavr = callPackage ../development/tools/simavr { avrgcc = pkgsCross.avr.buildPackages.gcc; - avrlibc = pkgsCross.avr.libcCross; + avrlibc = pkgsCross.avr.libc; }; simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_4; }; @@ -11594,10 +11587,6 @@ with pkgs; breath-theme = libsForQt5.callPackage ../data/themes/breath-theme { }; - cnspec = callPackage ../tools/security/cnspec { - buildGoModule = buildGo123Module; - }; - colloid-kde = libsForQt5.callPackage ../data/themes/colloid-kde { }; dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { }); @@ -12618,9 +12607,7 @@ with pkgs; } ); - manuskript = libsForQt5.callPackage ../applications/editors/manuskript { - python3Packages = python311Packages; - }; + manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; minari = python3Packages.toPythonApplication python3Packages.minari; @@ -12654,12 +12641,6 @@ with pkgs; withDoc = true; }; - gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { }; - - gpu-screen-recorder-gtk = - callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix - { }; - gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { }; gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { }; @@ -12985,8 +12966,6 @@ with pkgs; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; - kchmviewer = libsForQt5.callPackage ../applications/misc/kchmviewer { }; - okteta = libsForQt5.callPackage ../applications/editors/okteta { }; k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; @@ -14346,7 +14325,6 @@ with pkgs; virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; - inherit (gnome2) libIDL; # VirtualBox uses wsimport, which was removed after JDK 8. jdk = jdk8; @@ -15211,9 +15189,7 @@ with pkgs; ncurses = ncurses5; }; - rott = callPackage ../games/rott { SDL = SDL_compat; }; - - rott-shareware = rott.override { + rott-shareware = callPackage ../by-name/ro/rott/package.nix { buildShareware = true; }; @@ -15251,10 +15227,6 @@ with pkgs; lua = lua5_1; }; - # solarus and solarus-quest-editor must use the same version of Qt. - solarus = libsForQt5.callPackage ../games/solarus { }; - solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; - # You still can override by passing more arguments. spring = callPackage ../games/spring { asciidoc = asciidoc-full; }; @@ -15267,7 +15239,7 @@ with pkgs; steam-run-free = steam-fhsenv-without-steam.run; - steamback = python311.pkgs.callPackage ../tools/games/steamback { }; + steamback = python3.pkgs.callPackage ../tools/games/steamback { }; protontricks = python3Packages.callPackage ../tools/package-management/protontricks { steam-run = steam-run-free; @@ -15547,9 +15519,7 @@ with pkgs; deepdiff = with python3Packages; toPythonApplication deepdiff; - deepsecrets = callPackage ../tools/security/deepsecrets { - python3 = python311; - }; + deepsecrets = callPackage ../tools/security/deepsecrets { }; deep-translator = with python3Packages; toPythonApplication deep-translator; diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 4f6ae95b23f6..840c4e03e92d 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -211,6 +211,27 @@ let Whether to check that the `meta` attribute of derivations are correct during evaluation time. ''; }; + + rewriteURL = mkOption { + type = types.functionTo (types.nullOr types.str); + description = '' + A hook to rewrite/filter URLs before they are fetched. + + The function is passed the URL as a string, and is expected to return a new URL, or null if the given URL should not be attempted. + + This function is applied _prior_ to resolving mirror:// URLs. + + The intended use is to allow URL rewriting to insert company-internal mirrors, or work around company firewalls and similar network restrictions. + ''; + default = lib.id; + defaultText = literalExpression "(url: url)"; + example = literalExpression '' + { + # Use Nix like it's 2024! ;-) + rewriteURL = url: "https://web.archive.org/web/2024/''${url}"; + } + ''; + }; }; in diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 9d656d33c338..b378ae9b068e 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -6,7 +6,6 @@ generateSplicesForMkScope, makeScopeWithSplicing', stdenv, - preLibcCrossHeaders, config, }: @@ -57,7 +56,7 @@ makeScopeWithSplicing' { }; binutils = pkgs.wrapBintoolsWith { - libc = if stdenv.targetPlatform != stdenv.hostPlatform then pkgs.libcCross else pkgs.stdenv.cc.libc; + inherit (targetPackages) libc; bintools = self.binutils-unwrapped; }; @@ -88,7 +87,7 @@ makeScopeWithSplicing' { }; binutilsNoLibc = pkgs.wrapBintoolsWith { - libc = preLibcCrossHeaders; + libc = targetPackages.preLibcHeaders; bintools = self.binutils-unwrapped; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b4a23d1986b5..6d9f31dc446f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9495,7 +9495,7 @@ with self; doCheck = false; meta = { description = "Code coverage metrics for Perl"; - homepage = "http://www.pjcj.net/perl.html"; + homepage = "https://www.pjcj.net/perl.html"; license = with lib.licenses; [ artistic1 gpl1Plus @@ -13327,6 +13327,9 @@ with self; url = "mirror://cpan/authors/id/R/RC/RCLAMP/File-Find-Rule-0.34.tar.gz"; hash = "sha256-fm8WzDPrHyn/Jb7lHVE/S4qElHu/oY7bLTzECi1kyv4="; }; + patches = [ + ../development/perl-modules/FileFindRule-CVE-2011-10007.patch + ]; propagatedBuildInputs = [ NumberCompare TextGlob diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index faf0040093ef..1d8fcb86fbea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -189,6 +189,8 @@ self: super: with self; { aioairzone-cloud = callPackage ../development/python-modules/aioairzone-cloud { }; + aioamazondevices = callPackage ../development/python-modules/aioamazondevices { }; + aioambient = callPackage ../development/python-modules/aioambient { }; aioamqp = callPackage ../development/python-modules/aioamqp { }; @@ -333,6 +335,8 @@ self: super: with self; { aioimaplib = callPackage ../development/python-modules/aioimaplib { }; + aioimmich = callPackage ../development/python-modules/aioimmich { }; + aioinflux = callPackage ../development/python-modules/aioinflux { }; aioitertools = callPackage ../development/python-modules/aioitertools { }; @@ -1295,6 +1299,10 @@ self: super: with self; { azure-keyvault-secrets = callPackage ../development/python-modules/azure-keyvault-secrets { }; + azure-keyvault-securitydomain = + callPackage ../development/python-modules/azure-keyvault-securitydomain + { }; + azure-kusto-data = callPackage ../development/python-modules/azure-kusto-data { }; azure-kusto-ingest = callPackage ../development/python-modules/azure-kusto-ingest { }; @@ -2825,6 +2833,8 @@ self: super: with self; { confuse = callPackage ../development/python-modules/confuse { }; + conjure-python-client = callPackage ../development/python-modules/conjure-python-client { }; + connect-box = callPackage ../development/python-modules/connect-box { }; connected-components-3d = callPackage ../development/python-modules/connected-components-3d { }; @@ -3128,6 +3138,8 @@ self: super: with self; { cynthion = callPackage ../development/python-modules/cynthion { }; + cypari = callPackage ../development/python-modules/cypari { }; + cypari2 = callPackage ../development/python-modules/cypari2 { }; cypherpunkpay = callPackage ../development/python-modules/cypherpunkpay { }; @@ -3479,6 +3491,8 @@ self: super: with self; { devpi-common = callPackage ../development/python-modules/devpi-common { }; + devpi-ldap = callPackage ../development/python-modules/devpi-ldap { }; + devtools = callPackage ../development/python-modules/devtools { }; dfdiskcache = callPackage ../development/python-modules/dfdiskcache { }; @@ -5432,6 +5446,8 @@ self: super: with self; { fx2 = callPackage ../development/python-modules/fx2 { }; + fxrays = callPackage ../development/python-modules/fxrays { }; + fyta-cli = callPackage ../development/python-modules/fyta-cli { }; g2pkk = callPackage ../development/python-modules/g2pkk { }; @@ -5712,6 +5728,8 @@ self: super: with self; { gitpython = callPackage ../development/python-modules/gitpython { }; + giturlparse = callPackage ../development/python-modules/giturlparse { }; + glad = callPackage ../development/python-modules/glad { }; glad2 = callPackage ../development/python-modules/glad2 { }; @@ -7578,6 +7596,8 @@ self: super: with self; { knocki = callPackage ../development/python-modules/knocki { }; + knot-floer-homology = callPackage ../development/python-modules/knot-floer-homology { }; + knx-frontend = callPackage ../development/python-modules/knx-frontend { }; kombu = callPackage ../development/python-modules/kombu { }; @@ -8461,6 +8481,8 @@ self: super: with self; { lottie = callPackage ../development/python-modules/lottie { }; + low-index = callPackage ../development/python-modules/low-index { }; + lox = callPackage ../development/python-modules/lox { }; lpc-checksum = callPackage ../development/python-modules/lpc-checksum { }; @@ -10067,6 +10089,8 @@ self: super: with self; { newick = callPackage ../development/python-modules/newick { }; + newspaper3k = callPackage ../development/python-modules/newspaper3k { }; + newversion = callPackage ../development/python-modules/newversion { }; nexia = callPackage ../development/python-modules/nexia { }; @@ -10187,6 +10211,12 @@ self: super: with self; { nomadnet = callPackage ../development/python-modules/nomadnet { }; + nominal = callPackage ../development/python-modules/nominal { }; + + nominal-api = callPackage ../development/python-modules/nominal-api { }; + + nominal-api-protos = callPackage ../development/python-modules/nominal-api-protos { }; + nonbloat-db = callPackage ../development/python-modules/nonbloat-db { }; noneprompt = callPackage ../development/python-modules/noneprompt { }; @@ -11339,6 +11369,8 @@ self: super: with self; { pip-chill = callPackage ../development/python-modules/pip-chill { }; + pip-install-test = callPackage ../development/python-modules/pip-install-test { }; + pip-requirements-parser = callPackage ../development/python-modules/pip-requirements-parser { }; pip-system-certs = callPackage ../development/python-modules/pip-system-certs { }; @@ -11437,6 +11469,8 @@ self: super: with self; { plfit = toPythonModule (pkgs.plfit.override { inherit (self) python; }); + plink = callPackage ../development/python-modules/plink { }; + plone-testing = callPackage ../development/python-modules/plone-testing { }; ploomber-core = callPackage ../development/python-modules/ploomber-core { }; @@ -13404,7 +13438,9 @@ self: super: with self; { pyregion = callPackage ../development/python-modules/pyregion { }; - pyrender = callPackage ../development/python-modules/pyrender { }; + pyrender = callPackage ../development/python-modules/pyrender { + inherit (pkgs) mesa; + }; pyrevolve = callPackage ../development/python-modules/pyrevolve { }; @@ -16297,6 +16333,10 @@ self: super: with self; { snapcast = callPackage ../development/python-modules/snapcast { }; + snappy-15-knots = callPackage ../development/python-modules/snappy-15-knots { }; + + snappy-manifolds = callPackage ../development/python-modules/snappy-manifolds { }; + snapshottest = callPackage ../development/python-modules/snapshottest { }; snaptime = callPackage ../development/python-modules/snaptime { }; @@ -16463,6 +16503,8 @@ self: super: with self; { spglib = callPackage ../development/python-modules/spglib { }; + spherogram = callPackage ../development/python-modules/spherogram { }; + sphfile = callPackage ../development/python-modules/sphfile { }; sphinx = callPackage ../development/python-modules/sphinx { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 340c8b92f133..22cc2ce290e8 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -71,13 +71,13 @@ let embedded = { buildPackages.binutils = nativePlatforms; buildPackages.gcc = nativePlatforms; - libcCross = nativePlatforms; + libc = nativePlatforms; }; common = { buildPackages.binutils = nativePlatforms; gmp = nativePlatforms; - libcCross = nativePlatforms; + libc = nativePlatforms; nix = nativePlatforms; nixVersions.git = nativePlatforms; mesa = nativePlatforms; diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index 2c983fe8a5ac..d2d678467c5f 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -95,7 +95,7 @@ let linux = pkgs.util-linux; }; getconf = { - linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc else pkgs.netbsd.getconf; + linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.libc else pkgs.netbsd.getconf; darwin = pkgs.darwin.system_cmds; # I don't see any obvious arg exec in the doc/manpage binlore = '' @@ -103,8 +103,7 @@ let ''; }; getent = { - linux = - if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc.getent else pkgs.netbsd.getent; + linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.libc.getent else pkgs.netbsd.getent; darwin = pkgs.netbsd.getent; freebsd = pkgs.freebsd.getent; openbsd = pkgs.openbsd.getent;