diff --git a/lib/systems/default.nix b/lib/systems/default.nix index b4f6c13feafa..5de640da8697 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -319,7 +319,7 @@ let if final.isAarch32 then "arm" else if final.isAarch64 then - "aarch64" + "aarch64${optionalString final.isBigEndian "_be"}" else if final.isS390 && !final.isS390x then null else if final.isx86_64 then diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 7e43a17490d3..a33b472708b8 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -552,7 +552,6 @@ "lf-": 6652840 }, "members": { - "9999years": 15312184, "Qyriad": 1542224, "RaitoBezarius": 314564 }, diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index efa1c334af24..c5ed5ba62c40 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -476,12 +476,6 @@ githubId = 908758; name = "Abigail Bunyan"; }; - aborsu = { - email = "a.borsu@gmail.com"; - github = "aborsu"; - githubId = 5033617; - name = "Augustin Borsu"; - }; aboseley = { email = "adam.boseley@gmail.com"; github = "aboseley"; @@ -10585,6 +10579,11 @@ githubId = 982322; name = "Henrik Olsson"; }; + henrikvtcodes = { + github = "henrikvtcodes"; + githubId = 22358337; + name = "Henrik VT"; + }; henrirosten = { email = "henri.rosten@unikie.com"; github = "henrirosten"; @@ -11991,6 +11990,11 @@ github = "jaredmontoya"; githubId = 49511278; }; + jasanfarah = { + github = "jasanfarah"; + githubId = 69898185; + name = "Jasan Farah"; + }; jasoncarr = { email = "jcarr250@gmail.com"; github = "jasoncarr0"; @@ -16742,6 +16746,12 @@ githubId = 952712; name = "Matt Christ"; }; + mattcurrie = { + email = "me+nixpkgs@mattcurrie.com"; + github = "mattcurrie"; + githubId = 455505; + name = "Matt Currie"; + }; mattdef = { email = "mattdef@gmail.com"; github = "mattdef"; @@ -23969,12 +23979,6 @@ email = "hey@sandydoo.me"; matrix = "@sandydoo:matrix.org"; }; - santosh = { - email = "santoshxshrestha@gmail.com"; - name = "Santosh Shrestha"; - github = "santoshxshrestha"; - githubId = 182977126; - }; sarahec = { email = "seclark@nextquestion.net"; github = "sarahec"; @@ -26237,12 +26241,6 @@ githubId = 12595971; name = "Guillaume Girol"; }; - synthetica = { - email = "nix@hilhorst.be"; - github = "Synthetica9"; - githubId = 7075751; - name = "Patrick Hilhorst"; - }; sysedwinistrator = { email = "edwin.mowen@gmail.com"; github = "sysedwinistrator"; @@ -28450,6 +28448,12 @@ githubId = 7235381; name = "Ondřej Kvapil"; }; + vimlinuz = { + email = "vimlinuz@gmail.com"; + name = "Santosh Shrestha"; + github = "vimlinuz"; + githubId = 182977126; + }; vincentbernat = { email = "vincent@bernat.ch"; github = "vincentbernat"; diff --git a/maintainers/scripts/hydra_eval_check b/maintainers/scripts/hydra_eval_check deleted file mode 100755 index c8e03424f320..000000000000 --- a/maintainers/scripts/hydra_eval_check +++ /dev/null @@ -1,13 +0,0 @@ -#! /bin/sh - -# give absolute path of release.nix as argument -hydra_eval_jobs \ - --argstr system x86_64-linux \ - --argstr system i686-linux \ - --argstr system x86_64-darwin \ - --argstr system i686-cygwin \ - --argstr system x86_64-cygwin \ - --argstr system i686-freebsd \ - --arg officialRelease false \ - --arg nixpkgs "{ outPath = builtins.storePath ./. ; rev = 1234; }" \ - $@ diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index a1533ad7c6c2..a4dd4e619691 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -295,7 +295,6 @@ with lib.maintainers; gcc = { members = [ - synthetica vcunat ericson2314 ]; diff --git a/nixos/modules/hardware/facter/default.nix b/nixos/modules/hardware/facter/default.nix index 91bb328c508b..a748be44d411 100644 --- a/nixos/modules/hardware/facter/default.nix +++ b/nixos/modules/hardware/facter/default.nix @@ -23,6 +23,19 @@ meta.maintainers = with lib.maintainers; [ mic92 ]; options.hardware.facter = with lib; { + enable = mkOption { + type = types.bool; + default = config.hardware.facter.report != { }; + defaultText = literalExpression '' + config.hardware.facter.report != { } + ''; + description = '' + Whether to enable automatic hardware configuration using a report generated by nixos-facter. + + See for more information. + ''; + }; + report = mkOption { type = types.attrsOf types.anything; default = diff --git a/nixos/modules/hardware/facter/disk.nix b/nixos/modules/hardware/facter/disk.nix index 4158bd171bb9..fe4e8898fb56 100644 --- a/nixos/modules/hardware/facter/disk.nix +++ b/nixos/modules/hardware/facter/disk.nix @@ -22,7 +22,7 @@ in ''; }; - config = lib.mkIf (config.hardware.facter.reportPath != null) { + config = lib.mkIf config.hardware.facter.enable { boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.disk.kernelModules; }; } diff --git a/nixos/modules/hardware/facter/firmware.nix b/nixos/modules/hardware/facter/firmware.nix index b614cab85253..db909c5d1a85 100644 --- a/nixos/modules/hardware/facter/firmware.nix +++ b/nixos/modules/hardware/facter/firmware.nix @@ -8,7 +8,7 @@ let hasIntelCpu = facterLib.hasIntelCpu report; in { - config = lib.mkIf (config.hardware.facter.reportPath != null && isBaremetal) { + config = lib.mkIf (config.hardware.facter.enable && isBaremetal) { # none (e.g. bare-metal) # provide firmware for devices that might not have been detected by nixos-facter hardware.enableRedistributableFirmware = lib.mkDefault true; diff --git a/nixos/modules/hardware/facter/graphics/amd.nix b/nixos/modules/hardware/facter/graphics/amd.nix index b2ec114677a0..fd1b670edac1 100644 --- a/nixos/modules/hardware/facter/graphics/amd.nix +++ b/nixos/modules/hardware/facter/graphics/amd.nix @@ -12,7 +12,7 @@ in defaultText = "hardware dependent"; }; }; - config = lib.mkIf (config.hardware.facter.reportPath != null && cfg.enable) { + config = lib.mkIf (config.hardware.facter.enable && cfg.enable) { services.xserver.videoDrivers = [ "modesetting" ]; }; } diff --git a/nixos/modules/hardware/facter/graphics/default.nix b/nixos/modules/hardware/facter/graphics/default.nix index cd29040ce67d..f294c3b2ae5e 100644 --- a/nixos/modules/hardware/facter/graphics/default.nix +++ b/nixos/modules/hardware/facter/graphics/default.nix @@ -28,7 +28,7 @@ in }; }; - config = lib.mkIf (config.hardware.facter.reportPath != null && cfg.enable) ( + config = lib.mkIf (config.hardware.facter.enable && cfg.enable) ( { boot.initrd.kernelModules = config.hardware.facter.detected.boot.graphics.kernelModules; } diff --git a/nixos/modules/hardware/facter/keyboard.nix b/nixos/modules/hardware/facter/keyboard.nix index 62baf5bd32f1..98ae12ba3a55 100644 --- a/nixos/modules/hardware/facter/keyboard.nix +++ b/nixos/modules/hardware/facter/keyboard.nix @@ -15,7 +15,7 @@ in ''; }; - config = lib.mkIf (config.hardware.facter.reportPath != null) { + config = lib.mkIf config.hardware.facter.enable { boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.keyboard.kernelModules; }; } diff --git a/nixos/modules/hardware/facter/networking/default.nix b/nixos/modules/hardware/facter/networking/default.nix index 7f662d8785a0..1ad1229cb44e 100644 --- a/nixos/modules/hardware/facter/networking/default.nix +++ b/nixos/modules/hardware/facter/networking/default.nix @@ -60,12 +60,10 @@ in ]; }; }; - config = - lib.mkIf (config.hardware.facter.reportPath != null && config.hardware.facter.detected.dhcp.enable) - { - networking.useDHCP = lib.mkDefault true; + config = lib.mkIf (config.hardware.facter.enable && config.hardware.facter.detected.dhcp.enable) { + networking.useDHCP = lib.mkDefault true; - # Per-interface DHCP configuration - networking.interfaces = perInterfaceConfig; - }; + # Per-interface DHCP configuration + networking.interfaces = perInterfaceConfig; + }; } diff --git a/nixos/modules/hardware/facter/networking/initrd.nix b/nixos/modules/hardware/facter/networking/initrd.nix index 8c3135354f93..c26be93a35d7 100644 --- a/nixos/modules/hardware/facter/networking/initrd.nix +++ b/nixos/modules/hardware/facter/networking/initrd.nix @@ -14,7 +14,7 @@ in ''; }; - config = lib.mkIf (config.hardware.facter.reportPath != null && config.boot.initrd.network.enable) { + config = lib.mkIf (config.hardware.facter.enable && config.boot.initrd.network.enable) { boot.initrd.kernelModules = config.hardware.facter.detected.boot.initrd.networking.kernelModules; }; } diff --git a/nixos/modules/hardware/facter/networking/intel.nix b/nixos/modules/hardware/facter/networking/intel.nix index a28e8ecf580d..2710c45ab46a 100644 --- a/nixos/modules/hardware/facter/networking/intel.nix +++ b/nixos/modules/hardware/facter/networking/intel.nix @@ -49,7 +49,7 @@ in }; }; - config = lib.mkIf (config.hardware.facter.reportPath != null) { + config = lib.mkIf config.hardware.facter.enable { networking.enableIntel2200BGFirmware = lib.mkIf cfg._2200BG.enable (lib.mkDefault true); hardware.enableRedistributableFirmware = lib.mkIf cfg._3945ABG.enable (lib.mkDefault true); }; diff --git a/nixos/modules/hardware/facter/virtualisation.nix b/nixos/modules/hardware/facter/virtualisation.nix index 6acdd62516f9..cf34ca5eea4d 100644 --- a/nixos/modules/hardware/facter/virtualisation.nix +++ b/nixos/modules/hardware/facter/virtualisation.nix @@ -51,7 +51,7 @@ in }; }; - config = lib.mkIf (config.hardware.facter.reportPath != null) { + config = lib.mkIf config.hardware.facter.enable { # KVM support boot.kernelModules = diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9201540632cb..fcae71655603 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1780,6 +1780,7 @@ ./services/web-apps/vikunja.nix ./services/web-apps/wakapi.nix ./services/web-apps/weblate.nix + ./services/web-apps/websurfx.nix ./services/web-apps/whitebophir.nix ./services/web-apps/whoami.nix ./services/web-apps/wiki-js.nix diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix index eece4df20c9d..c584c595d6c5 100644 --- a/nixos/modules/services/development/jupyter/default.nix +++ b/nixos/modules/services/development/jupyter/default.nix @@ -31,7 +31,6 @@ let in { meta.maintainers = with lib.maintainers; [ - aborsu b-m-f ]; diff --git a/nixos/modules/services/finance/odoo.nix b/nixos/modules/services/finance/odoo.nix index 0c0c581fa987..422ca7240a85 100644 --- a/nixos/modules/services/finance/odoo.nix +++ b/nixos/modules/services/finance/odoo.nix @@ -7,13 +7,23 @@ let cfg = config.services.odoo; format = pkgs.formats.ini { }; + + inherit (config.system) stateVersion; in { options = { services.odoo = { enable = lib.mkEnableOption "odoo, an open source ERP and CRM system"; - package = lib.mkPackageOption pkgs "odoo" { }; + package = lib.mkOption { + type = lib.types.package; + description = "Which package to use for the Odoo instance."; + relatedPackages = [ + "odoo17" + "odoo18" + "odoo19" + ]; + }; addons = lib.mkOption { type = with lib.types; listOf package; @@ -100,16 +110,32 @@ in }; }; - services.odoo.settings.options = { - data_dir = "/var/lib/private/odoo/data"; - proxy_mode = cfg.domain != null; - # Disable the database manager by default - # https://www.odoo.com/documentation/master/administration/on_premise/deploy.html#database-manager-security - list_db = lib.mkDefault false; - } - // (lib.optionalAttrs (cfg.addons != [ ]) { - addons_path = lib.concatMapStringsSep "," lib.escapeShellArg cfg.addons; - }); + services.odoo = { + package = lib.mkDefault ( + if pkgs ? odoo then + throw '' + The `pkgs.odoo`-attribute has been removed. If it's supposed to be the default + odoo defined in an overlay, please set `services.odoo.package` to + `pkgs.odoo`. + '' + else if lib.versionOlder stateVersion "25.05" then + pkgs.odoo18 + else if lib.versionOlder stateVersion "25.11" then + pkgs.odoo18 + else + pkgs.odoo19 + ); + settings.options = { + data_dir = "/var/lib/private/odoo/data"; + proxy_mode = cfg.domain != null; + # Disable the database manager by default + # https://www.odoo.com/documentation/master/administration/on_premise/deploy.html#database-manager-security + list_db = lib.mkDefault false; + } + // (lib.optionalAttrs (cfg.addons != [ ]) { + addons_path = lib.concatMapStringsSep "," lib.escapeShellArg cfg.addons; + }); + }; users.users.odoo = { isSystemUser = true; diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix index 801750e67312..2938ee0802c2 100644 --- a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix +++ b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix @@ -27,6 +27,7 @@ let in writeScriptBin "nvidia-cdi-generator" '' #! ${runtimeShell} + set -e -u -o pipefail function cdiGenerate { ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} cdi generate \ diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix index 493668b22173..d05aa14f0045 100644 --- a/nixos/modules/services/misc/calibre-server.nix +++ b/nixos/modules/services/misc/calibre-server.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + utils, ... }: let @@ -11,20 +12,17 @@ let documentationLink = "https://manual.calibre-ebook.com"; generatedDocumentationLink = documentationLink + "/generated/en/calibre-server.html"; - execFlags = ( - lib.concatStringsSep " " ( - lib.mapAttrsToList (k: v: "${k} ${toString v}") ( - lib.filterAttrs (name: value: value != null) { - "--listen-on" = cfg.host; - "--port" = cfg.port; - "--auth-mode" = cfg.auth.mode; - "--userdb" = cfg.auth.userDb; - } - ) - ++ [ (lib.optionalString (cfg.auth.enable == true) "--enable-auth") ] - ++ cfg.extraFlags + execFlags = + lib.mapAttrsToList (k: v: "--${k}=${toString v}") ( + lib.filterAttrs (name: value: value != null) { + listen-on = cfg.host; + port = cfg.port; + auth-mode = cfg.auth.mode; + userdb = cfg.auth.userDb; + } ) - ); + ++ lib.optional cfg.auth.enable "--enable-auth" + ++ cfg.extraFlags; in { @@ -150,7 +148,9 @@ in serviceConfig = { User = cfg.user; Restart = "always"; - ExecStart = "${cfg.package}/bin/calibre-server ${lib.concatStringsSep " " cfg.libraries} ${execFlags}"; + ExecStart = utils.escapeSystemdExecArgs ( + [ "${cfg.package}/bin/calibre-server" ] ++ execFlags ++ [ "--" ] ++ cfg.libraries + ); }; }; diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 38a77f7aaace..9df4e99ff9a5 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -485,6 +485,7 @@ in PrivateNetwork = cfg.database.createLocally; # defaultServiceConfig enables this by default, needs to be disabled for remote DBs }; environment = env; + unitConfig.RequiresMountsFor = defaultServiceConfig.ReadWritePaths; preStart = '' # remove old papaerless-manage symlink diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 8f09ad170ac7..da48474d776c 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -54,6 +54,19 @@ in description = "Whether to enable Searx, the meta search engine."; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open the port in the firewall. + Enabling this option adds the port specified in {option}`services.settings.server.port` to {option}`networking.firewall.allowedTCPPorts`. + + ::: {.note} + When this option is set to true, {option}`services.settings.server.port` must be set as well or an error will be thrown. + ::: + ''; + }; + domain = mkOption { type = types.str; description = '' @@ -244,6 +257,13 @@ in ]; config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.openFirewall -> cfg.settings ? server.port; + message = "services.searx.settings.server.port must be set when openFirewall is enabled."; + } + ]; + environment = { etc = { "searxng/favicons.toml" = lib.mkIf (cfg.faviconsSettings != { }) { @@ -392,6 +412,8 @@ in isSystemUser = true; }; }; + + networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.settings.server.port ]; }; }; meta.maintainers = with maintainers; [ diff --git a/nixos/modules/services/scheduling/scx.nix b/nixos/modules/services/scheduling/scx.nix index 612c4995879a..bdc733df37f4 100644 --- a/nixos/modules/services/scheduling/scx.nix +++ b/nixos/modules/services/scheduling/scx.nix @@ -71,11 +71,11 @@ in }; extraArgs = lib.mkOption { - type = lib.types.listOf lib.types.singleLineStr; + type = lib.types.listOf lib.types.str; default = [ ]; example = [ - "--slice-us 5000" "--verbose" + "--slice-us 5000" ]; description = '' Parameters passed to the chosen scheduler at runtime. @@ -107,9 +107,10 @@ in ''; Restart = "on-failure"; }; + environment = { SCX_SCHEDULER = cfg.scheduler; - SCX_FLAGS = lib.escapeShellArgs cfg.extraArgs; + SCX_FLAGS = lib.concatStringsSep " " cfg.extraArgs; }; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/security/pocket-id.nix b/nixos/modules/services/security/pocket-id.nix index 23673f54d981..9396185c2469 100644 --- a/nixos/modules/services/security/pocket-id.nix +++ b/nixos/modules/services/security/pocket-id.nix @@ -213,15 +213,16 @@ in settingsFile ]; + script = '' + ${exportAllCredentials cfg.credentials} + exec ${getExe cfg.package} + ''; + serviceConfig = { Type = "simple"; User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.dataDir; - ExecStart = pkgs.writeShellScript "pocket-id-start" '' - ${exportAllCredentials cfg.credentials} - ${getExe cfg.package} - ''; Restart = "always"; RestartSec = 1; EnvironmentFile = [ diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix index 01d2858602b6..73db27519aa5 100644 --- a/nixos/modules/services/ttys/getty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -132,6 +132,12 @@ in ###### implementation config = mkIf config.console.enable { + assertions = [ + { + assertion = cfg.loginOptions != null -> cfg.autologinUser == null; + message = "services.getty.autoLoginUser has no effect when services.getty.loginOptions is set."; + } + ]; # Note: this is set here rather than up there so that changing # nixos.label would not rebuild manual pages services.getty.greetingLine = mkDefault ''<<< Welcome to ${config.system.nixos.distroName} ${config.system.nixos.label} (\m) - \l >>>''; diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 70d3e15e6e36..eee6a41f7de4 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -17,28 +17,80 @@ let cfg = config.services.kmscon; - autologinArg = lib.optionalString (cfg.autologinUser != null) "-f ${cfg.autologinUser}"; + gettyCfg = config.services.getty; configDir = pkgs.writeTextFile { name = "kmscon-config"; destination = "/kmscon.conf"; text = cfg.extraConfig; }; + + baseLoginOptions = "-p -- \\u"; + + agettyCmd = + enableAutologin: + "${lib.getExe' pkgs.util-linux "agetty"} ${ + lib.escapeShellArgs ( + [ + "--login-program" + (toString gettyCfg.loginProgram) + "--login-options" + # these options are passed as a single parameter + "${lib.optionalString enableAutologin "-f "}${baseLoginOptions}" + ] + ++ lib.optionals enableAutologin [ + "--autologin" + gettyCfg.autologinUser + ] + ++ gettyCfg.extraArgs + ++ [ + "--8bits" + "--noclear" + "--" + "-" + ] + ) + } $TERM"; + + loginScript = pkgs.writers.writeDash "kmscon-login" '' + kms_tty= + active_tty_file=/sys/class/tty/tty0/active + if [ -f "$active_tty_file" ]; then + read -r kms_tty < "$active_tty_file" + fi + + ${lib.optionalString (gettyCfg.autologinUser != null && gettyCfg.autologinOnce) '' + autologged="/run/kmscon.autologged" + if [ "$kms_tty" = tty1 ] && [ ! -f "$autologged" ]; then + touch "$autologged" + exec ${agettyCmd true} + fi + ''} + + exec ${agettyCmd (gettyCfg.autologinUser != null && !gettyCfg.autologinOnce)} + ''; in { + imports = [ + (lib.mkRemovedOptionModule [ "services" "kmscon" "autologinUser" ] '' + Autologin is now handled by the agetty module. + + Check `services.getty.autologinUser` instead. + '') + ]; + options = { services.kmscon = { enable = mkEnableOption '' - kmscon as the virtual console instead of gettys. - kmscon is a kms/dri-based userspace virtual terminal implementation. - It supports a richer feature set than the standard linux console VT, - including full unicode support, and when the video card supports drm - should be much faster + Use kmscon instead of autovt. + + Kmscon is a simple terminal emulator based on linux kernel mode setting (KMS). + It is an attempt to replace the in-kernel VT implementation with a userspace console. ''; package = mkPackageOption pkgs "kmscon" { }; - hwRender = mkEnableOption "3D hardware acceleration to render the console"; + hwRender = mkEnableOption "hardware acceleration + DRM backend"; fonts = mkOption { description = "Fonts used by kmscon, in order of priority."; @@ -63,8 +115,13 @@ in nullOr (nonEmptyListOf fontType); }; - useXkbConfig = mkEnableOption "" // { - description = "Whether to configure keymap from xserver keyboard settings."; + useXkbConfig = mkEnableOption "configure keymap from xserver keyboard settings."; + + term = mkOption { + description = "Value for the TERM environment variable."; + type = types.nullOr types.str; + default = null; + example = "xterm-256color"; }; extraConfig = mkOption { @@ -80,33 +137,39 @@ in default = ""; example = "--term xterm-256color"; }; - - autologinUser = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Username of the account that will be automatically logged in at the console. - If unspecified, a login prompt is shown as usual. - ''; - }; }; }; config = mkIf cfg.enable { + assertions = [ + { + assertion = gettyCfg.loginOptions == null; + message = "services.getty.loginOptions is not supported when services.kmscon is enabled."; + } + ]; + + environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; systemd.services."kmsconvt@" = { - after = [ - "systemd-logind.service" - "systemd-vconsole-setup.service" - ]; - requires = [ "systemd-logind.service" ]; - serviceConfig.ExecStart = [ - "" - '' - ${cfg.package}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p ${autologinArg} - '' + "" # override upstream default with an empty ExecStart + (builtins.concatStringsSep " " ( + [ + "${cfg.package}/bin/kmscon" + "--configdir" + configDir + "--vt=%I" + "--no-switchvt" + "--login" + ] + ++ lib.optional (cfg.extraOptions != "") cfg.extraOptions + ++ [ + "--" + loginScript + ] + + )) ]; restartIfChanged = false; @@ -115,9 +178,6 @@ in systemd.suppressedSystemUnits = [ "autovt@.service" ]; - systemd.services.systemd-vconsole-setup.enable = false; - systemd.services.reload-systemd-vconsole-setup.enable = false; - services.kmscon.extraConfig = let xkb = optionals cfg.useXkbConfig ( @@ -134,15 +194,20 @@ in ) config.services.xserver.xkb ) ); - render = optionals cfg.hwRender [ - "drm" - "hwaccel" - ]; + render = + if cfg.hwRender then + [ + "drm" + "hwaccel" + ] + else + [ "no-drm" ]; fonts = optional (cfg.fonts != null) "font-name=${lib.concatMapStringsSep ", " (f: f.name) cfg.fonts}"; + term = optional (cfg.term != null) "term=${cfg.term}"; in - lib.concatLines (xkb ++ render ++ fonts); + lib.concatLines (xkb ++ render ++ fonts ++ term); hardware.graphics.enable = mkIf cfg.hwRender true; @@ -151,4 +216,9 @@ in packages = map (f: f.package) cfg.fonts; }; }; + + meta.maintainers = with lib.maintainers; [ + hustlerone + ccicnce113424 + ]; } diff --git a/nixos/modules/services/web-apps/websurfx.nix b/nixos/modules/services/web-apps/websurfx.nix new file mode 100644 index 000000000000..fc43c8d33e8d --- /dev/null +++ b/nixos/modules/services/web-apps/websurfx.nix @@ -0,0 +1,115 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.websurfx; + settingsFormat = pkgs.formats.lua { asBindings = true; }; + settingsFile = settingsFormat.generate "config.lua" cfg.settings; +in +{ + options = { + services.websurfx = { + enable = lib.mkEnableOption "Websurfx, a metasearch engine"; + package = lib.mkPackageOption pkgs "websurfx" { }; + openFirewall = lib.mkEnableOption "Whether to open the used port in the firewall"; + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.binding_ip = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + description = "IP address on which the server should be launched"; + }; + options.port = lib.mkOption { + type = lib.types.port; + default = 4567; + description = "Port on which the server should be launched"; + }; + }; + default = { }; + description = '' + Configuration options for Websurfx, see + [websurfx/config.lua](https://github.com/neon-mmd/websurfx/blob/rolling/websurfx/config.lua) + for supported values. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + services.websurfx.settings = { + # General + logging = lib.mkDefault true; + debug = lib.mkDefault false; + threads = lib.mkDefault 10; + + # Server + production_use = lib.mkDefault false; + request_timeout = lib.mkDefault 30; + tcp_connection_keep_alive = lib.mkDefault 30; + pool_idle_connection_timeout = lib.mkDefault 30; + rate_limiter = { + number_of_requests = lib.mkDefault 20; + time_limit = lib.mkDefault 3; + }; + https_adaptive_window_size = lib.mkDefault true; + + operating_system_tls_certificates = lib.mkDefault true; + + number_of_https_connections = lib.mkDefault 10; + client_connection_keep_alive = lib.mkDefault 120; + + # Search + safe_search = lib.mkDefault 2; + + # Website + colorscheme = lib.mkDefault "catppuccin-mocha"; + theme = lib.mkDefault "simple"; + animation = lib.mkDefault "simple-frosted-glow"; + + # Caching + #redis_url = "redis://127.0.0.1:8082"; # The nixpkgs build doesn't have the redis-cache feature enabled + cache_expiry_time = lib.mkDefault 600; + + # Search Engines + upstream_search_engines = { + DuckDuckGo = lib.mkDefault true; + Searx = lib.mkDefault false; + Brave = lib.mkDefault false; + Startpage = lib.mkDefault false; + LibreX = lib.mkDefault false; + Mojeek = lib.mkDefault false; + Bing = lib.mkDefault false; + Wikipedia = lib.mkDefault true; + Yahoo = lib.mkDefault false; + }; + + proxy = lib.mkDefault null; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.settings.port ]; + + systemd.services.websurfx = { + description = "Websurfx, a metasearch engine"; + + serviceConfig = { + ExecStart = lib.getExe cfg.package; + DynamicUser = true; + RuntimeDirectory = "websurfx"; + Environment = [ "HOME=%t/websurfx" ]; + BindReadOnlyPaths = [ "${settingsFile}:%t/websurfx/.config/websurfx/config.lua" ]; + }; + + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + }; + }; + + meta.maintainers = [ lib.maintainers.SchweGELBin ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index cd7d3b61325c..de66d01e1c09 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1177,15 +1177,18 @@ in ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix { }; octoprint = runTest ./octoprint.nix; oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { }; - odoo = runTest ./odoo.nix; - odoo16 = runTest { - imports = [ ./odoo.nix ]; - _module.args.package = pkgs.odoo16; - }; odoo17 = runTest { imports = [ ./odoo.nix ]; _module.args.package = pkgs.odoo17; }; + odoo18 = runTest { + imports = [ ./odoo.nix ]; + _module.args.package = pkgs.odoo18; + }; + odoo19 = runTest { + imports = [ ./odoo.nix ]; + _module.args.package = pkgs.odoo19; + }; oh-my-zsh = runTest ./oh-my-zsh.nix; oku = runTest ./oku.nix; olivetin = runTest ./olivetin.nix; diff --git a/nixos/tests/kmscon.nix b/nixos/tests/kmscon.nix index cb20274c6ece..1c67a16af2ba 100644 --- a/nixos/tests/kmscon.nix +++ b/nixos/tests/kmscon.nix @@ -5,7 +5,6 @@ nodes.machine = { pkgs, - lib, ... }: { @@ -13,6 +12,8 @@ ./common/user-account.nix ]; + services.getty.autologinUser = "alice"; + services.kmscon = { enable = true; hwRender = true; @@ -22,6 +23,7 @@ package = pkgs.nerd-fonts.jetbrains-mono; } ]; + term = "xterm-256color"; package = pkgs.kmscon; }; }; @@ -29,15 +31,9 @@ enableOCR = true; testScript = '' - machine.wait_for_unit("multi-user.target") + machine.start() with subtest("ensure we can open a tty"): - machine.wait_for_text("machine login:") - - machine.send_chars("alice\n") - machine.wait_for_text("Password:") - - machine.send_chars("foobar\n") machine.wait_for_text("alice@machine") machine.send_chars("echo $TERM | tee /tmp/term.txt\n") diff --git a/nixos/tests/odoo.nix b/nixos/tests/odoo.nix index 8bc768d13e92..258b42ad1cd9 100644 --- a/nixos/tests/odoo.nix +++ b/nixos/tests/odoo.nix @@ -1,15 +1,12 @@ { package, lib, - pkgs, ... }: { name = "odoo"; meta.maintainers = with lib.maintainers; [ mkg20001 ]; - _module.args.package = lib.mkDefault pkgs.odoo; - nodes.server = { services.nginx = { enable = true; diff --git a/nixos/tests/pulseaudio.nix b/nixos/tests/pulseaudio.nix index c7791090cedb..b3b0837b239e 100644 --- a/nixos/tests/pulseaudio.nix +++ b/nixos/tests/pulseaudio.nix @@ -29,8 +29,8 @@ let in { name = "pulseaudio${lib.optionalString fullVersion "Full"}${lib.optionalString systemWide "-systemWide"}"; - meta = with pkgs.lib.maintainers; { - maintainers = [ synthetica ] ++ pkgs.pulseaudio.meta.maintainers; + meta = { + maintainers = pkgs.pulseaudio.meta.maintainers; }; nodes.machine = diff --git a/nixos/tests/radicle.nix b/nixos/tests/radicle.nix index 21fc208d8255..e802be63e83d 100644 --- a/nixos/tests/radicle.nix +++ b/nixos/tests/radicle.nix @@ -120,6 +120,9 @@ in }; }; + interactive.sshBackdoor.enable = true; + interactive.defaults.virtualisation.graphics = false; + testScript = { nodes, ... }@args: '' @@ -185,7 +188,7 @@ in ) with subtest("bob can sync bob's repository from the seed"): bob.succeed( - "cd /tmp/repo && rad sync --seed ${seed-nid}", + "cd /tmp/repo && rad sync --fetch --seed ${seed-nid}", "cd /tmp/repo && git pull" ) assert bob.succeed("cat /tmp/repo/testfile") == "hello bob\n" diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix index 92d99e6a37be..240c1392f4d2 100644 --- a/nixos/tests/sway.nix +++ b/nixos/tests/sway.nix @@ -2,9 +2,7 @@ { name = "sway"; meta = { - maintainers = with lib.maintainers; [ - synthetica - ]; + maintainers = [ ]; }; # testScriptWithTypes:49: error: Cannot call function of unknown type diff --git a/nixos/tests/vscodium.nix b/nixos/tests/vscodium.nix index 7cb0871ac9bc..51c294d432e5 100644 --- a/nixos/tests/vscodium.nix +++ b/nixos/tests/vscodium.nix @@ -41,7 +41,6 @@ let nodes."${name}" = machine; meta.maintainers = with lib.maintainers; [ - synthetica turion ]; diff --git a/pkgs/applications/editors/eclipse/update.sh b/pkgs/applications/editors/eclipse/update.sh index 92a7814a1307..75d75a9c4c30 100755 --- a/pkgs/applications/editors/eclipse/update.sh +++ b/pkgs/applications/editors/eclipse/update.sh @@ -1,31 +1,31 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash --pure -p curl cacert libxml2 yq nix jq -#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/3c7487575d9445185249a159046cc02ff364bff8.tar.gz +#! nix-shell -i bash --pure -p curl cacert nix jq +#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/5b2c2d84341b2afb5647081c1386a80d7a8d8605.tar.gz # ^ # | -# nixos-unstable ~ 2023-07-06 -----------------/ +# nixos-unstable ~ 2026-03-16 -----------------/ set -o errexit set -o nounset # scrape the downloads page for release info -curl -s -o eclipse-dl.html https://download.eclipse.org/eclipse/downloads/ -trap "rm eclipse-dl.html" EXIT +curl -s -O https://download.eclipse.org/eclipse/downloads/data.json +trap "rm data.json" EXIT dlquery() { - q=$1 - xmllint --html eclipse-dl.html --xmlout 2>/dev/null | xq -r ".html.body.main.div.table[3].tr[1].td[0].a${q}"; + q="$1" + cat data.json | jq -r ".releases[0] | $q"; } # extract release info from download page HTML -platform_major=$(dlquery '."#text" | split(".") | .[0]' -r); -platform_minor=$(dlquery '."#text" | split(".") | .[1]' -r); +platform_major=$(dlquery '.label | split(".") | .[0]'); +platform_minor=$(dlquery '.label | split(".") | .[1]'); -year=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[0:4]') -buildmonth=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[4:6]') -builddaytime=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[6:12]') +year=$(dlquery '.path | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[0:4]') +buildmonth=$(dlquery '.path | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[4:6]') +builddaytime=$(dlquery '.path | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[6:12]') timestamp="${year}${buildmonth}${builddaytime}"; # account for possible release-month vs. build-month mismatches diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix index 2a72d84c47f7..eb73e89aef5f 100644 --- a/pkgs/applications/editors/jupyter/kernel.nix +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -93,7 +93,7 @@ in meta = { description = "Wrapper to create jupyter notebook kernel definitions"; homepage = "https://jupyter.org/"; - maintainers = with lib.maintainers; [ aborsu ]; + maintainers = [ ]; }; }; } diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 3e9ae0a999a5..722c16fe26b7 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.1.77"; - hash = "sha256-fK1Exshw1mRV1S2DXjza01YaExGVeY371aXNTNlhhfE="; + version = "2.1.78"; + hash = "sha256-A8i7yU4W8Fjp1h7EFZKAEdyoqoKBVzJDvEZ+Y06dBXg="; }; postInstall = '' diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 4af654ca2f43..5109e3c4a995 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3552,8 +3552,8 @@ let mktplcRef = { name = "vscode-just-syntax"; publisher = "nefrob"; - version = "0.9.0"; - hash = "sha256-+9OZ8sRYK9D/JiI+cR1BajqrmLqnOYvrwTIfOaPnoq4="; + version = "0.9.1"; + hash = "sha256-yl9v4sL1yWzKwE0MIk7BeAd4/FkLmxQaW5ENb8UVNIU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/nefrob.vscode-just-syntax/changelog"; @@ -4185,8 +4185,8 @@ let mktplcRef = { publisher = "shd101wyy"; name = "markdown-preview-enhanced"; - version = "0.8.20"; - hash = "sha256-+dwLuqtEYirQaw/tuG5m5Ugk0crKQQZM43TmslJsBBc="; + version = "0.8.21"; + hash = "sha256-w0LVLoNTTubzfxFT1AQ9++k5IP8FQw1xVOqyA9Y+6W4="; }; meta = { description = "Provides a live preview of markdown using either markdown-it or pandoc"; 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 2ccd20b5240a..4efd16906d06 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -14,19 +14,19 @@ let vsix = stdenvNoCC.mkDerivation (finalAttrs: { name = "roo-code-${finalAttrs.version}.vsix"; pname = "roo-code-vsix"; - version = "3.45.0"; + version = "3.51.1"; src = fetchFromGitHub { owner = "RooCodeInc"; repo = "Roo-Code"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZWt2R50yFxUHDJ2jrkMKaNoWUD6mSNm0ucq/FXPC2VE="; + hash = "sha256-HpLL466mzDvNf7twW0a3dDUvgveRm0tbCOXGymTW+tA="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-QAzk+aXdCtQQ/KEoqGfn5j7l7Gx3HDvlL3aO+81hABM="; + hash = "sha256-Q97MDHl22lIF84/J3UW53dCD7oaN3Y6R32xhjRDBmpw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 97b30859d993..1acb16091c73 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.71.0"; - hash = "sha256-TzEydphPZ/OmIRJYslFJuk26f97mcIukPDS0WUxMOt4="; + version = "3.73.0"; + hash = "sha256-gPB5/CUw5GQ2jIQzRQ4/osJOkEHDsGY8ATy9lTfBwW8="; }; meta = { diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index ad8d71d371b6..07b6893661f5 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -116,7 +116,6 @@ buildVscode { license = lib.licenses.unfree; maintainers = with lib.maintainers; [ eadwu - synthetica bobby285271 johnrtitor jefflabonte diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 9ab9f1b8084e..c3d253da3c70 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -81,7 +81,6 @@ buildVscode rec { license = lib.licenses.mit; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ - synthetica bobby285271 ]; mainProgram = "codium"; diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index 49c475a2649a..45befe869524 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2026-03-10"; + version = "0-unstable-2026-03-18"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "ab1ee21996b78aaac1f82baa390990c8ce9a9936"; - hash = "sha256-mzK+ADPTFCxiPxQDw8CtwJEW0nrX+ozUosV0N/jeMHk="; + rev = "5f6b4daf61ed8f005f759236ea363fa8ee7a1d08"; + hash = "sha256-DNsNmtse35Bv3QxhJlYAFe3D0VRhSn2svwfiF+bgxxA="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 3a326c5c9eba..98fbc15dd0d8 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "146.0.7680.80", + "version": "146.0.7680.153", "chromedriver": { - "version": "146.0.7680.80", - "hash_darwin": "sha256-sjCEvFWV07GNhXJ9CfGVtZ6nCeqsqtNtY4sPj/gq13w=", - "hash_darwin_aarch64": "sha256-kTxZJiF7mJlVbkDDFP4ZUB2htBn45se1Wuz28RP8pr8=" + "version": "146.0.7680.154", + "hash_darwin": "sha256-jSAe8mkJ0mDqKJyzsaAuGwyG5lwdOHkYDUgxR2G+vJE=", + "hash_darwin_aarch64": "sha256-tCMADPY/Q2sjyHUvZPO9o+ZkLaZ7iTCLrTiPVUYVQr0=" }, "deps": { "depot_tools": { @@ -21,8 +21,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "f08938029c887ea624da7a1717059788ed95034d", - "hash": "sha256-PCQeTdc6Fl74TLyvxjli4scIUIm0GgZ3e9wbC18Tclw=", + "rev": "85fd829a1b2049479ead5ed578f5ed105a094fe4", + "hash": "sha256-PshNuKAZBXohix711YGjE4X24ixVW29wxgeePNE9Xzs=", "recompress": true }, "src/third_party/clang-format/script": { @@ -92,8 +92,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "1d3190bf5633327395d694d621258978d989dffd", - "hash": "sha256-QVtTxBBox8fiqTj0gjqvYx6HoBSlvuWIe5ki4iCQl08=" + "rev": "e05753c6d05b17b23d514038957469c70b75475c", + "hash": "sha256-SMym7PN2acfw84Z95xWSbN/QV5UIDIOztWxFeTCfBsk=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -132,8 +132,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "c46c81b25577c40de6e7e510743ae0454e0c8351", - "hash": "sha256-Duv3kNulPtVxCLPa3bFIev64O9Y4ObJP/IZz31oPJ0E=" + "rev": "3d52cfc8dd0bc2cdbbecd9803cc08102de7e4597", + "hash": "sha256-lyAG9tKBWQ2yy/morStUd0ZKDPT58t8516NDCQG/jZs=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -422,8 +422,8 @@ }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "4018d3b63456eb657475e66c352bfa86f321e0f5", - "hash": "sha256-RuCmzPIR6hW8znjQH4kQqSJmIIJWtMkUQjYEVn3B9AE=" + "rev": "446588f90da2e3372a9352d3b2ba8ab3f342c8ce", + "hash": "sha256-hLddZzWBQZ/MEF5fcCiju5ibNPSb+zhahlxdLaczdsE=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", @@ -602,8 +602,8 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "67cf48602b0c8aaa9807cd185212ee078eb30b21", - "hash": "sha256-jMoYwf63C0IHx/QcOT+LKCCYN3dJVUhC5COukkhwqx0=" + "rev": "bccc616f83aaed08f65d4a707dfe00e24133772b", + "hash": "sha256-yfjXNWczeGwPlnAVB161OsFXiHms2IRstqKmoZ/AWFU=" }, "src/third_party/perfetto": { "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git", @@ -652,8 +652,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "248acd90d9a35ac46b2ec30201ae50f301b8a173", - "hash": "sha256-zOL5j9X72ZvYmS8MzQ+pqSkT8AWBz2IwmaH7I3LN1IE=" + "rev": "3c7c530c115124b415c1f4e0e35694fbaefd2177", + "hash": "sha256-ObLypxiOKH/YoLw6uUA4MmHM44vA8iPhNCEfFcwip0Q=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -787,8 +787,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "d1972add2a63b2a528a6471d447f82e0010b5215", - "hash": "sha256-evtOzxwWgKUaJl9zwpQDqPp1wM7w3DzjRcLg29z9ELQ=" + "rev": "b2a90ac0037ee7187102ce2c40e5007216ca9a58", + "hash": "sha256-rX6NEN0RbfHPRqJqkGhypwWt/NcREvPaanL+CDxwhA8=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -817,8 +817,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "70253f966a7c3936f5a5ff57c6a4a4face1f16ad", - "hash": "sha256-8tA9nWXsiQ2Qt7pbALrhsnNFHOFLw/wlcz5OrFjYEI8=" + "rev": "abb5d7b829d60a5dae46fbcee0e9d0d554d3a946", + "hash": "sha256-hnwiRarq+69BECxJ9FQD0XGqqA/OF66RxZUPWTzDaFE=" } } }, diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8f100dfbe2a9..c84be0cd77a6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -310,11 +310,11 @@ "vendorHash": null }, "digitalocean_digitalocean": { - "hash": "sha256-CNHGuChMDqSFz8YXETfQzgyQw8p8Ua6u3gevFFr69RI=", + "hash": "sha256-QUx+pSj9FyY0+IOUcmBS32qEOgDAGxeQRcio6lQOGN4=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.79.0", + "rev": "v2.80.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -842,13 +842,13 @@ "vendorHash": "sha256-BxMhu2gcRuOlYWgx5ZOUBGdfB28+87SG1T/KAPDyei8=" }, "linode_linode": { - "hash": "sha256-trwD5gL/zVa82URY3zxKYN3UM2ZjvQAXBS0O6bfTVNU=", + "hash": "sha256-i2zAB/3cDOex7j2WciKlRlYfOyhkixEHYbTkoCG1u9s=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v3.9.0", + "rev": "v3.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jytzC7dzoadOXIMv6eSHS1KP0KmgybWKzYJibPTcsoU=" + "vendorHash": "sha256-HzBj7TSjiv/Ov10KOt5V4oQaKK7CKjBjxpSrhmOl1lQ=" }, "loafoe_htpasswd": { "hash": "sha256-1o2kgeTFxegzOgGXWP4OYZ3uC3WbAkCXPqScMvVpHr0=", @@ -1193,13 +1193,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "selectel_selectel": { - "hash": "sha256-/1s3TQK8EkM7WgHW77a/JGsCemiustIwlLAam9CZpiY=", + "hash": "sha256-oY2cSjoOXpDjmKSQKzx8yQhmX69diSgN1mJPR+z+hA8=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v7.5.4", + "rev": "v7.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-QdfBhTY7HwPqz9qm7KE0OL4ACOWiU8gLOKKdFbMrAro=" + "vendorHash": "sha256-mHf4ZG0hk/YTofuU80sVl1g78P6T+sbBMuPenE8uGQ0=" }, "siderolabs_talos": { "hash": "sha256-9VL2aa6wZFAfQ/rkfMKwWdDU9Vs6GwZzsvQpUfm7rME=", diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 0c67e633499f..6ca0720d6347 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,797 @@ { - version = "148.0"; + version = "148.0.1"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/af/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/af/thunderbird-148.0.1.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "2a1d74d4ba89b3023ad564e554c53bd54c05d2d2c8be2da823ecc3649ac096e0"; + sha256 = "452285eb74233e9775652bc3813472828dcd44d467ae6d4b16a9c7cce39c082b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/ar/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/ar/thunderbird-148.0.1.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "d06e89762e25fe3cc6a30c4e80f83c27a36f6b9f4417d7cda2d98143b7be59b3"; + sha256 = "cf72bfce85d9b38c6fcc71e426deffb603d1e3def18deaa1bec428fdf801ead0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/ast/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/ast/thunderbird-148.0.1.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e88c7ee32ee7e4ceb8723c0b5421b98776150c24f50c7fe873080f726e83db1c"; + sha256 = "55cf6c32186762059895e42a1c7c7cd5bcc7026efefc6eec51a09a91e8192a6f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/be/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/be/thunderbird-148.0.1.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "f3fd14c9fdfee48c6d63acde7bff6899c73cea1d57fe3291b7b39190d63b4290"; + sha256 = "35168b179085fb4e64a67c98d5283173941b74116ce668b515bb5ec6a97eb8bf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/bg/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/bg/thunderbird-148.0.1.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "85c862a8615c0bc819d05964ae5fd0fc3d7230c0ccc5d11b2b8646205752f5e3"; + sha256 = "b71369ed4c637f72d2e143e89f7dab72e70ad7759633947c69489e146bebe72d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/br/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/br/thunderbird-148.0.1.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "88704a97e04e80b32ee51ab0a5ee6dd5720619896b3209fa89d65a9ce51ab80c"; + sha256 = "db2288d18d25b157948901295cf1a4a42de4ed9b3458283ecfc93b6e1fcc1d78"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/ca/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/ca/thunderbird-148.0.1.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "87ea0060be5ee44a89d6233f6825eb77f375cfbf5d46019a0c8906537aadd0be"; + sha256 = "501d5d84eb25513b2aac8c4a2119b5968a1faa4a29e26c2ecd12923c5fdb0e25"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/cak/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/cak/thunderbird-148.0.1.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b9f1431b9569f4395cb956053079373827a9e893b6517ae0b07e37bb5a9c5a95"; + sha256 = "ca2afefe0635ffca10938ce467e93893cbe90b6294ba87dfa8096b5ab29ef2e1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/cs/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/cs/thunderbird-148.0.1.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "3ba27f649cdb363bd8c891450700203be79ac2f66ccedb1247e42d65354cc5d6"; + sha256 = "f65660542e9dacc05f64ff5a3bc920a5377814b409c5c3116ff432b7c2cbfc71"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/cy/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/cy/thunderbird-148.0.1.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "76523a4bc737dfa8d83e8b27f41ab0fdec3d9aa93fa38fbaa9568eb0b366db1a"; + sha256 = "0e80e40b32de26d50a492b12ea390acaac2af1bd78d03baf81127b387715d7c9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/da/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/da/thunderbird-148.0.1.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b966262c91e40caf2e347ca85b1fb4753ba8ccdf9a1a3444833ee743a0b162cf"; + sha256 = "f4f6f6554d2eca53346d5fff4804cbde7038620005ad01cb4ce2f8c9b298dd51"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/de/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/de/thunderbird-148.0.1.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "1b58d273f2238ae168837fc446888281af605360b3a4c304ea98d46a768cc579"; + sha256 = "95651cb1ce8626173619a0087cfeb7ab9d5e790df23582857166818e95d0cce3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/dsb/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/dsb/thunderbird-148.0.1.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7875af0cae15688ac45f0a206829239bf2ae17c5ab3aea447dc17a39ffa1350b"; + sha256 = "cbc87d7ed92ad1cf3a1e9552856854de68441360356ec691e2c8bb7a226f315d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/el/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/el/thunderbird-148.0.1.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c178f298cdee9cc2c9c4db8cc0a63ddd0262aa65bdbeda34159008672bda600b"; + sha256 = "1ef60149ba01eb5d3ab9532c544bde19fddbaa45b8aa6241e4b56e30169bcb7f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/en-CA/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/en-CA/thunderbird-148.0.1.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "cb88c31f081851ede374d66d4d7d2a3fc4e6165af665a4ad68451d7a8d120474"; + sha256 = "04b68817c67478537ed58bb27fb34b2c6c58802378c362074d812dd626917d27"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/en-GB/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/en-GB/thunderbird-148.0.1.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "9e13f1df2060e2c5f07ef72371b64fcae9696db738d22a0d926cef5d8eda8c4a"; + sha256 = "6edf076a07588800675d21cd97b91ef84745aaeda55163f07c078ae5e02ec81f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/en-US/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/en-US/thunderbird-148.0.1.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4e771f1e6049421887ef2397021ebb79550d6521c428b106174f15f08f9308ae"; + sha256 = "e22ab5e97d1ed20b21aa583d72fa906832fccb9d0e5655eea03c7932f92d4d25"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/es-AR/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/es-AR/thunderbird-148.0.1.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e625359901a8d77d1aa03520a515200fe651593bb1b1dbfa10c512920761af1a"; + sha256 = "92d3f0fe3d83eb1f15cb516268dfde2a010f9cb2a2a8f96b4d0fbd5fee13b38c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/es-ES/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/es-ES/thunderbird-148.0.1.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "69711a5a6da5752c1c853cbab3e4c2b3211ffc5a266ac4a496e4a1c66c5a0c39"; + sha256 = "1d904845434c3f7bf1a5f78729053e64f9f8a734803ae86b8f86ddb91ff677c7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/es-MX/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/es-MX/thunderbird-148.0.1.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "46c3ea3530039db77f8222a819e3a4c636a1a2a52afafc1bcd8a1ed90339e743"; + sha256 = "5ffbc240cad1883940b01ccd3290672c5ddb32cf89d8b3561d57ca851bd1078d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/et/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/et/thunderbird-148.0.1.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "287517798743c8fab465be863f155ad4ad4517a5f32937ec109c4ee72b7839c2"; + sha256 = "802a1c89f1ee330fc924a35a325490fd53b2956749dc671dbc219edf549e836b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/eu/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/eu/thunderbird-148.0.1.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "179765eafbaaf12e79688526ccbd105ca369d25bbf92e31569a85a7c4d064bbf"; + sha256 = "df741094e1b536395e960075a1a059ed285fdeec0be66c8c09a441bc57a81f5d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/fi/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/fi/thunderbird-148.0.1.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "1d24574c9825f6be59d74dde872543c44c03f452916e2055393e4b632afec9d9"; + sha256 = "a7993d9282f72ef9d84acaf44db1c206bd291ca8c30617851fd2c4587017c5e7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/fr/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/fr/thunderbird-148.0.1.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "87ff05f3b35d605a7ea4040c5ab9d87769a385e74cdbeefdbe45d345c0a0bf39"; + sha256 = "812139f24778a7e58c5c1840c6f969159d4cea59b6d24004eccf6f67310d4bf1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/fy-NL/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/fy-NL/thunderbird-148.0.1.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "a6143896f0dcf56d0410783999685e233aa901af49b112ca21dd08e206d1c51b"; + sha256 = "ba543d0cea5d3953056fe0114aa09444971b8db16dc465d6bcc459f07ef1dccd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/ga-IE/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/ga-IE/thunderbird-148.0.1.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ea11f36c27bd74d4be54d31d351f042d0b976b7b12cdc2d972917be14c4b1680"; + sha256 = "12b5218ad5ffb93894e70cfbda2f8b54d0eb15d8b83d3a60a52ad6d7962eb45b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/gd/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/gd/thunderbird-148.0.1.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "fb9142a4daae640256cc80b47e18cdf1d382b4863a6cb69586be0f7eafb28d62"; + sha256 = "54b9f126c19e1e864b6daccc02571458bafd161d39c99d03c29ef3a1bb52b1d1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/gl/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/gl/thunderbird-148.0.1.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "27be097c81fd2856e43b9b888cacb8fcb6ffd0c43b5125778068dc519f6e19da"; + sha256 = "35c788c302067571f90de49b471f97cc2cb48d5d667f2bf1eb84dfb3c6d51b15"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/he/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/he/thunderbird-148.0.1.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "962cc77013c76040f8f4058dd5859e2105a5c460d7b9fb82f5f34f9bea4ebec9"; + sha256 = "13d4b1e68c650e5f6140e42813b9daac7ed449f5ba906b827b8c491fe753fc90"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/hr/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/hr/thunderbird-148.0.1.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "cb56697c5b1a16172b04e9e8b05f582fe465e317a99f2f83a6707959b6015844"; + sha256 = "f773792996626c552d1d1cbef6ec0bdce7cf59523a5b83e5d1a6f7c2d336c0c9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/hsb/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/hsb/thunderbird-148.0.1.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "9356469fb9e9b4e102e42fd31084f4b22ab30862fbfb91e138ba7657acf3ad11"; + sha256 = "6226b53eed067c7bbb683ef39fe322bb4eebf25c71cdcbb363d6d30934b4cae0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/hu/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/hu/thunderbird-148.0.1.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "51162f84cdf426c8f54f5a119c09f964c81b55fff81e591c6c2624c7fd9742d3"; + sha256 = "4b2dca124f862cdadc3f020ee87544b73d8b5599f48090a37b62aaa728aa19a5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/hy-AM/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/hy-AM/thunderbird-148.0.1.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "aa4406777c72ff3a316ba458e1701f7696abd443103c02213e3fdfcb2c2092fc"; + sha256 = "c81e1c94485ee5be53943dd7ae625daa51e979096c36dd9842a1b2615eaeb9e6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/id/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/id/thunderbird-148.0.1.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a9d6e9745db7ec964e2a5405a3068cd2b0929118ec08af0bdaedee01827af0ed"; + sha256 = "c54fcc0b0d3e3859029956555b063cc9a73c766e72a3300a891b826a158f402a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/is/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/is/thunderbird-148.0.1.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9be05f69eaed79e8424df0a1fe8fe3c0789fd647ba9ca2df942e695371c2feb8"; + sha256 = "5ef1a371824713425cab9be4970f7b02d37ab22dd9e4aeb38efa04ef5c134f0d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/it/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/it/thunderbird-148.0.1.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3dcb2a561b158a3ce2c845b03c7de71da15d050423d7c6c78aebe00269819240"; + sha256 = "313335de72b2a88cf2269b534e6884795216e64ee1750347b82a61ab202abd24"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/ja/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/ja/thunderbird-148.0.1.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "24a180d9bab9dfaa3d0298137123e0d3ad59660b44bc2bac40aa99dfa6aa8b47"; + sha256 = "385feb6e38cb2243d59a7d4494ed06acc336bfd35fd7d4f2a456f531606b5712"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/ka/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/ka/thunderbird-148.0.1.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "3e04037c5883eee58e85a4b8d05a55172f7b020653c33f6bd5640b7d4b587045"; + sha256 = "4b83ff7771fad33a949dc202fa3a007535354c67d115c4765a966178c6afea3b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/kab/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/kab/thunderbird-148.0.1.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "94dd12883c626f41b0b358ecd9dd914fb84ea9126c33e0bf1853f7d62232e245"; + sha256 = "5db313ad933ba271eadde24c42f518001303ba538de3f7e72df182cdb7989b8a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/kk/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/kk/thunderbird-148.0.1.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "9b7c8ba6538c90229275b7b634a9e23ec6391a4ecf47eb243f50f363c5c6b7a7"; + sha256 = "098d2e9b6cfdf4024ed167410eff4df1b60a9cc6371fc819c43e8fa55e6ad1ac"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/ko/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/ko/thunderbird-148.0.1.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a1ff73d57842c2429b3fb95b8cc5fcb2f779dfdd456f8b630c2daf38d5771bed"; + sha256 = "7c9dda6fb8a17c53fb16931aa05a02cd9d9765db33f9728e27238493ff67bce2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/lt/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/lt/thunderbird-148.0.1.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "7cc673be6450933b380039a87639afc7ee8bc349ef29e80629655b68d7a98760"; + sha256 = "39dcd64af689688edc3fd51b0b640f3fbc0f547934e4bc3b3b7810e57b30c15b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/lv/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/lv/thunderbird-148.0.1.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "a78a7f4426610b2f79eeab6ffd13396f74c6fa0e23cc394f6ced1ecb6b0a3b54"; + sha256 = "868f3061c03fb32ab69e50633ff1f5c493a58783287775526facfaa57c3f6ab8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/ms/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/ms/thunderbird-148.0.1.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "7a3fb2bfe1031dd888bc1d1760a189716202e6ae9d2ddeef1ff496829084a8e6"; + sha256 = "872b7bd0d4b411dacd9f633e153b4629cf412541c4ae21a033539fc347ff36f9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/nb-NO/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/nb-NO/thunderbird-148.0.1.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c595f08cb485c7fc5bf82134c700161ca0617feefd57a1a9a71bcd62e7e6817d"; + sha256 = "10be343bac76cbb7bf9ca67f6cbd3f5425ee0eda6b7e9a567159546e5760ee13"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/nl/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/nl/thunderbird-148.0.1.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "8665add542bd8b7bd73a2e435f7aa5b0984d867ddaabfb17255e93eb5dad6d91"; + sha256 = "89fea21a2fb9c1339dcde75b75bd37de91a2a2634d024886988741b44438dce0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/nn-NO/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/nn-NO/thunderbird-148.0.1.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b85c298b67484f6c520a9d8577b86927165fd7c68e20885532791a4839c45138"; + sha256 = "7d96e4fad093df9aa4186bf3c9910fc88bbcf14553016d0edafe845b072f976c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/pa-IN/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/pa-IN/thunderbird-148.0.1.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "cd16ce0449e445a99a3706fd1b8d3c9d66c23537f0afa72aba78adb413e93ef0"; + sha256 = "7fba3ff598436f28d742abc4e6df4b51967a9149168df8aa257c7c4b4a8043f7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/pl/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/pl/thunderbird-148.0.1.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "510f7c9a0b1b5725975140a3696872270d1a78a951a6adf9ad53720c78163202"; + sha256 = "e65b936d427b17def458bc93d02462d6031d55a91d4214e9a9253ceedbf638a5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/pt-BR/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/pt-BR/thunderbird-148.0.1.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "d4e88bac104a595eda7e5df90ae73dce5a76c9dd69ee0f85c7c8c8ea98f1ec0c"; + sha256 = "4bd860fb707774a557987c051694388f158570542846bc14503806160adf85b6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/pt-PT/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/pt-PT/thunderbird-148.0.1.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "36368c81d1f4715d5400a7be046f9e7f6b4212fc49833809aed65d425ccede19"; + sha256 = "68375fa59a6af99ba072606d7d7c63048174b946bcb01e72924aa48311f5eb2b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/rm/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/rm/thunderbird-148.0.1.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b92bec0a32d85069500e6bac4dafa997492e1ff6753e4b9fa45e046d6eb9c445"; + sha256 = "75cb0a8111652bf92fcc7fe7f1514c5295cfa478beefdf17a7c892b760004d13"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/ro/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/ro/thunderbird-148.0.1.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "185c69a6a1008da59a51d0c609bea006a1bb120872164edb06b7f61a051e9800"; + sha256 = "31e85481c695fd8bb6a7dd06d7067ada7f3f778aa4e0a187efbef068187a3f40"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/ru/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/ru/thunderbird-148.0.1.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "bc36858362e7722a1a46486a92ae49c1987970690f5d86ab6d673b904e0ec468"; + sha256 = "637ca9e8241759ca086ce996eca96fa74479a9e4c46fa0bd4ef3811931a3d00a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/sk/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/sk/thunderbird-148.0.1.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "be4c86d573d9fd030133d0a3e2fd72bcd6ac2007d7c7a7702dd9a7bc7e1f3d4c"; + sha256 = "ea525cead16f814dab9539f221d573793e253fd38c8d3b6cda34726808afa68b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/sl/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/sl/thunderbird-148.0.1.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c545b8953cc3cb504efca6ca3823b4270f7d554eb02ae188ec6825623bb57ad8"; + sha256 = "e268eb305154ce6d36c89570fa8e349e5073f27d86f82410e5a303f0cd483e69"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/sq/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/sq/thunderbird-148.0.1.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "bfbadbc7d17bfc67d5a69663ce922264a4e1c798a9ec4083208bfe4f9a9cfbe1"; + sha256 = "d66e4d5785940914de12946e512baafff7fb0cef1a3ab284128be035d606ae85"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/sr/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/sr/thunderbird-148.0.1.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "89f8a7bcfdd9ed8cce492414c2b2522841796def04a557aafa36383adc3260e9"; + sha256 = "20eb73f689c4f46fb76bbe4a2428a96bd760d553cd392dd9c26f71eb3691ae3d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/sv-SE/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/sv-SE/thunderbird-148.0.1.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "da5c9b115cdd9a987d3c1215d6a25a301a2dac65354ba69d20393a51b33034a5"; + sha256 = "af37670b3049dc03b451d5d3f5bbd31b6a47fe2fb5e0861377c34f900ad49185"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/th/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/th/thunderbird-148.0.1.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1a5359bba691746015b9c9b5208d5653e42105c38b5c627b4269a1b598646adb"; + sha256 = "a42416b6af640f98b33fac06ae6f7bcdc499c3bfb5713a52df659afe8edd8759"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/tr/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/tr/thunderbird-148.0.1.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "436c05db002b57d79ea5d6d52cbd05bbd6e77c923e7f7dc7ac7963cc61cd54ef"; + sha256 = "89c297c77d753a342b1d59a019ad83d9cc8b26abdbc68fee05b35cd20a290a80"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/uk/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/uk/thunderbird-148.0.1.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "f3cb488696fc569e988a253c6470597c536feb5eda96649463b0b85a54e73e59"; + sha256 = "d6b248cfcb4300af21d1e3b15a8cd958aeb6b38c519bca2ca6492f4e50672c77"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/uz/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/uz/thunderbird-148.0.1.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "880666135e1591a31fda93f7bebe8a06b8dead391a62aba66e5d4fd749fce11d"; + sha256 = "dc7b26a2c9965fb0c0f6c3186e9bc19b1839ad787fc5a088cff3342c8bc19c85"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/vi/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/vi/thunderbird-148.0.1.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "5fe345b5fd9f3278a70e86c65093f885d625242220ac681f1118805a0b866c88"; + sha256 = "deca8678c47bde5e5543938613cba54f29e8a669b3b160d4a670942786c86ff0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/zh-CN/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/zh-CN/thunderbird-148.0.1.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b95f0e0b0b0d839ddcadc85cb4cf407f1dbbc8c534a1daae030b0cc8d54746ee"; + sha256 = "d3fac07d2e20825c52771b291ee6945ca17b04a49bc277b85f2efb9b23f39a13"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/linux-x86_64/zh-TW/thunderbird-148.0.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/linux-x86_64/zh-TW/thunderbird-148.0.1.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "0b5efb7ddd12c38fdd424f47e5168ad4bfe0614f6295f851720e04ebc78a328b"; + sha256 = "f62cd6f7e05a713e95a337537b9d8da48fe6158e69956af3bbe12a88b9f25e8b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/af/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/af/Thunderbird%20148.0.1.dmg"; locale = "af"; arch = "mac"; - sha256 = "2e698152ddefae5f2426062fc135a5ca60c93f274867eba342ca266cc0c213b8"; + sha256 = "35526c3cec825f03e85d7f05209a34556487f44fc16b7fef6990c7b226dff16c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/ar/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/ar/Thunderbird%20148.0.1.dmg"; locale = "ar"; arch = "mac"; - sha256 = "ab00b44b50fa77bfdfb53d83ed1d5935e146e628294dcdb6de0476c490cb3a2f"; + sha256 = "9bb4015d17581c49e623d7110667f9f31d0cbbb89840016f8394e93211113e36"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/ast/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/ast/Thunderbird%20148.0.1.dmg"; locale = "ast"; arch = "mac"; - sha256 = "df43e5e7c7a21c88682da9cc65bc3ecc98cafebac65f6aad62a7e4c9212d0a7d"; + sha256 = "60345ac71cdf38b99b8e230255d6f57a480d91180319c1b94eb26f5f5480abc1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/be/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/be/Thunderbird%20148.0.1.dmg"; locale = "be"; arch = "mac"; - sha256 = "2fd0ab9dc029f9ca6073395c67267c65b960b5ee3bd075d4f1fb327f40e6ca26"; + sha256 = "bc8f226e1ddb42b7a02b38ffe01321db8f626d11edff37a4ace2d7c8d9dc0c2b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/bg/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/bg/Thunderbird%20148.0.1.dmg"; locale = "bg"; arch = "mac"; - sha256 = "a4fc056244e20e7c58183709335d23d740fffe70b0fc627d21a1418e12a1ef02"; + sha256 = "41523d3f75bc331a9f35b011ad1dc42d234f55626d50cfd4f3db71456690c94c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/br/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/br/Thunderbird%20148.0.1.dmg"; locale = "br"; arch = "mac"; - sha256 = "e3962a0c3cf24dcf67349c9f3f26b8fc41abca62c28146d39e39f65f190cf15a"; + sha256 = "edb87fa82dd3281a54f781e4dbb91b4b66582e8ddc5e05a6e55fe29bb7274ff9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/ca/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/ca/Thunderbird%20148.0.1.dmg"; locale = "ca"; arch = "mac"; - sha256 = "e33bcf089f9c93826fcdd7acce7047adfafe751eda391761ae2878f1eb2c3dc1"; + sha256 = "6f9445db0e1afc4769f54c7009c9cec52d00c7c2ff3bdc6c6528d07cfea77867"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/cak/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/cak/Thunderbird%20148.0.1.dmg"; locale = "cak"; arch = "mac"; - sha256 = "f6b950b40e5c053784f563d5f1fbf6f5f050435fa42134d34f695b2535224019"; + sha256 = "fea52eaa6227594ca5ad6dba694001ae1d72909716b7f5946446c9c4998648fe"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/cs/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/cs/Thunderbird%20148.0.1.dmg"; locale = "cs"; arch = "mac"; - sha256 = "3699cafbeda437684f418fa9c88a58b5d3b67fdb0a568a4f6207342415b9f381"; + sha256 = "5bd0090ad793e766672c984f04e0cf8f9c53a5fe67ba5f76025090499656b4ec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/cy/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/cy/Thunderbird%20148.0.1.dmg"; locale = "cy"; arch = "mac"; - sha256 = "fb324678585a6e6b09dcb21632347be40cf59b8c2e7ee5292dcde4a40326d800"; + sha256 = "437a5b1b81fa338f02d75e540af447543bf89d8dec79dee83c41d8251b33e1a9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/da/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/da/Thunderbird%20148.0.1.dmg"; locale = "da"; arch = "mac"; - sha256 = "8ad9479268d19b2f41fbe2693221ed959a585432bacdd36516bb40492685b624"; + sha256 = "a6bc685dc64849ba6661492a50b6f21d6b354ef71257d3e41d7b9c3cf1f6adcf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/de/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/de/Thunderbird%20148.0.1.dmg"; locale = "de"; arch = "mac"; - sha256 = "07fb1638a4c1652ed4be351e0b5542fd43eb1fdaf731e5b22ff44a644bf2f6dc"; + sha256 = "17ed921402904770512effeb3818e6cb874f198fd2a66a1e2c4da3c1c5c164cd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/dsb/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/dsb/Thunderbird%20148.0.1.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "40bf5750c5a56f8b49568ebbf945fda7e424f7d275f4b39368dbe5b474094b4e"; + sha256 = "65284f2340da6a6055a5a47755a9c1a29ec97300f24b301c0579ce65f4a957dd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/el/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/el/Thunderbird%20148.0.1.dmg"; locale = "el"; arch = "mac"; - sha256 = "480da8df2d2b3c23a9924d841117aa8636c3c3c29af11e430ec7358d66ca8344"; + sha256 = "441f7187cebf2a31ac598254d8fe85b97fef05039bca87b473dbc39c825d9c14"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/en-CA/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/en-CA/Thunderbird%20148.0.1.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "b86c059dfe79f2615dffcb4a4fed8b031631553b4844ac9e4949e360bce55b2e"; + sha256 = "bfe8d53b9b042802ba504712b0195a661def0c9a84a220ee78c752238b955981"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/en-GB/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/en-GB/Thunderbird%20148.0.1.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "892c81dec7f8e0ca91af5551f6494839c25cb3e7b25dc53b3b2e71484cb2547a"; + sha256 = "bde9c478653048023b8d512ea2ac27c85e7162a5748b5e0bf65964d8f6b033d5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/en-US/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/en-US/Thunderbird%20148.0.1.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "57b23b7ec529f64f337d8b81b72d51c8a2bf4bd81e9abe2a10289f2c44cb2fcb"; + sha256 = "45d07933d5d4a21e8d02186fa540039ce69fba14b6c026e07358a8e96da6d547"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/es-AR/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/es-AR/Thunderbird%20148.0.1.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "f65c47e9e78cb09c101870ee1a4aba8e1c039049f184e8da5140956cde683e30"; + sha256 = "773d413057298b61d1938d4b82032315884f85d6d28a1c1035de0b0d2f2f779a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/es-ES/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/es-ES/Thunderbird%20148.0.1.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "69be6b34b4577fd56f3570d23196e3e8883ec650ede405dfa698d5d9598d835f"; + sha256 = "a08b8130585f93443609d5ff40384ff3905bcaf6209a60e2dc2420d55b824ac8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/es-MX/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/es-MX/Thunderbird%20148.0.1.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "0cb0cc41ddd5fcfce8d42ddae80c32683b15396cefb653f48f332f0a5dc8454e"; + sha256 = "a464dbd10aa39316025b0710bd1d93a6dd06f4ed8286a756f23b4f245fcb2fe0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/et/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/et/Thunderbird%20148.0.1.dmg"; locale = "et"; arch = "mac"; - sha256 = "d469fbee42e44ebc9b3464cf7a1c2da92ada82f308db49ffeb03f59dd652f2f9"; + sha256 = "5e3f8bfffbf37bc013e676d993914e66812df34886556671842f24373832aefa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/eu/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/eu/Thunderbird%20148.0.1.dmg"; locale = "eu"; arch = "mac"; - sha256 = "0967f819f982cd137fca7fa24e3d585e7962d166cb75e128cc535d724e61c6a4"; + sha256 = "759cef09c3af2487b321198a37649a589778c6bf46bfdeab9a3aec8796824f81"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/fi/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/fi/Thunderbird%20148.0.1.dmg"; locale = "fi"; arch = "mac"; - sha256 = "998cedb42bdb07ac9b5fca197a4a51312000bd6e5e38e5e104deec3fc9dfcdc7"; + sha256 = "5e4964778541e7756b5a2a9d6907dee3dbe1f0c3b096903ddc6e306457553786"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/fr/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/fr/Thunderbird%20148.0.1.dmg"; locale = "fr"; arch = "mac"; - sha256 = "3bd828ca34244f27b869daeb8c5b56999153648eb0e35b9374df0653d17d13d1"; + sha256 = "7bb49597cae30d6370681cb0e24cde9d1229df65755cebc61bcc3fc47dc56029"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/fy-NL/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/fy-NL/Thunderbird%20148.0.1.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "69c7cd3553b1d727dcce153b57dfb65bc31be4eefc3320a1681496d72b12482f"; + sha256 = "bb7e8dc83952215814d31828bcb328df345163ebe37b0ae7436f68610d411ddb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/ga-IE/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/ga-IE/Thunderbird%20148.0.1.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "5c4b715b773771d5556da5417b65af65601cb13e9859ab81081011910d02b948"; + sha256 = "b08e39455eef3ddd2a64ac77424515a9150ef7ba42e203f40f800202b6f33b7b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/gd/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/gd/Thunderbird%20148.0.1.dmg"; locale = "gd"; arch = "mac"; - sha256 = "d1c560f8c71b98f4b6693239ae7e2f4bd96ea59ef49d059c65a79abca12e4624"; + sha256 = "b7cb536ed12bae89da81186c1d8f36214eadd861ba757b39915e8a64280e6e88"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/gl/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/gl/Thunderbird%20148.0.1.dmg"; locale = "gl"; arch = "mac"; - sha256 = "a6b5bb48043b6a38659f1029291a705fb6c6648385044eccc11f9e3902d21c25"; + sha256 = "cca8c980a4e4cf4771937513bcb426ab0695583ccbd02092ca494e1dfea767b6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/he/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/he/Thunderbird%20148.0.1.dmg"; locale = "he"; arch = "mac"; - sha256 = "1cb978dac3416c6ffed22aa21e8e8b1399103ac4504972ade810d7d6089c4ab9"; + sha256 = "ec911c04717f26fa077f5e2ad07c32a24c6f39532b2832e9b6616687773fc703"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/hr/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/hr/Thunderbird%20148.0.1.dmg"; locale = "hr"; arch = "mac"; - sha256 = "b327ddac28f8779734bccac58f4f8447ffb8cfccc7c83d0ed013f6cf700c0154"; + sha256 = "ea40341e39b2bc0d3f13b68f900e23208645c5e0561d2ccc9c47fc0c7852f7d2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/hsb/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/hsb/Thunderbird%20148.0.1.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "184a81cdc86ec831aa25a0242696fcf76beb12610d5244c768879ba13b67c9d0"; + sha256 = "b2fdbf3c994c0b346847859910e8d62f761a6a7f82dd07c80500d73635a85c1b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/hu/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/hu/Thunderbird%20148.0.1.dmg"; locale = "hu"; arch = "mac"; - sha256 = "4e6fbf6b2eb5e74820068e774588880f46322d50f16d34537f62f76e880a4ef6"; + sha256 = "d8a923d4dcb8b6e50466edd5a24fc153a3f191ec4da2fb928cae303579496ce6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/hy-AM/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/hy-AM/Thunderbird%20148.0.1.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "d97a54d15360e7023acb7e2d3edb4afe16ef37d9e6dd8db799f845c88986aa3d"; + sha256 = "34cca0020b42e5be70f4c062a924d1f84c32409acbe45b80a5a42cac0fcee9a9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/id/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/id/Thunderbird%20148.0.1.dmg"; locale = "id"; arch = "mac"; - sha256 = "d59a2e7c1fa38c0340c80d4ae43a8064f1e84803090e7ab5203109760ca1ac81"; + sha256 = "712e3557b084cb0599913cf3b24b79778f8cd347e3f628a18efd86617718a47a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/is/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/is/Thunderbird%20148.0.1.dmg"; locale = "is"; arch = "mac"; - sha256 = "c3331bff9df8f84a8364d5528138065f50fff34cf01ea62cbeb86c6f20b45765"; + sha256 = "3ab39b983d8234e866f2b0adb8f9f6e4ada943152b4538d2dd7c82515d5e3882"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/it/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/it/Thunderbird%20148.0.1.dmg"; locale = "it"; arch = "mac"; - sha256 = "60bebd2749ddaac53d0fb9703994e85aa5c1912e38d826561890b0bed067c03b"; + sha256 = "f38d7c8f87d837adbacb12d783a712f6cc7dc76aecad426c0b3c6806fe600dfa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/ja-JP-mac/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/ja-JP-mac/Thunderbird%20148.0.1.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "7e0328c1c45b96e7cc04a042f624f8c23bd1063368d96b6bd0daea5d2c6db095"; + sha256 = "0e39f3778b6b4ebe26e3dc1ba6010b181ef49c0828d47568bb58ff41a4bdc492"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/ka/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/ka/Thunderbird%20148.0.1.dmg"; locale = "ka"; arch = "mac"; - sha256 = "7060d36f292d835a5a7150eecf419de107a8672fd86a99278700e3a94903a990"; + sha256 = "8aa66353fcf473fc43c7ac0a238d877e52fce85a1d6e88fdd6189aa4a4e8b0f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/kab/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/kab/Thunderbird%20148.0.1.dmg"; locale = "kab"; arch = "mac"; - sha256 = "b5e27585e4a3d830313fdac27deaba654bd6a2f830bff00d0e8f03b987984a5a"; + sha256 = "a89c63562db309c3ea5da0665c2b9c8745eab26b01237eff5e738395e92c3aa8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/kk/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/kk/Thunderbird%20148.0.1.dmg"; locale = "kk"; arch = "mac"; - sha256 = "57eb18d0e715d6d4c8437124acb31fb021033fc28131084d82e58b77d83f5ebd"; + sha256 = "d32b99d6999e37cc358d6a7854d373c35a8a76522c5670cebe627c700cc2d88b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/ko/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/ko/Thunderbird%20148.0.1.dmg"; locale = "ko"; arch = "mac"; - sha256 = "f139e4e5fde0a82f83ab2870160fb1305bd7117a36ba960b95ec32a7ba4cbca8"; + sha256 = "954e5cedc319f3b197626f6c202d8fe7b7da3087a21f5767c723fa7d17d1bc6f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/lt/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/lt/Thunderbird%20148.0.1.dmg"; locale = "lt"; arch = "mac"; - sha256 = "896c9f8010816794356a1441e20e7bd51bade70f51922171303d3831efb68eb3"; + sha256 = "2a76badf20edc565ca300de9d6ef8ec040346a5150d9999f96cc01a6b5730813"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/lv/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/lv/Thunderbird%20148.0.1.dmg"; locale = "lv"; arch = "mac"; - sha256 = "60c7c67136b04538a9287320c5e3c865f859d656b6794e1dc80fb9df8087f3b2"; + sha256 = "0bd6d7908864f69ab067bddb5cca3d876fbac45817e7640ccf487332657305a4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/ms/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/ms/Thunderbird%20148.0.1.dmg"; locale = "ms"; arch = "mac"; - sha256 = "bd11c5ddfbe3343eb65070ffccc9557f1a13ccc108b5e02efc25d910885adefd"; + sha256 = "23cd1f663a5b58700fb7b509f14b67e9ad0f447e19d0cbd59f000d06ef4647f7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/nb-NO/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/nb-NO/Thunderbird%20148.0.1.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "884668e2131c90dea65408001e6415db1d058c1a076db5bb6bac470d6d8d2ecd"; + sha256 = "c15dbca5b59f8805394e1674b5ceb4255aeaa0eedd8c1a6d0e725f7c70393878"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/nl/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/nl/Thunderbird%20148.0.1.dmg"; locale = "nl"; arch = "mac"; - sha256 = "d1cc3af837cd2c9363cf3b1a3c4e823bd8e47f68a974f4c364e759d1652e8b89"; + sha256 = "75a6ca45fe2e58a65779457bb8245053cba4c3cc3c2f8914c4bcfa0aab8457a2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/nn-NO/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/nn-NO/Thunderbird%20148.0.1.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "e9c699df3c5a62027c3d7709bb3c31782a4e33db0e096c6d8b9f22fd1b8dfa59"; + sha256 = "86b40d91c604ca800d2808017b3e025f1a279102dc135b4f08037818f62caab0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/pa-IN/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/pa-IN/Thunderbird%20148.0.1.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "12aabfada85ef236d78a1e85df62d1c7b71095d01d2e58fc618375cddab16e71"; + sha256 = "db23f780620fb28a89594467ad922e76f888c8516842722d8f91e39975aea51c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/pl/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/pl/Thunderbird%20148.0.1.dmg"; locale = "pl"; arch = "mac"; - sha256 = "4e340d6faba22ddc2e62374fd5ec8e9055ca0844a31710a0559ee46a9ae7dc4f"; + sha256 = "594d8fe62e19e961dda6aceb1eb8f318bc67509dd7776b592f2c51a45b402229"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/pt-BR/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/pt-BR/Thunderbird%20148.0.1.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "728f321121ec5551b85a8b14647e4ea51df974c211855693e60bab33cb9f0fec"; + sha256 = "795439fb60115992efed8400ed78b304f5f3f406876e1b0c625fe11934c101aa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/pt-PT/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/pt-PT/Thunderbird%20148.0.1.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "5feb101f3dcd58cb16a48e5ddcf8b3453daa6dae7d863743e654cb4e6d0199a0"; + sha256 = "2a8ebcc53821f8a130fe7369935dfa6bf7261720e2dd512715c1a9ddb0e0b635"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/rm/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/rm/Thunderbird%20148.0.1.dmg"; locale = "rm"; arch = "mac"; - sha256 = "c034878da40e43b9f0ebb591778610fda33e9d467122a4c9b4d6bd2f152322e6"; + sha256 = "d7ebb14d7b044f93861f3df6b2e9d982aace80243b4a26a58f0e69b8bc03f6f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/ro/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/ro/Thunderbird%20148.0.1.dmg"; locale = "ro"; arch = "mac"; - sha256 = "2ae6655c0d7054a6b5ecf585d4dfda7f61196f0eb000b066e8f90889a1bc5c96"; + sha256 = "0ef619aa1033043cd34eba0a8060966c37d83d4165f99e365c277ffb9675a4c5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/ru/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/ru/Thunderbird%20148.0.1.dmg"; locale = "ru"; arch = "mac"; - sha256 = "aa62dd5ec7c04f4c8554c0357d58d3dfcc60bdc8133fc7049a11b20db971dd15"; + sha256 = "ebdaa819f2ddce483efb1d730e8aac61be0d27a6ddb69054419a3a7a8969c381"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/sk/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/sk/Thunderbird%20148.0.1.dmg"; locale = "sk"; arch = "mac"; - sha256 = "5e0907d7a1c2b15be71e3d8a57de27de79195c91712016c1979943bc24efdfb6"; + sha256 = "3191e02d1ebbe9c27de33b1636ea0d43367c814db8b97e069ae12c25b6bb404f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/sl/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/sl/Thunderbird%20148.0.1.dmg"; locale = "sl"; arch = "mac"; - sha256 = "9a22ec01a99152a77df0e653b6a43060a95d949b2dc29953dea311793a4e13a4"; + sha256 = "318319f833ea0ab67361e369ff52c96e65465fc21b9191dd873196435c44dbf7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/sq/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/sq/Thunderbird%20148.0.1.dmg"; locale = "sq"; arch = "mac"; - sha256 = "1514817148c20d8edfd43a4703175ed244a1218e43e952e9f16b4cc99f00a8a4"; + sha256 = "21ff2f04469f0cfeee17d78b4791770aeeef9c29f174421d3dceef07cff3ba49"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/sr/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/sr/Thunderbird%20148.0.1.dmg"; locale = "sr"; arch = "mac"; - sha256 = "fda960a2cb41eabe5bd9498be0cdce5a9422c287089fa0ec140d8c5dce0dcee1"; + sha256 = "d4f6d75e40bc4a691e8490e277f080f165b7a083dde25b53df6c2085f5b2c7ab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/sv-SE/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/sv-SE/Thunderbird%20148.0.1.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "b5f44eccc1e1fdfeefae3202985b1a3f1a35a9166549f52e3780f97f1709e76f"; + sha256 = "eb3e889e8c90273098ba0fd27369f511f7a319eb36ce9e62b0cc83e462c534ac"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/th/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/th/Thunderbird%20148.0.1.dmg"; locale = "th"; arch = "mac"; - sha256 = "b1567fd0e87e818f65e825c43731fe0a4b35c86a731ccbd98f81ee4837247bb3"; + sha256 = "a5c547343b650d425c9dc484895447d365220e98361b3a3f3207f8f25e7c1225"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/tr/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/tr/Thunderbird%20148.0.1.dmg"; locale = "tr"; arch = "mac"; - sha256 = "5e094f6b4263cd5cf68797b8f112c57a0e02ae773ecfeb8579d30e70f38f4d61"; + sha256 = "9ae9431d362b06c087c5bd95667b96c438dede84b435f35d97333bcf47e3effd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/uk/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/uk/Thunderbird%20148.0.1.dmg"; locale = "uk"; arch = "mac"; - sha256 = "5f66b832e51bf734abe12f3dea6e69fa91df1b768c997dcec69b23f8fea7f840"; + sha256 = "7c781df523ff5f3b5457b5508f9a7bca5484c909fb1196b82f15a7694947cce2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/uz/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/uz/Thunderbird%20148.0.1.dmg"; locale = "uz"; arch = "mac"; - sha256 = "0317d21cec9bd6aa9c3f7f6cfc843dc2650b2c3de90266adcfb9874db35a2966"; + sha256 = "c94b894d9e9b179053b44c30a32a44f0ec986e29ec0728cfcdbdce000227d936"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/vi/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/vi/Thunderbird%20148.0.1.dmg"; locale = "vi"; arch = "mac"; - sha256 = "07b0a3b2e1b903d5cc9454f6c2d8be8a2928d8ae633d86a1b6eaf43c6980d779"; + sha256 = "f47d75e887c8001210efdfa9c43c2c20ad5be52901c100972610ab85963b2fc4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/zh-CN/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/zh-CN/Thunderbird%20148.0.1.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "86142bf9be41cedb1b34300b6406d547679547ed8d25c4f6f0fe45b0a00a9d3d"; + sha256 = "2e138c4db461358d63944f91aa3a05bf9dd669addae9d429564286287752a14e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0/mac/zh-TW/Thunderbird%20148.0.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/148.0.1/mac/zh-TW/Thunderbird%20148.0.1.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "b4723a043876b3f633166921319fddfdc7e65946cf91a5eac608d63efc93bdcb"; + sha256 = "667c0adfa78eb6de45b7946eea455de244e2bfdd233289cfb5dd1e3ba0707757"; } ]; } diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix index bae72d0adb76..41a9523303bb 100644 --- a/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication { meta = { description = "XMonad-like workspace switching for i3 and sway"; mainProgram = "i3-wk-switch"; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = [ ]; platforms = lib.platforms.linux; license = lib.licenses.mit; homepage = "https://travisf.net/i3-wk-switcher"; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 47633170e263..3f4740a37df2 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "wmfocus"; homepage = "https://github.com/svenstaro/wmfocus"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ab/abcmidi/package.nix b/pkgs/by-name/ab/abcmidi/package.nix index 94562d1bb5da..6d5dd308d444 100644 --- a/pkgs/by-name/ab/abcmidi/package.nix +++ b/pkgs/by-name/ab/abcmidi/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abcmidi"; - version = "2025.11.26"; + version = "2026.02.24"; src = fetchFromGitHub { owner = "sshlien"; repo = "abcmidi"; tag = finalAttrs.version; - hash = "sha256-OBlkk5Fq3ep+wZqFfSXNqrXtznisNFjn9uDVj/Q4Odk="; + hash = "sha256-Hy0ICuMK4pCaJn/36QwkCfEI5kgmkWyr9V4RhMpGQes="; }; # TODO: remove once https://github.com/sshlien/abcmidi/pull/15 merged diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix index 93f07e97ad98..273f046164d4 100644 --- a/pkgs/by-name/al/albert/package.nix +++ b/pkgs/by-name/al/albert/package.nix @@ -81,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: { # See: https://github.com/NixOS/nixpkgs/issues/279226 license = lib.licenses.unfree; maintainers = with lib.maintainers; [ - synthetica eljamm ]; mainProgram = "albert"; diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix index 56574b75bf83..1fb85afd8826 100644 --- a/pkgs/by-name/al/algia/package.nix +++ b/pkgs/by-name/al/algia/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "algia"; - version = "0.0.106"; + version = "0.0.107"; src = fetchFromGitHub { owner = "mattn"; repo = "algia"; tag = "v${finalAttrs.version}"; - hash = "sha256-8hsSt/QUyIEYpI4L8/uksuwLedjfilGHZ5xc9jUK1uo="; + hash = "sha256-23h2sVwOhKXnpYBq1jZbbC275dzc6HnqUpB/1wbrpw4="; }; vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU="; diff --git a/pkgs/by-name/an/animeko/0001-no-update-checker.patch b/pkgs/by-name/an/animeko/0001-no-update-checker.patch new file mode 100644 index 000000000000..6d3c9a1541d5 --- /dev/null +++ b/pkgs/by-name/an/animeko/0001-no-update-checker.patch @@ -0,0 +1,29 @@ +--- a/app/shared/ui-settings/src/commonMain/kotlin/ui/update/UpdateChecker.kt ++++ b/app/shared/ui-settings/src/commonMain/kotlin/ui/update/UpdateChecker.kt +@@ -40,25 +40,7 @@ + expectSuccess = true + }.use { client -> + withExceptionCollector { +- return kotlin.runCatching { +- client.getVersionFromAniServer("https://danmaku-global.myani.org/", currentVersion, releaseClass) +- .also { +- logger.info { "Got latest version from global server: ${it?.name}" } +- } +- }.recoverCatching { exception -> +- collect(exception) +- client.getVersionFromAniServer("https://danmaku-cn.myani.org/", currentVersion, releaseClass).also { +- logger.info { "Got latest version from CN server: ${it?.name}" } +- } +- }.onFailure { exception -> +- collect(exception) +- if (exception is CancellationException || exception is IOException) { +- throwLast() +- } +- val finalException = getLast()!! +- logger.error(finalException) { "Failed to get latest version" } +- throw finalException +- }.getOrThrow()// should not throw, because of `onFailure` ++ return null + } + } + } diff --git a/pkgs/by-name/an/animeko/deps.json b/pkgs/by-name/an/animeko/deps.json index 2225aa31ed29..39b131eb342b 100644 --- a/pkgs/by-name/an/animeko/deps.json +++ b/pkgs/by-name/an/animeko/deps.json @@ -53,10 +53,6 @@ "module": "sha256-KsL3EG4S8mNCW0pN/ICYlEf7iVZ1/pAthnWap0/RK30=", "pom": "sha256-/leyKEF/TXxneQPcYftKfPmT1gNJneJtjYET5HfMTxs=" }, - "androidx/annotation#annotation-iosarm64/1.7.0": { - "module": "sha256-AC0rtA4C7N7Y533F1nTe4s5f538pUxgcl+vVDSRlAY0=", - "pom": "sha256-ehf34KZP5hR8zaxQyF0Qo7AY/PHd/ip3e6YAA8pa3FY=" - }, "androidx/annotation#annotation-iosarm64/1.9.0": { "module": "sha256-6DJvdch3vV6HpxGXejlvW+xtpU1QTP3BBdQH6tTdXtc=", "pom": "sha256-r5RTiIOEj6z73kf5Xg2fNWerA2l/Nc6e7NnkS/y4JQc=" @@ -65,10 +61,6 @@ "module": "sha256-gWifMc5Ndyzq5Nm4EKEPjSJlSrdSk/9EbJwgEfi6MjE=", "pom": "sha256-JTmoAKO24c6Fefs5T7n0Yi81sDPGYvSj9Zc9+O+IilI=" }, - "androidx/annotation#annotation-iossimulatorarm64/1.7.0": { - "module": "sha256-OikdRa70npj492Pcc+iJJnOSmeiUyqGrKZhWZp7hjRI=", - "pom": "sha256-5+KpIB5thn7QIZaNGTjoBHdboYieIemh6IMcSL4iOYk=" - }, "androidx/annotation#annotation-iossimulatorarm64/1.9.0": { "module": "sha256-b8ECz4xqGmk7qL083JGilvz/Ag6SMrz+MAS1VRXMhpI=", "pom": "sha256-8G4LBU16fBWN4e++C66OrN0vy1Oak7n/ZOmYOAuoVHo=" @@ -81,11 +73,6 @@ "module": "sha256-P1qPqhneZn5j3KlzD/jvDkeOS6+1/uuCWOXAhiRtyQw=", "pom": "sha256-K+ZlunzbBGtBtAnHmj3gxtnhJVJCwIf2uUssdJO+CPQ=" }, - "androidx/annotation#annotation-jvm/1.7.0": { - "jar": "sha256-42uOS4OTpK3HTj1KsirVo2OW8M6i5AtXNOrhSTff0iQ=", - "module": "sha256-B85gw3erlOR8jJAlibl3YDAGT9Gn5NWgGjjXAONeXbQ=", - "pom": "sha256-LT/MEucHiGmSA5JmI39FEUDKqPlMHmLn/E1gLeNFsNc=" - }, "androidx/annotation#annotation-jvm/1.8.1": { "module": "sha256-yVnjsM3HXBXv4BYF+laqefAz45I44VBji4+r3mqhIaA=", "pom": "sha256-1JIDczqm+uBGw6PeTnlu7TR1lXVUhqZCc5iYRHWXULQ=" @@ -502,10 +489,6 @@ "module": "sha256-EPd9GdGF6KLN1LDa+ymy2hgM61G1PuwstFu40CeVSpg=", "pom": "sha256-4itFFcGCYOqcksHaHQsJqkb+gnCr1mg4oveFn/JzJds=" }, - "androidx/compose/runtime#runtime-saveable/1.8.2": { - "module": "sha256-bvgfp/FklhULLb9r4gHEEt7T80PKH5Xt5EIYdR7WbHI=", - "pom": "sha256-zkIRKN1Z/3cq3hv5T61DdKbcxe64Az4xQPawbvbZlCw=" - }, "androidx/compose/runtime#runtime-saveable/1.9.0": { "module": "sha256-dWS0MU7dgdDxwPp2MH9HPDl7Y0hWIdPO4KKRiwUvJS4=", "pom": "sha256-hqVscAR77b6wjyPOhtoJ3LR38J+MUjnvp5CV4uzgYLM=" @@ -3005,10 +2988,18 @@ "module": "sha256-/Pqut7oYe99qycvB0HNJiWSbCn/8bfteU5TBcJYfaLI=", "pom": "sha256-sid4YljDlKaO0ntiFyaB+JdOQoJHeTBU0XxAxlDEEfI=" }, + "co/touchlab#stately-strict-iosarm64/2.0.6": { + "module": "sha256-qOtTajAaiWcZulLhdrLMOxgzg3PlRL85DjGApJNMAVg=", + "pom": "sha256-oY8yBrVtGjDoAR2dMt0GaPATdyKBGvmyiLd0NE/Z5ZU=" + }, "co/touchlab#stately-strict-iosarm64/2.1.0": { "module": "sha256-8UOjj43DzTJcUh82aMb3UuxN99vKlf/A4kJWhNubHN4=", "pom": "sha256-80CheYAdvDwZ0/xiJNOnySnM+3NmfP2EujE5jtZDafY=" }, + "co/touchlab#stately-strict-iossimulatorarm64/2.0.6": { + "module": "sha256-uXuBPQgr1k5sLpnPY7KcFPKQaLaEw5jDf+pPy0OOeFg=", + "pom": "sha256-pvmqkz0ylUVaeLu1XRfqVFIYBybxlIr72XjkPJgFin4=" + }, "co/touchlab#stately-strict-iossimulatorarm64/2.1.0": { "module": "sha256-HvYz59tOHPEu88DkMv3YAiaIBbb+M+0PSE1by2jplTw=", "pom": "sha256-VhGaJG2F4fwijbx4TjMj7ld6FdxnVnykeHqKgbMbon4=" @@ -5515,10 +5506,6 @@ "module": "sha256-RWBz1hMzkqxpnWLPsN64wCvaKATJ0DowDPUiSpH/LIg=", "pom": "sha256-7woPdZv6dxVHNjyRKaa2PTUFds7PW4OZFTkQIcZoOgA=" }, - "org/jetbrains/compose/runtime#runtime-saveable-uikitarm64/1.8.2": { - "module": "sha256-O942iQhum9QIocX9wOQx+NVAaLPAlHHSI1AoWonTdmw=", - "pom": "sha256-fPWcnAL/lQ0yt1nF7TCzyp/bAHRX1v0fywMEw2e/E6g=" - }, "org/jetbrains/compose/runtime#runtime-saveable-uikitarm64/1.9.0": { "module": "sha256-uNVM3vXgpbeDXLM4iBM0iSz7qz+SN3/lmBeiXXU+kbg=", "pom": "sha256-HanDoPdPzxJ0SRyrHm7PfZ2C2iZnYCPoCQCldo+0uHs=" @@ -5531,10 +5518,6 @@ "module": "sha256-OgEVWV6hCpJxUIVrUuPNsS4zRtVDcAd/+HKII0t043Q=", "pom": "sha256-idSq3GUxiPxdCKVpbmH8HGq/IkpFNZUZ1MSNZDWG5n4=" }, - "org/jetbrains/compose/runtime#runtime-saveable-uikitsimarm64/1.8.2": { - "module": "sha256-hkmLu/22k8LUHFfk9wYTdE+1oDbT08zxzBB8zV1KwGY=", - "pom": "sha256-wqhTeOdhVYu27PHODBBZBkAcH97ai3FDQmThhayWKQU=" - }, "org/jetbrains/compose/runtime#runtime-saveable-uikitsimarm64/1.9.0": { "module": "sha256-NgHdc32iO0hYHHvq25xG7bNLyR0HITAb2J5heheFy30=", "pom": "sha256-mq9FKhMxH2vHDvqCZJma6dTV6EAOHJhoPDGDAgLM33M=" @@ -6203,6 +6186,9 @@ "jar": "sha256-z5XszGzHhN/0ed7guINPNYS5MpLMXZGXLoL117nhPjs=", "pom": "sha256-vklJB+DhnHi7ghFUr6F3bVrXoFi0qzAJD3Q1Sw4TON4=" }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.0": { + "pom": "sha256-K7bHVRuXx7oCn5hmWC56oZ1jq/1M1T2j/AxGLzq1/CY=" + }, "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=", "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" @@ -6885,95 +6871,95 @@ "module": "sha256-s+NvC4F8sW43udNc2Sf7pqQYPTpy6WYcDaEZtGe1U5Y=", "pom": "sha256-EN0WnADat5JXw6z/58I2vqwkgfngp2xT620S9Mp1q2c=" }, - "org/openani/mediamp#catalog/0.0.29": { - "module": "sha256-s6r4l6CUxAxXNrk0x4papHn7CT9Agn+VGhA5gde45/8=", - "pom": "sha256-E5GiqnTrK4imwFM7QBmAAhhxDKijBAIi/mwyH3FUuk4=" + "org/openani/mediamp#catalog/0.0.30": { + "module": "sha256-2OPa47tUPbb2VrTHEOwV8lGquOHf0NP7ic+M1D2GCHM=", + "pom": "sha256-A2o2vXqHPKNgWU1tVkeQMvwwjDfb6Z1u116yd1RJch0=" }, - "org/openani/mediamp#mediamp-api-android-debug/0.0.29": { - "module": "sha256-jU1JEH7gsdNZqGDewGzwxm9RVbT/0cL0T4SsT1m/v/w=", - "pom": "sha256-ZRgAVnFvMsp3tirT+pxdzLl/UgaKwWLiJwix9zmo5hU=" + "org/openani/mediamp#mediamp-api-android-debug/0.0.30": { + "module": "sha256-i05AWijPx24uS1h09c4mswpBwJKRgd9ey3mQPOXudsM=", + "pom": "sha256-WbTPILNxF14itRm7/VcMlWTusP8MJdaIzt0UduzodAs=" }, - "org/openani/mediamp#mediamp-api-android/0.0.29": { - "module": "sha256-A7Kf2AqX+9bds8WYtQnt7oRkoLXjXnk/3RnMiLcSCkw=", - "pom": "sha256-pyflDsXfp2uPi32gudBjcjjVfPjbwz2cV7Wnvclz7ME=" + "org/openani/mediamp#mediamp-api-android/0.0.30": { + "module": "sha256-1R6MW6Hod8WqccN3hSjQL61q/SOAUgXOmUutKvB1ZAk=", + "pom": "sha256-VmpuVDAwn3sa5SVacHYYIV6/AMD8cHA9ccJbzsSHLg8=" }, - "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-desktop/0.0.30": { + "jar": "sha256-cjmXO7AT1WxxAnqjAVqm1W5rGWBzgQg72/FMDH4cBgk=", + "module": "sha256-qk9kYkERTe27Ae63/HtReT9rpYtxIQM6oV00VI15Jok=", + "pom": "sha256-4y32EbVgTpToWtNFgVIEtIBrwzsLkQefMg+ml/0thRw=" }, - "org/openani/mediamp#mediamp-api-iosarm64/0.0.29": { - "module": "sha256-pi4zPVts8iYT+Id6q3xRa5R9W9LQrCdYL3pKlLqVjV4=", - "pom": "sha256-FEuhDtbkSE07U1E8Q87TIB/v4YLFpLrOqZnpPchKilQ=" + "org/openani/mediamp#mediamp-api-iosarm64/0.0.30": { + "module": "sha256-DWqiR1l7S++nrZxcFXJrLtw3XIjqj3kqwR2vd4m6fZw=", + "pom": "sha256-4bG2sVVe3LlKtenq/gUmWh3N2+l5FSh8EgYMYDoXyUk=" }, - "org/openani/mediamp#mediamp-api-iossimulatorarm64/0.0.29": { - "module": "sha256-vX2BCljeCqNtJiV7jXlH8iQJDFiX5J7EaaCnaK9u1GQ=", - "pom": "sha256-a+yj2/YHppcgKiQ/pK5lEM5ndC2GoLxN/RfHloDC6nU=" + "org/openani/mediamp#mediamp-api-iossimulatorarm64/0.0.30": { + "module": "sha256-PMH1SJn/7HHzFVq+PIIrYtfLHCy1wqTJwRdsDuD11+U=", + "pom": "sha256-kwJMwkxnwD+Chp9ip+Cmgy/Fq39mcuUbTbeD4xyEpzE=" }, - "org/openani/mediamp#mediamp-api/0.0.29": { - "module": "sha256-5BiLU2hqMh9twBjyMkZymeltSP5Lvhqm+Ebram4FJxk=", - "pom": "sha256-bxPAiiGEC3XucMnl+KwnQfP1Q96RlQBpHw459rTU9os=" + "org/openani/mediamp#mediamp-api/0.0.30": { + "module": "sha256-qpHZ8PUMNf0qUY7pImlp0BeOiLXccgCPfNR+jzXnTGo=", + "pom": "sha256-7mmAoDq1Js3QGlIlBpHvUN1WD1vWY6Vv3zjAejs3PTU=" }, - "org/openani/mediamp#mediamp-avkit-iosarm64/0.0.29": { - "module": "sha256-69NJ47GtvieicRl2jQwncgKUOdAg04krEMUkFanTD9E=", - "pom": "sha256-2ulgh0zZuf2Y3VB8HPEoeOoly57ZiuphZCxLt+O03PU=" + "org/openani/mediamp#mediamp-avkit-iosarm64/0.0.30": { + "module": "sha256-zBn6Tz4aGOYy0nMEBFLKtp5mRFzgcHjovmTSLKPKetU=", + "pom": "sha256-OSqAIdGS1juME6tgpo3PYaf6F9gYq86ze155k8SUNfc=" }, - "org/openani/mediamp#mediamp-avkit-iossimulatorarm64/0.0.29": { - "module": "sha256-NqOkI5Z9iakDOzLu9J/VdLA8s4k+RpyMHRUtpCsGQrw=", - "pom": "sha256-IPEcwTRk7xoDOwRIjOXcQ/xWneSRyfavPFoRQkKeYak=" + "org/openani/mediamp#mediamp-avkit-iossimulatorarm64/0.0.30": { + "module": "sha256-GkPl9oCYipnLq5AvhJSXfSmEN7CXDidf1jbveejZOgY=", + "pom": "sha256-sqk1pwBCNE3FVbYXPIvq9Wc1ZYC0t1HG8jRQiVGwKIs=" }, - "org/openani/mediamp#mediamp-avkit/0.0.29": { - "module": "sha256-3mZlCh9V5OHi74ETW/Z/7ElP12/rOxgDlHtfbcSmI5U=", - "pom": "sha256-BCn3TBi/kYcTE7qXYYJhAl+W7eXi5MPN6yodYYUi/18=" + "org/openani/mediamp#mediamp-avkit/0.0.30": { + "module": "sha256-qPTctSZF3yZ7eWeGd3whSLpe1VqhTKvghX9gt1x9ROc=", + "pom": "sha256-qxNi8q1t4QvUvisiKZZkS35jBER/QO/q9RQ7BDdxN3w=" }, - "org/openani/mediamp#mediamp-exoplayer/0.0.29": { - "module": "sha256-q3w8QTM4lgFZCCcKSH4/O8VASBVN/SxA7Kr6WBBjIpM=", - "pom": "sha256-aoJSOzxoqYK5oJThfGXanf6/kkRoji8PtCuBwui6vfE=" + "org/openani/mediamp#mediamp-exoplayer/0.0.30": { + "module": "sha256-vW+B6TZGu/PE96JqZVjTg4uhcLAO9XeN55Pfvm5Oz6M=", + "pom": "sha256-b9jem2r2BXE4BaMpCzchhh9bcKKRNPJvk2VA+50fbKM=" }, - "org/openani/mediamp#mediamp-internal-utils-iosarm64/0.0.29": { - "module": "sha256-dM6tWX17zmoxefcPBq5k+cj/YVlU5AG3ItIN+G4uOZ8=", - "pom": "sha256-UVczUfnaJ0ap5maZ7b1KNPrEZksna+QfhHVFLbAbAeg=" + "org/openani/mediamp#mediamp-internal-utils-iosarm64/0.0.30": { + "module": "sha256-oc5QOdK5ZYxNsVD5suYvlCMbzGonBapKmz42Nf9fYHg=", + "pom": "sha256-5TZ7j3EaRSQruC/8PTXXzLLKoq0/xedJ++30j32GkBc=" }, - "org/openani/mediamp#mediamp-internal-utils-iossimulatorarm64/0.0.29": { - "module": "sha256-imh0Vg3ZZcWinZeWPcN8ShBhgot2EJ4ZZrYdHrMlu/M=", - "pom": "sha256-q6DVnhuXEHqiLfk5X11RzePudY63ga1PhhiZg3fncWo=" + "org/openani/mediamp#mediamp-internal-utils-iossimulatorarm64/0.0.30": { + "module": "sha256-xL+LHQEp0IgT5QbkW7hhuQtsN4fCC0fPpjh51qNwMfM=", + "pom": "sha256-BTWno5jqBWiotMVy0BNLyKV35S5ZAFkVAg8zb0JPMrU=" }, - "org/openani/mediamp#mediamp-internal-utils/0.0.29": { - "module": "sha256-sIGzzI9XNlRUYlXqou8iLMNqvgi+v6XIUYnjfA+pbeo=", - "pom": "sha256-s5DI6wAi4qSMP8bAPz4K/gOCLLDBSwNKk6m2CKsdtIY=" + "org/openani/mediamp#mediamp-internal-utils/0.0.30": { + "module": "sha256-Db89LZagBZhIODpzWh/yxf3ND6Ipikk1KsQr+PqbZtk=", + "pom": "sha256-SRXlD3PGaI3qk5R0uGvd48K79iPI2W+D0QyBegkWGm8=" }, - "org/openani/mediamp#mediamp-source-ktxio-android-debug/0.0.29": { - "module": "sha256-sUm1P7HhQUhOwDUR1uVAPvHfZO5xhgiWX7ePLYgKDDs=", - "pom": "sha256-/BJ4n949a/0FK/f8vMJ4LMyWDFYvb5PDL67YYZOzrMs=" + "org/openani/mediamp#mediamp-source-ktxio-android-debug/0.0.30": { + "module": "sha256-nixitOGFxyv6HcDGdAKM1E8g9tBA96KD0x96SGkBzT0=", + "pom": "sha256-esmapPkeonUbs6tfhS35fbPdvtuh9hj6sPTwKesa4/o=" }, - "org/openani/mediamp#mediamp-source-ktxio-android/0.0.29": { - "module": "sha256-Qc/0FDWUS04Ss5F0BcpNAS5XJ6rTqVPhkHVXzaoFiRM=", - "pom": "sha256-tzinK8zk1fGrql2WXhwc7YgzDV6MnbnjIyT5KVzOqxw=" + "org/openani/mediamp#mediamp-source-ktxio-android/0.0.30": { + "module": "sha256-OVhaDjRoRqpyMICPyqcNTYdjb8KjXNCDiYn4ZcgubSI=", + "pom": "sha256-AdM6u0OvP2RRt6IkQ3lwRKpUef9R/cuDSGvsulHHR0w=" }, - "org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.29": { + "org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.30": { "jar": "sha256-CmvsMdXJcrr1UcbNQVI8OyPqwxo9pLKYoa1ye5k0764=", - "module": "sha256-3ZMls4s+OGQgPoXLFBqB7WbyE1Qn2f84XoXw0pOdtUQ=", - "pom": "sha256-nN9HUn/RfKtPCOSNiD2URA+IBpkSwWWt0HZO8CZjtEE=" + "module": "sha256-1u3N8N8Yg9A+5OThl+tqsqyEtns5RMiC8NdY1oB1M7k=", + "pom": "sha256-9duiRN3Hwp4p49AeyS6jLpoTjr0oTd8Akup3Yp+65As=" }, - "org/openani/mediamp#mediamp-source-ktxio-iosarm64/0.0.29": { - "module": "sha256-s848sz/BVAOAd5ORpSuZ5Mngsco2qJdoVX/IVhPUU6Q=", - "pom": "sha256-M+BJJRgYRKhY02cEqQbeqOUC4HQpkrIaoGqfpfMf1G0=" + "org/openani/mediamp#mediamp-source-ktxio-iosarm64/0.0.30": { + "module": "sha256-AlnPAvx7IWWitGp6PpJgZoIrJ28DIoxXg5yDV/mgl2k=", + "pom": "sha256-DcyGFMKTaYnvniNAZq1db2g0ED4XO6TdLOGa5sjJpDs=" }, - "org/openani/mediamp#mediamp-source-ktxio-iossimulatorarm64/0.0.29": { - "module": "sha256-KodoKoQh4lb9t799R3O2ZhuX1fg57ULxCJ/xSL956hk=", - "pom": "sha256-RT9U7NnYMDnVCTWKnkvU4ZHtFVGM2+PON2JdB4hPwCs=" + "org/openani/mediamp#mediamp-source-ktxio-iossimulatorarm64/0.0.30": { + "module": "sha256-T+2KAQm+6/pB5fbNurEukrK4OlOt5o5sjQxaO/23qjM=", + "pom": "sha256-IfCCH0sXk+TNXF0EXlafqihrONqUR49tVkwRp2f1RO4=" }, - "org/openani/mediamp#mediamp-source-ktxio/0.0.29": { - "module": "sha256-As/GVZGSN4hAfby3KRxBzyMMUpuNmy24wVPlSQ4ABww=", - "pom": "sha256-Zd+xibJweb9/tUsvBKtkQm8REPIRs9JI/q6D4uGBDag=" + "org/openani/mediamp#mediamp-source-ktxio/0.0.30": { + "module": "sha256-cUirc+cdT2fXVcuTYofTsmRv6mDruHt2u9BBiDbzUoI=", + "pom": "sha256-nXoS8U+BvG/r6i9jCGOLV2Ha7RbyMS6dhS6mNo2qlWA=" }, - "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.30": { + "jar": "sha256-DxMTtFdwUM76Vxs5a8EaohRI39mSLjhBtSnqPVj1IlQ=", + "module": "sha256-qT2ALGzzOSJamxUCRPOM91abwHZ4igwJqvPhB08G32U=", + "pom": "sha256-IaarXJ6GI1unhIJUDIN5j4RE1FVRbOCr9HYG5BIMOTo=" }, - "org/openani/mediamp/catalog/0.0.29/catalog-0.0.29": { - "toml": "sha256-wNPEmb14ugDo4NPEcf8lY0hRcCOGDFmsDGcHJqUSq5E=" + "org/openani/mediamp/catalog/0.0.30/catalog-0.0.30": { + "toml": "sha256-NMqiEq/q+rgs2uiUsFJBROfMY9sSjCdpurSWrRjM2c0=" }, "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix index cebbec7a0d10..d2c4b7729294 100644 --- a/pkgs/by-name/an/animeko/package.nix +++ b/pkgs/by-name/an/animeko/package.nix @@ -5,7 +5,7 @@ fetchpatch, gradle, autoPatchelfHook, - jetbrains, # Requird by upstream due to JCEF dependency + jetbrains, # Required by upstream due to JCEF dependency fontconfig, libxinerama, libxrandr, @@ -113,23 +113,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "animeko"; - version = "5.2.0"; + version = "5.3.2"; src = fetchFromGitHub { owner = "open-ani"; repo = "animeko"; tag = "v${finalAttrs.version}"; - hash = "sha256-eP1v/o9qUk8qG+n1cJRmlgu2l06hFZLeUN/X06qAVpY="; + hash = "sha256-mDUl1RpTIFBHdYst6R16iVljiUNOYh6mNUtOLBSuOE0="; fetchSubmodules = true; }; - # CefLog.init(jcefConfig.cefSettings) is being comment out due to compile error postPatch = '' echo "kotlin.native.ignoreDisabledTargets=true" >> local.properties sed -i "s/^version.name=.*/version.name=${finalAttrs.version}/" gradle.properties sed -i "s/^package.version=.*/package.version=${finalAttrs.version}/" gradle.properties - substituteInPlace app/shared/app-platform/src/desktopMain/kotlin/platform/AniCefApp.kt \ - --replace-fail 'CefLog.init(jcefConfig.cefSettings)' '//CefLog.init(jcefConfig.cefSettings)' ''; gradleBuildTask = "createReleaseDistributable"; @@ -237,6 +234,11 @@ stdenv.mkDerivation (finalAttrs: { libxdamage ]; + patches = [ + # Builtin updater will never work on NixOS, so we made a patch to disable updater + ./0001-no-update-checker.patch + ]; + dontWrapQtApps = true; doCheck = false; diff --git a/pkgs/by-name/an/anki/package.nix b/pkgs/by-name/an/anki/package.nix index 51862b6b25cb..411420b558a0 100644 --- a/pkgs/by-name/an/anki/package.nix +++ b/pkgs/by-name/an/anki/package.nix @@ -43,57 +43,63 @@ let srcHash = "sha256-0hLTQR7f7s58DUgAZbDeREMee6VrqAKHyhS1Hs/Em1A="; cargoHash = "sha256-qcB+r9VzBz6ACZaXPL26MOxxtb/h2OIuxyc54vUgfPM="; yarnHash = "sha256-EmKeHORr/+qsDzAwtearMi7qodcCgjeAQcy+79HL7Vg="; - pythonDeps = with python3Packages; [ - # anki (pylib) runtime deps - decorator - distro - markdown - orjson - protobuf - requests - typing-extensions + pythonDeps = + with python3Packages; + [ + # anki (pylib) runtime deps + decorator + distro + markdown + orjson + protobuf + requests + typing-extensions - # aqt runtime deps - beautifulsoup4 - flask - flask-cors - jsonschema - pip-system-certs - pyqt6 - pyqt6-sip - pyqt6-webengine - send2trash - waitress + # aqt runtime deps + beautifulsoup4 + flask + flask-cors + jsonschema + pip-system-certs + pyqt6 + pyqt6-sip + pyqt6-webengine + send2trash + waitress - # build-system deps (needed by uv for editable installs) - editables - hatchling - pathspec - pluggy - setuptools - trove-classifiers + # build-system deps (needed by uv for editable installs) + editables + hatchling + pathspec + pluggy + setuptools + trove-classifiers - # transitive deps - attrs - blinker - certifi - charset-normalizer - click - idna - itsdangerous - jinja2 - jsonschema-specifications - markupsafe - packaging - pip - pysocks - referencing - rpds-py - soupsieve - urllib3 - werkzeug - wrapt - ]; + # transitive deps + attrs + blinker + certifi + charset-normalizer + click + idna + itsdangerous + jinja2 + jsonschema-specifications + markupsafe + packaging + pip + pysocks + referencing + rpds-py + soupsieve + urllib3 + werkzeug + wrapt + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + anki-audio + anki-mac-helper + ]; src = fetchFromGitHub { owner = "ankitects"; diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json index a18415ffaf4c..11c396c48204 100644 --- a/pkgs/by-name/an/antigravity/information.json +++ b/pkgs/by-name/an/antigravity/information.json @@ -1,22 +1,22 @@ { - "version": "1.20.5", + "version": "1.20.6", "vscodeVersion": "1.107.0", "sources": { "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/linux-x64/Antigravity.tar.gz", - "sha256": "5b87664f454da487b8dee87aaf5e3361d9ba79b947770b798bd0fa874a9827e5" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/linux-x64/Antigravity.tar.gz", + "sha256": "ad382bf321a6216d07f95af1f613e03f5a07fdf6fc6632b769ce83d81afdd567" }, "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/linux-arm/Antigravity.tar.gz", - "sha256": "26fc65c4b538470ed1198f3d0ad855d1e4d81a9bfcbc607816b74de35999dbbf" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/linux-arm/Antigravity.tar.gz", + "sha256": "6e17f33d8ccb5622affb3590efccb87c3c4dd505f1d3b0f8506f1c20c39c026a" }, "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/darwin-x64/Antigravity.zip", - "sha256": "54fdcf8eac2eab176b04e587a5679d2993701fe4e5788e79f25c7ced2de605ef" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/darwin-x64/Antigravity.zip", + "sha256": "4e56f3ac83bc0e1803b4d811585d567f3795b14ad57ccec1fcfe8cb02f7cb719" }, "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.5-5474622945755136/darwin-arm/Antigravity.zip", - "sha256": "d3e6e75299062720a3300634305f2030ab8fcb4efb5ce8642305a576554caaca" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/darwin-arm/Antigravity.zip", + "sha256": "c4392cc64a52b7b7066cb1c21c32918854b7cd7297b7efa3b14397fc7d05ad5a" } } } diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix index 7c858507c0e0..8f4248f953b9 100644 --- a/pkgs/by-name/ap/api-linter/package.nix +++ b/pkgs/by-name/ap/api-linter/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "api-linter"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; tag = "v${finalAttrs.version}"; - hash = "sha256-Yx4UTxFJSc+tsA2u6IiSlzV9H7occ2qKtCm7zwv5PaA="; + hash = "sha256-xks5oKfJSMV4MbPFrYGWv82XeBLYbGgXF4r4kbFX93Q="; }; - vendorHash = "sha256-TiZRts1ruC0R5DQ5at7Z1c+zuGpD0f3D89X2b1gXA5s="; + vendorHash = "sha256-wPySRFqm396YRqEUZNMkA19SxqBNApwr8hm0PRA5cO0="; subPackages = [ "cmd/api-linter" ]; diff --git a/pkgs/by-name/ar/arc_unpacker/package.nix b/pkgs/by-name/ar/arc_unpacker/package.nix index 1d75fce17a12..302c9a9fd32f 100644 --- a/pkgs/by-name/ar/arc_unpacker/package.nix +++ b/pkgs/by-name/ar/arc_unpacker/package.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation { substituteInPlace CMakeLists.txt --replace-fail \ 'cmake_minimum_required(VERSION 2.8.8)' \ 'cmake_minimum_required(VERSION 3.10)' + + # boost 1.89 no longer provides boost_system as a separate CMake component + substituteInPlace CMakeLists.txt --replace-fail \ + 'find_package(Boost COMPONENTS filesystem system REQUIRED)' \ + 'find_package(Boost COMPONENTS filesystem REQUIRED)' ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 0d1a9ee009af..8d361268f807 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -272,6 +272,10 @@ url = "https://azcliprod.blob.core.windows.net/cli-extensions/rdbms_connect-${version}-py2.py3-none-any.whl"; hash = "sha256-66mX1K1azQvbuApyKBwvVuiKCbLaqezCDdrv0lhvVD0="; description = "Support for testing connection to Azure Database for MySQL & PostgreSQL servers"; + pythonRelaxDeps = [ + "mycli" + "pgcli" + ]; propagatedBuildInputs = (with python3Packages; [ pgcli diff --git a/pkgs/by-name/be/betterleaks/package.nix b/pkgs/by-name/be/betterleaks/package.nix new file mode 100644 index 000000000000..0c4d6b2358d0 --- /dev/null +++ b/pkgs/by-name/be/betterleaks/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "betterleaks"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "betterleaks"; + repo = "betterleaks"; + tag = "v${finalAttrs.version}"; + hash = "sha256-PJGFvm+QoExUMliL6rvBAKKjt8Ce5VZfQxCYbpXUXfU="; + }; + + vendorHash = "sha256-lIblIctRnq//ic+most3g9Ff92XhfqbFfHrLdI0beQQ="; + + ldflags = [ + "-s" + "-X=github.com/betterleaks/betterleaks/version.Version=${finalAttrs.version}" + ]; + + subPackages = [ + "." + ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + env.CGO_ENABLED = 0; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd betterleaks \ + --bash <($out/bin/betterleaks completion bash) \ + --fish <($out/bin/betterleaks completion fish) \ + --zsh <($out/bin/betterleaks completion zsh) + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/betterleaks"; + versionCheckProgramArg = "version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Scan code for secrets"; + homepage = "https://github.com/betterleaks/betterleaks"; + changelog = "https://github.com/betterleaks/betterleaks/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kachick + ]; + mainProgram = "betterleaks"; + }; +}) diff --git a/pkgs/by-name/bg/bgpdump/package.nix b/pkgs/by-name/bg/bgpdump/package.nix index 9a272ffe96fc..44a228c0fac2 100644 --- a/pkgs/by-name/bg/bgpdump/package.nix +++ b/pkgs/by-name/bg/bgpdump/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Analyze dump files produced by Zebra/Quagga or MRT"; license = lib.licenses.hpnd; maintainers = with lib.maintainers; [ lewo ]; - platforms = with lib.platforms; linux; + platforms = lib.platforms.unix; mainProgram = "bgpdump"; }; }) diff --git a/pkgs/by-name/bo/botan3/package.nix b/pkgs/by-name/bo/botan3/package.nix index c44b6e9eb5db..9c438d69082d 100644 --- a/pkgs/by-name/bo/botan3/package.nix +++ b/pkgs/by-name/bo/botan3/package.nix @@ -18,6 +18,11 @@ # build ESDM RNG plugin withEsdm ? false, + # build with jitterentropy RNG plugin, + # default disabled, health tests may fail without + # configuration of OSR and related parameters + # in jitterentropy + withJitterentropy ? false, # useful, but have to disable tests for now, as /dev/tpmrm0 is not accessible withTpm2 ? false, policy ? null, @@ -55,7 +60,7 @@ let ''; in stdenv.mkDerivation (finalAttrs: { - version = "3.10.0"; + version = "3.11.0"; pname = "botan"; __structuredAttrs = true; @@ -77,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "randombit"; repo = "botan"; tag = finalAttrs.version; - hash = "sha256-E4kKk4ry3SMn2DbnUTVx22lcAWDxxbo8DLyixjr/S6A="; + hash = "sha256-jjrO43SItFi+6FrU9B45Y1GK+6V5ZIgaYaMHkgRh4IE="; }; nativeBuildInputs = [ @@ -92,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [ tpm2-tss ] - ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ + ++ lib.optionals (withJitterentropy && !stdenv.hostPlatform.isMinGW) [ jitterentropy ] ++ lib.optionals (withEsdm && !stdenv.hostPlatform.isMinGW) [ @@ -129,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [ "--with-tpm2" ] - ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ + ++ lib.optionals (withJitterentropy && !stdenv.hostPlatform.isMinGW) [ "--enable-modules=jitter_rng" ] ++ lib.optionals (withEsdm && !stdenv.hostPlatform.isMinGW) [ diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix index 79ae0a37fc20..176dd895335b 100644 --- a/pkgs/by-name/ca/cadical/package.nix +++ b/pkgs/by-name/ca/cadical/package.nix @@ -106,5 +106,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; license = lib.licenses.mit; homepage = "https://fmv.jku.at/cadical/"; + mainProgram = "cadical"; }; }) diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 3fb3d27aaf79..0f54ac6ce4e3 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -296,7 +296,10 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://github.com/kovidgoyal/calibre/releases/tag/v${finalAttrs.version}"; license = if unrarSupport then lib.licenses.unfreeRedistributable else lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ pSub ]; + maintainers = with lib.maintainers; [ + pSub + sempiternal-aurora + ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 2cdb33275527..a25456d4e8ce 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "cdncheck"; - version = "1.2.26"; + version = "1.2.27"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${finalAttrs.version}"; - hash = "sha256-q7AK2v6GsyO4kDYTqpZzexJKxft3DyxmpQ71ji3SiIA="; + hash = "sha256-zGOtnjJaXs5BGcygwaR9kd6ZmEXU64Nu5td/8q6Hp0s="; }; vendorHash = "sha256-bYN119IyOkO9w+CWGwnCOXqpo4QHJV6iDuToMnTo0og="; diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index fd4de0829c6d..f00a2482d522 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -35,14 +35,14 @@ let in python3.pkgs.buildPythonApplication (finalAttrs: { pname = "checkov"; - version = "3.2.508"; + version = "3.2.510"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = finalAttrs.version; - hash = "sha256-3+0vvdDgrs0eRWiwv8CFl47Bm1W0fTzhJ2unvw2O7Bo="; + hash = "sha256-P64vAxt3+XJ8bUB5/tiO+ABagAQXHf8v4AVnFSNz7gM="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ci/circleci-cli/package.nix b/pkgs/by-name/ci/circleci-cli/package.nix index bedd2f5016d1..df8b17f1c26a 100644 --- a/pkgs/by-name/ci/circleci-cli/package.nix +++ b/pkgs/by-name/ci/circleci-cli/package.nix @@ -44,7 +44,7 @@ buildGoModule (finalAttrs: { Command to enable you to reproduce the CircleCI environment locally and run jobs as if they were running on the hosted CirleCI application. ''; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = [ ]; mainProgram = "circleci"; license = lib.licenses.mit; homepage = "https://circleci.com/"; diff --git a/pkgs/by-name/cl/claude-code-bin/manifest.json b/pkgs/by-name/cl/claude-code-bin/manifest.json index 4eb09a040b22..65c55afe22e6 100644 --- a/pkgs/by-name/cl/claude-code-bin/manifest.json +++ b/pkgs/by-name/cl/claude-code-bin/manifest.json @@ -1,46 +1,46 @@ { - "version": "2.1.77", - "buildDate": "2026-03-16T22:20:42Z", + "version": "2.1.78", + "buildDate": "2026-03-17T21:07:53Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "6426772419c758e71146725582d67f1dda42687c693c83def9ad3422bb81ebf1", - "size": 191188976 + "checksum": "0a4939f36bc0194021c56fa5c8470ad84e2282f2f404f1598a940c2044117168", + "size": 191585264 }, "darwin-x64": { "binary": "claude", - "checksum": "9be4a24a213cd3f475713e8fb7548c631aabdc355ca191e926ccb63f12976409", - "size": 197269232 + "checksum": "14d9193a85a6b191b090fd2a1ce261905cccf0bf6728239d7c2147719641963c", + "size": 197665520 }, "linux-arm64": { "binary": "claude", - "checksum": "f4303a1a3455b0ebbdd356c1337ae3076affc122fb79a78a2d1886e5c62f289c", - "size": 233092192 + "checksum": "75cf87465197883df61dcbb187d4ad3fc031bf91927658159929dcd2959542dc", + "size": 233493894 }, "linux-x64": { "binary": "claude", - "checksum": "34559c9cc9eeadc942d6731367aed3915b6b7351d98c61ebfebbd8fa59508ecd", - "size": 235864091 + "checksum": "b120a4139a4477a2719aeb0b2c790a5c2fe2d904e47f4e2adf3cab33b342d03a", + "size": 236265617 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "6e0fa4b8375637c96aafc9a53652bdd1db6dee159e0017a4b23b5f1243f6888e", - "size": 223627664 + "checksum": "2882a6412fd1109aedc9be76e798888cefbaecc1d7d20f0024932a80bbf051f7", + "size": 224029366 }, "linux-x64-musl": { "binary": "claude", - "checksum": "9608235989878d70a42f048db20d3b009d4dc3dd4c0cbf60280058a70a7c1cd9", - "size": 226461579 + "checksum": "7786b1b3aa8a4293800b6b34c93fd973d09865da1de2b970ba976c39f1bb50ac", + "size": 226863105 }, "win32-x64": { "binary": "claude.exe", - "checksum": "ba97366072c87110b130e886d071de19f29bbd1080db92d33c4ceadb5ba39611", - "size": 240405152 + "checksum": "c979e148d5431d3eaf00383d0a65a1793e7a9f160f0dc06561a85b17c7a8bd78", + "size": 240781984 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "fb703bb40c5ae851f0d8e34a5aee3bc8c8a996a63de1f874d10c06161bad4d98", - "size": 236599456 + "checksum": "eea099a2565559e44b6d884e74c827456d10bd4353b27004fc47a99142535265", + "size": 236975776 } } } diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 507edb5653d5..65b74b765f07 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.1.77", + "version": "2.1.78", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.1.77", + "version": "2.1.78", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 1f6cb38dbb53..7a12b4e5fc91 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -15,14 +15,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.1.77"; + version = "2.1.78"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-3bsFS3EZYbU8htlO7QtA9Qs8xlm0ZPz02bJ3ROZaugY="; + hash = "sha256-iyR20O4m1KFqrr2/zqRFVLCIMpvUiGghf/Uqy0T5czU="; }; - npmDepsHash = "sha256-spxAd9PEGRQFiGjaNRqGCu23PdmfwmBQyhT+gwTiTMs="; + npmDepsHash = "sha256-rhmItpljv64RgXK++WsuRM8fOJ/cGmOCtkaVywa4tqY="; strictDeps = true; diff --git a/pkgs/by-name/co/coc-texlab/package.nix b/pkgs/by-name/co/coc-texlab/package.nix index 8b566b4e0343..49abbcf6bbc6 100644 --- a/pkgs/by-name/co/coc-texlab/package.nix +++ b/pkgs/by-name/co/coc-texlab/package.nix @@ -36,18 +36,18 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "coc-texlab"; - version = "0-unstable-2026-03-07"; + version = "0-unstable-2026-03-11"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-texlab"; - rev = "104bbcdd5fbed16f765eb515fa0e0648d65879fe"; - hash = "sha256-G/SI/RwT5S8xNFSP5JTZI6tFbBN6LoE38CENTDZdQqo="; + rev = "4b0e8626f06a9396767468edd800501929483eda"; + hash = "sha256-HOZBojd6pqPPeOKeki2Fr23B5ew86ruEvPt9IAOJdMk="; }; yarnOfflineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-/cZaAIbQ/A87NE6FPhkyy8Junvd4MEdF7yfRKrS4vFM="; + hash = "sha256-iAEGe0QZrt+iSkR0MbjsrwpvJz89bP4Xj+NQfsOnL5s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/codd/generated.nix b/pkgs/by-name/co/codd/generated.nix index 142bb4f2baf0..a1c30784a9ef 100644 --- a/pkgs/by-name/co/codd/generated.nix +++ b/pkgs/by-name/co/codd/generated.nix @@ -41,7 +41,7 @@ }: mkDerivation { pname = "codd"; - version = "0.1.6"; + version = "0.1.8"; src = ./.; isLibrary = true; isExecutable = true; @@ -72,6 +72,7 @@ mkDerivation { unliftio unliftio-core unordered-containers + uuid vector ]; executableHaskellDepends = [ diff --git a/pkgs/by-name/co/codd/package.nix b/pkgs/by-name/co/codd/package.nix index a46f90429f8d..6550090382b8 100644 --- a/pkgs/by-name/co/codd/package.nix +++ b/pkgs/by-name/co/codd/package.nix @@ -14,18 +14,18 @@ ############## let - # Haxl has relatively tight version requirements and is thus often marked as broken. + # Haxl has relatively tight version requirements and is often marked as broken. haxlJailbroken = haskell.lib.markUnbroken (haskell.lib.doJailbreak haskellPackages.haxl); generated = haskellPackages.callPackage ./generated.nix { haxl = haxlJailbroken; }; derivationWithVersion = haskell.lib.compose.overrideCabal rec { - version = "0.1.6"; + version = "0.1.8"; src = fetchFromGitHub { owner = "mzabani"; repo = "codd"; tag = "v${version}"; - hash = "sha256-KdZCL09TERy/PolQyYYykEbPtG5yhxrLZSSo9n6p2WE="; + hash = "sha256-7MKlR3oepOwlBwiEpzz3NFepEYGqROT5RrYoe/vvBKM="; }; # We only run codd's tests that don't require postgresql nor strace. We need to support unix sockets in codd's test suite diff --git a/pkgs/by-name/co/codebraid/package.nix b/pkgs/by-name/co/codebraid/package.nix index 0e59af3aaca2..7a39b8d7d154 100644 --- a/pkgs/by-name/co/codebraid/package.nix +++ b/pkgs/by-name/co/codebraid/package.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication (finalAttrs: { with support for rich output like plots. ''; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = [ ]; mainProgram = "codebraid"; }; }) diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix index 985d8f1249f9..b66eaa36c5fc 100644 --- a/pkgs/by-name/co/composer-require-checker/package.nix +++ b/pkgs/by-name/co/composer-require-checker/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "composer-require-checker"; - version = "4.21.0"; + version = "4.22.0"; # Upstream no longer provides the composer.lock in their release artifact src = fetchgit { url = "https://github.com/maglnet/ComposerRequireChecker"; tag = finalAttrs.version; - hash = "sha256-Vr87mIljmov6owtQ8vo3e4bTOQx2x0zDtcyEUSt+ti0="; + hash = "sha256-L/jhVJxZOa3oIahVI85VoueFHUIuzKsQGum4127Psbg="; }; - vendorHash = "sha256-0hJu+k0iYdj0WnsFVuXdGQy5J82xKCGF3qg/zNsgj5s="; + vendorHash = "sha256-aAXFEtlQ89k7GjSQOPkN5kRg0GbAO46MACSzDL9LK34="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/co/contact/package.nix b/pkgs/by-name/co/contact/package.nix index 71a7177aad4a..0f230b0e2ad7 100644 --- a/pkgs/by-name/co/contact/package.nix +++ b/pkgs/by-name/co/contact/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "contact"; - version = "1.4.17"; + version = "1.4.22"; pyproject = true; src = fetchFromGitHub { owner = "pdxlocations"; repo = "contact"; tag = finalAttrs.version; - hash = "sha256-EQNKljdySxujpoAaA43jHfh39K2BW5/Autt06dlijpk="; + hash = "sha256-Kf6q5CNS+kzs+5gkKAS40+5RnsQ4FAsh8OQaH5Ii17Y="; }; dependencies = [ python3Packages.meshtastic ]; diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index a084ae9b78e6..66291738e081 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "coroot-node-agent"; - version = "1.28.3"; + version = "1.29.0"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot-node-agent"; rev = "v${finalAttrs.version}"; - hash = "sha256-1jwj6saABm1RFmqO0c5ViFTveRmlsmrNZ5D7P6HtWMc="; + hash = "sha256-WaRPXqf7L26I46jdWEHZpYSwa7c3Ow5Ld1RcOOdZUow="; }; vendorHash = "sha256-OOd3OctfklHzpMVDCnnb8HYPYqWQgBe+8HfbSm7dXzg="; diff --git a/pkgs/by-name/de/deadlock-mod-manager/no-updater-artifacts.patch b/pkgs/by-name/de/deadlock-mod-manager/no-updater-artifacts.patch index dd28c3a93fa8..6a10e7042dac 100644 --- a/pkgs/by-name/de/deadlock-mod-manager/no-updater-artifacts.patch +++ b/pkgs/by-name/de/deadlock-mod-manager/no-updater-artifacts.patch @@ -7,6 +7,6 @@ index ed05fce..e1649e0 100644 }, "active": true, - "createUpdaterArtifacts": true, - "targets": "all", + "targets": ["deb", "rpm"], "icon": [ "icons/32x32.png", \ No newline at end of file diff --git a/pkgs/by-name/de/deadlock-mod-manager/package.nix b/pkgs/by-name/de/deadlock-mod-manager/package.nix index 66fa7a6a4829..384df971f063 100644 --- a/pkgs/by-name/de/deadlock-mod-manager/package.nix +++ b/pkgs/by-name/de/deadlock-mod-manager/package.nix @@ -27,19 +27,19 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "deadlock-mod-manager"; - version = "0.14.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "deadlock-mod-manager"; repo = "deadlock-mod-manager"; tag = "v${finalAttrs.version}"; - hash = "sha256-A7RsgPi3NlcLSBkLg7/pWcSduaZyCspz19sjGjzEkqM="; + hash = "sha256-rsOaCgP7ub4FkTkg1VWPZyf+N2I0qM0DCIIqBpJZCVg="; }; cargoRoot = "apps/desktop"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-L4orWiK1s1hfC2QDJ8G4hI1iqrdPHBaVTVHoW0hdlGo="; + cargoHash = "sha256-aUtJzgjc9reFxUVMRwqCd2lNMRALlfMkfIRN4QT3g+E="; nativeBuildInputs = [ rustPlatform.cargoSetupHook @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpm = pnpm_9; fetcherVersion = 2; sourceRoot = "source"; - hash = "sha256-KhBWFujjo3FW3intvGA2Y7eLIdJ1B/4P5xIRPvzygT8="; + hash = "sha256-oQxW0q+myMllwLQd+GRXXvnce+bYtwTLEEwFU0nupv4="; }; patches = [ diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index 52753b1f4e56..80fa132e1174 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -30,14 +30,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "debian-devscripts"; - version = "2.26.5"; + version = "2.26.6"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "devscripts"; tag = "v${finalAttrs.version}"; - hash = "sha256-Fwl7UGIe0DcqKRWC/rm1Sa1DfxX4I35yJVSmfxERK6k="; + hash = "sha256-OoaugAlaS6JaSNHSn21XOVmC43MW5ggCSDSq8O271c8="; }; patches = [ diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index d76760555644..51d307c2a2e2 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -23,16 +23,16 @@ }: let - version = "2.0.4"; + version = "2.0.5"; devenvNixVersion = "2.32"; - devenvNixRev = "41eee9d3b1f611b1b90d51caa858b6d83834c44a"; + devenvNixRev = "ef483d53f25990bf0b4fd39f5414f885977ebd85"; nix_components = (nixVersions.nixComponents_git.overrideSource (fetchFromGitHub { owner = "cachix"; repo = "nix"; rev = devenvNixRev; - hash = "sha256-vtf03lfgQKNkPH9FdXdboBDS5DtFkXB8xRw5EBpuDas="; + hash = "sha256-eY8JFns4OeEidye8VIW68LSoykbPO0bQujvQVLLK7Qg="; })).overrideScope ( finalScope: prevScope: { @@ -48,10 +48,10 @@ rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; tag = "v${version}"; - hash = "sha256-wPH6q2PSP64doUXHqdEAmY68X4IAeC2UjSIyqzoUYwE="; + hash = "sha256-8tO3NLG9Lc/NUee0Owcf/z63TNTrUcx7eVRxSb294rk="; }; - cargoHash = "sha256-CzhdUrNAAhCVnXZCk06djnBv1cczhj7tIG/JRmaBX5c="; + cargoHash = "sha256-ecntFSPDWblllDtS/D086UKtQJG9La4TGEBhP3q0CfY="; env = { RUSTFLAGS = "--cfg tracing_unstable"; diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 122288e15f51..a2ea5ea3dfd2 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -4,6 +4,7 @@ lib, fetchFromGitLab, fetchgit, + gitUpdater, cmake, ninja, @@ -62,14 +63,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "digikam"; - version = "8.8.0"; + version = "9.0.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "graphics"; repo = "digikam"; tag = "v${finalAttrs.version}"; - hash = "sha256-yUrB0FXUcm+6QtlB7HMqdPpdhrV2iAo1oRkjgsHJiCU="; + hash = "sha256-zYOtTL4qEjXa/ZYlDIvneziYBXq4tIiVjRsrSJMaS0k="; }; patches = [ @@ -199,13 +200,17 @@ stdenv.mkDerivation (finalAttrs: { # over 3h in a normal build slot (2 cores requiredSystemFeatures = [ "big-parallel" ]; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = { description = "Photo management application"; homepage = "https://www.digikam.org/"; changelog = "${finalAttrs.src.meta.homepage}-/blob/master/project/NEWS.${finalAttrs.version}"; sourceProvenance = [ lib.sourceTypes.fromSource ]; license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ philipdb ]; platforms = lib.platforms.linux; mainProgram = "digikam"; }; diff --git a/pkgs/by-name/di/direwolf-unstable/package.nix b/pkgs/by-name/di/direwolf-unstable/package.nix index 227cda7815d7..20bf9ba0624f 100644 --- a/pkgs/by-name/di/direwolf-unstable/package.nix +++ b/pkgs/by-name/di/direwolf-unstable/package.nix @@ -12,13 +12,13 @@ inherit hamlibSupport gpsdSupport extraScripts; }).overrideAttrs (oldAttrs: { - version = "1.8.1-unstable-2026-03-09"; + version = "1.8.1-unstable-2026-03-12"; src = fetchFromGitHub { owner = "wb2osz"; repo = "direwolf"; - rev = "3b20d8210a1d6f77073fd3452bbe87a21ee35a79"; - hash = "sha256-w/D5RO5dfcTh3nCOxe/GaHTSbzCYm+J1cJCt1K9lAaw="; + rev = "0663670550073c9d89917d5ac78df65e551d237a"; + hash = "sha256-4A9595Z3to/HBW1WS1mLYQDGokmSz3ClfRDhsLxIj0E="; }; dontVersionCheck = true; diff --git a/pkgs/by-name/dn/dns-collector/package.nix b/pkgs/by-name/dn/dns-collector/package.nix index c17f2e2fdaf9..49b52af19d61 100644 --- a/pkgs/by-name/dn/dns-collector/package.nix +++ b/pkgs/by-name/dn/dns-collector/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "dns-collector"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "dmachard"; repo = "dns-collector"; tag = "v${finalAttrs.version}"; - hash = "sha256-b1fKxjdZpCuPg+lRhpYn8tjVOqQU1kyhta63G+8Pxr4="; + hash = "sha256-497qilu1/76XbAO3fKIRpDWjQaCmdDgdxswkE5y8pNU="; }; subPackages = [ "." ]; @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { "-X github.com/prometheus/common/version.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-UNp2lttwBQM9Xx6+aOQGKdOgeMBsyCHQdhCAbyvDCN4="; + vendorHash = "sha256-4gvGqNPRdB/t498WBF9vTqyuTl2rkAo7nRvNEpTMPqY="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix index 824f0b724828..cc24f397e683 100644 --- a/pkgs/by-name/do/doctl/package.nix +++ b/pkgs/by-name/do/doctl/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "doctl"; - version = "1.151.0"; + version = "1.152.0"; vendorHash = null; @@ -42,7 +42,7 @@ buildGoModule (finalAttrs: { owner = "digitalocean"; repo = "doctl"; tag = "v${finalAttrs.version}"; - hash = "sha256-E/WehmqEfsOJDdssIV4PQpKAEAyS+VnG17jbd0OxD8U="; + hash = "sha256-LC7eriG9WqoCzb5bkXPWQO3kH9QXkBwRQmqxOb9yL7s="; }; meta = { diff --git a/pkgs/by-name/do/dokieli/missing-hashes.json b/pkgs/by-name/do/dokieli/missing-hashes.json index 5a509d9d4615..3db740934d9f 100644 --- a/pkgs/by-name/do/dokieli/missing-hashes.json +++ b/pkgs/by-name/do/dokieli/missing-hashes.json @@ -49,24 +49,5 @@ "@rollup/rollup-win32-arm64-msvc@npm:4.57.1": "c1604ca04c0983fc4cb3b4fcfc546ed30d96b8845445b1f99e7c8ce0800866a6ed0ecae58f4c8fbf5f02aaa9aefc5eebfa7a003fe74e63b96630d8b0ee51a8b8", "@rollup/rollup-win32-ia32-msvc@npm:4.57.1": "bf3146adcd2cd3a63bfe51b92355ec2a7ec2c004e778b620ea14bfc401b34ffa0e0087a4b2ede0f600a25f4842aaedaffac1d5e67fcb315a0b5507291656e07f", "@rollup/rollup-win32-x64-gnu@npm:4.57.1": "cdd850fe4136b5d5649cacde8604391487ca9105dd7ef53817d9d9fd0ee80400608cff44f2810451aef5067fe05a31fe2f038c9aec59094fad00e3c8c54504c5", - "@rollup/rollup-win32-x64-msvc@npm:4.57.1": "4097849e2a9699531cab315c76576490c4318c8ca5d5a88c775cc94513cfccb66c0f54fc43203ab4b596a37f46d2d72eb341e03b0d5ec7d2bf47adb8651e59e4", - "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc", - "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d", - "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f", - "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "3aeff9aaf4ef6d786c517d9017b5c41b0af180cdbaf705d08e6e5b5ba9d5410d28ef6754c5f8a865f0bb5efd460dc1c4156b5e2201032c0a604a6c734ddbc848", - "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "b9f7a3e03db9edfc3480db056dd25229f901f21840ee768b69f349b66676a995a404e60617b3bcbd984f57f2199eb352dd6fad0f4420c3084ceef5e3293cdad5", - "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "4d03b8bcef5a90586a846d6d332f39cee211f3d330b6e10036969894b6ecfb70b047265e985d572def93b84f38621dec30e4b4bb42699dd784adbae3ca5e7bea", - "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "9f3a3c2e5e6418a5a78294fa042824f5c270e993c1a99e82dd6b0ee0d2869929bb62dd154a0acc1e4ef16273e8073e0e257901208c062e6bdd49d586d07bb419", - "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "05228d6fd669f404f0e3164ccf2430a52cc7b3bbd211367527b5d726b1220a1816bab70159bed55694d9b7543553f6002379e7e186c605d7055c5156977da022", - "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "8115802143396d4992bb2f6f0acb6e8bc141a57864c5fd84cbc70577c25784cb08dd163b753b1fc0decc02582cf4cb1e30d04faaf763048babbbe706bdfa26ea", - "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "50f9f54b2eafb1ea023671cc3070692b2b15f6e49105b08b3f588033e65e8de4183f76e080b798de710f9c41df1bf5515c01868866a21cbd35db179b4ac9f23b", - "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "8f8222f938cc2025ed3971e0e303f4ff5aa5df74474b835442830ebe942d050ba3f8bbb67095da64099e6fc69bb5bb73ca63db54e059c95e51aa8909880fb207", - "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "5c8987f7dcaf38ef27ec67dcf118141502d5ac75d28429da6d1b7037f3e5a5351f32f55094472fde11784e65d01f1da4dafd7c0fdca28423fbc8de2c2c51d16c", - "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "17aed6472880a82e5a05147a55efb6f0d968f5dcb584845addf89acec3824534ee741d4b162686124d17daf9131373c469c57843996a5ee2db4f1b1b55e1d11e", - "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "9495c08fc42f2d4a33e33c64adbcbf51588cd7ea07478eacb2e9143d955a760122440f4a3ac48b086cc2563ca2b2464d72ed0336fcc20c0a89ddc356f956eda8", - "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "c84fadfee66eeebd16eb7cce7c4b5a1ec90260c724d0064111e9f43a1341ebfede61627cb68fd3a9735e4c10b25606fb472a4d13143cc569867b80d85c4a9824", - "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5", - "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9", - "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854", - "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940" + "@rollup/rollup-win32-x64-msvc@npm:4.57.1": "4097849e2a9699531cab315c76576490c4318c8ca5d5a88c775cc94513cfccb66c0f54fc43203ab4b596a37f46d2d72eb341e03b0d5ec7d2bf47adb8651e59e4" } diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix index 5660e4e4b39f..13a014dd6193 100644 --- a/pkgs/by-name/do/dokieli/package.nix +++ b/pkgs/by-name/do/dokieli/package.nix @@ -16,19 +16,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dokieli"; - version = "0-unstable-2026-03-01"; + version = "0-unstable-2026-03-17"; src = fetchFromGitHub { owner = "dokieli"; repo = "dokieli"; - rev = "85f9e08e41ffd815db39b1524bf880cbb5775a66"; - hash = "sha256-EexIbwtENincgdzzbvNVq/dbJKly0uJGoXDT7G/3/Gs="; + rev = "ea9e0b4a4d374a87abc76365b44e7d24017206a6"; + hash = "sha256-KJbnXRSUvKGm6q8koZYoNGMaSO5u8xCoA3hDWOCgIx4="; }; missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-kXNev+L8DvDm8kUrCEWOSp7Es3WnCL3kfDLozrZ5/1U="; + hash = "sha256-fhwuF0ELHw2avw8pnZUXPVkq+MJjuynFTBAU6O92mLM="; }; buildPhase = '' diff --git a/pkgs/by-name/el/elan/package.nix b/pkgs/by-name/el/elan/package.nix index 11068cf6d36e..a73532dbe5b0 100644 --- a/pkgs/by-name/el/elan/package.nix +++ b/pkgs/by-name/el/elan/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "elan"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${finalAttrs.version}"; - hash = "sha256-pbzZTdvjxIqzEDzE38rjeJ/lgHx8NRTD3osVP/A7nHo="; + hash = "sha256-NSgzAYQjsf3lwYOiuJbkLJGRZ7rY2FEOjPORXNhjWuU="; }; - cargoHash = "sha256-fuXmI/IxxYooc8C5otH5BlCHv7SsfWevw4i9tW65rno="; + cargoHash = "sha256-JzyDVFp1lGPk1IK6CLQMBcJi5yCVD9x1iXtN0wlOF3g="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/en/ente-auth/0001-disable-updates.patch b/pkgs/by-name/en/ente-auth/0001-disable-updates.patch deleted file mode 100644 index 512106f8d853..000000000000 --- a/pkgs/by-name/en/ente-auth/0001-disable-updates.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/auth/lib/services/update_service.dart b/auth/lib/services/update_service.dart -index 716d553f1b..3946d87a7d 100644 ---- a/lib/services/update_service.dart -+++ b/lib/services/update_service.dart -@@ -134,9 +134,7 @@ class UpdateService { - } - - bool isIndependent() { -- return flavor == "independent" || -- _packageInfo.packageName.endsWith("independent") || -- PlatformUtil.isDesktop(); -+ return false; - } - } - \ No newline at end of file diff --git a/pkgs/by-name/en/ente-auth/git-hashes.json b/pkgs/by-name/en/ente-auth/git-hashes.json index 9b594708a9d6..1363dc639893 100644 --- a/pkgs/by-name/en/ente-auth/git-hashes.json +++ b/pkgs/by-name/en/ente-auth/git-hashes.json @@ -1,5 +1,5 @@ { - "ente_crypto_dart": "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=", + "ente_crypto_dart": "sha256-/Pz9HPyQ6ts/sbqopShRSQCC99seiE5pCK0pR5mNji8=", "fk_user_agent": "sha256-GmuQPohnTi4SVta1FyEErOb7n0Jp6UdLcX/Cf+koJNA=", "flutter_local_authentication": "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=", "move_to_background": "sha256-cLH3vUrPmEtYKlfn2hi6Wl4JQG4dt9aEyTmVCj7zBe0=", diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index 13a9da94e9c6..ceee123b2076 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -2,30 +2,29 @@ lib, flutter332, fetchFromGitHub, - sqlite, libayatana-appindicator, makeDesktopItem, copyDesktopItems, makeWrapper, jdk17_headless, - yq-go, }: let # fetch simple-icons directly to avoid cloning with submodules, # which would also clone a whole copy of flutter simple-icons = fetchFromGitHub (lib.importJSON ./simple-icons.json); desktopId = "io.ente.auth"; + flutter = flutter332; in -flutter332.buildFlutterApplication rec { +flutter.buildFlutterApplication rec { pname = "ente-auth"; - version = "4.4.12"; + version = "4.4.17"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "mobile" ]; tag = "auth-v${version}"; - hash = "sha256-1GJWGTzErV+wSkeAg3z0u7tBPFrq6hPc0fWniKT8w9M="; + hash = "sha256-qnjOrct70TaaO91QBHcbRIkzLZGH6mbpuLAAKE9k/es="; }; sourceRoot = "${src.name}/mobile/apps/auth"; @@ -33,15 +32,43 @@ flutter332.buildFlutterApplication rec { pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = lib.importJSON ./git-hashes.json; - patches = [ - # Disable update notifications and auto-update functionality - ./0001-disable-updates.patch - ]; + customSourceBuilders.ente_strings = + { version, src, ... }: + # There currently is no covenient way to setup the flutter SDK outside of apps + # and we can't move this to the app's own build phase as it would still reference + # the immutable source variant without the generated l10n files. + flutter.buildFlutterApplication { + inherit version src; + inherit (src) passthru; + pname = "ente_strings"; + sourceRoot = "${src.name}/mobile/packages/strings"; + pubspecLock = lib.importJSON ./strings.pubspec.lock.json; + + buildPhase = '' + runHook preBuild + + flutter gen-l10n + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + # The $debug output can't be disabled for buildFlutterApplication. + # The $out structure must match that of ente-auth to correctly resolve + # the package as pubspec uses relative paths for workspace packages. + mkdir -p $debug $out/mobile/{apps/auth,packages} + rm pubspec.lock + cp -r . $out/mobile/packages/strings + + runHook postInstall + ''; + }; postPatch = '' rmdir assets/simple-icons ln -s ${simple-icons} assets/simple-icons - ${lib.getExe yq-go} -i 'del(.dependencies.sqlite3_flutter_libs)' pubspec.yaml ''; nativeBuildInputs = [ @@ -50,7 +77,6 @@ flutter332.buildFlutterApplication rec { ]; buildInputs = [ - sqlite libayatana-appindicator # The networking client used by ente-auth (native_dio_adapter) # introduces a transitive dependency on Java, which technically @@ -63,6 +89,11 @@ flutter332.buildFlutterApplication rec { # https://github.com/juliansteenbakker/flutter_secure_storage/issues/965 env.CXXFLAGS = toString [ "-Wno-deprecated-literal-operator" ]; + flutterBuildFlags = [ + # Disable update notifications and auto-update functionality + "--dart-define=app.flavor=independent" + ]; + # Based on https://github.com/ente-io/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml # and https://github.com/ente-io/ente/blob/main/auth/linux/packaging/enteauth.appdata.xml desktopItems = [ diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json index 3238c7d01ca7..ed5917dd813d 100644 --- a/pkgs/by-name/en/ente-auth/pubspec.lock.json +++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json @@ -414,11 +414,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110", + "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.1.2" + "version": "11.5.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -450,15 +450,6 @@ "source": "hosted", "version": "2.1.1" }, - "dir_utils": { - "dependency": "direct main", - "description": { - "path": "../../packages/dir_utils", - "relative": true - }, - "source": "path", - "version": "1.0.0" - }, "dots_indicator": { "dependency": "direct main", "description": { @@ -526,17 +517,35 @@ "source": "path", "version": "1.0.0" }, - "ente_crypto_dart": { + "ente_crypto_api": { "dependency": "direct main", + "description": { + "path": "../../packages/ente_crypto_api", + "relative": true + }, + "source": "path", + "version": "0.0.1" + }, + "ente_crypto_dart": { + "dependency": "transitive", "description": { "path": ".", "ref": "HEAD", - "resolved-ref": "f91e1545f8263df127762240c4da54a0c42835b2", + "resolved-ref": "dc995b62d6ec5bca3ba47966685b2af3c42235b2", "url": "https://github.com/ente-io/ente_crypto_dart.git" }, "source": "git", "version": "1.0.0" }, + "ente_crypto_dart_adapter": { + "dependency": "direct main", + "description": { + "path": "../../packages/ente_crypto_dart_adapter", + "relative": true + }, + "source": "path", + "version": "0.0.1" + }, "ente_events": { "dependency": "direct main", "description": { @@ -573,6 +582,15 @@ "source": "path", "version": "1.0.0" }, + "ente_pure_utils": { + "dependency": "direct main", + "description": { + "path": "../../packages/ente_pure_utils", + "relative": true + }, + "source": "path", + "version": "1.0.0" + }, "ente_qr": { "dependency": "direct main", "description": { @@ -601,7 +619,7 @@ "version": "1.0.0" }, "ente_utils": { - "dependency": "direct overridden", + "dependency": "direct main", "description": { "path": "../../packages/utils", "relative": true @@ -1275,6 +1293,16 @@ "source": "hosted", "version": "6.9.5" }, + "launcher_icon_switcher": { + "dependency": "direct main", + "description": { + "name": "launcher_icon_switcher", + "sha256": "a1e0778ed016107077f54f22b4987f322315de8d3df31a6ed494134f55c0ff41", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.2" + }, "leak_tracker": { "dependency": "transitive", "description": { @@ -1777,6 +1805,15 @@ "source": "hosted", "version": "0.11.0" }, + "scoped_dir_access": { + "dependency": "direct main", + "description": { + "path": "../../packages/scoped_dir_access", + "relative": true + }, + "source": "path", + "version": "1.0.0" + }, "screen_retriever": { "dependency": "transitive", "description": { @@ -2103,6 +2140,16 @@ "source": "hosted", "version": "2.7.6" }, + "sqlite3_flutter_libs": { + "dependency": "direct main", + "description": { + "name": "sqlite3_flutter_libs", + "sha256": "e07232b998755fe795655c56d1f5426e0190c9c435e1752d39e7b1cd33699c71", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.34" + }, "stack_trace": { "dependency": "transitive", "description": { @@ -2477,11 +2524,11 @@ "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.5" + "version": "2.1.0" }, "window_manager": { "dependency": "direct main", diff --git a/pkgs/by-name/en/ente-auth/strings.pubspec.lock.json b/pkgs/by-name/en/ente-auth/strings.pubspec.lock.json new file mode 100644 index 000000000000..e90f6b6ec139 --- /dev/null +++ b/pkgs/by-name/en/ente-auth/strings.pubspec.lock.json @@ -0,0 +1,272 @@ +{ + "packages": { + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.3" + }, + "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_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.20.2" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.9" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.9" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.17" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.16.0" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.1" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.4" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.0.0" + } + }, + "sdks": { + "dart": ">=3.7.0-0 <4.0.0", + "flutter": ">=3.18.0-18.0.pre.54" + } +} diff --git a/pkgs/by-name/en/ente-auth/update.sh b/pkgs/by-name/en/ente-auth/update.sh index caec2206d422..37b16a732435 100755 --- a/pkgs/by-name/en/ente-auth/update.sh +++ b/pkgs/by-name/en/ente-auth/update.sh @@ -20,13 +20,19 @@ echo "Updating to $short_version" mobile_tree="$(gh-curl "https://api.github.com/repos/ente-io/ente/git/trees/$version" | gojq '.tree[] | select(.path == "mobile") | .url' --raw-output)" apps_tree="$(gh-curl "$mobile_tree" | gojq '.tree[] | select(.path == "apps") | .url' --raw-output)" auth_tree="$(gh-curl "$apps_tree" | gojq '.tree[] | select(.path == "auth") | .url' --raw-output)" +packages_tree="$(gh-curl "$mobile_tree" | gojq '.tree[] | select(.path == "packages") | .url' --raw-output)" +strings_tree="$(gh-curl "$packages_tree" | gojq '.tree[] | select(.path == "strings") | .url' --raw-output)" pushd "$pkg_dir" -# Get lockfile, filter out incompatible sqlite dependency and convert to JSON +# Get lockfile and convert to JSON echo "Updating lockfile" pubspec_lock="$(gh-curl "$auth_tree" | gojq '.tree[] | select(.path == "pubspec.lock") | .url' --raw-output)" -gh-curl "$pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input 'del(.packages.sqlite3_flutter_libs)' > pubspec.lock.json +gh-curl "$pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input > pubspec.lock.json + +echo "Updating strings lockfile" +strings_pubspec_lock="$(gh-curl "$strings_tree" | gojq '.tree[] | select(.path == "pubspec.lock") | .url' --raw-output)" +gh-curl "$strings_pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input > strings.pubspec.lock.json echo "Updating git hashes" ./fetch-git-hashes.py diff --git a/pkgs/by-name/en/entr/package.nix b/pkgs/by-name/en/entr/package.nix index 00b50dae92af..cb687415995e 100644 --- a/pkgs/by-name/en/entr/package.nix +++ b/pkgs/by-name/en/entr/package.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ pSub - synthetica ]; mainProgram = "entr"; }; diff --git a/pkgs/by-name/fa/fakedir/package.nix b/pkgs/by-name/fa/fakedir/package.nix new file mode 100644 index 000000000000..4103cc9c7133 --- /dev/null +++ b/pkgs/by-name/fa/fakedir/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fakedir"; + version = "0-unstable-2025-12-02"; + + src = fetchFromGitHub { + owner = "nixie-dev"; + repo = "fakedir"; + rev = "82bfac1f58a76f56fc4ef928982f507e01c552a5"; + hash = "sha256-wPseLfbRffX0Pr4TxJh59cmuY1OEfSDTvM2KrORafKs="; + }; + + CFLAGS = "-Ofast -DSTRIP_DEBUG"; + + installPhase = '' + install -Dm755 libfakedir.dylib $out/lib/libfakedir.dylib + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version=branch" + "--version-regex=(0-unstable-.*)" + ]; + }; + + meta = { + description = "Substitutes a directory elsewhere on macOS by replacing system calls"; + homepage = "https://github.com/nixie-dev/fakedir"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ eveeifyeve ]; + mainProgram = "fakedir"; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/fa/fastdds/package.nix b/pkgs/by-name/fa/fastdds/package.nix new file mode 100644 index 000000000000..94d46e30e87d --- /dev/null +++ b/pkgs/by-name/fa/fastdds/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + openssl, + asio, + tinyxml-2, + openjdk11, + python3, + foonathan-memory, + fastcdr, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fastdds"; + version = "3.4.2"; + + src = fetchFromGitHub { + owner = "eProsima"; + repo = "Fast-DDS"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-NTdkGRbE4yVMMZ/PqLC2nZYD0uIcmo1tr+ieOBSijCM="; + }; + + nativeBuildInputs = [ + cmake + openjdk11 + pkg-config + ]; + + buildInputs = [ + openssl + asio + tinyxml-2 + foonathan-memory + fastcdr + python3 + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DBUILD_SHARED_LIBS=ON" + "-DSECURITY=ON" + "-DCOMPILE_EXAMPLES=OFF" + "-DCMAKE_PREFIX_PATH=${foonathan-memory}" + ]; + + meta = { + description = "C++ implementation of the DDS (Data Distribution Service) standard"; + homepage = "https://github.com/eProsima/Fast-DDS"; + license = lib.licenses.asl20; + longDescription = '' + eProsima Fast DDS is a C++ implementation of the DDS (Data Distribution Service) standard + of the OMG (Object Management Group). It implements the RTPS (Real Time Publish Subscribe) + protocol, which provides publisher-subscriber communications over unreliable transports + such as UDP, as defined and maintained by the Object Management Group (OMG) consortium. + ''; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix index 630e58f21a34..db6d1a670cf3 100644 --- a/pkgs/by-name/fa/fastly/package.nix +++ b/pkgs/by-name/fa/fastly/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "fastly"; - version = "14.0.4"; + version = "14.1.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-QFmxEJT7r6Ijr8f9x7YZxpPVlP8A7ea6kgVB/qAHUBE="; + hash = "sha256-IXfxrBHrVBAY9yakbBiWl2oBXFCnXxPz6l1avJab9kE="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { "cmd/fastly" ]; - vendorHash = "sha256-MnAsEKdsuCQGMyU05ljzeJdaiPki6JikHRd1q9lhmtk="; + vendorHash = "sha256-9B47qGdSmNJcEI3kVwV2dyQmFbFrPMCX8izNjqbrFdk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fi/filebrowser-quantum/package.nix b/pkgs/by-name/fi/filebrowser-quantum/package.nix index df9cef0c6285..ab80d372ed04 100644 --- a/pkgs/by-name/fi/filebrowser-quantum/package.nix +++ b/pkgs/by-name/fi/filebrowser-quantum/package.nix @@ -6,13 +6,13 @@ }: let - version = "1.1.0-stable"; + version = "1.2.2-stable"; src = fetchFromGitHub { owner = "gtsteffaniak"; repo = "filebrowser"; tag = "v${version}"; - hash = "sha256-S3MtqIqmFYDY053HX8yYGxHc6ev0Y8eXbe24TL8PtYQ="; + hash = "sha256-MWFBoVr5WRfLhDUGEGS6ntb3v23HcOcm91x3fGriM2A="; }; frontend = buildNpmPackage { @@ -20,7 +20,7 @@ let inherit version src; sourceRoot = "${src.name}/frontend"; - npmDepsHash = "sha256-pJR5m1XrqeHwOADWMnFDtHivaKCBqqdG2O6fWql7ugA="; + npmDepsHash = "sha256-brW5YR/DNBOCPBDMEjSzyk+YTbrP5ppdQ0US/DLbyIs="; buildPhase = '' runHook preBuild @@ -47,7 +47,7 @@ buildGoModule { sourceRoot = "${src.name}/backend"; - vendorHash = "sha256-t4cREfkj+z+EvgXjzqYc8xs0jhTMUZMjcHxkkuuLpZs="; + vendorHash = "sha256-pU5qtWvhLbMdxzXK6uKxEkvbZdb2oa4ZHKaCPm0bIwU="; preBuild = '' mkdir -p http/embed diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index c1cddfa2012d..523aa06e553d 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "files-cli"; - version = "2.15.211"; + version = "2.15.220"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${finalAttrs.version}"; - hash = "sha256-iN56+OV0xjPtj5SajVF7HkUAWv4dPxlPDhnwSo+Nb80="; + hash = "sha256-EK9gvojot0pp3vkwzwKjr3rZI9IxPbp5Ng5tTzZawKQ="; }; - vendorHash = "sha256-FOH+S6T5luTrrKZRC1EzUvwBlWpMuW7QCYdtHlx+7EU="; + vendorHash = "sha256-JeJ7BjRt2zofl1W5wU+FMInPZ9w1Uu9ez9JWjos14Qs="; ldflags = [ "-s" diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix index 4dd8ee49453a..3f742a5b23ce 100644 --- a/pkgs/by-name/fl/fluxcd/package.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -10,10 +10,10 @@ }: let - version = "2.8.2"; - srcHash = "sha256-2UBnOtTdYkzHioGUHtAd0vwqpCouk/uaNvYmjmwc4F0="; - vendorHash = "sha256-W6Vgvb4pPexHxx7t8IIfBWyC3c5jUr9KxaR8k5QUUpw="; - manifestsHash = "sha256-mYIn7tzsKmx9Wx2WCrztyD3IVLI3pF7robv25HPiCx4="; + version = "2.8.3"; + srcHash = "sha256-5bs7atecd7NqUrJySMxOe01zGpTMbgrau5B6QkUTRyg="; + vendorHash = "sha256-ICI9Lace4gv2GE/nb9y5yRlvsOkujr2DA2gQ8PnIrIs="; + manifestsHash = "sha256-V1rWHu23K4224eiwUuueG2vk3LsdgtvVGZVQG5vBhLQ="; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix index 69c0bc0bc327..cbe60006ecba 100644 --- a/pkgs/by-name/fx/fx/package.nix +++ b/pkgs/by-name/fx/fx/package.nix @@ -32,6 +32,11 @@ buildGoModule (finalAttrs: { --zsh <($out/bin/fx --comp zsh) ''; + checkFlags = lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ + # flaky only on x86_64 darwin, https://hydra.nixos.org/build/319903711 + "-skip=^TestSearchCaching" + ]; + nativeInstallCheckInputs = [ versionCheckHook writableTmpDirAsHomeHook diff --git a/pkgs/by-name/ge/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix index 495c3971be02..e4367cb74561 100644 --- a/pkgs/by-name/ge/geoserver/extensions.nix +++ b/pkgs/by-name/ge/geoserver/extensions.nix @@ -42,159 +42,159 @@ in { app-schema = mkGeoserverExtension { name = "app-schema"; - version = "2.28.1"; # app-schema - hash = "sha256-PwZW9hFRiZIxgil75DXMsq0ymo7jPYX4Boj+hkXW8NI="; # app-schema + version = "2.28.2"; # app-schema + hash = "sha256-wJ0grTy8ZeiifvINLgbuLXdDYQeQvXKkGcFoYxlkOjI="; # app-schema }; authkey = mkGeoserverExtension { name = "authkey"; - version = "2.28.1"; # authkey - hash = "sha256-Zg3Db5QG4w+yMZ75MqtHt1Kri8peDGMZ0va5ZwI+6dw="; # authkey + version = "2.28.2"; # authkey + hash = "sha256-vy9HLjt1Lefd1+2QlKPHKU9IcPYfDPWcfqzInFahBBk="; # authkey }; cas = mkGeoserverExtension { name = "cas"; - version = "2.28.1"; # cas - hash = "sha256-YMnaRVPLn98mXm2sErKSRlzmvQbnU9MGMDXuYgwm+H0="; # cas + version = "2.28.2"; # cas + hash = "sha256-Z3FdAdVHrzNPiA1L/9cnSr/7QsevlqhxBoSwOfjap/E="; # cas }; charts = mkGeoserverExtension { name = "charts"; - version = "2.28.1"; # charts - hash = "sha256-LM75iq2xvSQjVxGnngoLCz5IkSI9/YqAqOqgSUlkrUA="; # charts + version = "2.28.2"; # charts + hash = "sha256-ZLFI6taLpSw9uIsAr8zAsP0xIHqKHhlnffCglEhmvbU="; # charts }; control-flow = mkGeoserverExtension { name = "control-flow"; - version = "2.28.1"; # control-flow - hash = "sha256-ZO04mls+OapOK/fi5IBy0mVJ5cF0fyQ1RgFhWt0AuEw="; # control-flow + version = "2.28.2"; # control-flow + hash = "sha256-ncKjBkYJGqtgsSU2RCMkfZd4jnqWCxaVf3VfQTHHv7Q="; # control-flow }; css = mkGeoserverExtension { name = "css"; - version = "2.28.1"; # css - hash = "sha256-2PcZhxkHXEOAs46fnt37VhupVOfRNWaRynNlLGviAho="; # css + version = "2.28.2"; # css + hash = "sha256-TAvS6VoJEkxUHaz/5/Sng2f8tvTWUZVeriL8uOrtb0I="; # css }; csw = mkGeoserverExtension { name = "csw"; - version = "2.28.1"; # csw - hash = "sha256-6TmSWnny0OedvnLu+HnKpVxdfcicp1D//isFFOclcmk="; # csw + version = "2.28.2"; # csw + hash = "sha256-AR229hydrY1D5rxpGFfyDAPgsceDcs46nH/vyHyn484="; # csw }; csw-iso = mkGeoserverExtension { name = "csw-iso"; - version = "2.28.1"; # csw-iso - hash = "sha256-BlnIS8gpWwBuiwdIqvq3UpJrdKPULvJxR7o3XJtI5tQ="; # csw-iso + version = "2.28.2"; # csw-iso + hash = "sha256-7s+Eu+Ik+9+C3+LMZ6gZowVLg8kuNOY9ZlsZEUDKRDg="; # csw-iso }; db2 = mkGeoserverExtension { name = "db2"; - version = "2.28.1"; # db2 - hash = "sha256-Ga4Db6G+LxRN+casjs0nYD6TFN1YrDjgOIlu46/0RgQ="; # db2 + version = "2.28.2"; # db2 + hash = "sha256-ipjFaGsVfBebKjMS9r7ZNHanNdbSA2lcdsLufr/ohgI="; # db2 }; # Needs wps extension. dxf = mkGeoserverExtension { name = "dxf"; - version = "2.28.1"; # dxf - hash = "sha256-703y8CBd9oYsryGgAftXq5Cr1lUeyws1Alx0tSwzZo8="; # dxf + version = "2.28.2"; # dxf + hash = "sha256-H7dugiW/fldMWVCqr3aPAYgYQUkBFutBALeOmYJouhE="; # dxf }; excel = mkGeoserverExtension { name = "excel"; - version = "2.28.1"; # excel - hash = "sha256-9ti+J7e9QieVbCFQ2xxuqX8TvQCcLPw0tPUNVqGG9+0="; # excel + version = "2.28.2"; # excel + hash = "sha256-wWxOVpy41sAQMqHgR+B8zIdQV05VIi7gV0on1rrqZ0g="; # excel }; feature-pregeneralized = mkGeoserverExtension { name = "feature-pregeneralized"; - version = "2.28.1"; # feature-pregeneralized - hash = "sha256-eGayG9FUJabhP60iypib1gLcRStqz5J4PMTuSB+xL60="; # feature-pregeneralized + version = "2.28.2"; # feature-pregeneralized + hash = "sha256-f6tqDnW3AI/Kg3Dd4w9CdoqhJoygN4EiNjht1mH3o3s="; # feature-pregeneralized }; # Note: The extension name ("gdal") clashes with pkgs.gdal. gdal = mkGeoserverExtension { name = "gdal"; - version = "2.28.1"; # gdal + version = "2.28.2"; # gdal buildInputs = [ pkgs.gdal ]; - hash = "sha256-sVI9o2xwbvez7Gm8gY9DAbEr5TUluVGDoC7ZweK4BUE="; # gdal + hash = "sha256-jT3QhjrQiTtZHCCyBE1F7MfEanNRdzjdRQ/Ao+Azars="; # gdal }; # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box. #geofence = mkGeoserverExtension { # name = "geofence"; - # version = "2.28.1"; # geofence - # hash = "sha256-POBOhg3d8HlA3qF2W41UTVhISM5vAQi74cI+y+Rj+Ic="; # geofence + # version = "2.28.2"; # geofence + # hash = "sha256-G72N5BRMIlkyfldeHdwNHM4kKEhbhp52VkJKaObtPQI="; # geofence #}; #geofence-server-h2 = mkGeoserverExtension { # name = "geofence-server-h2"; - # version = "2.28.1"; # geofence-server - # hash = "sha256-8lY+wrCD7PizeNvh9hDRhxdFxT7n1SVKD8TVU80iiZk="; # geofence-server-h2 + # version = "2.28.2"; # geofence-server + # hash = "sha256-qgm2jNXGYJ40lFmWN/ksWf6GxzLTYhZwkIRr0/dvItc="; # geofence-server-h2 #}; #geofence-server-postgres = mkGeoserverExtension { # name = "geofence-server-postgres"; - # version = "2.28.1"; # geofence-server - # hash = "sha256-DB3OK2dvPrDtlRRHaDUXqQW7AlOhN4zFm2t0N1+B3rk="; # geofence-server-postgres + # version = "2.28.2"; # geofence-server + # hash = "sha256-3vkf+jIdmt/ZMci1PSeA7yVoUuo5d5vuuowQ1G7pz6M="; # geofence-server-postgres #}; #geofence-wps = mkGeoserverExtension { # name = "geofence-wps"; - # version = "2.28.1"; # geofence-wps - # hash = "sha256-tP3hnN0kXKFIdgKrS7juyrCh1OoQD0Bx54/xq6nUzWA="; # geofence-wps + # version = "2.28.2"; # geofence-wps + # hash = "sha256-Bl+0gte7buh4uMbK6AEJOs3HHCZ1s6sED7UrB1v69BM="; # geofence-wps #}; geopkg-output = mkGeoserverExtension { name = "geopkg-output"; - version = "2.28.1"; # geopkg-output - hash = "sha256-6ARKLmhc5lhqi841Ou5ZrBuj6bdOwQDSGPwzGcBTNJw="; # geopkg-output + version = "2.28.2"; # geopkg-output + hash = "sha256-ccf6PP7lSnkPCguewaTkLiszmeNB1KRlc6sku1aUp3k="; # geopkg-output }; grib = mkGeoserverExtension { name = "grib"; - version = "2.28.1"; # grib - hash = "sha256-AW/i+vRthQct3U45EGw/6uPDZNdS9z816nnKVIGCg/k="; # grib + version = "2.28.2"; # grib + hash = "sha256-5QQhxLA6LR9ahEhLJM3FhFr7T30vzbXZ72sv2IbQuwA="; # grib buildInputs = [ netcdf ]; }; gwc-s3 = mkGeoserverExtension { name = "gwc-s3"; - version = "2.28.1"; # gwc-s3 - hash = "sha256-wVLW7qbKDRmf1okTI0PDREQ5eoJOVGMVLS+uusY2+cM="; # gwc-s3 + version = "2.28.2"; # gwc-s3 + hash = "sha256-ZKo10/k5aY6SNVKNPs4U9x9rMaz/P6nqPt1PJHr7U1Y="; # gwc-s3 }; h2 = mkGeoserverExtension { name = "h2"; - version = "2.28.1"; # h2 - hash = "sha256-zEjNN1dCmNR/5st/yNpWP1G3P6Zqf3RSFdUKOgdwff4="; # h2 + version = "2.28.2"; # h2 + hash = "sha256-vkjZn5y0taVG13/1/RJuFoKIFcHx+Ju2yYYLV3K8Qdc="; # h2 }; iau = mkGeoserverExtension { name = "iau"; - version = "2.28.1"; # iau - hash = "sha256-zn4FlC/vVvq1K6mSplOKarHHUWLNev5IW76wSiTvBuE="; # iau + version = "2.28.2"; # iau + hash = "sha256-yIpXjMCYjWE/xMGuNg3iNDyjMVdQCvRBeNCBOS0c1JA="; # iau }; importer = mkGeoserverExtension { name = "importer"; - version = "2.28.1"; # importer - hash = "sha256-7v5MvpvVbVKOBxUlEwem8MzPUTtBc8z+1JAEqeHUmYI="; # importer + version = "2.28.2"; # importer + hash = "sha256-Kb02ihQ9WIjcXRS1Yc9gO968/YK/FRlQ2CQGZCZmy20="; # importer }; inspire = mkGeoserverExtension { name = "inspire"; - version = "2.28.1"; # inspire - hash = "sha256-kgqwO3elSnT/4M9G+OgULaW+i/nDNGhvHblmWZRjTTA="; # inspire + version = "2.28.2"; # inspire + hash = "sha256-fU0/4VvTlIhyjPTNIYIVdT8dygWG8r0qk45O1q4fr3U="; # inspire }; # Needs Kakadu plugin from # https://github.com/geosolutions-it/imageio-ext #jp2k = mkGeoserverExtension { # name = "jp2k"; - # version = "2.28.1"; # jp2k - # hash = "sha256-sLUgsMXymnTuceCRLzqIAPmk4/Q3BO+A+7BLQoc3iP0="; # jp2k + # version = "2.28.2"; # jp2k + # hash = "sha256-eOg9w9z3KykTLvouWrUH4fvAJ1OaQJG7M9vA+3pwyFM="; # jp2k #}; # Throws "java.lang.UnsatisfiedLinkError: 'void org.libjpegturbo.turbojpeg.TJDecompressor.init()'" @@ -202,174 +202,174 @@ in # NOTE: When re-enabling this, RE-ENABLE THE CORRESPONDING TEST, TOO! (See tests/geoserver.nix) #libjpeg-turbo = mkGeoserverExtension { # name = "libjpeg-turbo"; - # version = "2.28.1"; # libjpeg-turbo - # hash = "sha256-fn1ItYvLMfvRLpCE8rEpTpBmkk8zkN3QtBO/RN4RXfo="; # libjpeg-turbo + # version = "2.28.2"; # libjpeg-turbo + # hash = "sha256-4RQzkMXuOdQKszmafTWG5PekU8nCGVb7/Oumql8vqFc="; # libjpeg-turbo # buildInputs = [ libjpeg.out ]; #}; mapml = mkGeoserverExtension { name = "mapml"; - version = "2.28.1"; # mapml - hash = "sha256-AonH/wBRh0oVs8psJ+XRutkSwybN3fs505SI/0qzG3o="; # mapml + version = "2.28.2"; # mapml + hash = "sha256-qOYI6MT+Ihpa+aSbC77J96aaA2cSaPBei0ppsPhC0ks="; # mapml }; mbstyle = mkGeoserverExtension { name = "mbstyle"; - version = "2.28.1"; # mbstyle - hash = "sha256-SvgvBkp6dS6v1JjQxpa7m7tqc2c63hruWCcFcouHXaQ="; # mbstyle + version = "2.28.2"; # mbstyle + hash = "sha256-M9Eg8DbiWTFrpZ26v7MdeKcxS+CscNTT/r7CPqGe7RI="; # mbstyle }; metadata = mkGeoserverExtension { name = "metadata"; - version = "2.28.1"; # metadata - hash = "sha256-M3HcgrPGZBBotNm6dsw4UjrH1onIQHDMdxuwNVuqO84="; # metadata + version = "2.28.2"; # metadata + hash = "sha256-EHtbBQpiqd56FtfizasbQtbMkwasOtZOcaRqStkjViU="; # metadata }; mongodb = mkGeoserverExtension { name = "mongodb"; - version = "2.28.1"; # mongodb - hash = "sha256-Urp8d0i6Xlk2muNKKioJTnrEvzC05tqiipLT162L7uk="; # mongodb + version = "2.28.2"; # mongodb + hash = "sha256-GlAXb1yx8bTAZr0z1H/3n6nODAsUeV21UgEej/97F4k="; # mongodb }; monitor = mkGeoserverExtension { name = "monitor"; - version = "2.28.1"; # monitor - hash = "sha256-Qo9aFOjbg9s1RZVqa/z1ka+QmFrPZJgrH8qMcstCywQ="; # monitor + version = "2.28.2"; # monitor + hash = "sha256-zyCNr+Z/juYjD5cvcFssIe/fS/MxB8ZYaZsEOoPSBhI="; # monitor }; mysql = mkGeoserverExtension { name = "mysql"; - version = "2.28.1"; # mysql - hash = "sha256-5/xP8vPNhOYN9YXL4sZk16652ZBB7Ivm7Cq05fYi7wI="; # mysql + version = "2.28.2"; # mysql + hash = "sha256-xQPSia3O/K9wC9wQHiwle6Z1jXEgEUIWp59u4lVv2RU="; # mysql }; netcdf = mkGeoserverExtension { name = "netcdf"; - version = "2.28.1"; # netcdf - hash = "sha256-qKgSyFrKI7JVMNt/qjgJ5puLaTsU406P5VyUpncMHOg="; # netcdf + version = "2.28.2"; # netcdf + hash = "sha256-EXtbuSu0uBQ77BjKWTt6lw15Vb3X48MX7iF35JD8Z2s="; # netcdf buildInputs = [ netcdf ]; }; netcdf-out = mkGeoserverExtension { name = "netcdf-out"; - version = "2.28.1"; # netcdf-out - hash = "sha256-Xk3cTve45U9LDv8lWugtGpfid4yr5yDWh7H7daVlAc8="; # netcdf-out + version = "2.28.2"; # netcdf-out + hash = "sha256-I7Snzevhl/hTxriKULartxda3ZX7pXP0HxFEwJMHFZE="; # netcdf-out buildInputs = [ netcdf ]; }; ogr-wfs = mkGeoserverExtension { name = "ogr-wfs"; - version = "2.28.1"; # ogr-wfs + version = "2.28.2"; # ogr-wfs buildInputs = [ pkgs.gdal ]; - hash = "sha256-ykFfqoLXeGigAdCLnDCKiCGD++n7jiOivua8Oh2DwU8="; # ogr-wfs + hash = "sha256-/8EebpM9Ppc2BqsOTEly6i/U358X9mCAkC5PE3z3Uw0="; # ogr-wfs }; # Needs ogr-wfs extension. ogr-wps = mkGeoserverExtension { name = "ogr-wps"; - version = "2.28.1"; # ogr-wps + version = "2.28.2"; # ogr-wps # buildInputs = [ pkgs.gdal ]; - hash = "sha256-WxOZ5WDNxV1HAT9cfCPm9DwoU/96OobuODOjd5dGN94="; # ogr-wps + hash = "sha256-VTj2XBWXY+I73ux6Y/XTsAtvPpMXiuz+cieTmkNLr6M="; # ogr-wps }; oracle = mkGeoserverExtension { name = "oracle"; - version = "2.28.1"; # oracle - hash = "sha256-lj53CC6f9vXatH9vxHaFZvEGDpplTZSYy56fz4d4Qs0="; # oracle + version = "2.28.2"; # oracle + hash = "sha256-a6idJZfCy2iSB5UWOepeZ1YGlhrOaMNpxHkJ5+8bJGc="; # oracle }; params-extractor = mkGeoserverExtension { name = "params-extractor"; - version = "2.28.1"; # params-extractor - hash = "sha256-1Znwqb+PHFlsuQIs8pMqo08s4uSc7wLZRYE+hVZzoQY="; # params-extractor + version = "2.28.2"; # params-extractor + hash = "sha256-EEX0E3f4Y0A120Trz5molTFOIrcZVXXIdW3skn5ID7Y="; # params-extractor }; printing = mkGeoserverExtension { name = "printing"; - version = "2.28.1"; # printing - hash = "sha256-OeMHkx4d7/FwNigQ8Mnz9UlqFJbMZFGmxZT8kJ3iPp8="; # printing + version = "2.28.2"; # printing + hash = "sha256-uyhqI14sy1refOaZwJZ81IEobrOiKIGKR1y80llNAv0="; # printing }; pyramid = mkGeoserverExtension { name = "pyramid"; - version = "2.28.1"; # pyramid - hash = "sha256-fLe2SeRSNvj6qqh6CMDu2w0gubf+xi3Ez7jO2fEbpjc="; # pyramid + version = "2.28.2"; # pyramid + hash = "sha256-fHNbhIUBL9A4ND6QVT1Z1jPgqM0jz/MRt+WHmHIl2g4="; # pyramid }; querylayer = mkGeoserverExtension { name = "querylayer"; - version = "2.28.1"; # querylayer - hash = "sha256-QM5DAoTFsn6JTLubQy4p0qsA91DcfU7C74cb80jzzWM="; # querylayer + version = "2.28.2"; # querylayer + hash = "sha256-tQ/BSL12Zj1hYAl582p+kYz+7SS5HGLvKOrA5c/hUXA="; # querylayer }; sldservice = mkGeoserverExtension { name = "sldservice"; - version = "2.28.1"; # sldservice - hash = "sha256-u5uzwyrwBzz5qcEtRS+ZIbmis9kVuGPt6+qo19K1HCM="; # sldservice + version = "2.28.2"; # sldservice + hash = "sha256-tKow9r+0km/IyzlubSi7NwfyuCm8jYIBv3PYkmcDGN0="; # sldservice }; sqlserver = mkGeoserverExtension { name = "sqlserver"; - version = "2.28.1"; # sqlserver - hash = "sha256-19KyMBZEYBeUKiogxux8jrc8VgNDdCnvhrEV8Q84SG0="; # sqlserver + version = "2.28.2"; # sqlserver + hash = "sha256-6J7tEPUXqtKcD0aKgHQv7/24Lpv4pOZZnWvmkNHTeco="; # sqlserver }; vectortiles = mkGeoserverExtension { name = "vectortiles"; - version = "2.28.1"; # vectortiles - hash = "sha256-tT4phUdL8yMKzobxWNivMpHJYu6KQmPiNECK9TtJgjg="; # vectortiles + version = "2.28.2"; # vectortiles + hash = "sha256-MlP+mjoQZHc9SRPIfMcV7OtUFXM8Z9T+O+Ti6rWLQuc="; # vectortiles }; wcs2_0-eo = mkGeoserverExtension { name = "wcs2_0-eo"; - version = "2.28.1"; # wcs2_0-eo - hash = "sha256-HawDOyymB01x7PaFg5QKQhTSFdybeY5oAAusaG95To8="; # wcs2_0-eo + version = "2.28.2"; # wcs2_0-eo + hash = "sha256-xxClO61LYNX80npRHoYvNvzz/eeVZ7yHoA2uhqGNLyQ="; # wcs2_0-eo }; web-resource = mkGeoserverExtension { name = "web-resource"; - version = "2.28.1"; # web-resource - hash = "sha256-FkuxR3WN95jyorpcv4ShT9J6jmUi0Z9NNwLEW3OKzx0="; # web-resource + version = "2.28.2"; # web-resource + hash = "sha256-hPS8B3DF+Em0ffL+z5z39dzyHlcdW0bgNNU3rRfzA9c="; # web-resource }; wmts-multi-dimensional = mkGeoserverExtension { name = "wmts-multi-dimensional"; - version = "2.28.1"; # wmts-multi-dimensional - hash = "sha256-tJP9pPKKYFLGbLWZEV5gWSaQdTbml3OKiIPM1sqhekY="; # wmts-multi-dimensional + version = "2.28.2"; # wmts-multi-dimensional + hash = "sha256-9wsLHgj0g+qGTfeVTkECfwIO1YwBRsxnS5H1NmsDqU0="; # wmts-multi-dimensional }; wps = mkGeoserverExtension { name = "wps"; - version = "2.28.1"; # wps - hash = "sha256-aYAN89XFpwzsW5aRBKSnixks3bxCAfOOznFDpoIvbIk="; # wps + version = "2.28.2"; # wps + hash = "sha256-DaL2b26sHW7a3WVB19H/S6pEJDde8fRwrHBDitWXqDI="; # wps }; # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not # available in nixpgs as of 2024/01. #wps-cluster-hazelcast = mkGeoserverExtension { # name = "wps-cluster-hazelcast"; - # version = "2.28.1"; # wps-cluster-hazelcast - # hash = "sha256-hO1/7OG9J5Ot5xKhMUbTAqm7B6TlecqNGxxbIuFCpCc="; # wps-cluster-hazelcast + # version = "2.28.2"; # wps-cluster-hazelcast + # hash = "sha256-+kgpkg+ZSi2IuupMUZ5O7aVXkeydylYv9ogALf4tDEM="; # wps-cluster-hazelcast #}; wps-download = mkGeoserverExtension { name = "wps-download"; - version = "2.28.1"; # wps-download - hash = "sha256-qB1vtczNULOsEjZaof9cA5YKPDE0Dwcz6mlUtzCanPQ="; # wps-download + version = "2.28.2"; # wps-download + hash = "sha256-o3Ya6ez/Y0ia6dstYlkMd8t6UOc5dvfPo12BzsMpDh0="; # wps-download }; # Needs Postrgres configuration or similar. # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html wps-jdbc = mkGeoserverExtension { name = "wps-jdbc"; - version = "2.28.1"; # wps-jdbc - hash = "sha256-9S6/TXK9YFzPD8u/S7SQuBcIGjUTalY69kzG4xbIU3g="; # wps-jdbc + version = "2.28.2"; # wps-jdbc + hash = "sha256-9Toz6BKX6XN4ohEX8+jEJ1z7aEYxbdFCiUmbiWYLXk8="; # wps-jdbc }; ysld = mkGeoserverExtension { name = "ysld"; - version = "2.28.1"; # ysld - hash = "sha256-qLWnujvB32U0EW7xW12GaAx6mPHkrU5Pa3S+T8+19r8="; # ysld + version = "2.28.2"; # ysld + hash = "sha256-XIQ6ksnySRNwtfMI696E57tIv1Aa2XKmyEpHdX7sRGs="; # ysld }; } diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index 4c66b14da3dd..b45482b5197c 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "geoserver"; - version = "2.28.1"; + version = "2.28.2"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip"; - hash = "sha256-wll05KPMVfpZGnybBxLeGH3pan8q4eWy8F4v5y5N3Gk="; + hash = "sha256-Gp38NuG92I4RF+9VL5bmS0uIUU9/IAbw5FqLkiOxcLQ="; }; sourceRoot = "."; diff --git a/pkgs/by-name/gh/ghunt/package.nix b/pkgs/by-name/gh/ghunt/package.nix index d17560e3641d..6a2c7e2ce9af 100644 --- a/pkgs/by-name/gh/ghunt/package.nix +++ b/pkgs/by-name/gh/ghunt/package.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "ghunt"; - version = "2.3.3"; + version = "2.3.4"; pyproject = true; src = fetchFromGitHub { @@ -14,8 +14,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: { repo = "ghunt"; # The newer releases aren't git-tagged to we just take the # commit with the version bump - rev = "5782248bfd92a24875e112ed0a83e6986d4c70d0"; - hash = "sha256-SQk/hy4r9LIffsu3kxLTv5LCcEvcZkP2jhmPA6Fzo8U="; + rev = "e8b0669cabb410dc40fb76b8d5d386a3a83fe08c"; + hash = "sha256-Zd0kpyr+Hkbh5MH3q3lrkH3liXw95sKRX+SZhsUVUhI="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/gi/gitea-mcp-server/package.nix b/pkgs/by-name/gi/gitea-mcp-server/package.nix index 5f8112ac99b2..5a1d597045e6 100644 --- a/pkgs/by-name/gi/gitea-mcp-server/package.nix +++ b/pkgs/by-name/gi/gitea-mcp-server/package.nix @@ -1,21 +1,22 @@ { lib, - buildGoModule, + buildGo126Module, fetchFromGitea, }: -buildGoModule (finalAttrs: { + +buildGo126Module (finalAttrs: { pname = "gitea-mcp-server"; - version = "0.8.1"; + version = "1.0.1"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "gitea-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-2K5bdrz7P99PmcY4iJp74PHSyvvE/aiC8UJMz9q3N88="; + hash = "sha256-B7uB69YsQd8EeENrezFK7kFXha21XValjEAYRjeYreo="; }; - vendorHash = "sha256-N1Ct479Q5RH4TCxcSbIBoGDP/atBlWkxwBLJLk82juM="; + vendorHash = "sha256-xfhvbTcniRnkv81MIEnoy36up8O2IZ1WUrhYJrhtZ3k="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix index 419f9672fbea..171b2546e670 100644 --- a/pkgs/by-name/gl/gleam/package.nix +++ b/pkgs/by-name/gl/gleam/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gleam"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "gleam"; tag = "v${finalAttrs.version}"; - hash = "sha256-y4D4e2zpa3WxUcO0XtuiY8KP+Y1LkNHKK675ZqbOHDU="; + hash = "sha256-5wnHS9366qqfmJyatmElIwzCVazdNf3xH8Ydh2cPX2E="; }; - cargoHash = "sha256-e0MwqNJHiKoPaWxI38codA3BcYp3j1kcnrvFzPc8roE="; + cargoHash = "sha256-Z8fEhj0b6K3KHmmC1CPaMXBdMn9fHu2Jc9ukDGFtSb4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gl/global/package.nix b/pkgs/by-name/gl/global/package.nix index f75b648a1776..43a1630067ef 100644 --- a/pkgs/by-name/gl/global/package.nix +++ b/pkgs/by-name/gl/global/package.nix @@ -1,5 +1,6 @@ { fetchurl, + fetchpatch2, lib, stdenv, libtool, @@ -24,6 +25,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9uf9C2iu0pLoW7aGYWuvZVHVyUJK3N3KEdgIujGMsyA="; }; + patches = [ + # Fix for GCC 15 / C23, which interprets empty function parameter lists as + # having no parameters instead of an unspecified signature. + (fetchpatch2 { + url = "https://src.fedoraproject.org/rpms/global/raw/5a1ababa270e571f3133c03edcdb0e65f95e763f/f/libdb-dbpanic-function-pointers.patch"; + hash = "sha256-o8u90h8ufF0Yr049fR9iMba+xq1tHXeiPdrHFSZMir0="; + }) + ]; + nativeBuildInputs = [ libtool makeWrapper diff --git a/pkgs/by-name/gn/gnumeric/package.nix b/pkgs/by-name/gn/gnumeric/package.nix index e83fa1a42754..c970c80a1bf2 100644 --- a/pkgs/by-name/gn/gnumeric/package.nix +++ b/pkgs/by-name/gn/gnumeric/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchpatch, pkg-config, intltool, libxml2, @@ -37,6 +37,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-fv4RlIfJiLY3MbsAsgRgJ010/Ob1X1be29XfoweCMpI="; }; + patches = [ + # Replace bool type with gboolean. + # See https://gitlab.gnome.org/GNOME/gnumeric/-/merge_requests/39. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnumeric/-/commit/dee6523426b75c10c36b188fafe6e7a27b6631e3.patch"; + hash = "sha256-a4KgxsrU9m/dZqu2LNC+jWiXvCTcRPzZW/67pg8yLGY="; + }) + ]; + + postPatch = '' + substituteInPlace configure.ac \ + --replace-fail 'GLIB_COMPILE_RESOURCES=' 'GLIB_COMPILE_RESOURCES="glib-compile-resources"#' + ''; + preConfigure = '' ./autogen.sh ''; @@ -74,11 +88,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - postPatch = '' - substituteInPlace configure.ac \ - --replace-fail 'GLIB_COMPILE_RESOURCES=' 'GLIB_COMPILE_RESOURCES="glib-compile-resources"#' - ''; - passthru = { updateScript = gnome.updateScript { packageName = "gnumeric"; diff --git a/pkgs/by-name/go/go-containerregistry/package.nix b/pkgs/by-name/go/go-containerregistry/package.nix index 15937599df45..b75fcb4f6989 100644 --- a/pkgs/by-name/go/go-containerregistry/package.nix +++ b/pkgs/by-name/go/go-containerregistry/package.nix @@ -15,13 +15,13 @@ in buildGoModule (finalAttrs: { pname = "go-containerregistry"; - version = "0.21.2"; + version = "0.21.3"; src = fetchFromGitHub { owner = "google"; repo = "go-containerregistry"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-q4gQjXsXZoP1UDsqcQdSR6RCNuPkCjczpATVPyfIzHE="; + sha256 = "sha256-BfKiBjfL5th1TPpw6hpno04MffLnXmOVq7BsGUCkPT0="; }; vendorHash = null; diff --git a/pkgs/by-name/go/go-passbolt-cli/package.nix b/pkgs/by-name/go/go-passbolt-cli/package.nix index 2edbc0da1592..b2f2c09e4411 100644 --- a/pkgs/by-name/go/go-passbolt-cli/package.nix +++ b/pkgs/by-name/go/go-passbolt-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "go-passbolt-cli"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "passbolt"; repo = "go-passbolt-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-EytU20jdrfXwuoofp8OAphX9jjUoFpKva75PBDIFDD8="; + hash = "sha256-cvcRVeVwwfVX96Ud6YmimtGJ1uJYcIhryWB1Yebr1Vc="; }; - vendorHash = "sha256-HbwGF9ZTwWdJf7XnUKnS1n58GSaPTRlblXAmtKQoooU="; + vendorHash = "sha256-M8jix6bJ+venQvwm1FTJ7+fXQxSIrdCdXmmp2aVkZo8="; ldflags = [ "-X=main.version=${finalAttrs.version}" diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index ce507fd9def1..1abb6a50004d 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -184,11 +184,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "146.0.7680.80"; + version = "146.0.7680.153"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-Lam/V3YtHyph4RDlz+vGbXESQuRNg+53wqgZoYFcwxU="; + hash = "sha256-b/DLXbvHbjUWFyJTXLoL0I6a/3r1YaVowNqr3oQ0imA="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -302,11 +302,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "146.0.7680.80"; + version = "146.0.7680.154"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/dzyizse52hr7lfzvs5c2ypryzq_146.0.7680.80/GoogleChrome-146.0.7680.80.dmg"; - hash = "sha256-vKt8bQLAsiwjX2tdrkPjq6uC5wXSk8Jb3dr43ofbEt4="; + url = "http://dl.google.com/release2/chrome/aduhru4wjcwjo2cuql7gnsdev6hq_146.0.7680.154/GoogleChrome-146.0.7680.154.dmg"; + hash = "sha256-u/i8fYn53BbQGFlBFTEayNpSQoeNPBJEBXr2KFArgW8="; }; dontPatch = true; diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index 3fecad6404c6..c290c94dad01 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -1,30 +1,30 @@ { stdenv, lib, - buildGo125Module, + buildGo126Module, fetchFromGitHub, installShellFiles, buildPackages, testers, goreleaser, }: -buildGo125Module rec { +buildGo126Module (finalAttrs: { pname = "goreleaser"; - version = "2.13.3"; + version = "2.14.3"; src = fetchFromGitHub { owner = "goreleaser"; repo = "goreleaser"; - rev = "v${version}"; - hash = "sha256-VlpBz2FguUfN+ssv+PLSB9RDgLKGP2V/0pAxaLNGu7w="; + rev = "v${finalAttrs.version}"; + hash = "sha256-2zG7B6d+NZ1XJrObCfgBZyin5JDv6hKlvZ8C4ckAJ8Q="; }; - vendorHash = "sha256-UiQ8JH6ISOmo5rQzxE1Zf4jU8VXtI29GsZFTINokLo8="; + vendorHash = "sha256-ImjoPvxkg35Fn4XdhTFLT2o4cDCjuyEOn1mDkMTjksk="; ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" "-X main.builtBy=nixpkgs" ]; @@ -53,7 +53,7 @@ buildGo125Module rec { passthru.tests.version = testers.testVersion { package = goreleaser; command = "goreleaser -v"; - inherit version; + inherit (finalAttrs) version; }; meta = { @@ -67,4 +67,4 @@ buildGo125Module rec { license = lib.licenses.mit; mainProgram = "goreleaser"; }; -} +}) diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix index 83de29895977..490cf06357f0 100644 --- a/pkgs/by-name/go/gosmee/package.nix +++ b/pkgs/by-name/go/gosmee/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "gosmee"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "gosmee"; tag = "v${finalAttrs.version}"; - hash = "sha256-93KO0rKyNlc1gxmG/4uWJUC6KccW5pBfxl/a/x1B9f8="; + hash = "sha256-IOxUpZUIIts2MU9YwHmzVDgyO1oV8sWzi3nOWogYJTQ="; }; vendorHash = null; diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index 93bd7ca5ad90..b4ec5ca4105e 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.9.1"; + version = "3.9.4"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-Cc6V3D3g3CYyozkvl1baDRJcsd+oaRNAMV1HPOkh/gw="; + hash = "sha256-CTy7kMRSaMYRtOctbgizA2i4VGSLGS5/kI2lAnTuDC4="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/iv/iverilog/package.nix b/pkgs/by-name/iv/iverilog/package.nix index fd72343d9157..0d694260f537 100644 --- a/pkgs/by-name/iv/iverilog/package.nix +++ b/pkgs/by-name/iv/iverilog/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoconf, bison, bzip2, @@ -19,24 +18,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "iverilog"; - version = "12.0"; + version = "13.0"; src = fetchFromGitHub { owner = "steveicarus"; repo = "iverilog"; tag = "v${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - hash = "sha256-J9hedSmC6mFVcoDnXBtaTXigxrSCFa2AhhFd77ueo7I="; + hash = "sha256-SfODx7K3UrDHMoKCbMFpxo4t9j9vG1oWF0RFS3dSUm4="; }; - patches = [ - # NOTE(jleightcap): `-Werror=format-security` warning patched shortly after release, backport the upstream fix - (fetchpatch { - name = "format-security"; - url = "https://github.com/steveicarus/iverilog/commit/23e51ef7a8e8e4ba42208936e0a6a25901f58c65.patch"; - hash = "sha256-fMWfBsCl2fuXe+6AR10ytb8QpC84bXlP5RSdrqsWzEk="; - }) - ]; - nativeBuildInputs = [ autoconf bison @@ -84,7 +74,9 @@ stdenv.mkDerivation (finalAttrs: { installCheckPhase = '' runHook preInstallCheck - sh .github/test.sh + # PLI1 is not enabled in the build (ENABLE_PLI1=no), so skip PLI1 VPI tests + # which would fail at runtime with "Failed - running vvp". + sh .github/test.sh no-pli1 runHook postInstallCheck ''; diff --git a/pkgs/by-name/j/j/package.nix b/pkgs/by-name/j/j/package.nix index de4349e12de3..bbcb3854a019 100644 --- a/pkgs/by-name/j/j/package.nix +++ b/pkgs/by-name/j/j/package.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ raskin - synthetica ]; broken = stdenv.hostPlatform.isDarwin; platforms = lib.platforms.all; diff --git a/pkgs/by-name/ka/kamal-proxy/package.nix b/pkgs/by-name/ka/kamal-proxy/package.nix new file mode 100644 index 000000000000..8a929ff30c8b --- /dev/null +++ b/pkgs/by-name/ka/kamal-proxy/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "kamal-proxy"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "basecamp"; + repo = "kamal-proxy"; + tag = "v${finalAttrs.version}"; + hash = "sha256-oY1XwhoZx/GMg46nQAOK6tx9VzQoXTNdxE26FjBvbsg="; + }; + + vendorHash = "sha256-EDPHqVGkZeaV/9p3EywUkQTNbIdBkAjre9oxRi4c+WY="; + + subPackages = [ "cmd/kamal-proxy" ]; + + env.CGO_ENABLED = 0; + + ldflags = [ "-s" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Lightweight proxy server for Kamal"; + homepage = "https://github.com/basecamp/kamal-proxy"; + changelog = "https://github.com/basecamp/kamal-proxy/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "kamal-proxy"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ jasanfarah ]; + }; +}) diff --git a/pkgs/by-name/ka/kara/package.nix b/pkgs/by-name/ka/kara/package.nix index 6c255ea2e7ca..c3d43e54d20e 100644 --- a/pkgs/by-name/ka/kara/package.nix +++ b/pkgs/by-name/ka/kara/package.nix @@ -2,29 +2,45 @@ stdenv, lib, fetchFromGitHub, + cmake, nix-update-script, kdePackages, }: stdenv.mkDerivation (finalAttrs: { pname = "kara"; - version = "0.8.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "dhruv8sh"; repo = "kara"; tag = "v${finalAttrs.version}"; - hash = "sha256-gdYwgHNnkvayd7GK9H8AZHeKL589hU6MN9DXiUkSU3A="; + hash = "sha256-nOMsR9bocDVwH1wB+tGu7y4hnvcAUVTNPXrAzcmws3w="; }; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ + cmake + kdePackages.extra-cmake-modules + ]; - mkdir -p $out/share/plasma/plasmoids/org.dhruv8sh.kara - cp metadata.json $out/share/plasma/plasmoids/org.dhruv8sh.kara - cp -r contents $out/share/plasma/plasmoids/org.dhruv8sh.kara + buildInputs = with kdePackages; [ + qtbase + qtdeclarative + ki18n + kservice + kwindowsystem + libplasma + plasma-activities + kwin + plasma-workspace + ]; - runHook postInstall - ''; + strictDeps = true; + + cmakeFlags = [ + (lib.cmakeFeature "Qt6_DIR" "${kdePackages.qtbase}/lib/cmake/Qt6") + ]; + + dontWrapQtApps = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/kd/kde-rounded-corners/package.nix b/pkgs/by-name/kd/kde-rounded-corners/package.nix index e85d10b882d1..adde7bfc8e3b 100644 --- a/pkgs/by-name/kd/kde-rounded-corners/package.nix +++ b/pkgs/by-name/kd/kde-rounded-corners/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kde-rounded-corners"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; rev = "v${finalAttrs.version}"; - hash = "sha256-v/kobtUoWBbYP4iMiUqWNnpIYyu5CBmYHnwxfN4eoQ0="; + hash = "sha256-ivWOMl0cveJHC6eX/QYteVi2GaRJ/2j02YlDj/Uvs1s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/keymap-drawer/package.nix b/pkgs/by-name/ke/keymap-drawer/package.nix index 4847dbc713e0..2b77b42af1f5 100644 --- a/pkgs/by-name/ke/keymap-drawer/package.nix +++ b/pkgs/by-name/ke/keymap-drawer/package.nix @@ -1,28 +1,4 @@ { python3, - fetchFromGitHub, }: - -let - python = python3.override { - packageOverrides = self: super: { - tree-sitter = super.tree-sitter.overrideAttrs { - version = "0.24.0"; - src = fetchFromGitHub { - owner = "tree-sitter"; - repo = "py-tree-sitter"; - tag = "v0.24.0"; - hash = "sha256-ZDt/8suteaAjGdk71l8eej7jDkkVpVDBIZS63SA8tsU="; - fetchSubmodules = true; - }; - # keymap-drawer only requires tree-sitter-devicetree grammer, and - # the tests fail with numereous TREE_SITTER_LANGUAGE_VERSION - # related failures related to other grammers. Hence we disable the - # tests altogether, hoping that in the future this python3.override - # won't be needed at all. - doInstallCheck = false; - }; - }; - }; -in -python.pkgs.toPythonApplication python.pkgs.keymap-drawer +python3.pkgs.toPythonApplication python3.pkgs.keymap-drawer diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix index 5723f7bc1568..afa8e2909951 100644 --- a/pkgs/by-name/km/kmscon/package.nix +++ b/pkgs/by-name/km/kmscon/package.nix @@ -18,19 +18,21 @@ ninja, check, bash, + gawk, + inotify-tools, buildPackages, nix-update-script, nixosTests, }: stdenv.mkDerivation (finalAttrs: { pname = "kmscon"; - version = "9.3.1"; + version = "9.3.2"; src = fetchFromGitHub { owner = "kmscon"; repo = "kmscon"; tag = "v${finalAttrs.version}"; - hash = "sha256-pH+dBcUKXrVh9/y6mNWmYBx6HVbuSZX/F2sCG/Yj5UQ="; + hash = "sha256-a1H9/j92Z/vjvFp226Ps9PFy5dAS8yg+RErgJWIb9HQ="; }; strictDeps = true; @@ -78,6 +80,13 @@ stdenv.mkDerivation (finalAttrs: { done ''; + postFixup = '' + substituteInPlace $out/bin/kmscon \ + --replace-fail "awk" "${lib.getExe gawk}" + substituteInPlace $out/bin/kmscon-launch-gui \ + --replace-fail "inotifywait" "${lib.getExe' inotify-tools "inotifywait"}" + ''; + passthru = { tests.kmscon = nixosTests.kmscon; updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; diff --git a/pkgs/by-name/km/kmscon/sandbox.patch b/pkgs/by-name/km/kmscon/sandbox.patch index 0a9292328aa3..9f896b761143 100644 --- a/pkgs/by-name/km/kmscon/sandbox.patch +++ b/pkgs/by-name/km/kmscon/sandbox.patch @@ -7,7 +7,7 @@ index de29a32..e731bbd 100644 systemd_deps = dependency('systemd', required: false) -systemdsystemunitdir = systemd_deps.get_variable('systemdsystemunitdir', default_value: 'lib/systemd/system') -+systemdsystemunitdir = get_option('libdir') / 'systemd' ++systemdsystemunitdir = get_option('libdir') / 'systemd' / 'system' # # Required dependencies diff --git a/pkgs/by-name/ko/komodo/package.nix b/pkgs/by-name/ko/komodo/package.nix index f44c7147758c..19a21ebc968f 100644 --- a/pkgs/by-name/ko/komodo/package.nix +++ b/pkgs/by-name/ko/komodo/package.nix @@ -17,6 +17,11 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-dLBgdcrIp5QM2TVIa86qX7m1c5n+qOIQJtqJPGvIZ+0="; }; + # Temporary fix to get build to pass until https://github.com/moghtech/komodo/pull/1122 + patches = [ + ./rustc-1_9_2-fixes.patch + ]; + cargoHash = "sha256-jf/Jp28g3inGn5jQp3cACdhl//tbXTMc1vP1K3g/CyQ="; # disable for check. document generation is fail diff --git a/pkgs/by-name/ko/komodo/rustc-1_9_2-fixes.patch b/pkgs/by-name/ko/komodo/rustc-1_9_2-fixes.patch new file mode 100644 index 000000000000..4021c35ba17e --- /dev/null +++ b/pkgs/by-name/ko/komodo/rustc-1_9_2-fixes.patch @@ -0,0 +1,52 @@ +diff --git a/bin/core/src/alert/discord.rs b/bin/core/src/alert/discord.rs +index 427227d..6d19678 100644 +--- a/bin/core/src/alert/discord.rs ++++ b/bin/core/src/alert/discord.rs +@@ -230,14 +230,13 @@ pub async fn send_alert( + ) + } + AlertData::Custom { message, details } => { +- format!( +- "{level} | {message}{}", +- if details.is_empty() { +- format_args!("") +- } else { +- format_args!("\n{details}") +- } +- ) ++ let details_str = if details.is_empty() { ++ String::new() ++ } else { ++ format!("\n{details} f") ++ }; ++ ++ format!("{level} | {message}{details_str}") + } + AlertData::None {} => Default::default(), + }; +diff --git a/bin/core/src/alert/mod.rs b/bin/core/src/alert/mod.rs +index 9eba5da..1f51ac2 100644 +--- a/bin/core/src/alert/mod.rs ++++ b/bin/core/src/alert/mod.rs +@@ -474,14 +474,13 @@ fn standard_alert_content(alert: &Alert) -> String { + ) + } + AlertData::Custom { message, details } => { +- format!( +- "{level} | {message}{}", +- if details.is_empty() { +- format_args!("") +- } else { +- format_args!("\n{details}") +- } +- ) ++ let details_str = if details.is_empty() { ++ String::new() ++ } else { ++ format!("\n{details}") ++ }; ++ ++ format!("{level} | {message}{details_str}") + } + AlertData::None {} => Default::default(), + } diff --git a/pkgs/by-name/kr/krew/package.nix b/pkgs/by-name/kr/krew/package.nix index e3eb7af8e101..314c6366fa50 100644 --- a/pkgs/by-name/kr/krew/package.nix +++ b/pkgs/by-name/kr/krew/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, makeWrapper, gitMinimal, + writableTmpDirAsHomeHook, + versionCheckHook, }: buildGoModule (finalAttrs: { @@ -13,8 +15,13 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "krew"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-KG4/vtEfwWVddfFoNbC4xakxOynDY6jyxek4JAXW5gY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-rhl4qVHwl876OSDrcLSS07x3H/x/zmFLPHdRw+fcYsw="; + leaveDotGit = true; + postFetch = '' + git -C "$out" rev-parse --short HEAD > "$out/.git_head" + rm -rf "$out/.git" + ''; }; vendorHash = "sha256-z0wiYknXcCx4vqROngn58CRe9TBgya4y3v736VBMhQ8="; @@ -23,11 +30,29 @@ buildGoModule (finalAttrs: { nativeBuildInputs = [ makeWrapper ]; + ldflags = [ + "-s" + "-X" + "sigs.k8s.io/krew/internal/version.gitTag=v${finalAttrs.version}" + ]; + + preBuild = '' + ldflags+=" -X=sigs.k8s.io/krew/internal/version.gitCommit=$(<.git_head)" + ''; + postFixup = '' wrapProgram $out/bin/krew \ --prefix PATH : ${lib.makeBinPath [ gitMinimal ]} ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook + versionCheckHook + ]; + versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckProgramArg = "version"; + meta = { description = "Package manager for kubectl plugins"; mainProgram = "krew"; 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 eb31bd752453..147c814dab10 100644 --- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix +++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix @@ -13,20 +13,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-collaboration-server"; - version = "4.4.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${finalAttrs.version}"; - hash = "sha256-Cm/Ch7dBKInQYPFGfSlSMLgj8uQR6E3S+6gCFUyvFSU="; + hash = "sha256-R8DO7hsWt8+aKnHFEoZ06f1f+r8dNmNoPZRVBfr9VCY="; }; - sourceRoot = "source/src/frontend"; + sourceRoot = "${finalAttrs.src.name}/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-JacPecJvdyATea8o1jQOxY9Gzx4kH+HLqE0eq03dzjg="; + hash = "sha256-F8VXjGY6Ct2Y8btqOmxZevCkxBvqg6xWZLYTZA2uUnM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix index 6d5137df41f0..9047413c1fd3 100644 --- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix @@ -12,20 +12,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-frontend"; - version = "4.4.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${finalAttrs.version}"; - hash = "sha256-Cm/Ch7dBKInQYPFGfSlSMLgj8uQR6E3S+6gCFUyvFSU="; + hash = "sha256-R8DO7hsWt8+aKnHFEoZ06f1f+r8dNmNoPZRVBfr9VCY="; }; - sourceRoot = "source/src/frontend"; + sourceRoot = "${finalAttrs.src.name}/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-JacPecJvdyATea8o1jQOxY9Gzx4kH+HLqE0eq03dzjg="; + hash = "sha256-F8VXjGY6Ct2Y8btqOmxZevCkxBvqg6xWZLYTZA2uUnM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix index 47e7e5759664..e38e23cd5c02 100644 --- a/pkgs/by-name/la/lasuite-docs/package.nix +++ b/pkgs/by-name/la/lasuite-docs/package.nix @@ -11,12 +11,12 @@ yarnConfigHook, }: let - version = "4.5.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-/mI11ldbYa051WA2hkV7fnc8CJOb0jHra0FJ+eVCqVs="; + hash = "sha256-R8DO7hsWt8+aKnHFEoZ06f1f+r8dNmNoPZRVBfr9VCY="; }; mail-templates = stdenv.mkDerivation { @@ -29,7 +29,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/src/mail/yarn.lock"; - hash = "sha256-g71OGg0PAo60h0bC+oOyvLvPOCg0pYXuYD8vsR5X9/k="; + hash = "sha256-ag9+g48dWl5Ww/78qqgtcKwiyPVlpNiJ7w7+DPaar2U="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pyproject = true; inherit version src; - sourceRoot = "source/src/backend"; + sourceRoot = "${finalAttrs.src.name}/src/backend"; patches = [ # Support configuration throught environment variables for SECURE_* @@ -104,12 +104,14 @@ python3Packages.buildPythonApplication (finalAttrs: { openai psycopg pycrdt + pydantic-ai-slim pyjwt pyopenssl python-magic redis requests sentry-sdk + uvicorn whitenoise ] ++ celery.optional-dependencies.redis diff --git a/pkgs/by-name/la/lasuite-meet-frontend/package.nix b/pkgs/by-name/la/lasuite-meet-frontend/package.nix index 4964ac865a97..f6a1d8c581be 100644 --- a/pkgs/by-name/la/lasuite-meet-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-meet-frontend/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "lasuite-meet-frontend"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-It/XicX3QBcaun36uksmbeEwhpCHpPM4SAfJwm6wjsQ="; + hash = "sha256-RmMFN1hDSU6q0ZROopsIDJ2nbmvdwW29YywX7rAbgP4="; }; sourceRoot = "source/src/frontend"; @@ -21,7 +21,7 @@ buildNpmPackage rec { npmDeps = fetchNpmDeps { inherit version src; sourceRoot = "source/src/frontend"; - hash = "sha256-eE8vzu6Bp1+kcM0xMUaIRJs+j9N+DhGtR4sxucmSqUM="; + hash = "sha256-W7X5nDtQYxzFZAhei+EXx+j6THTDwz4gTR/wxfB+GI4="; }; buildPhase = '' diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index 720b5a706ed6..3b3831673775 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/pkgs/by-name/la/lasuite-meet/package.nix @@ -13,14 +13,14 @@ in python.pkgs.buildPythonApplication rec { pname = "lasuite-meet"; - version = "1.9.0"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-It/XicX3QBcaun36uksmbeEwhpCHpPM4SAfJwm6wjsQ="; + hash = "sha256-RmMFN1hDSU6q0ZROopsIDJ2nbmvdwW29YywX7rAbgP4="; }; sourceRoot = "source/src/backend"; @@ -48,6 +48,7 @@ python.pkgs.buildPythonApplication rec { django-extensions django-lasuite django-parler + django-pydantic-field django-redis django-storages django-timezone-field @@ -65,6 +66,7 @@ python.pkgs.buildPythonApplication rec { mozilla-django-oidc nested-multipart-parser psycopg + pydantic pyjwt pyopenssl python-frontmatter diff --git a/pkgs/by-name/le/ledfx/package.nix b/pkgs/by-name/le/ledfx/package.nix index 1443ba9f7a0d..41be9fd655f8 100644 --- a/pkgs/by-name/le/ledfx/package.nix +++ b/pkgs/by-name/le/ledfx/package.nix @@ -4,7 +4,7 @@ python3, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "ledfx"; version = "2.1.0"; pyproject = true; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "LedFx"; repo = "LedFx"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-N9EHK0GVohFCjEKsm3g4h+4XWfzZO1tzdd2z5IN1YjI="; }; @@ -72,7 +72,7 @@ python3.pkgs.buildPythonApplication rec { ]; optional-dependencies = { - hue = with pyproject.pkgs; [ python-mbedtls ]; + hue = with python3.pkgs; [ python-mbedtls ]; }; nativeCheckInputs = with python3.pkgs; [ @@ -83,9 +83,9 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Network based LED effect controller with support for advanced real-time audio effects"; homepage = "https://github.com/LedFx/LedFx"; - changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/LedFx/LedFx/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "ledfx"; }; -} +}) diff --git a/pkgs/by-name/le/lepton-jpeg-util/package.nix b/pkgs/by-name/le/lepton-jpeg-util/package.nix new file mode 100644 index 000000000000..212aeff6362d --- /dev/null +++ b/pkgs/by-name/le/lepton-jpeg-util/package.nix @@ -0,0 +1,37 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "lepton-jpeg-util"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "lepton_jpeg_rust"; + tag = "v${finalAttrs.version}"; + hash = "sha256-DfVgQGGnrOOa/UdkYHSENbtxkbR0cTe08uglUM2hfGI="; + }; + + cargoHash = "sha256-AryHUFB6EWSUvKs+lBI16+A27VfRsr6aUtrwsiZxT28="; + + buildAndTestSubdir = "util"; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Port of DropBox Lepton compression to Rust"; + changelog = "https://github.com/microsoft/lepton_jpeg_rust/releases/tag/v${finalAttrs.version}"; + mainProgram = "lepton_jpeg_util"; + homepage = "https://github.com/microsoft/lepton_jpeg_rust"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ skohtv ]; + }; +}) diff --git a/pkgs/by-name/li/libe57format/package.nix b/pkgs/by-name/li/libe57format/package.nix index 892083d77d6a..be54d811b64a 100644 --- a/pkgs/by-name/li/libe57format/package.nix +++ b/pkgs/by-name/li/libe57format/package.nix @@ -3,22 +3,27 @@ stdenv, cmake, fetchFromGitHub, - fetchpatch, + nix-update-script, xercesc, + gtest, }: stdenv.mkDerivation (finalAttrs: { pname = "libe57format"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "asmaloney"; repo = "libE57Format"; - rev = "v${finalAttrs.version}"; - hash = "sha256-GyzfJshL2cOTEDp8eR0sqQq4GSnOdskiLi5mY1a2KW0="; - fetchSubmodules = true; # for submodule-vendored libraries such as `gtest` + tag = "v${finalAttrs.version}"; + hash = "sha256-rEX251cgb6GMToGzcZcwDzjLZBGcwN8+ij1nCIpK2ZE="; }; + postPatch = lib.optionalString finalAttrs.finalPackage.doCheck '' + rmdir test/extern/googletest + ln -s ${gtest.src} test/extern/googletest + ''; + # Repository of E57 files used for testing. libE57Format-test-data_src = fetchFromGitHub { owner = "asmaloney"; @@ -27,16 +32,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-JARpxp6Z2VioBfY0pZSyQU2mG/EllbaF3qteSFM9u8o="; }; - env.CXXFLAGS = toString [ - # GCC 13: error: 'int16_t' has not been declared in 'std' - "-include cstdint" - ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ + propagatedBuildInputs = [ xercesc ]; @@ -72,11 +72,13 @@ stdenv.mkDerivation (finalAttrs: { g++ -Wl,--no-undefined -shared -o libE57FormatShared.so -L. -Wl,-whole-archive -lE57Format -Wl,-no-whole-archive -lxerces-c mv libE57FormatShared.so libE57Format.so - if [ "$dontDisableStatic" -ne "1" ]; then + if [ "''${dontDisableStatic:-1}" -ne "1" ]; then rm libE57Format.a fi ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Library for reading & writing the E57 file format"; homepage = "https://github.com/asmaloney/libE57Format"; diff --git a/pkgs/by-name/li/libredwg/package.nix b/pkgs/by-name/li/libredwg/package.nix index bfde4639426b..3f79fd9f2722 100644 --- a/pkgs/by-name/li/libredwg/package.nix +++ b/pkgs/by-name/li/libredwg/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libredwg"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "LibreDWG"; repo = "libredwg"; tag = finalAttrs.version; - hash = "sha256-FlBHwNsqVSBE8dTDewoKkCbs8Jd/4d69MPpEFzg6Ruc="; + hash = "sha256-FeDQCByFGKfHJDOPQA92GslXZ33nhGfB6/63t2TeugE="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/li/libresprite/no-brew.patch b/pkgs/by-name/li/libresprite/no-brew.patch new file mode 100644 index 000000000000..2556850c08bd --- /dev/null +++ b/pkgs/by-name/li/libresprite/no-brew.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1234567..abcdefg 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -151,14 +151,4 @@ include_directories(${ZLIB_INCLUDE_DIRS}) + + # libArchive +-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +- # Homebrew ships libarchive keg only, include dirs have to be set manually +- execute_process( +- COMMAND brew --prefix libarchive +- OUTPUT_VARIABLE LIBARCHIVE_PREFIX +- OUTPUT_STRIP_TRAILING_WHITESPACE +- COMMAND_ERROR_IS_FATAL ANY +- ) +- set(LibArchive_INCLUDE_DIR "${LIBARCHIVE_PREFIX}/include") +-endif() + find_package(LibArchive REQUIRED) + include_directories(${LibArchive_INCLUDE_DIR}) diff --git a/pkgs/by-name/li/libresprite/package.nix b/pkgs/by-name/li/libresprite/package.nix index f3a635d2779a..630508099365 100644 --- a/pkgs/by-name/li/libresprite/package.nix +++ b/pkgs/by-name/li/libresprite/package.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # From https://github.com/LibreSprite/LibreSprite/pull/565 ./cmake4.diff + # Remove Homebrew-specific brew invocation for libarchive on Darwin; + # Nix provides libarchive directly via buildInputs. + ./no-brew.patch ]; nativeBuildInputs = [ cmake @@ -110,7 +113,5 @@ stdenv.mkDerivation (finalAttrs: { ''; maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; - # https://github.com/LibreSprite/LibreSprite/issues/308 - broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 582752ae611a..40ad50efcfc9 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -78,7 +78,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "8255"; + version = "8401"; outputs = [ "out" @@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-2bPFOEbBPpv2GwhMRkpJpIySh4/KLXKQ8uV7TiY3h+M="; + hash = "sha256-7moL9T29KfMbzvW3QxnasN0U6jAh8RPD/fEs7WpSP10="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -125,7 +125,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ [ openssl ]; npmRoot = "tools/server/webui"; - npmDepsHash = "sha256-5ZswgZFLeI32/xQZqCTTFbCzleDqr5AotjFg/5rNn1M="; + npmDepsHash = "sha256-DxgUDVr+kwtW55C4b89Pl+j3u2ILmACcQOvOBjKWAKQ="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src patches; diff --git a/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix b/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix index 4dbd8503129e..a26aaffdc0da 100644 --- a/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "lxgw-wenkai-screen"; - version = "1.521"; + version = "1.522"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai-Screen/releases/download/v${finalAttrs.version}/LXGWWenKaiScreen.ttf"; - hash = "sha256-7tqMMmIOmMHJHdGXrdD0glguDTJvx+vKYnPDda9OdBk="; + hash = "sha256-zRpvo5xOpC/Y9OKJlFeJsOUQz3AWQ1ZA+Ik82tmyIPM="; }; dontUnpack = true; diff --git a/pkgs/by-name/ma/mako/package.nix b/pkgs/by-name/ma/mako/package.nix index bdc8c3f4e988..25612abe5b87 100644 --- a/pkgs/by-name/ma/mako/package.nix +++ b/pkgs/by-name/ma/mako/package.nix @@ -78,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ dywedir - synthetica ]; platforms = lib.platforms.linux; mainProgram = "mako"; diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index e93a4ecd0db9..e3393bc17036 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mapproxy"; - version = "5.1.1"; + version = "6.0.1"; pyproject = true; src = fetchFromGitHub { owner = "mapproxy"; repo = "mapproxy"; tag = finalAttrs.version; - hash = "sha256-4TRaY/NfOjmq5v+6Rv2UGwF1rqnw4UggVOX2HMa5mVI="; + hash = "sha256-1LDN0vfnJlINHCIagQWhai4uJP+Fidi/9seBoJIlLl0="; }; prePatch = '' @@ -26,9 +26,12 @@ python3Packages.buildPythonApplication (finalAttrs: { pythonRemoveDeps = [ "future" ]; dependencies = with python3Packages; [ + babel boto3 # needed for caches service + jinja2 jsonschema pillow + python-dateutil pyyaml pyproj shapely diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix index b58b4e8feb82..fe5374eb03db 100644 --- a/pkgs/by-name/ma/matomo/package.nix +++ b/pkgs/by-name/ma/matomo/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "matomo"; - version = "5.5.2"; + version = "5.8.0"; src = fetchurl { url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz"; - hash = "sha256-1cUIKSrV5IgCdi3AvIxliJY0kWdaT+S+w8pEi2KoDjE="; + hash = "sha256-IMX15BVhwccLmooeULtLomYJmgl1E5CoiiBxDNkJzsY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ma/mautrix-telegram/package.nix b/pkgs/by-name/ma/mautrix-telegram/package.nix index 6a5664a311b3..4a80fc9c9b36 100644 --- a/pkgs/by-name/ma/mautrix-telegram/package.nix +++ b/pkgs/by-name/ma/mautrix-telegram/package.nix @@ -1,31 +1,31 @@ { lib, - python3, fetchPypi, fetchFromGitHub, + python3, + withE2BE ? true, }: let - python = python3.override { - self = python; - packageOverrides = self: super: { - tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.99.0a6"; - pname = "tulir_telethon"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ewqc6s5xXquZJTZVBsFmHeamBLDw6PnTSNcmTNKD0sk="; - }; - patches = [ ]; - doCheck = false; - }); - }; - }; + tulir-telethon = python3.pkgs.telethon.overrideAttrs ( + finalAttrs: previousAttrs: { + version = "1.99.0a6"; + pname = "tulir_telethon"; + src = fetchFromGitHub { + owner = "tulir"; + repo = "Telethon"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ulnA+xKbZDOTzXYmF9oBWNBNhgxSiF+mKx1ijoCyo/w="; + }; + dontUsePytestCheck = true; + } + ); in -python.pkgs.buildPythonPackage (finalAttrs: { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "mautrix-telegram"; version = "0.15.3"; + pyproject = true; src = fetchFromGitHub { owner = "mautrix"; @@ -34,47 +34,50 @@ python.pkgs.buildPythonPackage (finalAttrs: { hash = "sha256-w3BqWyAJV/lZPoOFDzxhootpw451lYruwM9efwS6cEc="; }; - format = "setuptools"; + build-system = with python3.pkgs; [ setuptools ]; patches = [ ./0001-Re-add-entrypoint.patch ]; - propagatedBuildInputs = - with python.pkgs; - ( - [ - ruamel-yaml - python-magic - commonmark - aiohttp - yarl - (mautrix.override { withOlm = withE2BE; }) - tulir-telethon - asyncpg - mako - setuptools - # speedups - cryptg - aiodns - brotli - # qr_login - pillow - qrcode - # formattednumbers - phonenumbers - # metrics - prometheus-client - # sqlite - aiosqlite - # proxy support - pysocks - ] - ++ lib.optionals withE2BE [ - # e2be - python-olm - pycryptodome - unpaddedbase64 - ] - ); + pythonRelaxDeps = [ + "mautrix" + "ruamel.yaml" + ]; + + dependencies = + with python3.pkgs; + [ + ruamel-yaml + python-magic + commonmark + aiohttp + yarl + (mautrix.override { withOlm = withE2BE; }) + tulir-telethon + asyncpg + mako + setuptools + # speedups + cryptg + aiodns + brotli + # qr_login + pillow + qrcode + # formattednumbers + phonenumbers + # metrics + prometheus-client + # sqlite + aiosqlite + # proxy support + pysocks + ] + ++ lib.optionals withE2BE [ + # e2be + python-olm + pycryptodome + unpaddedbase64 + ]; # has no tests doCheck = false; diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix index 8672419322f5..0738126f66ed 100644 --- a/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/pkgs/by-name/ma/maven/build-maven-package.nix @@ -59,13 +59,13 @@ let buildPhase = '' runHook preBuild - MAVEN_EXTRA_ARGS="" + MAVEN_EXTRA_ARGS="-B" # handle proxy if [[ -n "''${HTTP_PROXY-}" ]] || [[ -n "''${HTTPS_PROXY-}" ]] || [[ -n "''${NO_PROXY-}" ]];then mvnSettingsFile="$(mktemp -d)/settings.xml" ${writeProxySettings} $mvnSettingsFile - MAVEN_EXTRA_ARGS="-s=$mvnSettingsFile" + MAVEN_EXTRA_ARGS="$MAVEN_EXTRA_ARGS -s=$mvnSettingsFile" fi # handle cacert by populating a trust store on the fly diff --git a/pkgs/by-name/md/mdwatch/package.nix b/pkgs/by-name/md/mdwatch/package.nix index 3285415a50d5..64c80deac3ff 100644 --- a/pkgs/by-name/md/mdwatch/package.nix +++ b/pkgs/by-name/md/mdwatch/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.1.22"; src = fetchFromGitHub { - owner = "santoshxshrestha"; + owner = "vimlinuz"; repo = "mdwatch"; tag = "v${finalAttrs.version}"; hash = "sha256-aAa9Y1aKfZVnUyNkEUM7FJKEvQsX9BUqGlTb9zhZzTk="; @@ -26,8 +26,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Simple CLI tool to live-preview Markdown files in your browser"; - homepage = "https://github.com/santoshxshrestha/mdwatch"; - changelog = "https://github.com/santoshxshrestha/mdwatch/releases/tag/${finalAttrs.src.tag}"; + homepage = "https://github.com/vimlinuz/mdwatch"; + changelog = "https://github.com/vimlinuz/mdwatch/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ x123 ]; mainProgram = "mdwatch"; diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix index db5e51302f0b..c9f5a562d11b 100644 --- a/pkgs/by-name/mi/mistral-vibe/package.nix +++ b/pkgs/by-name/mi/mistral-vibe/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mistral-vibe"; - version = "2.4.2"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "mistralai"; repo = "mistral-vibe"; tag = "v${finalAttrs.version}"; - hash = "sha256-r/9kMhkoLfj9oEifFun/bpIQYEouqm9YEiWZVk07+S8="; + hash = "sha256-5su0Qfg3M+Yq4pkptDOJhvM8VFGCaOLeeDijeFeywP4="; }; build-system = with python3Packages; [ @@ -58,12 +58,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pyyaml requests rich + sounddevice textual textual-speedups tomli-w tree-sitter tree-sitter-bash watchfiles + websockets zstandard ]; @@ -81,7 +83,29 @@ python3Packages.buildPythonApplication (finalAttrs: { ]; versionCheckKeepEnvironment = [ "HOME" ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + disabledTests = [ + # Fail in the sandbox + # vibe.core.audio_recorder.audio_recorder_port.NoAudioInputDeviceError: No audio input device available + "test_audio_stream_yields_chunks" + "test_auto_stops_after_max_duration" + "test_buffer_mode_audio_stream_yields_nothing" + "test_can_record_multiple_times" + "test_cancel_discards_audio" + "test_manual_stop_prevents_on_expire" + "test_on_expire_receives_audio" + "test_peak_clamps_to_one" + "test_peak_updates_from_callback" + "test_silent_audio_has_zero_peak" + "test_start_sets_recording_state" + "test_start_when_already_recording_raises" + "test_stop_from_event_loop_does_not_block" + "test_stop_returns_empty_data_in_stream_mode" + "test_stop_returns_positive_duration" + "test_stop_returns_valid_wav" + "test_stop_without_drain_returns_promptly" + "test_stream_audio_does_not_leak_into_buffer_recording" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # AssertionError "test_rebuilds_index_when_mass_change_threshold_is_exceeded" "test_updates_index_incrementally_by_default" diff --git a/pkgs/by-name/mo/moosefs/package.nix b/pkgs/by-name/mo/moosefs/package.nix index 0bcb665ea532..36eeafd5ae8d 100644 --- a/pkgs/by-name/mo/moosefs/package.nix +++ b/pkgs/by-name/mo/moosefs/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "moosefs"; - version = "4.58.3"; + version = "4.58.4"; src = fetchFromGitHub { owner = "moosefs"; repo = "moosefs"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-lEnCP+ORWdW52SVO7K3WxcjlFMrQFR9VT8fjquI/fZg="; + sha256 = "sha256-AvY1TOoxxpiqrMqngZe3BTgMuxwltQk1unr/IEfOLt4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/morse-linux/package.nix b/pkgs/by-name/mo/morse-linux/package.nix index 7d0a5be31e4f..3f61d49a63da 100644 --- a/pkgs/by-name/mo/morse-linux/package.nix +++ b/pkgs/by-name/mo/morse-linux/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "morse"; - version = "2.6"; + version = "2.7"; src = fetchFromGitLab { owner = "esr"; repo = "morse-classic"; tag = finalAttrs.version; - hash = "sha256-wk/Jcp2YWUlecV3OMELD6IWrlj3IC8kh0U4geMxG4fw="; + hash = "sha256-KIFvOPPIpjRsXQDgaQuAFmYDcCwp9rOm9yxTFPOtf3E="; }; buildInputs = [ diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix index 7ee7194ee642..75cc947b89d4 100644 --- a/pkgs/by-name/mp/mpls/package.nix +++ b/pkgs/by-name/mp/mpls/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "mpls"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "mhersson"; repo = "mpls"; tag = "v${finalAttrs.version}"; - hash = "sha256-a33XbUw6H2EKfGZnpV6L00iab6AoXqPiNTMw/OaouHs="; + hash = "sha256-SdCWtz/BmuOBLuwQiif5YnnNctaOQpb6iHqDT6j35ZM="; }; vendorHash = "sha256-pi7KBA/313cG0AYWM/mUDng2M9L2tMLkonY4LI5XiW0="; diff --git a/pkgs/by-name/mp/mprisence/package.nix b/pkgs/by-name/mp/mprisence/package.nix index ef0a1703b83d..5dec1403baec 100644 --- a/pkgs/by-name/mp/mprisence/package.nix +++ b/pkgs/by-name/mp/mprisence/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mprisence"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "lazykern"; repo = "mprisence"; tag = "v${finalAttrs.version}"; - hash = "sha256-tzxuofwhYq6iRZ+f+T9KkXCV9gIplYc1LdB85D75hBA="; + hash = "sha256-5iNxNuLtIZDz8lS1J8qjBousGy/2ZR1/KI/xeFuQfSU="; }; - cargoHash = "sha256-W4/ppT37h+Ho7oVKA/2KhCjQeZX0NiIqdopQmBWf/Xc="; + cargoHash = "sha256-MIclhi34hXqhpSnyqxS496Fd8Xv/gFJJS3/4EObVYHs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/mt/mtpaint/package.nix b/pkgs/by-name/mt/mtpaint/package.nix index 8d42cd38b305..85c631d0aed7 100644 --- a/pkgs/by-name/mt/mtpaint/package.nix +++ b/pkgs/by-name/mt/mtpaint/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation { pname = "mtPaint"; - version = "3.50.12"; + version = "3.50.14"; src = fetchFromGitHub { owner = "wjaguar"; repo = "mtPaint"; - rev = "7cae5d663ed835a365d89a535536c39e18862a83"; - hash = "sha256-W/MQZ1WqoVMzyEd60rbvA8yieesDc/xfKqbYGZumi2U="; + rev = "8304376e8861a8a603371b0f188db30f9cafdc17"; + hash = "sha256-dyBbzEjdgMPlPnjFlJoZOh5qjx/qY94F28jEr2ihLQE="; }; strictDeps = true; diff --git a/pkgs/by-name/mu/mutmut/package.nix b/pkgs/by-name/mu/mutmut/package.nix index 1ea0499bdc5d..86ccf1ee3536 100644 --- a/pkgs/by-name/mu/mutmut/package.nix +++ b/pkgs/by-name/mu/mutmut/package.nix @@ -42,7 +42,6 @@ python3Packages.buildPythonApplication (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ l0b0 - synthetica ]; }; }) diff --git a/pkgs/by-name/my/mycli/package.nix b/pkgs/by-name/my/mycli/package.nix index f6693a8d892b..c2719a2a2c59 100644 --- a/pkgs/by-name/my/mycli/package.nix +++ b/pkgs/by-name/my/mycli/package.nix @@ -18,6 +18,7 @@ python3Packages.buildPythonApplication (finalAttrs: { }; pythonRelaxDeps = [ + "sqlglot" # https://github.com/dbcli/mycli/issues/1696 "sqlparse" "click" ]; diff --git a/pkgs/by-name/nc/ncpamixer/package.nix b/pkgs/by-name/nc/ncpamixer/package.nix index 231dd9836837..531173de8d81 100644 --- a/pkgs/by-name/nc/ncpamixer/package.nix +++ b/pkgs/by-name/nc/ncpamixer/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ncpamixer"; - version = "1.3.9"; + version = "1.3.11"; src = fetchFromGitHub { owner = "fulhax"; repo = "ncpamixer"; tag = finalAttrs.version; - hash = "sha256-uafjAaXtn97NNmRPxeHmbAaMeHIR/nrQKsTqDX5NRGU="; + hash = "sha256-N7GtMOcZb345tjcT5S3QOGx+n4SpDohiKPOjsgwgr6I="; }; patches = [ diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix index 61150c7b82c6..64504708f140 100644 --- a/pkgs/by-name/nc/ncps/package.nix +++ b/pkgs/by-name/nc/ncps/package.nix @@ -15,13 +15,13 @@ buildGoModule (finalAttrs: { pname = "ncps"; - version = "0.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "kalbasit"; repo = "ncps"; tag = "v${finalAttrs.version}"; - hash = "sha256-LRabKv+4xYQn2XH4AIacFkn3ewUd2S3UlVWCA6MUweU="; + hash = "sha256-VPcX9gLXnTrap6HHU+08QdTBbT2oaNA2C9WY0e/FVoc="; }; vendorHash = "sha256-PpHSkD7+csPfUXoYRuKhBm1iBtTSwJhOxuW/4ayv9hY="; diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix index 7d9482696894..3b9ed82a5bfd 100644 --- a/pkgs/by-name/ne/nelm/package.nix +++ b/pkgs/by-name/ne/nelm/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "nelm"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "werf"; repo = "nelm"; tag = "v${finalAttrs.version}"; - hash = "sha256-64OAyuqV8qryVNH0Mxo9FiHnVjeshG45rtiU7jumb+w="; + hash = "sha256-zlZ2muIEL/azEwdFMxXDO2XPpunYt42Vv1JYOmlN1k4="; }; - vendorHash = "sha256-rMSEUKHyj/R+YTm2ADNHsrdeH4SbF6XQyrkjkgPvhx8="; + vendorHash = "sha256-7gb962ejpgy9fLL+JVA8i6NLeltfIqtZvxwtnigTGvI="; subPackages = [ "cmd/nelm" ]; diff --git a/pkgs/by-name/ne/nerdfetch/package.nix b/pkgs/by-name/ne/nerdfetch/package.nix index 3db1d4bfbe80..807758ee402f 100644 --- a/pkgs/by-name/ne/nerdfetch/package.nix +++ b/pkgs/by-name/ne/nerdfetch/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "nerdfetch"; - version = "8.5.1"; + version = "8.5.4"; src = fetchFromGitHub { owner = "ThatOneCalculator"; repo = "NerdFetch"; tag = "v${finalAttrs.version}"; - hash = "sha256-wt/VpieLuS8cAUlpCdiFysdrjXwgGZ436eMUycTl0S4="; + hash = "sha256-tV8Ug7i/BTD+TxUCejwYdGLYauAYos18AnWQ1XgynWs="; }; dontUnpack = true; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "POSIX *nix (Linux, macOS, Android, *BSD, etc) fetch script using Nerdfonts"; homepage = "https://github.com/ThatOneCalculator/NerdFetch"; - changelog = "https://github.com/ThatOneCalculator/NerdFetch/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/ThatOneCalculator/NerdFetch/releases/tag/${finalAttrs.src.tag}"; maintainers = with lib.maintainers; [ ByteSudoer ]; license = lib.licenses.mit; mainProgram = "nerdfetch"; diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index 0187e0c683f9..a9c25f752604 100644 --- a/pkgs/by-name/ne/netbird-dashboard/package.nix +++ b/pkgs/by-name/ne/netbird-dashboard/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "netbird-dashboard"; - version = "2.32.5"; + version = "2.34.2"; src = fetchFromGitHub { owner = "netbirdio"; repo = "dashboard"; rev = "v${version}"; - hash = "sha256-DNIibCGeC4dzJ8xKQPLkWJZ2YfW2igLse+321SrSmhE="; + hash = "sha256-eqDH0mtxb756M6G0pC+FmbZtgj0vk9uKXnzCHlPEquE="; }; - npmDepsHash = "sha256-shN+XdS5Z2MxEFy453YqqovDUXbde3L9Y7+cPZW53/Y="; + npmDepsHash = "sha256-AYbTtUgo/e9BD5Kg877qUHkj+4l2OJ88rxnquA2789k="; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' diff --git a/pkgs/by-name/nh/nh-unwrapped/package.nix b/pkgs/by-name/nh/nh-unwrapped/package.nix index f3509e816370..92d0d2c4b80d 100644 --- a/pkgs/by-name/nh/nh-unwrapped/package.nix +++ b/pkgs/by-name/nh/nh-unwrapped/package.nix @@ -71,27 +71,34 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' - # Run both shell completion and manpage generation tasks. Unlike the - # fine-grained variants, the 'dist' command doesn't allow specifying the - # path but that's fine, because we can simply install them from the implicit - # output directories. - $out/bin/xtask dist + postInstall = + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + # Run both shell completion and manpage generation tasks. Unlike the + # fine-grained variants, the 'dist' command doesn't allow specifying the + # path but that's fine, because we can simply install them from the implicit + # output directories. + ${emulator} $out/bin/xtask dist - # The dist task above should've created - # 1. Shell completions in comp/ - # 2. The NH manpage (nh.1) in man/ - # Let's install those. - # The important thing to note here is that installShellCompletion cannot - # actually load *all* shell completions we generate with 'xtask dist'. - # Elvish, for example isn't supported. So we have to be very explicit - # about what we're installing, or this will fail. - installShellCompletion --cmd ${finalAttrs.meta.mainProgram} ./comp/*.{bash,fish,zsh,nu} - installManPage ./man/nh.1 - - # Avoid populating PATH with an 'xtask' cmd - rm $out/bin/xtask - ''; + # The dist task above should've created + # 1. Shell completions in comp/ + # 2. The NH manpage (nh.1) in man/ + # Let's install those. + # The important thing to note here is that installShellCompletion cannot + # actually load *all* shell completions we generate with 'xtask dist'. + # Elvish, for example isn't supported. So we have to be very explicit + # about what we're installing, or this will fail. + installShellCompletion --cmd ${finalAttrs.meta.mainProgram} ./comp/*.{bash,fish,zsh,nu} + installManPage ./man/nh.1 + '' + ) + + '' + # Avoid populating PATH with an 'xtask' cmd + rm $out/bin/xtask + ''; cargoHash = "sha256-BLv69rL5L84wNTMiKHbSumFU4jVQqAiI1pS5oNLY9yE="; diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index 709e0ed9124f..1269ef2a8152 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -12,19 +12,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ni"; - version = "28.3.0"; + version = "29.0.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "ni"; tag = "v${finalAttrs.version}"; - hash = "sha256-YLHtNJIGdprmqgBnKMREeHk6zZ43909JpmjJk/j0qyU="; + hash = "sha256-PRYsKIpjb3Mu+U1Vc4eHx07LHZt7DycEkb/AFsi/OgA="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-cwVCGEhNmhMweJJJoPzqe8e2agHfIxIi6WmKiceCAns="; + hash = "sha256-zYKsg9tMaiclazKkiE8EIKRJFwePEwChsvFOs9bp1jE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ni/nightdiamond-cursors/package.nix b/pkgs/by-name/ni/nightdiamond-cursors/package.nix index 4ef2eef09e1d..708d0077b5be 100644 --- a/pkgs/by-name/ni/nightdiamond-cursors/package.nix +++ b/pkgs/by-name/ni/nightdiamond-cursors/package.nix @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation { version = "0-unstable-2025-09-23"; src = fetchFromGitHub { - owner = "santoshxshrestha"; + owner = "vimlinuz"; repo = "NightDiamond-cursors"; rev = "3ff3c0486430a4901b4d5cbbee87a370aa2b8ce9"; hash = "sha256-huruHo5w7Qrte1+nIiz+P1xPNDGrv5/eByHwaSlZYwQ="; @@ -23,10 +23,10 @@ stdenvNoCC.mkDerivation { ''; meta = { - homepage = "https://github.com/santoshxshrestha/NightDiamond-cursors"; + homepage = "https://github.com/vimlinuz/NightDiamond-cursors"; description = "NightDiamond cursor themes"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ santosh ]; + maintainers = with lib.maintainers; [ vimlinuz ]; }; } diff --git a/pkgs/by-name/no/nomore403/package.nix b/pkgs/by-name/no/nomore403/package.nix index 425ca2ddda3b..5f7130fcf8e9 100644 --- a/pkgs/by-name/no/nomore403/package.nix +++ b/pkgs/by-name/no/nomore403/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "nomore403"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "devploit"; repo = "nomore403"; tag = "v${finalAttrs.version}"; - hash = "sha256-5jZgX8Cj+K2XHnSqmyq0/AQ295XHO9aI94niLNdxwuc="; + hash = "sha256-7rtmLBHv7QcfrD5+y6+r1uX1vB3VlxJzXQeBYUW6tK8="; }; - vendorHash = "sha256-SGme/lJ/QZz4LEe3HJYGSmowDqekKIwXEJzZAgrvUGU="; + vendorHash = "sha256-zAkS0o+wOQLmCil7Lh7DIZCcHYiceb1KwiK/vkSYYwk="; ldflags = [ "-s" diff --git a/pkgs/by-name/nv/nvidia-mig-parted/package.nix b/pkgs/by-name/nv/nvidia-mig-parted/package.nix index fbc804c23d05..c6c27f49aa56 100644 --- a/pkgs/by-name/nv/nvidia-mig-parted/package.nix +++ b/pkgs/by-name/nv/nvidia-mig-parted/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "nvidia-mig-parted"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "mig-parted"; tag = "v${finalAttrs.version}"; - hash = "sha256-No8NzmjDjri77r7YzuSYsGMvHHMxsvxJaddarKcDMr0="; + hash = "sha256-b+/Rz1Lj+Ef7fIw4g2el8td982SGKXb0iPboP53XGKQ="; }; vendorHash = null; diff --git a/pkgs/by-name/od/odoo18/package.nix b/pkgs/by-name/od/odoo18/package.nix index 4aae1d5e6d03..af443693db23 100644 --- a/pkgs/by-name/od/odoo18/package.nix +++ b/pkgs/by-name/od/odoo18/package.nix @@ -94,7 +94,7 @@ python.pkgs.buildPythonApplication rec { passthru = { updateScript = ./update.sh; tests = { - inherit (nixosTests) odoo; + inherit (nixosTests) odoo18; }; }; diff --git a/pkgs/by-name/od/odoo/package.nix b/pkgs/by-name/od/odoo19/package.nix similarity index 98% rename from pkgs/by-name/od/odoo/package.nix rename to pkgs/by-name/od/odoo19/package.nix index 2de0d3e4d2ff..c6a9f9c110e6 100644 --- a/pkgs/by-name/od/odoo/package.nix +++ b/pkgs/by-name/od/odoo19/package.nix @@ -92,7 +92,7 @@ python.pkgs.buildPythonApplication rec { passthru = { updateScript = ./update.sh; tests = { - inherit (nixosTests) odoo; + inherit (nixosTests) odoo19; }; }; diff --git a/pkgs/by-name/od/odoo/update.sh b/pkgs/by-name/od/odoo19/update.sh similarity index 100% rename from pkgs/by-name/od/odoo/update.sh rename to pkgs/by-name/od/odoo19/update.sh diff --git a/pkgs/by-name/op/openclaw/package.nix b/pkgs/by-name/op/openclaw/package.nix index db326603938d..23629043201a 100644 --- a/pkgs/by-name/op/openclaw/package.nix +++ b/pkgs/by-name/op/openclaw/package.nix @@ -1,6 +1,7 @@ { lib, stdenvNoCC, + buildPackages, fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, @@ -10,6 +11,7 @@ versionCheckHook, nix-update-script, rolldown, + installShellFiles, version ? "2026.3.12", }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -39,6 +41,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpm_10 nodejs_22 makeWrapper + installShellFiles ]; preBuild = '' @@ -82,6 +85,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + postInstall = lib.optionalString (stdenvNoCC.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenvNoCC.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd openclaw \ + --bash <(${emulator} $out/bin/openclaw completion --shell bash) \ + --fish <(${emulator} $out/bin/openclaw completion --shell fish) \ + --zsh <(${emulator} $out/bin/openclaw completion --shell zsh) + '' + ); + nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix index ce46269ad8dd..dbc937fa9bc3 100644 --- a/pkgs/by-name/op/openfga-cli/package.nix +++ b/pkgs/by-name/op/openfga-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "openfga-cli"; - version = "0.7.10"; + version = "0.7.11"; src = fetchFromGitHub { owner = "openfga"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-2sFuECnQoxySqTY0QWgKs5DUd+15fqd8m43zcVqfrXI="; + hash = "sha256-kExvR5FxC1VbT8xmkFREdeqJ+ism7Is1pTgrBMJp7Qs="; }; - vendorHash = "sha256-8MRafaGwu16+G20RMvBPu7JhyNu5FOIr7+sN7knw6ac="; + vendorHash = "sha256-QBUPJ+rWT8BeIVx/437j/pUNBHmIVWkEyRpnWhYdjO4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/openimagedenoise/cuda.patch b/pkgs/by-name/op/openimagedenoise/cuda.patch index 4bc5172d8830..d1b59d9f186b 100644 --- a/pkgs/by-name/op/openimagedenoise/cuda.patch +++ b/pkgs/by-name/op/openimagedenoise/cuda.patch @@ -1,21 +1,16 @@ -Remove upstream workarounds for CMake "limitations" that do not appear to exist -in nixpkgs build environment, but rather break the build, presumably because -CMAKE_INSTALL_{BIN,LIB}DIR is an absolute path in our build so -CMAKE_INSTALL_PREFIX has no effect. - diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt -index d5111cd..43986ad 100644 +index a0ea112..4d03b4f 100644 --- a/devices/CMakeLists.txt +++ b/devices/CMakeLists.txt -@@ -53,7 +53,6 @@ if(OIDN_DEVICE_CUDA) - -DCMAKE_CXX_COMPILER:FILEPATH=${_host_compiler} - -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE} - -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -- -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/cuda/preinstall - -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR} - -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} - -DCUDAToolkit_ROOT:PATH=${CUDAToolkit_ROOT} -@@ -69,14 +68,6 @@ if(OIDN_DEVICE_CUDA) +@@ -47,7 +47,6 @@ if(OIDN_DEVICE_CUDA) + -DCMAKE_CXX_COMPILER:FILEPATH=${_host_compiler} + -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE} + -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} +- -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/cuda/preinstall + -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR} + -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} + -DOIDN_ROOT_BINARY_DIR:PATH=${OIDN_ROOT_BINARY_DIR} +@@ -78,14 +77,6 @@ if(OIDN_DEVICE_CUDA) DEPENDS OpenImageDenoise_core ) @@ -30,3 +25,10 @@ index d5111cd..43986ad 100644 endif() if(OIDN_DEVICE_HIP) +@@ -186,4 +177,4 @@ endif() + + if(OIDN_DEVICE_METAL) + add_subdirectory(metal) +-endif() +\ No newline at end of file ++endif() diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index 2982de88dea1..1a94fc54f52b 100644 --- a/pkgs/by-name/op/openimagedenoise/package.nix +++ b/pkgs/by-name/op/openimagedenoise/package.nix @@ -19,10 +19,14 @@ stdenv.mkDerivation (finalAttrs: { # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/RenderKit/oidn/releases/download/v${finalAttrs.version}/oidn-${finalAttrs.version}.src.tar.gz"; - sha256 = "sha256-SM0Bn4qgeqRJAXr2MMjNjfWJVTcciERZxMHiyx4Z1hA="; + hash = "sha256-SM0Bn4qgeqRJAXr2MMjNjfWJVTcciERZxMHiyx4Z1hA="; }; - patches = lib.optional cudaSupport ./cuda.patch; + strictDeps = true; + + patches = lib.optionals cudaSupport [ + ./cuda.patch + ]; postPatch = '' # fix build failure with GCC14 @@ -35,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { python3 ispc ] - ++ lib.optional cudaSupport cudaPackages.cuda_nvcc + ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; buildInputs = [ @@ -49,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "OIDN_DEVICE_CUDA" cudaSupport) - (lib.cmakeFeature "TBB_INCLUDE_DIR" "${onetbb.dev}/include") + (lib.cmakeFeature "TBB_INCLUDE_DIR" "${lib.getDev onetbb}/include") (lib.cmakeFeature "TBB_ROOT" "${onetbb}") ]; diff --git a/pkgs/by-name/or/org-freedesktop-filemanager1-common/package.nix b/pkgs/by-name/or/org-freedesktop-filemanager1-common/package.nix new file mode 100644 index 000000000000..fa7f9e80269d --- /dev/null +++ b/pkgs/by-name/or/org-freedesktop-filemanager1-common/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + dbus, + systemdLibs, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "org-freedesktop-filemanager1-common"; + version = "0-unstable-2025-10-12"; + + src = fetchFromGitHub { + owner = "boydaihungst"; + repo = "org.freedesktop.FileManager1.common"; + rev = "7f516129ac71be409dc415421859de68c1a2ed0e"; + hash = "sha256-FCmNqz8JaP6XUaJOoWw5Lfls3ThdY+Yv2kRdk8XIRic="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + dbus + systemdLibs + ]; + + postInstall = '' + for file in $out/share/org.freedesktop.FileManager1.common/*-wrapper.sh; do + name=''${file##*/} + name=''${name%-wrapper.sh} + sed -i "s|^cmd=.*|cmd=\"$name\"|" "$file" + done + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Using File Manager DBus Interface to open file manager and hover over file(s)/folder(s)"; + homepage = "https://github.com/boydaihungst/org.freedesktop.FileManager1.common"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ anninzy ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ow/owocr/package.nix b/pkgs/by-name/ow/owocr/package.nix index c05a5605c9ca..9ab0eb7eddd3 100644 --- a/pkgs/by-name/ow/owocr/package.nix +++ b/pkgs/by-name/ow/owocr/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "owocr"; - version = "1.26.3"; + version = "1.26.5"; pyproject = true; src = fetchFromGitHub { owner = "AuroraWright"; repo = "owocr"; tag = finalAttrs.version; - hash = "sha256-/eee0uOWZgjHKhN3Ie75qxXqlSH1Fm3ipDYkvyIK5LM="; + hash = "sha256-ZISL0K16Ilmne8SZ5+L7FSxjZJd8j7tDklUOjPvw7HM="; }; # we use pystray directly to avoid making a new package diff --git a/pkgs/by-name/ox/oxfmt/package.nix b/pkgs/by-name/ox/oxfmt/package.nix index ac3a4efa04b8..fdbacb66033c 100644 --- a/pkgs/by-name/ox/oxfmt/package.nix +++ b/pkgs/by-name/ox/oxfmt/package.nix @@ -94,8 +94,9 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "JavaScript formatter with Prettier integration"; - homepage = "https://github.com/oxc-project/oxc"; + description = "High-performance formatter for the JavaScript ecosystem"; + homepage = "https://oxc.rs/docs/guide/usage/formatter"; + downloadPage = "https://github.com/oxc-project/oxc"; changelog = "https://github.com/oxc-project/oxc/blob/${finalAttrs.src.tag}/apps/oxfmt/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; diff --git a/pkgs/by-name/pa/padthv1/package.nix b/pkgs/by-name/pa/padthv1/package.nix index 89cfc6b0c971..587a0e455d88 100644 --- a/pkgs/by-name/pa/padthv1/package.nix +++ b/pkgs/by-name/pa/padthv1/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "padthv1"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "mirror://sourceforge/padthv1/padthv1-${finalAttrs.version}.tar.gz"; - hash = "sha256-Rru6nIPTdXmBD5sXHQXaB4gjWrlB6F6CYHPTjY7ekuo="; + hash = "sha256-Vn1VgzpWgeHxhE+BiVeXrHdkMq5BXMcnS1dG3b33noY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix index e538e51979af..88cb48468f45 100644 --- a/pkgs/by-name/pd/pdal/package.nix +++ b/pkgs/by-name/pd/pdal/package.nix @@ -24,7 +24,6 @@ proj, sqlite, tiledb, - xercesc, zlib, zstd, }: @@ -59,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { proj sqlite tiledb - xercesc zlib zstd ] diff --git a/pkgs/by-name/pe/penelope/package.nix b/pkgs/by-name/pe/penelope/package.nix index 3f0a4361c627..b3f1d0711103 100644 --- a/pkgs/by-name/pe/penelope/package.nix +++ b/pkgs/by-name/pe/penelope/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "penelope"; - version = "0.18.0"; + version = "0.19.1"; pyproject = true; src = fetchFromGitHub { owner = "brightio"; repo = "penelope"; tag = "v${finalAttrs.version}"; - hash = "sha256-ryUG/OQsU6mecr+kSe5CD41a53xNRrPs1esL+V1lmdQ="; + hash = "sha256-72HFPByH4FBRIYaTeEWaZ2dW43Q1OjosT3qAOMiu5t4="; }; postPatch = '' diff --git a/pkgs/by-name/pi/pingu/package.nix b/pkgs/by-name/pi/pingu/package.nix index d835fc833d0c..46411cd3ad82 100644 --- a/pkgs/by-name/pi/pingu/package.nix +++ b/pkgs/by-name/pi/pingu/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "pingu"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "CactiChameleon9"; repo = "pingu"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-pXC/y+piLhSWIcJ1/+UaC3sjHPKG3XvTuHzWENsXME0="; + sha256 = "sha256-KiJRr06N5zOq2vov+iKf5omrzxORxIUaEjM+rXfaoR0="; # Get values that require us to use git, then delete .git leaveDotGit = true; postFetch = '' @@ -22,7 +22,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-8d0pKweumnJH49HSBCfEF8cwEXLGMAk2WbhS10T/Cmc="; + vendorHash = "sha256-+2YyJo4RFJXTt7foDrEoLeCcbkRqQ+boFaKioUtcZsM="; ldflags = [ "-w" "-s" diff --git a/pkgs/by-name/pi/pipectl/package.nix b/pkgs/by-name/pi/pipectl/package.nix index c500f6c8af10..ca49ea6068d8 100644 --- a/pkgs/by-name/pi/pipectl/package.nix +++ b/pkgs/by-name/pi/pipectl/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Ferdi265/pipectl"; license = lib.licenses.gpl3; description = "Simple named pipe management utility"; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = [ ]; mainProgram = "pipectl"; }; }) diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index e5a87823b7c0..e9928d5bddd3 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2026-03-09"; + version = "0-unstable-2026-03-17"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "59cb58a646844f6fba00bfadc39b4bea96357358"; - hash = "sha256-CsKdUrgnjs11iVdfUwgiO9KTx1TCfqFljiFqiAYxoK4="; + rev = "1b7f032dee11d6534119541bc3e03f0fcbcc4995"; + hash = "sha256-++7gtFcp5mD480LfiFmr+7O8ZA3kO9DWZpyLlXagZMI="; }; - vendorHash = "sha256-G/XTWobysyzONctabYDIfAQ/zaAA9w2Ky7Hn6cj9l/c="; + vendorHash = "sha256-wbK//T/kE55Wx/Vn5Zl7VudvcEPEAqzKzlMZdcx6PIs="; subPackages = [ "cmd/pkgsite" ]; diff --git a/pkgs/by-name/pl/plexamp/package.nix b/pkgs/by-name/pl/plexamp/package.nix index 0c26bf0f962c..7f9acac9d661 100644 --- a/pkgs/by-name/pl/plexamp/package.nix +++ b/pkgs/by-name/pl/plexamp/package.nix @@ -43,7 +43,6 @@ appimageTools.wrapType2 { maintainers = with lib.maintainers; [ killercup redhawk - synthetica ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/pr/prose/package.nix b/pkgs/by-name/pr/prose/package.nix index 3754aa9ef2c7..c8549158d2ef 100644 --- a/pkgs/by-name/pr/prose/package.nix +++ b/pkgs/by-name/pr/prose/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "prose"; - version = "0.5.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "jgdavey"; repo = "prose"; tag = "v${finalAttrs.version}"; - hash = "sha256-e3NkG05ZKpUmlxO4cJbEvCZbrp7tg9rP0jMCAzYFVCI="; + hash = "sha256-YMRCdHDxZ3PMbRn1Ct+oQEMV1TgJa3VIMPVE2lK+tX8="; }; - cargoHash = "sha256-6LRQ94ZtnlSCM1pRMhPGDSDEacFEUL0UiQAfoZZ3MMM="; + cargoHash = "sha256-DT8ZlH5CG4VDzT5x5OtuRK//IguV8d+6F4vwdhZ/Rns="; passthru = { tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index e5f0ce0ffb01..cf6d69f37aa1 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton10-32"; + version = "GE-Proton10-33"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-NxZ4OJUYQdRNQTb62jRET6Ef14LEhynOASIMPvwWeNA="; + hash = "sha256-vuPqz9vD/B1H6IFA7Wi/YEPbklNTbVbEZ2Erm62kBnk="; }; dontUnpack = true; diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix index f04e67e1b2fa..46a1cb9dc1b3 100644 --- a/pkgs/by-name/pt/ptyxis/package.nix +++ b/pkgs/by-name/pt/ptyxis/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ptyxis"; - version = "49.3"; + version = "50.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "ptyxis"; tag = finalAttrs.version; - hash = "sha256-kBkLJdUN9WNP0HLiQQMWBC/49YaLmkgOuIj8jqkgLgY="; + hash = "sha256-SHp+2hYEYoKi5I4XuTwL818Kil812tOtuHNXCKoAJCk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix index 78584e759b93..0c9920d56d20 100644 --- a/pkgs/by-name/pu/pulumi-bin/data.nix +++ b/pkgs/by-name/pu/pulumi-bin/data.nix @@ -1,24 +1,24 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.225.1"; + version = "3.226.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.225.1-linux-x64.tar.gz"; - sha256 = "0ydbj9ck6s4yqhyarivfzaxy55rrwi73gcylpral8q0lp5jdlz33"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.226.0-linux-x64.tar.gz"; + sha256 = "1v60sszili8wxnhn1b9dp3fv0662shp6xa03l0ybnglwkz8fby3b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.50.0-linux-amd64.tar.gz"; - sha256 = "1g92w8h0sxp4cgclmfhzjmnc4ph9p9wyk3zy2r6kyngl3qjgcxn8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-linux-amd64.tar.gz"; + sha256 = "1f5pvflvcd9xr86ys1n46ywyakl30l2xrrwqhbhkb117gp17a9lx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-amd64.tar.gz"; sha256 = "1c8bd6m2kk6nzbmq3csb5babmbma83cxsvqxv7z0s59b2p6jc9r5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.96.0-linux-amd64.tar.gz"; - sha256 = "076frm1271k5ngdfyfq94qcaag4dz4079b23wadzlvaijw7r58a3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.97.0-linux-amd64.tar.gz"; + sha256 = "0wqrvrvdn9wy2hk4n27lndrk8jp1lihyzdwapbvj4xrypy24ghs2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-linux-amd64.tar.gz"; @@ -29,16 +29,16 @@ sha256 = "13jsxvjzhhx7zrnx93drh7sych1sh173fl5wa05hxzc18vl29g81"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.21.0-linux-amd64.tar.gz"; - sha256 = "128x7scca7lqqjbsk0rl3mlipc6mbl6q3kixrwm8vv4l0y5wp8pd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.23.0-linux-amd64.tar.gz"; + sha256 = "0k3v1s41vv6bj798vydjx6al1rxp4bhssxi3q2h13kxs5caqbigm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.8.1-linux-amd64.tar.gz"; sha256 = "148hqdcg8s4ac6sf17aamdwkinfvplf6kzkw3sb3s2frgbq7k4kx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.12.0-linux-amd64.tar.gz"; - sha256 = "08f0vgxsa7cmh2npxkwhvg5qxmdqmk8zxdr4p01bw50fvsdn87kd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.13.0-linux-amd64.tar.gz"; + sha256 = "1k5mjkicp28qg41d0z71s5crag6dyk1gs9a1sc9xvhkvmha6f752"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.33.0-linux-amd64.tar.gz"; @@ -61,8 +61,8 @@ sha256 = "182pn8ra0nhm4j6gkakdl5wik75wrhdqf7jpn52gyln6ai0nywri"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-linux-amd64.tar.gz"; - sha256 = "1zjz0mbfjgpnjiwr4rl5bv3bfl8l8sym1azyrnckkc0gzbgdkg2d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.1-linux-amd64.tar.gz"; + sha256 = "1l4nn0nbrv514rmgs8zz89z30fzd6jfnbqh4751malx89ach2rqy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "09x25vfq2fbxcmkcjaj0yr2xhcplyj0w2z4c0lwcl368fnk9z9zy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.14.0-linux-amd64.tar.gz"; - sha256 = "0kdb1a88z3mrlwm24m8935ck2fgb1vc2ygp38sq8fmndfzvrikvc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.15.0-linux-amd64.tar.gz"; + sha256 = "0x1lplrp26a4qnsf49q6x11midpgnkfp3ryg16w7cpyq18bf2xqa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-amd64.tar.gz"; @@ -93,12 +93,12 @@ sha256 = "19k79m8dhkiy4x4rs6dq4zkfczjsnmc0mvbh57b5l52imsv7ks7m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.27.0-linux-amd64.tar.gz"; - sha256 = "1babmf4727g6xsp4z00qqqz6nb01wqa2w90c2g0nnx804gsy5rr0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.28.0-linux-amd64.tar.gz"; + sha256 = "0saa0i1id3lgdlw8wi2wbwymd1vnxdzmrqqr876gk9hcs9fj7bar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.8.0-linux-amd64.tar.gz"; - sha256 = "0mkhj79nqpgx86ilm77apvbva4d16m384mrk10v4108kplrn8vb3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.9.0-linux-amd64.tar.gz"; + sha256 = "0gh9xxawgnmkr6rc3cn7vv9svl03cgv15bx5agvfa1amgaajixc4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.7.0-linux-amd64.tar.gz"; @@ -163,20 +163,20 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.225.1-darwin-x64.tar.gz"; - sha256 = "02cvhp0v5x7378mpbfpgil9xid25wd7q7svxfpi7qih8v0k5z51f"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.226.0-darwin-x64.tar.gz"; + sha256 = "0sw8yan7g7s7j8816i382j3l8mk5dkk34ppqcavdnlp5j3y331v7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.50.0-darwin-amd64.tar.gz"; - sha256 = "0977vw87ilwk7zka6f545291xb1n66y38fdyqiqpppj14yhkchg9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-darwin-amd64.tar.gz"; + sha256 = "19q09p7kqygdm1j2rvxbzzivyf983pi4frkfak3n63ybkbnxsp43"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-amd64.tar.gz"; sha256 = "08i28x0fp4pxb14klgjdqi05hyw4ilj0iz5ri53mpmviyl1mrmaq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.96.0-darwin-amd64.tar.gz"; - sha256 = "06jril67jal879fbxq7jh4qsaslb2vmvi8grh98ad0ark8yvlj48"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.97.0-darwin-amd64.tar.gz"; + sha256 = "0jbz6k9pv9d366q0xj39sg9zxlgl5vv0lb69hbxrm061qldkxnhf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-darwin-amd64.tar.gz"; @@ -187,16 +187,16 @@ sha256 = "06yyr3zaj29mhvfsf4fgwip53mk28hrh73va32vkxvry6hn2hmjr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.21.0-darwin-amd64.tar.gz"; - sha256 = "1g4d85jqr7j66xjx92azw2hxzapj45rr9bwdin9fy6snjv1z9y52"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.23.0-darwin-amd64.tar.gz"; + sha256 = "047fvz5j988lxdzf4wnaj36zcj7sj5kwj4flvgp2dbgp0ccz51a1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.8.1-darwin-amd64.tar.gz"; sha256 = "1j60xxsl9vsvjipnv8yw69i3shrs4bmz74rna4pdy1g2rm9kwndf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.12.0-darwin-amd64.tar.gz"; - sha256 = "00y0y0djndgi98vq068pzmflj6ypwqg1bm242vdajfz43afsz7z7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.13.0-darwin-amd64.tar.gz"; + sha256 = "074zm0g5shim2178i8wyrrvnv94yyx94s591mw2n2pd0hf6gicbd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.33.0-darwin-amd64.tar.gz"; @@ -219,8 +219,8 @@ sha256 = "1limkhwc7phij44z20bvikgf0sd3cd1n28av6phw02g7c2gph04l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-darwin-amd64.tar.gz"; - sha256 = "0mkp8aywwfzjbjhp6z2b58x136wlcbqdw338v9rfsk77ymcaz0jy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.1-darwin-amd64.tar.gz"; + sha256 = "1vnsvd74m5ysfhygs56s928hmap4cqy7pwbcclynw4qbwvyznay5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "1jyi9mp8dc5hkb493kz4mkhcn9rvz1whj42vfbml5zdnywhq346f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.14.0-darwin-amd64.tar.gz"; - sha256 = "1n9lallx43g745889k2zck5wzpd8bf8wypwiy5xd3v2q77kbj8lv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.15.0-darwin-amd64.tar.gz"; + sha256 = "1f0jnrgnw0kma86a7d1hijh41prp7c7630gnp3sff7489caxhphm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-amd64.tar.gz"; @@ -251,12 +251,12 @@ sha256 = "04rmlydspvgbcgn7qd9sk0bd70axz2rmpiydfw383352bxrinlvs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.27.0-darwin-amd64.tar.gz"; - sha256 = "1d5ib18acs4iq85m55n4iznw3vxscass2a8l0ng9fyld95jyv7sd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.28.0-darwin-amd64.tar.gz"; + sha256 = "1vzdp5nqz6c24qz1l2m8hgr1xa8jn4v4x29i4gkd688bvf6266dz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.8.0-darwin-amd64.tar.gz"; - sha256 = "18z1j0xm3crahkag1c9lr23ig9k035p71qhp8smapalxzalkx38h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.9.0-darwin-amd64.tar.gz"; + sha256 = "100kjik7qvpxc46wckps5w3h07w0gshs5v3i1dh2fzf6inbil5ip"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.7.0-darwin-amd64.tar.gz"; @@ -321,20 +321,20 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.225.1-linux-arm64.tar.gz"; - sha256 = "0wgwfmj54hqihfisfngajcqbg6d86m1kgzdm4bcbv1b0cw1f098a"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.226.0-linux-arm64.tar.gz"; + sha256 = "0hlyw7lybph57bhvr6hmwqsnzfwdssh426blfhsbjdasrc4vapl7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.50.0-linux-arm64.tar.gz"; - sha256 = "09bl8x2wmjnj89a01mn6and3ak8955w7p0bjy3d90a6hnpmkhmmv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-linux-arm64.tar.gz"; + sha256 = "0vnnvb6lyv0xpc3rzc3wr658l3d8w596mpfr5jlbbqpk0hw1dslx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-arm64.tar.gz"; sha256 = "0l3sgb5l0rjxj9msff6ywkvygn3pq96nbif3b85xssq7a0qsvh3c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.96.0-linux-arm64.tar.gz"; - sha256 = "1v19fnkpb71jygfbw0602nayjkjvi7fjiz92crw4vqrfmpq7py0i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.97.0-linux-arm64.tar.gz"; + sha256 = "01gyw9rw4qymljprxzjrf7jzxg576zghpb174c85k6dik02bw6bf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-linux-arm64.tar.gz"; @@ -345,16 +345,16 @@ sha256 = "1qinsdjkiy80x8mssg5crlzz0vqgpyl3mr286048y8q0a2jifkkv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.21.0-linux-arm64.tar.gz"; - sha256 = "1pzb7vjcgqwwgbldsg12mbi0awz7fpqxi42f6ah4rr2wk24v93k1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.23.0-linux-arm64.tar.gz"; + sha256 = "14j50dr2b4qkaixwcgkhz7a2g7wxndsfjzcfvlbych77ia6hy1y6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.8.1-linux-arm64.tar.gz"; sha256 = "1kn82iz49a53ap0nhih4rwprs672lr7vik2zv7fwdw3allv7aqwl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.12.0-linux-arm64.tar.gz"; - sha256 = "1g39lg92091v6c4ijr4z5k583kldkv9f2pr1605l1aqzdaabydc0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.13.0-linux-arm64.tar.gz"; + sha256 = "1m7skacb49hwrvdfka2944akz80ffl8n7662224mdnjh8858agph"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.33.0-linux-arm64.tar.gz"; @@ -377,8 +377,8 @@ sha256 = "1y66c9mc9521gdpi6kc54ri1drg07kvdxi73rfw8kpx7sv75gvk8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-linux-arm64.tar.gz"; - sha256 = "1g9b0lnzbb255w590i9hazb29lbs96x4n03g2sc3yplrfp23njb9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.1-linux-arm64.tar.gz"; + sha256 = "18svy29yvd2p1fjhc2f9f0hr0mbvf371lcr58ym7f7xim3hx0bdq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "1a9fwnf15l3ld0a17v2p66jxqav4rawhixy6rgs5065nbrf29vys"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.14.0-linux-arm64.tar.gz"; - sha256 = "020yyi3wjzsihk5g3lfmfsbyxswyl5gvrwnafpc87hjz3r16afmd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.15.0-linux-arm64.tar.gz"; + sha256 = "0fb3zpyf2b519ipc7jvp6x366zpympqfcg4h3ah4mkh094a61ljp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-arm64.tar.gz"; @@ -409,12 +409,12 @@ sha256 = "094pmichc66fnd38vfn4hb2dl3v88vqfx00smk0b19fdbrafcp5j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.27.0-linux-arm64.tar.gz"; - sha256 = "0ralnb39m9zd7248kpz4xm7yq87paiqlx1xsw3xzk21cy67px1cm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.28.0-linux-arm64.tar.gz"; + sha256 = "0k32hifaim24rz0ir5nljy58pdk3v9h8qb7vz97k15gq1blyq4l7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.8.0-linux-arm64.tar.gz"; - sha256 = "1n18515hdf8d561mqz46cj0ychrm3zwnx9l1hry9mbnfl8706g3x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.9.0-linux-arm64.tar.gz"; + sha256 = "1hc3fvsiwxnm6jqvbxq29bn1y2iq7q10vrwmkj0kz66iy5h923jh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.7.0-linux-arm64.tar.gz"; @@ -479,20 +479,20 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.225.1-darwin-arm64.tar.gz"; - sha256 = "0l96xnjivzwjswmz3mdnbz8xx3b0nvzj5jnr9dxrf9bf3yp31iys"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.226.0-darwin-arm64.tar.gz"; + sha256 = "162b38755w4f71ixcjza31k5hsygvf682rk51g3kiclc2gq3k7yk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.50.0-darwin-arm64.tar.gz"; - sha256 = "0p3qw40fc8gzf6a0fg4k3zgbd9msa83kl69ksp9wfn6hpj6z6gm4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-darwin-arm64.tar.gz"; + sha256 = "0icxa3m8fm5fprwi24clnq2112r4cjaz5yg898qws71vivx77720"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-arm64.tar.gz"; sha256 = "0hbrmmgh3pbsqcm20lz3kimxwls4s10cqssp19m344f9jwp33chq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.96.0-darwin-arm64.tar.gz"; - sha256 = "1b74jf9wd2ljxl6krzjgy1ap3mnmhc76rrwxna1yz6v0pa0k58d9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.97.0-darwin-arm64.tar.gz"; + sha256 = "0w3vlxvqnhvzcxdp39mng8cj4ij6gvfhxjnlz6ihagby6i7f370r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-darwin-arm64.tar.gz"; @@ -503,16 +503,16 @@ sha256 = "0vgb5zvg5gpv3pfl6nz5wpzhiyy550s99qj80qs83gzlr5gl9xab"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.21.0-darwin-arm64.tar.gz"; - sha256 = "0nkkn8j7pi961jz4y0gjknaxj3fbgffmwj4dadnwqm2ipvqalp6n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.23.0-darwin-arm64.tar.gz"; + sha256 = "0sqmk67ba1686dixpdkaq0v1bnplbcj2my9sc5chaa4bbbr8rmks"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.8.1-darwin-arm64.tar.gz"; sha256 = "1z4fpmfab6wp1nn2gs5aas38n61jxqi5x6v70d0wd16y2hwh0q0p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.12.0-darwin-arm64.tar.gz"; - sha256 = "1zdyg1134jrvvsc07q9mvrbycjrdrz3wnjcanirp0z5bw0f54z1r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.13.0-darwin-arm64.tar.gz"; + sha256 = "13pi43151lb3hbp0kxqmfxsmr95l6xxqrj23n66a3lnr2df5566x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.33.0-darwin-arm64.tar.gz"; @@ -535,8 +535,8 @@ sha256 = "0fifd3n6z0wjr600sd4011l4fds2hhljymzl38zpjq4qfz262pqh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.0-darwin-arm64.tar.gz"; - sha256 = "05kbm6ws0ijq1m6pjip3fsis1pn65jr4s1g1ck2hdaf6hq0p9hyh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.1-darwin-arm64.tar.gz"; + sha256 = "1dp65liavgnakahl8kmzk5hlvg4k0nfks535sdl68f5bkyg2m2m6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "1msppdp4navjhkp7lzngmp056y6x3fqb30r6wq5a53kyvi43x0ik"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.14.0-darwin-arm64.tar.gz"; - sha256 = "13qbccic5a0kqv9013j9yx94nbvx1937i1rz5bnbv3dhwlkkxjgm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.15.0-darwin-arm64.tar.gz"; + sha256 = "182xxaz0hsg2mg2r80hip73aqfhlnz8z96jjq0xrl74jmwn4pgzl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-arm64.tar.gz"; @@ -567,12 +567,12 @@ sha256 = "150kg8brpsazpdd6laywwvbrjmzl4n3w7saf9vidiwsv01zpl90m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.27.0-darwin-arm64.tar.gz"; - sha256 = "0xhflraz9xk0ggqar91knh9bvzla0lll7q9ijrklcm5pfjbhf5zr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.28.0-darwin-arm64.tar.gz"; + sha256 = "0w7j7br44f4fdfcpqj2jairf9z65ga5i88yqkxrwliqf605i0b0a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.8.0-darwin-arm64.tar.gz"; - sha256 = "1pks02j8apf3fy72xl2pxanhrbybnlpmz1p7a48apm5h8rkx3vw6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.9.0-darwin-arm64.tar.gz"; + sha256 = "0vvgk7c35fbdldpk2snq4y400g0cz8y9p43s2lar36b9asyq011n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.7.0-darwin-arm64.tar.gz"; diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix index 9abcde3296e7..9a02c1bd78e1 100644 --- a/pkgs/by-name/qo/qovery-cli/package.nix +++ b/pkgs/by-name/qo/qovery-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "qovery-cli"; - version = "1.57.3"; + version = "1.57.4"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-RjSpojVDmUIBYTKPiiFzbkUeena45nFNi/GhD14FbYY="; + hash = "sha256-RUNAWqFUF/7KXsFHmGDtl5elhCVoTXhsFC2LsKUEb6M="; }; vendorHash = "sha256-i0QWcRF8PKDQmZMzI0mHWY6pDbnjAOoXKxg9onavTjw="; diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 36428aa63541..b26cc9292912 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "26.3.7"; + version = "26.3.13"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-bweV/rDRZIm7QJr9RwcycMOYti5nZGAClvAgA4KsPP4="; + hash = "sha256-7B88l012hOKmAUJ5LvSEs8vwRmTv1yuzaj3OXTwLRPY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qp/qpwgraph/package.nix b/pkgs/by-name/qp/qpwgraph/package.nix index 271eef27e796..15701335606b 100644 --- a/pkgs/by-name/qp/qpwgraph/package.nix +++ b/pkgs/by-name/qp/qpwgraph/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.9.9"; + version = "1.0.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-lL90qhd0qggLQ98g4FgMHZT6xBChHACmASLvxfYNAAw="; + sha256 = "sha256-cBypvVr/DwnzeKX32PCHKg3vR/7fReRiJB5Pfh11blA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix index e6b916501c09..48b4d7353561 100644 --- a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix +++ b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rabbitmqadmin-ng"; - version = "2.22.0"; + version = "2.26.0"; src = fetchFromGitHub { owner = "rabbitmq"; repo = "rabbitmqadmin-ng"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y5esZgvaIaAkEDaeBzda3I1LfYS4ho3Nb6ypqank6+U="; + hash = "sha256-tc4ihqSZ+lIGg4PXzsLp51fMgYi2frsv6rxkOgp8J9k="; }; - cargoHash = "sha256-Aj6DVn9vPG0U0iMlUVAaxpsyaLyHMj/TeH4sftvuTi8="; + cargoHash = "sha256-V1ANIUTLYOfFEzIzEMFHiQD5hKFhv6maK5+bRS9TXTg="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 4cad77577500..ee0d3e98845b 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -15,9 +15,9 @@ xdg-utils, versionCheckHook, - version ? "1.6.1", - srcHash ? "sha256-7kwtWuYdYG3MDHThCkY5OZmx4pWaQXMYoOlJszmV2rM=", - cargoHash ? "sha256-59RyfSUJNoQ7EtQK3OSYOIO/YVEjeeM9ovbojHFX4pI=", + version ? "1.7.0", + srcHash ? "sha256-8/+ximoCPfNQJ/1APb0d5Z8kfWTI3SoN0RX9qrLP52o=", + cargoHash ? "sha256-xo8bH7f5MrUzoLat67rxiWMA24AnCngUkWWt402XAMQ=", updateScript ? ./update.sh, }: diff --git a/pkgs/by-name/ra/radicle-node/unstable.nix b/pkgs/by-name/ra/radicle-node/unstable.nix index 2f2fd8f30a34..d0727de810e4 100644 --- a/pkgs/by-name/ra/radicle-node/unstable.nix +++ b/pkgs/by-name/ra/radicle-node/unstable.nix @@ -1,8 +1,8 @@ { radicle-node }: radicle-node.override { - version = "1.7.0-rc.1"; - srcHash = "sha256-eq7rUzTbmPb0pRfcFnWP4vrbCTbXW9N4BleDCMUnLH8="; - cargoHash = "sha256-OkgWdu+7FY1tq0bjMbhjqjlJT9ZUgR8i12LhqyFJi+A="; + version = "1.7.0"; + srcHash = "sha256-8/+ximoCPfNQJ/1APb0d5Z8kfWTI3SoN0RX9qrLP52o="; + cargoHash = "sha256-xo8bH7f5MrUzoLat67rxiWMA24AnCngUkWWt402XAMQ="; updateScript = ./update-unstable.sh; } diff --git a/pkgs/by-name/ra/radicle-node/update-unstable.sh b/pkgs/by-name/ra/radicle-node/update-unstable.sh index 217b0c1d0677..bdb3c69b58d9 100755 --- a/pkgs/by-name/ra/radicle-node/update-unstable.sh +++ b/pkgs/by-name/ra/radicle-node/update-unstable.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils gnugrep common-updater-scripts nix-update +#!nix-shell -i bash -p coreutils gnugrep gnused common-updater-scripts nix-update -version=$(list-git-tags | grep -oP '^releases/\K\d+\.\d+\.\d+.*' | sort -rV | head -1) +version=$(list-git-tags | grep -oP '^releases/\K\d+\.\d+\.\d+.*' \ + | sed -E 's/-(alpha|beta|rc)\./~\1./' | sort -rV | tr '~' - | head -1) nix-update --version="$version" radicle-node-unstable --override-filename pkgs/by-name/ra/radicle-node/unstable.nix diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix index b77102168e81..4e1a973357db 100644 --- a/pkgs/by-name/ra/rapidraw/package.nix +++ b/pkgs/by-name/ra/rapidraw/package.nix @@ -34,7 +34,7 @@ gvfs, libheif, glib-networking, - nodejs_20, + nodejs_24, npmHooks, cargo-tauri, writableTmpDirAsHomeHook, @@ -42,13 +42,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rapidraw"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "CyberTimon"; repo = "RapidRAW"; tag = "v${finalAttrs.version}"; - hash = "sha256-PzPw7TJQK6ojsdw8cypS/drtc/ec93IYGIjTEdpIraI="; + hash = "sha256-C6U3xU/rL+Og6DgJTnPESf+LPlm+svTNS5bSGhrn7dQ="; fetchSubmodules = true; # darwin/linux hash mismatch in rawler submodule @@ -62,21 +62,21 @@ rustPlatform.buildRustPackage (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-4PbNSM4BIMOpmPcys/Vt5gzy/Pu9L6rPcG0lGnTDvGo="; + hash = "sha256-YpM/EQ4eFqziwEpSXpBNEO8A5fCmjVtCrgr11YxLKxY="; }; nativeBuildInputs = [ pkg-config makeWrapper wrapGAppsHook4 - nodejs_20 + nodejs_24 npmHooks.npmConfigHook cargo-tauri.hook writableTmpDirAsHomeHook ]; buildInputs = [ - nodejs_20 + nodejs_24 glib-networking openssl gtk3 @@ -136,22 +136,32 @@ rustPlatform.buildRustPackage (finalAttrs: { ORT_STRATEGY = "system"; }; - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - # Patch the .desktop file to set the Categories field - sed -i '/^Categories=/c\Categories=Graphics;Photography' "$out/share/applications/RapidRAW.desktop" + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + # Patch the .desktop file to set the Categories field + sed -i '/^Categories=/c\Categories=Graphics;Photography' "$out/share/applications/RapidRAW.desktop" - # Ensure the resources directory exists before linking - mkdir -p $out/lib/RapidRAW/resources + # Ensure the resources directory exists before linking + mkdir -p $out/lib/RapidRAW/resources - # link the .so file - ln -sf ${onnxruntime}/lib/libonnxruntime.so $out/lib/RapidRAW/resources/libonnxruntime.so - ''; + # link the .so file + ln -sf ${onnxruntime}/lib/libonnxruntime.so $out/lib/RapidRAW/resources/libonnxruntime.so + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Add rpath for onnxruntime so the binary can find libonnxruntime.dylib at runtime + install_name_tool -add_rpath "${onnxruntime}/lib" "$out/Applications/RapidRAW.app/Contents/MacOS/rapidraw" + ''; - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - wrapGApp $out/bin/rapidraw \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} \ - --set ORT_STRATEGY "system" - ''; + postFixup = + lib.optionalString stdenv.hostPlatform.isLinux '' + wrapGApp $out/bin/rapidraw \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} \ + --set ORT_STRATEGY "system" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + wrapGApp "$out/Applications/RapidRAW.app/Contents/MacOS/rapidraw" \ + --set ORT_STRATEGY "system" + ''; meta = { description = "Blazingly-fast, non-destructive, and GPU-accelerated RAW image editor built with performance in mind"; diff --git a/pkgs/by-name/rc/rcon-cli/package.nix b/pkgs/by-name/rc/rcon-cli/package.nix index 575bfee0baa1..99c4d389cf3d 100644 --- a/pkgs/by-name/rc/rcon-cli/package.nix +++ b/pkgs/by-name/rc/rcon-cli/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "rcon-cli"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "itzg"; repo = "rcon-cli"; tag = finalAttrs.version; - hash = "sha256-v9f367XTPKAocGdwwPe/dXsFK30THbqpQwuvSV/lWN4="; + hash = "sha256-Cs2SYz6+3ziAbnoXiWdpwBg3lmIJWq06wuYy/TKoVSU="; }; - vendorHash = "sha256-TogEdy0rtOzywBCtJ9dw8jO25dzxygqDGFDCbCNwhz8="; + vendorHash = "sha256-MxIofF5Jj+w7gxsO+F48ymtgB3bgSutmC5Jh3GcKCnA="; subPackages = [ "." ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/re/redmine/Gemfile b/pkgs/by-name/re/redmine/Gemfile index 9f7647787801..755975b9e9f1 100644 --- a/pkgs/by-name/re/redmine/Gemfile +++ b/pkgs/by-name/re/redmine/Gemfile @@ -9,7 +9,7 @@ gem "actionpack-xml_parser" gem 'roadie-rails', '~> 3.3.0' gem 'marcel' gem 'mail', '~> 2.8.1' -gem 'nokogiri', '~> 1.18.3' +gem 'nokogiri', '~> 1.19.1' gem 'i18n', '~> 1.14.1' gem 'rbpdf', '~> 1.21.4' gem 'addressable' diff --git a/pkgs/by-name/re/redmine/Gemfile.lock b/pkgs/by-name/re/redmine/Gemfile.lock index c91336ba1aea..f2d477827f8f 100644 --- a/pkgs/by-name/re/redmine/Gemfile.lock +++ b/pkgs/by-name/re/redmine/Gemfile.lock @@ -77,7 +77,7 @@ GEM minitest (>= 5.1) securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) - addressable (2.8.8) + addressable (2.8.9) public_suffix (>= 2.0.2, < 8.0) ast (2.4.3) base64 (0.3.0) @@ -155,7 +155,7 @@ GEM prism (>= 1.3.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - json (2.18.1) + json (2.19.1) jwt (3.1.2) base64 language_server-protocol (3.17.0.5) @@ -178,14 +178,14 @@ GEM mime-types (3.7.0) logger mime-types-data (~> 3.2025, >= 3.2025.0507) - mime-types-data (3.2026.0224) + mime-types-data (3.2026.0303) mini_magick (5.2.0) benchmark logger mini_mime (1.1.5) mini_portile2 (2.8.9) minitest (5.27.0) - mocha (3.0.2) + mocha (3.1.0) ruby2_keywords (>= 0.0.5) multi_xml (0.8.1) bigdecimal (>= 3.1, < 5) @@ -205,7 +205,7 @@ GEM net-protocol netrc (0.11.0) nio4r (2.7.5) - nokogiri (1.18.10) + nokogiri (1.19.1) mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth2 (2.0.18) @@ -233,7 +233,7 @@ GEM psych (5.3.1) date stringio - public_suffix (7.0.2) + public_suffix (7.0.5) puma (7.2.0) nio4r (~> 2.0) racc (1.8.1) @@ -326,7 +326,7 @@ GEM rubocop-ast (>= 1.45.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.49.0) + rubocop-ast (1.49.1) parser (>= 3.3.7.2) prism (~> 1.7) rubocop-performance (1.25.0) @@ -373,7 +373,7 @@ GEM svg_optimizer thor thor (1.5.0) - timeout (0.6.0) + timeout (0.6.1) trilogy (2.9.0) tsort (0.2.0) tzinfo (2.0.6) @@ -430,7 +430,7 @@ DEPENDENCIES net-ldap (~> 0.17.0) net-pop (~> 0.1.2) net-smtp (~> 0.5.0) - nokogiri (~> 1.18.3) + nokogiri (~> 1.19.1) oauth2 pg (~> 1.5.3) propshaft (~> 1.1.0) diff --git a/pkgs/by-name/re/redmine/gemset.nix b/pkgs/by-name/re/redmine/gemset.nix index 65b2eea0c704..5d9ec4e70b2a 100644 --- a/pkgs/by-name/re/redmine/gemset.nix +++ b/pkgs/by-name/re/redmine/gemset.nix @@ -218,10 +218,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mxhjgihzsx45l9wh2n0ywl9w0c6k70igm5r0d63dxkcagwvh4vw"; + sha256 = "11ali533wx91fh93xlk88gjqq8w0p7kxw09nlh41hwc9wv5ly5fc"; type = "gem"; }; - version = "2.8.8"; + version = "2.8.9"; }; ast = { groups = [ @@ -775,10 +775,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11prr7nrxh1y4rfsqa51gy4ixx63r18cz9mdnmk0938va1ajf4gy"; + sha256 = "0b888h9v2y4aasi9aapxqimiaj1i1csk56l22dczigs8kv2zv56x"; type = "gem"; }; - version = "2.18.1"; + version = "2.19.1"; }; jwt = { dependencies = [ "base64" ]; @@ -928,10 +928,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zg5cyzhkdzkygspl676h8pad83l6gmwykvcd4snjzxkd00jx85y"; + sha256 = "09627cnx432528j7j73711fbd0r30ri0lfsh9dfiki94b3gg2jhn"; type = "gem"; }; - version = "3.2026.0224"; + version = "3.2026.0303"; }; mini_magick = { dependencies = [ @@ -994,10 +994,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1y1dx5crlx7ppshzv7qqfj0mgpvzyxc0f107mvsvywcb3m9jk01x"; + sha256 = "0mhx9qyiig73mw3zrk8f28ca8dqx8gwgipw94jri07zvxdljvx3m"; type = "gem"; }; - version = "3.0.2"; + version = "3.1.0"; }; multi_xml = { dependencies = [ "bigdecimal" ]; @@ -1134,10 +1134,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m"; + sha256 = "1lss1nh526n3h1qsig2kjchi8vlsjwc8pdjpplm1f2yz6rzk52sr"; type = "gem"; }; - version = "1.18.10"; + version = "1.19.1"; }; oauth2 = { dependencies = [ @@ -1283,10 +1283,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mx84s7gn3xabb320hw8060v7amg6gmcyyhfzp0kawafiq60j54i"; + sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs"; type = "gem"; }; - version = "7.0.2"; + version = "7.0.5"; }; puma = { dependencies = [ "nio4r" ]; @@ -1727,10 +1727,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zbikzd6237fvlzjfxdlhwi2vbmavg1cc81y6cyr581365nnghs9"; + sha256 = "0dahfpnzz63hyqxa03x8rypnrxzwyvh4i5a8ri34bzpnf3pg64j4"; type = "gem"; }; - version = "1.49.0"; + version = "1.49.1"; }; rubocop-performance = { dependencies = [ @@ -1990,10 +1990,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bz11pq7n1g51f50jqmgyf5b1v64p1pfqmy5l21y6vpr37b2lwkd"; + sha256 = "1jxcji88mh6xsqz0mfzwnxczpg7cyniph7wpavnavfz7lxl77xbq"; type = "gem"; }; - version = "0.6.0"; + version = "0.6.1"; }; trilogy = { groups = [ "default" ]; diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix index a226ae68009a..90b099494bb2 100644 --- a/pkgs/by-name/re/redmine/package.nix +++ b/pkgs/by-name/re/redmine/package.nix @@ -15,7 +15,7 @@ }: let - version = "6.1.1"; + version = "6.1.2"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -69,7 +69,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.redmine.org/releases/redmine-${finalAttrs.version}.tar.gz"; - hash = "sha256-Hy5t0GlwYvxzNwH4i1BB3A38a1NiVet5AvIfsJcOYD4="; + hash = "sha256-k46XXoCMz7Sw3LrYtC8Cqs8Mqe8VSRw4xa9HVnQMzwg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index 38cfca80005a..4030b8a79e0d 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -25,16 +25,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "restate"; - version = "1.5.6"; + version = "1.6.2"; src = fetchFromGitHub { owner = "restatedev"; repo = "restate"; tag = "v${finalAttrs.version}"; - hash = "sha256-N27cKlJxQtE+/fMnaTlWyM3QeOIkt5M79t9PzB69eqw="; + hash = "sha256-i9P6Lh0Qw4ylUVwAE51UTE5rSDluZafpEmxuAtv0SYQ="; }; - cargoHash = "sha256-JnlqKESW2VBv902/qZqEr5rEDSLhnpQ/nZdYHU6tBMI="; + cargoHash = "sha256-LfLqScEqBJK9s+xRg2Ah1OnBEDQjXQ9LgJGusmxEDfk="; env = { PROTOC = lib.getExe protobuf; @@ -76,6 +76,10 @@ rustPlatform.buildRustPackage (finalAttrs: { # Have to be set to dynamically link librdkafka CARGO_FEATURE_DYNAMIC_LINKING = 1; + + # krb5-src contains K&R-style C code incompatible with GCC 14's default C23 standard; + # tikv-jemalloc-sys has a strerror_r return type mismatch (-Wint-conversion) + NIX_CFLAGS_COMPILE = "-std=gnu17 -Wno-error=int-conversion"; }; nativeBuildInputs = [ @@ -105,7 +109,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # TIMEOUT [ 180.006s] "--skip" "fast_forward_over_trim_gap" - # TIMEOUT (could be related to https://github.com/resytatedev/restate/issues/3043) + # TIMEOUT (could be related to https://github.com/restatedev/restate/issues/3043) "--skip" "restatectl_smoke_test" ]; diff --git a/pkgs/by-name/re/resvg/package.nix b/pkgs/by-name/re/resvg/package.nix index 5f2e99a1b98c..84969b8b7de3 100644 --- a/pkgs/by-name/re/resvg/package.nix +++ b/pkgs/by-name/re/resvg/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "resvg"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = "resvg"; rev = "v${finalAttrs.version}"; - hash = "sha256-kiE9Zv3PonRRq6pbRnqGz0LKlYSTFSuuqYaLDmC9I2Y="; + hash = "sha256-BCYjVOWFpOZm7ocmfszFpaBxnd96vhf3/yGlvAVRtCw="; }; - cargoHash = "sha256-dqqO+CPyBaUFBZGwhwXFRr8tnZWp27sF0606tmOm7ms="; + cargoHash = "sha256-cVOAmwX/pYA6R0HK8+RLt/IvzowAO/g1i2YM71bYFoA="; cargoBuildFlags = [ "--package=resvg" diff --git a/pkgs/by-name/rg/rgbds/package.nix b/pkgs/by-name/rg/rgbds/package.nix index 5a005cb82c9d..fb53688b0bb2 100644 --- a/pkgs/by-name/rg/rgbds/package.nix +++ b/pkgs/by-name/rg/rgbds/package.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ''; maintainers = with lib.maintainers; [ NieDzejkob + mattcurrie ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix index 34f8b91cc68a..821484bbd4fc 100644 --- a/pkgs/by-name/rm/rmfakecloud/package.nix +++ b/pkgs/by-name/rm/rmfakecloud/package.nix @@ -11,13 +11,13 @@ }: buildGoModule rec { pname = "rmfakecloud"; - version = "0.0.27"; + version = "0.0.29"; src = fetchFromGitHub { owner = "ddvk"; repo = "rmfakecloud"; rev = "v${version}"; - hash = "sha256-Umh5MwFCKJ8Nr0uhPEvlTAn7SpMmvAh6N2l74bS6BYw="; + hash = "sha256-N6hAv8dVCM3VWuKpHlK82mjQh6RB7W+n9KBNNQXDrC8="; }; vendorHash = "sha256-XksCJ9b5NDIutwqnWP63R2udp/Y5qkkgo2a4TPUi0Z4="; diff --git a/pkgs/by-name/rn/rnp/0001-fix-build-with-Botan-3.11.patch b/pkgs/by-name/rn/rnp/0001-fix-build-with-Botan-3.11.patch new file mode 100644 index 000000000000..0c8d26a42368 --- /dev/null +++ b/pkgs/by-name/rn/rnp/0001-fix-build-with-Botan-3.11.patch @@ -0,0 +1,25 @@ +From aa31e5d8af9295488bef3a559ec3756d5021501d Mon Sep 17 00:00:00 2001 +From: Markus Theil +Date: Mon, 16 Mar 2026 13:14:29 +0100 +Subject: [PATCH] fix build with Botan 3.11 + +Signed-off-by: Markus Theil +--- + src/lib/crypto/mem.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/crypto/mem.cpp b/src/lib/crypto/mem.cpp +index 94d90f54..dbd2a143 100644 +--- a/src/lib/crypto/mem.cpp ++++ b/src/lib/crypto/mem.cpp +@@ -25,6 +25,7 @@ + */ + + #include ++#include + #include "mem.h" + #include "logging.h" + #include +-- +2.53.0 + diff --git a/pkgs/by-name/rn/rnp/package.nix b/pkgs/by-name/rn/rnp/package.nix index 360c0f591da4..c3eff4c93851 100644 --- a/pkgs/by-name/rn/rnp/package.nix +++ b/pkgs/by-name/rn/rnp/package.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ + # tracked at https://github.com/rnpgp/rnp/pull/2381 + ./0001-fix-build-with-Botan-3.11.patch ]; cmakeFlags = [ diff --git a/pkgs/by-name/ro/routedns/package.nix b/pkgs/by-name/ro/routedns/package.nix index 361db89c338f..5f7545110757 100644 --- a/pkgs/by-name/ro/routedns/package.nix +++ b/pkgs/by-name/ro/routedns/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "routedns"; - version = "0.1.140"; + version = "0.1.151"; src = fetchFromGitHub { owner = "folbricht"; repo = "routedns"; rev = "v${finalAttrs.version}"; - hash = "sha256-byeCsm+W7H2MXAOdPFxZyALYh7C9WB/FO8Ee/y/sLV8="; + hash = "sha256-Uv2H3AllmFFuPb/S/aS3j7afyQYBpxSkcKRKTvY0Iyk="; }; - vendorHash = "sha256-iUWiO8h55N+1c0EODLUxcIYEt2lT+2xyCAxa5f1ub3c="; + vendorHash = "sha256-a4KcKb75yWv7+1vIYCypS9nnrFJ3zogXIPzUVVA7AXs="; subPackages = [ "./cmd/routedns" ]; diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index e9d92c320dd3..567ceffe0f1e 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -21,8 +21,8 @@ wolfssl, python3, pugixml, - flatbuffers, - llvm_18, + protobuf_33, + llvm, cubeb, opencv, enableDiscordRpc ? false, @@ -50,19 +50,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rpcs3"; - version = "0.0.39-unstable-2026-01-15"; + version = "0.0.39-unstable-2026-02-20"; src = fetchFromGitHub { owner = "RPCS3"; repo = "rpcs3"; - rev = "eaebd3426e7050c35beb8f24952d6da4d6a75360"; + rev = "6bfb33279f6989f3ff9ea2dc40ef45d6aeb57ef8"; postCheckout = '' cd $out/3rdparty git submodule update --init \ fusion/fusion asmjit/asmjit yaml-cpp/yaml-cpp SoundTouch/soundtouch stblib/stb \ feralinteractive/feralinteractive ''; - hash = "sha256-iE7iZ66BSWI96a9DOeBQEx6NV+CtIyX0PXg3O2RXHWY="; + hash = "sha256-Cu4Zaze0FZ00sRvPtUzUkOiX5ZAHWTtmWa536gNOTNY="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SYSTEM_FAUDIO" true) (lib.cmakeBool "USE_SYSTEM_OPENAL" true) (lib.cmakeBool "USE_SYSTEM_PUGIXML" true) - (lib.cmakeBool "USE_SYSTEM_FLATBUFFERS" true) + (lib.cmakeBool "USE_SYSTEM_PROTOBUF" true) (lib.cmakeBool "USE_SYSTEM_SDL" true) (lib.cmakeBool "USE_SYSTEM_OPENCV" true) (lib.cmakeBool "USE_SYSTEM_CUBEB" true) @@ -131,8 +131,8 @@ stdenv.mkDerivation (finalAttrs: { python3 pugixml sdl3 - flatbuffers - llvm_18 + protobuf_33 + llvm libsm opencv.cxxdev cubeb diff --git a/pkgs/by-name/rs/rsgain/package.nix b/pkgs/by-name/rs/rsgain/package.nix index d0db34bd3771..d6b4669b2211 100644 --- a/pkgs/by-name/rs/rsgain/package.nix +++ b/pkgs/by-name/rs/rsgain/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rsgain"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "complexlogic"; repo = "rsgain"; rev = "v${finalAttrs.version}"; - hash = "sha256-dqvaPLVpNnbN2W0TOphS7QU6MDh5pxFJoUDGvkat164="; + hash = "sha256-mI/lXRmPQTSgzFvNu8cjJN86wIkWFUrJg1yFFfBu2JE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index f13255a804db..1862612cbbe6 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -13,14 +13,14 @@ in python.pkgs.toPythonModule ( python.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2026-03-10"; + version = "0-unstable-2026-03-18"; pyproject = true; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "8b95b2058be41580270f1dc348847c3342ee129b"; - hash = "sha256-5IdfqWj4zOSnkvsssSJywKXrY18DO/zPKNLAJ19Jirk="; + rev = "3810dc9d1c38b44d4e14eaf502222e7dc72f3e17"; + hash = "sha256-EoKClu4K9oYLjzG+zhglRDeIN5PXlEnvhsyeVdRTH/w="; }; nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; diff --git a/pkgs/by-name/se/serverpod_cli/package.nix b/pkgs/by-name/se/serverpod_cli/package.nix index 7ed7fb029c12..63e593fb49b4 100644 --- a/pkgs/by-name/se/serverpod_cli/package.nix +++ b/pkgs/by-name/se/serverpod_cli/package.nix @@ -8,14 +8,14 @@ }: buildDartApplication rec { pname = "serverpod_cli"; - version = "3.4.2"; + version = "3.4.4"; # Fetch the whole monorepo src = fetchFromGitHub { owner = "serverpod"; repo = "serverpod"; tag = version; - hash = "sha256-u2YQRUMebfk2/GXll0uIgr0Lyh8DrBD7h6fo8laXgpE="; + hash = "sha256-c/JsEUNGsa55slbJ33ZMr72+UelhiWKls5d2dUumJ+A="; }; sourceRoot = "${src.name}/tools/serverpod_cli"; diff --git a/pkgs/by-name/se/serverpod_cli/pubspec.lock.json b/pkgs/by-name/se/serverpod_cli/pubspec.lock.json index c90921dcf8b6..82ee37832b4c 100644 --- a/pkgs/by-name/se/serverpod_cli/pubspec.lock.json +++ b/pkgs/by-name/se/serverpod_cli/pubspec.lock.json @@ -384,11 +384,11 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "9f29b9bcc8ee287b1a31e0d01be0eae99a930dbffdaecf04b3f3d82a969f296f", + "sha256": "df0c643f44ad098eb37988027a8e2b2b5a031fd3977f06bbfd3a76637e8df739", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.1" + "version": "1.18.2" }, "mime": { "dependency": "transitive", @@ -514,51 +514,51 @@ "dependency": "transitive", "description": { "name": "serverpod_client", - "sha256": "4beb3bb5d2b4d753199c663d80aaf646b07d54a25963f1ed5eee97ec04f6ccec", + "sha256": "e7aecd8fb0a4ad86fcb931fb411f6e408b65c0fbcdb046940530cdaef8dea2db", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.2" + "version": "3.4.4" }, "serverpod_lints": { "dependency": "direct dev", "description": { "name": "serverpod_lints", - "sha256": "2a36b136061ce3409d2c63358021794c32eb400636945157bf142e2e6eaf39f9", + "sha256": "ad270a1d5315f1edd4f7474a00dc937b4e3a8043d59c15c19cf5bdd0272183ca", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.2" + "version": "3.4.4" }, "serverpod_serialization": { "dependency": "direct main", "description": { "name": "serverpod_serialization", - "sha256": "6643931c8147d1ed7207d6d18202399221e36f9f85b478a148fde15a4a076c1a", + "sha256": "6b087d9e6075dec0973c31220b0ba09f67d31d79cb691f689a704e4b7f8343a3", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.2" + "version": "3.4.4" }, "serverpod_service_client": { "dependency": "direct main", "description": { "name": "serverpod_service_client", - "sha256": "84b6dd7a6712ffb4ddfc01f721e3af1e5e20bc18e95d4245eb029360c0daae81", + "sha256": "2d81f988f25ce136f3695f53564836853dca822fd01bf12065b9bab5b566306c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.2" + "version": "3.4.4" }, "serverpod_shared": { "dependency": "direct main", "description": { "name": "serverpod_shared", - "sha256": "4a37fd56b84259d1eea9b5483f52d7ed044629e53d577af4e0e1e94940151503", + "sha256": "8ebb1107e7a8f5bae35228a93f6a7701067d4dab4f340b4e34b010786668c46f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.2" + "version": "3.4.4" }, "shelf": { "dependency": "transitive", diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index f159be7e0ee9..fb10a8caa916 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shader-slang"; - version = "2026.4"; + version = "2026.4.2"; src = fetchFromGitHub { owner = "shader-slang"; repo = "slang"; tag = "v${finalAttrs.version}"; - hash = "sha256-BuvIXhxKMXkqxXu4kuGOGrhT+/MrNXAdfPTbX9++wys="; + hash = "sha256-BOI3lIb04zLGz9HCK4HPziX+yVHu2BBAP5M6I07L1fQ="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sh/shira/package.nix b/pkgs/by-name/sh/shira/package.nix index 4fd7651f10de..9d43604560f7 100644 --- a/pkgs/by-name/sh/shira/package.nix +++ b/pkgs/by-name/sh/shira/package.nix @@ -5,20 +5,20 @@ ffmpeg, }: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication (finalAttrs: { pname = "shira"; - version = "1.7.1-unstable-2025-08-31"; + version = "1.8.2"; pyproject = true; src = fetchFromGitHub { owner = "KraXen72"; repo = "shira"; - rev = "a7478efa434597324458441f328c1b2f84c04dbc"; - hash = "sha256-k15GaOmS0rlQBQldnLo1SzIyCkNQux6P5b7ZG2BIa90="; + tag = "v${finalAttrs.version}"; + hash = "sha256-SgxEvIpjRfc0saoarqw8KySwhbk1UYCGjMcbhhWMhZg="; }; build-system = [ - python3Packages.flit-core + python3Packages.hatchling ]; dependencies = with python3Packages; [ @@ -46,4 +46,4 @@ python3Packages.buildPythonApplication { maintainers = with lib.maintainers; [ thegu5 ]; mainProgram = "shiradl"; }; -} +}) diff --git a/pkgs/by-name/sn/snouty/package.nix b/pkgs/by-name/sn/snouty/package.nix new file mode 100644 index 000000000000..c79ff899a269 --- /dev/null +++ b/pkgs/by-name/sn/snouty/package.nix @@ -0,0 +1,59 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + pkg-config, + openssl, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "snouty"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "antithesishq"; + repo = "snouty"; + tag = "v${finalAttrs.version}"; + hash = "sha256-YLB4A5Ol+4sZF1RB28npJZ4pVF2Y2lSMBD8QoV8wZUg="; + }; + + cargoHash = "sha256-TJy9mJSXgJQMMDK6TFOXQVU8PujMjd3k2gdlW5Kf//4="; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + env.OPENSSL_NO_VENDOR = true; + + postInstall = '' + installShellCompletion \ + $releaseDir/build/snouty-*/out/snouty.{bash,fish} \ + --zsh $releaseDir/build/snouty-*/out/_snouty + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI for the Antithesis API"; + homepage = "https://github.com/antithesishq/snouty"; + changelog = "https://github.com/antithesishq/snouty/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + carlsverre + winter + ]; + mainProgram = "snouty"; + }; +}) diff --git a/pkgs/by-name/sp/spaceship-prompt/package.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix index 5129d0a1133d..32aed5579138 100644 --- a/pkgs/by-name/sp/spaceship-prompt/package.nix +++ b/pkgs/by-name/sp/spaceship-prompt/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "4.21.1"; + version = "4.22.0"; src = fetchFromGitHub { owner = "denysdovhan"; repo = "spaceship-prompt"; rev = "v${version}"; - sha256 = "sha256-kuxC7MzgGtDMVcLQZA74sOaBBbEDTuGVEtpjCotGkCs="; + sha256 = "sha256-+2Nlao4w3DoAqIMgc68iyUAXdTyPGrW9cfG1brELlyo="; }; strictDeps = true; diff --git a/pkgs/by-name/sp/splix/package.nix b/pkgs/by-name/sp/splix/package.nix index e52319bbbd4c..a002f6a39889 100644 --- a/pkgs/by-name/sp/splix/package.nix +++ b/pkgs/by-name/sp/splix/package.nix @@ -8,16 +8,14 @@ jbigkit, zlib, }: - let - color-profiles = stdenv.mkDerivation { pname = "splix-color-profiles"; - version = "unstable-2007-06-25"; + version = "0-unstable-2007-06-25"; src = fetchurl { - url = "http://splix.ap2c.org/samsung_cms.tar.bz2"; - sha256 = "1156flics5m9m7a4hdmcc2nphbdyary6dfmbcrmsp9xb7ivsypdl"; + url = "https://web.archive.org/web/20170518031609if_/http://splix.ap2c.org/samsung_cms.tar.bz2"; + hash = "sha256-tF2vdzyrp6trZqu6ZnxWvi14rWCsNkjUqakWzSJ1poQ="; }; installPhase = '' @@ -25,7 +23,6 @@ let cp * $out/share/cups/profiles/samsung/ ''; }; - in stdenv.mkDerivation (finalAttrs: { pname = "splix-svn"; @@ -36,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { # although the community has been adding some new printer models. url = "svn://svn.code.sf.net/p/splix/code/splix"; rev = finalAttrs.version; - sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl"; + hash = "sha256-tEsxElTEGzVBCiqicJT1tytJXHHvRcHrUKyMbzupi5s="; }; postPatch = '' @@ -60,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "CUPS drivers for SPL (Samsung Printer Language) printers"; - homepage = "http://splix.ap2c.org"; + homepage = "https://web.archive.org/web/20220729010458/http://splix.ap2c.org/"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/by-name/sp/sprite/package.nix b/pkgs/by-name/sp/sprite/package.nix new file mode 100644 index 000000000000..36b1370f6526 --- /dev/null +++ b/pkgs/by-name/sp/sprite/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchurl, + versionCheckHook, + autoPatchelfHook, + writableTmpDirAsHomeHook, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "sprite"; + version = "0.0.1-rc41"; + + src = fetchurl { + url = "https://sprites-binaries.t3.storage.dev/client/v${finalAttrs.version}/sprite-${ + if stdenv.hostPlatform.isLinux then "linux" else "darwin" + }-${if stdenv.hostPlatform.isx86_64 then "amd64" else "arm64"}.tar.gz"; + hash = + { + aarch64-darwin = "sha256-WVEa0NjpoeHZtn8p8k5AJLifIZWgPchpyrj5ikRupoI="; + x86_64-darwin = "sha256-zwCgZSFeFFk49blOjzH5PEv5fuFUlnP/Bre0uJpz78c="; + aarch64-linux = "sha256-PjL4usgcx3ybLB7ZLPfKHaqygWVfiuCNrERbYrDRZYk="; + x86_64-linux = "sha256-PAnnP5M9lLwC3Qhydz3Bo0uLtX6uE5cJF4lDOGfsiDk="; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + sourceRoot = "."; + + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; + + installPhase = '' + mkdir -p $out/bin + install -m 755 sprite $out/bin/ + ''; + + passthru.updateScript = ./update.sh; + + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "--version"; + versionCheckKeepEnvironment = "HOME"; + doInstallCheck = true; + + meta = { + description = "Command Line Interactive for sprites, stateful sandbox environments with checkpoint & restore"; + homepage = "https://sprites.dev"; + license = lib.licenses.unfree; + mainProgram = "sprite"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ drawbu ]; + }; +}) diff --git a/pkgs/by-name/sp/sprite/update.sh b/pkgs/by-name/sp/sprite/update.sh new file mode 100755 index 000000000000..91c2464ae641 --- /dev/null +++ b/pkgs/by-name/sp/sprite/update.sh @@ -0,0 +1,47 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix-prefetch + +set -o errexit +set -o nounset +set -o pipefail + +dirname="$(dirname "$0")" + +updateHash() +{ + version=$1 + archHash=$2 + filetype=$3 + + url="https://sprites-binaries.t3.storage.dev/client/v$version/sprite-$filetype.tar.gz" + hash=$(nix-prefetch-url --type sha256 "$url") + sriHash="$(nix hash convert sha256:"$hash")" + + sed -i "s|$archHash = \"[a-zA-Z0-9\/+-=]*\";|$archHash = \"$sriHash\";|g" "$dirname/package.nix" +} + +updateVersion() +{ + sed -i "s/version = \".*\";/version = \"$1\";/g" "$dirname/package.nix" +} + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; sprite.version" | tr -d '"') + +# right now, the release channel returns an error, because no "stable" version +# has been released; we have to rely on the release candidate for now. +# TODO: drop /rc.txt when a release hits stable +latestTag=$(curl -f https://sprites-binaries.t3.storage.dev/client/release.txt \ + || curl -f https://sprites-binaries.t3.storage.dev/client/rc.txt) +latestVersion="$(expr "$latestTag" : 'v\(.*\)')" + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "sprite is up-to-date: ${currentVersion}" + exit 0 +fi + +updateVersion "$latestVersion" + +updateHash "$latestVersion" x86_64-linux linux-amd64 +updateHash "$latestVersion" aarch64-linux linux-arm64 +updateHash "$latestVersion" x86_64-darwin darwin-amd64 +updateHash "$latestVersion" aarch64-darwin darwin-arm64 diff --git a/pkgs/by-name/sq/sqlcipher/package.nix b/pkgs/by-name/sq/sqlcipher/package.nix index aa7141f7e5dc..ce04088a97ab 100644 --- a/pkgs/by-name/sq/sqlcipher/package.nix +++ b/pkgs/by-name/sq/sqlcipher/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlcipher"; - version = "4.13.0"; + version = "4.14.0"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; tag = "v${finalAttrs.version}"; - hash = "sha256-3Qt7nOB0iMyNXfENC3gv3F6sENU7OUTZ3n2mo0M2CSA="; + hash = "sha256-e3iIr6wCVT+74VREreL2wHttNG8KXJSyqJtoveJSgIc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sq/sqlite-vec/package.nix b/pkgs/by-name/sq/sqlite-vec/package.nix index 97817b03cc21..3045275d6d1a 100644 --- a/pkgs/by-name/sq/sqlite-vec/package.nix +++ b/pkgs/by-name/sq/sqlite-vec/package.nix @@ -40,7 +40,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/asg017/sqlite-vec"; changelog = "https://github.com/asg017/sqlite-vec/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.anmonteiro ]; + maintainers = with lib.maintainers; [ + anmonteiro + sarahec + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix index ca7f066384f2..206821d4aa0c 100644 --- a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix +++ b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix @@ -5,13 +5,13 @@ }: buildGoModule (finalAttrs: { pname = "ssm-session-manager-plugin"; - version = "1.2.779.0"; + version = "1.2.792.0"; src = fetchFromGitHub { owner = "aws"; repo = "session-manager-plugin"; rev = finalAttrs.version; - hash = "sha256-QLr/G82uinbz21z5FswSh0UKWZE4FWjKaVQFQJOYSdw="; + hash = "sha256-bLoHxUKSH0AcqR1ow7X9XgUjoVLd7ccxqTsNoD9RjDE="; }; patches = [ diff --git a/pkgs/by-name/st/stax/package.nix b/pkgs/by-name/st/stax/package.nix new file mode 100644 index 000000000000..b77bd71e3590 --- /dev/null +++ b/pkgs/by-name/st/stax/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + perl, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "stax"; + version = "0.25.1"; + + src = fetchFromGitHub { + owner = "cesarferreira"; + repo = "stax"; + tag = "v${finalAttrs.version}"; + hash = "sha256-HHunRVDoijBOcIzj0xknj2O+m+A1nmkkxu97XZcvmJw="; + }; + + nativeBuildInputs = [ perl ]; + + cargoHash = "sha256-cJmK5uX3HCz4own2UtXFkHdGFETjina2/UW18f/g/bA="; + + doInstallCheck = true; + doCheck = false; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + meta = { + description = "Stacked-branch workflow for Git with an interactive TUI, smart PRs, and safe undo"; + homepage = "https://github.com/cesarferreira/stax"; + license = lib.licenses.mit; + mainProgram = "stax"; + maintainers = with lib.maintainers; [ + henrikvtcodes + ]; + }; +}) diff --git a/pkgs/by-name/st/style50/package.nix b/pkgs/by-name/st/style50/package.nix index 6f9bc3d3191b..f9397b5b806b 100644 --- a/pkgs/by-name/st/style50/package.nix +++ b/pkgs/by-name/st/style50/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "style50"; - version = "2.10.4"; + version = "2.11.0"; pyproject = true; src = fetchFromGitHub { owner = "cs50"; repo = "style50"; tag = "v${finalAttrs.version}"; - hash = "sha256-59V3QZMYH5edBXv1GNdoaQxerDfKmLKUZ7VL3cvDvuE="; + hash = "sha256-THmxq69peJwT3XQKEpT+ooBYaDDkn1HHGVH5rvM/FF8="; }; build-system = [ diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index 0739dbc850a5..904ab5f8784b 100644 --- a/pkgs/by-name/sw/sway-unwrapped/package.nix +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -139,9 +139,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/swaywm/sway/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.linux ++ lib.platforms.freebsd; - maintainers = with lib.maintainers; [ - synthetica - ]; + maintainers = [ ]; mainProgram = "sway"; }; }) diff --git a/pkgs/by-name/sy/sylk/package.nix b/pkgs/by-name/sy/sylk/package.nix index f96678b48724..6a8bb4933279 100644 --- a/pkgs/by-name/sy/sylk/package.nix +++ b/pkgs/by-name/sy/sylk/package.nix @@ -1,48 +1,137 @@ { - appimageTools, - fetchurl, lib, - libxshmfence, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + copyDesktopItems, + electron, + fixup-yarn-lock, + imagemagick, + makeDesktopItem, + node-gyp-build, + nodejs, + writableTmpDirAsHomeHook, + yarnBuildHook, + yarnConfigHook, + yarnInstallHook, }: -appimageTools.wrapType2 rec { +stdenv.mkDerivation (finalAttrs: { pname = "sylk"; - version = "3.7.0"; + version = "3.8.0"; - src = fetchurl { - url = "https://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256-3lWWc3aSn+aKM/gX4v2suVbj5sZPKl1r36eQP3a2pNg="; + src = fetchFromGitHub { + owner = "AGProjects"; + repo = "sylk-webrtc"; + tag = finalAttrs.version; + hash = "sha256-AJbZDAEqGfVPuo+My8wxfFWVPelO6XK2pKsglmLyRTw="; }; - extraPkgs = pkgs: [ - libxshmfence + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-VY97NPnT1225l6SLyTI3qITBGF7rqE5xz6UVVucblcU="; + }; + + # required for electron + passthru.appOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/app/yarn.lock"; + hash = "sha256-S9L/rveTuXF2vSqSDu+NlV5vP5f28lda/KMGU8iS1Zo="; + }; + + outputs = [ + "out" + "deps" + "electronDeps" ]; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + nativeBuildInputs = [ + copyDesktopItems + fixup-yarn-lock + imagemagick + node-gyp-build + nodejs # needed for executing package.json scripts + writableTmpDirAsHomeHook + yarnBuildHook + yarnConfigHook + yarnInstallHook + ]; - extraInstallCommands = '' - install -Dm444 ${appimageContents}/sylk-electron.desktop -t $out/share/applications/ - install -Dm444 ${appimageContents}/sylk-electron.png -t $out/share/icons/hicolor/512x512/apps/ + dontConfigure = true; + yarnBuildScript = "electron"; - substituteInPlace $out/share/applications/sylk-electron.desktop \ - --replace-fail 'Exec=AppRun --no-sandbox' 'Exec=${pname}' + preBuild = '' + originalOfflineMirror=$(yarn config --offline get yarn-offline-mirror) + + installDeps() { + local cache="$1" + local output="$2" + fixup-yarn-lock yarn.lock + yarn config --offline set yarn-offline-mirror "$cache" + yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts + patchShebangs node_modules/ + mkdir -p $output + cp -R node_modules $output + } + + installDeps $yarnOfflineCache $deps + + pushd app + installDeps ${finalAttrs.passthru.appOfflineCache} $electronDeps + popd + + yarn config --offline set yarn-offline-mirror $originalOfflineMirror ''; - profile = '' - export LC_ALL=C.UTF-8 + postFixup = '' + mkdir -p $out/share + mv $out/lib/node_modules/Sylk $out/share/Sylk + + rm -rf $out/lib + rm -rf $out/share/Sylk/.parcel-cache + rm -rf $out/share/Sylk/node_modules + + ln -s $electronDeps/node_modules $out/share/Sylk/app/node_modules + ln -s $deps/node_modules $out/share/Sylk/node_modules + + makeWrapper ${lib.getExe electron} $out/bin/sylk \ + --add-flags $out/share/Sylk/app \ + --inherit-argv0 + + # Convert the .ico file to PNGs, which are used by the desktop file + for size in 16 24 32 48 64 128 256; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + magick "$out/share/Sylk/build/icon.ico" -delete 1--1 \ + -background none \ + -thumbnail "$size"x"$size" \ + $out/share/icons/hicolor/"$size"x"$size"/apps/sylk-electron.png + done; ''; + desktopItems = [ + (makeDesktopItem { + name = "sylk"; + exec = "sylk"; + desktopName = "Sylk"; + comment = "WebRTC client"; + icon = "sylk-electron"; + startupWMClass = "Sylk"; + terminal = false; + categories = [ + "Audio" + "Video" + "AudioVideo" + ]; + }) + ]; + meta = { description = "Desktop client for SylkServer, a multiparty conferencing tool"; homepage = "https://sylkserver.com/"; license = lib.licenses.agpl3Plus; + changelog = "https://github.com/AGProjects/sylk-webrtc/blob/${finalAttrs.src.rev}/changelog.txt"; mainProgram = "sylk"; maintainers = with lib.maintainers; [ zimbatm ]; teams = with lib.teams; [ ngi ]; - platforms = [ - "i386-linux" - "x86_64-linux" - ]; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + platforms = electron.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/sy/syspower/package.nix b/pkgs/by-name/sy/syspower/package.nix index 918cf4d9a830..20cd7c65e302 100644 --- a/pkgs/by-name/sy/syspower/package.nix +++ b/pkgs/by-name/sy/syspower/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation { pname = "syspower"; - version = "0-unstable-2024-12-10"; + version = "0-unstable-2025-12-31"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syspower"; - rev = "323332b4d97a30360455682194ed35868fcbaf71"; - hash = "sha256-obL9XUf8kONBWZoyrPvN1PWmEyQx8vMsl6KIneSjkGM="; + rev = "1a74a7895a02363dfcc23bb43cd3f7d7d8ad3320"; + hash = "sha256-gLkjyhLA0QDG/89uTp32VEoOlTGaDjqZm1aLy+X36qw="; }; buildInputs = [ diff --git a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix index e8821359fff2..a94b4d3ade29 100644 --- a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix +++ b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix @@ -2,9 +2,10 @@ lib, tailscale, buildGoModule, + go_1_26, }: -buildGoModule { +buildGoModule.override { go = go_1_26; } { pname = "tailscale-gitops-pusher"; inherit (tailscale) version; diff --git a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix index bdfc03cd8a68..6284eef9e68b 100644 --- a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix +++ b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix @@ -2,10 +2,11 @@ lib, stdenv, buildGoModule, + go_1_26, tailscale, }: -buildGoModule { +buildGoModule.override { go = go_1_26; } { pname = "tailscale-nginx-auth"; inherit (tailscale) version src vendorHash; diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index e61f2c0d65e6..dde5f5eda749 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -3,6 +3,7 @@ stdenv, buildGoModule, + go_1_26, fetchFromGitHub, makeWrapper, @@ -22,9 +23,9 @@ tailscale-nginx-auth, }: -buildGoModule (finalAttrs: { +buildGoModule.override { go = go_1_26; } (finalAttrs: { pname = "tailscale"; - version = "1.94.2"; + version = "1.96.2"; outputs = [ "out" @@ -35,10 +36,10 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-qjWVB8xWVgIVUgrf27F6hwiFIE+4ERXWeHv26ugg/x4="; + hash = "sha256-6taTRKYFxCNK7BUnNZ3lljqVS7AeYEfm46gmilf6eEk="; }; - vendorHash = "sha256-WeMTOkERj4hvdg4yPaZ1gRgKnhRIBXX55kUVbX/k/xM="; + vendorHash = "sha256-rhuWEEN+CtumVxOw6Dy/IRxWIrZ2x6RJb6ULYwXCQc4="; nativeBuildInputs = [ makeWrapper @@ -91,11 +92,6 @@ buildGoModule (finalAttrs: { # subPackages above limits what is built to just what we # want but also limits the tests unset subPackages - - # several tests hang, but keeping the file for tsnet/packet_filter_test.go - # packet_filter_test issue: https://github.com/tailscale/tailscale/issues/16051 - substituteInPlace tsnet/tsnet_test.go \ - --replace-fail 'func Test' 'func skippedTest' ''; checkFlags = @@ -133,9 +129,6 @@ buildGoModule (finalAttrs: { # not necessary and fails to match "TestSyncedToUpstream" # tempfork/acme - # flaky: https://github.com/tailscale/tailscale/issues/7030 - "TestConcurrent" - # flaky: https://github.com/tailscale/tailscale/issues/11762 "TestTwoDevicePing" @@ -144,7 +137,36 @@ buildGoModule (finalAttrs: { "TestTaildropIntegration_Fresh" # context deadline exceeded - "TestPacketFilterFromNetmap" + "TestPacketFilterFromNetmap" # tsnet + + # tsnet tests that need a full tailscale server and hang in the sandbox + "TestListener_Server" # tsnet + "TestDialBlocks" # tsnet + "TestConn" # tsnet + "TestLoopbackLocalAPI" # tsnet + "TestLoopbackSOCKS5" # tsnet + "TestTailscaleIPs" # tsnet + "TestListenerCleanup" # tsnet + "TestStartStopStartGetsSameIP" # tsnet + "TestFunnel" # tsnet + "TestFunnelClose" # tsnet + "TestListenService" # tsnet + "TestListenerClose" # tsnet + "TestFallbackTCPHandler" # tsnet + "TestCapturePcap" # tsnet + "TestUDPConn" # tsnet + "TestUserMetricsByteCounters" # tsnet + "TestUserMetricsRouteGauges" # tsnet + "TestTUN" # tsnet + "TestTUNDNS" # tsnet + "TestListenPacket" # tsnet + "TestListenTCP" # tsnet + "TestListenTCPDualStack" # tsnet + "TestDialTCP" # tsnet + "TestDialUDP" # tsnet + "TestSelfDial" # tsnet + "TestListenUnspecifiedAddr" # tsnet + "TestListenMultipleEphemeralPorts" # tsnet # flaky: https://github.com/tailscale/tailscale/issues/15348 "TestSafeFuncHappyPath" @@ -155,9 +177,10 @@ buildGoModule (finalAttrs: { # Fails because we vendor dependencies "TestLicenseHeaders" - # Uses testing/synctest with gonotify.DirWatcher which spawns goroutines - # that block on inotify syscalls incompatible with synctest's bubble mechanism + # Uses testing/synctest which spawns goroutines that block on syscalls + # incompatible with synctest's bubble mechanism "TestDNSTrampleRecovery" + "TestOnPolicyChangeSkipsPreAuthConns" # ssh/tailssh ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # syscall default route interface en0 differs from netstat diff --git a/pkgs/by-name/te/terser/package.nix b/pkgs/by-name/te/terser/package.nix index dbf14ae38e94..3addfd8bbbce 100644 --- a/pkgs/by-name/te/terser/package.nix +++ b/pkgs/by-name/te/terser/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "terser"; - version = "5.44.1"; + version = "5.46.1"; src = fetchFromGitHub { owner = "terser"; repo = "terser"; rev = "v${version}"; - hash = "sha256-Z4ZdCSGqyu7jjpLgHEZCvrZj+IsqEbdcjATdy80TnC8="; + hash = "sha256-Ob3bzaUrHfDaRy25eWmE3YEtZxhZGYp6TEMtDWbzgQs="; }; - npmDepsHash = "sha256-Zmbh/NMriZtkYpFd5hCJo+nPrKTrqYfh3W+sZpopBHM="; + npmDepsHash = "sha256-24z5w43ciXydl14XwC0XZ5kZX9HoXFQyWHYntQXMHy0="; meta = { description = "JavaScript parser, mangler and compressor toolkit for ES6+"; diff --git a/pkgs/by-name/to/topicctl/package.nix b/pkgs/by-name/to/topicctl/package.nix index a311d2d0c2cf..a9759a3b0e49 100644 --- a/pkgs/by-name/to/topicctl/package.nix +++ b/pkgs/by-name/to/topicctl/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "topicctl"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-i7Gu7bk7J8+kG6gWpB+8hyIQs7B3TNQmYvLyQQ0ZGtc="; + sha256 = "sha256-huP6Irmk4eEhpfJV+h6aqvw+cpPj9StobyfZPXng2VM="; }; vendorHash = "sha256-aoFMYgyZnXmPg3fjwydGm85WKcT+Jez07a4JX1o3Mmo="; diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix index 38cc399601c4..b8072db53644 100644 --- a/pkgs/by-name/tr/triton-llvm/package.nix +++ b/pkgs/by-name/tr/triton-llvm/package.nix @@ -128,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "LLVM_INCLUDE_DOCS" (buildDocs || buildMan)) (lib.cmakeBool "MLIR_INCLUDE_DOCS" (buildDocs || buildMan)) (lib.cmakeBool "LLVM_BUILD_DOCS" (buildDocs || buildMan)) - (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) # Way too slow, only uses one core # (lib.cmakeBool "LLVM_ENABLE_DOXYGEN" (buildDocs || buildMan)) (lib.cmakeBool "LLVM_ENABLE_SPHINX" (buildDocs || buildMan)) diff --git a/pkgs/by-name/ts/tsgolint/package.nix b/pkgs/by-name/ts/tsgolint/package.nix index 1bb07ffc62fb..1f5b36581742 100644 --- a/pkgs/by-name/ts/tsgolint/package.nix +++ b/pkgs/by-name/ts/tsgolint/package.nix @@ -1,21 +1,21 @@ { lib, - buildGoModule, + buildGo126Module, fetchFromGitHub, findutils, - go, + go_1_26, nix-update-script, }: -buildGoModule (finalAttrs: { +buildGo126Module (finalAttrs: { pname = "tsgolint"; - version = "0.11.5"; + version = "0.17.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "tsgolint"; tag = "v${finalAttrs.version}"; - hash = "sha256-XPx8yU3K2v5+FTANwXX9xs+d/WEz6L19suf1QED/Mbs="; + hash = "sha256-bY5oDaaKMu4KmGQFT3MyzNNKZWC8PVSRjAgWYhPVE2s="; fetchSubmodules = true; }; @@ -30,8 +30,9 @@ buildGoModule (finalAttrs: { (finalAttrs.src + "/patches/0001-Parallel-readDirectory-visitor.patch") (finalAttrs.src + "/patches/0002-Adapt-project-service-for-single-run-mode.patch") (finalAttrs.src + "/patches/0003-patch-expose-more-functions-via-the-shim-with-type-f.patch") - (finalAttrs.src + "/patches/0004-feat-improve-panic-message-for-extracting-TS-extensi.patch") - (finalAttrs.src + "/patches/0005-fix-early-return-from-invalid-tsconfig-for-better-er.patch") + (finalAttrs.src + "/patches/0004-fix-early-return-from-invalid-tsconfig-for-better-er.patch") + (finalAttrs.src + "/patches/0005-fix-collections-avoid-internal-json-import-in-ordere.patch") + (finalAttrs.src + "/patches/0006-perf-vfs-cache-ReadFile-results-in-cachedvfs.patch") ]; postPatch = @@ -39,7 +40,7 @@ buildGoModule (finalAttrs: { # the local module to the go.mod instead. '' popd - ${lib.getExe go} mod edit --replace=github.com/microsoft/typescript-go=./typescript-go + ${lib.getExe go_1_26} mod edit --replace=github.com/microsoft/typescript-go=./typescript-go '' + # From justfile's "init" target upstream. @@ -49,7 +50,7 @@ buildGoModule (finalAttrs: { ''; proxyVendor = true; - vendorHash = "sha256-5NX+rjdPz/ZSVmykOc5ffFg1rplF1pznIWKiydl6kKY="; + vendorHash = "sha256-Mb78gEN582QFTRTBefdAz8Yly2vB3zbPyViRnA1V3wI="; subPackages = [ "cmd/tsgolint" ]; diff --git a/pkgs/by-name/un/unitree-sdk2/package.nix b/pkgs/by-name/un/unitree-sdk2/package.nix new file mode 100644 index 000000000000..ce47acad782a --- /dev/null +++ b/pkgs/by-name/un/unitree-sdk2/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + autoPatchelfHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "unitree-sdk2"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "unitreerobotics"; + repo = "unitree_sdk2"; + rev = finalAttrs.version; + hash = "sha256-a+O3jQDJFq/v0zhpGJVuwjgWAZWkIqiNfKt/L4IOSco="; + }; + + nativeBuildInputs = [ + cmake + autoPatchelfHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + ]; + + cmakeFlags = [ + "-DBUILD_EXAMPLES=OFF" + ]; + + # The SDK core is a prebuilt static library; only cmake configure and install are needed + dontBuild = true; + + meta = { + description = "Unitree robot SDK version 2 for Go2, B2, H1, and G1 robots"; + homepage = "https://github.com/unitreerobotics/unitree_sdk2"; + license = lib.licenses.bsd3; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 746015692610..1638f4082361 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.10.10"; + version = "0.10.11"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-axDmf81Hiv/Pw5tHXh0X+mA8b9zp2YUFdJBgOADxJms="; + hash = "sha256-eQ/MUMnFo3GptiC45GtC0A4+zWjJSiNpkhDyArxznPE="; }; - cargoHash = "sha256-ZhRZIpsz/7monrs80Y/WHiErulT0sQut0RIAnqBWcmk="; + cargoHash = "sha256-s5dvDU5kOD/T+UA+sfouZSrmsA5YGzNpO2gb3YISxgE="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index b0c5c3e0a19c..cf977f043ca3 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "vacuum-go"; - version = "0.25.0"; + version = "0.25.2"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qm3TrVgChCuCfMoVstFjAeONR20zLHXexfHQE8/2kdQ="; + hash = "sha256-SJYOnd9wTIUwK/X8LeXH+Pn09+H8EFzjkkSTINRXdsE="; }; - vendorHash = "sha256-8AH/o95EnpCMfiMzcMRKL0cnM+4yU61dom/4Gv+PM6A="; + vendorHash = "sha256-RLa63ZvnXJ1bNHrwP9oLznsaSlz7tY7ROtHIML+7Egw="; env.CGO_ENABLED = 0; ldflags = [ diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index 369d923d8d10..58fe791753b6 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.18.0"; + version = "8.18.1"; outputs = [ "bin" @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libvips"; repo = "libvips"; tag = "v${finalAttrs.version}"; - hash = "sha256-gAFB1VkOc+OBE8IvtKo5A/v2xqb/4RwV1Q8yU12HYOA="; + hash = "sha256-PIaoijkhMKbG8IgK11h8DLemjUR1WNSYB1yfqI4kwdQ="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix index 26088e2653c8..d7a442baef82 100644 --- a/pkgs/by-name/wa/waybar/package.nix +++ b/pkgs/by-name/wa/waybar/package.nix @@ -220,7 +220,6 @@ stdenv.mkDerivation (finalAttrs: { lovesegfault minijackson rodrgz - synthetica khaneliman ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/wi/wireguard-tools/package.nix b/pkgs/by-name/wi/wireguard-tools/package.nix index 6a3855c7b2f7..025e1b9912b7 100644 --- a/pkgs/by-name/wi/wireguard-tools/package.nix +++ b/pkgs/by-name/wi/wireguard-tools/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "wireguard-tools"; - version = "1.0.20250521"; + version = "1.0.20260223"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-V9yKf4ZvxpOoVCFkFk18+130YBMhyeMt0641tn0O0e0="; + sha256 = "sha256-jOFEE9CcCjU52nPO/+ib72rqki7H1qkIinv7Z8yWQBA="; }; outputs = [ diff --git a/pkgs/by-name/wi/wireguard-tools/update.sh b/pkgs/by-name/wi/wireguard-tools/update.sh index e549228e8f1f..ae1819a986e8 100755 --- a/pkgs/by-name/wi/wireguard-tools/update.sh +++ b/pkgs/by-name/wi/wireguard-tools/update.sh @@ -3,5 +3,5 @@ set -eu -o pipefail -version="$(curl -sL https://build.wireguard.com/distros.txt | sed -n 's/^upstream\tkmodtools\t\([^\t]\+\)\t.*/\1/p')" +version="$(curl -sL https://build.wireguard.com/distros.txt | sed -n 's/^upstream\ttools\t\([^\t]\+\)\t.*/\1/p')" update-source-version wireguard-tools "$version" diff --git a/pkgs/by-name/wl/wl-mirror/package.nix b/pkgs/by-name/wl/wl-mirror/package.nix index ad61d15d047d..56bdaf62ed0b 100644 --- a/pkgs/by-name/wl/wl-mirror/package.nix +++ b/pkgs/by-name/wl/wl-mirror/package.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Ferdi265/wl-mirror"; description = "Simple Wayland output mirror client"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/wp/wpsoffice-cn/sources.nix b/pkgs/by-name/wp/wpsoffice-cn/sources.nix index bac7958d405f..b8f44cdb1ccf 100644 --- a/pkgs/by-name/wp/wpsoffice-cn/sources.nix +++ b/pkgs/by-name/wp/wpsoffice-cn/sources.nix @@ -1,18 +1,18 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2026-01-29 +# Last updated: 2026-03-18 { - linux-version = "12.1.2.24722"; - darwin-version = "12.1.25195"; + linux-version = "12.1.2.24730"; + darwin-version = "12.1.25205"; x86_64-linux = { - url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/24722/wps-office_12.1.2.24722.AK.preread.sw_612408_amd64.deb"; - hash = "sha256-eSX3Zu1q1Hrq1HNQPfILJWH7D3F55rr3FiJ79Er57xs="; + url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/24730/wps-office_12.1.2.24730.AK.preread.sw_625635_amd64.deb"; + hash = "sha256-kkITeff8xnq2E9OpiMeMr2ixTILhVbTfScESxZ3WXCY="; }; x86_64-darwin = { - url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25195/WPS_Office_12.1.25195(25195)_x64.dmg"; - hash = "sha256-QwCV281dlE0j0Q2dHt/gV3QPFaQ8vQm8UIU2ohaaSus="; + url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25205/WPS_Office_12.1.25205(25205)_x64.dmg"; + hash = "sha256-U//LuyogUn8+WUVkFSRIWMeQK3cPpyfu4c+84jnXoAw="; }; aarch64-darwin = { - url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25195/WPS_Office_12.1.25195(25195)_arm64.dmg"; - hash = "sha256-9HqZTJ73tE8XzbEI+MH3ePVNr/gtELwcjZHrAKWK+x0="; + url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25205/WPS_Office_12.1.25205(25205)_arm64.dmg"; + hash = "sha256-/lMVXokvwKCMRChpCyi01ehJgTUeoKHP1MlNzTX1NvA="; }; } diff --git a/pkgs/by-name/yo/youtube-tui/package.nix b/pkgs/by-name/yo/youtube-tui/package.nix index a4ad7ab33654..df139ae7a89a 100644 --- a/pkgs/by-name/yo/youtube-tui/package.nix +++ b/pkgs/by-name/yo/youtube-tui/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "youtube-tui"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "Siriusmart"; repo = "youtube-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-a2Y0CATnKmZsYr3eUch3EUgHw41X1a2iOP0CjEJLXnc="; + hash = "sha256-bTdhncgtQaC367P7OLfX5om+Zn0+V5HHGaWJ252xnrA="; }; - cargoHash = "sha256-W3MBYcxb51cBjHUF7zXMOrRVzcxUX/TxiLyYGuOPFyI="; + cargoHash = "sha256-Mq0FyapMGufTyPJXfRVZtPa3XMdimZ8nSXqTue1tdA0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index aa0227fdb956..b2dbeba28665 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -23,14 +23,14 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2026.03.13"; + version = "2026.03.17"; pyproject = true; src = fetchFromGitHub { owner = "yt-dlp"; repo = "yt-dlp"; tag = version; - hash = "sha256-Sx5otasIqQW8n37cVqGI9j6biwMcEMIboLcyC1dkexk="; + hash = "sha256-A4LUCuKCjpVAOJ8jNoYaC3mRCiKH0/wtcsle0YfZyTA="; }; postPatch = '' diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index a9384bedc45e..34bb6f790a2a 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ytdl-sub"; - version = "2026.03.09.post3"; + version = "2026.03.13"; pyproject = true; src = fetchFromGitHub { owner = "jmbannon"; repo = "ytdl-sub"; tag = finalAttrs.version; - hash = "sha256-+ULR/8bHO6gX7oWDbj3WHqYLXTwbDxSPenEDXGETTi0="; + hash = "sha256-P+LCDk/d/gsqOoBh6cyYpJVgVQ6jL3dhlywvvH1AkW4="; }; postPatch = '' diff --git a/pkgs/by-name/ze/zeroclaw/package.nix b/pkgs/by-name/ze/zeroclaw/package.nix index 8a93ac25e7c6..1510627f9417 100644 --- a/pkgs/by-name/ze/zeroclaw/package.nix +++ b/pkgs/by-name/ze/zeroclaw/package.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zeroclaw"; - version = "0.3.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "zeroclaw-labs"; repo = "zeroclaw"; tag = "v${finalAttrs.version}"; - hash = "sha256-4AcWGEnSXdFmq4Fn/ecMrDVoUxSRYxqwiLQ3pcfCKv8="; + hash = "sha256-RlliRnf9RLIbzWh3WRIvicie8mOPN0uimiiFbFD6+tQ="; }; postPatch = @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ln -s ${zeroclaw-web} web/dist ''; - cargoHash = "sha256-NDE+OuYVs9j/wl+nK9hmAEPTbfF6ZOKkANhb+C+dAns="; + cargoHash = "sha256-tvT2+hPZpBBkYS1cnkNSzJiV2S2Z6RnhLZDkEYvOvgc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/emulators/zsnes/fortify3.patch b/pkgs/by-name/zs/zsnes/fortify3.patch similarity index 100% rename from pkgs/applications/emulators/zsnes/fortify3.patch rename to pkgs/by-name/zs/zsnes/fortify3.patch diff --git a/pkgs/applications/emulators/zsnes/default.nix b/pkgs/by-name/zs/zsnes/package.nix similarity index 84% rename from pkgs/applications/emulators/zsnes/default.nix rename to pkgs/by-name/zs/zsnes/package.nix index 383e44be626a..6e227599cc70 100644 --- a/pkgs/applications/emulators/zsnes/default.nix +++ b/pkgs/by-name/zs/zsnes/package.nix @@ -1,19 +1,11 @@ { lib, - stdenv, fetchFromGitHub, - nasm, - SDL, - zlib, - libpng, - ncurses, - libGLU, - libGL, - makeDesktopItem, + pkgsi686Linux, }: let - desktopItem = makeDesktopItem { + desktopItem = pkgsi686Linux.makeDesktopItem { name = "zsnes"; exec = "zsnes"; icon = "zsnes"; @@ -24,7 +16,7 @@ let }; in -stdenv.mkDerivation { +pkgsi686Linux.stdenv.mkDerivation { pname = "zsnes"; version = "1.51"; @@ -41,13 +33,13 @@ stdenv.mkDerivation { ]; buildInputs = [ - nasm - SDL - zlib - libpng - ncurses - libGLU - libGL + pkgsi686Linux.nasm + pkgsi686Linux.SDL + pkgsi686Linux.zlib + pkgsi686Linux.libpng + pkgsi686Linux.ncurses + pkgsi686Linux.libGLU + pkgsi686Linux.libGL ]; prePatch = '' @@ -91,10 +83,7 @@ stdenv.mkDerivation { description = "Super Nintendo Entertainment System Emulator"; license = lib.licenses.gpl2Plus; homepage = "https://www.zsnes.com"; - platforms = [ - "i686-linux" - "x86_64-linux" - ]; + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; mainProgram = "zsnes"; }; } diff --git a/pkgs/applications/emulators/zsnes/zlib-1.3.patch b/pkgs/by-name/zs/zsnes/zlib-1.3.patch similarity index 100% rename from pkgs/applications/emulators/zsnes/zlib-1.3.patch rename to pkgs/by-name/zs/zsnes/zlib-1.3.patch diff --git a/pkgs/applications/emulators/zsnes/2.x.nix b/pkgs/by-name/zs/zsnes2/package.nix similarity index 80% rename from pkgs/applications/emulators/zsnes/2.x.nix rename to pkgs/by-name/zs/zsnes2/package.nix index 5a313443fee7..3b679e94ceed 100644 --- a/pkgs/applications/emulators/zsnes/2.x.nix +++ b/pkgs/by-name/zs/zsnes2/package.nix @@ -1,19 +1,10 @@ { lib, - stdenv, fetchFromGitHub, - SDL, - libGL, - libGLU, - libpng, - libx11, - nasm, - pkg-config, - zlib, - udevCheckHook, + pkgsi686Linux, }: -stdenv.mkDerivation (finalAttrs: { +pkgsi686Linux.stdenv.mkDerivation (finalAttrs: { pname = "zsnes2"; version = "2.0.12"; @@ -25,18 +16,18 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - nasm - pkg-config - udevCheckHook + pkgsi686Linux.nasm + pkgsi686Linux.pkg-config + pkgsi686Linux.udevCheckHook ]; buildInputs = [ - SDL - libGL - libGLU - libpng - libx11 - zlib + pkgsi686Linux.SDL + pkgsi686Linux.libGL + pkgsi686Linux.libGLU + pkgsi686Linux.libpng + pkgsi686Linux.libx11 + pkgsi686Linux.zlib ]; dontConfigure = true; diff --git a/pkgs/development/coq-modules/ConCert/default.nix b/pkgs/development/coq-modules/ConCert/default.nix index 147de4850513..da0ca0280fe7 100644 --- a/pkgs/development/coq-modules/ConCert/default.nix +++ b/pkgs/development/coq-modules/ConCert/default.nix @@ -3,7 +3,7 @@ mkCoqDerivation, which, coq, - metarocq, + metarocq-erasure, bignums, QuickChick, stdpp, @@ -25,14 +25,15 @@ mkCoqDerivation { in lib.switch coq.coq-version [ - (case "9.1" "1.0.0") + (case "9.1" "1.0.1") ] null; + release."1.0.1".sha256 = "sha256-HqbgUnGcZHkeG6qLf4qp/JT5oTPmdfOn1IJqnrloM2U="; release."1.0.0".sha256 = "sha256-R+kWOZtR7T2LVQnHmLGDmGpLO0S76fPRWJpsO9nWqLE="; releaseRev = v: "v${v}"; propagatedBuildInputs = [ coq.ocamlPackages.findlib - metarocq + metarocq-erasure bignums QuickChick stdpp diff --git a/pkgs/development/coq-modules/TypedExtraction/default.nix b/pkgs/development/coq-modules/TypedExtraction/default.nix index ab5c95a7c01f..3c9dcfd32e5f 100644 --- a/pkgs/development/coq-modules/TypedExtraction/default.nix +++ b/pkgs/development/coq-modules/TypedExtraction/default.nix @@ -4,7 +4,7 @@ which, coq, stdlib, - metarocq, + metarocq-erasure, version ? null, single ? false, }: @@ -29,13 +29,15 @@ let lib.switch [ coq.coq-version - metarocq.version + metarocq-erasure.version ] [ + (case "9.1" "1.5.1-9.1" "0.2.1") (case "9.1" (lib.versions.range "1.4" "1.4.1") "0.2.0") ] null; release = { + "0.2.1".sha256 = "sha256-GWdu/l7CipeBubgS5OGHsZfpP2Fkr1cfiZMRH5d1n0g="; "0.2.0".sha256 = "sha256-rgg39X45IXjcnejBhh8N7wMiH+gHQrfO8pBbFEWOGVI="; }; releaseRev = v: "v${v}"; @@ -87,7 +89,7 @@ let propagatedBuildInputs = [ stdlib coq.ocamlPackages.findlib - metarocq + metarocq-erasure ] ++ typedextraction-deps; diff --git a/pkgs/development/coq-modules/ceres-bs/default.nix b/pkgs/development/coq-modules/ceres-bs/default.nix index f1e09094334d..2ed11d887508 100644 --- a/pkgs/development/coq-modules/ceres-bs/default.nix +++ b/pkgs/development/coq-modules/ceres-bs/default.nix @@ -2,7 +2,7 @@ lib, mkCoqDerivation, coq, - metarocq, + metarocq-utils, stdlib, version ? null, }: @@ -31,7 +31,7 @@ mkCoqDerivation { propagatedBuildInputs = [ coq.ocamlPackages.findlib stdlib - metarocq + metarocq-utils ]; meta = { diff --git a/pkgs/development/coq-modules/metarocq/default.nix b/pkgs/development/coq-modules/metarocq/default.nix index 0396573620c2..c0919ce79d9e 100644 --- a/pkgs/development/coq-modules/metarocq/default.nix +++ b/pkgs/development/coq-modules/metarocq/default.nix @@ -4,6 +4,8 @@ single ? false, coq, equations, + ExtLib, + stdlib, version ? null, }@args: @@ -15,7 +17,7 @@ let case = case: out: { inherit case out; }; in lib.switch coq.coq-version [ - (case "9.1" "1.4.1-9.1") + (case "9.1" "1.5.1-9.1") (case "9.0" "1.4-9.0.1") ] null; release = { @@ -23,6 +25,7 @@ let "1.4-9.0.1".sha256 = "sha256-zMUd2A6EG0LYK3L9ABQvS/Et4MDpSmf3Pxd9+IPNYkI="; "1.4-9.1".sha256 = "sha256-v6jFvUavIzyb/e6ytAaZjxQLFM9uW9TDUB77yRO74eE="; "1.4.1-9.1".sha256 = "sha256-tzoAWX74lg7pArGVP11QBvDRKMvmGxXvrf3+1E3Y4DI="; + "1.5.1-9.1".sha256 = "sha256-0iFnSzfbufn2XhJ8EPyWu3KIiHYwxfMVQa2KT6GSR7s="; }; releaseRev = v: "v${v}"; @@ -91,6 +94,8 @@ let mlPlugin = true; propagatedBuildInputs = [ equations + ExtLib + stdlib coq.ocamlPackages.zarith coq.ocamlPackages.stdlib-shims ] diff --git a/pkgs/development/cuda-modules/packages/cuda_cccl.nix b/pkgs/development/cuda-modules/packages/cuda_cccl.nix index c4f39f875dd9..ee0839f6aa5b 100644 --- a/pkgs/development/cuda-modules/packages/cuda_cccl.nix +++ b/pkgs/development/cuda-modules/packages/cuda_cccl.nix @@ -23,6 +23,13 @@ buildRedist { rmdir -v "$PWD/include/cccl" ''; + # NVIDIA, in their wisdom, expect CCCL to be a directory inside include. + # https://github.com/NVIDIA/cutlass/blob/087c84df83d254b5fb295a7a408f1a1d554085cf/CMakeLists.txt#L773 + postInstall = lib.optionalString (cudaAtLeast "13.0") '' + nixLog "creating alias for ''${!outputInclude:?}/include/cccl" + ln -srv "''${!outputInclude:?}/include" "''${!outputInclude:?}/include/cccl" + ''; + meta = { description = "Building blocks that make it easier to write safe and efficient CUDA C++ code"; longDescription = '' diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 9c59d282ab3c..9b6dd5f040d2 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -137,7 +137,6 @@ stdenv.mkDerivation { detegr shnarazk sternenseemann - synthetica ]; platforms = lib.platforms.all; }; diff --git a/pkgs/development/libraries/intel-oneapi/base.nix b/pkgs/development/libraries/intel-oneapi/base.nix index 4a2ba3b92766..beb2b1878f3d 100644 --- a/pkgs/development/libraries/intel-oneapi/base.nix +++ b/pkgs/development/libraries/intel-oneapi/base.nix @@ -27,6 +27,7 @@ gtk3, pango, cairo, + libgbm, expat, libxkbcommon, eudev, @@ -103,6 +104,7 @@ intel-oneapi.mkIntelOneApi (finalAttrs: { nss dbus cups + libgbm expat libxkbcommon eudev @@ -154,6 +156,7 @@ intel-oneapi.mkIntelOneApi (finalAttrs: { gtk3 pango cairo + libgbm expat libxkbcommon eudev diff --git a/pkgs/development/libraries/intel-oneapi/default.nix b/pkgs/development/libraries/intel-oneapi/default.nix index 505543fca47f..7aa5ba13bb16 100644 --- a/pkgs/development/libraries/intel-oneapi/default.nix +++ b/pkgs/development/libraries/intel-oneapi/default.nix @@ -76,10 +76,7 @@ depsByComponent.${shortName comp} or [ ] ) components; - phases = [ - "installPhase" - "fixupPhase" - ]; + dontUnpack = true; # See https://software.intel.com/content/www/us/en/develop/documentation/installation-guide-for-intel-oneapi-toolkits-linux/top/installation/install-with-command-line.html installPhase = '' diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index e9a837f233a0..a37debea366e 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "26.0.2"; + version = "26.0.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-OaE1XM421C0rMep03wM7g4Ttwwn/8z5neLQI8LY9b2U="; + hash = "sha256-CTOnJKsx9hDtLhDnuJSGc/lBQ2ZcDm3/Iie7awusGho="; }; meta = { diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 01f707132a66..419d2aa49be7 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -147,7 +147,6 @@ let license = lib.licenses.mit; platforms = lib.platforms.linux ++ lib.platforms.freebsd; maintainers = with lib.maintainers; [ - synthetica wineee doronbehar ]; diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index deba1080bb19..1f7dfd7ce616 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -1,4 +1,5 @@ { + lib, buildDunePackage, conduit-lwt, ppx_sexp_conv, @@ -30,7 +31,7 @@ buildDunePackage { lwt_ssl ]; - doCheck = true; + doCheck = !lib.versionAtLeast lwt.version "6.0.0"; checkInputs = [ lwt_log ssl diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 04bcf1aee022..0b4a63746990 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -3,7 +3,6 @@ fetchFromGitHub, buildDunePackage, zed, - lwt_log, lwt_react, mew_vi, uucp, @@ -23,7 +22,6 @@ buildDunePackage (finalAttrs: { propagatedBuildInputs = [ zed - lwt_log lwt_react mew_vi uucp diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index b30ce1352313..754cbb3c5bff 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -7,15 +7,13 @@ dune-configurator, ocplib-endian, ppxlib, - version ? if lib.versionAtLeast ppxlib.version "0.36" then "5.9.2" else "5.9.1", + version ? if lib.versionAtLeast ppxlib.version "0.36" then "6.1.1" else "5.9.1", }: buildDunePackage { pname = "lwt"; inherit version; - minimalOCamlVersion = "4.08"; - src = fetchFromGitHub { owner = "ocsigen"; repo = "lwt"; @@ -24,6 +22,7 @@ buildDunePackage { { "5.9.1" = "sha256-oPYLFugMTI3a+hmnwgUcoMgn5l88NP1Roq0agLhH/vI="; "5.9.2" = "sha256-pzowRN1wwaF2iMfMPE7RCtA2XjlaXC3xD0yznriVfu8="; + "6.1.1" = "sha256-EMlA+mh66bfVNqDcmuaW7GoEEu6xQhCRjZx7t7pHuGo="; } ."${version}"; }; diff --git a/pkgs/development/ocaml-modules/lwt_eio/default.nix b/pkgs/development/ocaml-modules/lwt_eio/default.nix index 2fa9aed6cca1..c84d716c507f 100644 --- a/pkgs/development/ocaml-modules/lwt_eio/default.nix +++ b/pkgs/development/ocaml-modules/lwt_eio/default.nix @@ -2,6 +2,7 @@ lib, buildDunePackage, fetchurl, + fetchpatch, eio, lwt, }: @@ -16,6 +17,11 @@ buildDunePackage rec { hash = "sha256-dlJnhHh4VNO60NZJZqc1HS8wPR95WhdeBJTK37pPbCE="; }; + patches = lib.optional (lib.versionAtLeast lwt.version "6.0.0") (fetchpatch { + url = "https://github.com/ocaml-multicore/lwt_eio/commit/5f8bf1e7af33590683ee45151894d7b9a20607f0.patch"; + hash = "sha256-5A3Bh+xOXo79Rw145hYqYv42li30M0TKLW+qu/dC0KQ="; + }); + propagatedBuildInputs = [ eio lwt diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix index 4bcd3524e849..1e1a5ba2377a 100644 --- a/pkgs/development/ocaml-modules/lwt_log/default.nix +++ b/pkgs/development/ocaml-modules/lwt_log/default.nix @@ -5,17 +5,15 @@ lwt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lwt_log"; version = "1.1.2"; - minimalOCamlVersion = "4.03"; - src = fetchFromGitHub { owner = "aantron"; - repo = pname; - rev = version; - sha256 = "sha256-ODTD3KceEnrEzD01CeuNg4BNKOtKZEpYaDIB+RIte1U="; + repo = "lwt_log"; + tag = finalAttrs.version; + hash = "sha256-ODTD3KceEnrEzD01CeuNg4BNKOtKZEpYaDIB+RIte1U="; }; propagatedBuildInputs = [ lwt ]; @@ -25,5 +23,6 @@ buildDunePackage rec { homepage = "https://github.com/aantron/lwt_log"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; + broken = lib.versionAtLeast lwt.version "6.0.0"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 170f0e3fa873..1d53de47f70e 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -20,7 +20,6 @@ ca-certs, cohttp, cohttp-lwt-unix, - lwt_log, re, logs-syslog, cryptokit, @@ -78,7 +77,6 @@ buildDunePackage (finalAttrs: { cohttp-lwt-unix cryptokit ipaddr - lwt_log lwt_ssl re logs-syslog diff --git a/pkgs/development/ocaml-modules/ocsipersist/lib.nix b/pkgs/development/ocaml-modules/ocsipersist/lib.nix index d88841190bc8..339e1c11d0f6 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/lib.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/lib.nix @@ -1,20 +1,37 @@ { lib, buildDunePackage, + applyPatches, + fetchpatch, fetchFromGitHub, lwt_ppx, lwt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocsipersist-lib"; version = "2.0.0"; - src = fetchFromGitHub { - owner = "ocsigen"; - repo = "ocsipersist"; - tag = version; - hash = "sha256-7CKKwJxqxUpCMNs4xGbsMZ6Qud9AnczBStTXS+N21DU="; + src = applyPatches { + + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "ocsipersist"; + tag = finalAttrs.version; + hash = "sha256-7CKKwJxqxUpCMNs4xGbsMZ6Qud9AnczBStTXS+N21DU="; + }; + + patches = [ + # Migrate to logs + (fetchpatch { + url = "https://github.com/ocsigen/ocsipersist/commit/1fc0088b4dc2226f01863dd25f8ed56528c5543d.patch"; + hash = "sha256-WR7SW8jAAo47AIQ7UMQNF8FTXgj6FbxIqFjrLhu7wFs="; + excludes = [ + "*.opam" + "dune-project" + ]; + }) + ]; }; buildInputs = [ lwt_ppx ]; @@ -26,4 +43,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; homepage = "https://github.com/ocsigen/ocsipersist/"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix b/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix index 3d7c001c306f..ae37d0a2ce0b 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix @@ -1,7 +1,7 @@ { buildDunePackage, ocsipersist, - lwt_log, + logs, pgocaml, xml-light, }: @@ -11,7 +11,7 @@ buildDunePackage { inherit (ocsipersist) version src; propagatedBuildInputs = [ - lwt_log + logs ocsipersist pgocaml ]; diff --git a/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix b/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix index 429f56f46ef2..aed27a3d03b7 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix @@ -1,7 +1,7 @@ { buildDunePackage, ocsipersist, - lwt_log, + logs, ocaml_sqlite3, ocsigen_server, }: @@ -11,7 +11,7 @@ buildDunePackage { inherit (ocsipersist) version src; propagatedBuildInputs = [ - lwt_log + logs ocaml_sqlite3 ocsipersist ]; diff --git a/pkgs/development/ocaml-modules/tezt/default.nix b/pkgs/development/ocaml-modules/tezt/default.nix index 665373b769c0..c77951e6f250 100644 --- a/pkgs/development/ocaml-modules/tezt/default.nix +++ b/pkgs/development/ocaml-modules/tezt/default.nix @@ -31,5 +31,6 @@ buildDunePackage rec { meta = { description = "Test framework for unit tests, integration tests, and regression tests"; license = lib.licenses.mit; + broken = lib.versionAtLeast lwt.version "6.0.0"; }; } diff --git a/pkgs/development/octave-modules/linear-algebra/default.nix b/pkgs/development/octave-modules/linear-algebra/default.nix index e850810ebdf8..3e349e3ec8d1 100644 --- a/pkgs/development/octave-modules/linear-algebra/default.nix +++ b/pkgs/development/octave-modules/linear-algebra/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "linear-algebra"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "1wwjpxp9vjc6lszh0z3kgy4hyzpib8rvvh6b74ijh9qk9r9nmvjk"; + sha256 = "sha256-Sc2FpNZxKKo2xRSOshcUPxTg69VgNQvQttJPkGMIsoo="; }; meta = { diff --git a/pkgs/development/python-modules/a2a-sdk/default.nix b/pkgs/development/python-modules/a2a-sdk/default.nix index c640fcb4bdf4..f7bee7783c10 100644 --- a/pkgs/development/python-modules/a2a-sdk/default.nix +++ b/pkgs/development/python-modules/a2a-sdk/default.nix @@ -33,14 +33,14 @@ buildPythonPackage (finalAttrs: { pname = "a2a-sdk"; - version = "0.3.24"; + version = "0.3.25"; pyproject = true; src = fetchFromGitHub { owner = "a2aproject"; repo = "a2a-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-NnLyLCoUFzTp9ji8OE+JxtCHMzy0Ri3uPLoN2HyAjxU="; + hash = "sha256-pGsxrNRqIFXEOxstvTFC4sXjZvphMHfPYzk4xhjaA6s="; }; build-system = [ diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix index 2bbb400a48ee..9d225bc89510 100644 --- a/pkgs/development/python-modules/adafruit-io/default.nix +++ b/pkgs/development/python-modules/adafruit-io/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "adafruit-io"; - version = "2.8.2"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "adafruit"; repo = "Adafruit_IO_Python"; tag = finalAttrs.version; - hash = "sha256-JYQKrGg4FRzqq3wy/TqafC16rldvPEi+/xEI7XGvWM8="; + hash = "sha256-INi1ZJf9j8fP+DJrtQvXKWr7gjp8V7OQVOBuSMB1O/0="; }; build-system = [ diff --git a/pkgs/development/python-modules/anki-audio/default.nix b/pkgs/development/python-modules/anki-audio/default.nix new file mode 100644 index 000000000000..05badedf8001 --- /dev/null +++ b/pkgs/development/python-modules/anki-audio/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + stdenv, + hatchling, + mpv-unwrapped, + lame, +}: + +buildPythonPackage (finalAttrs: { + pname = "anki-audio"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ankitects"; + repo = "anki-bundle-extras"; + rev = "e83c6e64dcb110ed579fc78afbb4e72bed8fb9e9"; + hash = "sha256-iOAZ7EytEVpvsrnVFk6bkiU8FWf2Q7tTzJjawZQCW6E="; + }; + + build-system = [ hatchling ]; + + env = { + ANKI_AUDIO_TARGET_OS = "darwin"; + ANKI_AUDIO_TARGET_ARCH = stdenv.hostPlatform.darwinArch; + }; + + preBuild = + let + archDir = if stdenv.hostPlatform.isAarch64 then "arm64" else "amd64"; + in + '' + mkdir -p mac/${archDir}/dist/audio/Resources + ln -s ${lib.getExe mpv-unwrapped} ${lib.getExe lame} mac/${archDir}/dist/audio/Resources/ + ''; + + pythonImportsCheck = [ "anki_audio" ]; + + meta = { + description = "Audio binaries (mpv, lame) for Anki"; + homepage = "https://github.com/ankitects/anki-bundle-extras"; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + platforms = lib.platforms.darwin; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + euank + junestepp + oxij + ]; + }; +}) diff --git a/pkgs/development/python-modules/anki-mac-helper/default.nix b/pkgs/development/python-modules/anki-mac-helper/default.nix new file mode 100644 index 000000000000..9197c5e2cdad --- /dev/null +++ b/pkgs/development/python-modules/anki-mac-helper/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + stdenv, + anki, + hatchling, + swift, +}: + +buildPythonPackage (finalAttrs: { + pname = "anki-mac-helper"; + inherit (anki) version src; + pyproject = true; + + sourceRoot = "${finalAttrs.src.name}/qt/mac"; + + build-system = [ hatchling ]; + nativeBuildInputs = [ swift ]; + + # This is intended to emulate github:ankitects/anki/qt/mac/helper_build.py, + # but targets the platform directly instead of universal binary + lipo. + preBuild = '' + swiftc \ + -target ${stdenv.hostPlatform.darwinArch}-apple-macos11 \ + -emit-library \ + -module-name ankihelper \ + -O \ + *.swift \ + -o anki_mac_helper/libankihelper.dylib + ''; + + pythonImportsCheck = [ "anki_mac_helper" ]; + + meta = { + description = "Small support library for Anki on Macs"; + homepage = "https://github.com/ankitects/anki"; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + platforms = lib.platforms.darwin; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + euank + junestepp + oxij + ]; + }; +}) diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index e53ddc829b01..45560104fcda 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -20,21 +20,18 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "17.1.1"; + version = "17.2.1"; pyproject = true; src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; tag = "v${version}"; - hash = "sha256-G5DcD1Xw3al9JOBPhGwmMttifPYTDjEQrcS2H3AXbiU="; + hash = "sha256-fHvnMrwATmwXkSp+WI2v4f885iycgJzEmWD0nPiBMbg="; }; postPatch = '' - test -f setup.py || mv setup/setup.py . - touch setup/__init__.py - substituteInPlace setup.py \ - --replace-fail "from setup_utils" "from setup.setup_utils" + test -f setup.py || mv setup/setup.publish.py setup.py patchShebangs internal_documentation/scripts ''; diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index a6a11963e9f5..c295a4e1592c 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -5,11 +5,12 @@ flit-core, pytestCheckHook, pythonAtLeast, + typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncstdlib"; - version = "3.13.1"; + version = "3.13.3"; pyproject = true; # https://github.com/maxfischer2781/asyncstdlib/issues/189 @@ -18,21 +19,24 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "maxfischer2781"; repo = "asyncstdlib"; - tag = "v${version}"; - hash = "sha256-U2/LPbg/U6CUB22EpsJHprK2ngjQmZhLtEEuszuzB8Q="; + tag = "v${finalAttrs.version}"; + hash = "sha256-3mM97zB/pEw8/kPO6jUL7dz6Q7kVatfsURy+5zSq9Bs="; }; build-system = [ flit-core ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + typing-extensions + ]; pythonImportsCheck = [ "asyncstdlib" ]; meta = { description = "Python library that extends the Python asyncio standard library"; homepage = "https://asyncstdlib.readthedocs.io/"; - changelog = "https://github.com/maxfischer2781/asyncstdlib/releases/tag/${src.tag}"; - license = with lib.licenses; [ mit ]; + changelog = "https://github.com/maxfischer2781/asyncstdlib/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index e734f3579f8f..96bc071e25cc 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -15,16 +15,16 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bc-detect-secrets"; - version = "1.5.45"; + version = "1.5.47"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "detect-secrets"; - tag = version; - hash = "sha256-/0VHhKcYcXYXosInjsgBf6eR7kcfLiLSyxFuaIqTbiQ="; + tag = finalAttrs.version; + hash = "sha256-ykmOa29/ASEr+AG2SjhSUN8gLMeKpscDKsPtTTZ+cU8="; }; build-system = [ setuptools ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { responses writableTmpDirAsHomeHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); disabledTests = [ # Tests are failing for various reasons (missing git repo, missing test data, etc.) @@ -70,4 +70,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/bespon/default.nix b/pkgs/development/python-modules/bespon/default.nix index ea0196d8c52b..8ff0dc3c6816 100644 --- a/pkgs/development/python-modules/bespon/default.nix +++ b/pkgs/development/python-modules/bespon/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Encodes and decodes data in the BespON format"; homepage = "https://github.com/gpoore/bespon_py"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/botan3/default.nix b/pkgs/development/python-modules/botan3/default.nix index 998d8e289b9b..634cd19c4036 100644 --- a/pkgs/development/python-modules/botan3/default.nix +++ b/pkgs/development/python-modules/botan3/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { setuptools-scm ]; - sourceRoot = "Botan-${version}/src/python"; + sourceRoot = "source/src/python"; postPatch = '' # remove again, when https://github.com/randombit/botan/pull/5040 got diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 8682c3e2221d..5d6bdac6457a 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.42.69"; + version = "1.42.70"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-UszWRaNNK06Xr49E26/7uFSh3lJhDpUCwoS/sk5tiWI="; + hash = "sha256-njagHAgWmQa+hGEFwU4t2JB771prBBUd/6q1r/E4lbk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index 3efefe5656e4..25e44e8c4a22 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "bundlewrap"; - version = "5.0.2"; + version = "5.0.3"; pyproject = true; src = fetchFromGitHub { owner = "bundlewrap"; repo = "bundlewrap"; tag = finalAttrs.version; - hash = "sha256-kU76WvT4VE/78HTMjByoDHgkrg/5MlS5vnc6z6lAANw="; + hash = "sha256-gncxzeAlfob0dXZ1iqMwqG5h+OyGxvPhrS0MZ+x0mbo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cflib/default.nix b/pkgs/development/python-modules/cflib/default.nix index ec7fa149f29b..898dca90e8c4 100644 --- a/pkgs/development/python-modules/cflib/default.nix +++ b/pkgs/development/python-modules/cflib/default.nix @@ -7,7 +7,6 @@ libusb-package, numpy, packaging, - pyserial, pyusb, scipy, pytestCheckHook, @@ -43,13 +42,13 @@ buildPythonPackage rec { libusb-package numpy packaging - pyserial pyusb scipy ]; disabledTestPaths = [ # exception: Cannot find a Crazyradio Dongle (HW required) + "examples/radio/radio_test.py" "sys_test/single_cf_grounded/" "sys_test/swarm_test_rig/" ]; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index c42919f80a06..e53909acba0f 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.13.2"; + version = "7.13.4"; pyproject = true; src = fetchFromGitHub { owner = "coveragepy"; repo = "coveragepy"; tag = version; - hash = "sha256-dYgZLAiuPwYs4NomT+c2KS9VXXYEMW8oyHk2y4TCwe0="; + hash = "sha256-QWwaZDX3qW8AWbx5McOI5S+UO63/jGyRcycNSkAEgro="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 53b612c9c60a..62b1935e1896 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -20,16 +20,16 @@ xmldiff, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cyclonedx-python-lib"; - version = "11.6.0"; + version = "11.7.0"; pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; - tag = "v${version}"; - hash = "sha256-LnXunfYUz76XIHEXhaFJymBMFln8sIH0yxCodRmKdY0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-35JTr2he7sHOqG3Nd0UM9CZ4Q/HFv3UQsF6hxOKR/+k="; }; pythonRelaxDeps = [ "py-serializable" ]; @@ -54,12 +54,8 @@ buildPythonPackage rec { jsonschema lxml ]; - json-validation = [ - jsonschema - ]; - xml-validation = [ - lxml - ]; + json-validation = [ jsonschema ]; + xml-validation = [ lxml ]; }; nativeCheckInputs = [ @@ -67,7 +63,7 @@ buildPythonPackage rec { pytestCheckHook xmldiff ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); pythonImportsCheck = [ "cyclonedx" ]; @@ -93,8 +89,8 @@ buildPythonPackage rec { meta = { description = "Python library for generating CycloneDX SBOMs"; homepage = "https://github.com/CycloneDX/cyclonedx-python-lib"; - changelog = "https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/${src.tag}"; - license = with lib.licenses; [ asl20 ]; + changelog = "https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 81e9acb837a2..20563abf5b17 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "databricks-sdk"; - version = "0.96.0"; + version = "0.100.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${finalAttrs.version}"; - hash = "sha256-cwZrewypNltMyr2RPMeyAKJYzy+iwdnfoW/M7uecPaA="; + hash = "sha256-NB+YgUrMsteZ1hNJKWSpeM4yW196HgkP9/00ATM/2m8="; }; build-system = [ diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index fdfd2bfbe322..f644f48ac660 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/browniebroke/deezer-python"; changelog = "https://github.com/browniebroke/deezer-python/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix index b1b4929bd853..773d844e65a5 100644 --- a/pkgs/development/python-modules/disposable-email-domains/default.nix +++ b/pkgs/development/python-modules/disposable-email-domains/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "disposable-email-domains"; - version = "0.0.168"; + version = "0.0.169"; pyproject = true; # No tags on GitHub src = fetchPypi { pname = "disposable_email_domains"; inherit (finalAttrs) version; - hash = "sha256-gI8MtLJ5OKjhSdWq7M1ckRv1Bz156W5fAucGDYwBSlQ="; + hash = "sha256-4FHvAMZEm6f9XVLJpJT/ErBXjBQhjlekpdC5Joyhp9M="; }; build-system = [ diff --git a/pkgs/development/python-modules/dynaconf/default.nix b/pkgs/development/python-modules/dynaconf/default.nix index eaa43423ad3b..a27dd548b8dc 100644 --- a/pkgs/development/python-modules/dynaconf/default.nix +++ b/pkgs/development/python-modules/dynaconf/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "dynaconf"; - version = "3.2.12"; + version = "3.2.13"; pyproject = true; src = fetchFromGitHub { owner = "dynaconf"; repo = "dynaconf"; tag = version; - hash = "sha256-DtZ4rJ425a7ootpWtMXbezyH215dJwW4HTzvGgAUnsc="; + hash = "sha256-3qUGLEQ0x/WTF/M/SEts6v9w1yGYSB6LYEcxKQcbqSk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 883459222443..23fd42508c97 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { mainProgram = "ftfy"; homepage = "https://github.com/LuminosoInsight/python-ftfy"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ aborsu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index dc6fbd48cc90..a26fd39a3337 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.38"; + version = "0.2.40"; pyproject = true; src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-garminconnect"; tag = version; - hash = "sha256-d2R/ir/dxFnC4ZjLBHP+mm9JMtfPZ9VMxSRv35rE+CU="; + hash = "sha256-EAmKrOmnJFn+vTfmAprd5onqW/uyOe/shSB1u0HVrIE="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index a8d27a8904df..4519ae336514 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -4,21 +4,23 @@ fetchPypi, freezegun, hatchling, + logfire, + pydantic-settings, pydantic, pytest-vcr, pytestCheckHook, - requests, requests-oauthlib, + requests, }: buildPythonPackage (finalAttrs: { pname = "garth"; - version = "0.6.3"; + version = "0.7.9"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-UZ1LUylEY4ZSu3QO5E3PNuHSNDIa7PCF7dfxqB6mb2k="; + hash = "sha256-vLNoLl6Z5w7n6u//desPqtgRCqEx66T/EiLXcFDN6Z4="; }; pythonRelaxDeps = [ "requests-oauthlib" ]; @@ -26,7 +28,9 @@ buildPythonPackage (finalAttrs: { build-system = [ hatchling ]; dependencies = [ + logfire pydantic + pydantic-settings requests requests-oauthlib ]; diff --git a/pkgs/development/python-modules/genai-prices/default.nix b/pkgs/development/python-modules/genai-prices/default.nix new file mode 100644 index 000000000000..777e35e4edf9 --- /dev/null +++ b/pkgs/development/python-modules/genai-prices/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + uv-build, + + # dependencies + httpx, + pydantic, +}: + +buildPythonPackage (finalAttrs: { + pname = "genai-prices"; + version = "0.0.55"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "genai-prices"; + tag = "v${finalAttrs.version}"; + hash = "sha256-FxHBVroKC9tgYJ+a429cnv7UVWMBoeTX+BEah7eD9Us="; + }; + + sourceRoot = "${finalAttrs.src.name}/packages/python"; + + build-system = [ + uv-build + ]; + + dependencies = [ + httpx + pydantic + ]; + + pythonImportsCheck = [ + "genai_prices" + ]; + + doCheck = false; # no tests + + meta = { + description = "Calculate prices for calling LLM inference APIs"; + homepage = "https://github.com/pydantic/genai-prices"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix index 22dfe4b5b2b1..4935f15b8777 100644 --- a/pkgs/development/python-modules/google-genai/default.nix +++ b/pkgs/development/python-modules/google-genai/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "google-genai"; - version = "1.66.0"; + version = "1.67.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-genai"; tag = "v${version}"; - hash = "sha256-UNaJzxTFzMEa43oRYr1QqtktpggdXYSPFdkhd3qRLlw="; + hash = "sha256-1ewVg271kooPkCEtmDm1HHnJY3MkomrXKp1dK9J0RXI="; }; build-system = [ diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix index 1577fafa790a..f2c6759cf63c 100644 --- a/pkgs/development/python-modules/greynoise/default.nix +++ b/pkgs/development/python-modules/greynoise/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "greynoise"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; src = fetchFromGitHub { owner = "GreyNoise-Intelligence"; repo = "pygreynoise"; tag = "v${version}"; - hash = "sha256-wJDO666HC3EohfR+LbG5F0Cp/eL7q4kXniWhJfc7C3s="; + hash = "sha256-CP+Fx3Gu6pQWnX/WjJ+qq7TK9onatVHp0ghu33WU7X4="; }; patches = lib.optionals (!withRepl) [ diff --git a/pkgs/development/python-modules/griffelib/default.nix b/pkgs/development/python-modules/griffelib/default.nix new file mode 100644 index 000000000000..5e01d59bc861 --- /dev/null +++ b/pkgs/development/python-modules/griffelib/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + pdm-backend, + uv-dynamic-versioning, + + # optional-dependencies + pip, + platformdirs, + wheel, +}: + +buildPythonPackage (finalAttrs: { + pname = "griffelib"; + version = "2.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mkdocstrings"; + repo = "griffe"; + tag = finalAttrs.version; + hash = "sha256-SiUkgkaHtq2aWraL5BJvItOExTGUQ+e6pQVXEwTM0mk="; + }; + + sourceRoot = "${finalAttrs.src.name}/packages/griffelib"; + + build-system = [ + hatchling + pdm-backend + uv-dynamic-versioning + ]; + + optional-dependencies.pypi = [ + pip + platformdirs + wheel + ]; + + pythonImportsCheck = [ + "griffe" + ]; + + meta = { + description = "Signatures for entire Python programs. Extract the structure, the frame, the skeleton of your project, to generate API documentation or find breaking changes in your API"; + homepage = "https://github.com/mkdocstrings/griffe"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 8f615210cad1..809fe854ef62 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202603171"; + version = "0.1.202603181"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-MbGWIPYsuKO7oK360QThNQMd/qLcXsyu9uNAibp9CBs="; + hash = "sha256-rmb7T+olD0iLaie0luUHyltNgpPDO1BQOas+ZFPU2BY="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 095c740c5dd1..f7111651b85f 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "identify"; - version = "2.6.17"; + version = "2.6.18"; pyproject = true; src = fetchFromGitHub { owner = "pre-commit"; repo = "identify"; tag = "v${finalAttrs.version}"; - hash = "sha256-hnVG1TRkq605uFk3PmzqFwnzcYru/4OYbrJYAtDuo0g="; + hash = "sha256-Va1aWNeavA0iR/gKSrheJI/PIIy+KfmjEK1I97n9V/c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jianpu-ly/default.nix b/pkgs/development/python-modules/jianpu-ly/default.nix index 00d1d7e3e34d..42e2448a5279 100644 --- a/pkgs/development/python-modules/jianpu-ly/default.nix +++ b/pkgs/development/python-modules/jianpu-ly/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jianpu-ly"; - version = "1.865"; + version = "1.866"; pyproject = true; src = fetchPypi { inherit version; pname = "jianpu_ly"; - hash = "sha256-fW4qoaDrOZL+oKRPWIZbvuZSOCsrWDw0QsO4r6SJB/Y="; + hash = "sha256-nLVLRot4ECZyQ+G6o3mc4fVN9uGP/ZX2RATwaA6pGBI="; }; dependencies = [ lilypond ]; diff --git a/pkgs/development/python-modules/keymap-drawer/default.nix b/pkgs/development/python-modules/keymap-drawer/default.nix index bece9396dd9f..d0e8e97abe3a 100644 --- a/pkgs/development/python-modules/keymap-drawer/default.nix +++ b/pkgs/development/python-modules/keymap-drawer/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, pythonOlder, - keymap-drawer, nix-update-script, pcpp, platformdirs, @@ -19,11 +18,8 @@ tree-sitter-grammars, versionCheckHook, }: -let - version = "0.22.1"; -in -buildPythonPackage { - inherit version; +buildPythonPackage (finalAttrs: { + version = "0.23.0"; pname = "keymap-drawer"; pyproject = true; disabled = pythonOlder "3.12"; @@ -31,8 +27,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "caksoylar"; repo = "keymap-drawer"; - tag = "v${version}"; - hash = "sha256-X3O5yspEdey03YQ6JsYN/DE9NUiq148u1W6LQpUQ3ns="; + tag = "v${finalAttrs.version}"; + hash = "sha256-yrZidTATnOPacAfdk0gFIgH/3MaZqVOjmzkWNnMa01s="; }; build-system = [ poetry-core ]; @@ -58,29 +54,19 @@ buildPythonPackage { pythonImportsCheck = [ "keymap_drawer" ]; - versionCheckProgram = "${placeholder "out"}/bin/keymap"; - passthru.tests = callPackages ./tests { - # Explicitly pass the correctly scoped package. - # The top-level package will still resolve to itself, because the way - # `toPythonApplication` interacts with scopes is weird. - inherit keymap-drawer; + keymap-drawer = finalAttrs.finalPackage; }; passthru.updateScript = nix-update-script { }; meta = { description = "Module and CLI tool to help parse and draw keyboard layouts"; homepage = "https://github.com/caksoylar/keymap-drawer"; - changelog = "https://github.com/caksoylar/keymap-drawer/releases/tag/v${version}"; + changelog = "https://github.com/caksoylar/keymap-drawer/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ MattSturgeon ]; mainProgram = "keymap"; - # keymap-drawer currently requires tree-sitter 0.24.0 - # See https://github.com/caksoylar/keymap-drawer/issues/183 - # top-level package `keymap-drawer` is not broken due to this - # incompatibility, thanks to a Python override - broken = lib.versionAtLeast tree-sitter.version "0.25.0"; }; -} +}) diff --git a/pkgs/development/python-modules/keymap-drawer/tests/config.yaml b/pkgs/development/python-modules/keymap-drawer/tests/config.yaml new file mode 100644 index 000000000000..35eed11c0483 --- /dev/null +++ b/pkgs/development/python-modules/keymap-drawer/tests/config.yaml @@ -0,0 +1,9 @@ +draw_config: + key_w: 50 + key_h: 50 + split_gap: 20 + glyphs: {} + +parse_config: + preprocess: true + diff --git a/pkgs/development/python-modules/keymap-drawer/tests/default.nix b/pkgs/development/python-modules/keymap-drawer/tests/default.nix index 7c94185c41f5..224284f651df 100644 --- a/pkgs/development/python-modules/keymap-drawer/tests/default.nix +++ b/pkgs/development/python-modules/keymap-drawer/tests/default.nix @@ -1,89 +1,179 @@ { - lib, - fetchFromGitHub, - runCommand, - stdenv, + keymap-drawer, + runCommandWith, testers, - keymap-drawer, + libxml2, + xmlstarlet, yamllint, + yq-go, }: let runKeymapDrawer = - name: - runCommand "keymap-drawer-${name}" { - nativeBuildInputs = [ keymap-drawer ]; + { name, ... }@args: + runCommandWith { + name = "${keymap-drawer.name}-${name}"; + derivationArgs = removeAttrs args [ "name" ] // { + nativeBuildInputs = [ keymap-drawer ] ++ args.nativeBuildInputs or [ ]; + }; }; - - MattSturgeon-example = fetchFromGitHub { - owner = "MattSturgeon"; - repo = "glove80-config"; - rev = "d55267dd26593037256b35a5d6ebba0f75541da5"; - hash = "sha256-MV6cNpgHBuaGvpu2aR1aBNMpwPnDqOSbGf+2ykxocP4="; - nonConeMode = true; - sparseCheckout = [ - "config" - "img" - ]; - }; - - # MattSturgeon's example requires MDI icons - mdi = fetchFromGitHub { - owner = "Templarian"; - repo = "MaterialDesign-SVG"; - tag = "v7.4.47"; - hash = "sha256-NoSSRT1ID38MT70IZ+7h/gMVCNsjNs3A2RX6ePGwuQ0="; - }; in { - dump-config = runKeymapDrawer "dump-config" '' - keymap dump-config --output "$out" + dump-config = + runKeymapDrawer + { + name = "dump-config"; + nativeBuildInputs = [ + yamllint + ]; + } + /* bash */ '' + keymap dump-config --output "$out" - if [ ! -s "$out" ]; then - >&2 echo 'Expected `dump-config` to have content.' - exit 1 - fi + if [ ! -s "$out" ]; then + >&2 echo 'Expected `dump-config` to have content.' + exit 1 + fi - ${lib.getExe yamllint} --strict --config-data relaxed "$out" - ''; + yamllint --strict --config-data relaxed "$out" + ''; - parse-zmk = testers.testEqualContents { - assertion = "keymap parse --zmk-keymap produces expected YAML"; - expected = "${MattSturgeon-example}/img/glove80.yaml"; - actual = runKeymapDrawer "parse" '' - keymap \ - --config ${MattSturgeon-example}/config/keymap_drawer.yaml \ - parse --zmk-keymap ${MattSturgeon-example}/config/glove80.keymap \ - --output "$out" - ''; - checkMetadata = stdenv.buildPlatform.isLinux; - }; + invalid-keymap = testers.testBuildFailure ( + runKeymapDrawer + { + name = "invalid-keymap"; + } + /* bash */ '' + keymap \ + --config ${./config.yaml} \ + parse --zmk-keymap ${./invalid.keymap} \ + --output "$out" + '' + ); - draw = testers.testEqualContents { - assertion = "keymap draw produces expected SVG"; - expected = "${MattSturgeon-example}/img/glove80.svg"; - actual = runKeymapDrawer "draw" '' - ${lib.optionalString stdenv.buildPlatform.isLinux '' - export XDG_CACHE_HOME="$PWD/cache" - glyphs="$XDG_CACHE_HOME/keymap-drawer/glyphs" - ''} - ${lib.optionalString stdenv.buildPlatform.isDarwin '' - export HOME="$PWD/home" - glyphs="$HOME/Library/Caches/keymap-drawer/glyphs" - ''} - mkdir -p "$glyphs" + parse-zmk = + runKeymapDrawer + { + name = "parse"; + nativeBuildInputs = [ + yamllint + yq-go + ]; + } + /* bash */ '' + keymap \ + --config ${./config.yaml} \ + parse --zmk-keymap ${./minimal.keymap} \ + --output "$out" - # Unpack MDI icons into the cache - for file in ${mdi}/svg/* - do - ln -s "$file" "$glyphs/mdi:$(basename "$file")" - done + yamllint --strict --config-data relaxed "$out" || { + >&2 echo "Malformed YAML" + exit 1 + } - keymap \ - --config ${MattSturgeon-example}/config/keymap_drawer.yaml \ - draw ${MattSturgeon-example}/img/glove80.yaml \ - --output "$out" - ''; - checkMetadata = stdenv.buildPlatform.isLinux; - }; + layer_count=$(yq '.layers | length' "$out") + (( layer_count == 2 )) || { + >&2 echo "Expected 2 layers, found $layer_count" + exit 1 + } + + default_layer=$(yq --exit-status '.layers.default | flatten' "$out") || { + >&2 echo "Expected default layer" + exit 1 + } + + fn_layer=$(yq --exit-status '.layers.fn | flatten' "$out") || { + >&2 echo "Expected fn layer" + exit 1 + } + + [ "$default_layer" = '[ESC, A, B, SPACE, C, D]' ] || { + >&2 echo "Incorrect default layer: $default_layer" + exit 1 + } + + [ "$fn_layer" = '[F1, F2, F3, F4, F5, F6]' ] || { + >&2 echo "Incorrect fn layer: $fn_layer" + exit 1 + } + + yq --exit-status '.. | select(. == "ESC")' "$out" >/dev/null || { + >&2 echo "Expected 'ESC' key" + exit 1 + } + + yq --exit-status '.. | select(. == "SPACE")' "$out" >/dev/null || { + >&2 echo "Expected 'SPACE' key" + exit 1 + } + + yq --exit-status '.. | select(. == "F1")' "$out" >/dev/null || { + >&2 echo "Expected 'F1' key" + exit 1 + } + ''; + + draw = + runKeymapDrawer + { + name = "draw"; + nativeBuildInputs = [ + xmlstarlet + libxml2 + ]; + } + /* bash */ '' + keymap \ + --config ${./config.yaml} \ + draw ${./minimal.yaml} \ + --output "$out" + + ns="http://www.w3.org/2000/svg" + + # Basic XML validity + xmllint --noout "$out" || { + >&2 echo "Malformed XML" + exit 1 + } + + # Root element is + xmlstarlet sel -N s="$ns" -t -v "name(/s:svg)" "$out" | grep -qx svg || { + >&2 echo "Expected root element" + exit 1 + } + + # Assert two layers exist + layer_count=$(xmlstarlet sel -N s="$ns" -t -v 'count(//s:g[contains(@class, "layer-")])' "$out") + (( layer_count == 2 )) || { + >&2 echo "Expected exactly 2 layers, found $layer_count" + exit 1 + } + + for layer in default fn; do + # layer-id class + xmlstarlet sel -N s="$ns" -t -v 'count(//s:g[@class="layer-'"$layer"'"])' "$out" | grep -qx 1 || { + >&2 echo "Missing layer-$layer class" + exit 1 + } + + # text label + xmlstarlet sel -N s="$ns" -t -v '//s:text[@class="label" and text()="'"$layer"':"]' "$out" | grep -q "$layer": || { + >&2 echo "Missing $layer layer text label" + exit 1 + } + done + + key_count=$(xmlstarlet sel -N s="$ns" -t -v 'count(//s:g[contains(@class, "keypos-")])' "$out") + (( key_count == 12 )) || { + >&2 echo "Expected 12 keys total (6 per layer), found $key_count" + exit 1 + } + + for key in ESC A B SPACE C D F1 F2 F3 F4 F5 F6; do + xmlstarlet sel -N s="$ns" -t -v "//s:text[@class='key tap' and text()='$key']" "$out" | grep -q "$key" || { + >&2 echo "Expected key '$key'" + exit 1 + } + done + ''; } diff --git a/pkgs/development/python-modules/keymap-drawer/tests/invalid.keymap b/pkgs/development/python-modules/keymap-drawer/tests/invalid.keymap new file mode 100644 index 000000000000..4cc004db639e --- /dev/null +++ b/pkgs/development/python-modules/keymap-drawer/tests/invalid.keymap @@ -0,0 +1,11 @@ +/ { + keymap { + compatible = "zmk,keymap"; + + broken_layer { + bindings = < + &kp ESC &kp A + &kp SPACE // <-- missing closing + inconsistent row + }; + }; +}; diff --git a/pkgs/development/python-modules/keymap-drawer/tests/minimal.keymap b/pkgs/development/python-modules/keymap-drawer/tests/minimal.keymap new file mode 100644 index 000000000000..517759fdb58b --- /dev/null +++ b/pkgs/development/python-modules/keymap-drawer/tests/minimal.keymap @@ -0,0 +1,19 @@ +/ { + keymap { + compatible = "zmk,keymap"; + + default_layer { + bindings = < + &kp ESC &kp A &kp B + &kp SPACE &kp C &kp D + >; + }; + + fn_layer { + bindings = < + &kp F1 &kp F2 &kp F3 + &kp F4 &kp F5 &kp F6 + >; + }; + }; +}; diff --git a/pkgs/development/python-modules/keymap-drawer/tests/minimal.yaml b/pkgs/development/python-modules/keymap-drawer/tests/minimal.yaml new file mode 100644 index 000000000000..decc960e6234 --- /dev/null +++ b/pkgs/development/python-modules/keymap-drawer/tests/minimal.yaml @@ -0,0 +1,13 @@ +layout: + ortho_layout: + rows: 2 + columns: 3 +layers: + default: + - [ESC, A, B] + - [SPACE, C, D] + + fn: + - [F1, F2, F3] + - [F4, F5, F6] + diff --git a/pkgs/development/python-modules/kurbopy/default.nix b/pkgs/development/python-modules/kurbopy/default.nix index 551d4edae1cc..9c5dfec52c46 100644 --- a/pkgs/development/python-modules/kurbopy/default.nix +++ b/pkgs/development/python-modules/kurbopy/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "kurbopy"; - version = "0.11.1"; + version = "0.13.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-05ezUpcHxCxo/4oyPKogq4/vdfpNnEBhtv+lYBjKdvg="; + hash = "sha256-JiXNgUeY2booOp1zaWtCuEqdyp/CxXy4rUo5kKmq0eQ="; }; propagatedBuildInputs = [ fonttools ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-51qJAcJvolYCW3XWeymc2xd2QHiKLd7MdRdDedEH8QY="; + hash = "sha256-dWYOQk6kSGRL8nl3f89FWzdB17hgBALvsQkjeT9oKNc="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/libusb-package/default.nix b/pkgs/development/python-modules/libusb-package/default.nix index 154e3554e69b..7726d6013387 100644 --- a/pkgs/development/python-modules/libusb-package/default.nix +++ b/pkgs/development/python-modules/libusb-package/default.nix @@ -2,10 +2,12 @@ lib, buildPythonPackage, fetchFromGitHub, + pyusb, + replaceVars, setuptools, setuptools-scm, + stdenv, tomli, - importlib-resources, libusb1, }: @@ -21,17 +23,30 @@ buildPythonPackage rec { hash = "sha256-4zTyaidpSlledTcEztWzRgwj43oNV7xWrhMXCE9Qz3k="; }; + patches = [ + (replaceVars ./hardcode-libusb1-path.patch { + libusb1 = "${lib.getLib libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + build-system = [ setuptools setuptools-scm tomli ]; - dependencies = [ - importlib-resources - libusb1 + nativeCheckInputs = [ + pyusb ]; + checkPhase = '' + runHook preCheck + + python test.py + + runHook postCheck + ''; + meta = { description = "Python package for simplified libusb distribution and usage with pyOCD"; homepage = "https://github.com/pyocd/libusb-package"; diff --git a/pkgs/development/python-modules/libusb-package/hardcode-libusb1-path.patch b/pkgs/development/python-modules/libusb-package/hardcode-libusb1-path.patch new file mode 100644 index 000000000000..8949c9e2eba8 --- /dev/null +++ b/pkgs/development/python-modules/libusb-package/hardcode-libusb1-path.patch @@ -0,0 +1,48 @@ +diff --git a/setup.cfg b/setup.cfg +index b04257d..f5c436a 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -45,7 +45,6 @@ package_dir = + =src + zip_safe = False + install_requires = +- importlib_resources + + [options.packages.find] + where = src +diff --git a/src/libusb_package/__init__.py b/src/libusb_package/__init__.py +index 67e3e46..684be57 100644 +--- a/src/libusb_package/__init__.py ++++ b/src/libusb_package/__init__.py +@@ -21,10 +21,9 @@ import ctypes.util + import functools + import platform + import sys ++from pathlib import Path + from typing import (Any, Optional, TYPE_CHECKING) + +-import importlib_resources +- + from ._version import version as __version__ + + if TYPE_CHECKING: +@@ -49,18 +48,7 @@ def get_library_path() -> Optional[Path]: + The path is valid until the process exits. If the library was extracted from a zip in order to + be accessible as a file, it will be cleaned up with the process exits. + """ +- lib_resource = importlib_resources.files(__name__).joinpath(_LIBRARY_NAME) +- if lib_resource.is_file(): +- path_context = importlib_resources.as_file(lib_resource) +- path = path_context.__enter__() +- +- @atexit.register +- def cleanup(): +- path_context.__exit__(None, None, None) +- +- return path +- else: +- return None ++ return Path('@libusb1@') + + + def find_library(candidate: str) -> Optional[str]: diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix index 64019f9155fd..c88e18d5419f 100644 --- a/pkgs/development/python-modules/llama-index-readers-database/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "llama-index-readers-database"; - version = "0.5.1"; + version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "llama_index_readers_database"; inherit version; - hash = "sha256-9hMQJ0DdMIADJ5Mtjx7PIq6pOHjUmCceecuPev10d/8="; + hash = "sha256-LDxPRKd+i4zwGArLW8b8URtBc9Y+id/uKEybnsW4c5U="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-workflows/default.nix b/pkgs/development/python-modules/llama-index-workflows/default.nix index eb0624458b50..b5abca8952dd 100644 --- a/pkgs/development/python-modules/llama-index-workflows/default.nix +++ b/pkgs/development/python-modules/llama-index-workflows/default.nix @@ -10,13 +10,13 @@ buildPythonPackage (finalAttrs: { pname = "llama-index-workflows"; - version = "2.15.1"; + version = "2.16.1"; pyproject = true; src = fetchPypi { pname = "llama_index_workflows"; inherit (finalAttrs) version; - hash = "sha256-Xkba4saD06negApPr0crSqkVAms/Qb02urowexLNPn8="; + hash = "sha256-L2viI69AcITu8GS8vsj2CuTdAR2aBGMYh86YYlj6xYo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index 78ec739553f6..d59ca6b09cc9 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -167,7 +167,7 @@ let llm = buildPythonPackage rec { pname = "llm"; - version = "0.28"; + version = "0.29"; pyproject = true; build-system = [ setuptools ]; @@ -176,7 +176,7 @@ let owner = "simonw"; repo = "llm"; tag = version; - hash = "sha256-PMQGyBwP6UCIz7p94atWgepbw9IwW6ym60sfP/PBrCA="; + hash = "sha256-51WHV8ZvyUJgr+a3jFUoZ2hPlv2oiA4rrgalqZEFIfM="; }; patches = [ diff --git a/pkgs/development/python-modules/lmstudio/default.nix b/pkgs/development/python-modules/lmstudio/default.nix new file mode 100644 index 000000000000..10fce8805d42 --- /dev/null +++ b/pkgs/development/python-modules/lmstudio/default.nix @@ -0,0 +1,94 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + pdm-backend, + + # dependencies + anyio, + httpx, + httpx-ws, + msgspec, + typing-extensions, + + # tests + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "lmstudio"; + version = "1.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lmstudio-ai"; + repo = "lmstudio-python"; + tag = finalAttrs.version; + hash = "sha256-3LOoCWoQ7eXRPXHRio9Rtle07HcV3ZrWkrtVVY6mvfI="; + }; + + build-system = [ + pdm-backend + ]; + + dependencies = [ + anyio + httpx + httpx-ws + msgspec + typing-extensions + ]; + + pythonImportsCheck = [ "lmstudio" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # lmstudio.LMStudioRuntimeError: Local API host port is not yet resolved. + "test_session_disconnected_async" + ]; + + disabledTestPaths = [ + # ModuleNotFoundError: No module named 'pytest_subtests' + "tests/async/test_model_catalog_async.py" + "tests/sync/test_model_catalog_sync.py" + "tests/test_inference.py" + + # lmstudio.LMStudioRuntimeError: Local API host port is not yet resolved. + "tests/async/test_embedding_async.py" + "tests/async/test_images_async.py" + "tests/async/test_inference_async.py" + "tests/async/test_llm_async.py" + "tests/async/test_model_handles_async.py" + "tests/async/test_repository_async.py" + "tests/async/test_sdk_bypass_async.py" + "tests/sync/test_embedding_sync.py" + "tests/sync/test_images_sync.py" + "tests/sync/test_inference_sync.py" + "tests/sync/test_llm_sync.py" + "tests/sync/test_model_handles_sync.py" + "tests/sync/test_repository_sync.py" + "tests/sync/test_sdk_bypass_sync.py" + "tests/test_convenience_api.py" + "tests/test_logging.py" + "tests/test_plugin_examples.py" + "tests/test_sessions.py" + "tests/test_timeouts.py" + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "LM Studio Python SDK"; + homepage = "https://github.com/lmstudio-ai/lmstudio-python"; + changelog = "https://github.com/lmstudio-ai/lmstudio-python/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/mistralai/default.nix b/pkgs/development/python-modules/mistralai/default.nix index e2870952868c..7c7e0e75e04e 100644 --- a/pkgs/development/python-modules/mistralai/default.nix +++ b/pkgs/development/python-modules/mistralai/default.nix @@ -9,13 +9,10 @@ # dependencies eval-type-backport, httpx, - invoke, opentelemetry-api, - opentelemetry-exporter-otlp-proto-http, - opentelemetry-sdk, + opentelemetry-semantic-conventions, pydantic, python-dateutil, - pyyaml, typing-inspection, # optional-dependencies @@ -26,19 +23,20 @@ requests, # tests + opentelemetry-sdk, pytestCheckHook, }: buildPythonPackage (finalAttrs: { pname = "mistralai"; - version = "1.12.3"; + version = "2.0.4"; pyproject = true; src = fetchFromGitHub { owner = "mistralai"; repo = "client-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-DaCAO4/DoskFuRgNcoLWBuRdnxXfYhsgY/WZu/s1wk0="; + hash = "sha256-SLPLj9rp8TTOSE3ldobBFU1+MpffzH1Bpshw+7LLUvU="; }; preBuild = '' @@ -50,18 +48,15 @@ buildPythonPackage (finalAttrs: { ]; pythonRelaxDeps = [ - "opentelemetry-exporter-otlp-proto-http" + "opentelemetry-semantic-conventions" ]; dependencies = [ eval-type-backport httpx - invoke opentelemetry-api - opentelemetry-exporter-otlp-proto-http - opentelemetry-sdk + opentelemetry-semantic-conventions pydantic python-dateutil - pyyaml typing-inspection ]; @@ -80,7 +75,15 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "mistralai" ]; nativeCheckInputs = [ + opentelemetry-sdk pytestCheckHook + ] + ++ finalAttrs.passthru.optional-dependencies.agents + ++ finalAttrs.passthru.optional-dependencies.gcp; + + disabledTests = [ + # AssertionError: is not an instance of + "TestOtelTracing" ]; meta = { diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index 4dbb824dd23c..444db06d24a5 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Numpy data type serialization using msgpack"; homepage = "https://github.com/lebedov/msgpack-numpy"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ aborsu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index 83bf70a02d22..2812709dfca3 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/murmurhash"; changelog = "https://github.com/explosion/murmurhash/releases/tag/release-v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ aborsu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 36a7196c07ee..ffd4868a1ae1 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -495,8 +495,8 @@ in "sha256-ha8UiyvXgKk/G98JZYIfJh3v2EKWZwgxNir6BL0+RjU="; mypy-boto3-emr = - buildMypyBoto3Package "emr" "1.42.3" - "sha256-oh5SV2hqG7KcCgBpBeokWeYkBqYprKirv3lZxD2sCnA="; + buildMypyBoto3Package "emr" "1.42.70" + "sha256-xfiBuaUkQUua4XPzGRDuk4VE2yKyy2E9mOu6TuJHEWY="; mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.42.3" @@ -571,8 +571,8 @@ in "sha256-N0kQ7Fc44SFKXhl4V+oAclPNlWhluOs53NDokiXcSNM="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.42.68" - "sha256-HvL13TFg9jP3iSqyxDdsOaBv7shpkMqIQURe9e+ACVA="; + buildMypyBoto3Package "glue" "1.42.70" + "sha256-1LdCLIL9olH9DiZFsWulOaFqc8UE9tK/+cDiCXohYFQ="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.42.51" "sha256-QHAuRJrioMD7ASgV1Wobm81Gb+Z87c78yBs9X1+Kz+E="; diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix index 9693a4bb0463..00ec9516980b 100644 --- a/pkgs/development/python-modules/niquests/default.nix +++ b/pkgs/development/python-modules/niquests/default.nix @@ -1,4 +1,5 @@ { + aiofiles, buildPythonPackage, charset-normalizer, cryptography, @@ -17,22 +18,18 @@ buildPythonPackage rec { pname = "niquests"; - version = "3.17.0"; + version = "3.18.2"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "niquests"; tag = "v${version}"; - hash = "sha256-HGczeExOoZMBiPS//B/gu56Wnpzz55oawhTT67ekuOs="; + hash = "sha256-lZMUm1rYCsNSMz/cKTqynaLqb1P75JJCFMDZ9onFS4g="; }; build-system = [ hatchling ]; - pythonRelaxDeps = [ - "wassima" - ]; - dependencies = [ charset-normalizer urllib3-future @@ -66,6 +63,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "niquests" ]; nativeCheckInputs = [ + aiofiles cryptography fastapi pytest-asyncio diff --git a/pkgs/development/python-modules/outlines-core/Cargo.lock b/pkgs/development/python-modules/outlines-core/Cargo.lock index fb6bba097780..854803a365f5 100644 --- a/pkgs/development/python-modules/outlines-core/Cargo.lock +++ b/pkgs/development/python-modules/outlines-core/Cargo.lock @@ -8,6 +8,20 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" +[[package]] +name = "ahash" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" +dependencies = [ + "cfg-if", + "getrandom 0.3.4", + "once_cell", + "serde", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "1.1.4" @@ -31,9 +45,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-lc-rs" -version = "1.15.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5932a7d9d28b0d2ea34c6b3779d35e3dd6f6345317c34e73438c4f1f29144151" +checksum = "94bffc006df10ac2a68c83692d734a465f8ee6c5b384d8545a636f81d858f4bf" dependencies = [ "aws-lc-sys", "zeroize", @@ -41,11 +55,10 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.33.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1826f2e4cfc2cd19ee53c42fbf68e2f81ec21108e0b7ecf6a71cf062137360fc" +checksum = "4321e568ed89bb5a7d291a7f37997c2c0df89809d7b6d12062c81ddb54aa782e" dependencies = [ - "bindgen", "cc", "cmake", "dunce", @@ -84,37 +97,17 @@ dependencies = [ "virtue", ] -[[package]] -name = "bindgen" -version = "0.72.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn", -] - [[package]] name = "bitflags" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "byteorder" @@ -124,15 +117,24 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" + +[[package]] +name = "castaway" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a" +dependencies = [ + "rustversion", +] [[package]] name = "cc" -version = "1.2.45" +version = "1.2.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" +checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423" dependencies = [ "find-msvc-tools", "jobserver", @@ -140,15 +142,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.4" @@ -162,23 +155,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] -name = "clang-sys" -version = "1.8.1" +name = "cmake" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d" dependencies = [ - "glob", - "libc", - "libloading", + "cc", ] [[package]] -name = "cmake" -version = "0.1.54" +name = "compact_str" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a" dependencies = [ - "cc", + "castaway", + "cfg-if", + "itoa", + "rustversion", + "ryu", + "serde", + "static_assertions", ] [[package]] @@ -263,6 +260,15 @@ dependencies = [ "syn", ] +[[package]] +name = "dary_heap" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06d2e3287df1c007e74221c49ca10a95d557349e54b3a75dc2fb14712c751f04" +dependencies = [ + "serde", +] + [[package]] name = "derive_builder" version = "0.20.2" @@ -358,15 +364,15 @@ checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" [[package]] name = "find-msvc-tools" -version = "0.1.4" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "flate2" -version = "1.1.5" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", "miniz_oxide", @@ -395,30 +401,30 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "futures-channel" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" [[package]] name = "futures-io" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" [[package]] name = "futures-macro" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", @@ -427,21 +433,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" [[package]] name = "futures-task" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" [[package]] name = "futures-util" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-core", "futures-io", @@ -450,15 +456,14 @@ dependencies = [ "futures-task", "memchr", "pin-project-lite", - "pin-utils", "slab", ] [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "js-sys", @@ -481,17 +486,11 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "glob" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" - [[package]] name = "hashbrown" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" [[package]] name = "heck" @@ -514,18 +513,17 @@ dependencies = [ "rustls", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 2.0.18", "ureq", ] [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -560,9 +558,9 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hyper" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1744436df46f0bde35af3eda22aeaba453aada65d8f1c171cd8a5f59030bd69f" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ "atomic-waker", "bytes", @@ -593,19 +591,18 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 1.0.4", + "webpki-roots 1.0.6", ] [[package]] name = "hyper-util" -version = "0.1.18" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" +checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" dependencies = [ "base64 0.22.1", "bytes", "futures-channel", - "futures-core", "futures-util", "http", "http-body", @@ -668,9 +665,9 @@ checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ "icu_collections", "icu_locale_core", @@ -682,9 +679,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" @@ -730,9 +727,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", "hashbrown", @@ -762,15 +759,15 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" +checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" [[package]] name = "iri-string" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" +checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" dependencies = [ "memchr", "serde", @@ -778,27 +775,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "jobserver" @@ -812,43 +800,26 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.82" +version = "0.3.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" +checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c" dependencies = [ "once_cell", "wasm-bindgen", ] -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - [[package]] name = "libc" -version = "0.2.177" +version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" - -[[package]] -name = "libloading" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" -dependencies = [ - "cfg-if", - "windows-link", -] +checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "libredox" -version = "0.1.10" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a" dependencies = [ - "bitflags", "libc", ] @@ -860,9 +831,9 @@ checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "log" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lru-slab" @@ -888,9 +859,9 @@ checksum = "670fdfda89751bc4a84ac13eaa63e205cf0fd22b4c9a5fbfa085b63c1f1d3a30" [[package]] name = "memchr" -version = "2.7.6" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "memoffset" @@ -919,9 +890,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "wasi", @@ -968,9 +939,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "onig" @@ -1014,7 +985,7 @@ dependencies = [ "serde", "serde-pyobject", "serde_json", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokenizers", ] @@ -1032,9 +1003,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pin-project-lite" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pin-utils" @@ -1050,9 +1021,9 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "portable-atomic" -version = "1.11.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "potential_utf" @@ -1072,32 +1043,21 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn", -] - [[package]] name = "proc-macro2" -version = "1.0.103" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" +checksum = "ab53c047fcd1a1d2a8820fe84f05d6be69e9526be40cb03b73f86b6b03e6d87d" dependencies = [ - "cfg-if", "indoc", "libc", "memoffset", @@ -1111,20 +1071,19 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" +checksum = "b455933107de8642b4487ed26d912c2d899dec6114884214a0b3bb3be9261ea6" dependencies = [ - "once_cell", "python3-dll-a", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" +checksum = "1c85c9cbfaddf651b1221594209aed57e9e5cff63c4d11d1feead529b872a089" dependencies = [ "libc", "pyo3-build-config", @@ -1132,9 +1091,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" +checksum = "0a5b10c9bf9888125d917fb4d2ca2d25c8df94c7ab5a52e13313a07e050a3b02" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1144,9 +1103,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" +checksum = "03b51720d314836e53327f5871d4c0cfb4fb37cc2c4a11cc71907a86342c40f9" dependencies = [ "heck", "proc-macro2", @@ -1178,7 +1137,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokio", "tracing", "web-time", @@ -1186,9 +1145,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.13" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" dependencies = [ "bytes", "getrandom 0.3.4", @@ -1199,7 +1158,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.17", + "thiserror 2.0.18", "tinyvec", "tracing", "web-time", @@ -1221,9 +1180,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.42" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -1252,7 +1211,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] @@ -1272,7 +1231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] @@ -1281,14 +1240,14 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", ] [[package]] name = "rand_core" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" dependencies = [ "getrandom 0.3.4", ] @@ -1305,12 +1264,12 @@ dependencies = [ [[package]] name = "rayon-cond" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +checksum = "2964d0cf57a3e7a06e8183d14a8b527195c706b7983549cd5462d5aa3747438f" dependencies = [ "either", - "itertools 0.11.0", + "itertools", "rayon", ] @@ -1330,16 +1289,16 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", "libredox", "thiserror 1.0.69", ] [[package]] name = "regex" -version = "1.12.2" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", @@ -1349,9 +1308,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -1360,15 +1319,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "reqwest" -version = "0.12.24" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ "base64 0.22.1", "bytes", @@ -1402,7 +1361,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 1.0.4", + "webpki-roots 1.0.6", ] [[package]] @@ -1413,7 +1372,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.16", + "getrandom 0.2.17", "libc", "untrusted", "windows-sys 0.52.0", @@ -1427,9 +1386,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustls" -version = "0.23.35" +version = "0.23.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" +checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" dependencies = [ "aws-lc-rs", "log", @@ -1443,9 +1402,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" +checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" dependencies = [ "web-time", "zeroize", @@ -1453,9 +1412,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.8" +version = "0.103.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" +checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" dependencies = [ "aws-lc-rs", "ring", @@ -1471,9 +1430,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "serde" @@ -1487,10 +1446,11 @@ dependencies = [ [[package]] name = "serde-pyobject" -version = "0.6.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c485853a65e1a5f2db72e818ec4c7548a39614fabdd988f5e3504071453b7d7" +checksum = "5614e792b7c36d3feeb45b8287ea2dc615f063896e59258d11ef5015c18bdf6a" dependencies = [ + "log", "pyo3", "serde", ] @@ -1517,16 +1477,16 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "indexmap", "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -1549,15 +1509,15 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "simd-adler32" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" [[package]] name = "slab" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" @@ -1567,12 +1527,12 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1604,6 +1564,12 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "strsim" version = "0.11.1" @@ -1618,9 +1584,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.110" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -1649,9 +1615,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.13.3" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" +checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" [[package]] name = "thiserror" @@ -1664,11 +1630,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.17", + "thiserror-impl 2.0.18", ] [[package]] @@ -1684,9 +1650,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", @@ -1705,9 +1671,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" dependencies = [ "tinyvec_macros", ] @@ -1720,23 +1686,25 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenizers" -version = "0.21.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3169b3195f925496c895caee7978a335d49218488ef22375267fba5a46a40bd7" +checksum = "b238e22d44a15349529690fb07bd645cf58149a1b1e44d6cb5bd1641ff1a6223" dependencies = [ + "ahash", "aho-corasick", + "compact_str", + "dary_heap", "derive_builder", "esaxx-rs", - "getrandom 0.2.16", + "getrandom 0.3.4", "hf-hub", - "itertools 0.13.0", - "lazy_static", + "itertools", "log", "macro_rules_attribute", "monostate", "onig", "paste", - "rand 0.8.5", + "rand 0.9.2", "rayon", "rayon-cond", "regex", @@ -1744,7 +1712,7 @@ dependencies = [ "serde", "serde_json", "spm_precompiled", - "thiserror 2.0.17", + "thiserror 2.0.18", "unicode-normalization-alignments", "unicode-segmentation", "unicode_categories", @@ -1752,9 +1720,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.48.0" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" dependencies = [ "bytes", "libc", @@ -1776,9 +1744,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" dependencies = [ "bytes", "futures-core", @@ -1789,9 +1757,9 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" dependencies = [ "futures-core", "futures-util", @@ -1804,9 +1772,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags", "bytes", @@ -1834,9 +1802,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "pin-project-lite", "tracing-core", @@ -1844,9 +1812,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.34" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", ] @@ -1859,9 +1827,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "unicode-ident" -version = "1.0.22" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-normalization-alignments" @@ -1929,9 +1897,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.7" +version = "2.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" dependencies = [ "form_urlencoded", "idna", @@ -1945,6 +1913,12 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + [[package]] name = "virtue" version = "0.0.18" @@ -1968,18 +1942,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.1+wasi-0.2.4" +version = "1.0.2+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.105" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e" dependencies = [ "cfg-if", "once_cell", @@ -1990,11 +1964,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.55" +version = "0.4.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" +checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8" dependencies = [ "cfg-if", + "futures-util", "js-sys", "once_cell", "wasm-bindgen", @@ -2003,9 +1978,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.105" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2013,9 +1988,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.105" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3" dependencies = [ "bumpalo", "proc-macro2", @@ -2026,9 +2001,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.105" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16" dependencies = [ "unicode-ident", ] @@ -2048,9 +2023,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.82" +version = "0.3.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" +checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9" dependencies = [ "js-sys", "wasm-bindgen", @@ -2072,14 +2047,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.4", + "webpki-roots 1.0.6", ] [[package]] name = "webpki-roots" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" +checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" dependencies = [ "rustls-pki-types", ] @@ -2345,9 +2320,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "wit-bindgen" -version = "0.46.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" [[package]] name = "writeable" @@ -2380,18 +2355,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.27" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +checksum = "f2578b716f8a7a858b7f02d5bd870c14bf4ddbbcf3a4c05414ba6503640505e3" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.27" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +checksum = "7e6cc098ea4d3bd6246687de65af3f920c430e236bee1e3bf2e441463f08a02f" dependencies = [ "proc-macro2", "quote", @@ -2457,3 +2432,9 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/pkgs/development/python-modules/outlines-core/default.nix b/pkgs/development/python-modules/outlines-core/default.nix index 24811b5bc9ba..79f1c7c127da 100644 --- a/pkgs/development/python-modules/outlines-core/default.nix +++ b/pkgs/development/python-modules/outlines-core/default.nix @@ -32,17 +32,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "outlines-core"; - version = "0.2.13"; - + version = "0.2.14"; pyproject = true; src = fetchFromGitHub { owner = "dottxt-ai"; repo = "outlines-core"; - tag = version; - hash = "sha256-mfw/cOLZPRcL3HWmrm/SyA0zDCPWr5F19EWIUdNu9jM="; + tag = finalAttrs.version; + hash = "sha256-XmXD2tWG2277bC318Bn9RqeEE7j9VdauvWnBmFS8Lsk="; }; cargoDeps = rustPlatform.importCargoLock { @@ -53,7 +52,7 @@ buildPythonPackage rec { substituteInPlace Cargo.toml \ --replace-fail \ 'version = "0.0.0"' \ - 'version = "${version}"' + 'version = "${finalAttrs.version}"' cp --no-preserve=mode ${./Cargo.lock} Cargo.lock ''; @@ -67,7 +66,7 @@ buildPythonPackage rec { ]; buildInputs = [ - openssl.dev + openssl ]; build-system = [ @@ -97,7 +96,10 @@ buildPythonPackage rec { rm -rf outlines_core ''; - nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies; + nativeCheckInputs = [ + pytestCheckHook + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; disabledTests = [ # Tests that need to download from Hugging Face Hub. @@ -116,8 +118,8 @@ buildPythonPackage rec { meta = { description = "Structured text generation (core)"; homepage = "https://github.com/outlines-dev/outlines-core"; - changelog = "https://github.com/dottxt-ai/outlines-core/releases/tag/${version}"; + changelog = "https://github.com/dottxt-ai/outlines-core/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ danieldk ]; }; -} +}) diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix index c954547e11ec..3b30f9a8e0ab 100644 --- a/pkgs/development/python-modules/outlines/default.nix +++ b/pkgs/development/python-modules/outlines/default.nix @@ -31,6 +31,7 @@ google-genai, iso3166, jax, + lmstudio, llama-cpp-python, mistralai, ollama, @@ -41,26 +42,41 @@ tensorflow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "outlines"; - version = "1.2.9"; + version = "1.2.12"; pyproject = true; src = fetchFromGitHub { owner = "outlines-dev"; repo = "outlines"; - tag = version; - hash = "sha256-QuS8IokiOPJeh59+W4FLoE9dvBCChf2li70+Ex3aIwg="; + tag = finalAttrs.version; + hash = "sha256-DPxtvaEbPv3go2WD9lqXB6AfTSmIA+MsqZwxXVcpyXk="; }; + # Fix mistralai>=2.0 compatibility + postPatch = '' + substituteInPlace tests/models/test_mistral_type_adapter.py \ + --replace-fail \ + "from mistralai import (" \ + "from mistralai.client.models import (" + + substituteInPlace outlines/models/mistral.py \ + --replace-fail \ + "from mistralai import UserMessage" \ + "from mistralai.client.models import UserMessage" + + substituteInPlace outlines/models/mistral.py tests/models/test_mistral.py \ + --replace-fail \ + "from mistralai import Mistral" \ + "from mistralai.client import Mistral" + ''; + build-system = [ setuptools setuptools-scm ]; - pythonRelaxDeps = [ - "outlines_core" - ]; dependencies = [ cloudpickle datasets @@ -94,6 +110,7 @@ buildPythonPackage rec { iso3166 jax llama-cpp-python + lmstudio mistralai ollama openai @@ -109,11 +126,17 @@ buildPythonPackage rec { ]; disabledTests = [ + # Incompatible with latest mistralai (AssertionError: assert False) + "test_mistral_type_adapter_input_chat" + "test_mistral_type_adapter_input_list" + "test_mistral_type_adapter_input_text" + # Try to dowload models from Hugging Face Hub "test_application_callable_call" "test_application_generator_reuse" "test_application_template_call" "test_application_template_error" + "test_check_hf_chat_template" "test_generator_black_box_async_processor" "test_generator_black_box_sync_processor" "test_generator_init_multiple_output_type" @@ -226,8 +249,8 @@ buildPythonPackage rec { meta = { description = "Structured text generation"; homepage = "https://github.com/outlines-dev/outlines"; - changelog = "https://github.com/dottxt-ai/outlines/releases/tag/${version}"; + changelog = "https://github.com/dottxt-ai/outlines/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ lach ]; }; -} +}) diff --git a/pkgs/development/python-modules/packvers/default.nix b/pkgs/development/python-modules/packvers/default.nix index 82890f16474f..82742b99d64f 100644 --- a/pkgs/development/python-modules/packvers/default.nix +++ b/pkgs/development/python-modules/packvers/default.nix @@ -8,16 +8,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "packvers"; - version = "22.0"; + version = "21.5"; pyproject = true; src = fetchFromGitHub { - owner = "nexB"; + owner = "aboutcode-org"; repo = "packvers"; - tag = version; - hash = "sha256-19jCW3BK6XIcukDsFd1jERc2+g8Hcs/gdm3+dBzQS14="; + tag = finalAttrs.version; + hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE="; }; build-system = [ setuptools ]; @@ -39,11 +39,11 @@ buildPythonPackage rec { meta = { description = "Module for version handling of modules"; homepage = "https://github.com/aboutcode-org/packvers"; - changelog = "https://github.com/nexB/packvers/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/aboutcode-org/packvers/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = with lib.licenses; [ asl20 # and bsd2 ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/panflute/default.nix b/pkgs/development/python-modules/panflute/default.nix index 8a9bc8d131c8..8c98ea2073c7 100644 --- a/pkgs/development/python-modules/panflute/default.nix +++ b/pkgs/development/python-modules/panflute/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = "https://scorreia.com/software/panflute"; changelog = "https://github.com/sergiocorreia/panflute/releases/tag/${version}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pkginfo2/default.nix b/pkgs/development/python-modules/pkginfo2/default.nix index feacfa7f9643..6cd382006eb2 100644 --- a/pkgs/development/python-modules/pkginfo2/default.nix +++ b/pkgs/development/python-modules/pkginfo2/default.nix @@ -6,18 +6,21 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pkginfo2"; version = "30.1.0"; pyproject = true; src = fetchFromGitHub { - owner = "nexB"; + owner = "aboutcode-org"; repo = "pkginfo2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-M6fJbW1XCe+LKyjIupKnLmVkH582r1+AH44r9JA0Sxg="; }; + # Tries to setup python virtualenv and install dependencies + dontConfigure = true; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -27,14 +30,21 @@ buildPythonPackage rec { disabledTests = [ # AssertionError "test_ctor_w_path" + "test_ctor_w_egg_info_as_file" + ]; + + disabledTestPaths = [ + # disabled in upstream CI: https://github.com/aboutcode-org/pkginfo2/commit/4c9899954a154095aa3289d2a1657257f3f0d0e0 + "tests/wonky/" + "tests/examples/" ]; meta = { description = "Query metadatdata from sdists, bdists or installed packages"; - homepage = "https://github.com/nexB/pkginfo2"; - changelog = "https://github.com/aboutcode-org/pkginfo2/releases/tag/${src.tag}"; + homepage = "https://github.com/aboutcode-org/pkginfo2"; + changelog = "https://github.com/aboutcode-org/pkginfo2/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "pkginfo2"; }; -} +}) diff --git a/pkgs/development/python-modules/py-moneyed/default.nix b/pkgs/development/python-modules/py-moneyed/default.nix new file mode 100644 index 000000000000..40397825058f --- /dev/null +++ b/pkgs/development/python-modules/py-moneyed/default.nix @@ -0,0 +1,47 @@ +{ + babel, + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + setuptools, + typing-extensions, +}: + +buildPythonPackage (finalAttrs: { + pname = "py-moneyed"; + version = "3.0"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "py-moneyed"; + repo = "py-moneyed"; + tag = "v${finalAttrs.version}"; + hash = "sha256-k0ZbLwog6TYxKDLZV7eH1Br8buMPfpOkgp+pMN/qdB8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + babel + typing-extensions + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + # babel has more currencies than defined in the package + "test_all_babel_currencies" + ]; + + pythonImportsCheck = [ "moneyed" ]; + + meta = { + description = "Provides Currency and Money classes for use in your Python code"; + homepage = "https://github.com/py-moneyed/py-moneyed"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ kurogeek ]; + changelog = "https://github.com/py-moneyed/py-moneyed/blob/${finalAttrs.src.tag}/CHANGES.rst"; + }; +}) diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix new file mode 100644 index 000000000000..c001a34f2069 --- /dev/null +++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + uv-dynamic-versioning, + + # dependencies + genai-prices, + griffelib, + httpx, + opentelemetry-api, + pydantic-graph, + pydantic, + typing-inspection, + +}: + +buildPythonPackage (finalAttrs: { + pname = "pydantic-ai-slim"; + version = "1.70.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-ai"; + tag = "v${finalAttrs.version}"; + hash = "sha256-eG+v5/v8PxGjTVdUcrwhWfIWHFXwNOLMFHsNK9zH7Wo="; + }; + + sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim"; + + build-system = [ + hatchling + uv-dynamic-versioning + ]; + + dependencies = [ + genai-prices + griffelib + httpx + opentelemetry-api + pydantic-graph + pydantic + typing-inspection + ]; + + pythonImportsCheck = [ + "pydantic_ai" + ]; + + doCheck = false; + + meta = { + description = "GenAI Agent Framework, the Pydantic way"; + homepage = "https://github.com/pydantic/pydantic-ai"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix new file mode 100644 index 000000000000..5e169ea7ad97 --- /dev/null +++ b/pkgs/development/python-modules/pydantic-graph/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + uv-dynamic-versioning, + + # dependencies + httpx, + logfire-api, + pydantic, + typing-inspection, +}: + +buildPythonPackage (finalAttrs: { + pname = "pydantic-graph"; + version = "1.70.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-ai"; + tag = "v${finalAttrs.version}"; + hash = "sha256-eG+v5/v8PxGjTVdUcrwhWfIWHFXwNOLMFHsNK9zH7Wo="; + }; + + sourceRoot = "${finalAttrs.src.name}/pydantic_graph"; + + build-system = [ + hatchling + uv-dynamic-versioning + ]; + + dependencies = [ + httpx + logfire-api + pydantic + typing-inspection + ]; + + pythonImportsCheck = [ + "pydantic_graph" + ]; + + doCheck = false; # no tests + + meta = { + description = "GenAI Agent Framework, the Pydantic way"; + homepage = "https://github.com/pydantic/pydantic-ai"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/development/python-modules/pyporscheconnectapi/default.nix b/pkgs/development/python-modules/pyporscheconnectapi/default.nix index 95bb88bb0ba0..e5bbb4868c16 100644 --- a/pkgs/development/python-modules/pyporscheconnectapi/default.nix +++ b/pkgs/development/python-modules/pyporscheconnectapi/default.nix @@ -1,5 +1,6 @@ { lib, + aiofiles, beautifulsoup4, buildPythonPackage, fetchFromGitHub, @@ -10,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "pyporscheconnectapi"; - version = "0.2.6"; + version = "0.2.7"; pyproject = true; src = fetchFromGitHub { owner = "CJNE"; repo = "pyporscheconnectapi"; tag = finalAttrs.version; - hash = "sha256-aiNCT1IYSXdlJfIoQsBnVn9FGHifkI8e35VCQGGAAZ0="; + hash = "sha256-c46XAWKf7LeQ9Nz1IumOIs/Z8DuCa2zaatBizFT+FMg="; }; postPatch = '' @@ -28,6 +29,7 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; dependencies = [ + aiofiles beautifulsoup4 httpx rich diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index fb10c30d28db..f76528153620 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "pysigma"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "SigmaHQ"; repo = "pySigma"; tag = "v${finalAttrs.version}"; - hash = "sha256-WAW6TD+cAdtHGxpCHvgaoIAWiKZD7jVztx1vr69lzxI="; + hash = "sha256-QPGpmEWfgea420y8mmUF+CHV3xslr39TvxPxAjhI8d4="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pysyncobj/default.nix b/pkgs/development/python-modules/pysyncobj/default.nix index 891fb9effcc4..7ad999c52dbd 100644 --- a/pkgs/development/python-modules/pysyncobj/default.nix +++ b/pkgs/development/python-modules/pysyncobj/default.nix @@ -5,16 +5,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysyncobj"; - version = "0.3.14"; + version = "0.3.15"; pyproject = true; src = fetchFromGitHub { owner = "bakwc"; repo = "PySyncObj"; - tag = "v${version}"; - hash = "sha256-a1fECsLIEFu9Wwai0viR/lkqWVWBKs+OdxHey3Pltmo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-6kvWcKSyVtK3sdeetJxx1golIXRY/RYkFCpWBfs10rg="; }; build-system = [ setuptools ]; @@ -27,9 +27,9 @@ buildPythonPackage rec { meta = { description = "Python library for replicating your class"; homepage = "https://github.com/bakwc/PySyncObj"; - changelog = "https://github.com/bakwc/PySyncObj/releases/tag/v${version}"; + changelog = "https://github.com/bakwc/PySyncObj/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "syncobj_admin"; }; -} +}) diff --git a/pkgs/development/python-modules/python-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix index 04af74d98d09..9ba70ff6d9e9 100644 --- a/pkgs/development/python-modules/python-ly/default.nix +++ b/pkgs/development/python-modules/python-ly/default.nix @@ -1,13 +1,14 @@ { buildPythonPackage, fetchFromGitHub, - lib, hatchling, + lib, lxml, pytestCheckHook, + versionCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-ly"; version = "0.9.9"; pyproject = true; @@ -15,25 +16,40 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frescobaldi"; repo = "python-ly"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CMMssU+qoHbhdny0sgpoYQas4ySPVHnu7GPnSthuMuE="; }; + pythonImportsCheck = [ "ly" ]; + build-system = [ hatchling ]; # Tests seem to be broken ATM: https://github.com/wbsoft/python-ly/issues/70 doCheck = false; - nativeCheckInputs = [ lxml pytestCheckHook ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + meta = { - changelog = "https://github.com/frescobaldi/python-ly/releases/tag/${src.tag}"; + changelog = "https://github.com/frescobaldi/python-ly/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Tool and library for manipulating LilyPond files"; - homepage = "https://github.com/frescobaldi/python-ly"; - license = lib.licenses.gpl2; - maintainers = [ ]; + longDescription = '' + This package provides a Python library ly containing various + Python modules to parse, manipulate or create documents in + LilyPond format. A command line program ly is also provided + that can be used to do various manipulations with LilyPond + files. + + The LilyPond format is a plain text input format that is used by + the GNU music typesetter [LilyPond](https://lilypond.org). + ''; + homepage = "https://pypi.org/project/python-ly"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ yiyu ]; + mainProgram = "ly"; }; -} +}) diff --git a/pkgs/development/python-modules/python-pooldose/default.nix b/pkgs/development/python-modules/python-pooldose/default.nix index 568e140c7a56..a514ef9aef33 100644 --- a/pkgs/development/python-modules/python-pooldose/default.nix +++ b/pkgs/development/python-modules/python-pooldose/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-pooldose"; - version = "0.8.2"; + version = "0.8.6"; pyproject = true; src = fetchFromGitHub { owner = "lmaertin"; repo = "python-pooldose"; tag = version; - hash = "sha256-zhEUsbHIe31PQt4p0VhrZN3Y2ifE94br/D2ksRSh6Pg="; + hash = "sha256-MbfFCE88xWGGRkRPqZ9oftaydxs5R2cgIcdU0YqWQi4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pywaze/default.nix b/pkgs/development/python-modules/pywaze/default.nix index 5e5e3d7f09ee..5804de59344e 100644 --- a/pkgs/development/python-modules/pywaze/default.nix +++ b/pkgs/development/python-modules/pywaze/default.nix @@ -10,16 +10,16 @@ respx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pywaze"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "eifinger"; repo = "pywaze"; - tag = "v${version}"; - hash = "sha256-INjVspha4AbxKPMQtL/4BUavFisrQXUGofZ3nuz39UU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-yhECJORKVM8R/+CjhSTwgtCPeQ8QwIuG3EZHmtjVkX0="; }; build-system = [ hatchling ]; @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { description = "Module for calculating WAZE routes and travel times"; homepage = "https://github.com/eifinger/pywaze"; - changelog = "https://github.com/eifinger/pywaze/releases/tag/v${version}"; + changelog = "https://github.com/eifinger/pywaze/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyweatherflowudp/default.nix b/pkgs/development/python-modules/pyweatherflowudp/default.nix index 4f59bf387d3e..25c70f00f5b0 100644 --- a/pkgs/development/python-modules/pyweatherflowudp/default.nix +++ b/pkgs/development/python-modules/pyweatherflowudp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "pyweatherflowudp"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; src = fetchFromGitHub { owner = "briis"; repo = "pyweatherflowudp"; tag = finalAttrs.version; - hash = "sha256-07AvFvrnNainBpve3pkiHzbrqSsjcP0N/nJ2slwVdqc="; + hash = "sha256-4zS6YQmceGfJMGR++VdymIfNq7NAB9jKDT6bVl0wHAc="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyworxcloud/default.nix b/pkgs/development/python-modules/pyworxcloud/default.nix index 466c2684f2ae..22f4902b26ad 100644 --- a/pkgs/development/python-modules/pyworxcloud/default.nix +++ b/pkgs/development/python-modules/pyworxcloud/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyworxcloud"; - version = "6.0.5"; + version = "6.1.0"; pyproject = true; src = fetchFromGitHub { owner = "MTrab"; repo = "pyworxcloud"; tag = "v${version}"; - hash = "sha256-BqRdR202mF+aosAf1GRu8xcMSTkUrgxRVSgHyCg4wjA="; + hash = "sha256-V57BQ0F5gpKi9aOy79/VyU/qTx/CujM+H6XvRlrjBXY="; }; pythonRelaxDeps = [ "awsiotsdk" ]; diff --git a/pkgs/development/python-modules/rflink/default.nix b/pkgs/development/python-modules/rflink/default.nix index 3f2f3af9ebda..3fdd5edf4a78 100644 --- a/pkgs/development/python-modules/rflink/default.nix +++ b/pkgs/development/python-modules/rflink/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "rflink"; - version = "0.0.67"; + version = "0.0.68"; pyproject = true; src = fetchFromGitHub { owner = "aequitas"; repo = "python-rflink"; tag = version; - hash = "sha256-LAmn9/l+J++CvRa5gypuoQ41mZVSoVqbPpbqVSP6CN4="; + hash = "sha256-0mMBZYN3xzRotVuLw2HgzSVhsXUv531x3i97B2lI5KE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index 6e8b52c11cb7..f20ec8f29cbb 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -5,6 +5,7 @@ setuptools, robotframework, robotframework-assertion-engine, + sqlparse, pytestCheckHook, }: @@ -20,14 +21,14 @@ buildPythonPackage rec { hash = "sha256-RGTx5Xn40MHr5M6DUb3dkR2OU7B0JKuFYP1o18o3Ct4="; }; - nativeBuildInputs = [ - robotframework + build-system = [ setuptools ]; propagatedBuildInputs = [ robotframework robotframework-assertion-engine + sqlparse ]; pythonImportsCheck = [ "DatabaseLibrary" ]; @@ -35,6 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { + changelog = "https://github.com/MarketSquare/Robotframework-Database-Library/releases/tag/${src.tag}"; description = "Database Library contains utilities meant for Robot Framework"; homepage = "https://github.com/MarketSquare/Robotframework-Database-Library"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index aa0faee17031..17f46719c69e 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -12,6 +12,7 @@ psutil, pydantic, pytestCheckHook, + pyyaml, rich, setuptools-scm, setuptools, @@ -22,8 +23,8 @@ let owner = "emeryberger"; repo = "heap-layers"; name = "Heap-Layers"; - rev = "a2048eae91b531dc5d72be7a194e0b333c06bd4c"; - sha256 = "sha256-vl3z30CBX7hav/DM/UE0EQ9lLxZF48tMJrYMXuSulyA="; + tag = "v1.0.0"; + hash = "sha256-p+8aUC124Digv3c9fZ7lLHg6H8FXoAcAQxlYzf9TYbM="; }; printf-src = fetchFromGitHub { @@ -31,20 +32,20 @@ let repo = "printf"; name = "printf"; tag = "v4.0.0"; - sha256 = "sha256-tgLJNJw/dJGQMwCmfkWNBvHB76xZVyyfVVplq7aSJnI="; + hash = "sha256-tgLJNJw/dJGQMwCmfkWNBvHB76xZVyyfVVplq7aSJnI="; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scalene"; - version = "1.5.55"; + version = "2.1.4"; pyproject = true; src = fetchFromGitHub { owner = "plasma-umass"; repo = "scalene"; - tag = "v${version}"; - hash = "sha256-aO7l/paYqbneDArAbXxptIlMGfvc1dAaFLucEj/7xbk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ISXD7QegTL0OvAGS7KYZAk9MAKTr0hMFe/9ws02Ykgk="; }; patches = [ @@ -52,6 +53,7 @@ buildPythonPackage rec { ]; prePatch = '' + mkdir vendor cp -r ${heap-layers-src} vendor/Heap-Layers mkdir vendor/printf cp ${printf-src}/printf.c vendor/printf/printf.cpp @@ -60,18 +62,19 @@ buildPythonPackage rec { sed -i 's/^#define vsnprintf vsnprintf_/\/\/&/' vendor/printf/printf.h ''; - nativeBuildInputs = [ + build-system = [ cython setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ cloudpickle jinja2 numpy psutil pydantic + pyyaml rich ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nvidia-ml-py ]; @@ -97,6 +100,14 @@ buildPythonPackage rec { "test_nested_package_relative_import" ]; + disabledTestPaths = [ + # Broken pipe + # https://github.com/plasma-umass/scalene/issues/1017 + "tests/test_coverup_50.py" + "tests/test_multiprocessing_spawn.py::TestReplacementSemLockPickling" + "tests/test_multiprocessing_spawn.py::TestSpawnModeIntegration" + ]; + # remove scalene directory to prevent pytest import confusion preCheck = '' rm -rf scalene @@ -107,7 +118,7 @@ buildPythonPackage rec { meta = { description = "High-resolution, low-overhead CPU, GPU, and memory profiler for Python with AI-powered optimization suggestions"; homepage = "https://github.com/plasma-umass/scalene"; - changelog = "https://github.com/plasma-umass/scalene/releases/tag/v${version}"; + changelog = "https://github.com/plasma-umass/scalene/releases/tag/${finalAttrs.src.tag}"; mainProgram = "scalene"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ sarahec ]; @@ -122,4 +133,4 @@ buildPythonPackage rec { "aarch64-darwin" ]; }; -} +}) diff --git a/pkgs/development/python-modules/sphinx-markdown-builder/default.nix b/pkgs/development/python-modules/sphinx-markdown-builder/default.nix index 2b5477295a76..10b206c89783 100644 --- a/pkgs/development/python-modules/sphinx-markdown-builder/default.nix +++ b/pkgs/development/python-modules/sphinx-markdown-builder/default.nix @@ -6,7 +6,6 @@ # build system setuptools, - wheel, # deps docutils, @@ -15,19 +14,7 @@ # tests pytestCheckHook, - - # optional deps - black, - bumpver, - coveralls, - flake8, - isort, - pip-tools, - pylint, - pytest, - pytest-cov, sphinxcontrib-httpdomain, - sphinxcontrib-plantuml, }: buildPythonPackage rec { @@ -44,7 +31,6 @@ buildPythonPackage rec { build-system = [ setuptools - wheel ]; dependencies = [ @@ -53,35 +39,15 @@ buildPythonPackage rec { tabulate ]; - optional-dependencies = { - dev = [ - black - bumpver - coveralls - flake8 - isort - pip-tools - pylint - pytest - pytest-cov - sphinx - sphinxcontrib-httpdomain - sphinxcontrib-plantuml - ]; - }; - pythonImportsCheck = [ "sphinx_markdown_builder" ]; nativeCheckInputs = [ pytestCheckHook + sphinxcontrib-httpdomain ]; - # NOTE: not sure why, but a `Missing dependencies: wheel` error happens when - # `black` is included here, with python3.13 - checkInputs = lib.remove black optional-dependencies.dev; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index 56e716ababde..b33247ebf0bb 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, - fetchFromGitHub, - fetchpatch, + fetchFromCodeberg, + pythonAtLeast, openssl, rsa, pyaes, @@ -12,33 +12,19 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "telethon"; version = "1.42.0"; pyproject = true; - src = fetchFromGitHub { - owner = "LonamiWebs"; + src = fetchFromCodeberg { + owner = "Lonami"; repo = "Telethon"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NMHJkSTGR3/tck0k97EfVN9f85PAWst+EZ6G7Tgrt5s="; }; - patches = [ - # https://github.com/LonamiWebs/Telethon/pull/4670 - (fetchpatch { - url = "https://github.com/LonamiWebs/Telethon/commit/8e2a46568ef9193f5887aea1abf919ac4ca6d31e.patch"; - name = "fix_async_test.patch"; - hash = "sha256-oVpLnO4OxNam/mq945OskVEHkbS5TDSUXk/0xPHVv3I="; - }) - ] - ++ lib.optionals (lib.versionOlder version "1.40.1") [ - (fetchpatch { - url = "https://github.com/LonamiWebs/Telethon/commit/ae9c798e2c3648ff40dee1b3f371f5d66851642e.patch"; - name = "fix_test_messages_test.patch"; - hash = "sha256-8SJm8EE6w7zRQxt1NuTX6KP1MTYPiYO/maJ5tOA2I9w="; - }) - ]; + disabled = pythonAtLeast "3.14"; postPatch = '' substituteInPlace telethon/crypto/libssl.py --replace-fail \ @@ -61,13 +47,14 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytestCheckHook - ]; + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; meta = { - homepage = "https://github.com/LonamiWebs/Telethon"; + homepage = "https://codeberg.org/Lonami/Telethon"; description = "Full-featured Telegram client library for Python 3"; license = lib.licenses.mit; - changelog = "https://github.com/LonamiWebs/Telethon/blob/${src.tag}/readthedocs/misc/changelog.rst"; + changelog = "https://codeberg.org/Lonami/Telethon/blob/${finalAttrs.src.tag}/readthedocs/misc/changelog.rst"; maintainers = with lib.maintainers; [ nyanloutre ]; }; -} +}) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index b577d4cbf2b2..8da83f9766fb 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -76,6 +76,6 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/thinc"; changelog = "https://github.com/explosion/thinc/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ aborsu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index d1224750f409..0c68879d8d82 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -6,26 +6,30 @@ fetchPypi, pytestCheckHook, pytest-cov-stub, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "tld"; - version = "0.13.1"; - format = "setuptools"; + version = "0.13.2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-dewAk2y89WT2c2HEFxM2NEC2xO8PDBWStbD75ywXo1A="; + hash = "sha256-2YP6krnXF0AHQvyoROKdXhgnEHnHvPq/ZtAbObShQ0U="; }; - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub + build-system = [ + setuptools + setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ factory-boy faker + pytest-cov-stub + pytestCheckHook ]; doCheck = false; # missing pytest-codeblock @@ -41,7 +45,6 @@ buildPythonPackage rec { meta = { description = "Extracts the top level domain (TLD) from the URL given"; - mainProgram = "update-tld-names"; homepage = "https://github.com/barseghyanartur/tld"; changelog = "https://github.com/barseghyanartur/tld/blob/${version}/CHANGELOG.rst"; # https://github.com/barseghyanartur/tld/blob/master/README.rst#license @@ -52,5 +55,6 @@ buildPythonPackage rec { gpl2Only ]; maintainers = with lib.maintainers; [ fab ]; + mainProgram = "update-tld-names"; }; } diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index ed985066ba62..00e4c93d9c80 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -248,6 +248,7 @@ let && !(builtins.elem cudaPackages.cudaMajorVersion [ "11" "12" + "13" ]); "MPI cudatoolkit does not match cudaPackages.cudatoolkit" = MPISupport && cudaSupport && (mpi.cudatoolkit != cudaPackages.cudatoolkit); diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix index 61899625be11..dcac97f86a56 100644 --- a/pkgs/development/python-modules/trino-python-client/default.nix +++ b/pkgs/development/python-modules/trino-python-client/default.nix @@ -1,11 +1,12 @@ { lib, - buildPythonPackage, boto3, + buildPythonPackage, fetchFromGitHub, httpretty, keyring, lz4, + orjson, pytestCheckHook, python-dateutil, pytz, @@ -35,6 +36,7 @@ buildPythonPackage rec { dependencies = [ lz4 + orjson python-dateutil pytz requests diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index 68ae5ac23069..907a1a46ba0e 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -1,6 +1,6 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, setuptools, setuptools-scm, @@ -14,14 +14,16 @@ pytest-xdist, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "typecode"; version = "30.1.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-/KNhekPDB1eGVtcGNMKHx9oyruP97of7ydzx+9P7dQ8="; + src = fetchFromGitHub { + owner = "aboutcode-org"; + repo = "typecode"; + tag = "v${finalAttrs.version}"; + hash = "sha256-OAQX39f6chM+xSY41rCBYsv4RDhLuBlu2WLcCt7vw0w="; }; dontConfigure = true; @@ -52,17 +54,11 @@ buildPythonPackage rec { # https://github.com/aboutcode-org/typecode/issues/36 # AssertionError: assert 'application/x-bytecode.python'... - "test_compiled_python_1" "test_package_json" # fails due to change in file (libmagic) 5.45 "test_doc_postscript_eps" "test_package_debian" - - # fails due to change in file (libmagic) 5.46 - "test_media_image_img" - "test_compiled_elf_so" - "test_compiled_elf_so_2" ]; pythonImportsCheck = [ "typecode" ]; @@ -70,8 +66,8 @@ buildPythonPackage rec { meta = { description = "Comprehensive filetype and mimetype detection using libmagic and Pygments"; homepage = "https://github.com/aboutcode-org/typecode"; - changelog = "https://github.com/aboutcode-org/typecode/releases/tag/v${version}"; + changelog = "https://github.com/aboutcode-org/typecode/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix index 09fdbd2c079a..8e07a8ecbd30 100644 --- a/pkgs/development/python-modules/waterfurnace/default.nix +++ b/pkgs/development/python-modules/waterfurnace/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "waterfurnace"; - version = "1.6.2"; + version = "1.6.4"; pyproject = true; src = fetchFromGitHub { owner = "sdague"; repo = "waterfurnace"; tag = "v${finalAttrs.version}"; - hash = "sha256-E5GHO4kRfAg+A3FW674i6ekCrpjwYx5rx7xbTZXuT80="; + hash = "sha256-Eh9jmq4VWSDFjU4aFppuJmd1ym8ZAC1/CdSe0iq6ds0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/yt-dlp-ejs/default.nix b/pkgs/development/python-modules/yt-dlp-ejs/default.nix index 3fe00326e1b7..fb9f12c163cd 100644 --- a/pkgs/development/python-modules/yt-dlp-ejs/default.nix +++ b/pkgs/development/python-modules/yt-dlp-ejs/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "yt-dlp-ejs"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { owner = "yt-dlp"; repo = "ejs"; tag = version; - hash = "sha256-6S6O2wXfD38iMbtqMB3WA25cJJoWQRZ7gx9cpKQVYpU="; + hash = "sha256-+tOA9sPk0BGJHFQCoAC8y5Bz3UcjgIPDQ8WDPkRlW5k="; }; pnpmDeps = fetchPnpmDeps { diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index c05039ce967e..f5a8a60a6861 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -1,9 +1,11 @@ { + lib, buildDunePackage, js_of_ocaml-ppx, js_of_ocaml, lwt, lwt_log, + loggerSupport ? !lib.versionAtLeast lwt.version "6.0.0", }: buildDunePackage { @@ -16,6 +18,6 @@ buildDunePackage { propagatedBuildInputs = [ js_of_ocaml lwt - lwt_log - ]; + ] + ++ lib.optional loggerSupport lwt_log; } diff --git a/pkgs/servers/home-assistant/custom-components/circadian_lighting/package.nix b/pkgs/servers/home-assistant/custom-components/circadian_lighting/package.nix new file mode 100644 index 000000000000..a3ce17d98791 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/circadian_lighting/package.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, + nix-update-script, +}: + +buildHomeAssistantComponent rec { + owner = "claytonjn"; + domain = "circadian_lighting"; + version = "2.1.6"; + + src = fetchFromGitHub { + owner = "claytonjn"; + repo = "hass-circadian_lighting"; + tag = version; + hash = "sha256-6S1wIO6UgPdUPt9oDCzIb4duUOql4KgnTd6MjRhrSb0="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/claytonjn/hass-circadian_lighting/releases/tag/${src.tag}"; + description = "Circadian Lighting custom component for Home Assistant"; + homepage = "https://github.com/claytonjn/hass-circadian_lighting"; + maintainers = with lib.maintainers; [ jpds ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix index cc051b9c592b..b47189dcf7ce 100644 --- a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix +++ b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "samoswall"; domain = "polaris"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "samoswall"; repo = "polaris-mqtt"; tag = "v${version}"; - hash = "sha256-/HMR+BZuwAoqFfELkjhT3k5NKMc2ahE/I3DTR1lQ5L0="; + hash = "sha256-N8/NTipJEltyHekQaZZjvqfw+noI7pu/YStoidV9ddw="; }; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix index f8ec64e6d80c..c6bbf74c41cf 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "al-one"; domain = "xiaomi_miot"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "al-one"; repo = "hass-xiaomi-miot"; rev = "v${version}"; - hash = "sha256-Gx2omTbI1Kwgg3kaPum0iSNw/TDYh3fI0GMGFrOzrTg="; + hash = "sha256-t1kOPiZR0CxOsp2V4cJNi+aiDdr7VhqhX8jOAiKTemk="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/battery-state-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/battery-state-card/package.nix index dcd9a31316e2..ae44e8371cfd 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/battery-state-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/battery-state-card/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "battery-state-card"; - version = "3.3.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "maxwroc"; repo = "battery-state-card"; tag = "v${finalAttrs.version}"; - hash = "sha256-/oFW80zCp4vnRc3ZKVJtvNH11UPrdustFDktZdnFiQM="; + hash = "sha256-mwyOdNlGMHK1xrwRL85R0i5s9g5I44WjHcbNTAY/fkw="; }; - npmDepsHash = "sha256-TYiUTzNsaEwy9Y5O0UyFXCGFJ/jdjTek3B5CVvac+p8="; + npmDepsHash = "sha256-vhjH7AePShgrzLRgCEn5sO0jJzOstDzMDQaog2UCarM="; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix new file mode 100644 index 000000000000..15555be3ee4b --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix @@ -0,0 +1,53 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + yarn-berry, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "horizon-card"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "rejuvenate"; + repo = "lovelace-horizon-card"; + tag = "v${finalAttrs.version}"; + hash = "sha256-z2cJ6BIhNnzUo9nIFxVyrPBVWSKf35fyLXK72pE8TJw="; + }; + + nativeBuildInputs = [ + yarn-berry + yarn-berry.yarnBerryConfigHook + ]; + + offlineCache = yarn-berry.fetchYarnBerryDeps { + inherit (finalAttrs) src; + hash = "sha256-LYPHBnDRcGeXo2btx1A4/e7fr7MYg/2G5GkuG/xDG+I="; + }; + + buildPhase = '' + runHook preBuild + + yarn build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install dist/lovelace-horizon-card.js -Dt $out + + runHook postInstall + ''; + + meta = { + description = "Sun Card successor: Visualize the position of the Sun over the horizon"; + homepage = "https://github.com/rejuvenate/lovelace-horizon-card"; + changelog = "https://github.com/rejuvenate/lovelace-horizon-card/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix index df5423f67bda..9f2eb3166a9f 100644 --- a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "frser-sqlite-datasource"; - version = "3.8.2"; - zipHash = "sha256-TJMKHB1loDiBrTWKpIUNfcMTBXhorxqvLrdBEuUspto="; + version = "4.0.1"; + zipHash = "sha256-hjjhNZlez8SXvpy91D/mtJHavH8oiLKgt/4a2vnI4fU="; meta = { description = "Use a SQLite database as a data source in Grafana"; license = lib.licenses.asl20; diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index 30349d77d741..25576e2c5a04 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -13,22 +13,22 @@ rustPlatform.buildRustPackage rec { # in nixpkgs! # For that, check the `` section of `appinfo/info.xml` # in the app (https://github.com/nextcloud/notify_push/blob/main/appinfo/info.xml) - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "nextcloud"; repo = "notify_push"; tag = "v${version}"; - hash = "sha256-RdrwHlp3VlQkhyYr9XDWzqhNnNmUnd8hVAei8IkkNR8="; + hash = "sha256-lBFxGt5ha5kefNrmZO2fmUD/KZLrcUURv5JJ3pmitPE="; }; - cargoHash = "sha256-+z9XaAzToLZg6/PoRigkvPVpZ/bX/t0VBR5bg3dCUVw="; + cargoHash = "sha256-VKai9y9GZjknata61IGcWSdYAAV4bJxz8YjeGVZpBPA="; passthru = rec { app = fetchNextcloudApp { appName = "notify_push"; appVersion = version; - hash = "sha256-Z9vTAln//DYsx5VLWeJP1KBRF0to79F9aBLnpp+PdwA="; + hash = "sha256-Oan4xADU0teC5Lue9RwRkfkDKc0APb9nqar+s/Y9MPw="; license = "agpl3Plus"; homepage = "https://github.com/nextcloud/notify_push"; url = "https://github.com/nextcloud-releases/notify_push/releases/download/v${version}/notify_push-v${version}.tar.gz"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "test_client"; - cargoHash = "sha256-+z9XaAzToLZg6/PoRigkvPVpZ/bX/t0VBR5bg3dCUVw="; + cargoHash = "sha256-VKai9y9GZjknata61IGcWSdYAAV4bJxz8YjeGVZpBPA="; meta = meta // { mainProgram = "test_client"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_search.nix b/pkgs/servers/sql/postgresql/ext/pg_search.nix index 46c1ac58baa7..21541d38b34a 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_search.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_search.nix @@ -1,23 +1,22 @@ { buildPgrxExtension, - cargo-pgrx_0_16_1, + cargo-pgrx_0_17_0, fetchFromGitHub, fetchurl, lib, nix-update-script, pkg-config, postgresql, - stdenv, }: let - # https://github.com/paradedb/paradedb/blob/v0.21.13/Cargo.lock#L3431-L3460 - linderaVersion = "1.5.1"; + # https://github.com/paradedb/paradedb/blob/v0.22.1/Cargo.lock#L4239-L4269 + linderaVersion = "1.4.1"; linderaWebsite = "https://lindera.dev"; # pg_search's tokenizer uses several language dictionaries used by the Lindera crate dictionaries = { - # https://github.com/lindera/lindera/blob/v1.5.1/lindera-ko-dic/build.rs#L15-L22 + # https://github.com/lindera/lindera/blob/v1.4.1/lindera-ko-dic/build.rs#L15-L22 lindera-ko-dic = rec { language = "Korean"; filename = "mecab-ko-dic-2.1.1-20180720.tar.gz"; @@ -27,7 +26,7 @@ let }; }; - # https://github.com/lindera/lindera/blob/v1.5.1/lindera-cc-cedict/build.rs#L15-L22 + # https://github.com/lindera/lindera/blob/v1.4.1/lindera-cc-cedict/build.rs#L15-L22 lindera-cc-cedict = rec { language = "Chinese"; filename = "CC-CEDICT-MeCab-0.1.0-20200409.tar.gz"; @@ -37,7 +36,7 @@ let }; }; - # https://github.com/lindera/lindera/blob/v1.5.1/lindera-ipadic/build.rs#L15-L22 + # https://github.com/lindera/lindera/blob/v1.4.1/lindera-ipadic/build.rs#L15-L22 lindera-ipadic = rec { language = "Japanese"; filename = "mecab-ipadic-2.7.0-20250920.tar.gz"; @@ -50,16 +49,16 @@ let in buildPgrxExtension (finalAttrs: { pname = "pg_search"; - version = "0.21.14"; + version = "0.22.1"; src = fetchFromGitHub { owner = "paradedb"; repo = "paradedb"; tag = "v${finalAttrs.version}"; - hash = "sha256-uXEtb9e9YgNuPOO9O8nPbCvG+MSwYiKFifI/GJqE9i8="; + hash = "sha256-HR0L3KuVDkk2xPyuIH89SWWOX4bqwFDYxaLz6+4h5tI="; }; - cargoHash = "sha256-sTkbpnB/N5eDfTCk86TIM6BZQ20hdHUqSbRFo4Wyo68="; + cargoHash = "sha256-6TUi+DSu3BI63JXvMEksOcu6zjWWUD5dzLxwzv+Jydw="; inherit postgresql; @@ -79,10 +78,10 @@ buildPgrxExtension (finalAttrs: { echo "Lindera cache prepared at $LINDERA_CACHE" ''; - # https://github.com/paradedb/paradedb/blob/v0.21.13/Cargo.toml#L38-L39 - cargo-pgrx = cargo-pgrx_0_16_1; + # https://github.com/paradedb/paradedb/blob/v0.22.1/Cargo.toml#L38-L39 + cargo-pgrx = cargo-pgrx_0_17_0; - # https://github.com/paradedb/paradedb/tree/v0.21.13/pg_search + # https://github.com/paradedb/paradedb/tree/v0.22.1/pg_search cargoPgrxFlags = [ "--package" "pg_search" @@ -103,8 +102,8 @@ buildPgrxExtension (finalAttrs: { changelog = "https://github.com/paradedb/paradedb/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.lucperkins ]; - # https://github.com/paradedb/paradedb/blob/v0.21.13/pg_search/Cargo.toml#L14-L18 - broken = lib.versionOlder postgresql.version "14"; + # https://github.com/paradedb/paradedb/blob/v0.22.1/pg_search/Cargo.toml#L14-L17 + broken = lib.versionOlder postgresql.version "15"; platforms = postgresql.meta.platforms; }; }) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index cb5b6b7b50c7..82bbdb5a1cbf 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -500,13 +500,13 @@ let version, update, edition, + language, sw_edition, target_sw, target_hw, - language, other, }: - "cpe:2.3:${part}:${vendor}:${product}:${version}:${update}:${edition}:${sw_edition}:${target_sw}:${target_hw}:${language}:${other}"; + "cpe:2.3:${part}:${vendor}:${product}:${version}:${update}:${edition}:${language}:${sw_edition}:${target_sw}:${target_hw}:${other}"; possibleCPEPartsFuns = [ (vendor: version: { success = true; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix index e164b40aac94..dbf8ad0a078f 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-anthy"; - version = "5.1.9"; + version = "5.1.10"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.zst"; - hash = "sha256-XDsKmhc5h3YAEfQOWtK46tZ+70DS1Cv3RP5kkixSQN8="; + hash = "sha256-t4ZdPAPvUbd2iQvfUlFlpUTjC+RG4nYuDFPIfpBZB4Y="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix index a15ebdff93d2..2b75181a719b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fcitx5-bamboo"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-bamboo"; rev = finalAttrs.version; - hash = "sha256-xZzIpJQMyifu4GqAwiXgwGP4wO2j4Au5qEr49Ko2FjA="; + hash = "sha256-BaN/KrKIC3roNq4mkWfq8uq0w+G+ehrl/jEl0DJ6RC0="; fetchSubmodules = true; }; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index d0ccdd52de98..74df970f72b6 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.1.10"; + version = "5.1.11"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-CdmzO7wPJkue3PdGYav8/Smj0Fich80Z1biCjqTsO5I="; + hash = "sha256-zOaXQUIW9+kOae2hajtnKLNmtlhZLuFAb+nts9gmivQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 9d38b075135a..2cf9b7073a05 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.1.12"; + version = "5.1.13"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-XwVvkxG5627E5BE2Yp0w/mFjaG1nYa0Olm8Gz6V4+eA="; + hash = "sha256-STx2S5fuaZCsGoM8nsihYoW+C1GdkD3K7pT84aMRI9c="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 25fde5ca0b40..57a44919d525 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.1.5"; + version = "5.1.6"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-eMo/ZsZdfAxR14aSnit3yHdw/yv8KdfKjK1Hu7Ce/3o="; + hash = "sha256-4v3XWXXlTYOO2/SKnEBTr5WsGxqFLjsPgCE7goVrFGY="; }; outputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index ad84a793ede1..72b8dd1eed4a 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.1.8"; + version = "5.1.9"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-6aBn0muWbmdxqUCrrXDRd4MZP7QUMX1ZHcAUdTF9Kys="; + hash = "sha256-zxq/nINxLvhZCcndNyAUAOY74npFXcYUR78TlZVyRUk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 89772b77e010..4c37576ecc04 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.15"; + version = "5.0.16"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-BhsckLi6FSrRw+QZ8pTEgjV4BaTKSKAJtmcRCFoOUwU="; + hash = "sha256-df0BjORGT+zx/8kg/nGPDa9MBAXpPtdfx8S5O+E31wE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix index a8bdc6083177..b17bbdc80414 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-m17n"; - version = "5.1.5"; + version = "5.1.6"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-gvR//H+Kf/pYv6Avr0No8PZO7hAnOHj16v6n+tDXgkU="; + hash = "sha256-+sQu/P28XV2nkS7rxy+pTXijY1mLvmwbePaJLUtLaBg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 510547079701..3ab643daf337 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.1.12"; + version = "5.1.13"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.zst"; - hash = "sha256-A7x7PQiyPAprJRg1tdk1Amq7pAhe8ney2KX9+9F0mK4="; + hash = "sha256-KB4IOLq6mRB1ZnOPg4Avpk6vp29xbLkDGYXvCdtrjA8="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 6b0dcb52a84b..60b2d8e70db8 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.1.10"; + version = "5.1.11"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-u1ZNMKSAuevW3s0WB5RovWEyewAwxMXq8NUEzuibR3U="; + hash = "sha256-Oigygr486SNYssre8rMDRDzn28hVI8pabm+0/eoR94Y="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index b1cabc0f9b96..f62e1611bcbb 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.1.5"; + version = "5.1.6"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-hoAaismWfiVIYs780oiwwA3syjBnYNQ5nYbhlBbAAKw="; + hash = "sha256-hqFui1Ycxih7I7VjUjfJe6V5I9RyamyNi6aZKcWGrWU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index 00f1fe10342b..9d72e72cbf16 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.1.9"; + version = "5.1.10"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - hash = "sha256-tTJPoFmhILPvKNwut0vLohkvm+nJzX8VrMVTopfmF1Q="; + hash = "sha256-g4RK1OCRQJoLv5fLR/O2GghgBIWOKzhRbkuijIgpr7U="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/pandoc-imagine/default.nix b/pkgs/tools/misc/pandoc-imagine/default.nix index c9e36942c76d..8307eda4974c 100644 --- a/pkgs/tools/misc/pandoc-imagine/default.nix +++ b/pkgs/tools/misc/pandoc-imagine/default.nix @@ -33,7 +33,7 @@ buildPythonApplication rec { into images or ASCII art ''; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = [ ]; mainProgram = "pandoc-imagine"; }; } diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index 8fd3b27e3551..ec806a25ceeb 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -21,6 +21,8 @@ assert lib.assertMsg ( { stdenv, + closureInfo, + runCommand, meson, bison, boehmgc, @@ -55,6 +57,7 @@ assert lib.assertMsg ( openssl, pkgsStatic, rustc, + rust-cbindgen, toml11, pegtl, buildPackages, @@ -94,6 +97,7 @@ assert lib.assertMsg ( libseccomp, pastaFod ? lib.meta.availableOn stdenv.hostPlatform passt, passt, + withPlugins ? lib.versionAtLeast version "2.95" && !enableStatic, confDir, stateDir, @@ -106,6 +110,20 @@ let hasDtraceSupport = lib.versionAtLeast version "2.93"; parseToYAML = lib.versionAtLeast version "2.93"; usesCapnp = lib.versionAtLeast version "2.94"; + + mesonCrossFile = + deps: + runCommand "lix-cross-file.conf" + { + input = '' + [project options] + builtin-dep-closure = @deps@ + ''; + passAsFile = [ "input" ]; + } + '' + substitute $inputPath $out --replace-fail @deps@ "$(cat ${deps})" + ''; in # gcc miscompiles coroutines at least until 13.2, possibly longer # do not remove this check unless you are sure you (or your users) will not report bugs to Lix upstream about GCC miscompilations. @@ -138,6 +156,37 @@ stdenv.mkDerivation (finalAttrs: { ]; __structuredAttrs = true; + # dep closure for builtin builders in meson array form for immediate use + builtinDeps = + if stdenv.hostPlatform.isStatic then + builtins.toFile "lix-static-dep-closure" "[]" + else + runCommand "lix-builtin-dep-closure" + { + closure = closureInfo { + # closureInfo does not work all that well for things like lowdown, + # where it finds only -out but not -lib. we'll take -out and -lib, + # ignoring -bin, -man, -dev, etc. and hope that'll be good enough. + rootPaths = lib.flatten ( + map + (drv: [ + (drv.out or [ ]) + (drv.lib or [ ]) + ]) + ( + lib.subtractLists finalAttrs.disallowedReferences ( + finalAttrs.buildInputs ++ finalAttrs.propagatedBuildInputs + ) + ) + ); + }; + } + '' + closure=($(cat $closure/store-paths)) + closure="$(printf ", '%s'" "''${closure[@]}")" + printf "[%s]" "''${closure:2}" >$out + ''; + # We only include CMake so that Meson can locate toml11, which only ships CMake dependency metadata. dontUseCmakeConfigure = true; @@ -150,7 +199,11 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals finalAttrs.doInstallCheck [ p.aiohttp p.pytest + p.pytest-timeout p.pytest-xdist + p.pyxattr + p.tappy + p.ruff ] ++ lib.optionals usesCapnp [ p.pycapnp ] )) @@ -171,6 +224,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals isLLVMOnly [ rustc + rust-cbindgen cargo rustPlatform.cargoSetupHook ] @@ -185,7 +239,10 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals parseToYAML [ yq ] ++ lib.optionals usesCapnp [ capnproto ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ] - ++ lib.optionals (lib.versionAtLeast version "2.94") [ zstd ]; + ++ lib.optionals (lib.versionAtLeast version "2.94") [ zstd ] + ++ lib.optionals (withPlugins && finalAttrs.doInstallCheck) [ + curl + ]; buildInputs = [ boost @@ -278,6 +335,11 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "enable-embedded-sandbox-shell" ( stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic )) + ] + ++ lib.optionals (lib.versionAtLeast version "2.95") [ + (lib.mesonBool "enable-contrib-plugins" withPlugins) + ] + ++ [ (lib.mesonEnable "seccomp-sandboxing" withLibseccomp) (lib.mesonOption "store-dir" storeDir) @@ -307,7 +369,12 @@ stdenv.mkDerivation (finalAttrs: { [ (lib.mesonOption "build-test-env" "${pkgsStatic.busybox}/bin") (lib.mesonOption "build-test-shell" "${pkgsStatic.bash}/bin") - ]; + ] + ++ lib.optionals (lib.versionAtLeast version "2.95") [ + "--${ + if stdenv.hostPlatform != stdenv.buildPlatform then "cross" else "native" + }-file=${mesonCrossFile finalAttrs.builtinDeps}" + ]; ninjaFlags = [ "-v" ]; diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 61bacf78be73..2640659d43d0 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -262,20 +262,20 @@ lib.makeExtensible ( attrName = "git"; lix-args = rec { - version = "2.95.0-pre-20260103_${builtins.substring 0 12 src.rev}"; + version = "2.96.0-pre-20260317_${builtins.substring 0 12 src.rev}"; src = fetchFromGitea { domain = "git.lix.systems"; owner = "lix-project"; repo = "lix"; - rev = "d387c9113c73f04bed46dbdd59b6c36de2253d73"; - hash = "sha256-jYUcmXA4FNwoJtxRgH+Be96wQv8h9Y9dByYf+KmcgK4="; + rev = "96db7c79cf2a9a06725360b0d12e5de583bef07d"; + hash = "sha256-Ixwk38HArs7MZXxdWRkSZFzUhUdlCro+8+M/sO+fE/Y="; }; cargoDeps = rustPlatform.fetchCargoVendor { name = "lix-${version}"; inherit src; - hash = "sha256-APm8m6SVEAO17BBCka13u85/87Bj+LePP7Y3zHA3Mpg="; + hash = "sha256-a5XtutX+NS4wOqxeqbscWZMs99teKick5+cQfbCRGxQ="; }; }; }; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index bb451c97fa11..d52f51884f23 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -41,6 +41,7 @@ rustPlatform, snappy, stdenv, + symlinkJoin, systemd, zlib, @@ -66,13 +67,13 @@ stdenv.mkDerivation ( finalAttrs: { pname = "netdata"; - version = "2.8.5"; + version = "2.9.0"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${finalAttrs.version}"; - hash = "sha256-NO6KE2Gf09Y9Ff6uJQj5XAZ+05WMdvRV2iSBdWTs2CE="; + hash = "sha256-QA8YI1cHiPjrTZc9fy81i9YGgGTdE98Eo3xQtVn4/nY="; fetchSubmodules = true; }; @@ -244,10 +245,12 @@ stdenv.mkDerivation ( (lib.cmakeBool "ENABLE_JEMALLOC" true) (lib.cmakeBool "ENABLE_LIBBACKTRACE" withLibbacktrace) (lib.cmakeBool "ENABLE_ML" withML) + (lib.cmakeBool "ENABLE_NETDATA_JOURNAL_FILE_READER" withSystemdJournal) (lib.cmakeBool "ENABLE_PLUGIN_CUPS" withCups) (lib.cmakeBool "ENABLE_PLUGIN_EBPF" withEbpf) (lib.cmakeBool "ENABLE_PLUGIN_FREEIPMI" withIpmi) (lib.cmakeBool "ENABLE_PLUGIN_NETWORK_VIEWER" withNetworkViewer) + (lib.cmakeBool "ENABLE_PLUGIN_OTEL_SIGNAL_VIEWER" withOtel) (lib.cmakeBool "ENABLE_PLUGIN_OTEL" withOtel) (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_JOURNAL" withSystemdJournal) (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_UNITS" withSystemdUnits) @@ -305,7 +308,7 @@ stdenv.mkDerivation ( sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d"; - vendorHash = "sha256-AVNUbKCvO+Z3eKE+bJ/VFDo1tS9DdlmMw6M3OSdHiIU="; + vendorHash = "sha256-VBr6VZvTKh2GFtcVSHCVNhzS8gvl4VFTNLtrK81Y92I="; proxyVendor = true; doCheck = false; @@ -348,11 +351,26 @@ stdenv.mkDerivation ( }; } // lib.optionalAttrs (withOtel || withSystemdJournal) { - cargoDeps = rustPlatform.fetchCargoVendor { - pname = "${finalAttrs.pname}-nd-jf"; - inherit (finalAttrs) version src cargoRoot; - hash = "sha256-HY6OtKHP75mO9X+F2a6H6e+3M0pgZBOIIaxAI9OhgkQ="; + cargoDeps = symlinkJoin { + name = "cargo-vendor-dir"; + paths = [ + (rustPlatform.fetchCargoVendor { + inherit (finalAttrs) + pname + version + src + cargoRoot + ; + hash = "sha256-M9XECeLu58vBTJE4hFkoshc/ze/HF6rBERcjbjAHOJ0="; + }) + (rustPlatform.fetchCargoVendor { + pname = "${finalAttrs.pname}-nd-jf"; + inherit (finalAttrs) version src; + cargoRoot = "${finalAttrs.cargoRoot}/jf"; + hash = "sha256-6spr8WRt2G6tzaUQACxIcVMoDNKOFTg6rSPEOihMgLE="; + }) + ]; }; - cargoRoot = "src/crates/jf"; + cargoRoot = "src/crates"; } ) diff --git a/pkgs/tools/system/netdata/use-local-corrosion.patch b/pkgs/tools/system/netdata/use-local-corrosion.patch index 0a4e80fa6515..f9e8fea075db 100644 --- a/pkgs/tools/system/netdata/use-local-corrosion.patch +++ b/pkgs/tools/system/netdata/use-local-corrosion.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 414a3c54b..cf1fcb7b4 100644 +index 3fa051e07..7dffb90aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -230,13 +230,8 @@ cmake_dependent_option(ENABLE_NETDATA_JOURNAL_FILE_READER "Enable netdata's jour +@@ -195,13 +195,7 @@ cmake_dependent_option(ENABLE_NETDATA_JOURNAL_FILE_READER "Enable netdata's jour # Setup Rust/Corrosion for plugins that need it - if(ENABLE_NETDATA_JOURNAL_FILE_READER OR ENABLE_PLUGIN_OTEL) + if(ENABLE_NETDATA_JOURNAL_FILE_READER OR ENABLE_PLUGIN_OTEL OR ENABLE_PLUGIN_OTEL_SIGNAL_VIEWER) - include(FetchContent) - FetchContent_Declare( - Corrosion @@ -14,7 +14,6 @@ index 414a3c54b..cf1fcb7b4 100644 - ) - FetchContent_MakeAvailable(Corrosion) + find_package(Corrosion REQUIRED) -+ - corrosion_import_crate(MANIFEST_PATH src/crates/jf/Cargo.toml - CRATES journal_reader_ffi otel-plugin) - endif() + + if(ENABLE_NETDATA_JOURNAL_FILE_READER) + corrosion_import_crate(MANIFEST_PATH src/crates/jf/Cargo.toml diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32ff1d1662c4..3687b7d55d21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1257,9 +1257,6 @@ with pkgs; winetricks = callPackage ../applications/emulators/wine/winetricks.nix { }; - zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; - zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { }; - ### APPLICATIONS/EMULATORS/RETROARCH libretro = recurseIntoAttrs (callPackage ../applications/emulators/libretro { }); @@ -1635,7 +1632,7 @@ with pkgs; coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { }; - intel-oneapi = callPackage ../development/libraries/intel-oneapi { }; + intel-oneapi = recurseIntoAttrs (callPackage ../development/libraries/intel-oneapi { }); cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63b6c071e387..c13dc795c296 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -758,6 +758,12 @@ self: super: with self; { anitopy = callPackage ../development/python-modules/anitopy { }; + anki-audio = callPackage ../development/python-modules/anki-audio { }; + + anki-mac-helper = callPackage ../development/python-modules/anki-mac-helper { + inherit (pkgs) swift; + }; + anndata = callPackage ../development/python-modules/anndata { }; annexremote = callPackage ../development/python-modules/annexremote { }; @@ -6082,6 +6088,8 @@ self: super: with self; { } ); + genai-prices = callPackage ../development/python-modules/genai-prices { }; + genanki = callPackage ../development/python-modules/genanki { }; general-sam = callPackage ../development/python-modules/general-sam { }; @@ -6700,6 +6708,8 @@ self: super: with self; { griffe = callPackage ../development/python-modules/griffe { }; + griffelib = callPackage ../development/python-modules/griffelib { }; + grip = callPackage ../development/python-modules/grip { }; groestlcoin-hash = callPackage ../development/python-modules/groestlcoin-hash { }; @@ -9203,6 +9213,8 @@ self: super: with self; { lmnotify = callPackage ../development/python-modules/lmnotify { }; + lmstudio = callPackage ../development/python-modules/lmstudio { }; + lmtpd = callPackage ../development/python-modules/lmtpd { }; lnkparse3 = callPackage ../development/python-modules/lnkparse3 { }; @@ -13092,6 +13104,8 @@ self: super: with self; { py-melissa-climate = callPackage ../development/python-modules/py-melissa-climate { }; + py-moneyed = callPackage ../development/python-modules/py-moneyed { }; + py-multiaddr = callPackage ../development/python-modules/py-multiaddr { }; py-multibase = callPackage ../development/python-modules/py-multibase { }; @@ -13481,6 +13495,8 @@ self: super: with self; { pydantic = callPackage ../development/python-modules/pydantic { }; + pydantic-ai-slim = callPackage ../development/python-modules/pydantic-ai-slim { }; + pydantic-argparse-extensible = callPackage ../development/python-modules/pydantic-argparse-extensible { }; @@ -13491,6 +13507,8 @@ self: super: with self; { pydantic-extra-types = callPackage ../development/python-modules/pydantic-extra-types { }; + pydantic-graph = callPackage ../development/python-modules/pydantic-graph { }; + pydantic-scim = callPackage ../development/python-modules/pydantic-scim { }; pydantic-settings = callPackage ../development/python-modules/pydantic-settings { };