diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index c6d074279462..d265c719ca29 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -74,6 +74,8 @@ - `nodePackages.wavedrom-cli` has been removed, as it was unmaintained within nixpkgs. +- All `@tailwindcss` packages in the `nodePackages` set have been removed, as they are libraries that should instead be locked by JS projects that utilize them. + - `arti` has been updated to major version 2, which removed the long-deprecated `proxy.socks_port` and `proxy.dns_port` and the legacy syntax for specifying directory authorities. For more information, see the [changelog for 2.0.0](https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v2.0.0/CHANGELOG.md). - `kanata` now requires `karabiner-dk` version 6.0+ or later. @@ -194,8 +196,6 @@ - `openrgb` was updated to 1.0rc2, which now uses Plugin API version 4. Some existing OpenRGB plugins may be incompatible or require updates. -- the `neovim` wrapper sets provider-related configuration in its generated config rather than as wrapper arguments. It should not affect configuration unless you set `wrapRc` to false. - - We now use the upstream wrapper script for Gradle, supporting both the `JAVA_HOME` and `GRADLE_OPTS` environment variables. ## Nixpkgs Library {#sec-nixpkgs-release-26.05-lib} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fdba52e7b39f..fef6397cb0ed 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2548,12 +2548,6 @@ githubId = 6553158; name = "Joel Höner"; }; - atila = { - name = "Átila Saraiva"; - email = "atilasaraiva@gmail.com"; - github = "AtilaSaraiva"; - githubId = 29521461; - }; atkinschang = { email = "atkinschang+nixpkgs@gmail.com"; github = "AtkinsChang"; @@ -8637,12 +8631,6 @@ githubId = 5198058; name = "Udo Sauer"; }; - fettgoenner = { - email = "paulmatti@protonmail.com"; - github = "fettgoenner"; - githubId = 92429150; - name = "Paul Meinhold"; - }; feyorsh = { email = "george@feyor.sh"; github = "Feyorsh"; @@ -11831,6 +11819,12 @@ githubId = 1358764; name = "Jamie Magee"; }; + janezp = { + name = "Janez Podhostnik"; + email = "janez.podhostnik@ourplace.is"; + github = "janezpodhostnik"; + githubId = 67895329; + }; janhencic = { name = "Jan Hencic"; email = "jan@hencic.com"; @@ -13968,6 +13962,11 @@ githubId = 148352; name = "Jim Fowler"; }; + kitsunoff = { + github = "kitsunoff"; + githubId = 58953114; + name = "Maxim Belyy"; + }; Kitt3120 = { email = "nixpkgs@schweren.dev"; github = "Kitt3120"; @@ -14836,6 +14835,11 @@ githubId = 736291; name = "Lee Machin"; }; + lefaucheur0769 = { + name = "LeFaucheur0769"; + github = "LeFaucheur0769"; + githubId = 90474269; + }; legojames = { github = "jrobinson-uk"; githubId = 4701504; @@ -17472,6 +17476,12 @@ githubId = 33701036; name = "Milo Mc"; }; + mimahlavacek = { + email = "mima.hlavacek@gmail.com"; + github = "mima-hlavacek"; + githubId = 55756477; + name = "Míma Hlaváček"; + }; mimame = { email = "miguel.madrid.mencia@gmail.com"; github = "mimame"; @@ -18739,12 +18749,6 @@ githubId = 166791; name = "Neil Mayhew"; }; - nek0 = { - email = "nek0@nek0.eu"; - github = "nek0"; - githubId = 1859691; - name = "Amedeo Molnár"; - }; nekitdev = { email = "nekit@nekit.dev"; github = "nekitdev"; @@ -21140,6 +21144,12 @@ githubId = 103822; name = "Patrick Mahoney"; }; + pmeinhold = { + email = "paulmatti@protonmail.com"; + github = "pmeinhold"; + githubId = 92429150; + name = "Paul Meinhold"; + }; pmenke = { email = "nixos@pmenke.de"; github = "pmenke-de"; diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index f89d9d3942bf..1ec3860bcac2 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -28,6 +28,8 @@ - [qui](https://github.com/autobrr/qui), a modern alternative webUI for qBittorrent, with multi-instance support. Written in Go/React. Available as [services.qui](#opt-services.qui.enable). +- [Remark42](https://remark42.com/), a self-hosted comment engine. Available as [services.remark42](#opt-services.remark42.enable). + - [LibreChat](https://www.librechat.ai/), open-source self-hostable ChatGPT clone with Agents and RAG APIs. Available as [services.librechat](#opt-services.librechat.enable). - [nohang](https://github.com/hakavlad/nohang), a daemon for Linux that prevents out of memory (OOM) situations from affecting system responsiveness. Available as [services.nohang](#opt-services.nohang.enable) diff --git a/nixos/modules/hardware/pcmcia.nix b/nixos/modules/hardware/pcmcia.nix index 9f289b029463..955a039a3096 100644 --- a/nixos/modules/hardware/pcmcia.nix +++ b/nixos/modules/hardware/pcmcia.nix @@ -5,7 +5,7 @@ ... }: let - pcmciaUtils = pkgs.pcmciaUtils.overrideAttrs { + pcmciautils = pkgs.pcmciautils.overrideAttrs { inherit (config.hardware.pcmcia) firmware config; }; in @@ -48,9 +48,9 @@ in boot.kernelModules = [ "pcmcia" ]; - services.udev.packages = [ pcmciaUtils ]; + services.udev.packages = [ pcmciautils ]; - environment.systemPackages = [ pcmciaUtils ]; + environment.systemPackages = [ pcmciautils ]; }; diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 7dd2a481004a..462575f17e81 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -228,6 +228,10 @@ in (mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ]) (mkRenamedOptionModule [ "programs" "man" "enable" ] [ "documentation" "man" "enable" ]) (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ]) + (mkRenamedOptionModule + [ "documentation" "man" "generateCaches" ] + [ "documentation" "man" "cache" "enable" ] + ) (mkRemovedOptionModule [ "documentation" "nixos" @@ -261,7 +265,7 @@ in ''; }; - man.generateCaches = mkOption { + man.cache.enable = mkOption { type = types.bool; default = false; description = '' @@ -273,6 +277,16 @@ in ''; }; + man.cache.generateAtRuntime = mkOption { + type = types.bool; + default = false; + description = '' + Whether to generate the manual page index caches at runtime using + a systemd service. Note that this is currently only supported by the + man-db module. + ''; + }; + info.enable = mkOption { type = types.bool; default = true; diff --git a/nixos/modules/misc/man-db.nix b/nixos/modules/misc/man-db.nix index bb5a412dc7e0..bd5969770c1f 100644 --- a/nixos/modules/misc/man-db.nix +++ b/nixos/modules/misc/man-db.nix @@ -7,13 +7,14 @@ let cfg = config.documentation.man.man-db; + cfgm = config.documentation.man; in { options = { documentation.man.man-db = { enable = lib.mkEnableOption "man-db as the default man page viewer" // { - default = config.documentation.man.enable; + default = cfgm.enable; defaultText = lib.literalExpression "config.documentation.man.enable"; example = false; }; @@ -39,7 +40,7 @@ in }; defaultText = lib.literalMD "all man pages in {option}`config.environment.systemPackages`"; description = '' - The manual pages to generate caches for if {option}`documentation.man.generateCaches` + The manual pages to generate caches for if {option}`documentation.man.cache.enable` is enabled. Must be a path to a directory with man pages under `/share/man`; see the source for an example. Advanced users can make this a content-addressed derivation to save a few rebuilds. @@ -65,41 +66,79 @@ in ) ]; - config = lib.mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; - environment.etc."man_db.conf".text = - let - # We unfortunately can’t use the customized `cfg.package` when - # cross‐compiling. Instead we detect that situation and work - # around it by using the vanilla one, like the OpenSSH module. - buildPackage = - if pkgs.stdenv.buildPlatform.canExecute pkgs.stdenv.hostPlatform then + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { + environment.systemPackages = [ cfg.package ]; + environment.etc."man_db.conf".text = + let + # We unfortunately can’t use the customized `cfg.package` when + # cross‐compiling. Instead we detect that situation and work + # around it by using the vanilla one, like the OpenSSH module. + buildPackage = + if pkgs.stdenv.buildPlatform.canExecute pkgs.stdenv.hostPlatform then + cfg.package + else + pkgs.buildPackages.man-db; + + manualCache = + if (!cfgm.cache.generateAtRuntime) then + pkgs.runCommand "man-cache" + { + nativeBuildInputs = [ buildPackage ]; + preferLocalBuild = true; + } + '' + echo "MANDB_MAP ${cfg.manualPages}/share/man $out" > man.conf + mandb -C man.conf -pscq + '' + else + "/var/cache/man/nixos-mandb"; + in + '' + # Manual pages paths for NixOS + MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man + MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man + + ${lib.optionalString cfgm.cache.enable '' + # Manual pages caches for NixOS + MANDB_MAP /run/current-system/sw/share/man ${manualCache} + ''} + ''; + } + + (lib.mkIf (cfgm.enable && cfgm.cache.generateAtRuntime) { + users.users.mandb = { + isSystemUser = true; + group = "mandb"; + }; + users.groups.mandb = { }; + + systemd.services.mandb = { + path = [ cfg.package - else - pkgs.buildPackages.man-db; + pkgs.rsync + ]; + script = '' + rsync \ + --checksum --recursive --copy-links --delete --no-times --no-perms --chmod=+w \ + ${cfg.manualPages}/share/man/ "$CACHE_DIRECTORY/nixos-manpages" - manualCache = - pkgs.runCommand "man-cache" - { - nativeBuildInputs = [ buildPackage ]; - preferLocalBuild = true; - } - '' - echo "MANDB_MAP ${cfg.manualPages}/share/man $out" > man.conf - mandb -C man.conf -pscq - ''; - in - '' - # Manual pages paths for NixOS - MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man - MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man + echo "MANDB_MAP $CACHE_DIRECTORY/nixos-manpages $CACHE_DIRECTORY/nixos-mandb" \ + > "$RUNTIME_DIRECTORY/man.conf" - ${lib.optionalString config.documentation.man.generateCaches '' - # Generated manual pages cache for NixOS (immutable) - MANDB_MAP /run/current-system/sw/share/man ${manualCache} - ''} - # Manual pages caches for NixOS - MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos - ''; - }; + mandb -C "$RUNTIME_DIRECTORY/man.conf" -q + ''; + serviceConfig = { + CacheDirectory = "man"; + RuntimeDirectory = "mandb"; + User = "mandb"; + BindReadOnlyPaths = [ "/dev/null:/etc/man_db.conf" ]; # mandb will still read /etc/man_db.conf if it exists, even when setting -C path/to/config.conf + ProtectSystem = "strict"; + }; + wantedBy = [ "default.target" ]; + }; + }) + ] + ); } diff --git a/nixos/modules/misc/mandoc.nix b/nixos/modules/misc/mandoc.nix index 694f3137478e..dc8bfae9a6f0 100644 --- a/nixos/modules/misc/mandoc.nix +++ b/nixos/modules/misc/mandoc.nix @@ -60,7 +60,7 @@ in apply = makeLeadingSlashes; description = '' Change the paths where mandoc {manpage}`makewhatis(8)`generates the - manual page index caches. {option}`documentation.man.generateCaches` + manual page index caches. {option}`documentation.man.cache.enable` should be enabled to allow cache generation. This list should only include the paths to manpages installed in the system configuration, i. e. /run/current-system/sw/share/man. {manpage}`makewhatis(8)` @@ -215,7 +215,7 @@ in # create mandoc.db for whatis(1), apropos(1) and man(1) -k # TODO(@sternenseemman): fix symlinked directories not getting indexed, # see: https://inbox.vuxu.org/mandoc-tech/20210906171231.GF83680@athene.usta.de/T/#e85f773c1781e3fef85562b2794f9cad7b2909a3c - extraSetup = lib.mkIf config.documentation.man.generateCaches '' + extraSetup = lib.mkIf config.documentation.man.cache.enable '' for man_path in ${ lib.concatMapStringsSep " " (path: "$out" + lib.escapeShellArg path) cfg.cachePath } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 255c20796217..19d56efec8b8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1738,6 +1738,7 @@ ./services/web-apps/privatebin.nix ./services/web-apps/prosody-filer.nix ./services/web-apps/readeck.nix + ./services/web-apps/remark42.nix ./services/web-apps/reposilite.nix ./services/web-apps/rimgo.nix ./services/web-apps/rss-bridge.nix diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 1031a0bd8dc0..13c00237906e 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -169,7 +169,8 @@ in programs.fish.shellAliases = lib.mapAttrs (name: lib.mkDefault) cfge.shellAliases; # Required for man completions - documentation.man.generateCaches = lib.mkDefault true; + documentation.man.cache.enable = lib.mkDefault true; + documentation.man.cache.generateAtRuntime = lib.mkDefault true; environment = lib.mkMerge [ (lib.mkIf cfg.useBabelfish { diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index bc5c206f967b..38bbb4eab1c7 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -294,6 +294,7 @@ in perms = [ "read" "add" + "player" "control" "admin" ]; @@ -323,6 +324,7 @@ in permissions = [ "read" "add" + "player" "control" "admin" ]; diff --git a/nixos/modules/services/misc/flaresolverr.nix b/nixos/modules/services/misc/flaresolverr.nix index 7967580307f9..8aad08abd781 100644 --- a/nixos/modules/services/misc/flaresolverr.nix +++ b/nixos/modules/services/misc/flaresolverr.nix @@ -46,13 +46,77 @@ in RestartSec = 5; Type = "simple"; DynamicUser = true; + UMask = "0077"; RuntimeDirectory = "flaresolverr"; WorkingDirectory = "/run/flaresolverr"; ExecStart = lib.getExe cfg.package; TimeoutStopSec = 30; + + # Systemd hardening + LockPersonality = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictRealtime = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = [ + "net" + "pid" + "user" + ]; + CapabilityBoundingSet = [ + "~CAP_BLOCK_SUSPEND" + "~CAP_BPF" + "~CAP_CHOWN" + "~CAP_IPC_LOCK" + "~CAP_MKNOD" + "~CAP_NET_ADMIN" + "~CAP_NET_RAW" + "~CAP_PERFMON" + "~CAP_SYSLOG" + "~CAP_SYS_ADMIN" + "~CAP_SYS_BOOT" + "~CAP_SYS_MODULE" + "~CAP_SYS_PACCT" + "~CAP_SYS_PTRACE" + "~CAP_SYS_TIME" + "~CAP_WAKE_ALARM" + ]; + SystemCallFilter = [ + "~@chown" + "~@clock" + "~@cpu-emulation" + "~@debug" + "~@keyring" + "~@memlock" + "~@module" + "~@obsolete" + "~@pkey" + "~@raw-io" + "~@reboot" + "~@setuid" + "~@swap" + "~@timer" + ]; + SystemCallErrorNumber = "EPERM"; + SystemCallArchitectures = "native"; }; }; networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; }; }; + + meta.maintainers = with lib.maintainers; [ diogotcorreia ]; } diff --git a/nixos/modules/services/misc/gotenberg.nix b/nixos/modules/services/misc/gotenberg.nix index b2515f4f2af9..eb924966b4b2 100644 --- a/nixos/modules/services/misc/gotenberg.nix +++ b/nixos/modules/services/misc/gotenberg.nix @@ -8,6 +8,7 @@ let cfg = config.services.gotenberg; args = [ + "--api-bind-ip=${cfg.bindIP}" "--api-port=${toString cfg.port}" "--api-timeout=${cfg.timeout}" "--api-root-path=${cfg.rootPath}" diff --git a/nixos/modules/services/misc/n8n.nix b/nixos/modules/services/misc/n8n.nix index edb387fa8bca..7e302a190a87 100644 --- a/nixos/modules/services/misc/n8n.nix +++ b/nixos/modules/services/misc/n8n.nix @@ -30,8 +30,35 @@ let path = "${pkg}/lib/node_modules/${pkg.pname}"; }) cfg.customNodes ); + + # Runners + runnersCfg = cfg.taskRunners; + runnersEnv = partitionEnv runnersCfg.environment; + commonAllowedEnv = lib.attrNames runnersEnv.regular; + enabledRunners = lib.filterAttrs (_name: runnerCfg: runnerCfg.enable) runnersCfg.runners; + anyRunnerEnabled = runnersCfg.enable && (enabledRunners != { }); + runnerTypes = lib.attrNames enabledRunners; + runnersStateDir = "n8n-task-runners"; + taskRunnerConfigs = lib.mapAttrsToList (runnerType: runnerCfg: { + runner-type = runnerType; + workdir = "/var/lib/${runnersStateDir}"; + command = runnerCfg.command; + args = runnerCfg.args; + allowed-env = commonAllowedEnv; + env-overrides = runnerCfg.environment; + health-check-server-port = toString runnerCfg.healthCheckPort; + }) enabledRunners; + + launcherConfigFile = pkgs.writeText "n8n-task-runners.json" ( + builtins.toJSON { task-runners = taskRunnerConfigs; } + ); in { + meta.maintainers = with lib.maintainers; [ + sweenu + gepbird + ]; + imports = [ (lib.mkRemovedOptionModule [ "services" "n8n" "settings" ] "Use services.n8n.environment instead.") (lib.mkRemovedOptionModule [ @@ -128,13 +155,188 @@ in When enabled, n8n sends notifications of new versions and security updates. ''; }; + N8N_CUSTOM_EXTENSIONS = lib.mkOption { + internal = true; + type = with lib.types; nullOr path; + default = if cfg.customNodes != [ ] then toString customNodesDir else null; + description = '' + Specify the path to directories containing your custom nodes. + ''; + }; + N8N_RUNNERS_MODE = lib.mkOption { + internal = true; + type = + with lib.types; + enum [ + "internal" + "external" + ]; + default = if runnersCfg.enable then "external" else "internal"; + description = '' + How to launch and run the task runner. + `internal` means n8n will launch a task runner as child process. + `external` means an external orchestrator will launch the task runner. + ''; + }; + N8N_RUNNERS_BROKER_PORT = lib.mkOption { + type = with lib.types; coercedTo port toString str; + default = 5679; + description = '' + Port the task broker listens on for task runner connections. + ''; + }; + N8N_RUNNERS_BROKER_LISTEN_ADDRESS = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + description = '' + Address the task broker listens on. + ''; + }; + N8N_RUNNERS_AUTH_TOKEN_FILE = lib.mkOption { + type = with lib.types; nullOr path; + default = null; + description = '' + Path to a file containing the shared authentication token + used between the n8n server (task broker) and the task runners. + + This option is required when {option}`services.n8n.taskRunners.enable` is true. + The file should be readable by the service and not stored in the Nix store. + Use tools like `agenix` or `sops-nix` to manage this secret. + ''; + }; }; }; default = { }; }; + + taskRunners = { + enable = lib.mkEnableOption "n8n task runners for sandboxed Code node execution"; + + launcherPackage = lib.mkPackageOption pkgs "n8n-task-runner-launcher" { }; + + environment = lib.mkOption { + description = '' + Environment variables for the task runner launcher and runners. + These are common to all runners and passed via `allowed-env` in the launcher config. + See for available options. + + Environment variables ending with `_FILE` are automatically handled as secrets: + they are loaded via systemd credentials for secure access with `DynamicUser=true`. + + Note: The authentication token should be set via {option}`services.n8n.environment.N8N_RUNNERS_AUTH_TOKEN_FILE`. + ''; + example = lib.literalExpression '' + { + N8N_RUNNERS_AUTO_SHUTDOWN_TIMEOUT = 15; + N8N_RUNNERS_MAX_CONCURRENCY = 10; + } + ''; + type = lib.types.submodule { + freeformType = + with lib.types; + attrsOf (oneOf [ + str + (coercedTo int toString str) + (coercedTo bool builtins.toJSON str) + ]); + options = { + N8N_RUNNERS_CONFIG_PATH = lib.mkOption { + internal = true; + type = with lib.types; nullOr path; + default = launcherConfigFile; + description = '' + Path to the configuration file for the task runner launcher. + ''; + }; + N8N_RUNNERS_AUTH_TOKEN_FILE = lib.mkOption { + type = with lib.types; nullOr path; + default = cfg.environment.N8N_RUNNERS_AUTH_TOKEN_FILE; + defaultText = lib.literalExpression "config.services.n8n.environment.N8N_RUNNERS_AUTH_TOKEN_FILE"; + description = '' + Path to the authentication token file for the task runner. + ''; + }; + N8N_RUNNERS_TASK_BROKER_URI = lib.mkOption { + type = lib.types.str; + default = "http://${cfg.environment.N8N_RUNNERS_BROKER_LISTEN_ADDRESS}:${cfg.environment.N8N_RUNNERS_BROKER_PORT}"; + defaultText = lib.literalExpression ''"http://''${config.services.n8n.environment.N8N_RUNNERS_BROKER_LISTEN_ADDRESS}:''${config.services.n8n.environment.N8N_RUNNERS_BROKER_PORT}"''; + description = '' + URI of the n8n task broker that the runner connects to. + ''; + }; + }; + }; + default = { }; + }; + + runners = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.submodule ( + { name, ... }: + { + options = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to enable the ${name} task runner. + Only takes effect when {option}`services.n8n.taskRunners.enable` is true. + ''; + }; + + command = lib.mkOption { + type = lib.types.str; + description = "Command to execute for this runner."; + }; + + healthCheckPort = lib.mkOption { + type = lib.types.port; + description = "Port for the runner's health check server."; + }; + + args = lib.mkOption { + type = with lib.types; listOf str; + default = [ ]; + description = "Additional command-line arguments to pass to the task runner."; + }; + + environment = lib.mkOption { + type = with lib.types; attrsOf str; + default = { }; + description = "Environment variables specific to this task runner."; + }; + }; + } + ) + ); + default = { }; + defaultText = lib.literalExpression '' + { + javascript = { + enable = true; + command = lib.getExe' config.services.n8n.package "n8n-task-runner"; + healthCheckPort = 5681; + }; + python = { + enable = true; + command = lib.getExe' config.services.n8n.package "n8n-task-runner-python"; + healthCheckPort = 5682; + }; + } + ''; + description = "Configuration for individual task runners."; + }; + }; }; config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = anyRunnerEnabled -> cfg.environment.N8N_RUNNERS_AUTH_TOKEN_FILE != null; + message = "services.n8n.environment.N8N_RUNNERS_AUTH_TOKEN_FILE must be set when task runners are enabled."; + } + ]; + systemd.services.n8n = { description = "n8n service"; after = [ "network.target" ]; @@ -144,15 +346,12 @@ in // { HOME = cfg.environment.N8N_USER_FOLDER; } - // lib.optionalAttrs (cfg.customNodes != [ ]) { - N8N_CUSTOM_EXTENSIONS = toString customNodesDir; - } // n8nEnv.fileBasedTransformed; serviceConfig = { Type = "simple"; ExecStart = lib.getExe cfg.package; Restart = "on-failure"; - StateDirectory = "n8n"; + StateDirectory = baseNameOf cfg.environment.N8N_USER_FOLDER; LoadCredential = lib.mapAttrsToList ( varName: secretPath: "${envVarToCredName varName}:${secretPath}" @@ -178,6 +377,62 @@ in }; }; + warnings = lib.optional (runnersCfg.enable && !anyRunnerEnabled) '' + services.n8n.taskRunners.enable is true, but both JavaScript and Python runners are disabled. + Enable at least one runner or disable taskRunners. + ''; + + # We set the defaults here to ease adding attributes + services.n8n.taskRunners.runners = { + javascript = lib.mapAttrs (_: lib.mkDefault) { + enable = true; + command = lib.getExe' cfg.package "n8n-task-runner"; + healthCheckPort = 5681; + }; + python = lib.mapAttrs (_: lib.mkDefault) { + enable = true; + command = lib.getExe' cfg.package "n8n-task-runner-python"; + healthCheckPort = 5682; + }; + }; + + systemd.services.n8n-task-runner = lib.mkIf anyRunnerEnabled { + description = "n8n task runner"; + after = [ "n8n.service" ]; + requires = [ "n8n.service" ]; + wantedBy = [ "multi-user.target" ]; + environment = runnersEnv.regular // runnersEnv.fileBasedTransformed; + serviceConfig = { + Type = "simple"; + ExecStart = "${lib.getExe runnersCfg.launcherPackage} ${lib.concatStringsSep " " runnerTypes}"; + Restart = "on-failure"; + + StateDirectory = runnersStateDir; + + LoadCredential = lib.mapAttrsToList ( + varName: secretPath: "${envVarToCredName varName}:${secretPath}" + ) runnersEnv.fileBased; + + # Hardening + DynamicUser = "true"; + NoNewPrivileges = "yes"; + PrivateTmp = "yes"; + PrivateDevices = "yes"; + DevicePolicy = "closed"; + ProtectSystem = "strict"; + ProtectHome = "read-only"; + ProtectControlGroups = "yes"; + ProtectKernelModules = "yes"; + ProtectKernelTunables = "yes"; + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK"; + RestrictNamespaces = "yes"; + RestrictRealtime = "yes"; + RestrictSUIDSGID = "yes"; + MemoryDenyWriteExecute = "no"; # v8 JIT requires memory segments to be Writable-Executable. + LockPersonality = "yes"; + }; + }; + networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ (lib.toInt cfg.environment.N8N_PORT) ]; }; diff --git a/nixos/modules/services/web-apps/remark42.nix b/nixos/modules/services/web-apps/remark42.nix new file mode 100644 index 000000000000..33909cfef80b --- /dev/null +++ b/nixos/modules/services/web-apps/remark42.nix @@ -0,0 +1,143 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.remark42; + siteList = lib.concatStringsSep "," cfg.sites; +in +{ + options.services.remark42 = { + enable = lib.mkEnableOption "Remark42 commenting server"; + + package = lib.mkPackageOption pkgs "remark42" { }; + + remarkUrl = lib.mkOption { + type = lib.types.str; + example = "https://comments.example.com"; + description = '' + Public URL of this Remark42 instance. This is passed to the backend as + `REMARK_URL` and should match the frontend embed config `host`. + ''; + }; + + sites = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ "remark" ]; + example = [ + "blog" + "docs" + ]; + description = '' + Site IDs served by this instance (passed as `SITE`, comma-separated). + The frontend embed config `site_id` must match one of these values. + ''; + }; + + listenAddress = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + example = "0.0.0.0"; + description = "Bind address (`REMARK_ADDRESS`)."; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 8080; + description = "Listen port (`REMARK_PORT`)."; + }; + + dataDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/remark42"; + description = '' + Working directory for Remark42. Data files are stored here and + automatic backups will be created in this directory by default. + ''; + }; + + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/secrets/remark42.env"; + description = '' + Optional environment file in systemd `EnvironmentFile=` format. + Use this for secrets to avoid storing them in the Nix store. + ''; + }; + + settings = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + example = { + AUTH_ANON = "true"; + }; + description = "Extra environment variables passed to Remark42."; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to open the firewall for `port`."; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.sites != [ ]; + message = "services.remark42.sites must contain at least one site ID."; + } + { + assertion = cfg.environmentFile != null || (cfg.settings ? SECRET); + message = '' + Remark42 requires SECRET. + Provide it via services.remark42.environmentFile (recommended), + or via services.remark42.settings.SECRET (not recommended). + ''; + } + ]; + + users.groups.remark42 = { }; + users.users.remark42 = { + isSystemUser = true; + group = "remark42"; + home = cfg.dataDir; + createHome = true; + description = "Remark42 service user"; + }; + + systemd.services.remark42 = { + description = "Remark42 commenting server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = cfg.settings // { + REMARK_URL = cfg.remarkUrl; + SITE = siteList; + REMARK_ADDRESS = cfg.listenAddress; + REMARK_PORT = toString cfg.port; + }; + + serviceConfig = { + Type = "simple"; + User = "remark42"; + Group = "remark42"; + + WorkingDirectory = cfg.dataDir; + ExecStart = "${cfg.package}/bin/remark42 server"; + + Restart = "on-failure"; + RestartSec = "2s"; + } + // lib.optionalAttrs (cfg.environmentFile != null) { + EnvironmentFile = cfg.environmentFile; + }; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ]; + }; +} diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 467a5d04516f..4b7bb1271392 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -713,7 +713,12 @@ in systemd.managerEnvironment = { # Doesn't contain systemd itself - everything works so it seems to use the compiled-in value for its tools # util-linux is needed for the main fsck utility wrapping the fs-specific ones - PATH = lib.makeBinPath (config.system.fsPackages ++ [ cfg.package.util-linux ]); + PATH = lib.makeBinPath ( + config.system.fsPackages + ++ [ cfg.package.util-linux ] + # systemd-ssh-generator needs sshd in PATH + ++ lib.optional config.services.openssh.enable config.services.openssh.package + ); LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; TZDIR = "/etc/zoneinfo"; # If SYSTEMD_UNIT_PATH ends with an empty component (":"), the usual unit load path will be appended to the contents of the variable diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c8afa8ae52d5..0df0f410b0f4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1391,6 +1391,7 @@ in redlib = runTest ./redlib.nix; redmine = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./redmine.nix { }; refind = runTest ./refind.nix; + remark42 = runTest ./remark42.nix; renovate = runTest ./renovate.nix; replace-dependencies = handleTest ./replace-dependencies { }; reposilite = runTest ./reposilite.nix; diff --git a/nixos/tests/flaresolverr.nix b/nixos/tests/flaresolverr.nix index db25ab117cad..19b95565bcb8 100644 --- a/nixos/tests/flaresolverr.nix +++ b/nixos/tests/flaresolverr.nix @@ -1,7 +1,7 @@ { lib, ... }: { name = "flaresolverr"; - meta.maintainers = [ ]; + meta.maintainers = with lib.maintainers; [ diogotcorreia ]; nodes.machine = { pkgs, ... }: diff --git a/nixos/tests/n8n.nix b/nixos/tests/n8n.nix index d3226e2ed0f4..270f63648904 100644 --- a/nixos/tests/n8n.nix +++ b/nixos/tests/n8n.nix @@ -1,12 +1,18 @@ { lib, pkgs, ... }: let port = 5678; + brokerPort = 5679; webhookUrl = "http://example.com"; secretFile = toString (pkgs.writeText "n8n-encryption-key" "test-encryption-key-12345"); + authTokenFile = toString (pkgs.writeText "n8n-runner-auth-token" "test-runner-auth-token-12345"); in { name = "n8n"; - meta.maintainers = with lib.maintainers; [ k900 ]; + meta.maintainers = with lib.maintainers; [ + k900 + sweenu + gepbird + ]; node.pkgsReadOnly = false; @@ -20,8 +26,26 @@ in WEBHOOK_URL = webhookUrl; N8N_TEMPLATES_ENABLED = false; DB_PING_INTERVAL_SECONDS = 2; - # !!! Don't do this with real keys. The /nix store is world-readable! + # !!! Don't do this with real keys/tokens. The /nix store is world-readable! N8N_ENCRYPTION_KEY_FILE = secretFile; + N8N_RUNNERS_AUTH_TOKEN_FILE = authTokenFile; + }; + taskRunners = { + enable = true; + environment = { + # Common env var for all runners + N8N_RUNNERS_MAX_CONCURRENCY = 10; + }; + runners = { + javascript = { + args = [ "--disallow-code-generation-from-strings" ]; + environment.NODE_FUNCTION_ALLOW_BUILTIN = "*"; + }; + python = { + args = [ "--test-arg" ]; + environment.N8N_RUNNERS_STDLIB_ALLOW = "*"; + }; + }; }; }; }; @@ -48,5 +72,35 @@ in custom_extensions_dir = machine.succeed("grep -oP 'N8N_CUSTOM_EXTENSIONS=\\K[^\"]+' /etc/systemd/system/n8n.service").strip() machine.succeed(f"test -L {custom_extensions_dir}/n8n-nodes-carbonejs") machine.succeed(f"test -f {custom_extensions_dir}/n8n-nodes-carbonejs/package.json") + + # Test task runner integration on n8n service + machine.succeed("grep -qF 'N8N_RUNNERS_MODE=external' /etc/systemd/system/n8n.service") + machine.succeed("grep -qF 'N8N_RUNNERS_BROKER_PORT=${toString brokerPort}' /etc/systemd/system/n8n.service") + machine.succeed("grep -qF 'LoadCredential=n8n_runners_auth_token_file:${authTokenFile}' /etc/systemd/system/n8n.service") + + # Test task runner service + machine.wait_for_unit("n8n-task-runner.service") + machine.succeed("systemctl is-active n8n-task-runner.service") + + # Test that both runner types are enabled + machine.succeed("grep -qF 'javascript python' /etc/systemd/system/n8n-task-runner.service") + + # Test common environment variables are passed to launcher + machine.succeed("grep -qF 'N8N_RUNNERS_MAX_CONCURRENCY=10' /etc/systemd/system/n8n-task-runner.service") + machine.succeed("grep -qF 'N8N_RUNNERS_TASK_BROKER_URI=http://127.0.0.1:${toString brokerPort}' /etc/systemd/system/n8n-task-runner.service") + + # Test auth token is loaded via credentials + machine.succeed("grep -qF 'LoadCredential=n8n_runners_auth_token_file:${authTokenFile}' /etc/systemd/system/n8n-task-runner.service") + + # Test launcher config file + config_path = machine.succeed("grep -oP 'N8N_RUNNERS_CONFIG_PATH=\\K[^[:space:]\"]+' /etc/systemd/system/n8n-task-runner.service").strip() + config = machine.succeed(f"cat {config_path}") + assert "NODE_FUNCTION_ALLOW_BUILTIN" in config, "JavaScript env-override not in config" + assert "N8N_RUNNERS_STDLIB_ALLOW" in config, "Python env-override not in config" + assert "N8N_RUNNERS_MAX_CONCURRENCY" in config, "Common allowed-env not in config" + assert "--disallow-code-generation-from-strings" in config, "JavaScript args not in config" + assert "--test-arg" in config, "Python args not in config" + assert '"health-check-server-port":"5681"' in config, "JavaScript health check port not in config" + assert '"health-check-server-port":"5682"' in config, "Python health check port not in config" ''; } diff --git a/nixos/tests/rancher/multi-node.nix b/nixos/tests/rancher/multi-node.nix index 6e73d7996ecd..2e47db1f18e4 100644 --- a/nixos/tests/rancher/multi-node.nix +++ b/nixos/tests/rancher/multi-node.nix @@ -218,11 +218,6 @@ in # wait for the agent to show up server.wait_until_succeeds("kubectl get node agent") - ${lib.optionalString (rancherDistro == "k3s") '' - for m in machines: - m.succeed("k3s check-config") - ''} - server.succeed("kubectl cluster-info") # Also wait for our service account to show up; it takes a sec server.wait_until_succeeds("kubectl get serviceaccount default") diff --git a/nixos/tests/rancher/single-node.nix b/nixos/tests/rancher/single-node.nix index b59d5486b97c..44009a9b0276 100644 --- a/nixos/tests/rancher/single-node.nix +++ b/nixos/tests/rancher/single-node.nix @@ -84,9 +84,6 @@ in machine.wait_for_unit("${serviceName}") machine.succeed("kubectl cluster-info") machine.fail("sudo -u noprivs kubectl cluster-info") - ${lib.optionalString (rancherDistro == "k3s") '' - machine.succeed("k3s check-config") - ''} # Also wait for our service account to show up; it takes a sec machine.wait_until_succeeds("kubectl get serviceaccount default") diff --git a/nixos/tests/remark42.nix b/nixos/tests/remark42.nix new file mode 100644 index 000000000000..d9f67ae8bcff --- /dev/null +++ b/nixos/tests/remark42.nix @@ -0,0 +1,30 @@ +{ pkgs, ... }: + +{ + name = "remark42"; + + nodes.machine = + { ... }: + { + environment.systemPackages = [ pkgs.curl ]; + + services.remark42 = { + enable = true; + remarkUrl = "http://127.0.0.1:8080"; + sites = [ "remark" ]; + + environmentFile = pkgs.writeText "remark42.env" '' + SECRET=unit-test-secret + ''; + + settings.AUTH_ANON = "true"; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("remark42.service") + machine.wait_for_open_port(8080) + machine.succeed("curl -fsS http://127.0.0.1:8080/web/ | head") + ''; +} diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 07e80cb86abd..595f069202e3 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -841,6 +841,14 @@ in assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: test.mount\n") + # we can start inactive mounts + machine.succeed("systemctl stop test.mount") + out = switch_to_specialisation("${machine}", "addedMount") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: local-fs.target, test.mount\n") # modify the mountpoint's options out = switch_to_specialisation("${machine}", "addedMountOptsModified") assert_lacks(out, "stopping the following units:") @@ -1444,6 +1452,15 @@ in switch_to_specialisation("${machine}", "mount") out = machine.succeed("mount | grep 'on /testmount'") assert_contains(out, "size=1024k") + # We can start inactive mounts + machine.succeed("systemctl stop testmount.mount") + out = switch_to_specialisation("${machine}", "mount") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units") + assert_lacks(out, "restarting the following units:") + assert_lacks(out, "starting the following units:") + assert_contains(out, "the following new units were started: testmount.mount\n") # Changing options reloads the unit out = switch_to_specialisation("${machine}", "mountOptionsModified") assert_lacks(out, "stopping the following units:") diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix index edf9877fcaf6..ddc3268923d0 100644 --- a/pkgs/applications/audio/mopidy/moped.nix +++ b/pkgs/applications/audio/mopidy/moped.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4"; }; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; build-system = [ pythonPackages.setuptools ]; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index d1740db71df6..afade20b517c 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -140,21 +140,6 @@ python3.pkgs.buildPythonApplication rec { pytest-xdist ]); - pytestFlags = [ - # missing translation strings in potfiles - "--deselect=tests/test_po.py::TPOTFILESIN::test_missing" - # require networking - "--deselect=tests/plugin/test_covers.py::test_live_cover_download" - "--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station" - # upstream does actually not enforce source code linting - "--ignore=tests/quality" - # marked as flaky, breaks in sandbox - "--deselect=tests/test_library_file.py::TWatchedFileLibrary::test_watched_adding" - ] - ++ lib.optionals (withXineBackend || !withGstPlugins) [ - "--ignore=tests/plugin/test_replaygain.py" - ]; - env.LC_ALL = "en_US.UTF-8"; preCheck = '' @@ -162,15 +147,32 @@ python3.pkgs.buildPythonApplication rec { export XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS" ''; - checkPhase = '' - runHook preCheck + checkPhase = + let + pytestFlags = [ + # missing translation strings in potfiles + "--deselect=tests/test_po.py::TPOTFILESIN::test_missing" + # require networking + "--deselect=tests/plugin/test_covers.py::test_live_cover_download" + "--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station" + # upstream does actually not enforce source code linting + "--ignore=tests/quality" + # marked as flaky, breaks in sandbox + "--deselect=tests/test_library_file.py::TWatchedFileLibrary::test_watched_adding" + ] + ++ lib.optionals (withXineBackend || !withGstPlugins) [ + "--ignore=tests/plugin/test_replaygain.py" + ]; + in + '' + runHook preCheck - xvfb-run -s '-screen 0 1920x1080x24' \ - dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \ - pytest $pytestFlags + xvfb-run -s '-screen 0 1920x1080x24' \ + dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \ + pytest ${lib.concatStringsSep " " pytestFlags} - runHook postCheck - ''; + runHook postCheck + ''; preFixup = lib.optionalString (kakasi != null) '' gappsWrapperArgs+=(--prefix PATH : ${lib.getBin kakasi}) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 1a76c7b2acbc..47f52d27c486 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { # Find FLTK without requiring an OpenGL library in buildInputs ++ lib.optional (guiModule == "fltk") "-DFLTK_SKIP_OPENGL=ON"; - CXXFLAGS = [ + env.CXXFLAGS = toString [ # GCC 13: error: 'uint8_t' does not name a type "-include cstdint" ]; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 5b019e254e7f..1dfbd0f39559 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { zeromq ]; - CXXFLAGS = [ + env.CXXFLAGS = toString [ "-I${lib.getDev utf8cpp}/include/utf8cpp" "-I${lib.getDev cxx-rs}/include" ]; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 6c97a6f22377..e8f04ad30fc3 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -104,16 +104,13 @@ let packpathDirs.myNeovimPackages = vimPackageInfo.vimPackage; finalPackdir = neovimUtils.packDir packpathDirs; - rcContent = lib.concatStringsSep "\n" ( - [ - providerLuaRc - ] - ++ lib.optional (luaRcContent != "") luaRcContent - ++ lib.optional (neovimRcContent' != "") '' - vim.cmd.source "${writeText "init.vim" neovimRcContent'}" - '' - ++ lib.optionals autoconfigure vimPackageInfo.pluginAdvisedLua - ); + rcContent = '' + ${luaRcContent} + '' + + lib.optionalString (neovimRcContent' != "") '' + vim.cmd.source "${writeText "init.vim" neovimRcContent'}" + '' + + lib.optionalString autoconfigure (lib.concatStringsSep "\n" vimPackageInfo.pluginAdvisedLua); python3Env = lib.warnIf (attrs ? python3Env) @@ -128,7 +125,12 @@ let wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; - generatedWrapperArgs = + generatedWrapperArgs = [ + # vim accepts a limited number of commands so we join all the provider ones + "--add-flags" + ''--cmd "lua ${providerLuaRc}"'' + ] + ++ lib.optionals ( finalAttrs.packpathDirs.myNeovimPackages.start != [ ] @@ -140,17 +142,17 @@ let "--add-flags" ''--cmd "set rtp^=${finalPackdir}"'' ] - ++ lib.optionals finalAttrs.withRuby [ - "--set" - "GEM_HOME" - "${rubyEnv}/${rubyEnv.ruby.gemPath}" - ] - ++ lib.optionals (finalAttrs.runtimeDeps != [ ]) [ - "--suffix" - "PATH" - ":" - (lib.makeBinPath finalAttrs.runtimeDeps) - ]; + ++ lib.optionals finalAttrs.withRuby [ + "--set" + "GEM_HOME" + "${rubyEnv}/${rubyEnv.ruby.gemPath}" + ] + ++ lib.optionals (finalAttrs.runtimeDeps != [ ]) [ + "--suffix" + "PATH" + ":" + (lib.makeBinPath finalAttrs.runtimeDeps) + ]; providerLuaRc = neovimUtils.generateProviderRc { inherit (finalAttrs) @@ -179,7 +181,7 @@ let ++ lib.optionals finalAttrs.wrapRc [ "--set-default" "VIMINIT" - "lua dofile('${writeText "init.lua" finalAttrs.luaRcContent}')" + "lua dofile('${writeText "init.lua" rcContent}')" ] ++ finalAttrs.generatedWrapperArgs; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index b3499fc7ab71..960261585db5 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,12 +12,12 @@ pkgs, }: let - version = "0.0.27-unstable-2026-02-03"; + version = "0.0.27-unstable-2026-02-16"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "d80b7966c0505809e83e408353bbe8cb3394936d"; - hash = "sha256-+IfICc7uBaMV27VJcHlUOxZ2TFQoIHFJPMtoIjjgnZ8="; + rev = "ecc669a87deb2be95db49e53041c05a2d0980fd4"; + hash = "sha256-ciBJS6+knAQSZrtxWvSSADCfBLH07OMG+Rl3jrAz49M="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; 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 8a6faa45e21b..9a32fe550626 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.39"; - hash = "sha256-8OaNOwG9lRHca/hjqGpmcuY+2OGkv7rPSt0faO72vIc="; + version = "2.1.49"; + hash = "sha256-9WwA1TUM/h8kLoZV/ukh/4s3w9DnJ/cVAxypz4jlj6A="; }; postInstall = '' diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e2cda36c9e76..cb9dc2535e19 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1967,8 +1967,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.69.3"; - hash = "sha256-u9f743vZar9FYWXam94wdF6wBZxp6/fikZM0rGXfces="; + version = "6.71.0"; + hash = "sha256-jOD5VFF9g4BNdpm3ZoCi0LPkkBmLZ7vlXVVHgiCGac8="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -2879,18 +2879,7 @@ let }; }; - mads-hartmann.bash-ide-vscode = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "mads-hartmann"; - name = "bash-ide-vscode"; - version = "1.43.0"; - hash = "sha256-IpJCzoYZ+L39HqBts487E00RfVnZhLa9wUYs2FIV9pQ="; - }; - meta = { - license = lib.licenses.mit; - maintainers = [ lib.maintainers.kamadorueda ]; - }; - }; + mads-hartmann.bash-ide-vscode = callPackage ./mads-hartmann.bash-ide-vscode { }; marp-team.marp-vscode = buildVscodeMarketplaceExtension { mktplcRef = { @@ -3044,6 +3033,8 @@ let }; }; + miguelsolorio.fluent-icons = callPackage ./miguelsolorio.fluent-icons { }; + miguelsolorio.min-theme = callPackage ./miguelsolorio.min-theme { }; mikestead.dotenv = buildVscodeMarketplaceExtension { @@ -3070,25 +3061,14 @@ let }; }; - mkhl.direnv = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "mkhl"; - name = "direnv"; - version = "0.17.0"; - hash = "sha256-9sFcfTMeLBGw2ET1snqQ6Uk//D/vcD9AVsZfnUNrWNg="; - }; - meta = { - description = "direnv support for Visual Studio Code"; - license = lib.licenses.bsd0; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=mkhl.direnv"; - maintainers = [ ]; - }; - }; + mkhl.direnv = callPackage ./mkhl.direnv { }; mkhl.shfmt = callPackage ./mkhl.shfmt { }; mongodb.mongodb-vscode = callPackage ./mongodb.mongodb-vscode { }; + motivesoft.vscode-man-page-syntax = callPackage ./motivesoft.vscode-man-page-syntax { }; + moshfeu.compare-folders = buildVscodeMarketplaceExtension { mktplcRef = { name = "compare-folders"; @@ -3606,6 +3586,8 @@ let }; }; + nomicfoundation.hardhat-solidity = callPackage ./nomicfoundation.hardhat-solidity { }; + nonylene.dark-molokai-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "dark-molokai-theme"; diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix index ee22c48e762f..16d6ee92ca09 100644 --- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "basedpyright"; publisher = "detachhead"; - version = "1.37.4"; - hash = "sha256-OkL0p7SfCinyyIlQN/4Rxc1kXFSSe1X3UuhgNQ17ovo="; + version = "1.38.1"; + hash = "sha256-KomVzNgm4CD3AMuJ7myZlU6R4bp97pNlnooYdEepQNo="; }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases"; diff --git a/pkgs/applications/editors/vscode/extensions/mads-hartmann.bash-ide-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mads-hartmann.bash-ide-vscode/default.nix new file mode 100644 index 000000000000..16f7181bfae9 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/mads-hartmann.bash-ide-vscode/default.nix @@ -0,0 +1,32 @@ +{ + lib, + vscode-utils, + jq, + moreutils, + shfmt, + shellcheck, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "mads-hartmann"; + name = "bash-ide-vscode"; + version = "1.43.0"; + hash = "sha256-IpJCzoYZ+L39HqBts487E00RfVnZhLa9wUYs2FIV9pQ="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + jq -e ' + .contributes.configuration.properties."bashIde.shellcheckPath".default = "${lib.getExe shellcheck}" | + .contributes.configuration.properties."bashIde.shfmt.path".default = "${lib.getExe shfmt}" + ' package.json | sponge package.json + ''; + meta = { + license = lib.licenses.mit; + maintainers = [ lib.maintainers.kamadorueda ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/miguelsolorio.fluent-icons/default.nix b/pkgs/applications/editors/vscode/extensions/miguelsolorio.fluent-icons/default.nix new file mode 100644 index 000000000000..90e175ffab11 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/miguelsolorio.fluent-icons/default.nix @@ -0,0 +1,19 @@ +{ lib, vscode-utils }: + +vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { + mktplcRef = { + name = "fluent-icons"; + publisher = "miguelsolorio"; + version = "0.0.19"; + hash = "sha256-OfPSh0SapT+YOfi0cz3ep8hEhgCTHpjs1FfmgAyjN58="; + }; + + meta = { + changelog = "https://github.com/miguelsolorio/vscode-fluent-icons/releases/tag/${finalAttrs.version}"; + description = "Fluent product icons for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=miguelsolorio.fluent-icons"; + homepage = "https://github.com/miguelsolorio/vscode-fluent-icons"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.iamanaws ]; + }; +}) diff --git a/pkgs/applications/editors/vscode/extensions/mkhl.direnv/default.nix b/pkgs/applications/editors/vscode/extensions/mkhl.direnv/default.nix new file mode 100644 index 000000000000..1eb24cbe4ae7 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/mkhl.direnv/default.nix @@ -0,0 +1,30 @@ +{ + lib, + vscode-utils, + jq, + moreutils, + direnv, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "mkhl"; + name = "direnv"; + version = "0.17.0"; + hash = "sha256-9sFcfTMeLBGw2ET1snqQ6Uk//D/vcD9AVsZfnUNrWNg="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + jq -e '.contributes.configuration.properties."direnv.path.executable".default = "${lib.getExe direnv}"' package.json | sponge package.json + ''; + meta = { + description = "direnv support for Visual Studio Code"; + license = lib.licenses.bsd0; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mkhl.direnv"; + maintainers = [ ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/motivesoft.vscode-man-page-syntax/default.nix b/pkgs/applications/editors/vscode/extensions/motivesoft.vscode-man-page-syntax/default.nix new file mode 100644 index 000000000000..afe8cbef3afe --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/motivesoft.vscode-man-page-syntax/default.nix @@ -0,0 +1,19 @@ +{ lib, vscode-utils }: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-man-page-syntax"; + publisher = "motivesoft"; + version = "1.1.4"; + hash = "sha256-Hf6UUXShxhFpOG4aaKqHKoyJ0yqFthzNSVW/JZph43c="; + }; + + meta = { + changelog = "https://github.com/Motivesoft/vscode-man-page-syntax/blob/main/CHANGELOG.md"; + description = "Syntax highlighting support for manpage authoring"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=motivesoft.vscode-man-page-syntax"; + homepage = "https://github.com/Motivesoft/vscode-man-page-syntax"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.iamanaws ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/nomicfoundation.hardhat-solidity/default.nix b/pkgs/applications/editors/vscode/extensions/nomicfoundation.hardhat-solidity/default.nix new file mode 100644 index 000000000000..8437955ff8c8 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/nomicfoundation.hardhat-solidity/default.nix @@ -0,0 +1,19 @@ +{ lib, vscode-utils }: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "hardhat-solidity"; + publisher = "nomicfoundation"; + version = "0.8.26"; + hash = "sha256-AXiGdUjoFl0R41bRJeGc1Gqs/O6foDwqiH2MmkKxhdo="; + }; + + meta = { + changelog = "https://github.com/NomicFoundation/hardhat-vscode/blob/main/client/CHANGELOG.md"; + description = "Solidity and Hardhat support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=nomicfoundation.hardhat-solidity"; + homepage = "https://github.com/NomicFoundation/hardhat-vscode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.iamanaws ]; + }; +} diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh index bb1562c0f3ce..c092ae92c86f 100755 --- a/pkgs/applications/editors/vscode/update-vscode.sh +++ b/pkgs/applications/editors/vscode/update-vscode.sh @@ -1,14 +1,33 @@ #! /usr/bin/env nix-shell #!nix-shell -i bash -p bash curl gawk gnugrep gnused jq nix nix-prefetch nix-prefetch-scripts common-updater-scripts +# Script to automatically fetch latest vscode + set -eou pipefail -latestVersion=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/releases | jq --raw-output 'map(select(.prerelease==false)) | .[].tag_name' | sort -V | tail -n1) +version="${1:-}" + currentVersion=$(nix eval --raw -f . vscode.version) -echo "latest version: $latestVersion" +if [[ -n "$version" ]]; then + latestVersion="$version" +else + latestVersion=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/releases | jq --raw-output 'map(select(.prerelease==false)) | .[].tag_name' | sort -V | tail -n1) + if ! [[ "$latestVersion" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + echo "Error: Invalid version from GitHub API: $latestVersion" + exit 1 + fi +fi + +echo "target version: $latestVersion" echo "current version: $currentVersion" +minVersion=$(printf '%s\n' "$currentVersion" "$latestVersion" | sort -V | head -n1) +if [[ "$minVersion" == "$latestVersion" ]] && [[ "$latestVersion" != "$currentVersion" ]]; then + echo "Error: target version '$latestVersion' is less than current version '$currentVersion'" + exit 1 +fi + if [[ "$latestVersion" == "$currentVersion" ]]; then echo "package is up-to-date" exit 0 @@ -23,4 +42,10 @@ for system in $systems; do done rev=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/git/ref/tags/$latestVersion | jq --raw-output .object.sha) -update-source-version vscode $rev --version-key=rev --source-key=vscodeServer.src --ignore-same-version --ignore-same-hash +vscodeServerHash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url https://update.code.visualstudio.com/commit:$rev/server-linux-x64/stable)) +update-source-version vscode $rev $vscodeServerHash --version-key=rev --source-key=vscodeServer.src --ignore-same-version --ignore-same-hash + +echo "" +echo "Update complete! To test the changes:" +echo " 1. Close any running VS Code instances" +echo " 2. Run: NIXPKGS_ALLOW_UNFREE=1 nix run -f . vscode" diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 2284c514a303..58666db8fea9 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,20 +36,20 @@ let hash = { - x86_64-linux = "sha256-ST5i8gvNtAaBbmcpcg9GJipr8e5d0A0qbdG1P9QViek="; - x86_64-darwin = "sha256-BRGXLasiHZSKsijq02bCa2RbaBc7iC1ZtLe29u4KTH0="; - aarch64-linux = "sha256-7plpHWoi8eYDKQZVV3OCXZJUk8j173M1xpRgTOTsPZ0="; - aarch64-darwin = "sha256-RgfhGjVFmaIAAotTYNPUDrJZ8qj8e4yR9bVfal/Hl6o="; - armv7l-linux = "sha256-Zzz4HsmiWcKiBRE19pGll8BRQy26wbmpuYSi89PDoBo="; + x86_64-linux = "sha256-6zmuYl34QMG3W5h/gCfiW9atK4CpdoQJvttw6y4sy9Q="; + x86_64-darwin = "sha256-0TD+ez+/jc6nZEoZO3j467ouMbmnek6iQQ6SMo57oL0="; + aarch64-linux = "sha256-Cz7mjcm0HcoRK5EA5xi9AHOxbiEOt9JL+Drfd6/tYBw="; + aarch64-darwin = "sha256-8Rfjr8WShCwrJlJapkALNPubPVBpKGZRtHKtTi5Xslc="; + armv7l-linux = "sha256-eUvAvFIP8/5KIIyZFD6VY6RBR97kus6PFb7Inxgh30A="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.109.2"; + version = "1.109.4"; # This is used for VS Code - Remote SSH test - rev = "591199df409fbf59b4b52d5ad4ee0470152a9b31"; + rev = "c3a26841a84f20dfe0850d0a5a9bd01da4f003ea"; in buildVscode { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -82,7 +82,7 @@ buildVscode { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-CbU8VdJETTzpwCpzVgavoeSQMdz3RdwDYJ7wUqs8LJ8="; + hash = "sha256-tv7BPcSnejWzURVB3/HpiyqjjeDxsn4dS/NTonsuEs4="; }; stdenv = stdenvNoCC; }; diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index 4d265d072343..080531a78aa1 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2026-02-09"; + version = "0-unstable-2026-02-16"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "b75abf3f5638df99d69fd9169a1a46bd325c98c0"; - hash = "sha256-KdRQPQiLnuO6RCsBjN7Ta1myrQtabrVf+rqlWypi/bw="; + rev = "2a125b5d28cb2c02cbd2fdb00ce268581ffca05b"; + hash = "sha256-tYB2xcIU7O6BizHSSS4CPQMbLsnlHZKqcx26WypWt1E="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 2c6d63d0e918..7111275add99 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -116,12 +116,18 @@ stdenv.mkDerivation rec { "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; - CMAKE_CXX_FLAGS = toString [ - "-std=c++11" - "-Wno-deprecated-declarations" - "-Wno-unused-result" - ]; - env.CXXFLAGS = "-include cstdint"; # needed at least with gcc13 on aarch64-linux + env = { + CMAKE_CXX_FLAGS = toString [ + "-std=c++11" + "-Wno-deprecated-declarations" + "-Wno-unused-result" + ]; + # needed at least with gcc13 on aarch64-linux + CXXFLAGS = toString [ + "-include" + "cstdint" + ]; + }; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications/RawTherapee.app $out/bin diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 4d3a97ade7dd..ffe3cbc7039e 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { opencl-headers ]; - LIBLEPT_HEADERSDIR = "${leptonica}/include"; + env.LIBLEPT_HEADERSDIR = "${leptonica}/include"; meta = { description = "OCR engine"; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 67d1503b7b78..20daaabfacbb 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -823,7 +823,7 @@ } }, "ungoogled-chromium": { - "version": "145.0.7632.75", + "version": "145.0.7632.109", "deps": { "depot_tools": { "rev": "fb0b652edba70f5c4ac867f3beca9e535f905b4c", @@ -835,16 +835,16 @@ "hash": "sha256-SoXVnpCuNee80N4YdsTEHQd3jZNoHOwKVP6O8a67Ym0=" }, "ungoogled-patches": { - "rev": "145.0.7632.75-1", - "hash": "sha256-DlHNbochbPLRdD3wn1lW9S7x4OLzI+1cAMqjeTYNlA4=" + "rev": "145.0.7632.109-1", + "hash": "sha256-IKt/88bzppdwewWJpim8JL7u6N42o6W2VygvWd+XdVo=" }, "npmHash": "sha256-13sgV/5BD7QvDLBAEmoLN5vongw+S5v5znvZcctxhWc=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "ab0b95409566de9da1ed76e690022f774aec7793", - "hash": "sha256-VvHDqNTXOFeV+QY3K2O9fTFxDzrkz6qKl9hP8nVDMAw=", + "rev": "61eff07de4f37ac1c6969c91034a447ef6cd394d", + "hash": "sha256-b498JyyvsN/+0Gqjdrq+eT1HW54/ayEENRHa1Sw69Xw=", "recompress": true }, "src/third_party/clang-format/script": { @@ -954,8 +954,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "0cf07977de12e7056ab3cbcbf584411e88a1f734", - "hash": "sha256-2OgNRRkpUlkyXAQDSOL4279JAi1C0QbH4MEfNW7WieQ=" + "rev": "d9f5a980bb5a4baeb7d9c1fef89a39789a6cd9fb", + "hash": "sha256-DaNsRQm9bR2lfbiP6vWr2R7KD8mYWOaJ72VJyrUkJvI=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -1079,8 +1079,8 @@ }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "cc75f545bcb65238f74fd291833112305ce6915a", - "hash": "sha256-tOE96dcLmUaAVvOo4oGoUrEFpGSH2yxIBtvXSAVzbK0=" + "rev": "8eb35b80efbc72ffb3aff36c3c1106fe9269df88", + "hash": "sha256-fzcXSU0kaIZVTQx1L5A0Xmn3HEzUE35mzfsU0YEaxw0=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1424,8 +1424,8 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "3c679253a9e17c10be696d345c63636b18b7f925", - "hash": "sha256-OW39m1TVJnSdbeVeTCgSxePTqFTOwWqZIrU/5SEioCc=" + "rev": "004b47619573a582c076679764e07725ace3e497", + "hash": "sha256-PHu3v/ZeEa11/CTGJh8aJjV/lTIVSJ6W7uH2njsHj1w=" }, "src/third_party/perfetto": { "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git", @@ -1639,8 +1639,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "fffd2bdc35a900b4312833885d9d30803580670e", - "hash": "sha256-WqSGzOCvLw6k3t1oNgZV17KY8TVl6j4lJr0NZSVbm4o=" + "rev": "a8b42c8fae7c7f1ce4e32b08ee61c22775185c01", + "hash": "sha256-HZ4JbSoMNVqUrCWoxk0/AxzlcpMgKhe/HJ7DGeTeE9M=" } } } diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json index 2140d0b31c72..3b5747c576ef 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-amd64.tar.gz", - "sha256": "572f512cc0bdf89213d2c532e6182d4a291663bb38a51beb57197bf3fb67dd47" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "3f45abe980b2a6ba9ba8037d9b5a96ab199ce5ddf53c496e99087422d20f0383" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-amd64.tar.zst", - "sha256": "a65a1ed1cf081285d4c32ed3989d95cb0a4d90209e99a8765b65d41b02ea059d" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "924ecfe275f8e9e6c03ab52d78901cf7aa32bf5abd1c4294ac8c41d7860865b6" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm.tar.gz", - "sha256": "ffaee35854e9bfa6f34fae0a7a2ff81e8909cfb2d5a5bd65df89c03a1ceb1b3a" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "fc310a93b1477a9e0e5ad21bc2e1a28dbadd7578923dff594bccc8cf90eb265b" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm.tar.zst", - "sha256": "b92568a2fa8683a5abd29c151d12f2737bf7ac961dfa615a2fa891a66f2d23cf" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "dcef1d1edf592dce46a6a039576c3169d0caf4eec165c6cbcf1dfbe019b1535d" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm64.tar.gz", - "sha256": "cc99b0211110b8dc14c47cde0fe9b93b7e36c2ead64286412a896f6aa8a722cf" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "a5d645989991207bae3cee1597c8c581908291af912766132d99fae3b103918b" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm64.tar.zst", - "sha256": "a7ab99f7e2a6cf6ecc833c8ba67ba154b3ff186c58d574fa4bbda2e70dcb55f7" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "53e747b44505ddcc239c3d175dfa9f23b925c5018e3f878b0be87af876c4c41b" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix index d37386e72219..5f660e667ad4 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.32.11+k3s3"; - k3sCommit = "c9aa1d2889a003715698542826c2af94160ac2e5"; - k3sRepoSha256 = "0fi634dnsghjwnp07h6jhknccqlr9n5g3l34sipc41vvfmn4b0k8"; - k3sVendorHash = "sha256-qbmqzsd8oMQSFCh7HvjDiYds5gLEIGjjcv4EJbgxfJI="; + k3sVersion = "1.32.12+k3s1"; + k3sCommit = "0dc662e80238b7b70d24ad9025a6b64292d14955"; + k3sRepoSha256 = "1pmdbzxp968hxya590qhf4sz3gx6yzpwhcg24hkfsxbm9bclrr0g"; + k3sVendorHash = "sha256-T5GGzudpTTMb2SBC6+spCo7Q/IOr6LfiWb/oWOcCOv8="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.15.0"; @@ -17,5 +17,5 @@ flannelPluginVersion = "v1.9.0-flannel1"; kubeRouterVersion = "v2.6.3-k3s1"; criDockerdVersion = "v0.3.19-k3s2.32"; - helmJobVersion = "v0.9.12-build20251215"; + helmJobVersion = "v0.9.14-build20260210"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json index 8b50bf120d6f..cf8d01656bb8 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-amd64.tar.gz", - "sha256": "130a3b3e51947b7a0beffca422b85c2d3fbe78b1163a0fc069871877021123d3" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "e4c4437580f6a2379963ed78d3a58212932fd4c917fc33c0664ce2a8b89fe389" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-amd64.tar.zst", - "sha256": "b0d7062008fa7fcad9ad7c6b60f74ae1c561927dbb5a4105433f5afbd091361b" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1760ed5f74a27f4ac5ccac4f8cdf88f2cb5c3bc85ec23674bd499ae3efd93617" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm.tar.gz", - "sha256": "6451f4bd29b4ab76dcbfa520d907425976a04e9d5044b969e81fa2dfdc085c20" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "6f1ff82e1845d00692f89ad12cf0b0921ae451bae18e8479334a6200312dd746" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm.tar.zst", - "sha256": "03a165ad40d022616281fbf329bcfa546b9245a9f431d1c362b86faff72d83dd" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "9ae9184211aa4b729cb3c2c659e6442c55bedc7a13720f923898b284b48b87b0" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm64.tar.gz", - "sha256": "6243a503de28c17f4b1b16018237a5008bc99983dc3b3b87ed2a1fe790d9e211" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "a1a00a92559e9a966e882e871163dae7278fea5f20194a37d00cd81fae5dff84" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm64.tar.zst", - "sha256": "74713adf726f6b407330b93e252b7a8e0a85204137c8a6f61b66f681b5761c42" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "df4695448bd8a783cb0e6c91e40aa1abed36b921a121dd1b7f87ff3973faec27" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix index 49a514d8fd05..5bb9348513f4 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.33.7+k3s3"; - k3sCommit = "1288e778af2a8ae295c47c213a3d13abd2969cde"; - k3sRepoSha256 = "07274x0d0q7cn6x5g8d0zbyf67axrmchhngsjsp3plskyr313hcy"; - k3sVendorHash = "sha256-XlZFYEGqoDGFlLJYRJDDoRPWuptFYkZT6axergChFN4="; + k3sVersion = "1.33.8+k3s1"; + k3sCommit = "3552cfc26032474faad53ee617fde32ac0c1a222"; + k3sRepoSha256 = "00dmd3rfghwi8mq33ksiga1nwpk1swqfdwalgspliy5vhfvwgma8"; + k3sVendorHash = "sha256-89C0jv8IUweToIAGyZkaK9o9owm9e8qD4BhJuJw0XVs="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.15.0"; @@ -17,5 +17,5 @@ flannelPluginVersion = "v1.9.0-flannel1"; kubeRouterVersion = "v2.6.3-k3s1"; criDockerdVersion = "v0.3.19-k3s2"; - helmJobVersion = "v0.9.12-build20251215"; + helmJobVersion = "v0.9.14-build20260210"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json index 86024f6eca19..877c9a4f99a7 100644 --- a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-amd64.tar.gz", - "sha256": "696c2e10f511295f5e0e6281a2f22eec60b33962d45bc9117703db1ac887e981" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.4%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "ab5da5904db9b41df478fd59e526b5802902650e83a85674c6b19c51ad38b4a4" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-amd64.tar.zst", - "sha256": "4805a6c4bfdfd20d3ad42bc14c79e00662739aca275e6a37cd8f3a406fae0f0a" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "924ecfe275f8e9e6c03ab52d78901cf7aa32bf5abd1c4294ac8c41d7860865b6" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm.tar.gz", - "sha256": "a4bc850fcf9b73bf0f45d4a1f50bd612e52d77daa5de5020589e7f99e5d1a3e6" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.4%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "2018507533f3aa8c33be81358940d33ec98836f6fbcc463d1c2cfb7f20efb36c" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm.tar.zst", - "sha256": "a1b0ac3a00f409fa51e196ea9db5f2282efff00a282ab797bf49b29453bb1379" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.4%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "2a93722994fb58faa36fa6293a7e454fa1c621eaa0a82e08e996f767e61c0c88" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm64.tar.gz", - "sha256": "ceea4427499fb39be0bff18f840cf80a091f63e88421bc89fdfceb8017aab59b" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.4%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "61a8587016aabce6f1d701c679e1d3050adaa7029c3c6dc309940b5764fb9c38" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm64.tar.zst", - "sha256": "e0cec00a1c19c8c6f7fde7005e325d285f23ff43752cce9ce0796ccb10e9582a" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "df4695448bd8a783cb0e6c91e40aa1abed36b921a121dd1b7f87ff3973faec27" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix index 880c8208b997..be3e6ebefb97 100644 --- a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.34.3+k3s3"; - k3sCommit = "2975fb0973ca47f54b1aa2a8c3a976a779f52349"; - k3sRepoSha256 = "0bvccp573xihzbnkd3n6xldcxpnlwiz9b5p0fw6sxv69m7jaac2f"; - k3sVendorHash = "sha256-R8QXwXmTKsONsbWaedFNDPdYZ82jaQ/T8S9sllqKPjk="; + k3sVersion = "1.34.4+k3s1"; + k3sCommit = "c6017918a65c824ce8d321db15267c8a317cd39d"; + k3sRepoSha256 = "0b19c1jpkndr6859m745xms1j3hn6bjffdgmv3yl05y6finaqgzq"; + k3sVendorHash = "sha256-ZTRcv28rgKslrDRr5y8SnQJpo2ErbURa22l1nv+4QHw="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.15.0"; @@ -17,5 +17,5 @@ flannelPluginVersion = "v1.9.0-flannel1"; kubeRouterVersion = "v2.6.3-k3s1"; criDockerdVersion = "v0.3.19-k3s3"; - helmJobVersion = "v0.9.12-build20251215"; + helmJobVersion = "v0.9.14-build20260210"; } diff --git a/pkgs/applications/networking/cluster/rke2/builder.nix b/pkgs/applications/networking/cluster/rke2/builder.nix index 68fe28b50075..bb2381c8f9a0 100644 --- a/pkgs/applications/networking/cluster/rke2/builder.nix +++ b/pkgs/applications/networking/cluster/rke2/builder.nix @@ -75,7 +75,7 @@ buildGoModule (finalAttrs: { ]; # Passing boringcrypto to GOEXPERIMENT variable to build with goboring library - GOEXPERIMENT = "boringcrypto"; + env.GOEXPERIMENT = "boringcrypto"; # https://github.com/rancher/rke2/blob/104ddbf3de65ab5490aedff36df2332d503d90fe/scripts/build-binary#L27-L39 ldflags = diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0a1eca0e16c4..2979b17271c4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -54,11 +54,11 @@ "vendorHash": "sha256-Hvk2jckla1LcMankcdUTct8Kea0OznyxDxTJ+UrJHy0=" }, "aminueza_minio": { - "hash": "sha256-rgrX08mO99cl95YTW0rqFH/jJhyxMr/DSIEL5Wg9R9s=", + "hash": "sha256-46ymgizu1ita4valeUvbCZcBTGHk9n9alUYkr9TG9iI=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.17.0", + "rev": "v3.20.0", "spdx": "AGPL-3.0", "vendorHash": "sha256-AO6reoqxDcPAMXKlqjJLGmhsgFrekaQXjMPm9fxhpFA=" }, @@ -274,13 +274,13 @@ "vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI=" }, "datadog_datadog": { - "hash": "sha256-cK3vueSObBu8m8hszIGxEa7l8+vebkZgSRtcuocnJxY=", + "hash": "sha256-at4p1fQpfA4F6H85jcvhqsZZTrEicF9//3JzhQSEp3s=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.88.0", + "rev": "v3.89.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-WvN5Z7P2rcyzuOr6ySUC1j9RMPs+BgTQd3iy68QsCqk=" + "vendorHash": "sha256-50iJI5K5VdZ4VkiTQ2g4lwEfdjOz7CdRcMhc0NSIeBA=" }, "datadrivers_nexus": { "hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=", @@ -706,13 +706,13 @@ "vendorHash": null }, "hetznercloud_hcloud": { - "hash": "sha256-ek9MvDan1LKlVa0XxqRfb2JvJvEtEQ0C+BOSR2ACYcE=", + "hash": "sha256-7c6sOPLH38D2sJsS9VoFl9LkZ0CNp5bFFyrVzPnXPYs=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.60.0", + "rev": "v1.60.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-baqt8ZBmPQpKZIb/7tb44p7xf8azBawks4mQxtAqIpc=" + "vendorHash": "sha256-rd7QuDdq7xRMyaQIDyXY1DI2Tt/wy3oXan/nE0HIyT0=" }, "huaweicloud_huaweicloud": { "hash": "sha256-vDGr0g/yhLTr+oyXxbM7v2TyecYRAvx40crCi3ug5Lk=", @@ -751,11 +751,11 @@ "vendorHash": null }, "integrations_github": { - "hash": "sha256-qf6iGCGE5Hod5PEasxqjdMij+4DS5vDvaiPBKkeQOwU=", + "hash": "sha256-tygj+fCzKhipsyXVMtUxjEy/TvIAGFBPYHwlJJulAVI=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.11.0", + "rev": "v6.11.1", "spdx": "MIT", "vendorHash": null }, @@ -778,13 +778,13 @@ "vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg=" }, "jianyuan_sentry": { - "hash": "sha256-AH7Ef3G1C0jQX4Wprc8J9rP34u+xifzhclqtmVCQmAI=", + "hash": "sha256-J8hINbcBEdukkSLw+nKwbln9EfNh4sIb5F7FPLmXLE4=", "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", "repo": "terraform-provider-sentry", - "rev": "v0.14.8", + "rev": "v0.14.9", "spdx": "MIT", - "vendorHash": "sha256-owQrunW0X87DVdA/A/Pl5MWsVfx8kPL1L/xJYWS5ptI=" + "vendorHash": "sha256-ILb6eUVt961ZBcEVKT324OXMxF/d+Wx9tzA3PDTe5iU=" }, "joneshf_openwrt": { "hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=", @@ -968,13 +968,13 @@ "vendorHash": "sha256-fh0QEWSwdoWKED/39OBT5kMADbsUDvhJUYMfWR9P5os=" }, "ns1-terraform_ns1": { - "hash": "sha256-pKdybFzTuuD6D76Uhuz+fLN+EmpDxUwjIWXYK6DRKOY=", + "hash": "sha256-MX/Wd9Lztjn7uwDzJjs4bsSSp0PFzUgsu4jXke9jHL8=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.8.0", + "rev": "v2.8.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-QEzQogxM44Yc2iH6r+AtTYhv0p/T7jDwO5axNQE2sMY=" + "vendorHash": "sha256-iFya3JEM2XklfunQq0Mbdar/nyWOQZHfYWa2NWBxzTM=" }, "numtide_linuxbox": { "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=", @@ -1076,11 +1076,11 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "pagerduty_pagerduty": { - "hash": "sha256-dQaXwuT7BsgaC5PeFMqqQ1607E2/BYTA18RL8YycvNw=", + "hash": "sha256-CH0rAsJKP6AogzYJUOHsdGln/DnwyP9WAlOgUEb3ahA=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.30.9", + "rev": "v3.31.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1130,11 +1130,11 @@ "vendorHash": "sha256-33NOGIvqLpgndG68GxAeoiISjWV7ApR4jmvqyZHjPKo=" }, "rootlyhq_rootly": { - "hash": "sha256-8Y+S+uHrEmVrF95KazomTIVaj6GcwFNN050Jfx2ofpw=", + "hash": "sha256-iNWJBv9idm0BUIeP7HScQP8MtWdyJCUF4p1EdRvgE98=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v5.6.0", + "rev": "v5.7.0", "spdx": "MPL-2.0", "vendorHash": "sha256-UyfCHBSdGKCulExhUdYfvEab8cVjaHGDfgslRS0d1Co=" }, @@ -1229,13 +1229,13 @@ "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8=" }, "spacelift-io_spacelift": { - "hash": "sha256-qQ8/y1KWHIc6WHEVXfiP6LKC44N8uK47x2Lv7TAMedE=", + "hash": "sha256-W05b6v8OEPLRUzh0w5Wu7bySuaCkrD3Rl9CkomgEyEE=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.43.0", + "rev": "v1.44.0", "spdx": "MIT", - "vendorHash": "sha256-XNPXjqrrTIC3WrpvDBP7veAYgmYws9FdF4W3j6ewRPk=" + "vendorHash": "sha256-E9e4+n12uSc12F428D8Oqe0iquTMywAY4DYWhSC+hmk=" }, "splunk-terraform_signalfx": { "hash": "sha256-dPhHzWOkNgIxlHSZm88zKkrgaXaXJ6RFdYeqX5zYSfU=", @@ -1499,12 +1499,12 @@ "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc=" }, "yandex-cloud_yandex": { - "hash": "sha256-f/dCdlJfhEWzN+nXKVy9y1zy3SAULuyJFs/XzxoU0Xs=", + "hash": "sha256-dD78ZHMDhSRHzkOs0fIxjZmNCHvWTDIKuVv68Tl7sTY=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.185.0", + "rev": "v0.187.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NxFEJxm+6HCtQxSQF65LB+4lsknGSdACokUyBVAJvn0=" + "vendorHash": "sha256-ZYVGqcviq7auN2JwqHEFWiFPvy+PkaYV7MamNKF8Frc=" } } diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 03be31854dbc..09aaac6e9ad1 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - LC_ALL = "en_US.utf8"; + env.LC_ALL = "en_US.utf8"; meta = { homepage = "https://profanity-im.github.io"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix index 7287a750999c..ca7dfdebfd04 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix @@ -1,1193 +1,1193 @@ { - version = "140.7.1esr"; + version = "140.7.2esr"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/af/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/af/thunderbird-140.7.2esr.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "5b7dec6f98948f31015700246fd22e81c4e7f3b273b139b5ac4fccbfbe99d8cb"; + sha256 = "b681212fbde3539e71154eea3b39b314456006e22c241de3eb30c88fb7ce9cb7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/ar/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/ar/thunderbird-140.7.2esr.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "4f9e4d98af53a7453db7529ae4d77ecb42f45c3d1b0a890c221e2b3cdde7727b"; + sha256 = "c0b9c68f0c543fc0e397ed0c1ce9355c5a4dbe6b860a25c03e7c8a9b5ead7edc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/ast/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/ast/thunderbird-140.7.2esr.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "bca20ece82117097b828258bac2a5d9367bab7db64b7646dbdc0c8d3ee33a2ac"; + sha256 = "163c5d00d3ede4aca99b430f5b679952e020c4aaf211f0999ce1951108299b9e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/be/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/be/thunderbird-140.7.2esr.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a1baf718c198ae0b7e010a93a3fc37599676ab8349b5add712187c9e6cf349e3"; + sha256 = "383bc91283c2cedb3d417f0cd46a932ae7e19637aafbc5dac278e2d3181f80d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/bg/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/bg/thunderbird-140.7.2esr.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "118a9b06d92f17e911084ae004c46bf1b12bf424029406e25563c21e0483929a"; + sha256 = "eb7b3c3ae2773f50501c8f8a72663c2a6aca57c89ac2c016aeeb1528ac55df61"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/br/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/br/thunderbird-140.7.2esr.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "40a6fe676265efb0f6ecc6e80892d86ff428a9237db38e21f822a32212754424"; + sha256 = "94ff916988ce05085b0a1bbe00a2aacf06265133f8fec4c34021277c5f6fb547"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/ca/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/ca/thunderbird-140.7.2esr.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "bc57c32fdb91e55aad80842cf7c58265ffbd1f17cee9df56f432dccab23b3777"; + sha256 = "277dbeb28619263d583a6d83e9c7a86f6f794608828f033b4486ccee3eedc3f3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/cak/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/cak/thunderbird-140.7.2esr.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "ec2ac6515bdab5650ffbf2cb98398e3d609fcaf76edeee743a684e6c4235b51b"; + sha256 = "f9a9cecc2849c1bbe8e7e7c2a9cc2066aa4f7df244f5bc926c9d3854aab3002b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/cs/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/cs/thunderbird-140.7.2esr.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "145c56d72c7739389e8d54e01a748f1867e3cd1c01b0ddd55e2c13104ed6be63"; + sha256 = "4fc1377d662510cad3f586f3c6cf0451f99f7236acd574c4dc4b7ce2a2b9f8ea"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/cy/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/cy/thunderbird-140.7.2esr.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8225ef1b3f5f362f2762481720b538dc17202cc13722bcb81b5f6d89a81874e7"; + sha256 = "9d7e2750fb1839e15f09ae25dba323e726f717b8f882c3558f2854fb4872bcf2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/da/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/da/thunderbird-140.7.2esr.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "71703f868f51a052db8702a7b7c8960254e53939be2ed27a15ed7b1962512b9b"; + sha256 = "ef531943cfd0f62bc41d1bd5d89ae99e83beb0877bd750df565ba051fbfe8776"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/de/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/de/thunderbird-140.7.2esr.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "614f5846d8a409627e6da87fd5d83899e895ea3837c5869c7fa73ce145d046dd"; + sha256 = "ee7468ad052f8c5084bc26626c1dcee00506d4d32ba3f318d88c2cd08babb43c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/dsb/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/dsb/thunderbird-140.7.2esr.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "199b1006f1016c79cad9f7cfe8dcd730b2c344630a588e718bb8261e92d7df6f"; + sha256 = "40b937a3342eebb13863b3394c490bff3b2e7656ccc4c176680436830be6a400"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/el/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/el/thunderbird-140.7.2esr.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "04fd18329b3d83cefb6d23e171c2818df0ff36119246926df7ea02998e41ab38"; + sha256 = "61c78963056e08169bf3797f785b4d222cd43b4388119c0930ebd9b954bba42d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/en-CA/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/en-CA/thunderbird-140.7.2esr.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "8614a7b486806fb5509caf49ab1db91dc4c973cd4b15704940a30a203b154bb1"; + sha256 = "ab0624aa07a01a69c9b74f9f4a90b01b2f0727b5a20fbcfb29a3e3a9bb1aafbd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/en-GB/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/en-GB/thunderbird-140.7.2esr.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "005a596fdb4ed7a022291b00acf98dcfee87916cf114f9538e44079eb429df5f"; + sha256 = "a9ee0997ffefc128de123a288ec525e3f0973cee05b61f99bb6646972ca29912"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/en-US/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/en-US/thunderbird-140.7.2esr.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "204cbb7a808f1f53f39089002b8962fce89ceb523c801ed359925340d907b9bc"; + sha256 = "bf0f83e49108c65476744b4fe6e015e739780b9087852a0ea18682070f945c1a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/es-AR/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/es-AR/thunderbird-140.7.2esr.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0f1c52d9f567d927c8f76de8aae20bb76a29ec35f461d92d5d96973bfc0c14b2"; + sha256 = "5927f6e9bf9f7c40474fb22e63d98e9627c566806c8faff63b00756115d3bea5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/es-ES/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/es-ES/thunderbird-140.7.2esr.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "14109fae21d8e6b13e5914bde4314dacda77b6de10319d8a130c6a5566e0b673"; + sha256 = "36b8c1ffac8852967fdb01b1b842d2491e612ee1e3c7aa52f122df2209d23877"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/es-MX/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/es-MX/thunderbird-140.7.2esr.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e63e10993d525ca8f45f5ac4cc0afc1b0f619a52d128229c36e19ff251b0009d"; + sha256 = "b0dbeb662a6ac8205b01e3d8445903e386d49c2a72782ba7d0f20721d423c909"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/et/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/et/thunderbird-140.7.2esr.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "4bf00088fc58723754872ba6daa17b497add794798d7917489fb497500425ceb"; + sha256 = "ada633e20406001af4bab6c5e61e41a758e709fb2f1263246ffcf62ef511ad74"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/eu/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/eu/thunderbird-140.7.2esr.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "4c0c7adeaa22b6224cf447712c5eac9ce090961c6696af0c7275b556630a8228"; + sha256 = "4445bfea4a725b51c874f1884f5972b676cf907d4c4df4ded64665c45ac522af"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/fi/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/fi/thunderbird-140.7.2esr.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "42f8d7bc6c6a467177a9f0ae7d0fc8cd77c429396634b427e5d526c68593f55e"; + sha256 = "6b2cde0c56328eb2d079798f22e18751655af480c9cd5461fd50274ad78b1eca"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/fr/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/fr/thunderbird-140.7.2esr.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6ad635b0050615f6d06709aaa9d82f0f9ba7dc533770a94169d890f65a8d3175"; + sha256 = "2b818b412155e71c4baeafd2faeb9b6177706103ac917718c284962da0d61d8f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/fy-NL/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/fy-NL/thunderbird-140.7.2esr.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "d7975b86c83e23e0564bc7b5f16497aadc3e04513b6e7d5055e99917619599c5"; + sha256 = "7fafb581b46373143c7a6087567a50094f822d807de04b140ab8065291c1d691"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/ga-IE/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/ga-IE/thunderbird-140.7.2esr.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "28a2a62e20ca40a996f9f61536d03f2d98c1d1070280494d6b762146088d32fa"; + sha256 = "13c74e978fd847539df0532c8697c7e926b022aa83392ee1a8704e4eef162a7a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/gd/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/gd/thunderbird-140.7.2esr.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "276bbcb4631383ff1c6257821366195084ba572dcfc5b8d4534c74bde2e56072"; + sha256 = "4d646dd557b6ffd4d4f9a46e7f8feb880350f5ccfb75af5b92ab5f561cf2aa6a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/gl/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/gl/thunderbird-140.7.2esr.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "7f00925909c5be3944ac5002f1375576c63dd2d8f4b75d38d60b2c689592861a"; + sha256 = "ded50fa774cda7079694d64c81158c8b3fa8b8db0764b445af206b521d2bb285"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/he/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/he/thunderbird-140.7.2esr.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "fbad00373533da065ef9514b43116a56aadf290f481b67ed386075e9e3ea2b5e"; + sha256 = "2178b027d334dec1539ecfde2953854547c8de78c3244c61b3ae427dcde43eae"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/hr/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/hr/thunderbird-140.7.2esr.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "17b10303dcd3dc0d7c37418d12cab0c2f0a87e9b6d47ffe04c8eeb603448b63b"; + sha256 = "8d2518748e5b73b39ed7792a3d314288cc336807f1c43cab8ea050e9f76571a6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/hsb/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/hsb/thunderbird-140.7.2esr.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "9b77c642bff76d8d98a42d0cd20d2d655497719900bd471d041125e67da6bda2"; + sha256 = "2073cb4eaa4fc9d5e0f72df3898da03f6c42fa01f7c9a98e66c6391ba1409ac3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/hu/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/hu/thunderbird-140.7.2esr.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "33950744e99e11775eeeb303ed243dc1fd6a56ce76222ca0fb6057afac6ec368"; + sha256 = "e4a2eb1395c5afa408adf4514346ae7b9fb8fae4182a7be7b8a3e17fb9cafc9f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/hy-AM/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/hy-AM/thunderbird-140.7.2esr.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "657c6167cf2fec5dac4b80e27410ca5e7c1d46f8ee975de186712dbf69487f2f"; + sha256 = "c9edab2f4b4bbc832fd777d2b070f6566edff11275262190972dd56d17a581fc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/id/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/id/thunderbird-140.7.2esr.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "f57591c6b6f228b02a68469545bed0e9d489a231cf45d60ced042b287851e365"; + sha256 = "7822e1769e8fe4ccca505efa2e397df7d743d254f30e1c0413464e2d6d167a22"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/is/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/is/thunderbird-140.7.2esr.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "afd67151da9dbb1568999f3a0e576273950eca6f820e1bdfef715560efdd0a4b"; + sha256 = "c3133459e1226c49637d7100d0417c7754aa26ec213dc02fedeb0019a5ed9b4e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/it/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/it/thunderbird-140.7.2esr.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "0a7f1657b61541c6b67a4953e0654b67241cadcf4258c6df5460668cc1086a62"; + sha256 = "8171967cb135e57e80428b8f269cffb2d81aad1784eacdf216b06e11f7dad19a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/ja/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/ja/thunderbird-140.7.2esr.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ffdcf569033285c0240fb339913947b65ad0e3692fa10c717b7ca8c039848c6e"; + sha256 = "26a432b8593c305e7fd6e223ffc9d039c5cd59cf6b72d33c0136016710aa1f6c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/ka/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/ka/thunderbird-140.7.2esr.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "e6e01244a2db4ed4c3dc9b6d2ac23b4b604b0f6f93286db73ae8e423e94f2602"; + sha256 = "c725a4f2c21994f39639b1a0faf84de7afb83e11209f7c934d9ab23489ec68b5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/kab/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/kab/thunderbird-140.7.2esr.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d19b11a1342473e64bad99e37c406fa0fdafe3c9d2b7839f9f0be58c1fb6f2e3"; + sha256 = "c7ba39e989dac1a5e08aad77a62e8039409f7dd6ecbd2a4525b2cbcafc82dfd8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/kk/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/kk/thunderbird-140.7.2esr.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "373a35ee62eef078a0dcbccbf54650010201df5417e607f54093ed1422fbcedb"; + sha256 = "103211b0f627fbc2868064746f29c9f97ffb0d362e6e0bdb75db7cfa72e7feec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/ko/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/ko/thunderbird-140.7.2esr.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "51187b64f63c1c07238f4e130ccf64fab1a11c6514ef247bed17a398724b6822"; + sha256 = "4e5859c8e7528b3c051aab6fecf50ec365fb0fcc30f5009a2c384852a7238442"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/lt/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/lt/thunderbird-140.7.2esr.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "28ae9e88a8cb34c8032386e47b1d8d606845e16a0824fe30d2ff0d7e6dad0d87"; + sha256 = "876b4d4532248338b73afa7fd524ab436d2e442b8b79b2c12beb72c2b3dc1937"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/lv/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/lv/thunderbird-140.7.2esr.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "5d803d462b439483cf8a2e58ab423a700032135a869dfb89848c586d447322c3"; + sha256 = "b4818f4ccfdda2c19aa3abbc210a36995d2ad3f14596da4f1a059aad51cde5fc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/ms/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/ms/thunderbird-140.7.2esr.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9291cb1c7cbd951c3105a5c3dc49a2e2b4b3acf0a3b0239d0106b4d9b6e03e8d"; + sha256 = "a35216a334ed417540f7e9ad0194643465c867e6f376fe3ae8fc2f75e954097d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/nb-NO/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/nb-NO/thunderbird-140.7.2esr.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "8daecbe961ae7091a18f224512319a5e5bbd3aa1fe80d0c72bfb3f46b49327b1"; + sha256 = "6a8d815c6e5e3ace65caa1e1feaa46d9181aa37aa341c2fe9e0c6992267cfc75"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/nl/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/nl/thunderbird-140.7.2esr.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1796f18da45ee925d5d24e20990d0517eb250fb009c85ced7479480e29dd224f"; + sha256 = "546fa9c52cbe20a943a99c2865c070e0c8d2066d0ebbc475d5d910858f1485be"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/nn-NO/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/nn-NO/thunderbird-140.7.2esr.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "22fe200430f9f63b82f5aa1529e28309a3fb8df305cfe85a7d4592cee3dbdef8"; + sha256 = "849c3cd5cd36602f618e309ea8fe0223f1e3479d1480f8b8b8e4caca6745cbcc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/pa-IN/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/pa-IN/thunderbird-140.7.2esr.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "55b1a622f7711f22993ed9196eb8888b58c8b14746452332cc005de08ed798db"; + sha256 = "90d9aaa687228d3875453f1bedb9813fa61081d1db7270a94fc4a010eeeb8809"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/pl/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/pl/thunderbird-140.7.2esr.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9894ae922d592709b223ba0f907966af756e226cfd1211a68103135cba9ab860"; + sha256 = "5ac18c42275db09e3837fd7eda8cb738ef9ac56bb1618322599c5d5211ad01df"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/pt-BR/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/pt-BR/thunderbird-140.7.2esr.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "aeb9cecca149d68c58140cb66532701a352cc0b64fbc9e7c5d427ccdf0cb9eab"; + sha256 = "413f9126f35cff3490f3d75dae5458d53548a7f10480bf70cff22cc06a859a01"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/pt-PT/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/pt-PT/thunderbird-140.7.2esr.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "89f7f5f1425b49f37c01fbbbe277de3730bed69e587b17ff8969e27b430d9ea6"; + sha256 = "66a922b521a6f6fc28e5732d5ac45f4e58c25b001cffeac254f84b91fae233b3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/rm/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/rm/thunderbird-140.7.2esr.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "687d09ce9b1896e5ee4b3369c607f4a929fce7ba10c555711c9f6e9638d76960"; + sha256 = "c438ced7d426f8530802d46d16e200cf6b9a09210220781043b8bb767cc6cf7c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/ro/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/ro/thunderbird-140.7.2esr.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "48f263eee3e58456faae628963dcc552964dba9b699d7760f52f55fec8205dbb"; + sha256 = "b6e263b5c0741d335b421a5ced074aa38b023e85e32f6eee1eee206f0c53e6cf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/ru/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/ru/thunderbird-140.7.2esr.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "823258dbaf6ae5c7f0341e6ae7a466c8b6317fbf705445fcc37490e493c11c92"; + sha256 = "da30b4ccbcac2e084984ce97aefcd2b7eea2985b90a842f588afde4def103a2c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/sk/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/sk/thunderbird-140.7.2esr.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1770eac1424b8947d83bd2b7c6f40e025edd46b83380f47aabc4f576dc9eef6e"; + sha256 = "1aad729808dae89cce92ac9e14edc75d81526bd8903b9fb75b4239936599b022"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/sl/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/sl/thunderbird-140.7.2esr.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a76b6a79c3e096d58e6a2470939cfa6ddbebba14a9fbc882c9937dd75fd27082"; + sha256 = "982ffb5bcc26f49a6e896711e7202c4d4bcf974806de20b4e6a674e3f846a30d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/sq/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/sq/thunderbird-140.7.2esr.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "78a9560247a79521711abad8e070fbacc72e8e210d90211a79ee08cdad532f28"; + sha256 = "bb2bfabb817a3cbe7f02c51810d227169abaa020f5128538b13389ef6ef93f06"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/sr/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/sr/thunderbird-140.7.2esr.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "79b7eddb1c1d8f0ad19b4fac0af8a4f30de201475a52451790769ee2162f08bf"; + sha256 = "8f62a7822a422155c369edcfd5c27be8a19223a3c37912c0d91fab9b9eaf47b8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/sv-SE/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/sv-SE/thunderbird-140.7.2esr.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "eebabdbf022e3644357d1bceb90b5b1199728f3991aaea3a23c30054d96ccecb"; + sha256 = "f781ec3fc7ca213498f258ac0210b162f24f8e8d3d27a0ff1e70a4318f355540"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/th/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/th/thunderbird-140.7.2esr.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "e1effd639dace7d05ce6577077bdbf1201c26634b2b56592704d8f76aa8d9d9a"; + sha256 = "54267a44d8cbe21b247c80206d0e9fcf92882a331dfa5d4bed34d87a9845145f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/tr/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/tr/thunderbird-140.7.2esr.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "662a9972da39227d8ed8d664633385fab03e96b28c841bf495a51b4be82ab884"; + sha256 = "00de2de3e34a653e2b9f8d2094c952f1559a53df02e7f75ae50e327ecdfa8982"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/uk/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/uk/thunderbird-140.7.2esr.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "9b8036e3ff59abd78533ba7b59f16a5bfb232e567b293ef1c3eee8d772ef47e8"; + sha256 = "7dfca3cf5bf992fc5e680f8c40a82233b243f7128fc840f216a6ff7c03142f80"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/uz/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/uz/thunderbird-140.7.2esr.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "feda8cfa74fc9a435fc68bede9e70028d1cea77a43ed7588c3a6ffbfce22f614"; + sha256 = "4a220b6309d9be5cb1bb2980cd9a4daad34a4188a79e3e5392588bcbf892f086"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/vi/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/vi/thunderbird-140.7.2esr.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d7898a741bb20869eac084675cb102708804e8597bde42dd4d6668710fbe33ff"; + sha256 = "06fa65623fb8ed6c679ce7d9b10be2899f520c32f09943b7d102ddc1e48c4078"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/zh-CN/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/zh-CN/thunderbird-140.7.2esr.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "cc817e9992a22fbd58e38e7fe4415e167a4acb4d7f5a48f260ebc22e0eaabbd7"; + sha256 = "8091b54666e2097665c0c0db8138ad41a71e93be67833b935a3d800170302408"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-x86_64/zh-TW/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-x86_64/zh-TW/thunderbird-140.7.2esr.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "362c7b898c52c7c7b3fe8a8d1a6ccbc3a3d207d57d94268cc0c0b6aa61bb0b57"; + sha256 = "b30a563e48160bf18a804ab3613599cc9636d00bafa9c5299f68b8b5e0ae6c8b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/af/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/af/thunderbird-140.7.2esr.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "5299d8b602892f133d39b638c07431821a68f87f4feec5df104a1f231de71ff1"; + sha256 = "531934aa55945a01525defc8c6b26a5f880c90cea55dda64ebfa1f9354de17b1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/ar/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/ar/thunderbird-140.7.2esr.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "16db793bcec6b1348943b4526d718189d84566106a95b99f89ec269f6497f626"; + sha256 = "70d062e68e0f3b17a19243ecbb1ff46f156b7b65c81693abe598b3b3091f10aa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/ast/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/ast/thunderbird-140.7.2esr.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "e1dc3eefd77408e8e4c1bab0d6d6bf6a8a0290520ad259e6fd7a1a76ded17865"; + sha256 = "c042ee9d6d1203ae499e1bf49d2198583635b62352b90e0d26f7d9804f4a9891"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/be/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/be/thunderbird-140.7.2esr.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "78e12295c3e1c66cf3759459b27467d2f0fc7107ecdf255b133b550526af29ae"; + sha256 = "412255a2711de100b2543e565676bc73877bb9c441cbcd7c4000088d7eb7c382"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/bg/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/bg/thunderbird-140.7.2esr.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "c94d4217a282dc6106bc4318560c1a2c52d143e8a8365f984a4204f742a7bddb"; + sha256 = "25135c11b570afa50cf62a4b379bcccb46ed4ca69c79e15b02efe33a882cad25"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/br/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/br/thunderbird-140.7.2esr.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "1ec9e9c90616cd043b562f894f75b99c6931ad68526117871ee4788bcb5c2d43"; + sha256 = "98019686e07b38b1db300567df07aaacb2cfd807e1c67b531cd64095ab05ca8f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/ca/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/ca/thunderbird-140.7.2esr.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "acd741ad9c1ae07b897b887d40247313a8b85f2a97b85126c8acb000e206c8d5"; + sha256 = "8eda9bbd7de1e7fd775f2df9e1d4bd4c63e8d92f230182e1fa3f6cb4fa52ca6b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/cak/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/cak/thunderbird-140.7.2esr.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "4b231b7575f544d25faf6a4faa53ec0b2217c852211f652bf9994872bbe3daa8"; + sha256 = "d07d8fdb84934286636347622cce33b8d3c58880a56306a52ff091ee623de3d2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/cs/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/cs/thunderbird-140.7.2esr.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "9fb9f17599513f76ac0a3a7a7c07c5a896c7cb1ba808b8612f02b7e8aedd6d9a"; + sha256 = "c7d7ef8d7a53c3596b20b43dc11a9238f3c7faeb5bbfe4740e1ff3c08d3b3c7a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/cy/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/cy/thunderbird-140.7.2esr.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "99a0eb5a9ffe3ba9514fb48ce48d7790cee7be0594cf2e5e460276b99a7cca00"; + sha256 = "9cdf10a70a67f9ab977b121a73fbdc58b6a91cc32bfd812c09b724ba9ee0c254"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/da/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/da/thunderbird-140.7.2esr.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "f375f1cb9a86b9de8683936c76ae7737b5991e06d9a48dd0041eaa8b65400e59"; + sha256 = "ad0a5db3d271faa09a783023cab5182a0bd141b34f81fda4a2db0769404a66c3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/de/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/de/thunderbird-140.7.2esr.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "8c6b4daa3313e59484889409e92b93c1784a7127c4a1b70a597884e9c2351202"; + sha256 = "eefe231166f05f32dbde725201c32daf92d8116223e5addfc6b43914c765cc37"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/dsb/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/dsb/thunderbird-140.7.2esr.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "fc068af72beb25c9867109f89a53457d1bbcb140f3ae3dd998f46c2f33d3971e"; + sha256 = "9ab915ae10f05f60b4fbd7b29cfd57c3fb85469f9c03d213e9e290df00f782ea"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/el/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/el/thunderbird-140.7.2esr.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "d3f8b78811e91a3376bf749f699533e396c0daa6f22a5ef3574ae5c49ec4ab8e"; + sha256 = "57c4574c2ccd0f111bce17e792558c492aa147956fd20f877c37bba6dd999735"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/en-CA/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/en-CA/thunderbird-140.7.2esr.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "66296374395d3306426f044d7db6bf105c2656cd5d90c72445f3bd2d0a58f6d9"; + sha256 = "10d9beef63ad216dd8e9cc75e2f362be854269013bb41155ab2a30c33c709a65"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/en-GB/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/en-GB/thunderbird-140.7.2esr.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "33a137c6b304f60db90d948903e78f44cc046698593514b7a84c2ea25ca7d6f9"; + sha256 = "0470d8514b82ae2b041a02d3a317d1122bc8cc19a57e75bc2dc34b804db4e467"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/en-US/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/en-US/thunderbird-140.7.2esr.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "2b3b5fd0ece74d27df1e284900bbd78a21cea2e04e1bf7ff5083b35068e42ab9"; + sha256 = "3d572cfb797672ef14e631f3c71b8b3bd5ed853541772dd5041093ab9b55c92b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/es-AR/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/es-AR/thunderbird-140.7.2esr.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "bc1659a3d0d100da6df8fca124e012491935a05eae232059b95e1659718b1923"; + sha256 = "ca2e07d0eaea923ef810bed5d7df362eafb53e4c0a0014a1fe4b1632e30e0e54"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/es-ES/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/es-ES/thunderbird-140.7.2esr.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "5e79b692226377986718014547b3c3b845b9e8c1e93e2cd52c39d90bcbc45ac5"; + sha256 = "bec1d95201a26da2dbdc398d9a10943dd88d6bb9877518b08511494d28f9e6b3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/es-MX/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/es-MX/thunderbird-140.7.2esr.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f9a1875250360b2f663cc668aa6d4dd2f90b7fa09c1ab6d57ba215f6e0eaaadd"; + sha256 = "445116f8c97c34ab89d1cf530ce906f5b75891209c4e9162626654f21e2ce1bd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/et/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/et/thunderbird-140.7.2esr.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "b6bc578f03754b19b21decd64c9212a7cb209acfc79f9a310fb690a27e0b1f31"; + sha256 = "06fb6813037ab73bedbe873dd222e292420b1c7ec811dde282cf4d4a15ba1b42"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/eu/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/eu/thunderbird-140.7.2esr.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "718db87f1648d2f411c8cabe5e966803f08fa8ba8a92684823f32a60e0607ae6"; + sha256 = "f9bbe76ebabd3cd9f542d9b9b1d0b9f83f371dbb0c0fd74a55d9c414aef6f76d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/fi/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/fi/thunderbird-140.7.2esr.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "ea8ba1103bc0819a041928123b01e55e8bfe24910a222f5d56999f01edf15dc4"; + sha256 = "a1f9e8484b33915d9109694a2dee5080c25d88d95c76fee00fca558a0741cc69"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/fr/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/fr/thunderbird-140.7.2esr.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "b17695d870e918c65b103b2d0d485ec3e4daa21c631d7c2236635ec1507fd0f1"; + sha256 = "0e2e8564bdb6b1689ac60de47670c8c4eb8de60d080b9e624ff6868f80cb3d68"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/fy-NL/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/fy-NL/thunderbird-140.7.2esr.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "814514bc983b63ee0d7b5cc9abc3f143c1a784f1fa981f77ba52a9bafd47220a"; + sha256 = "a752a5dbd430045e62c501a9948e2b4651071e8be720e01632ba7652e7e6f1b6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/ga-IE/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/ga-IE/thunderbird-140.7.2esr.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "2a15661bb955f27d5c8f3c45f0726b6c42a8f23a93e3c13253ea3ad1ebe09613"; + sha256 = "9c795a01a1e482b09ab5897b410b56859ee7ec1b1b720cf45f9418059676c0d1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/gd/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/gd/thunderbird-140.7.2esr.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "f43c248d24dac3128475d80b66075977cd47b91697dc3efbfe49cd951998b02d"; + sha256 = "9a8212e3b4ed03450321afb26296ec1803161f4a64fa8922c0fbc1f25e25b9c1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/gl/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/gl/thunderbird-140.7.2esr.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "3dcc191c7c6c26d6d2bf65cdb271284528d0c7783eb0dfd201f7e2d68169a9e4"; + sha256 = "f97a0d6da18f11eda65e465944f94764fca82e60d3850a7eb200ec7dd839b596"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/he/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/he/thunderbird-140.7.2esr.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "9a2c10585da93aa061441be7127cf89c00486b9ffd1ece7a8afec40c8c065f00"; + sha256 = "aacc34255db4d0b940c8bb5cad727163d88e1f0c1f0c3fc3dc2f3df08ffe99ee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/hr/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/hr/thunderbird-140.7.2esr.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "231cca1fc1033e52dc1305634ae2d0735764dae07c7bf38d4ed7022a4ddcb8af"; + sha256 = "6dc2b739d1d40459e98ac04e334e35e30a0486012cb21f744541bb88a4b20883"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/hsb/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/hsb/thunderbird-140.7.2esr.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "42c464f27487380f23907959fad19e6cb1610f0a16a4aff30c95e6b1bc6a47df"; + sha256 = "775dd9d7169c7fd5cf363aeee761e9d5e66159d84d470370e5798ed8019e1862"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/hu/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/hu/thunderbird-140.7.2esr.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "dc83c5954c74ccee86289fa0098c454617bc7ebc88e3c1aca3d9a305fcbbafd6"; + sha256 = "a6d262c771aef926e158ce24a9fbde9e0d2fbc9da5c4a2d265e661160360024e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/hy-AM/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/hy-AM/thunderbird-140.7.2esr.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "9bcd5bb2fa3a49da88f5179c7712e82b463fccc0310bca260a9807325d250e60"; + sha256 = "5c54cec50da8f19dbd9772dc6ace0a3b7d4dec499172284bca6a8375e18ea6a4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/id/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/id/thunderbird-140.7.2esr.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "b576ad6b6946252b7c11b3e191cafc49ea73350ca4c9aa7e8d8afffafc4c8e04"; + sha256 = "5d08e059f50fcf18691dcb604978135a1e355966c74c84acc3e5168760c8ef6d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/is/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/is/thunderbird-140.7.2esr.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "489d825e1c44758b9b3172b4a80b4830057eacba1ec0b61830e7a14a6f64a59a"; + sha256 = "8e481afab39dfb8b9672b6371c73ce9d78ef6e52df43afa128d892a957bc281c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/it/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/it/thunderbird-140.7.2esr.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "5a79087fb9170f40ec518f4a142177859026185e99f13c998f9d74d23e09fc77"; + sha256 = "88bf0189190b1a2b76445b0e13e45f57dacadba55ab114d1d428936b82ff0f59"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/ja/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/ja/thunderbird-140.7.2esr.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "375f1a48ebc3dfbabb26b9fc163f492a8c8bb8393f9cfcbfb592fe9ad58b6af3"; + sha256 = "1580f1dccc63c63eb188ac41ab87baeb28f2fa314362295191b03b63e111f3f1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/ka/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/ka/thunderbird-140.7.2esr.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "7275236d9f380408be391fce840c65cdc966f2d4c1d51d09b8c69c5e59d0904d"; + sha256 = "7dd350b02b27bd1787f0ed695bb8e476d9393185c5e25cd93cb51c1ec2548b90"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/kab/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/kab/thunderbird-140.7.2esr.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "e4642c2166a2496479bbff72eff36647a35e787de5ea7bd66c3ff39454a0bec3"; + sha256 = "a2701bd2f66a6642455c72ede0b9dc12317b2b052faf68083a1ef6016bff1d3c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/kk/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/kk/thunderbird-140.7.2esr.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "9db23d6c99ed3c4ad2ed864938c3ef5e815f0b860de3dca8341c4e9d74147578"; + sha256 = "3e794b80305af408e9eb9c0b81814353792f0c26b9e9fad61a00a2b156836e37"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/ko/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/ko/thunderbird-140.7.2esr.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "0cc207d7e6d4f667d75cbe7eb00b647248019e4d8cd5d9fe07e86d807f734dd4"; + sha256 = "de8ab5f31b623e540aafb6c8ba700b9d716f69d7a6b2bb3e6e8d1e3b0e8edbca"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/lt/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/lt/thunderbird-140.7.2esr.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "c42feadacff777f115fe5fbe816e473233a220bcd2046b0bb0d10c04c4df8d79"; + sha256 = "b3544a2370158067f9346cfffe7f2a2794e72ac52e81cfc3b5c3ce341b89c0ba"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/lv/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/lv/thunderbird-140.7.2esr.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "03fea570f2723cf5450b48ef9375ae3cc1a73c4abb2e5bc9e62141a99cab32ba"; + sha256 = "11350a3fa229f3500c472d7f88f43e8dd44a9c93d0e03ce6d07900421e836baf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/ms/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/ms/thunderbird-140.7.2esr.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "dd4c9ece5dcf1da22d8bafdfddca5e167c88c40448232c68e7673e8b9fd576f4"; + sha256 = "91402139a32e42f5b4dd27dcf9200f2d3218b684a1a16789aae74ae40ab2dd43"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/nb-NO/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/nb-NO/thunderbird-140.7.2esr.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ad9ab2a3bf9f49cbd0f500d3de2c42b2a14cc51e1161ae2827947f84ce296c8e"; + sha256 = "4ac72a9f716eee93f074d47e1b32f808e745fb7d65044cdca3a272179f1abc15"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/nl/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/nl/thunderbird-140.7.2esr.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "bf4e0fb2c130dd74a6f364aee7bb622f5847bbfd10c02c8e417558032277f5d1"; + sha256 = "9198ec42798b049e7bca68b7500b744ce57d1a271aceb90fa46447c04014a978"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/nn-NO/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/nn-NO/thunderbird-140.7.2esr.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "14aafe24abbd4ed6c4d5858236ec512a72c4943204798956a7be9973a5baa4c1"; + sha256 = "a2e44570551478a8048bb437ac5a0837f8e2023a3ba2f0a9f6c900319850d545"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/pa-IN/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/pa-IN/thunderbird-140.7.2esr.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f37176fa338b9452dc54aad25054b9fa8356cc396c663fc0aff35ded1b9c9790"; + sha256 = "af2f191cf24bd80e8905bcfc093d5e099d637e0c857814c54c6b1389026d9671"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/pl/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/pl/thunderbird-140.7.2esr.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "0252bf2a0900e3dfffc744e5e08302bb137b7511a46aaaaa00d46d2caf473e58"; + sha256 = "dfc9ba5ce4dc6cb261f57bda7c89a5b32e55422c8f02392b239f171c5b4737c0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/pt-BR/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/pt-BR/thunderbird-140.7.2esr.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "b5730bf671bee8dd5cb28cef8021821e45d2f34a93ae3ef16c0a7a04be36bb32"; + sha256 = "e9b6109e4b82d2e60ae39e5a8c2ebcc54220d6dfe316051c73f3ec5ed34f2bad"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/pt-PT/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/pt-PT/thunderbird-140.7.2esr.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "f4305abdd1186f0f9858450297726172249a34c8775dda50c93490a142dc90da"; + sha256 = "53c4b88948b44049331fcbdcd4920a1865e2f58ae1b1194f68d5bc30bc390d73"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/rm/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/rm/thunderbird-140.7.2esr.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "e553a425d205a56cbb271f29c052ae8298ef11509bb4337338b58d9901aa778f"; + sha256 = "81e534efca9fb98834ab480b5c0bc288f41068e9187c07e26e277cc2df17605e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/ro/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/ro/thunderbird-140.7.2esr.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "feae61eb1a0103092c4ef7bf1fc04e201f187e66c74cf56e3acb4d0de88f6ce2"; + sha256 = "f45135afa64265ec81bf297c1cb4b17edd74537a10d4b6a57aa728ebc0504ff9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/ru/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/ru/thunderbird-140.7.2esr.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "7c569aaee50e0578484d9532200b74b54d0d0c705b4b99838ebc60ba7854af90"; + sha256 = "c6f698eefd26dab7952829796c4df1dee5b04d265bf1daf63357a9405651bd29"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/sk/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/sk/thunderbird-140.7.2esr.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "58d9669fd9323a4795343bfb9b7e597f21977a6215b08faabc795247936569aa"; + sha256 = "2813d6d97893f30196c552dc1be6022e60ab2c97144dc25e90d13ca6055d2a28"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/sl/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/sl/thunderbird-140.7.2esr.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "46e9f09c02e81b625739701975934169f74742408daf4383df9c3dd410097eed"; + sha256 = "56e1161bfb4c6e44eb7c21373499d43018e523f19b1e2706e8b8641595995440"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/sq/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/sq/thunderbird-140.7.2esr.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "ca45d3339dcebedcb62192b1052a1ec7a33f1aa4c8d4e6b73c1586f26c748825"; + sha256 = "4a704e6233600377f5f7ac888ef41652ac85f32efc8008405c16323d035a3de0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/sr/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/sr/thunderbird-140.7.2esr.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "46493950559c46c0541a4389cfff9325ec134a8d53d40a7cca320a359d31979e"; + sha256 = "79b3959a075c2aa4aea22c4edd04a25fbfba1e59a7e62498dbb7d5679350c14b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/sv-SE/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/sv-SE/thunderbird-140.7.2esr.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "c51331b989284b571903d2cd87cd2b83559bd543cfbf84d52d3209b962303436"; + sha256 = "3eb878d219ed645976d8553e4e40e256e9fcb1a8b982998b22be21a3484aa8b6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/th/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/th/thunderbird-140.7.2esr.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "141bd30794fd27fd83c37e3305cc3d8c96dc1ef4ca192c580f52a7ce77a79fcb"; + sha256 = "aa46397cbf2e8c28a85ac927f1f147b89a0a6708a26eb216c5fc9997a73cc8d5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/tr/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/tr/thunderbird-140.7.2esr.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "37d6bf21a8633a8d536a9dbd62e4b8408b822061f29aaf545581ad280224e504"; + sha256 = "2ec4ae98ac31899b54884043ae94976e13bf34ec7a3868c8d81e17320f6983c8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/uk/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/uk/thunderbird-140.7.2esr.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "47bacc18fc24db53a346fcf60a46ffdf10ebd606080dbbf46f817ae37aae1b89"; + sha256 = "12e234ef09c9745b6b8c01ab49737a501314af5a054fc890fa12e63fc25c6e95"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/uz/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/uz/thunderbird-140.7.2esr.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "435232c916a9baa276cdd1a6791dd058d5c923cfdcfd3183ed58af63892fae21"; + sha256 = "46138a5facb6f39cb077f3ba7c5e09eeb03d0cd3978350f015c9f75d84e7be54"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/vi/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/vi/thunderbird-140.7.2esr.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "98e19487ca27ac0a3dd57a444461738d67c9875bed4269d289bd825c78b62218"; + sha256 = "ea9dc0b611e26cb891de00b2aaba7b7b5d97952b0e2f1b15054ed398981cced8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/zh-CN/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/zh-CN/thunderbird-140.7.2esr.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "c42ed125eb1d3353c1ef04344179f06175362402d85ef93dd7b7f54cf34f9b73"; + sha256 = "52fafe6509481b0ad98e7ac490e0df31d7618bf87d54176adb7b788d01db7ef1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/linux-i686/zh-TW/thunderbird-140.7.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/linux-i686/zh-TW/thunderbird-140.7.2esr.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "1454bf0dbbea965edb3c20d9bcc7f033fe832b7ae38707cff5bcb29e85839d33"; + sha256 = "de1a9889a7d203423533ca22357bfffb01c7cc3d0139cee9be02e6721eb3c04e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/af/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/af/Thunderbird%20140.7.2esr.dmg"; locale = "af"; arch = "mac"; - sha256 = "13cfd4606aa42f1824b432c79a00715702a8a4dcbf20e6dc3f8f792e96a76134"; + sha256 = "601ef77985793052cfabafa2cffab1b9662b6b4ff752185b6b1da03b8bbcfa44"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/ar/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/ar/Thunderbird%20140.7.2esr.dmg"; locale = "ar"; arch = "mac"; - sha256 = "5bdf90d9dc8339957424b06af5aba8dd13d036ac13f54d64815be22793a3a011"; + sha256 = "dd7edec202650d9dbcdc78150fc19a481e953b34e6b74291164638ec953dc01e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/ast/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/ast/Thunderbird%20140.7.2esr.dmg"; locale = "ast"; arch = "mac"; - sha256 = "8aeed54bac4a71cd306d3259b6fe3105008aa0dc8c28e3607e7cab0b9e690441"; + sha256 = "ae317dcd3ad78ffb97203563b25931ed25114ab6881d7b0c5330397254cf8891"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/be/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/be/Thunderbird%20140.7.2esr.dmg"; locale = "be"; arch = "mac"; - sha256 = "784ea4d03310b97583d4ecf15fec3ff2da715fe58f7aa55021b8ce34af175f5a"; + sha256 = "12b5c5bf2c8685435ab7afbba0c614d0e8ccca0dcd7aa17c27e8fd00bb888d08"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/bg/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/bg/Thunderbird%20140.7.2esr.dmg"; locale = "bg"; arch = "mac"; - sha256 = "7f5bd8a778c337ae67635264960d8934c2202292eb6e4e566f0878d3b9732cf9"; + sha256 = "8e7929e8123ba70d4d0b293b4eea069bf26409bf2c843e89cef45b16a8a3fd5c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/br/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/br/Thunderbird%20140.7.2esr.dmg"; locale = "br"; arch = "mac"; - sha256 = "10a070fe1fc664f16b37fa59b10c49a3406895bb7b3b30951d92120b1fba146d"; + sha256 = "f789b7381daef0ef2611d4bf523021cf394fc2dc69f7af1478446329ea6cc718"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/ca/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/ca/Thunderbird%20140.7.2esr.dmg"; locale = "ca"; arch = "mac"; - sha256 = "b6dbe9fee9c5ebfa954809c71da2ed26480040cf6b2aabb1983d0fe747f83645"; + sha256 = "fde7da51d5dfc6690554d6776ac10fee4ba414fe749f7cd1220a29891d91bb7d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/cak/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/cak/Thunderbird%20140.7.2esr.dmg"; locale = "cak"; arch = "mac"; - sha256 = "494b0b719a8f1c009e42011722edbb31224f02bb59c42d718cc76c2af90d91a4"; + sha256 = "bf1a82021478dfa02eb32601f402662bb58f8c36d0e33d4fb38d11abe3686bc6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/cs/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/cs/Thunderbird%20140.7.2esr.dmg"; locale = "cs"; arch = "mac"; - sha256 = "41d4fe58699cf6a6224b655b1a75800659ee198fc362ccbd3ecf01e4ad3316b7"; + sha256 = "dd0d3a5038c3fe5db02fd9528f3a3f8158dbf324bab7f3acc6489bd93cb9a6ee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/cy/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/cy/Thunderbird%20140.7.2esr.dmg"; locale = "cy"; arch = "mac"; - sha256 = "57f1f289716e2824007b6dfde088fa3e4d1910cd94ade1d1dbbe5a1eb6ecbd4b"; + sha256 = "678e03ca379abc6b193a75af589e0c55049e05fcbea566ffb3ea053d791f2620"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/da/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/da/Thunderbird%20140.7.2esr.dmg"; locale = "da"; arch = "mac"; - sha256 = "285b6ab82b4b24fa4c101ca4848bf017cd72e880df91bfae2816b1ec435d4207"; + sha256 = "d0828c74f8e4e644553d832c3ca30118bee0bc87d6b5c36357b5aecdb9a4866a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/de/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/de/Thunderbird%20140.7.2esr.dmg"; locale = "de"; arch = "mac"; - sha256 = "6d133410df3e7b8bc6e1b9821bd7703d2c569c4b8caf83cca8062c86d3e6a74c"; + sha256 = "361c1d647108fb16ffcd3c069e410030748f28cbde4135ab34494297bef22d18"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/dsb/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/dsb/Thunderbird%20140.7.2esr.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "004dfaecaaeef54f615d45cc7dc911ac00b44a9ecc580c5d4cf6874eba2928bd"; + sha256 = "4c4d96879cf8ba5e35f0c7d365bd44f5b70d971ac1b0bbc448110ac5c438382a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/el/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/el/Thunderbird%20140.7.2esr.dmg"; locale = "el"; arch = "mac"; - sha256 = "c71728843a70d05c56e97742e02e1f74c5f12fee8aeee1c08c99b8fa1a144d8d"; + sha256 = "9d9e22981e4c1d1d53f017499791dcb6381737e59566d571ed7860e1bc8d1908"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/en-CA/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/en-CA/Thunderbird%20140.7.2esr.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "525923bbab917b56425128b00e9f4ebea20ef545166c04b7ff5da1a6fe2c56a2"; + sha256 = "6daaa843dbedc7340a1bc81ddf70a85a8b143eb5a655ee3cbc1a03cc4911e36d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/en-GB/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/en-GB/Thunderbird%20140.7.2esr.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "41ee880b4e1d7908d3a5cd462fb81c15639a11defad0a6547d7b0a453146237e"; + sha256 = "4758be1c6b84ccc6428bc067131f986a04f4c1e436c316343b9299aac9a31736"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/en-US/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/en-US/Thunderbird%20140.7.2esr.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "e01fe842446b552a8ac63e5e4eb796b15053a1cbdc58284f75a4f2c533a867df"; + sha256 = "f804974211ea6bcc00e3f6017048ac563e469be9c48794d0b42b2e217811b4cd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/es-AR/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/es-AR/Thunderbird%20140.7.2esr.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "33de894137fc31419c670160d155e4514294f0cecb3a14731f9df7391786f8cd"; + sha256 = "b568359b98bfd2c41576dcf5b1ed7aced11fe23e206b84921d98a986a72db157"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/es-ES/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/es-ES/Thunderbird%20140.7.2esr.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "49956f9349c15463c8a050f705dd2633c42375c76d16a303327a4894e5a9a878"; + sha256 = "da79495ad76a2ed05dc3376ee2db16d2540b3552a736e3f3f4ea89e0c07b5470"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/es-MX/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/es-MX/Thunderbird%20140.7.2esr.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "dc394170f751883b25258b4d955728f2142343d18123b8317fcb3ae72b8dcb0e"; + sha256 = "139ab5233f44fcd72087786eee0b05bff552fb0f5ff35514f8f87e954880dbd7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/et/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/et/Thunderbird%20140.7.2esr.dmg"; locale = "et"; arch = "mac"; - sha256 = "3555405c5dc7c58dea1406902dbd6ff9ed9b7c58f4e6b3136e5169ef7fa67e05"; + sha256 = "4656361d64cf07ab585df08212184472768ec47361b1d447f270b7182b970dbd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/eu/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/eu/Thunderbird%20140.7.2esr.dmg"; locale = "eu"; arch = "mac"; - sha256 = "0fb26d43fe0a0f04316ae3348c8e205074af183f4ef78873d7f0929239df3ab6"; + sha256 = "29a0a0b975f2a26a3a31d915fdb05862274d6f75fa44a00024a052527bcd99c9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/fi/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/fi/Thunderbird%20140.7.2esr.dmg"; locale = "fi"; arch = "mac"; - sha256 = "2e3a190f4687aecda0e552900128963cf69151e2534d5c9ff2faa40e4ad52fb3"; + sha256 = "d37a8bb1197cc3ae4ef9d7010b4d09464c9b366671f29f78eb3d52dcfc96dda7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/fr/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/fr/Thunderbird%20140.7.2esr.dmg"; locale = "fr"; arch = "mac"; - sha256 = "3a44b87626a5531c7afe443ae18f5bdec1f9e62f1ae6638032954cda2d18cc1c"; + sha256 = "7ccf78cc27bcb0cd6716bbc5db66baa97f6a1073573e5f1c0649d8791d626b2f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/fy-NL/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/fy-NL/Thunderbird%20140.7.2esr.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "54aa26c1bb1a1a657ca44ed474e58bd3c527adc079219272052d524af837ebd6"; + sha256 = "85937efb7f403a3b6a7e34331ee9c4cc6935be788230d82b3dd69c8e1d303fd8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/ga-IE/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/ga-IE/Thunderbird%20140.7.2esr.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "5850be5ff63980251d35826f527d69e37c25121e051455fd6f20c96c6af0b374"; + sha256 = "36bb0a02fb40a22211e7375eafec83f429055364644024c27fb7ffeda0f9c76e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/gd/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/gd/Thunderbird%20140.7.2esr.dmg"; locale = "gd"; arch = "mac"; - sha256 = "81190f2e64098ab271c1f6ebc2e6a5697308f24d3de621bbc5203e8c2c70b693"; + sha256 = "282ca9ed419588ff0428821ea1c165d6d1956c080fc7239786e11205d31a242b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/gl/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/gl/Thunderbird%20140.7.2esr.dmg"; locale = "gl"; arch = "mac"; - sha256 = "b23b8fca805ee63cad277b99efc31a6336500c23093692c1c7b4a8bec0f3939f"; + sha256 = "4b8a2498a9814047bc4c5c0a7965ca64a54dbd4e58f982b8334e4a394ce747d3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/he/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/he/Thunderbird%20140.7.2esr.dmg"; locale = "he"; arch = "mac"; - sha256 = "654a528ee68420dc8e4cc86e153f90a9d91482ad5d39f7716640e7ff8e1bf1bb"; + sha256 = "bcf64179af3d1b36b29db9676e37c58c058c5bf8a652ac856edb8810a29e75b4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/hr/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/hr/Thunderbird%20140.7.2esr.dmg"; locale = "hr"; arch = "mac"; - sha256 = "c5a5726e9f18a8d2f93e678da56bf74cfb02b58d3f2e3c9b9d91c5e774493ef9"; + sha256 = "0af758922ab6b8ac0758b768f0c7b7f181544b908645f311356f3026a691cb86"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/hsb/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/hsb/Thunderbird%20140.7.2esr.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "05221f70b8ef5f4a126dddcdc0d3b4ab2480334a6ea0b538f1def0a351d4084b"; + sha256 = "748a5f125317501a743946c7bd932b8f7d5ef693e7a1c7527fc1593310ffae8e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/hu/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/hu/Thunderbird%20140.7.2esr.dmg"; locale = "hu"; arch = "mac"; - sha256 = "88b2161fbe3e552939d397d38384382239d0fa7c8d08ebd84615ebc502acb78e"; + sha256 = "60462f25d993de18304f3e37e31f2b0edd7b0f54bf321a9b716d78fa2748f762"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/hy-AM/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/hy-AM/Thunderbird%20140.7.2esr.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "b9802d28f47532ebc1910d13576c4496ff44606474aae023b9ec76a7c852ebd1"; + sha256 = "f09a1be52896b1e50ea8e6dd5164b420af73918f4f2c9e6b5b72eae28b29f5e8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/id/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/id/Thunderbird%20140.7.2esr.dmg"; locale = "id"; arch = "mac"; - sha256 = "83e36f9177a7c14424f54a1a37de9514276c50e8822097b826128bec5d76cbe2"; + sha256 = "21a88634bf870fc51589255fbf4f6e3bcccb3572dd9a0019fa4a5594d372fdf0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/is/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/is/Thunderbird%20140.7.2esr.dmg"; locale = "is"; arch = "mac"; - sha256 = "76fd09dfad62c9ce8674a686b990e8c035d566bf718c3274603e0cc6e46d6216"; + sha256 = "cac0a5e743f0993d02c174b871017cb3f6ab520ef17df81ea9851bbccaa8396a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/it/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/it/Thunderbird%20140.7.2esr.dmg"; locale = "it"; arch = "mac"; - sha256 = "2e9bf1eab7668a222fed1b71a3ac765d88e8737d76c9e8f0bbb0c43e1e61e19c"; + sha256 = "6600458f3673a8fc0462394fd786ba4cf15584b0194f07b2cec4f7f6eb3f620d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/ja-JP-mac/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/ja-JP-mac/Thunderbird%20140.7.2esr.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "5bb959a7b7c11cc3282a613a10fecc1774ca3b80b9223b785be45068ef1b8c2c"; + sha256 = "9156514e4b891ca2cf3d9cb7fc4b184e9e7abb301d0d170b7c4f82acf117ca70"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/ka/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/ka/Thunderbird%20140.7.2esr.dmg"; locale = "ka"; arch = "mac"; - sha256 = "7c9b70f120fdf89fc7ae432dd6f202adc98c87bfd050d844020988eb06904b93"; + sha256 = "1cf436973e977ded9036463f7356d0523e14301900a4b2e6429326b60cef43f2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/kab/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/kab/Thunderbird%20140.7.2esr.dmg"; locale = "kab"; arch = "mac"; - sha256 = "290645b73f75e0c521bddeda026dd97cb8327faf7ac645884cf8cec81b74bb36"; + sha256 = "d5c7d0440a3112a4557156a0c6a1bce7c2e4e559146b24fe7cd754a03a41ceb8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/kk/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/kk/Thunderbird%20140.7.2esr.dmg"; locale = "kk"; arch = "mac"; - sha256 = "a54fd42f881aedcba2d41e93ef9918d8fb6a0cd3d8b018948173b26715c88785"; + sha256 = "0053e8fcef759d58a541ca6e41e0c3360ec35f3b858e1be414e7a19344c27b88"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/ko/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/ko/Thunderbird%20140.7.2esr.dmg"; locale = "ko"; arch = "mac"; - sha256 = "b169115cf34deb65bf4a6dd30fb37ade1e185ee72c8f69bcfa6fd2b8a8137203"; + sha256 = "52de3137ce58b1428c7e4978c2f9df50d7d07d069ec7b6c0ba97e969690bd7c7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/lt/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/lt/Thunderbird%20140.7.2esr.dmg"; locale = "lt"; arch = "mac"; - sha256 = "d09270fc1487f21dfda84ea575cb8ebeb9068c32b5e2dfd0a1a8a0ee545e3f2c"; + sha256 = "38a6c088eedad3f737d71de6335c0138a280eaa64321f4b2164d5817fda3dfd5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/lv/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/lv/Thunderbird%20140.7.2esr.dmg"; locale = "lv"; arch = "mac"; - sha256 = "942cd2fbdf7a4d1cefc6f62a306b9ac6ad9c7c9089825c76429074dd9fde19f2"; + sha256 = "5aa4b9ae1ca96d74beebe2374ed8fea68371fd45f3d7582e260629b3a52e812e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/ms/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/ms/Thunderbird%20140.7.2esr.dmg"; locale = "ms"; arch = "mac"; - sha256 = "e2d3094b95d878254c725c297a768d16bf2a1911537305778d3a432d44eb843a"; + sha256 = "8aaec3d546ba5eace61306f440b306d5184de2f4730440b454300127a8ad9b8b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/nb-NO/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/nb-NO/Thunderbird%20140.7.2esr.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "f5c8a8724ff2711bf9aca2c3fbaa20d65455b2b2c58ad867220c86e33bc8dda7"; + sha256 = "f9caf869cc2cd01e891badf3e8b014060ef7dc2b2be96a08a9c44bf2f8645e40"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/nl/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/nl/Thunderbird%20140.7.2esr.dmg"; locale = "nl"; arch = "mac"; - sha256 = "36bf2ecef95c9e6f936cb185c6415d018d44d3ac275b17980861315945e76838"; + sha256 = "27068d5d5257f806866e4934dedde2acb6fdbdb6693ba8b086f7bdf9d1231db2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/nn-NO/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/nn-NO/Thunderbird%20140.7.2esr.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "b84d841afa65a8736e616395eb176d7be24d87053b32b0c67ffbeebfa01c8468"; + sha256 = "f793338427f379649187bf7f54724688296defd77eba6bee4160e87141d8e09b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/pa-IN/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/pa-IN/Thunderbird%20140.7.2esr.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "c767b0df37f0d3ffb98e30d656b434adefd9b1cf4dde31aa8669ff43ebeefde4"; + sha256 = "8ef69e3c1f223fd88a0bfbf8813e1054eb5967f61f979cc323b08372542109dc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/pl/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/pl/Thunderbird%20140.7.2esr.dmg"; locale = "pl"; arch = "mac"; - sha256 = "1b013c67fe917a1b1778bb95ddbbe175600cc72853ddb6faad5b3fda1c5d7bf5"; + sha256 = "4d20ba79dd992109b84ae2677ef6cadc9dfa6c812a3298349431d843df14d01d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/pt-BR/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/pt-BR/Thunderbird%20140.7.2esr.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "98b8e90bb8366bad34d382b416e9e7e4b0f321c40312b5430d352b9ec323d98a"; + sha256 = "5ec99a800705785c8911a00e399ed5d06b44dbe70031f00ecd64a6cb8588b6af"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/pt-PT/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/pt-PT/Thunderbird%20140.7.2esr.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "705169557a0ccd02b296524f62a2788e920007f3cbe2d87da9a8adc31a19c8b2"; + sha256 = "d85310f5a841e7384458eb04d8ab5b9ffa9bb18ce96635d6d14fa2dc51d814cc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/rm/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/rm/Thunderbird%20140.7.2esr.dmg"; locale = "rm"; arch = "mac"; - sha256 = "9c3662d63eddc089a865230044b01ff081ee8dfefc3d78139a0bc99b89854ca4"; + sha256 = "538b0d36bfb43befbdf592095b40187e2c0b6c549b20e812c542f6cfabbf7cab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/ro/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/ro/Thunderbird%20140.7.2esr.dmg"; locale = "ro"; arch = "mac"; - sha256 = "e97f3267e92739519a151ff429f318402a8d5355e9d73a1ba519e7ec0169dbad"; + sha256 = "3895a3972eb29b39027e84e1364afefe784b98d34cc315a7b96ea280df831539"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/ru/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/ru/Thunderbird%20140.7.2esr.dmg"; locale = "ru"; arch = "mac"; - sha256 = "c805d6928565cd6f4bd754c165bde5015136c535d7e6a47d57916ab943bdd25a"; + sha256 = "ce026f7842e066aa48d215a224866a4f9a2226d8966a23fba4f5137a6e75e183"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/sk/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/sk/Thunderbird%20140.7.2esr.dmg"; locale = "sk"; arch = "mac"; - sha256 = "85e47b5846ebd1913abca659ada060bed60f0644fc55c5433f74c877d1c39659"; + sha256 = "be5f8b11c70361975a326b5f852704c3d77e95b7ee840700c61425c0a4ab6f45"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/sl/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/sl/Thunderbird%20140.7.2esr.dmg"; locale = "sl"; arch = "mac"; - sha256 = "e9226f7a201fabff8c6ae7bbca18d74a3998214c3293d072790a700e70bec605"; + sha256 = "5a1c736e90c7675e38d4b99500d9951e31b4424eaaa21269b7196c9167cd94bd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/sq/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/sq/Thunderbird%20140.7.2esr.dmg"; locale = "sq"; arch = "mac"; - sha256 = "41abd8ca0ba3ca5a24c76fccaa1f6e1c9b545e3f1062496d2aa498900f1e1dcf"; + sha256 = "6c5b44a4888a3c89ebf022693ba5862aaa3685ab55eab8d6999121eeda3dd80b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/sr/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/sr/Thunderbird%20140.7.2esr.dmg"; locale = "sr"; arch = "mac"; - sha256 = "76e0c9eac8ccd4d9f241ce686aa8ca96bb1fed7055484b909b77521e818c6181"; + sha256 = "6dd684bc68a54e50ab3889897c0697f14c7f62e168fff7b2bddf0f8989f62406"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/sv-SE/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/sv-SE/Thunderbird%20140.7.2esr.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "51e47141e9b712e8829326d6dfe69b05a9f904cb2c38fb42cc52a9f3bd037d22"; + sha256 = "14a37b6b99da9158d369a5fbabdbdd94caba4853af2c9146cb04fbc7bfc6f949"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/th/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/th/Thunderbird%20140.7.2esr.dmg"; locale = "th"; arch = "mac"; - sha256 = "850a3fdfef1d28fc5d33a5f100a6d9faab3630b4d4102e8058467e5fe6641455"; + sha256 = "cd74b128553b14c5d11e7b02ff58f02a02cf9a99aa2848968d7f4fba04e75427"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/tr/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/tr/Thunderbird%20140.7.2esr.dmg"; locale = "tr"; arch = "mac"; - sha256 = "21b72fe0c147705e63f6b0458b9dac9e0aeb8d9db388eea4242be9b155745106"; + sha256 = "5bb8f8c14b8d25a00f62cfb91d5378fc5b50d1c570c3e259485b4d81b333e51b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/uk/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/uk/Thunderbird%20140.7.2esr.dmg"; locale = "uk"; arch = "mac"; - sha256 = "5d4782e2e50b6d225cace9e18ae007f454b5857ed126a98602ef0fa5a2d22d8c"; + sha256 = "1716531727c133909f48dd91e4595ffe784473b4b0f4225b7dd040288bf40dfb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/uz/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/uz/Thunderbird%20140.7.2esr.dmg"; locale = "uz"; arch = "mac"; - sha256 = "033cb8cedca8437273613161c1e65785c7f0dfeedc09ccaea413cd0e7ddebe61"; + sha256 = "61f8af826af699c7e7b4f14d774bde36d75b1aa24cea6385b92eb96c1122d59f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/vi/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/vi/Thunderbird%20140.7.2esr.dmg"; locale = "vi"; arch = "mac"; - sha256 = "aa1eea4472b6696e436ed61ab54b1ecf32a5f9135ca2d2c2dfad7984e7f5661b"; + sha256 = "faa08af065ea93dc912bfb832653fd2cbff96d07b04d3e5992f0398f3ee6ed94"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/zh-CN/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/zh-CN/Thunderbird%20140.7.2esr.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "b33b1575854ff14416a73faa26c1948260328d57dd361d08587a53a5fb066018"; + sha256 = "89a06428a29fa1a6ce2b35ce08f6cf1e916da8f34a28da0f62e3a1d90ff63407"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.1esr/mac/zh-TW/Thunderbird%20140.7.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.7.2esr/mac/zh-TW/Thunderbird%20140.7.2esr.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "022a0e5281322c7e5547918a8b5450a286e6f22043dcdcbd737789dd470de49b"; + sha256 = "d638c5aac5e7e73ab2231cee2a8e51049076405106a415b96ee09389d488e2e6"; } ]; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 6d176db0c832..49fc1a56eb19 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -157,7 +157,7 @@ liberation-sans-narrow, liberation_ttf_v2, libertine, - libertine-g, + linux-libertine-g, noto-fonts, noto-fonts-lgc-plus, noto-fonts-cjk-sans, @@ -206,7 +206,7 @@ let liberation-sans-narrow liberation_ttf_v2 libertine - libertine-g + linux-libertine-g # Font priority issues in some tests in Still noto-fonts-lgc-plus (if variant == "fresh" then noto-fonts else (notoSubset [ "Arabic" ])) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 2189e70503be..2269432bf744 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -40,7 +40,7 @@ appimageTools.wrapType2 { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ atila ]; + maintainers = [ ]; mainProgram = "mendeley-reference-manager"; }; diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix index 0ab95960455c..26778014e84f 100644 --- a/pkgs/applications/science/chemistry/avogadro2/default.nix +++ b/pkgs/applications/science/chemistry/avogadro2/default.nix @@ -5,12 +5,10 @@ cmake, eigen, avogadrolibs, - molequeue, hdf5, jkqtplotter, openbabel, - qttools, - wrapQtAppsHook, + qt6, mesa, }: @@ -18,20 +16,20 @@ let avogadroI18N = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadro-i18n"; - tag = "1.102.1"; - hash = "sha256-doY+AWJ0GiE6VsTolgmFIRcRVl52lTgwNJLpXgVQ57c="; + tag = "1.103.0"; + hash = "sha256-gdr0Ed0UWjQB0LQq+6RvlAb8ZNFQAjV9mrgFLePG+CM="; }; in stdenv.mkDerivation (finalAttrs: { pname = "avogadro2"; - version = "1.102.1"; + version = "1.103.0"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadroapp"; rev = finalAttrs.version; - hash = "sha256-nBkOiw6JO/cG1Ob9gw7Tt/076OoRaRRmDc/a9YAfZCA="; + hash = "sha256-nmvK3R966Xv2Xs5wXDh/8itIZLIRqbXHFe8dffFiI+s="; }; postUnpack = '' @@ -40,16 +38,15 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ avogadrolibs - molequeue eigen hdf5 jkqtplotter - qttools + qt6.qttools ]; propagatedBuildInputs = [ openbabel ]; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index e1e7c4d8a0ae..fae5f8a00782 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SVMLIGHT" withSvmLight) ]; - CXXFLAGS = "-faligned-new"; + env.CXXFLAGS = "-faligned-new"; doCheck = true; diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 7a4fdb9d0811..d72a5d37a394 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { {} + ''; - CXXFLAGS = " --std=c++11 "; + env.CXXFLAGS = " --std=c++11 "; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 4e19564295cd..5e0b96969a82 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -42,140 +42,139 @@ let sha256, extraPatches ? [ ], }: - stdenv.mkDerivation ( - rec { - inherit version; - pname = "subversion${lib.optionalString (!bdbSupport && perlBindings && pythonBindings) "-client"}"; + stdenv.mkDerivation rec { + inherit version; + pname = "subversion${lib.optionalString (!bdbSupport && perlBindings && pythonBindings) "-client"}"; - src = fetchurl { - url = "mirror://apache/subversion/subversion-${version}.tar.bz2"; - inherit sha256; - }; + src = fetchurl { + url = "mirror://apache/subversion/subversion-${version}.tar.bz2"; + inherit sha256; + }; - # Can't do separate $lib and $bin, as libs reference bins - outputs = [ - "out" - "dev" - "man" - ]; + # Can't do separate $lib and $bin, as libs reference bins + outputs = [ + "out" + "dev" + "man" + ]; - nativeBuildInputs = [ - autoconf - libtool - python3 - ]; + nativeBuildInputs = [ + autoconf + libtool + python3 + ]; - buildInputs = [ - zlib - apr - aprutil - sqlite - openssl - lz4 - utf8proc - ] - ++ lib.optional httpSupport serf - ++ lib.optionals pythonBindings [ - python3 - py3c - ] - ++ lib.optional perlBindings perl - ++ lib.optional saslSupport sasl; + buildInputs = [ + zlib + apr + aprutil + sqlite + openssl + lz4 + utf8proc + ] + ++ lib.optional httpSupport serf + ++ lib.optionals pythonBindings [ + python3 + py3c + ] + ++ lib.optional perlBindings perl + ++ lib.optional saslSupport sasl; - patches = [ ./apr-1.patch ] ++ extraPatches; + patches = [ ./apr-1.patch ] ++ extraPatches; - # remove vendored swig-3 files as these will shadow the swig provided - # ones and result in compile errors - postPatch = '' - rm subversion/bindings/swig/proxy/{perlrun.swg,pyrun.swg,python.swg,rubydef.swg,rubyhead.swg,rubytracking.swg,runtime.swg,swigrun.swg} - ''; + # remove vendored swig-3 files as these will shadow the swig provided + # ones and result in compile errors + postPatch = '' + rm subversion/bindings/swig/proxy/{perlrun.swg,pyrun.swg,python.swg,rubydef.swg,rubyhead.swg,rubytracking.swg,runtime.swg,swigrun.swg} + ''; + env = { # We are hitting the following issue even with APR 1.6.x # -> https://issues.apache.org/jira/browse/SVN-4813 # "-P" CPPFLAG is needed to build Python bindings and subversionClient - CPPFLAGS = [ "-P" ]; - - preConfigure = '' - ./autogen.sh - ''; - - configureFlags = [ - (lib.withFeature bdbSupport "berkeley-db") - (lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs") - (lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig) - (lib.withFeatureAs saslSupport "sasl" sasl) - (lib.withFeatureAs httpSupport "serf" serf) - "--with-zlib=${zlib.dev}" - "--with-sqlite=${sqlite.dev}" - "--with-apr=${apr.dev}" - "--with-apr-util=${aprutil.dev}" - ] - ++ lib.optionals javahlBindings [ - "--enable-javahl" - "--with-jdk=${jdk}" - ]; - - preBuild = '' - makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) - ''; - - postInstall = '' - if test -n "$pythonBindings"; then - make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn - make install-swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn - fi - - if test -n "$perlBindings"; then - make swig-pl-lib - make install-swig-pl-lib - cd subversion/bindings/swig/perl/native - perl Makefile.PL PREFIX=$out - make install - cd - - fi - - mkdir -p $out/share/bash-completion/completions - cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion - - for f in $out/lib/*.la $out/lib/python*/site-packages/*/*.la; do - substituteInPlace $f \ - --replace "${expat.dev}/lib" "${expat.out}/lib" \ - --replace "${zlib.dev}/lib" "${zlib.out}/lib" \ - --replace "${sqlite.dev}/lib" "${sqlite.out}/lib" \ - --replace "${openssl.dev}/lib" "${lib.getLib openssl}/lib" - done - ''; - - inherit perlBindings pythonBindings; - - enableParallelBuilding = true; - # Missing install dependencies: - # libtool: error: error: relink 'libsvn_ra_serf-1.la' with the above command before installing it - # make: *** [build-outputs.mk:1316: install-serf-lib] Error 1 - enableParallelInstalling = false; - - nativeCheckInputs = [ python3 ]; - doCheck = false; # fails 10 out of ~2300 tests - - passthru.tests = { inherit (nixosTests) svnserve; }; - - meta = { - description = "Version control system intended to be a compelling replacement for CVS in the open source community"; - license = lib.licenses.asl20; - homepage = "https://subversion.apache.org/"; - mainProgram = "svn"; - maintainers = with lib.maintainers; [ lovek323 ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; - + CPPFLAGS = toString [ "-P" ]; } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { CXX = "clang++"; CC = "clang"; CPP = "clang -E"; CXXCPP = "clang++ -E"; - } - ); + }; + + preConfigure = '' + ./autogen.sh + ''; + + configureFlags = [ + (lib.withFeature bdbSupport "berkeley-db") + (lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs") + (lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig) + (lib.withFeatureAs saslSupport "sasl" sasl) + (lib.withFeatureAs httpSupport "serf" serf) + "--with-zlib=${zlib.dev}" + "--with-sqlite=${sqlite.dev}" + "--with-apr=${apr.dev}" + "--with-apr-util=${aprutil.dev}" + ] + ++ lib.optionals javahlBindings [ + "--enable-javahl" + "--with-jdk=${jdk}" + ]; + + preBuild = '' + makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) + ''; + + postInstall = '' + if test -n "$pythonBindings"; then + make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn + make install-swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn + fi + + if test -n "$perlBindings"; then + make swig-pl-lib + make install-swig-pl-lib + cd subversion/bindings/swig/perl/native + perl Makefile.PL PREFIX=$out + make install + cd - + fi + + mkdir -p $out/share/bash-completion/completions + cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion + + for f in $out/lib/*.la $out/lib/python*/site-packages/*/*.la; do + substituteInPlace $f \ + --replace "${expat.dev}/lib" "${expat.out}/lib" \ + --replace "${zlib.dev}/lib" "${zlib.out}/lib" \ + --replace "${sqlite.dev}/lib" "${sqlite.out}/lib" \ + --replace "${openssl.dev}/lib" "${lib.getLib openssl}/lib" + done + ''; + + inherit perlBindings pythonBindings; + + enableParallelBuilding = true; + # Missing install dependencies: + # libtool: error: error: relink 'libsvn_ra_serf-1.la' with the above command before installing it + # make: *** [build-outputs.mk:1316: install-serf-lib] Error 1 + enableParallelInstalling = false; + + nativeCheckInputs = [ python3 ]; + doCheck = false; # fails 10 out of ~2300 tests + + passthru.tests = { inherit (nixosTests) svnserve; }; + + meta = { + description = "Version control system intended to be a compelling replacement for CVS in the open source community"; + license = lib.licenses.asl20; + homepage = "https://subversion.apache.org/"; + mainProgram = "svn"; + maintainers = with lib.maintainers; [ lovek323 ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; + }; in { diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index b4546c885f8e..182e12044b5f 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -85,7 +85,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/nowrep/obs-vkcapture"; changelog = "https://github.com/nowrep/obs-vkcapture/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ - atila pedrohlc ]; license = lib.licenses.gpl2Only; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 95dc5c5fecf6..b26be178e0d4 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -16,12 +16,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.4.6"; + version = "2.4.8"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-69mLiu/v+iZntrGvL0eNE/dDQwRVIlg5MfsNTr52Ots="; + sha256 = "sha256-pQ437Du++L6KhBCqkHpiYCoT713RAB+rnoGCXr5M0S4="; rev = "v${version}"; }; diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix deleted file mode 100644 index 0e68a1108319..000000000000 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - fetchFromGitHub, - stdenv, - lld, -}: - -let - arch = stdenv.hostPlatform.qemuArch; - - target = ./. + "/${arch}-unknown-none.json"; - -in - -let - cross = import ../../../.. { - system = stdenv.hostPlatform.system; - crossSystem = lib.systems.examples."${arch}-embedded" // { - rust.rustcTarget = "${arch}-unknown-none"; - rust.platform = - assert lib.assertMsg (builtins.pathExists target) "Target spec not found"; - lib.importJSON target; - }; - }; - - inherit (cross) rustPlatform; - -in - -rustPlatform.buildRustPackage rec { - pname = "rust-hypervisor-firmware"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "cloud-hypervisor"; - repo = "rust-hypervisor-firmware"; - tag = version; - sha256 = "sha256-iLYmPBJH7I6EJ8VTUbR0+lZaebvbZlRv2KglbjKX76Q="; - }; - - cargoHash = "sha256-iqsU4t8Zz9UTtAu+a6kqwnPZ6qdGAriQ7hcU58KDQ8M="; - - # lld: error: unknown argument '-Wl,--undefined=AUDITABLE_VERSION_INFO' - # https://github.com/cloud-hypervisor/rust-hypervisor-firmware/issues/249 - auditable = false; - - env = { - RUSTC_BOOTSTRAP = 1; - RUSTFLAGS = "-C linker=lld -C linker-flavor=ld.lld"; - }; - - nativeBuildInputs = [ - lld - ]; - - # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ - doCheck = false; - - meta = { - homepage = "https://github.com/cloud-hypervisor/rust-hypervisor-firmware"; - description = "Simple firmware that is designed to be launched from anything that supports loading ELF binaries and running them with the PVH booting standard"; - license = with lib.licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ astro ]; - platforms = [ "x86_64-none" ]; - mainProgram = "hypervisor-fw"; - }; -} diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json b/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json deleted file mode 100644 index dab5ec84bf1a..000000000000 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "llvm-target": "x86_64-unknown-none", - "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128", - "arch": "x86_64", - "target-endian": "little", - "target-pointer-width": "64", - "target-c-int-width": "32", - "os": "none", - "executables": true, - "linker": "rust-lld", - "linker-flavor": "ld.lld", - "panic-strategy": "abort", - "disable-redzone": true, - "features": "-mmx,-sse,+soft-float", - "code-model": "small", - "relocation-model": "pic", - "pre-link-args": { - "ld.lld": ["--script=x86_64-unknown-none.ld"] - } -} diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 8c7ef0442848..4d9db85dbc2f 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -114,8 +114,6 @@ stdenv.mkDerivation rec { "doc" ]; - FONTCONFIG_FILE = toString fontsConf; - propagatedUserEnvPkgs = [ hicolor-icon-theme ]; buildInputs = [ cairo @@ -150,11 +148,14 @@ stdenv.mkDerivation rec { ] ++ lib.optional lua.pkgs.isLuaJIT "-DLUA_LIBRARY=${lua}/lib/libluajit-5.1.so"; - GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; - # LUA_CPATH and LUA_PATH are used only for *building*, see the --search flags - # below for how awesome finds the libraries it needs at runtime. - LUA_CPATH = "${luaEnv}/lib/lua/${lua.luaversion}/?.so"; - LUA_PATH = "${luaEnv}/share/lua/${lua.luaversion}/?.lua;;"; + env = { + FONTCONFIG_FILE = toString fontsConf; + GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; + # LUA_CPATH and LUA_PATH are used only for *building*, see the --search flags + # below for how awesome finds the libraries it needs at runtime. + LUA_CPATH = "${luaEnv}/lib/lua/${lua.luaversion}/?.so"; + LUA_PATH = "${luaEnv}/share/lua/${lua.luaversion}/?.lua;;"; + }; postInstall = '' # Don't use wrapProgram or the wrapper will duplicate the --search diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 9bb07456e8f2..808fe5db2780 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -603,7 +603,7 @@ stdenvNoCC.mkDerivation { installPhase = if targetPlatform.isCygwin then '' - echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_bin}/lib" >> $out + echo addToSearchPath "_linkDeps_inputPath" "${cc_solib}/bin" >> $out # Work around build failure caused by the gnulib workaround for # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114870. remove after # gnulib is updated in core packages (e.g. iconv, gnupatch, gnugrep) diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index 6bbd01da9d2d..c649a493c8ff 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -98,6 +98,7 @@ let "dropAttrs" "dropDerivationAttrs" "keepAttrs" + "enableParallelBuilding" ] ++ dropAttrs ) keepAttrs; @@ -201,7 +202,10 @@ stdenv.mkDerivation ( ); buildInputs = args.overrideBuildInputs or ([ coq ] ++ (args.buildInputs or [ ]) ++ extraBuildInputs); - inherit enableParallelBuilding; + enableParallelBuilding = + lib.warnIf (args ? enableParallelBuilding && args.enableParallelBuilding == true) + "mkCoqDerivation: enableParallelBuilding is enabled by default; remove the explicit setting" + enableParallelBuilding; meta = ( diff --git a/pkgs/build-support/docker/tarsum.nix b/pkgs/build-support/docker/tarsum.nix index 9358c571e94b..6c82fb8f4238 100644 --- a/pkgs/build-support/docker/tarsum.nix +++ b/pkgs/build-support/docker/tarsum.nix @@ -13,9 +13,11 @@ stdenv.mkDerivation { dontUnpack = true; - CGO_ENABLED = 0; - GOFLAGS = "-trimpath"; - GO111MODULE = "off"; + env = { + CGO_ENABLED = 0; + GOFLAGS = "-trimpath"; + GO111MODULE = "off"; + }; buildPhase = '' runHook preBuild diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix index 3fab7442ef25..a2f620b4b638 100644 --- a/pkgs/build-support/fetchgit/tests.nix +++ b/pkgs/build-support/fetchgit/tests.nix @@ -1,4 +1,6 @@ { + stdenv, + config, runCommand, testers, fetchgit, @@ -239,8 +241,11 @@ withGitConfig = let pkgs = import ../../.. { - config.gitConfig = { - url."https://github.com".insteadOf = "https://doesntexist.forsure"; + system = stdenv.hostPlatform.system; + config = config // { + gitConfig = { + url."https://github.com".insteadOf = "https://doesntexist.forsure"; + }; }; }; in diff --git a/pkgs/build-support/setup-hooks/cygwin-dll-link.sh b/pkgs/build-support/setup-hooks/cygwin-dll-link.sh deleted file mode 100644 index a9309925e658..000000000000 --- a/pkgs/build-support/setup-hooks/cygwin-dll-link.sh +++ /dev/null @@ -1,77 +0,0 @@ -# shellcheck shell=bash - -addLinkDLLPaths() { - addToSearchPath "LINK_DLL_FOLDERS" "$1/lib" - addToSearchPath "LINK_DLL_FOLDERS" "$1/bin" -} - -# shellcheck disable=SC2154 -addEnvHooks "$targetOffset" addLinkDLLPaths - -addOutputDLLPaths() { - for output in $(getAllOutputNames); do - addToSearchPath "LINK_DLL_FOLDERS" "${!output}/lib" - addToSearchPath "LINK_DLL_FOLDERS" "${!output}/bin" - done -} - -postInstallHooks+=(addOutputDLLPaths) - -_dllDeps() { - "$OBJDUMP" -p "$1" \ - | sed -n 's/.*DLL Name: \(.*\)/\1/p' \ - | sort -u -} - -_linkDeps() { - local target="$1" dir="$2" check="$3" - echo 'target:' "$target" - local dll - _dllDeps "$target" | while read -r dll; do - echo ' dll:' "$dll" - if [[ -e "$dir/$dll" ]]; then continue; fi - # Locate the DLL - it should be an *executable* file on $LINK_DLL_FOLDERS. - local dllPath - if ! dllPath="$(PATH="$(dirname "$target"):$LINK_DLL_FOLDERS" type -P "$dll")"; then - if [[ -z "$check" || -n "${allowedImpureDLLsMap[$dll]}" ]]; then - continue - fi - echo unable to find "$dll" in "$LINK_DLL_FOLDERS" >&2 - exit 1 - fi - echo ' linking to:' "$dllPath" - CYGWIN+=\ winsymlinks:nativestrict ln -sr "$dllPath" "$dir" - # That DLL might have its own (transitive) dependencies, - # so add also all DLLs from its directory to be sure. - _linkDeps "$dllPath" "$dir" "" - done -} - -linkDLLs() { - # shellcheck disable=SC2154 - if [ ! -d "$prefix" ]; then return; fi - ( - set -e - shopt -s globstar nullglob - - local -a allowedImpureDLLsArray - concatTo allowedImpureDLLsArray allowedImpureDLLs - - local -A allowedImpureDLLsMap; - - for dll in "${allowedImpureDLLsArray[@]}"; do - allowedImpureDLLsMap[$dll]=1 - done - - cd "$prefix" - - # Iterate over any DLL that we depend on. - local target - for target in {bin,libexec}/**/*.{exe,dll}; do - [[ ! -f "$target" || ! -x "$target" ]] || - _linkDeps "$target" "$(dirname "$target")" "1" - done - ) -} - -fixupOutputHooks+=(linkDLLs) diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix index 23e47251488a..353a3813eb69 100644 --- a/pkgs/by-name/_1/_1oom/package.nix +++ b/pkgs/by-name/_1/_1oom/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "1oom"; - version = "1.11.7"; + version = "1.11.8"; outputs = [ "out" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "1oom-fork"; repo = "1oom"; tag = "v${finalAttrs.version}"; - hash = "sha256-pOEs3HQSxER0wUhasxQUyrktka8cRZCtNER0F01BRvk="; + hash = "sha256-Y29Xc8ylXhpQO7dDl7z7XC7+RB4UOIRksZ8RtfaCiEc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ac/acorns/package.nix b/pkgs/by-name/ac/acorns/package.nix new file mode 100644 index 000000000000..5fdc747c3f4c --- /dev/null +++ b/pkgs/by-name/ac/acorns/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "acorns"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "redhat-documentation"; + repo = "acorns"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TqLfEiq4FYrc88aJK047n+pjMNkz7/H9AQZ6wxb1dI0="; + }; + + cargoHash = "sha256-q+XDKVNH1FLggfHlThck3yGDyFL9N7vHlj5cxPCnkdU="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + meta = { + description = "Generate an AsciiDoc release notes document from tracking tickets"; + homepage = "https://redhat-documentation.github.io/acorns/"; + downloadPage = "https://github.com/redhat-documentation/acorns"; + changelog = "https://github.com/redhat-documentation/acorns/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ iamanaws ]; + mainProgram = "acorns"; + }; +}) diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix index 2b0d3601c46b..4f3420a991d8 100644 --- a/pkgs/by-name/ac/acpica-tools/package.nix +++ b/pkgs/by-name/ac/acpica-tools/package.nix @@ -34,21 +34,23 @@ stdenv.mkDerivation (finalAttrs: { "iasl" ]; - env.NIX_CFLAGS_COMPILE = toString [ - "-O3" - ]; + env = { + NIX_CFLAGS_COMPILE = toString [ + "-O3" + ]; + + # i686 builds fail with hardening enabled (due to -Wformat-overflow). Disable + # -Werror altogether to make this derivation less fragile to toolchain + # updates. + NOWERROR = "TRUE"; + + # We can handle stripping ourselves. + # Unless we are on Darwin. Upstream makefiles degrade coreutils install to cp if _APPLE is detected. + INSTALLFLAGS = lib.optionals (!stdenv.hostPlatform.isDarwin) "-m 555"; + }; enableParallelBuilding = true; - # i686 builds fail with hardening enabled (due to -Wformat-overflow). Disable - # -Werror altogether to make this derivation less fragile to toolchain - # updates. - NOWERROR = "TRUE"; - - # We can handle stripping ourselves. - # Unless we are on Darwin. Upstream makefiles degrade coreutils install to cp if _APPLE is detected. - INSTALLFLAGS = lib.optionals (!stdenv.hostPlatform.isDarwin) "-m 555"; - installFlags = [ "PREFIX=${placeholder "out"}" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ad/adriconf/package.nix b/pkgs/by-name/ad/adriconf/package.nix index 08eb000bd892..550cd42d469d 100644 --- a/pkgs/by-name/ad/adriconf/package.nix +++ b/pkgs/by-name/ad/adriconf/package.nix @@ -9,7 +9,6 @@ libdrm, libGL, atkmm, - pcre, gtkmm4, pugixml, libgbm, @@ -44,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: { libdrm libGL atkmm - pcre gtkmm4 pugixml libgbm diff --git a/pkgs/by-name/ad/adrs/package.nix b/pkgs/by-name/ad/adrs/package.nix index 90bbdbf893c9..b54c71c9b1fe 100644 --- a/pkgs/by-name/ad/adrs/package.nix +++ b/pkgs/by-name/ad/adrs/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "adrs"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "joshrotenberg"; repo = "adrs"; tag = "v${finalAttrs.version}"; - hash = "sha256-dHiXnLARzviShnih1gkMehMpsztaofFXToDStd3GWkY="; + hash = "sha256-D1Tg5ep9ri6fj0fLmKqQeMdlAe/Nc38wKTF5dsWxK3k="; }; - cargoHash = "sha256-RThX4n4qn/0cPm8GZLnzbNt5VrMWf0wMXz0G9Im9CHk="; + cargoHash = "sha256-jrKDOLPps/ExGnREQy1yz8Say1bAcvJXHrkLivux4Vg="; meta = { description = "Command-line tool for managing Architectural Decision Records"; diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix index 3352b156efcd..f71fe4e30eb1 100644 --- a/pkgs/by-name/al/allure/package.nix +++ b/pkgs/by-name/al/allure/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "allure"; - version = "2.36.0"; + version = "2.37.0"; src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; - hash = "sha256-sUXVk6v0oJHoyql4i6XKM8D+9jXN/HYCv/mjyhndRxo="; + hash = "sha256-pl0n9X8HnIsazyG7qvJw2wmpwhKa/i7ohlHOsHg9glw="; }; dontConfigure = true; diff --git a/pkgs/by-name/al/althttpd/package.nix b/pkgs/by-name/al/althttpd/package.nix index e8148aa18a5c..4f15ecb9466a 100644 --- a/pkgs/by-name/al/althttpd/package.nix +++ b/pkgs/by-name/al/althttpd/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation { pname = "althttpd"; - version = "0-unstable-2025-08-22"; + version = "0-unstable-2026-01-27"; src = fetchfossil { url = "https://sqlite.org/althttpd/"; - rev = "e9bf26f78e1f5792"; - hash = "sha256-Q16tqhnPzYrFkrHTC8NBrdpsbrpjPUkdxLwmyYqUHZo="; + rev = "7758535a137da507"; + hash = "sha256-9yszcoYpbM9/KDn7zpWgDINZF6azkQVxwlOw7BvRo+4="; }; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix index b8c7d0ee2217..cebbec7a0d10 100644 --- a/pkgs/by-name/an/animeko/package.nix +++ b/pkgs/by-name/an/animeko/package.nix @@ -144,7 +144,10 @@ stdenv.mkDerivation (finalAttrs: { useBwrap = false; }; - env.JAVA_HOME = jetbrains.jdk; + env = { + JAVA_HOME = jetbrains.jdk; + ANDROID_SDK_HOME = "$(pwd)"; + }; gradleFlags = [ "-Dorg.gradle.java.home=${jetbrains.jdk}" @@ -257,8 +260,6 @@ stdenv.mkDerivation (finalAttrs: { ln -sf ${libvlc}/lib $out/lib/app/resources/ ''; - ANDROID_SDK_HOME = "$(pwd)"; - passthru.updateScript = writeShellScript "update-animeko" '' ${lib.getExe nix-update} animeko $(nix-build -A animeko.mitmCache.updateScript) diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json index e5c6b4e09f40..a87cd26156b5 100644 --- a/pkgs/by-name/an/antigravity/information.json +++ b/pkgs/by-name/an/antigravity/information.json @@ -1,22 +1,22 @@ { - "version": "1.16.5", + "version": "1.18.4", "vscodeVersion": "1.107.0", "sources": { "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.16.5-6703236727046144/linux-x64/Antigravity.tar.gz", - "sha256": "1953c62452d32a72e595f7fa832c7a7ed9072d22c9cf99df3a22c249a97f5e97" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.18.4-5780041996042240/linux-x64/Antigravity.tar.gz", + "sha256": "f97d790d1fb74e8ccb9ddb6af301a2b60391aed22f633f1a2baf86862aa65826" }, "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.16.5-6703236727046144/linux-arm/Antigravity.tar.gz", - "sha256": "b828e4a6e5133283b418a3e2afd2f97111ffc804cc2eef56c0e2327396b8ad97" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.18.4-5780041996042240/linux-arm/Antigravity.tar.gz", + "sha256": "eee54e88290cf4b0b8feb56283a04ab31ce4746465ca0bd1afd3e4505b2f95ea" }, "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.16.5-6703236727046144/darwin-x64/Antigravity.zip", - "sha256": "6d859d2427ac9f4cbd435e1568d6a626186e153f38263c4dd3e1c16672f79005" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.18.4-5780041996042240/darwin-x64/Antigravity.zip", + "sha256": "fdff8b6fdfda9a28ac5a147f174337c3cf515b10cddc8466af5a32c6deaaca87" }, "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.16.5-6703236727046144/darwin-arm/Antigravity.zip", - "sha256": "4b4ece88e76e01ffe7e774a8eadb21134011d0177adb90464ef8f6c2102ff45d" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.18.4-5780041996042240/darwin-arm/Antigravity.zip", + "sha256": "f1ccd9e3f051431b54b95b905afed8ec1b8b1a3f1bc841b3617b143553fd6f51" } } } diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index 188e0a1c2456..7fd9433743b1 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "1.1.6"; + version = "1.1.9"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-7WNWbTs+r3L2O6ixK1yEElwdFfRPqx2yX+nPRy3nSEM="; + hash = "sha256-gYLLKejvyQTbDEua51RxxQy1aSUsp8EJrg/7b5xrEBs="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-mSnEga9JtS1ObMJpS0uo1RZs2ubpTwsErtmD8rMe5gg="; + vendorHash = "sha256-Iv9aRb4soepckHl0cQMb3TqHjiNn19QLFCprTunWiO8="; excludedPackages = [ "internal/gen-jsonschema" diff --git a/pkgs/by-name/ar/arc-theme/package.nix b/pkgs/by-name/ar/arc-theme/package.nix index a1e3bf7649c9..3f4287d1f1ef 100644 --- a/pkgs/by-name/ar/arc-theme/package.nix +++ b/pkgs/by-name/ar/arc-theme/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; # Fontconfig error: Cannot load default config file: No such file: (null) - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; mesonFlags = [ # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity" diff --git a/pkgs/by-name/ar/ardour/package.nix b/pkgs/by-name/ar/ardour/package.nix index 9f7f7be04f7d..1a2e14771506 100644 --- a/pkgs/by-name/ar/ardour/package.nix +++ b/pkgs/by-name/ar/ardour/package.nix @@ -192,14 +192,17 @@ stdenv.mkDerivation ( ] ++ lib.optional optimize "--optimize"; - env.NIX_CFLAGS_COMPILE = toString [ - # 'ioprio_set' syscall support: - "-D_GNU_SOURCE" - # compiler doesn't find headers without these: - "-I${lib.getDev serd}/include/serd-0" - "-I${lib.getDev sratom}/include/sratom-0" - "-I${lib.getDev sord}/include/sord-0" - ]; + env = { + NIX_CFLAGS_COMPILE = toString [ + # 'ioprio_set' syscall support: + "-D_GNU_SOURCE" + # compiler doesn't find headers without these: + "-I${lib.getDev serd}/include/serd-0" + "-I${lib.getDev sratom}/include/sratom-0" + "-I${lib.getDev sord}/include/sord-0" + ]; + LINKFLAGS = "-lpthread"; + }; postInstall = '' # wscript does not install these for some reason @@ -227,8 +230,6 @@ stdenv.mkDerivation ( }" ''; - LINKFLAGS = "-lpthread"; - meta = { description = "Multi-track hard disk recording software"; longDescription = '' diff --git a/pkgs/by-name/ar/ardour_8/package.nix b/pkgs/by-name/ar/ardour_8/package.nix index e21a47802dcd..aa870cdd312d 100644 --- a/pkgs/by-name/ar/ardour_8/package.nix +++ b/pkgs/by-name/ar/ardour_8/package.nix @@ -216,7 +216,7 @@ stdenv.mkDerivation ( }" ''; - LINKFLAGS = "-lpthread"; + env.LINKFLAGS = "-lpthread"; meta = { description = "Multi-track hard disk recording software"; diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index d98a6c2e98c5..82ca81024f30 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "art"; - version = "1.26.1"; + version = "1.26.2"; src = fetchFromGitHub { owner = "artpixls"; repo = "ART"; tag = finalAttrs.version; - hash = "sha256-Abh3Hj3wKdWNN7rdU61MgkZHmoa7ufYzZGKsrxplkj0="; + hash = "sha256-zjGb5XiXry16xHlrlDw1b3ROYgHuJe3srRFWY/AIBRE="; }; # Fix the build with CMake 4. @@ -105,12 +105,18 @@ stdenv.mkDerivation (finalAttrs: { "-DCTL_INCLUDE_DIR=${color-transformation-language}/include/CTL" ]; - CMAKE_CXX_FLAGS = toString [ - "-std=c++11" - "-Wno-deprecated-declarations" - "-Wno-unused-result" - ]; - env.CXXFLAGS = "-include cstdint"; # needed at least with gcc13 on aarch64-linux + env = { + CMAKE_CXX_FLAGS = toString [ + "-std=c++11" + "-Wno-deprecated-declarations" + "-Wno-unused-result" + ]; + # needed at least with gcc13 on aarch64-linux + CXXFLAGS = toString [ + "-include" + "cstdint" + ]; + }; meta = { description = "Raw converter based on RawTherapee"; diff --git a/pkgs/by-name/au/authentik/client-go-config.patch b/pkgs/by-name/au/authentik/client-go-config.patch new file mode 100644 index 000000000000..8398b16160c7 --- /dev/null +++ b/pkgs/by-name/au/authentik/client-go-config.patch @@ -0,0 +1,9 @@ +diff --git a/config.yaml b/config.yaml +index 2f07ea7..0f90432 100644 +--- a/config.yaml ++++ b/config.yaml +@@ -4,3 +4,4 @@ additionalProperties: + packageName: api + enumClassPrefix: true + useOneOfDiscriminatorLookup: true ++ disallowAdditionalPropertiesIfNotPresent: false diff --git a/pkgs/by-name/au/authentik/ldap.nix b/pkgs/by-name/au/authentik/ldap.nix index 5d4159ae9737..bf6b88202e11 100644 --- a/pkgs/by-name/au/authentik/ldap.nix +++ b/pkgs/by-name/au/authentik/ldap.nix @@ -1,6 +1,7 @@ { buildGoModule, authentik, + apiGoVendorHook, vendorHash, }: @@ -9,6 +10,8 @@ buildGoModule { inherit (authentik) version src; inherit vendorHash; + nativeBuildInputs = [ apiGoVendorHook ]; + env.CGO_ENABLED = 0; subPackages = [ "cmd/ldap" ]; diff --git a/pkgs/by-name/au/authentik/outposts.nix b/pkgs/by-name/au/authentik/outposts.nix index 485dd81e8c20..0548c36e888d 100644 --- a/pkgs/by-name/au/authentik/outposts.nix +++ b/pkgs/by-name/au/authentik/outposts.nix @@ -1,10 +1,11 @@ { callPackage, authentik, + apiGoVendorHook ? authentik.apiGoVendorHook, vendorHash ? authentik.proxy.vendorHash, }: { - ldap = callPackage ./ldap.nix { inherit vendorHash; }; - proxy = callPackage ./proxy.nix { inherit vendorHash; }; - radius = callPackage ./radius.nix { inherit vendorHash; }; + ldap = callPackage ./ldap.nix { inherit apiGoVendorHook vendorHash; }; + proxy = callPackage ./proxy.nix { inherit apiGoVendorHook vendorHash; }; + radius = callPackage ./radius.nix { inherit apiGoVendorHook vendorHash; }; } diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 8a4a7c6409e3..680c719f0f06 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -10,18 +10,23 @@ nodejs_24, python3, makeWrapper, + openapi-generator-cli, + go, + typescript, + makeSetupHook, + writeShellScript, }: let nodejs = nodejs_24; - version = "2025.10.1"; + version = "2025.12.4"; src = fetchFromGitHub { owner = "goauthentik"; repo = "authentik"; tag = "version/${version}"; - hash = "sha256-HowB6DTGCqz770fKYbnE+rQ11XRV0WSNkLD+HSWZwz8="; + hash = "sha256-alTyrMBbjZbw4jhEna8saabf93sqSrZCu+Z5xH3pZ7M="; }; meta = { @@ -39,6 +44,90 @@ let ]; }; + client-go = stdenvNoCC.mkDerivation { + pname = "authentik-client-go"; + version = "3.${version}"; + inherit meta; + + src = fetchFromGitHub { + owner = "goauthentik"; + repo = "client-go"; + tag = "v3.${version}"; + hash = "sha256-+/CfOE2HkBU+ZddvdXGenB/z8xNFk8cujpZpMXyh3cY="; + }; + + patches = [ + ./client-go-config.patch + ]; + + postPatch = '' + substituteInPlace ./config.yaml \ + --replace-fail '/local' "$(pwd)" + ''; + + nativeBuildInputs = [ + openapi-generator-cli + go + ]; + + buildPhase = '' + runHook preBuild + + openapi-generator-cli generate \ + -i ${src}/schema.yml -o $out \ + -g go \ + -c ./config.yaml + + gofmt -w $out + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp go.mod go.sum $out + + cd $out + rm -rf test + rm -f .travis.yml git_push.sh + + runHook postInstall + ''; + }; + + client-ts = stdenvNoCC.mkDerivation { + pname = "authentik-client-ts"; + inherit version src meta; + + postPatch = '' + substituteInPlace ./scripts/api/ts-config.yaml \ + --replace-fail '/local' "$(pwd)" + ''; + + nativeBuildInputs = [ + nodejs + openapi-generator-cli + typescript + ]; + + buildPhase = '' + runHook preBuild + + openapi-generator-cli generate \ + -i ./schema.yml -o $out \ + -g typescript-fetch \ + -c ./scripts/api/ts-config.yaml \ + --additional-properties=npmVersion=${version} \ + --git-repo-id authentik --git-user-id goauthentik + + cd $out + npm run build + + runHook postBuild + ''; + }; + # prefetch-npm-deps does not save all dependencies even though the lockfile is fine website-deps = stdenvNoCC.mkDerivation { pname = "authentik-website-deps"; @@ -48,8 +137,8 @@ let outputHash = { - "aarch64-linux" = "sha256-aXXlzTsZp5mOrsxy9oHNzcc+1cFSnbC9RmtawBohmLI="; - "x86_64-linux" = "sha256-Hi0HXzwTLuer0v4IKF3aim0tVe7AVLi67DiMimrIq5s="; + "aarch64-linux" = "sha256-GL5FPIBnoEXYtw8DPJpRPe3tT3qioN4AdoeOmCoiYsM="; + "x86_64-linux" = "sha256-AnceTipq6uUvTbOAZanVshAbAJ9LS1kwImbttTOcWxc="; } .${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform"); @@ -119,8 +208,8 @@ let outputHash = { - "aarch64-linux" = "sha256-t/jyzG3ibTW3fu8Gl1tWkSjMG6Lek/7JDccDrZX6sD0="; - "x86_64-linux" = "sha256-8I1YAKvgWjM3p9O1mCetZvhZelrfB31w0ZwkZBUEoh4="; + "aarch64-linux" = "sha256-eZZ5Ynj81KwFsU5emPtYZ2CxO8MFvWbJnCHs+L88KQQ="; + "x86_64-linux" = "sha256-yUAyyO1NFav1EptrRYGSzC8dxCxYVj0FmzHk8IckFZM="; } .${stdenvNoCC.hostPlatform.system} or (throw "authentik-webui-deps: unsupported host platform"); outputHashMode = "recursive"; @@ -172,6 +261,10 @@ let find -type d -name node_modules -prune -print -exec cp -rT {} $buildRoot/{} \; popd + chmod -R +w node_modules/@goauthentik + rm -R node_modules/@goauthentik/api + ln -sn ${client-ts} node_modules/@goauthentik/api + pushd node_modules/.bin patchShebangs $(readlink rollup) patchShebangs $(readlink wireit) @@ -208,6 +301,21 @@ let # https://github.com/goauthentik/authentik/pull/16324 django = final.django_5; + ak-guardian = final.buildPythonPackage { + pname = "ak-guardian"; + inherit version src meta; + pyproject = true; + + sourceRoot = "${src.name}/packages/ak-guardian"; + + build-system = with final; [ hatchling ]; + + propagatedBuildInputs = with final; [ + django + typing-extensions + ]; + }; + django-channels-postgres = final.buildPythonPackage { pname = "django-channels-postgres"; inherit version src meta; @@ -330,14 +438,15 @@ let pyproject = true; postPatch = '' - rm lifecycle/system_migrations/tenant_files.py substituteInPlace authentik/root/settings.py \ --replace-fail 'Path(__file__).absolute().parent.parent.parent' "Path(\"$out\")" substituteInPlace authentik/lib/default.yml \ - --replace-fail '/blueprints' "$out/blueprints" \ - --replace-fail './media' '/var/lib/authentik/media' + --replace-fail '/blueprints' "$out/blueprints" substituteInPlace authentik/stages/email/utils.py \ --replace-fail 'web/' '${webui}/' + # allways allow file upload if the data directoy exists + substituteInPlace authentik/admin/files/backends/file.py \ + --replace-fail "and (self._base_dir.is_mount() or (self._base_dir / self.usage.value).is_mount())" "" ''; build-system = [ @@ -351,6 +460,7 @@ let dependencies = with final; [ + ak-guardian argon2-cffi cachetools channels @@ -364,7 +474,6 @@ let django-cte django-dramatiq-postgres django-filter - django-guardian django-model-utils django-pglock django-pgtrigger @@ -375,7 +484,6 @@ let django-tenants djangoql djangorestframework - djangorestframework-guardian docker drf-orjson-renderer drf-spectacular @@ -440,6 +548,31 @@ let inherit (python.pkgs) authentik-django; + # Provide a setup-hook to configure the Go vendor directory with up-to-date API bindings. + # This is done to avoid the `vendorHash` depending on anything in the `client-go` build (e.g. + # openapi-generator-cli version updates changing the produced content) and invalidating the hash. + apiGoVendorHook = + makeSetupHook + { + name = "authentik-api-go-vendor-hook"; + } + ( + writeShellScript "authentik-api-go-vendor-hook" '' + authentikApiGoVendorHook() { + chmod -R +w vendor/goauthentik.io/api + rm -rf vendor/goauthentik.io/api/v3 + cp -r ${client-go} vendor/goauthentik.io/api/v3 + + echo "Finished authentikApiGoVendorHook" + } + + # don't run for FOD, e.g. the `goModules` build + if [ -z ''${outputHash-} ]; then + postConfigureHooks+=(authentikApiGoVendorHook) + fi + '' + ); + proxy = buildGoModule { pname = "authentik-proxy"; inherit version src meta; @@ -453,9 +586,14 @@ let --replace-fail './web' "${authentik-django}/web" ''; + nativeBuildInputs = [ apiGoVendorHook ]; + env.CGO_ENABLED = 0; - vendorHash = "sha256-m2shrCwoVdbtr8B83ZcAyG+J6dEys2xdjtlfFFF4CDo="; + # calculate the vendorHash without other dependencies, so it is only based on the `go.sum` file + overrideModAttrs.postPatch = ""; + + vendorHash = "sha256-pdQg02f1K4nOhsnadoplQYOhEybqZxn+yDQRN5RNygM="; postInstall = '' mv $out/bin/server $out/bin/authentik @@ -500,9 +638,10 @@ stdenvNoCC.mkDerivation { ''; passthru = { - inherit proxy; + inherit proxy apiGoVendorHook; outposts = callPackages ./outposts.nix { inherit (proxy) vendorHash; + inherit apiGoVendorHook; }; }; diff --git a/pkgs/by-name/au/authentik/proxy.nix b/pkgs/by-name/au/authentik/proxy.nix index 37cb9e88dc82..f1db56006460 100644 --- a/pkgs/by-name/au/authentik/proxy.nix +++ b/pkgs/by-name/au/authentik/proxy.nix @@ -1,6 +1,7 @@ { buildGoModule, authentik, + apiGoVendorHook, vendorHash, }: @@ -9,6 +10,8 @@ buildGoModule { inherit (authentik) version src; inherit vendorHash; + nativeBuildInputs = [ apiGoVendorHook ]; + env.CGO_ENABLED = 0; subPackages = [ "cmd/proxy" ]; diff --git a/pkgs/by-name/au/authentik/radius.nix b/pkgs/by-name/au/authentik/radius.nix index 4c44ecfe6d07..ba348a72515f 100644 --- a/pkgs/by-name/au/authentik/radius.nix +++ b/pkgs/by-name/au/authentik/radius.nix @@ -1,6 +1,7 @@ { buildGoModule, authentik, + apiGoVendorHook, vendorHash, }: @@ -9,6 +10,8 @@ buildGoModule { inherit (authentik) version src; inherit vendorHash; + nativeBuildInputs = [ apiGoVendorHook ]; + env.CGO_ENABLED = 0; subPackages = [ "cmd/radius" ]; diff --git a/pkgs/by-name/av/avalanche-cli/package.nix b/pkgs/by-name/av/avalanche-cli/package.nix index f2d83a65fe1a..959786285291 100644 --- a/pkgs/by-name/av/avalanche-cli/package.nix +++ b/pkgs/by-name/av/avalanche-cli/package.nix @@ -26,10 +26,12 @@ buildGoModule (finalAttrs: { proxyVendor = true; vendorHash = "sha256-0+YwlCHjiU46y333RSuaha4pLKFTYlj+M9+TFAALamY="; - # Fix error: 'Caught SIGILL in blst_cgo_init' - # https://github.com/bnb-chain/bsc/issues/1521 - CGO_CFLAGS = "-O -D__BLST_PORTABLE__"; - CGO_CFLAGS_ALLOW = "-O -D__BLST_PORTABLE__"; + env = { + # Fix error: 'Caught SIGILL in blst_cgo_init' + # https://github.com/bnb-chain/bsc/issues/1521 + CGO_CFLAGS = "-O -D__BLST_PORTABLE__"; + CGO_CFLAGS_ALLOW = "-O -D__BLST_PORTABLE__"; + }; ldflags = [ "-s" diff --git a/pkgs/by-name/av/avdump3/package.nix b/pkgs/by-name/av/avdump3/package.nix index 06bbb5a6149d..b1b850c9da1a 100644 --- a/pkgs/by-name/av/avdump3/package.nix +++ b/pkgs/by-name/av/avdump3/package.nix @@ -2,9 +2,12 @@ lib, stdenv, fetchzip, + autoPatchelfHook, + makeBinaryWrapper, + jq, dotnet-runtime, zlib, - runtimeShell, + libzen, }: stdenv.mkDerivation { @@ -17,21 +20,36 @@ stdenv.mkDerivation { stripRoot = false; }; + nativeBuildInputs = [ + autoPatchelfHook + makeBinaryWrapper + jq + ]; + + buildInputs = [ + zlib + libzen + stdenv.cc.cc.lib + ]; + installPhase = '' runHook preInstall + mkdir -p $out/share/avdump3 $out/bin mv * $out/share/avdump3 - cat > $out/bin/avdump3 < tmp.json + mv tmp.json $out/share/avdump3/AVDump3CL.runtimeconfig.json + + makeBinaryWrapper ${dotnet-runtime}/bin/dotnet $out/bin/avdump3 \ + --add-flags $out/share/avdump3/AVDump3CL.dll + runHook postInstall ''; - dontPatchELF = true; - meta = { mainProgram = "avdump3"; description = "Tool for extracting audio/video metadata from media files and uploading it to AniDB"; diff --git a/pkgs/by-name/aw/awsume/package.nix b/pkgs/by-name/aw/awsume/package.nix index a9cc42881dcb..56c31bccc45e 100644 --- a/pkgs/by-name/aw/awsume/package.nix +++ b/pkgs/by-name/aw/awsume/package.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-lm9YANYckyHDoNbB1wytBm55iyBmUuxFPmZupfpReqc="; }; - AWSUME_SKIP_ALIAS_SETUP = 1; + env.AWSUME_SKIP_ALIAS_SETUP = 1; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ba/backblaze-b2/0001-fix-error-with-pytest-4.0.patch b/pkgs/by-name/ba/backblaze-b2/0001-fix-error-with-pytest-4.0.patch new file mode 100644 index 000000000000..7a1a44954fbe --- /dev/null +++ b/pkgs/by-name/ba/backblaze-b2/0001-fix-error-with-pytest-4.0.patch @@ -0,0 +1,40 @@ +From 898cfcc19af66f5a9273cd04b43cf76ae9ec6da9 Mon Sep 17 00:00:00 2001 +From: Michael Daniels +Date: Tue, 17 Feb 2026 21:17:33 -0500 +Subject: [PATCH] fix error with pytest 4.0 + +https://docs.pytest.org/en/stable/deprecations.html#pytest-plugins-in-non-top-level-conftest-files +--- + test/conftest.py | 1 + + test/integration/conftest.py | 3 --- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/test/conftest.py b/test/conftest.py +index 8f0629b..53f3e32 100644 +--- a/test/conftest.py ++++ b/test/conftest.py +@@ -12,6 +12,7 @@ import sys + + import pytest + ++pytest_plugins = ['b2sdk.v3.testing'] + + @pytest.hookimpl + def pytest_configure(config): +diff --git a/test/integration/conftest.py b/test/integration/conftest.py +index 1a7226d..035a2be 100755 +--- a/test/integration/conftest.py ++++ b/test/integration/conftest.py +@@ -47,9 +47,6 @@ ROOT_PATH = pathlib.Path(__file__).parent.parent.parent + GENERAL_BUCKET_NAME_PREFIX = 'clitst' + + +-pytest_plugins = ['b2sdk.v3.testing'] +- +- + @pytest.fixture(scope='session', autouse=True) + def summary_notes(request, worker_id): + capmanager = request.config.pluginmanager.getplugin('capturemanager') +-- +2.51.2 + diff --git a/pkgs/by-name/ba/backblaze-b2/package.nix b/pkgs/by-name/ba/backblaze-b2/package.nix index 8d2ff950131f..7feab2059fbd 100644 --- a/pkgs/by-name/ba/backblaze-b2/package.nix +++ b/pkgs/by-name/ba/backblaze-b2/package.nix @@ -11,16 +11,18 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "backblaze-b2"; - version = "4.4.2"; + version = "4.5.1"; pyproject = true; src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; tag = "v${finalAttrs.version}"; - hash = "sha256-ut1e/A36Tp4pgwZx+S8nYmjg3k/2CmRpdUfz3iOXTz0="; + hash = "sha256-0BF4+L47Cx7GNGeNm8nJkEfTLYb6jLxSH3WE+h9B6zA="; }; + patches = [ ./0001-fix-error-with-pytest-4.0.patch ]; + nativeBuildInputs = with python3Packages; [ installShellFiles argcomplete diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index 68c8d313fab7..ef4be96ab1a0 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -21,16 +21,16 @@ let in buildNpmPackage' rec { pname = "balena-cli"; - version = "23.2.31"; + version = "24.0.2"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-hyiMPOTiPgRmCvimepW7tqPoeEr52MLtIFL1t4DDBX8="; + hash = "sha256-E+vwcj6+pYDWlBgXdPagD/VrASelIbRroWC4HAn4c/c="; }; - npmDepsHash = "sha256-zqkrtqQccy08htx24MRoYFglLziDSnr0fldq1uYL5cI="; + npmDepsHash = "sha256-yVxsoemdxCS3oz3ULxPflLLNEdVD2EKRkQa7+7AFdiw="; makeCacheWritable = true; diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix index a245a414b1bc..90a9dd160407 100644 --- a/pkgs/by-name/ba/bambu-studio/package.nix +++ b/pkgs/by-name/ba/bambu-studio/package.nix @@ -3,7 +3,6 @@ lib, binutils, fetchFromGitHub, - fetchpatch, cmake, ninja, pkg-config, @@ -57,13 +56,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "bambu-studio"; - version = "02.04.00.70"; + version = "02.05.00.67"; src = fetchFromGitHub { owner = "bambulab"; repo = "BambuStudio"; tag = "v${finalAttrs.version}"; - hash = "sha256-BrH8gKbc0y76wbWrQxU+0xMJcYAm4Gi/xmECVf6pGkI="; + hash = "sha256-jLaSUs6OmoD0yw1hOcJarYKfr1rbhB2TwRiBBU0utEI="; }; nativeBuildInputs = [ @@ -122,13 +121,6 @@ stdenv.mkDerivation (finalAttrs: { ./patches/no-cereal.patch # Cmake 4 support ./patches/cmake.patch - # Fix build with gcc15 - # https://github.com/bambulab/BambuStudio/pull/8555 - (fetchpatch { - name = "bambu-studio-include-stdint-header.patch"; - url = "https://github.com/bambulab/BambuStudio/commit/434752bf643933f22348d78335abe7f60550e736.patch"; - hash = "sha256-vWqTM6IHL/gBncLk6gZHw+dFe0sdVuPdUqYeVJUbTis="; - }) ]; doCheck = true; diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix index 6b364c284223..fbf07613ed3c 100644 --- a/pkgs/by-name/ba/bant/package.nix +++ b/pkgs/by-name/ba/bant/package.nix @@ -33,7 +33,10 @@ buildBazelPackage rec { "--registry" "file://${registry}" ]; - LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool"; + + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + LIBTOOL = "${cctools}/bin/libtool"; + }; postPatch = '' patchShebangs scripts/create-workspace-status.sh diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix index 486bd3af5a92..2fe57bc41fcb 100644 --- a/pkgs/by-name/ba/bazarr/package.nix +++ b/pkgs/by-name/ba/bazarr/package.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { homepage = "https://www.bazarr.media/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ diogotcorreia ]; mainProgram = "bazarr"; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/bd/bdf2ttf/gcc-15.patch b/pkgs/by-name/bd/bdf2ttf/gcc-15.patch new file mode 100644 index 000000000000..92ffb22a9aad --- /dev/null +++ b/pkgs/by-name/bd/bdf2ttf/gcc-15.patch @@ -0,0 +1,38 @@ +Fetched as: +$ curl -L https://patch-diff.githubusercontent.com/raw/koron/bdf2ttf/pull/9.patch + +From 87d9f987517c78c444d1d425e33c9a5f06ced3ce Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Thu, 22 Jan 2026 06:35:12 +0000 +Subject: [PATCH] bdf.c: fix the build against -std=c23 + +`gcc-15` switched to `c23` by default and `bdf2tff` +started to fail the build as: + +```` +src/bdf.c:131:1: error: conflicting types for 'glyph_open'; have 'bdf_glyph_t *(int, int)' {aka 'struct _bdf_glyph_t *(int, int)'} + 131 | glyph_open(int width, int height) + | ^~~~~~~~~~ +src/bdf.c:60:25: note: previous declaration of 'glyph_open' with type 'bdf_glyph_t *(void)' {aka 'struct _bdf_glyph_t *(void)'} + 60 | static bdf_glyph_t* glyph_open(); + | ^~~~~~~~~~ +```` + +THe change fixed explicit prototype for a forward declaration. +--- + src/bdf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bdf.c b/src/bdf.c +index 0832092..08272ed 100644 +--- a/src/bdf.c ++++ b/src/bdf.c +@@ -57,7 +57,7 @@ static width_table_t cell_width_table[] = { + + static int bdf_load_fh(bdf_t* font, FILE* fp); + static void count_validglyph(bdf_t* font); +-static bdf_glyph_t* glyph_open(); ++static bdf_glyph_t* glyph_open(int width, int height); + static void glyph_close(bdf_glyph_t *glyph); + static char* iscmd(char* target, char* keyword); + static int atoi_next(char** str); diff --git a/pkgs/by-name/bd/bdf2ttf/package.nix b/pkgs/by-name/bd/bdf2ttf/package.nix index e34ec6856808..6e07635481dd 100644 --- a/pkgs/by-name/bd/bdf2ttf/package.nix +++ b/pkgs/by-name/bd/bdf2ttf/package.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation { hash = "sha256-235BTcTaC/30yLlgo0OO2cp3YCHWa87GFJGBx5lmz6o="; }; + patches = [ + # gcc-15 build fix: https://github.com/koron/bdf2ttf/pull/9 + ./gcc-15.patch + ]; + dontConfigure = true; makeFlags = [ "gcc" ]; diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 4d30cc8113e4..f8ef243f1447 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: let pname = "beeper"; - version = "4.2.547"; + version = "4.2.564"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage"; - hash = "sha256-PuthmxdIuftaK9U9r52Fc9b8JzYPwxezRhWjdyo+nmA="; + hash = "sha256-AvcERjQizf/8MsFjC9NtkMne/2ZFLPxiL0HMQsyo8TE="; }; appimageContents = appimageTools.extract { inherit pname version src; diff --git a/pkgs/by-name/bf/bftpd/package.nix b/pkgs/by-name/bf/bftpd/package.nix index 7f146a5dcf5a..01578c892844 100644 --- a/pkgs/by-name/bf/bftpd/package.nix +++ b/pkgs/by-name/bf/bftpd/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxcrypt ]; - CFLAGS = "-std=gnu89"; + env.CFLAGS = "-std=gnu89"; preConfigure = '' sed -re 's/-[og] 0//g' -i Makefile* diff --git a/pkgs/by-name/bl/blockbook/package.nix b/pkgs/by-name/bl/blockbook/package.nix index 411221f63052..5ecf87529d88 100644 --- a/pkgs/by-name/bl/blockbook/package.nix +++ b/pkgs/by-name/bl/blockbook/package.nix @@ -49,7 +49,7 @@ buildGoModule rec { "-X github.com/trezor/blockbook/common.buildDate=unknown" ]; - CGO_LDFLAGS = [ + env.CGO_LDFLAGS = toString [ "-L${lib.getLib stdenv.cc.cc}/lib" "-lrocksdb" "-lz" diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix index d5d1ac88333a..53dbfc6655a6 100644 --- a/pkgs/by-name/bl/bluespec/package.nix +++ b/pkgs/by-name/bl/bluespec/package.nix @@ -177,12 +177,17 @@ stdenv.mkDerivation rec { cctools ]; - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals (stdenv.cc.isClang) [ - # wide_data.cxx:1750:15: error: variable length arrays in C++ are a Clang extension [-Werror,-Wvla-cxx-extension] - "-Wno-error" - ] - ); + env = + lib.optionalAttrs (stdenv.cc.isClang) { + NIX_CFLAGS_COMPILE = toString [ + # wide_data.cxx:1750:15: error: variable length arrays in C++ are a Clang extension [-Werror,-Wvla-cxx-extension] + "-Wno-error" + ]; + } + // lib.optionalAttrs (withSuiteCheck && stdenv.hostPlatform.isLinux) { + # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) + LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; + }; makeFlags = [ "NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices-src instead of the subrepo) @@ -235,11 +240,6 @@ stdenv.mkDerivation rec { checkTarget = if withSuiteCheck then "checkparallel" else "check-smoke"; # this is the shortest check but "check-suite" tests much more - # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = lib.optionalString ( - withSuiteCheck && stdenv.hostPlatform.isLinux - ) "${glibcLocales}/lib/locale/locale-archive"; - nativeCheckInputs = [ gmp-static iverilog diff --git a/pkgs/by-name/bo/borg-sans-mono/package.nix b/pkgs/by-name/bo/borg-sans-mono/package.nix index c27f41e0d335..151282cd02e0 100644 --- a/pkgs/by-name/bo/borg-sans-mono/package.nix +++ b/pkgs/by-name/bo/borg-sans-mono/package.nix @@ -27,6 +27,6 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/marnen/borg-sans-mono"; license = lib.licenses.asl20; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ atila ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/bo/botamusique/package.nix b/pkgs/by-name/bo/botamusique/package.nix index 55b85a96111d..8d86a367d3ee 100644 --- a/pkgs/by-name/bo/botamusique/package.nix +++ b/pkgs/by-name/bo/botamusique/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { --replace "version = 'git'" "version = '${version}'" ''; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/br/browserpass/package.nix b/pkgs/by-name/br/browserpass/package.nix index 3e7f17629ed2..24138be165e7 100644 --- a/pkgs/by-name/br/browserpass/package.nix +++ b/pkgs/by-name/br/browserpass/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { sed -i -e 's/INSTALL =.*/INSTALL = install/' Makefile ''; - DESTDIR = placeholder "out"; + env.DESTDIR = placeholder "out"; postConfigure = '' make configure diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix index af0138114a91..455360f85785 100644 --- a/pkgs/by-name/br/bruno-cli/package.nix +++ b/pkgs/by-name/br/bruno-cli/package.nix @@ -42,7 +42,7 @@ buildNpmPackage { patchShebangs packages/*/node_modules ''; - ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index a398b4b1ae4a..461f2882a82f 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -84,7 +84,7 @@ buildNpmPackage rec { patchShebangs packages/*/node_modules ''; - ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; # remove giflib dependency npmRebuildFlags = [ "--ignore-scripts" ]; diff --git a/pkgs/by-name/bt/btdu/package.nix b/pkgs/by-name/bt/btdu/package.nix index 97b700818d79..38e0458495f7 100644 --- a/pkgs/by-name/bt/btdu/package.nix +++ b/pkgs/by-name/bt/btdu/package.nix @@ -39,7 +39,6 @@ buildDubPackage rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ - atila cybershadow ]; mainProgram = "btdu"; diff --git a/pkgs/by-name/bu/bumblebee/package.nix b/pkgs/by-name/bu/bumblebee/package.nix index c1bbb4ae962b..3c454536bdc1 100644 --- a/pkgs/by-name/bu/bumblebee/package.nix +++ b/pkgs/by-name/bu/bumblebee/package.nix @@ -159,14 +159,14 @@ stdenv.mkDerivation rec { # Don't use a special group, just reuse wheel. "CONF_GID=wheel" # see #10282 - #"CONF_PRIMUS_LD_PATH=${primusLibs}" + #"CONF_PRIMUS_LD_PATH=${primus-lib}" ] ++ lib.optionals useNvidia [ "CONF_LDPATH_NVIDIA=${nvidiaLibs}" "CONF_MODPATH_NVIDIA=${nvidia_x11.bin}/lib/xorg/modules" ]; - CFLAGS = [ + env.CFLAGS = toString [ "-DX_MODULE_APPENDS=\\\"${xmodules}\\\"" ]; diff --git a/pkgs/by-name/bu/bupc/package.nix b/pkgs/by-name/bu/bupc/package.nix index 0077d8ad9730..e25dbf1e111b 100644 --- a/pkgs/by-name/bu/bupc/package.nix +++ b/pkgs/by-name/bu/bupc/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # Used during the configure phase - ENVCMD = "${coreutils}/bin/env"; + env.ENVCMD = "${coreutils}/bin/env"; buildInputs = [ perl ]; diff --git a/pkgs/by-name/ca/canon-capt/package.nix b/pkgs/by-name/ca/canon-capt/package.nix index 389e7c898eda..52219a33e7f8 100644 --- a/pkgs/by-name/ca/canon-capt/package.nix +++ b/pkgs/by-name/ca/canon-capt/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { # Fix for 'ppdc: Unable to find include file ""', which blocks '*.ppd' generation. # Issue occurs in hermetic sandbox; this workaround is the current solution. # Source: https://github.com/NixOS/nixpkgs/blob/9997402000a82eda4327fde36291234118c7515e/pkgs/misc/drivers/hplip/default.nix#L160 - CUPS_DATADIR = "${cups}/share/cups"; + env.CUPS_DATADIR = "${cups}/share/cups"; configurePhase = '' runHook preConfigure diff --git a/pkgs/by-name/ca/capitaine-cursors/package.nix b/pkgs/by-name/ca/capitaine-cursors/package.nix index b2d7fb323971..699aec8c5f0f 100644 --- a/pkgs/by-name/ca/capitaine-cursors/package.nix +++ b/pkgs/by-name/ca/capitaine-cursors/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec { ''; # Complains about not being able to find the fontconfig config file otherwise - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; buildInputs = [ inkscape diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix index ad6b054a84b1..18161241ebc4 100644 --- a/pkgs/by-name/ca/caprine/package.nix +++ b/pkgs/by-name/ca/caprine/package.nix @@ -20,7 +20,7 @@ buildNpmPackage rec { hash = "sha256-hBGsqOqKMHNy2SNw1kHCQq1lPDd2S36L5pdKgD2O8FA="; }; - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; npmDepsHash = "sha256-FgOHuMMUX92VHF6hdznoi7bhO/27t6+l038kmpqjctQ="; diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix index 66bb02785d8e..0bc7cd8fc2d6 100644 --- a/pkgs/by-name/ca/cargo-dist/package.nix +++ b/pkgs/by-name/ca/cargo-dist/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-dist"; - version = "0.30.3"; + version = "0.30.4"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${finalAttrs.version}"; - hash = "sha256-x59bUgd89XAwuHwGvREDqAS/cI4Ot7HGTONGbTOgzw8="; + hash = "sha256-Woaa+KNRLqTRgglGM50L8w6UXlnDTcUHQZ20AYbZPnE="; }; - cargoHash = "sha256-OTbUTYxqEzE3hyHq2hCbhigz5xJT2Bjd/pu6EI+0aWA="; + cargoHash = "sha256-DVIckYfIf7EqqRXQbNI3msvDopSY7RxR11942w3XBjg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 17607da8aeb2..8e92fbdbe0f8 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-expand"; - version = "1.0.120"; + version = "1.0.121"; src = fetchFromGitHub { owner = "dtolnay"; repo = "cargo-expand"; tag = finalAttrs.version; - hash = "sha256-KXnAKv8202Trkkr9D9HRmxTOZ67M2Jt4dhZ9o7D86uI="; + hash = "sha256-Mwc1toL3kF+ZSmSwE24FRHXtIGHB0IVBiKtHGEpsn2E="; }; - cargoHash = "sha256-eCDjGKLPy98SuknzzIE2GZEsxFjNZKuV30Y5nBQao3s="; + cargoHash = "sha256-F5g70cQYSiz63DD4uQTYIQ6I7Xf6fXL4ZwfDzOYpXzQ="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix index 66aa21aa6bdd..2ef25d040f36 100644 --- a/pkgs/by-name/ca/cargo-hack/package.nix +++ b/pkgs/by-name/ca/cargo-hack/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-hack"; - version = "0.6.42"; + version = "0.6.43"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-ebKnXTEWROIy4MREcBQ+ahbQoQZCSttiCMrgW+/buj4="; + hash = "sha256-5C2qqmP+k7WtvjEOPuhlcj2MbcOJJEMsAwmr928Uw4E="; }; - cargoHash = "sha256-4Vg0JD2FeZV8SiD5Kzg1KLkPnQ20NVlkbiguwbpYip8="; + cargoHash = "sha256-sG+ltuEbptHeYgXAUIOlQ82f5z8MvKwHWHsU9aGC/K0="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index 6c4f39d2aa91..18b8a9b3a699 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -57,10 +57,12 @@ rustPlatform.buildRustPackage (finalAttrs: { }; }; - # `cargo-llvm-cov` reads these environment variables to find these binaries, - # which are needed to run the tests - LLVM_COV = "${llvm}/bin/llvm-cov"; - LLVM_PROFDATA = "${llvm}/bin/llvm-profdata"; + env = { + # `cargo-llvm-cov` reads these environment variables to find these binaries, + # which are needed to run the tests + LLVM_COV = "${llvm}/bin/llvm-cov"; + LLVM_PROFDATA = "${llvm}/bin/llvm-profdata"; + }; nativeCheckInputs = [ gitMinimal diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix index 02f170bb678e..1cf4bcc7e3bd 100644 --- a/pkgs/by-name/ca/cargo-show-asm/package.nix +++ b/pkgs/by-name/ca/cargo-show-asm/package.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-show-asm"; - version = "0.2.55"; + version = "0.2.56"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-ZSPlFDnLVQp1uz1VrbXmw8bAM1/ZWojAv7PSFG+k2Pw="; + hash = "sha256-PBvcAIqCx29UqV8Ky3j0JF1aN6dbFOKxmwvJt4hAut0="; }; - cargoHash = "sha256-M4nn9MnFtyHh9QX12CHGGOL4gkTy9lozd87Rph4+OBA="; + cargoHash = "sha256-73LAMjYf3yEuBrk45/J2dArc65BAEO4kxrKp6GhBnxs="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix index fc6638e8514a..3bfc766dc9cb 100644 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix @@ -17,6 +17,8 @@ cargo-tauri.overrideAttrs ( hash = "sha256-UE/mJ0WdbVT4E1YuUCtu80UB+1WR+KRWs+4Emy3Nclc="; }; + patches = [ ]; + # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${finalAttrs.src.name}/tooling/cli"; diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix index f9a4b7e46cda..653594014592 100644 --- a/pkgs/by-name/ca/cargo-typify/package.nix +++ b/pkgs/by-name/ca/cargo-typify/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-typify"; - version = "0.1.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "oxidecomputer"; repo = "typify"; rev = "v${finalAttrs.version}"; - hash = "sha256-vokhWIY5iikTyADrqxp6DIq+tJ+xdFPebDFTddJnstA="; + hash = "sha256-czVxvsRhKnNnvPmONF+pTzZG1tizfCCbThgPhaI8TLo="; }; - cargoHash = "sha256-1qxWFyA9xCnyDES27uj7gDc5Nf6qdikNkpuf/DP/NAU="; + cargoHash = "sha256-7z/gWIl2HqEkpRcWXZv6QQmLdJVJQfY7VCVP2ik5Mps="; nativeBuildInputs = [ rustfmt diff --git a/pkgs/by-name/ca/cavif/package.nix b/pkgs/by-name/ca/cavif/package.nix new file mode 100644 index 000000000000..e34ca888f022 --- /dev/null +++ b/pkgs/by-name/ca/cavif/package.nix @@ -0,0 +1,44 @@ +{ + lib, + rustPlatform, + fetchCrate, + nasm, + nix-update-script, + nixos-icons, + runCommand, + testers, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cavif"; + version = "1.6.0"; + + src = fetchCrate { + inherit (finalAttrs) pname version; + hash = "sha256-F2b03x+jklgxa3VcRA3y0wuK7AQ2LJtCEvCa6eFeG3w="; + }; + + cargoHash = "sha256-x/0Kgf8oWjL6m2/8ol32EJpKkWSgBRbdCTay6KYrtzg="; + + nativeBuildInputs = [ nasm ]; + + passthru = { + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + encode = runCommand "cavif-encode-test" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } '' + cavif ${nixos-icons}/share/icons/hicolor/512x512/apps/nix-snowflake.png -o $out + ''; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Encoder/converter CLI for AVIF images"; + homepage = "https://github.com/kornelski/cavif-rs"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nettika ]; + mainProgram = "cavif"; + }; +}) diff --git a/pkgs/by-name/cd/cdk8s-cli/package.nix b/pkgs/by-name/cd/cdk8s-cli/package.nix index 165c044da9c7..9cec2ba1663e 100644 --- a/pkgs/by-name/cd/cdk8s-cli/package.nix +++ b/pkgs/by-name/cd/cdk8s-cli/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdk8s-cli"; - version = "2.204.7"; + version = "2.204.9"; src = fetchFromGitHub { owner = "cdk8s-team"; repo = "cdk8s-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-+VY9vGGb/Fk2YhqDLDsdA/2jjKsiyGEOgaY+YNr0LCo="; + hash = "sha256-FV9/v8/UFrLtNPIZCh8No8A7n5oIzd9BlyjP1np8VZY="; }; yarnOfflineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-BFkXKEpK/iTaO7MnkqyTt0VX+yYbSy0y8eqrQb88JdM="; + hash = "sha256-4/1euuWSaZcRO2gwMj55g+m+K46D/bEd+yFJojGap5k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cd/cdktf-cli/package.nix b/pkgs/by-name/cd/cdktn-cli/package.nix similarity index 72% rename from pkgs/by-name/cd/cdktf-cli/package.nix rename to pkgs/by-name/cd/cdktn-cli/package.nix index 7d338e863da8..33b3856011d8 100644 --- a/pkgs/by-name/cd/cdktf-cli/package.nix +++ b/pkgs/by-name/cd/cdktn-cli/package.nix @@ -8,7 +8,7 @@ fixup-yarn-lock, go, makeWrapper, - nodejs, + nodejs_20, nix-update-script, patchelf, removeReferencesTo, @@ -18,26 +18,26 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "cdktf-cli"; - version = "0.21.0"; + pname = "cdktn-cli"; + version = "0.22.0"; src = fetchFromGitHub { - owner = "hashicorp"; - repo = "terraform-cdk"; + owner = "open-constructs"; + repo = "cdk-terrain"; tag = "v${finalAttrs.version}"; - hash = "sha256-iqy8j1bqwjSRBOj8kjFtAq9dLiv6dDbJsiFGQUhGW7k="; + hash = "sha256-KgDRQ76ePLJEdULMCTJTouMaWu0SCeV4NwNW2WpoaNY="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-qGjzy/+u8Ui9aHK0sX3MfYbkj5Cqab4RlhOgrwbEmGs="; + hash = "sha256-0aOwRdfCTiQHmWzOk+ExLX+/EAryxheyILe7L7oyd4w="; }; hcl2json-go-modules = (buildGoModule { - pname = "cdktf-hcl2json-go-modules"; + pname = "cdktn-hcl2json-go-modules"; inherit (finalAttrs) version src; - modRoot = "packages/@cdktf/hcl2json"; + modRoot = "packages/@cdktn/hcl2json"; vendorHash = "sha256-OiKPq0CHkOxJaFzgsaNJ02tasvHtHWylmaPRPayJob4="; proxyVendor = true; doCheck = false; @@ -46,9 +46,9 @@ stdenv.mkDerivation (finalAttrs: { hcltools-go-modules = (buildGoModule { - pname = "cdktf-hcltools-go-modules"; + pname = "cdktn-hcltools-go-modules"; inherit (finalAttrs) version src; - modRoot = "packages/@cdktf/hcl-tools"; + modRoot = "packages/@cdktn/hcl-tools"; vendorHash = "sha256-orGxkYEQVtTKvXb7/FD/CLwqSINgBQFTF5arbR0xAvE="; proxyVendor = true; doCheck = false; @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { fixup-yarn-lock go makeWrapper - nodejs + nodejs_20 patchelf removeReferencesTo yarn @@ -71,9 +71,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # wasm_exec has moved to lib in newer versions of Go - substituteInPlace packages/@cdktf/hcl-tools/prebuild.sh \ + substituteInPlace packages/@cdktn/hcl-tools/prebuild.sh \ --replace-fail "misc/wasm/wasm_exec.js" "lib/wasm/wasm_exec.js" - substituteInPlace packages/@cdktf/hcl2json/prebuild.sh \ + substituteInPlace packages/@cdktn/hcl2json/prebuild.sh \ --replace-fail "misc/wasm/wasm_exec.js" "lib/wasm/wasm_exec.js" ''; @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preCheck # Skip tests that require terraform (unfree) - yarn --offline workspace cdktf-cli test -- \ + yarn --offline workspace cdktn-cli test -- \ --testPathIgnorePatterns \ "src/test/cmds/(convert|init).test.ts" @@ -126,11 +126,11 @@ stdenv.mkDerivation (finalAttrs: { yarn --offline --production install - mkdir -p "$out/lib/node_modules/cdktf-cli" - cp -rL node_modules packages/cdktf-cli/bundle packages/cdktf-cli/package.json "$out/lib/node_modules/cdktf-cli/" + mkdir -p "$out/lib/node_modules/cdktn-cli" + cp -rL node_modules packages/cdktn-cli/bundle packages/cdktn-cli/package.json "$out/lib/node_modules/cdktn-cli/" - makeWrapper "${lib.getExe nodejs}" "$out/bin/cdktf" \ - --add-flags "$out/lib/node_modules/cdktf-cli/bundle/bin/cdktf.js" + makeWrapper "${lib.getExe nodejs_20}" "$out/bin/cdktn" \ + --add-flags "$out/lib/node_modules/cdktn-cli/bundle/bin/cdktn.js" runHook postInstall ''; @@ -138,8 +138,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' # Go isn't needed at runtime, so remove these to decrease the closure size remove-references-to -t ${go} \ - "$out/lib/node_modules/cdktf-cli/node_modules/@cdktf/hcl-tools/main.wasm" \ - "$out/lib/node_modules/cdktf-cli/node_modules/@cdktf/hcl2json/main.wasm" + "$out/lib/node_modules/cdktn-cli/node_modules/@cdktn/hcl-tools/main.wasm" \ + "$out/lib/node_modules/cdktn-cli/node_modules/@cdktn/hcl2json/main.wasm" ''; nativeInstallCheckInputs = [ @@ -154,10 +154,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "CDK for Terraform CLI"; - homepage = "https://github.com/hashicorp/terraform-cdk"; - changelog = "https://github.com/hashicorp/terraform-cdk/releases/tag/${finalAttrs.src.tag}"; + homepage = "https://cdktn.io"; + changelog = "https://github.com/open-constructs/cdk-terrain/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mpl20; - mainProgram = "cdktf"; + mainProgram = "cdktn"; maintainers = with lib.maintainers; [ deejayem ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ch/changedetection-io/package.nix b/pkgs/by-name/ch/changedetection-io/package.nix index 2754c888a9a9..785cd7d5807d 100644 --- a/pkgs/by-name/ch/changedetection-io/package.nix +++ b/pkgs/by-name/ch/changedetection-io/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.51.4"; + version = "0.53.5"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; tag = version; - hash = "sha256-Qm3dI5ZHkLK3hTsadnzIDdmeiDM/QovGw2FZDVml5tE="; + hash = "sha256-B5T9M4JpNn4hUeV8rR1SIJobLKnuMkr4Se8d+Zu/xxY="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix index 70e5ba36afeb..5a7a52e44a68 100644 --- a/pkgs/by-name/ch/chatd/package.nix +++ b/pkgs/by-name/ch/chatd/package.nix @@ -24,7 +24,7 @@ buildNpmPackage rec { }; makeCacheWritable = true; # sharp tries to build stuff in node_modules - ELECTRON_SKIP_BINARY_DOWNLOAD = true; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = true; npmDepsHash = "sha256-jvGvhgNhY+wz/DFS7NDtmzKXbhHbNF3i0qVQoFFeB0M="; diff --git a/pkgs/by-name/ch/cheating-daddy/package.nix b/pkgs/by-name/ch/cheating-daddy/package.nix index 6c1e2fa2d4a1..0cbace76118f 100644 --- a/pkgs/by-name/ch/cheating-daddy/package.nix +++ b/pkgs/by-name/ch/cheating-daddy/package.nix @@ -13,16 +13,16 @@ buildNpmPackage (finalAttrs: { pname = "cheating-daddy"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "sohzm"; repo = "cheating-daddy"; - tag = finalAttrs.version; - hash = "sha256-w1Kd9V9MQvsWiVHr9pRPVLkds+Aj/dsZg6Xvj0vWWVg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/xH3tBnZAnDr/EbewtJc0WpBirW1Obn6tka7NP0ovAc="; }; - npmDepsHash = "sha256-fMvzHrljOm43Dj0uJcqCj6QWd6qosARainhW9WSE348="; + npmDepsHash = "sha256-xoZ/qz7fGw858GsITkx/ag0FeeL4zcXh32qwb+OTLbg="; nativeBuildInputs = [ copyDesktopItems @@ -31,7 +31,11 @@ buildNpmPackage (finalAttrs: { zip ]; - env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + env = { + ONNXRUNTIME_NODE_INSTALL = "skip"; + ONNXRUNTIME_NODE_INSTALL_CUDA = "skip"; + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + }; makeCacheWritable = true; diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 52351f1c8e3f..45ecb9a2fb3f 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -37,14 +37,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.501"; + version = "3.2.504"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-kvUPhCuKWcklrrTnzbNWIg2Vqhv5dFP52+QkYas3kww="; + hash = "sha256-w6U8XW/hSPy/WJy4a6N41Hu+i9OVqiwI5buAE2uFjoI="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ch/chipsec/package.nix b/pkgs/by-name/ch/chipsec/package.nix index 945617e41e4b..bd9f6db867ff 100644 --- a/pkgs/by-name/ch/chipsec/package.nix +++ b/pkgs/by-name/ch/chipsec/package.nix @@ -25,7 +25,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: { ./log-path.diff ]; - KSRC = lib.optionalString withDriver "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + env = lib.optionalAttrs withDriver { + KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + }; nativeBuildInputs = [ nasm diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix index 8b4c30b8e65e..323369883d9d 100644 --- a/pkgs/by-name/ch/chrysalis/package.nix +++ b/pkgs/by-name/ch/chrysalis/package.nix @@ -32,9 +32,9 @@ appimageTools.wrapType2 { -t $out/share/applications substituteInPlace \ $out/share/applications/Chrysalis.desktop \ - --replace-fail 'Exec=Chrysalis' 'Exec=${pname}' + --replace-fail 'Exec=Chrysalis' 'Exec=chrysalis' - install -Dm444 ${appimageContents}/usr/share/icons/hicolor/256x256/chrysalis.png -t $out/share/pixmaps + cp -r ${appimageContents}/usr/share $out/share ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix index fef24e1b7101..90c81aecc8b1 100644 --- a/pkgs/by-name/ci/cider-2/package.nix +++ b/pkgs/by-name/ci/cider-2/package.nix @@ -86,6 +86,8 @@ stdenv.mkDerivation rec { install -Dm444 $out/share/pixmaps/cider.png \ $out/share/icons/hicolor/256x256/apps/cider.png + + rm -r $out/share/pixmaps ''; passthru.updateScript = ./updater.sh; @@ -97,7 +99,6 @@ stdenv.mkDerivation rec { mainProgram = "cider-2"; maintainers = with lib.maintainers; [ amadejkastelic - itsvic-dev l0r3v ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/ci/cie-middleware-linux/package.nix b/pkgs/by-name/ci/cie-middleware-linux/package.nix index 6458e211f7d8..517cda05f5b7 100644 --- a/pkgs/by-name/ci/cie-middleware-linux/package.nix +++ b/pkgs/by-name/ci/cie-middleware-linux/package.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation { # Install other files install -Dm644 data/app.m0rf30.cieid.desktop -t "$out/share/applications" - install -Dm755 data/app.m0rf30.cieid.svg -t "$out/share/pixmaps" + install -Dm755 data/app.m0rf30.cieid.svg -t "$out/share/icons/hicolor/scalable/apps" install -Dm644 LICENSE "$out/share/licenses/cieid/LICENSE" ''; diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index d28a4de75e5f..f855bf648c17 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # cannot use lib.optionalString as it creates an empty string, disabling all tests - LIT_FILTER_OUT = + env.LIT_FILTER_OUT = let lit-filters = # There are some tests depending on `clang-tools` to work. They are activated only when detected diff --git a/pkgs/by-name/ci/cisco-packet-tracer_9/package.nix b/pkgs/by-name/ci/cisco-packet-tracer_9/package.nix index 8fc360fef57a..4dba6142cfc4 100644 --- a/pkgs/by-name/ci/cisco-packet-tracer_9/package.nix +++ b/pkgs/by-name/ci/cisco-packet-tracer_9/package.nix @@ -74,6 +74,10 @@ appimageTools.wrapType2 rec { install -Dm444 ${contents}/usr/share/icons/hicolor/48x48/apps/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer-9.png cp -r ${contents}/usr/share/icons/gnome/48x48/mimetypes $out/share/icons/hicolor/48x48/ + + for desktop in $out/share/applications/*.desktop; do + sed -i '/^\[Desktop Entry\]/a StartupWMClass=PacketTracer' "$desktop" + done ''; meta = { diff --git a/pkgs/by-name/ci/citron-emu/package.nix b/pkgs/by-name/ci/citron-emu/package.nix deleted file mode 100644 index 0f10a33c5778..000000000000 --- a/pkgs/by-name/ci/citron-emu/package.nix +++ /dev/null @@ -1,197 +0,0 @@ -{ - lib, - stdenv, - SDL2, - boost, - catch2_3, - cmake, - ninja, - fetchFromGitea, - cpp-jwt, - cubeb, - gamemode, - discord-rpc, - enet, - fetchzip, - ffmpeg-headless, - fmt, - glslang, - openal, - libopus, - libusb1, - libva, - lz4, - python3, - wrapGAppsHook3, - nlohmann_json, - rapidjson, - openssl, - pkg-config, - qt6, - spirv-tools, - spirv-headers, - vulkan-utility-libraries, - vulkan-headers, - vulkan-loader, - simpleini, - zlib, - vulkan-memory-allocator, - zstd, - withDiscordPresence ? true, - withOptimisation ? false, -}: -let - nx_tzdbVersion = "221202"; - nx_tzdb = fetchzip { - url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${nx_tzdbVersion}/${nx_tzdbVersion}.zip"; - hash = "sha256-YOIElcKTiclem05trZsA3YJReozu/ex7jJAKD6nAMwc="; - stripRoot = false; - }; - inherit (qt6) - qtbase - qtmultimedia - qttools - qtwayland - qtwebengine - wrapQtAppsHook - ; -in -stdenv.mkDerivation (finalAttrs: { - pname = "citron-emu"; - version = "0.12.25"; - src = fetchFromGitea { - fetchSubmodules = true; - domain = "git.citron-emu.org"; - owner = "Citron"; - repo = "Emulator"; - tag = finalAttrs.version; - hash = "sha256-Su+SvCb6KDF9/ilb6Y/RZTOq/ffaMTWiJZy8nmGZ3n4="; - }; - - nativeBuildInputs = [ - cmake - ninja - glslang - pkg-config - python3 - qttools - wrapGAppsHook3 - wrapQtAppsHook - ]; - - buildInputs = [ - vulkan-headers - boost - catch2_3 - cpp-jwt - cubeb - enet - ffmpeg-headless - fmt - openal - libopus - libusb1 - libva - lz4 - nlohmann_json - rapidjson - openssl - qtbase - qtmultimedia - qtwayland - qtwebengine - gamemode - SDL2 - simpleini - spirv-tools - spirv-headers - vulkan-loader - vulkan-memory-allocator - vulkan-utility-libraries - zlib - zstd - ] - ++ lib.optionals withDiscordPresence [ - discord-rpc - ]; - - __structuredAttrs = true; - cmakeFlags = [ - (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") - (lib.cmakeBool "CITRON_ENABLE_LTO" true) - (lib.cmakeBool "CITRON_TESTS" false) - (lib.cmakeBool "ENABLE_QT" true) - (lib.cmakeBool "USE_SYSTEM_QT" true) - (lib.cmakeBool "ENABLE_QT_TRANSLATION" true) - (lib.cmakeBool "CITRON_USE_EXTERNAL_SDL2" false) - (lib.cmakeBool "CITRON_USE_EXTERNAL_VULKAN_HEADERS" false) - (lib.cmakeBool "CITRON_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES" false) - (lib.cmakeBool "CITRON_USE_EXTERNAL_VULKAN_SPIRV_TOOLS" false) - (lib.cmakeBool "CITRON_DOWNLOAD_TIME_ZONE_DATA" false) - (lib.cmakeBool "CITRON_CHECK_SUBMODULES" false) - (lib.cmakeBool "CITRON_USE_QT_WEB_ENGINE" true) - (lib.cmakeBool "CITRON_USE_QT_MULTIMEDIA" true) - (lib.cmakeBool "USE_DISCORD_PRESENCE" withDiscordPresence) - (lib.cmakeBool "CITRON_ENABLE_COMPATIBILITY_REPORTING" false) - (lib.cmakeBool "CITRON_USE_AUTO_UPDATER" false) - (lib.cmakeFeature "TITLE_BAR_FORMAT_IDLE" "${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}") - (lib.cmakeFeature "TITLE_BAR_FORMAT_RUNNING" "${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}") - ] - ++ lib.optionals withOptimisation [ - (lib.cmakeFeature "CMAKE_C_FLAGS" "-march=x86-64-v3") - (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-march=x86-64-v3") - ]; - - env = { - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse4.1"; - }; - - dontWrapGApps = true; - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - preConfigure = '' - # provide pre-downloaded tz data - mkdir -p build/externals/nx_tzdb - ln -s ${nx_tzdb} build/externals/nx_tzdb/nx_tzdb - ''; - - postPatch = '' - # --- Qt 6.10: use GuiPrivate so qpa/qplatformnativeinterface.h is found --- - - # Add GuiPrivate to the Qt6 components - substituteInPlace CMakeLists.txt \ - --replace-fail "find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent)" \ - "find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent GuiPrivate)" - - # Link Qt6::GuiPrivate into the GUI target so its private headers are on the include path - substituteInPlace src/citron/CMakeLists.txt \ - --replace-fail "target_link_libraries(citron PRIVATE Boost::headers" \ - "target_link_libraries(citron PRIVATE Boost::headers Qt6::GuiPrivate" - ''; - - postInstall = '' - install -Dm444 $src/dist/72-citron-input.rules $out/lib/udev/rules.d/72-citron-input.rules - ''; - - passthru = { - inherit nx_tzdb; - }; - - meta = { - homepage = "https://citron-emu.org"; - changelog = "https://git.citron-emu.org/Citron/Emulator/releases/tag/${finalAttrs.version}"; - description = "Nintendo Switch emulator for PC"; - mainProgram = "citron"; - platforms = [ "x86_64-linux" ]; - license = with lib.licenses; [ - gpl3Plus - # Icons - asl20 - mit - cc0 - ]; - maintainers = with lib.maintainers; [ samemrecebi ]; - }; -}) diff --git a/pkgs/by-name/cl/claude-code-bin/manifest.json b/pkgs/by-name/cl/claude-code-bin/manifest.json index 404e75d75689..1f22b70dfc9e 100644 --- a/pkgs/by-name/cl/claude-code-bin/manifest.json +++ b/pkgs/by-name/cl/claude-code-bin/manifest.json @@ -1,41 +1,46 @@ { - "version": "2.1.39", - "buildDate": "2026-02-10T21:13:30Z", + "version": "2.1.47", + "buildDate": "2026-02-18T20:16:40Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "d8d7a2b996a691036a53933a259a532254a400934aee452e289e1f4443026d82", - "size": 182876336 + "checksum": "73795e6d8f0aa4e07d8f20d351e0f84e515db2ce73b69770650bc3d5d582ef73", + "size": 184395680 }, "darwin-x64": { "binary": "claude", - "checksum": "2cba24a410a5226f9750b8fe7e83dbe9a61485ef9b0eb286b0b00438aa990d05", - "size": 187935648 + "checksum": "b62889b0d4d1f07bf76ebe89b6d1b1b85690977a939307bc896cd76748df3031", + "size": 189516896 }, "linux-arm64": { "binary": "claude", - "checksum": "8f66e02a5be8a620e286f6e634fb424b5ac065731b048af3d745cf719b2c7851", - "size": 220025668 + "checksum": "9255d330db19353d73b3975b0bc2ebaddd1cf002a62fa15b95a6bbfec8a9be18", + "size": 221546407 }, "linux-x64": { "binary": "claude", - "checksum": "68e4775b293d95e06d168581c523fc5c1523968179229d31a029f285b2aceaff", - "size": 222867057 + "checksum": "9c48bde67bda274d65c3d65da4f78e21a458ce722a8955edcc272d32c98c74a3", + "size": 224432260 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "82055ce3ec2bbcfcd11b8eae4b6f08226dfad29b10ac8b6231feb59e55b8730d", - "size": 213209060 + "checksum": "2bb8530b925220727cbc7ba4880dd12ccda308ebed513915a5c71674c3bc05f2", + "size": 214713415 }, "linux-x64-musl": { "binary": "claude", - "checksum": "ab8161c8102f031de34f617648d250432433fbf6c2945cbe5a6bd09a841fd5b6", - "size": 215367113 + "checksum": "3ba4ec54ff2f4d6500dd156725914695c40369851ee429583c821cb09c04d36e", + "size": 216932316 }, "win32-x64": { "binary": "claude.exe", - "checksum": "f0357538ba50c80d02deb44a9aa4e02e577b34158284edeca99f5d9ba1183fc9", - "size": 232531616 + "checksum": "b29dca8880f7bcd8820909cb630f0bace6e8a4a126caa7aafdd5ca2dbd13c497", + "size": 233474208 + }, + "win32-arm64": { + "binary": "claude.exe", + "checksum": "ae9b2d1274aa067d79663f19045a9b0df2882c073f90d208d827610f4014c2dc", + "size": 225526432 } } } diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 6f9384dd5bfe..b84f196c5cb2 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.39", + "version": "2.1.47", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.1.39", + "version": "2.1.47", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" @@ -15,20 +15,21 @@ "node": ">=18.0.0" }, "optionalDependencies": { - "@img/sharp-darwin-arm64": "^0.33.5", - "@img/sharp-darwin-x64": "^0.33.5", - "@img/sharp-linux-arm": "^0.33.5", - "@img/sharp-linux-arm64": "^0.33.5", - "@img/sharp-linux-x64": "^0.33.5", - "@img/sharp-linuxmusl-arm64": "^0.33.5", - "@img/sharp-linuxmusl-x64": "^0.33.5", - "@img/sharp-win32-x64": "^0.33.5" + "@img/sharp-darwin-arm64": "^0.34.2", + "@img/sharp-darwin-x64": "^0.34.2", + "@img/sharp-linux-arm": "^0.34.2", + "@img/sharp-linux-arm64": "^0.34.2", + "@img/sharp-linux-x64": "^0.34.2", + "@img/sharp-linuxmusl-arm64": "^0.34.2", + "@img/sharp-linuxmusl-x64": "^0.34.2", + "@img/sharp-win32-arm64": "^0.34.2", + "@img/sharp-win32-x64": "^0.34.2" } }, "node_modules/@img/sharp-darwin-arm64": { - "version": "0.33.5", - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz", - "integrity": "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.5.tgz", + "integrity": "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==", "cpu": [ "arm64" ], @@ -44,13 +45,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-darwin-arm64": "1.0.4" + "@img/sharp-libvips-darwin-arm64": "1.2.4" } }, "node_modules/@img/sharp-darwin-x64": { - "version": "0.33.5", - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz", - "integrity": "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.5.tgz", + "integrity": "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==", "cpu": [ "x64" ], @@ -66,13 +67,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-darwin-x64": "1.0.4" + "@img/sharp-libvips-darwin-x64": "1.2.4" } }, "node_modules/@img/sharp-libvips-darwin-arm64": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz", - "integrity": "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.4.tgz", + "integrity": "sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==", "cpu": [ "arm64" ], @@ -86,9 +87,9 @@ } }, "node_modules/@img/sharp-libvips-darwin-x64": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz", - "integrity": "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.4.tgz", + "integrity": "sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==", "cpu": [ "x64" ], @@ -102,9 +103,9 @@ } }, "node_modules/@img/sharp-libvips-linux-arm": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz", - "integrity": "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.4.tgz", + "integrity": "sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==", "cpu": [ "arm" ], @@ -118,9 +119,9 @@ } }, "node_modules/@img/sharp-libvips-linux-arm64": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz", - "integrity": "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.4.tgz", + "integrity": "sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==", "cpu": [ "arm64" ], @@ -134,9 +135,9 @@ } }, "node_modules/@img/sharp-libvips-linux-x64": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz", - "integrity": "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.4.tgz", + "integrity": "sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==", "cpu": [ "x64" ], @@ -150,9 +151,9 @@ } }, "node_modules/@img/sharp-libvips-linuxmusl-arm64": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz", - "integrity": "sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.4.tgz", + "integrity": "sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==", "cpu": [ "arm64" ], @@ -166,9 +167,9 @@ } }, "node_modules/@img/sharp-libvips-linuxmusl-x64": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz", - "integrity": "sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.4.tgz", + "integrity": "sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==", "cpu": [ "x64" ], @@ -182,9 +183,9 @@ } }, "node_modules/@img/sharp-linux-arm": { - "version": "0.33.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz", - "integrity": "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.5.tgz", + "integrity": "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==", "cpu": [ "arm" ], @@ -200,13 +201,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-arm": "1.0.5" + "@img/sharp-libvips-linux-arm": "1.2.4" } }, "node_modules/@img/sharp-linux-arm64": { - "version": "0.33.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz", - "integrity": "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.5.tgz", + "integrity": "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==", "cpu": [ "arm64" ], @@ -222,13 +223,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-arm64": "1.0.4" + "@img/sharp-libvips-linux-arm64": "1.2.4" } }, "node_modules/@img/sharp-linux-x64": { - "version": "0.33.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz", - "integrity": "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.5.tgz", + "integrity": "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==", "cpu": [ "x64" ], @@ -244,13 +245,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-x64": "1.0.4" + "@img/sharp-libvips-linux-x64": "1.2.4" } }, "node_modules/@img/sharp-linuxmusl-arm64": { - "version": "0.33.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz", - "integrity": "sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.5.tgz", + "integrity": "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==", "cpu": [ "arm64" ], @@ -266,13 +267,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linuxmusl-arm64": "1.0.4" + "@img/sharp-libvips-linuxmusl-arm64": "1.2.4" } }, "node_modules/@img/sharp-linuxmusl-x64": { - "version": "0.33.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz", - "integrity": "sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.5.tgz", + "integrity": "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==", "cpu": [ "x64" ], @@ -288,13 +289,32 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linuxmusl-x64": "1.0.4" + "@img/sharp-libvips-linuxmusl-x64": "1.2.4" + } + }, + "node_modules/@img/sharp-win32-arm64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.5.tgz", + "integrity": "sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" } }, "node_modules/@img/sharp-win32-x64": { - "version": "0.33.5", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz", - "integrity": "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==", + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.5.tgz", + "integrity": "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==", "cpu": [ "x64" ], diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 1bac26c3ee75..0ea22d83264d 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.39"; + version = "2.1.47"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-NLLiaJkU91ZnEcQUWIAX9oUTt+C5fnWXFFPelTtWmdo="; + hash = "sha256-zog13iz4gP9LPcF5qglvyViqox6iiRWeCU0r0TqnWlk="; }; - npmDepsHash = "sha256-VWw1bYkFch95JDlOwKoTAQYOr8R80ICJ8QUI4E64W7o="; + npmDepsHash = "sha256-1wvl0vwl9CMntNDuh7sTWqNTnAg1AYgnuUukZOXU+PU="; strictDeps = true; diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index 6e3f05f33c33..455cb1c2858d 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -11,7 +11,7 @@ buildNpmPackage rec { pname = "clever-tools"; - version = "4.5.3"; + version = "4.6.0"; nodejs = nodejs_22; @@ -19,10 +19,10 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-/PVVnTzRPy4AM3OEfTdrSrvdWfbPSrP/LoenzPA0d2Q="; + hash = "sha256-0c2SBArtMUffQ7hd2fH9l5DMGm+UIWNeY/aSU0cUHzg="; }; - npmDepsHash = "sha256-i9cZI+P363EqODlnggqKT6XxoDYTNVrg5rTYNWWHm8A="; + npmDepsHash = "sha256-Quzpdmu9qvJ4P77nsXzqLg3k7tQvuYtvEioDuUSU0+M="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/cl/clfft/package.nix b/pkgs/by-name/cl/clfft/package.nix index b3d55f41e5c0..be470ec69e6b 100644 --- a/pkgs/by-name/cl/clfft/package.nix +++ b/pkgs/by-name/cl/clfft/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # https://github.com/clMathLibraries/clFFT/issues/237 - CXXFLAGS = "-std=c++98"; + env.CXXFLAGS = "-std=c++98"; meta = { description = "Library containing FFT functions written in OpenCL"; diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix index bfa3c9f64f31..f02241164921 100644 --- a/pkgs/by-name/cl/clickhouse/package.nix +++ b/pkgs/by-name/cl/clickhouse/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "26.1.2.11-stable"; - rev = "53779390caa67a65a2368cdbb7533ed925608ba9"; - hash = "sha256-azzrQ37AhC0KvA7ZMLlSSWxEdwzSfrbaBFSUerOqVCY="; + version = "26.1.3.52-stable"; + rev = "5549f2acae95c6d627654f50e212a85d059a55f9"; + hash = "sha256-7Ww7vQNjvR65Ycw2jnetyy6s8KkHOylzFey+K2xBLjM="; lts = false; } diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix index 6513a016ad04..a4f8361f2ea2 100644 --- a/pkgs/by-name/cl/cljfmt/package.nix +++ b/pkgs/by-name/cl/cljfmt/package.nix @@ -8,11 +8,11 @@ buildGraalvmNativeImage (finalAttrs: { pname = "cljfmt"; - version = "0.15.6"; + version = "0.16.0"; src = fetchurl { url = "https://github.com/weavejester/cljfmt/releases/download/${finalAttrs.version}/cljfmt-${finalAttrs.version}-standalone.jar"; - hash = "sha256-/ihm/b/B9cSay2Zgshie7D0KwaKuIjiNI5FOnWOHfOw="; + hash = "sha256-56llKSnJJzjv9mf33ir7b3gk8Jp+jxyuax6vEXj0xDk="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/by-name/cl/clmagma/package.nix b/pkgs/by-name/cl/clmagma/package.nix index bfd23cb0bcb5..dbcbd91dc96f 100644 --- a/pkgs/by-name/cl/clmagma/package.nix +++ b/pkgs/by-name/cl/clmagma/package.nix @@ -60,12 +60,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - MKLROOT = "${mkl}"; - clBLAS = "${clblas}"; + env = { + MKLROOT = mkl; + clBLAS = clblas; - # Otherwise build looks for it in /run/opengl-driver/etc/OpenCL/vendors, - # which is not available. - OPENCL_VENDOR_PATH = "${intel-ocl}/etc/OpenCL/vendors"; + # Otherwise build looks for it in /run/opengl-driver/etc/OpenCL/vendors, + # which is not available. + OPENCL_VENDOR_PATH = "${intel-ocl}/etc/OpenCL/vendors"; + }; preBuild = '' # By default it tries to use GPU, and thus fails for CPUs diff --git a/pkgs/by-name/cl/clockify/package.nix b/pkgs/by-name/cl/clockify/package.nix index d25c393bc3a0..133293f75f87 100644 --- a/pkgs/by-name/cl/clockify/package.nix +++ b/pkgs/by-name/cl/clockify/package.nix @@ -19,7 +19,7 @@ appimageTools.wrapType2 rec { in '' install -Dm 444 ${appimageContents}/clockify.desktop -t $out/share/applications - install -Dm 444 ${appimageContents}/clockify.png -t $out/share/pixmaps + install -Dm 444 ${appimageContents}/clockify.png -t $out/share/icons/hicolor/1024x1024/apps substituteInPlace $out/share/applications/clockify.desktop \ --replace-fail 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix index 3919947697fe..d2ad046a4cff 100644 --- a/pkgs/by-name/cl/cloud-hypervisor/package.nix +++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cloud-hypervisor"; - version = "50.0"; + version = "51.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = "cloud-hypervisor"; rev = "v${finalAttrs.version}"; - hash = "sha256-U2jNKdc+CWB/Z9TvAC0xfHDipfe4dhWjL9VXbBVaNJE="; + hash = "sha256-RdwQg6/EI+oGkyNXnu5t1q87oTXev25XpIaE+PWDTx4="; }; - cargoHash = "sha256-M1jVvFo9Bo/ZFqaFtzwp2rusl1T1m7jAkEobOF0cnlA="; + cargoHash = "sha256-WoFdX1GrgbADm2zm269OGczaGktVXau1UP7vzxfNZPQ="; separateDebugInfo = true; diff --git a/pkgs/by-name/cl/cloudgoat/package.nix b/pkgs/by-name/cl/cloudgoat/package.nix index 95c0b9f9caaa..00127c5d0b75 100644 --- a/pkgs/by-name/cl/cloudgoat/package.nix +++ b/pkgs/by-name/cl/cloudgoat/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "cloudgoat"; - version = "2.3.1"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "RhinoSecurityLabs"; repo = "cloudgoat"; tag = "v${finalAttrs.version}"; - hash = "sha256-GYhi4rh+JXyUQkRkE5XsbczWbGEt1zqsALBQcwRWJbI="; + hash = "sha256-Y41Q6mVt0XY8nZnRGTXdc0HaQapd55FUe8mhwU0NKrM="; }; build-system = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index 6b210a5b0da1..118e7a204782 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ buildGoModule (finalAttrs: { pname = "cnspec"; - version = "12.22.0"; + version = "12.23.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${finalAttrs.version}"; - hash = "sha256-Z7TEO236RYHgdzRRkvF+piGu6daYGzEeSTYeKTnsVME="; + hash = "sha256-RQOr5+QjWV4z9btRJ+4NgNYSVT5nvPSoLGJlhAHNTfE="; }; proxyVendor = true; - vendorHash = "sha256-HoONDFaU72r4P+w4mibuG2AUHPsNVBjOk/d6TENt0Yc="; + vendorHash = "sha256-nnmmd/RIIJIZIhwE5DI7dKVovuKMjuawwzSZU2wLOj0="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/by-name/co/cobalt/package.nix b/pkgs/by-name/co/cobalt/package.nix index 65e1d5d54f57..649d81836013 100644 --- a/pkgs/by-name/co/cobalt/package.nix +++ b/pkgs/by-name/co/cobalt/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cobalt"; - version = "0.20.3"; + version = "0.20.4"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-ec6S6PQzDc8t8MuZLyVStxi7tQB6rMu+Fz8Tw1qpTGc="; + hash = "sha256-XS8KZXHmeMPwCXMR68yIHYikV6Zwj46w2Mtz+d0JCTI="; }; - cargoHash = "sha256-xwpEdhV9YDfNIbjocz5N0E4BO8FW7Af2kW4QndqZhPo="; + cargoHash = "sha256-vd+udalOsHMCWBI23v56N2yHRVlbKC0gjvFHJeCv0qw="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/co/coc-emmet/package.nix b/pkgs/by-name/co/coc-emmet/package.nix index 7d2bd93c087d..40cac7149897 100644 --- a/pkgs/by-name/co/coc-emmet/package.nix +++ b/pkgs/by-name/co/coc-emmet/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nodejs ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/co/coc-r-lsp/package.nix b/pkgs/by-name/co/coc-r-lsp/package.nix index 5041dd5de652..da487906c18e 100644 --- a/pkgs/by-name/co/coc-r-lsp/package.nix +++ b/pkgs/by-name/co/coc-r-lsp/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nodejs ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/co/coc-spell-checker/package.nix b/pkgs/by-name/co/coc-spell-checker/package.nix index b02556e9f636..4b6be645132a 100644 --- a/pkgs/by-name/co/coc-spell-checker/package.nix +++ b/pkgs/by-name/co/coc-spell-checker/package.nix @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nodejs ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/co/coc-stylelint/package.nix b/pkgs/by-name/co/coc-stylelint/package.nix index 40a12dbd98e4..482717d78380 100644 --- a/pkgs/by-name/co/coc-stylelint/package.nix +++ b/pkgs/by-name/co/coc-stylelint/package.nix @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nodejs ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/co/coc-vimlsp/package.nix b/pkgs/by-name/co/coc-vimlsp/package.nix index 395441c17dea..f08f17be1d96 100644 --- a/pkgs/by-name/co/coc-vimlsp/package.nix +++ b/pkgs/by-name/co/coc-vimlsp/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nodejs ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/co/coc-wxml/package.nix b/pkgs/by-name/co/coc-wxml/package.nix index caf706f21679..5ec0005ef3df 100644 --- a/pkgs/by-name/co/coc-wxml/package.nix +++ b/pkgs/by-name/co/coc-wxml/package.nix @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nodejs ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/co/colmena/package.nix b/pkgs/by-name/co/colmena/package.nix index 7c941161d501..cc5ccb1fa0dd 100644 --- a/pkgs/by-name/co/colmena/package.nix +++ b/pkgs/by-name/co/colmena/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ nix-eval-jobs ]; - NIX_EVAL_JOBS = "${nix-eval-jobs}/bin/nix-eval-jobs"; + env.NIX_EVAL_JOBS = "${nix-eval-jobs}/bin/nix-eval-jobs"; patches = [ # Fixes nix 2.24 compat: https://github.com/zhaofengli/colmena/pull/236 diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix index 7bcc9283814b..d89b1883f771 100644 --- a/pkgs/by-name/co/contour/package.nix +++ b/pkgs/by-name/co/contour/package.nix @@ -12,7 +12,6 @@ libutempter, termbench-pro, qt6, - pcre, boost, catch2_3, fmt, @@ -67,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: { termbench-pro qt6.qtmultimedia qt6.qt5compat - pcre boost catch2_3 fmt diff --git a/pkgs/by-name/co/convertall/package.nix b/pkgs/by-name/co/convertall/package.nix new file mode 100644 index 000000000000..b97f042061bc --- /dev/null +++ b/pkgs/by-name/co/convertall/package.nix @@ -0,0 +1,30 @@ +{ + lib, + flutter341, + fetchFromGitHub, +}: + +flutter341.buildFlutterApplication rec { + pname = "convertall"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "doug-101"; + repo = "ConvertAll"; + tag = "v${version}"; + hash = "sha256-esc2xhL0Jx5SaqM0GnnVzdtnSN9bX8zln66We/2RqoA="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + meta = { + homepage = "https://convertall.bellz.org"; + description = "Graphical unit converter"; + mainProgram = "convertall"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + Luflosi + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/co/convertall/pubspec.lock.json b/pkgs/by-name/co/convertall/pubspec.lock.json new file mode 100644 index 000000000000..785310699ebc --- /dev/null +++ b/pkgs/by-name/co/convertall/pubspec.lock.json @@ -0,0 +1,792 @@ +{ + "packages": { + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "a7f37ff061d7abc2fcf213554b9dcaca713c5853afa5c065c44888bc9ccaf813", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.6" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.12.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" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "cupertino_icons": { + "dependency": "transitive", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "decimal": { + "dependency": "direct main", + "description": { + "name": "decimal", + "sha256": "24a261d5d5c87e86c7651c417a5dbdf8bcd7080dd592533910e8d0505a279f21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "eval_ex": { + "dependency": "direct main", + "description": { + "name": "eval_ex", + "sha256": "3f8853d996ee41955f2232ad3730e95698fb1040d03f6ebc6ab01f1c2bc3be53", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.8" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.3" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "flutter_markdown_selectionarea": { + "dependency": "direct main", + "description": { + "name": "flutter_markdown_selectionarea", + "sha256": "d4bc27e70a5c40ebdab23a4b81f75d53696a214d4d1f13c12045b38a0ddc58a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.17+1" + }, + "flutter_spinbox": { + "dependency": "direct main", + "description": { + "name": "flutter_spinbox", + "sha256": "38d8c1a3a39f0fa72823d4470785f5e165f2deb53531ca7803b54ba45e4dbd46", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.1" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.4" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.8" + }, + "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": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "markdown": { + "dependency": "transitive", + "description": { + "name": "markdown", + "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.0" + }, + "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" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "provider": { + "dependency": "direct main", + "description": { + "name": "provider", + "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.4" + }, + "rational": { + "dependency": "transitive", + "description": { + "name": "rational", + "sha256": "cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.9" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.3" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.10" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "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" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.16" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.3" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.4" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.3.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.12.0" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.9" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + } + }, + "sdks": { + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.27.0" + } +} diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index 457c99d4cf6a..d052a906ca19 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.429.0"; + version = "1.430.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip"; - hash = "sha256-msqySCQxAySQTEAToUF/JV+IH4B/NKxymCouofEt9Ic="; + hash = "sha256-b2NMh+9JcPrMu0JHL2vdWOJhUA+PoCmj7M21rS9MS3o="; stripRoot = false; }; diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index 335da70bd81f..a084ae9b78e6 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { buildInputs = [ systemdLibs ]; - CGO_CFLAGS = "-I ${systemdLibs}/include"; + env.CGO_CFLAGS = "-I ${systemdLibs}/include"; ldflags = [ "-extldflags='-Wl,-z,lazy'" diff --git a/pkgs/by-name/co/cosign/package.nix b/pkgs/by-name/co/cosign/package.nix index 318af8026f0f..add283296bb6 100644 --- a/pkgs/by-name/co/cosign/package.nix +++ b/pkgs/by-name/co/cosign/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "cosign"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "sigstore"; repo = "cosign"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ddq9MJNRZ+ywJwxIUP4nhag8UZIH/hOYnF71P3+gI/0="; + hash = "sha256-YYssI+fPw6drMZqAwRk3ubh0l/RgEN8b0eoEunihjlw="; }; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite); @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { installShellFiles ]; - vendorHash = "sha256-TuA3LwZFAKjZ4aoX92tYd7eziG5N1vDOTsEgwhg5n6w="; + vendorHash = "sha256-xC+Wfj1OTLhQAuJlyOB6KPaUXuzOxC2oLCqI5O/6znI="; subPackages = [ "cmd/cosign" diff --git a/pkgs/by-name/cp/cpp-redis/package.nix b/pkgs/by-name/cp/cpp-redis/package.nix index 5f129f3352da..0bf3ce1ed02b 100644 --- a/pkgs/by-name/cp/cpp-redis/package.nix +++ b/pkgs/by-name/cp/cpp-redis/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config ]; - CFLAGS = "-D_GLIBCXX_USE_NANOSLEEP"; + env.CFLAGS = "-D_GLIBCXX_USE_NANOSLEEP"; patches = [ ./01-fix-sleep_for.patch ]; diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix index a66adb559ad8..2a5f375c9c83 100644 --- a/pkgs/by-name/cr/crosvm/package.nix +++ b/pkgs/by-name/cr/crosvm/package.nix @@ -56,8 +56,10 @@ rustPlatform.buildRustPackage { patchShebangs third_party/minijail/tools/*.py ''; - CROSVM_USE_SYSTEM_MINIGBM = true; - CROSVM_USE_SYSTEM_VIRGLRENDERER = true; + env = { + CROSVM_USE_SYSTEM_MINIGBM = true; + CROSVM_USE_SYSTEM_VIRGLRENDERER = true; + }; buildFeatures = [ "virgl_renderer" ]; diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 169678b8e29a..829a406d5de6 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "crush"; - version = "0.42.0"; + version = "0.43.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "crush"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ev3Kk+jFnjc8pdozeeqktxDtYjyODvdN8lkiynMKe/o="; + hash = "sha256-VyV57ASsn2t1zaW7L6o7sVc+H+tHf4AP1HaKgrdXrtk="; }; - vendorHash = "sha256-u2K0CmCFFrlNVUJhof/8/OtX2ruKvVAIhyyE5Uyoj6Y="; + vendorHash = "sha256-qFqFyPdAqh2BXeE2tkLmn88Z8qHFeSlTA2Ols8H7iaQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/cr/cryptopp/package.nix b/pkgs/by-name/cr/cryptopp/package.nix index a57949bea97c..bcc57aa3972a 100644 --- a/pkgs/by-name/cr/cryptopp/package.nix +++ b/pkgs/by-name/cr/cryptopp/package.nix @@ -42,7 +42,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; hardeningDisable = [ "fortify" ]; - CXXFLAGS = lib.optionals withOpenMP [ "-fopenmp" ]; + + env = lib.optionalAttrs withOpenMP { + CXXFLAGS = "-fopenmp"; + }; doCheck = true; diff --git a/pkgs/by-name/cs/csmith/package.nix b/pkgs/by-name/cs/csmith/package.nix index 261f5bf1bbf0..80830a36167a 100644 --- a/pkgs/by-name/cs/csmith/package.nix +++ b/pkgs/by-name/cs/csmith/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { SysCPU ]); - CXXFLAGS = "-std=c++98"; + env.CXXFLAGS = "-std=c++98"; postInstall = '' substituteInPlace $out/bin/compiler_test.pl \ diff --git a/pkgs/by-name/cu/cups-brother-dcpt720dw/package.nix b/pkgs/by-name/cu/cups-brother-dcpt720dw/package.nix new file mode 100644 index 000000000000..24268c81d7e8 --- /dev/null +++ b/pkgs/by-name/cu/cups-brother-dcpt720dw/package.nix @@ -0,0 +1,115 @@ +{ + stdenv, + lib, + fetchurl, + perl, + ghostscript, + coreutils, + gnugrep, + which, + file, + gnused, + dpkg, + makeBinaryWrapper, + libredirect, + debugLvl ? "0", +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cups-brother-dcpt720dw"; + version = "3.5.0-1"; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf105179/dcpt720dwpdrv-${finalAttrs.version}.i386.deb"; + hash = "sha256-ToUFGnHxd6rnLdfhdDGzhvsgFJukEAVzlm79hmkSV3E="; + }; + + strictDeps = true; + buildInputs = [ perl ]; + nativeBuildInputs = [ + dpkg + makeBinaryWrapper + ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + dpkg-deb -x $src $out + + LPDDIR=$out/opt/brother/Printers/dcpt720dw/lpd + WRAPPER=$out/opt/brother/Printers/dcpt720dw/cupswrapper/brother_lpdwrapper_dcpt720dw + + ln -s $LPDDIR/${stdenv.hostPlatform.linuxArch}/* $LPDDIR/ + + substituteInPlace $WRAPPER \ + --replace-fail "PRINTER =~" "PRINTER = \"dcpt720dw\"; #" \ + --replace-fail "basedir =~" "basedir = \"$out/opt/brother/Printers/dcpt720dw/\"; #" \ + --replace-fail "lpdconf = " "lpdconf = \$lpddir.'/'.\$LPDCONFIGEXE.\$PRINTER; #" \ + --replace-fail "\$DEBUG=0;" "\$DEBUG=${debugLvl};" + + substituteInPlace $LPDDIR/filter_dcpt720dw \ + --replace-fail "BR_PRT_PATH =~" "BR_PRT_PATH = \"$out/opt/brother/Printers/dcpt720dw/\"; #" \ + --replace-fail "PRINTER =~" "PRINTER = \"dcpt720dw\"; #" + + wrapProgram $WRAPPER \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + gnused + ] + } + + wrapProgram $LPDDIR/filter_dcpt720dw \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + ghostscript + gnugrep + gnused + which + file + ] + } + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $LPDDIR/brdcpt720dwfilter + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $LPDDIR/brprintconf_dcpt720dw + + wrapProgram $LPDDIR/brprintconf_dcpt720dw \ + --set LD_PRELOAD "${lib.getLib libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS /opt=$out/opt + + wrapProgram $LPDDIR/brdcpt720dwfilter \ + --set LD_PRELOAD "${lib.getLib libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS /opt=$out/opt + + mkdir -p "$out/lib/cups/filter" "$out/share/cups/model" + + ln -s $out/opt/brother/Printers/dcpt720dw/cupswrapper/brother_lpdwrapper_dcpt720dw \ + $out/lib/cups/filter/brother_lpdwrapper_dcpt720dw + + ln -s "$out/opt/brother/Printers/dcpt720dw/cupswrapper/brother_dcpt720dw_printer_en.ppd" \ + "$out/share/cups/model/" + + runHook postInstall + ''; + + meta = { + description = "Brother DCP-T720DW printer driver"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ mimahlavacek ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + downloadPage = "https://support.brother.com/g/b/downloadtop.aspx?c=cn_ot&lang=en&prod=dcpt720dw_all"; + homepage = "http://www.brother.com/"; + }; +}) diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index ca46d135e389..422f2ff3a7bf 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -119,7 +119,11 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) { + env = { + CXX = "${stdenv.cc.targetPrefix}c++"; + CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; + } + // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) { # Not having this causes curl’s `configure` script to fail with static builds on Darwin because # some of curl’s propagated inputs need libiconv. NIX_LDFLAGS = "-liconv"; @@ -209,9 +213,6 @@ stdenv.mkDerivation (finalAttrs: { "--with-ca-path=/etc/ssl/certs" ]; - CXX = "${stdenv.cc.targetPrefix}c++"; - CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; - # takes 14 minutes on a 24 core and because many other packages depend on curl # they cannot be run concurrently and are a bottleneck # tests are available in passthru.tests.withCheck diff --git a/pkgs/by-name/cu/curlftpfs/package.nix b/pkgs/by-name/cu/curlftpfs/package.nix index 2d4b90b9c764..9404af4c3830 100644 --- a/pkgs/by-name/cu/curlftpfs/package.nix +++ b/pkgs/by-name/cu/curlftpfs/package.nix @@ -39,7 +39,9 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; - CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D__off_t=off_t"; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + CFLAGS = "-D__off_t=off_t"; + }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix the build on macOS with macFUSE installed. Needs autoreconfHook for diff --git a/pkgs/by-name/da/darling-dmg/package.nix b/pkgs/by-name/da/darling-dmg/package.nix index 3a71869edd4b..9f5654adea22 100644 --- a/pkgs/by-name/da/darling-dmg/package.nix +++ b/pkgs/by-name/da/darling-dmg/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - CXXFLAGS = [ + env.CXXFLAGS = toString [ "-DCOMPILE_WITH_LZFSE=1" "-llzfse" ]; diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index 1f4955307891..30f65ac30137 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "databricks-cli"; - version = "0.288.0"; + version = "0.289.1"; src = fetchFromGitHub { owner = "databricks"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-GBkeIY/uYiLA6CmKiMnMuGX2sPSyOmr9gZXZTe/AoQs="; + hash = "sha256-K3Zap7agH5tLkk5CVgU8s33giPuZwmQTdvh09TUa20U="; }; # Otherwise these tests fail asserting that the version is 0.0.0-dev @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}" ''; - vendorHash = "sha256-YtXdGQzuzTHBrqRUk2ORacVNixdLt+jHxJ8zMxwlcmI="; + vendorHash = "sha256-XNGoUDmoso6hx+pj6oLBa/Fsyzk5wRyFm/VtKZw5Pmk="; excludedPackages = [ "bundle/internal" diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix index 0124dc3f353e..5d7fde62d943 100644 --- a/pkgs/by-name/db/dbmate/package.nix +++ b/pkgs/by-name/db/dbmate/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "dbmate"; - version = "2.30.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; tag = "v${finalAttrs.version}"; - hash = "sha256-K5aMBIJmU5vRuRihrqqMsxNXlemFwBqIfC0jVK1j87o="; + hash = "sha256-RUorEH4l4YazRw/QxdjPKFV9GXGWEGRTJzk5ugWFj00="; }; vendorHash = "sha256-47UycctApQqi9PZc3a+qKdRsG+qj46RzcCUbyNxgXiI="; diff --git a/pkgs/by-name/dd/ddcutil/package.nix b/pkgs/by-name/dd/ddcutil/package.nix index 914839320f22..80795c41efa9 100644 --- a/pkgs/by-name/dd/ddcutil/package.nix +++ b/pkgs/by-name/dd/ddcutil/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitHub, + fetchurl, autoreconfHook, pkg-config, glib, @@ -16,13 +16,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ddcutil"; - version = "2.2.5"; + version = "2.2.3"; - src = fetchFromGitHub { - owner = "rockowitz"; - repo = "ddcutil"; - tag = "v${finalAttrs.version}"; - hash = "sha256-6Bf4I2bt7Ykn2P834tVIbTaY+7fae18zrs2I84Byv1Y="; + src = fetchurl { + url = "https://www.ddcutil.com/tarballs/ddcutil-${finalAttrs.version}.tar.gz"; + hash = "sha256-4XvAUqYvnqhS2eOLpPHtfnNmVnoOGdvhpDnuca2+BqA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/deadpixi-sam-unstable/package.nix b/pkgs/by-name/de/deadpixi-sam-unstable/package.nix index cbd620ec8f07..0a9d81b10afc 100644 --- a/pkgs/by-name/de/deadpixi-sam-unstable/package.nix +++ b/pkgs/by-name/de/deadpixi-sam-unstable/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { --replace "RXPATH=/usr/bin/ssh" "RXPATH=ssh" ''; - CFLAGS = "-D_DARWIN_C_SOURCE"; + env.CFLAGS = "-D_DARWIN_C_SOURCE"; makeFlags = [ "DESTDIR=$(out)" ]; buildInputs = [ libx11 diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 09adec27a555..6a5c82eb3fb7 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -30,17 +30,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "deno"; - version = "2.6.9"; + version = "2.6.10"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; # required for tests - hash = "sha256-FSm3X+1cTQURF9V/cCYvjJmPx9udcE/s5J6oRhcDWWU="; + hash = "sha256-youaF9YERkGUwN0sg6IzV8OAyahSDbFt0psn/p4iOVY="; }; - cargoHash = "sha256-DgotLiq4xzVH8dhOUA4Fxg0NW0DRnHVCJlxQYVQDaeE="; + cargoHash = "sha256-goaqxj8Y5Gqo4et4AkyZ3Uv74Q3M3V0VExUA/AMYNMI="; patches = [ ./patches/0002-tests-replace-hardcoded-paths.patch @@ -130,7 +130,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoTestFlags = [ "--lib" # unit tests - "--test=integration_tests" + "--test=integration_test" # Test targets not included here: # - node_compat: there are tons of network access in them and it's not trivial to skip test cases. # - specs: this target uses a custom test harness that doesn't implement the --skip flag. diff --git a/pkgs/by-name/de/desync/package.nix b/pkgs/by-name/de/desync/package.nix index dc781ac07623..157861086c96 100644 --- a/pkgs/by-name/de/desync/package.nix +++ b/pkgs/by-name/de/desync/package.nix @@ -21,8 +21,29 @@ buildGoModule (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; - # nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad. - doCheck = false; + # required for TestHTTPHandlerReadWrite and other tests + __darwinAllowLocalNetworking = true; + + checkFlags = + let + skippedTests = [ + "TestExtract" # block cloning fails on ZFS + "TestExtractCommand/extract_while_regenerating_the_corrupted_seed" # block cloning fails on ZFS + "TestExtractCommand/extract_with_seed_directory" # block cloning fails on ZFS + "TestExtractCommand/extract_with_single_seed" # block cloning fails on ZFS + "TestExtractCommand/extract_with_single_seed,_explicit_data_directory_and_unexpected_seed_options" # block cloning fails on ZFS + "TestExtractCommand/extract_with_single_seed_and_explicit_data_directory" # block cloning fails on ZFS + "TestExtractWithNonStaticSeeds" # block cloning fails on ZFS + "TestMountIndex" # FUSE does not work in sandbox + "TestSeed/extract_repetitive_file" # block cloning fails on ZFS + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # sendfile is not permitted in Darwin sandbox + "TestS3StoreGetChunk/fail" + "TestS3StoreGetChunk/recover" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd desync \ diff --git a/pkgs/by-name/de/devpi-client/package.nix b/pkgs/by-name/de/devpi-client/package.nix index 73dc522b8bd7..109d2213eafe 100644 --- a/pkgs/by-name/de/devpi-client/package.nix +++ b/pkgs/by-name/de/devpi-client/package.nix @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { "--fast" ]; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index 7037764dc621..65fe0363f261 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -108,12 +108,12 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "312"; + version = "313"; pyproject = true; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-bILLE0MwPYHQtkvIQibbkZ0dENySbshaWX1oWDGQmu8="; + hash = "sha256-rOjWxb6nWvfMWr2+9AyoCoOSg2jo3ZeoF8R6A8VvBj8="; }; outputs = [ diff --git a/pkgs/by-name/di/diffuse/package.nix b/pkgs/by-name/di/diffuse/package.nix index 8b5bf717ac97..d241ed6d1cf0 100644 --- a/pkgs/by-name/di/diffuse/package.nix +++ b/pkgs/by-name/di/diffuse/package.nix @@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { ]; # to avoid running gtk-update-icon-cache, update-desktop-database and glib-compile-schemas - DESTDIR = "/"; + env.DESTDIR = "/"; makeWrapperArgs = [ "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" diff --git a/pkgs/by-name/di/direnv/package.nix b/pkgs/by-name/di/direnv/package.nix index 7b74981d9072..7b831c38ef85 100644 --- a/pkgs/by-name/di/direnv/package.nix +++ b/pkgs/by-name/di/direnv/package.nix @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-SAIGFQGACTB3Q0KnIdiKKNYY6fVjf/09wGqNr0Hkg+M="; # we have no bash at the moment for windows - BASH_PATH = lib.optionalString (!stdenv.hostPlatform.isWindows) "${bash}/bin/bash"; + env.BASH_PATH = lib.optionalString (!stdenv.hostPlatform.isWindows) "${bash}/bin/bash"; # replace the build phase to use the GNUMakefile instead buildPhase = '' diff --git a/pkgs/by-name/di/distrobox/package.nix b/pkgs/by-name/di/distrobox/package.nix index 92864244106a..07550a6a2a7b 100644 --- a/pkgs/by-name/di/distrobox/package.nix +++ b/pkgs/by-name/di/distrobox/package.nix @@ -67,7 +67,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://distrobox.it/"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ atila ]; + maintainers = [ ]; mainProgram = "distrobox"; }; }) diff --git a/pkgs/by-name/dn/dnsdist/disable-network-tests.patch b/pkgs/by-name/dn/dnsdist/disable-network-tests.patch deleted file mode 100644 index fd0fdfbc4eae..000000000000 --- a/pkgs/by-name/dn/dnsdist/disable-network-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/test-dnsdisttcp_cc.cc b/test-dnsdisttcp_cc.cc -index 1fbb00e..dc04137 100644 ---- a/test-dnsdisttcp_cc.cc -+++ b/test-dnsdisttcp_cc.cc -@@ -848,6 +848,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionWithProxyProtocol_SelfAnswered) - - BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) - { -+ return; - auto local = getBackendAddress("1", 80); - ClientState localCS(local, true, false, false, "", {}); - auto tlsCtx = std::make_shared(); -@@ -1711,6 +1712,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) - - BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) - { -+ return; - auto local = getBackendAddress("1", 80); - ClientState localCS(local, true, false, false, "", {}); - /* enable out-of-order on the front side */ -@@ -3677,6 +3679,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) - - BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendNotOOOR) - { -+ return; - auto local = getBackendAddress("1", 80); - ClientState localCS(local, true, false, false, "", {}); - /* enable out-of-order on the front side */ diff --git a/pkgs/by-name/dn/dnsdist/package.nix b/pkgs/by-name/dn/dnsdist/package.nix index 07f3f465b2e4..8af9f1347384 100644 --- a/pkgs/by-name/dn/dnsdist/package.nix +++ b/pkgs/by-name/dn/dnsdist/package.nix @@ -1,62 +1,86 @@ { - lib, - stdenv, - fetchurl, - pkg-config, - systemd, boost, - libsodium, - libedit, - re2, - net-snmp, - lua, - protobuf, - openssl, - zlib, + cargo, + fetchpatch, + fetchurl, + fstrm, h2o, + lib, + libbpf, + libcap, + libedit, + libsodium, + lua, + net-snmp, nghttp2, nixosTests, + openssl, + pkg-config, + protobuf, + python3, + re2, + rustPlatform, + stdenv, + systemd, + xdp-tools, + zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "dnsdist"; - version = "1.9.10"; + version = "2.0.2"; src = fetchurl { - url = "https://downloads.powerdns.com/releases/dnsdist-${finalAttrs.version}.tar.bz2"; - hash = "sha256-An3b3uaVxaWXKAV7/EHFsaaR+hx6XokniwnzVTJfvtY="; + url = "https://downloads.powerdns.com/releases/dnsdist-${finalAttrs.version}.tar.xz"; + hash = "sha256-M3Trplpco8+5/Fl5HEflA1FJ/lIcy7ztX4NKF/RWQb8="; }; patches = [ - # Disable tests requiring networking: - # "Error connecting to new server with address 192.0.2.1:53: connecting socket to 192.0.2.1:53: Network is unreachable" - ./disable-network-tests.patch + # Fix build error when only protobuf is enabled + (fetchpatch { + url = "https://github.com/PowerDNS/pdns/commit/daece82818d7f83b26dcf724ec1864644bc3f854.patch"; + hash = "sha256-Ag65Gjmm2m4yvRfqMjSo1EEJg/2EHWDBg15vSL5DKCU="; + stripLen = 2; + }) ]; nativeBuildInputs = [ + cargo pkg-config protobuf + python3 + python3.pkgs.pyyaml + rustPlatform.cargoSetupHook ]; buildInputs = [ - systemd boost - libsodium - libedit - re2 - net-snmp - lua - openssl - zlib + fstrm # Required for DNSTAP h2o + libbpf + libcap + libedit + libsodium + lua + net-snmp nghttp2 + openssl + re2 + systemd + xdp-tools # AF_XDP support + zlib ]; configureFlags = [ "--with-libsodium" "--with-re2" "--enable-dnscrypt" + "--enable-dnstap" "--enable-dns-over-tls" "--enable-dns-over-https" + "--enable-yaml" + "--with-ebpf" + "--with-xsk" + "--with-libcap" "--with-protobuf=yes" "--with-net-snmp" "--disable-dependency-tracking" @@ -65,6 +89,13 @@ stdenv.mkDerivation (finalAttrs: { "--with-boost=${boost.dev}" ]; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) cargoRoot src; + hash = "sha256-nDAvgM3xb+95dcGIHiSKlFo4/0Rs5Evf1vvR5vF4MXs="; + }; + + cargoRoot = "dnsdist-rust-lib/rust"; + doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/by-name/dn/dnspeep/package.nix b/pkgs/by-name/dn/dnspeep/package.nix index bbdb1a80aecf..a7767de99e47 100644 --- a/pkgs/by-name/dn/dnspeep/package.nix +++ b/pkgs/by-name/dn/dnspeep/package.nix @@ -18,8 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-tZlh7+END6oOy3uWOrjle+nwqFhMU6bbXmr4hdt6gqY="; - LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ]; - LIBPCAP_VER = libpcap.version; + env = { + LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ]; + LIBPCAP_VER = libpcap.version; + }; meta = { description = "Spy on the DNS queries your computer is making"; diff --git a/pkgs/by-name/do/docbook2x/package.nix b/pkgs/by-name/do/docbook2x/package.nix index fbbe6e3daeb2..3413918f9499 100644 --- a/pkgs/by-name/do/docbook2x/package.nix +++ b/pkgs/by-name/do/docbook2x/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { # configure tries to find osx in PATH and hardcodes the resulting path # (if any) on the Perl code. this fails under strictDeps, so override # the autoconf test: - OSX = "${opensp}/bin/osx"; + env.OSX = "${opensp}/bin/osx"; postConfigure = '' # Broken substitution is used for `perl/config.pl', which leaves literal diff --git a/pkgs/by-name/do/dotnet-outdated/package.nix b/pkgs/by-name/do/dotnet-outdated/package.nix index 254f59463939..738696dbaf2b 100644 --- a/pkgs/by-name/do/dotnet-outdated/package.nix +++ b/pkgs/by-name/do/dotnet-outdated/package.nix @@ -6,11 +6,11 @@ buildDotnetGlobalTool rec { pname = "dotnet-outdated"; nugetName = "dotnet-outdated-tool"; - version = "4.6.9"; + version = "4.7.0"; dotnet-sdk = dotnetCorePackages.sdk_10_0; - nugetHash = "sha256-LVe/b18hxM9A0Kni6Kl4sE38KgzIihDuc+xRw8qaKv0="; + nugetHash = "sha256-96tYVEN6sWw2H5xB6UaDUO7EtOn839Nfagamxf8bLvA="; meta = { description = ".NET Core global tool to display and update outdated NuGet packages in a project"; diff --git a/pkgs/by-name/dr/draco/package.nix b/pkgs/by-name/dr/draco/package.nix index 24352556e86a..d17e8e471f63 100644 --- a/pkgs/by-name/dr/draco/package.nix +++ b/pkgs/by-name/dr/draco/package.nix @@ -61,9 +61,10 @@ stdenv.mkDerivation (finalAttrs: { "-DDRACO_TINYGLTF_PATH=${tinygltf}" ]; - CXXFLAGS = [ + env.CXXFLAGS = toString [ # error: expected ')' before 'value' in 'explicit GltfValue(uint8_t value)' - "-include cstdint" + "-include" + "cstdint" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/dr/drawio/package.nix b/pkgs/by-name/dr/drawio/package.nix index f34850f7c99b..a86bddff9fff 100644 --- a/pkgs/by-name/dr/drawio/package.nix +++ b/pkgs/by-name/dr/drawio/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { darwin.autoSignDarwinBinariesHook ]; - ELECTRON_SKIP_BINARY_DOWNLOAD = true; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = true; configurePhase = '' runHook preConfigure diff --git a/pkgs/by-name/dr/drill/package.nix b/pkgs/by-name/dr/drill/package.nix index 1e88a744405b..2d06e6cf7905 100644 --- a/pkgs/by-name/dr/drill/package.nix +++ b/pkgs/by-name/dr/drill/package.nix @@ -24,8 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: { pkg-config ]; - OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; - OPENSSL_DIR = "${lib.getDev openssl}"; + env = { + OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; + OPENSSL_DIR = "${lib.getDev openssl}"; + }; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl diff --git a/pkgs/by-name/dr/droidcam/package.nix b/pkgs/by-name/dr/droidcam/package.nix index 5e9caf964d96..c3a9a211284d 100644 --- a/pkgs/by-name/dr/droidcam/package.nix +++ b/pkgs/by-name/dr/droidcam/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "droidcam"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-z/SteW3jYR/VR+HffvTetdGs5oz4qWBNkaqLYiP1V8c="; + sha256 = "sha256-22lRmtXumjR/83Fg1edBisM1GjNZvNUvPs1Yg7Na1xw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dr/droidmote/package.nix b/pkgs/by-name/dr/droidmote/package.nix index 8d325319d24f..57cd8d1e47a9 100644 --- a/pkgs/by-name/dr/droidmote/package.nix +++ b/pkgs/by-name/dr/droidmote/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { homepage = "https://www.videomap.it/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ atila ]; + maintainers = [ ]; platforms = lib.attrNames srcs; }; } diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix index 47f81d6a25bb..de58c611f8bc 100644 --- a/pkgs/by-name/dr/dropbear/package.nix +++ b/pkgs/by-name/dr/dropbear/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-DR98pxHPwzbcioXmcsq5z9giOgL+LaCkp661jJ4RNjQ="; }; - CFLAGS = lib.pipe (lib.attrNames dflags) [ + env.CFLAGS = lib.pipe (lib.attrNames dflags) [ (map (name: "-D${name}=\\\"${dflags.${name}}\\\"")) (lib.concatStringsSep " ") ]; diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index 09711f351e85..f851a097f925 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dua"; - version = "2.33.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-3Mlhz+vYeDSoVLuBFAtgJxrECwUchSWIusrLKqhxU30="; + hash = "sha256-F09Ne+2Ospw44L97nwHXp/ELM9B3G2Mt0Crau//zV/c="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-85I+rWomp+2G1DLbwowHDSrRm6dS4b99Ia24ffY7Fnk="; + cargoHash = "sha256-g92G/4mfHH7zW14eoodL7j179Iah5iAH78zlmcxM/AM="; checkFlags = [ # Skip interactive tests diff --git a/pkgs/by-name/du/dumpasn1/package.nix b/pkgs/by-name/du/dumpasn1/package.nix index f9a878f711b5..cf7a526589bc 100644 --- a/pkgs/by-name/du/dumpasn1/package.nix +++ b/pkgs/by-name/du/dumpasn1/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-r40czSLdjCYbt73zK7exCoP/kMq6+pyJfz9LKJLLaXM="; }; - CFLAGS = ''-DDUMPASN1_CONFIG_PATH='"$(out)/etc/"' ''; + env.CFLAGS = ''-DDUMPASN1_CONFIG_PATH='"$(out)/etc/"' ''; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix index 8669f2eb3dde..c0d7424775f1 100644 --- a/pkgs/by-name/dw/dwarfs/package.nix +++ b/pkgs/by-name/dw/dwarfs/package.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # these fail inside of the sandbox due to missing access # to the FUSE device - GTEST_FILTER = + env.GTEST_FILTER = let disabledTests = [ "dwarfs/tools_test.end_to_end/*" diff --git a/pkgs/by-name/dy/dynamic-colors/package.nix b/pkgs/by-name/dy/dynamic-colors/package.nix index 2d453bcab36d..7613f54bd019 100644 --- a/pkgs/by-name/dy/dynamic-colors/package.nix +++ b/pkgs/by-name/dy/dynamic-colors/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-jSdwq9WwYZP8MK6z7zJa0q93xfanr6iuvAt8YQkQxxE="; }; - PREFIX = placeholder "out"; + env.PREFIX = placeholder "out"; postPatch = '' substituteInPlace bin/dynamic-colors \ diff --git a/pkgs/by-name/ea/eask-cli/package.nix b/pkgs/by-name/ea/eask-cli/package.nix index d94b62a9fe4f..7b54749c6880 100644 --- a/pkgs/by-name/ea/eask-cli/package.nix +++ b/pkgs/by-name/ea/eask-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "eask-cli"; - version = "0.12.5"; + version = "0.12.8"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-GYpFbCEgS9GgZs/XC3NwA8GuCiovaUTL1bVqlsnyFKI="; + hash = "sha256-eH46NlHQs+OVbc3WVUKHQGgXi9rvFMTrbd3UB8WCB6k="; }; - npmDepsHash = "sha256-712QW0tTKg7THsBzvEHcG97FBMw3ESzpoqdw0kv3mMU="; + npmDepsHash = "sha256-U/VKtefL31FNYUegt8+Qg2jM6fx4cX660UcNqGsWMOc="; dontBuild = true; diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index 9000999343a2..5deea8e1531c 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -52,7 +52,11 @@ buildGoModule rec { glibc ]; - CGO_LDFLAGS = "-lpcap -lpthread -static"; + env.CGO_LDFLAGS = toString [ + "-lpcap" + "-lpthread" + "-static" + ]; ldflags = [ "-extldflags '-static'" diff --git a/pkgs/by-name/ec/ecasound/package.nix b/pkgs/by-name/ec/ecasound/package.nix index b643c8aa7fe5..395c103a6a3c 100644 --- a/pkgs/by-name/ec/ecasound/package.nix +++ b/pkgs/by-name/ec/ecasound/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - CXXFLAGS = "-std=c++11"; + env.CXXFLAGS = "-std=c++11"; configureFlags = [ "--enable-liblilv" "--with-extra-cppflags=-Dnullptr=0" diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index 19c0aabd0642..e4ded1dfd220 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { ++ attrs.nativeBuildInputs or [ ]; strictDeps = true; - ${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix; + env.${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix; prePatch = '' rm -rf BaseTools diff --git a/pkgs/by-name/ef/eflite/package.nix b/pkgs/by-name/ef/eflite/package.nix index a6aa478947e8..c797057b331f 100644 --- a/pkgs/by-name/ef/eflite/package.nix +++ b/pkgs/by-name/ef/eflite/package.nix @@ -44,7 +44,9 @@ stdenv.mkDerivation (finalAttrs: { ./format.patch ]; - CFLAGS = lib.optionalString debug " -DDEBUG=2"; + env = lib.optionalAttrs debug { + CFLAGS = " -DDEBUG=2"; + }; meta = { homepage = "https://eflite.sourceforge.net"; diff --git a/pkgs/by-name/ek/ekho/package.nix b/pkgs/by-name/ek/ekho/package.nix index f99ac8376ef9..93a928c216ce 100644 --- a/pkgs/by-name/ek/ekho/package.nix +++ b/pkgs/by-name/ek/ekho/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ./autogen.sh ''; - CXXFLAGS = [ + env.CXXFLAGS = toString [ "-O0" "-I${lib.getDev utf8cpp}/include/utf8cpp" ]; diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index da702d2a11eb..13a9da94e9c6 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -61,7 +61,7 @@ flutter332.buildFlutterApplication rec { ]; # https://github.com/juliansteenbakker/flutter_secure_storage/issues/965 - CXXFLAGS = [ "-Wno-deprecated-literal-operator" ]; + env.CXXFLAGS = toString [ "-Wno-deprecated-literal-operator" ]; # 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 diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix index 60947666ec93..b76075a42f1b 100644 --- a/pkgs/by-name/eq/equicord/package.nix +++ b/pkgs/by-name/eq/equicord/package.nix @@ -20,20 +20,20 @@ stdenv.mkDerivation (finalAttrs: { # the Equicord repository. Dates as tags (and automatic releases) were the compromise # we came to with upstream. Please do not change the version schema (e.g., to semver) # unless upstream changes the tag schema from dates. - version = "2026-01-19"; + version = "2026-02-16"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equicord"; tag = finalAttrs.version; - hash = "sha256-pEFU1E+BqAAAz2ywPrS1MejhZ/g47iG/4BBey+2F7Hw="; + hash = "sha256-YSTLO2DtUWNfTpUMjtFjVOAt8jOnAxZnfZFFFXe7Fkg="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 1; - hash = "sha256-iBCA4G1E1Yw/d94pQzcbBGJYeIIgZI+Gw87/x4ogoyg="; + hash = "sha256-um8CmR4H+sck6sOpIpnISPhYn/rvXNfSn6i/EgQFvk0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/er/ergogen/package.nix b/pkgs/by-name/er/ergogen/package.nix index 2dfc6400de20..169ac57f788e 100644 --- a/pkgs/by-name/er/ergogen/package.nix +++ b/pkgs/by-name/er/ergogen/package.nix @@ -24,7 +24,8 @@ buildNpmPackage (finalAttrs: { makeCacheWritable = true; dontNpmBuild = true; npmPackFlags = [ "--ignore-scripts" ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + + env.NODE_OPTIONS = "--openssl-legacy-provider"; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/er/ergoscf/package.nix b/pkgs/by-name/er/ergoscf/package.nix index 322f6915cae3..de4d74093589 100644 --- a/pkgs/by-name/er/ergoscf/package.nix +++ b/pkgs/by-name/er/ergoscf/package.nix @@ -35,13 +35,15 @@ stdenv.mkDerivation (finalAttrs: { env = { # Required for compilation with gcc-14 NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - LDFLAGS = "-lblas -llapack"; + LDFLAGS = toString [ + "-lblas" + "-llapack" + ]; + OMP_NUM_THREADS = 2; # required for check phase }; enableParallelBuilding = true; - OMP_NUM_THREADS = 2; # required for check phase - # With "fortify3", there are test failures, such as: # Testing cnof CAMB3LYP/6-31G using FMM # *** buffer overflow detected ***: terminated diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix index b9433a125d59..be6f4b7a53ad 100644 --- a/pkgs/by-name/er/erofs-utils/package.nix +++ b/pkgs/by-name/er/erofs-utils/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "erofs-utils"; - version = "1.8.10"; + version = "1.9"; outputs = [ "out" "man" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; - hash = "sha256-BetO3r4R3szm7LNOmNL4DIzSg8Lyln2Lp+/VhBhXBRQ="; + hash = "sha256-0byEtdYLyuEhp/V+qX1BVRiQh+F4+BJ/MIRtn1N8nXM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix index d292fa9657e6..76c1cd08c2bd 100644 --- a/pkgs/by-name/es/esphome/dashboard.nix +++ b/pkgs/by-name/es/esphome/dashboard.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20260110.0"; + version = "20260210.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "dashboard"; tag = version; - hash = "sha256-h8g/MRfOBkiCKNTOM4I6OimsE5ljgsIMQLl1eZLfP3U="; + hash = "sha256-Edd2ZOSBAZSrGVjbncyPhhjFjE0CxBHz16ZHXyzx9LI="; }; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-DkK2WG7oWHvwYflNdwOMfE0OVP2ICEGAhhTH2rix9zc="; + hash = "sha256-L6tKhijTFAvQwhBBl5Wk6xzI2dtDI6IYfCkiKX75Pvc="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 7ebd1f1e8acf..ee731a80cce1 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -33,14 +33,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2026.1.5"; + version = "2026.2.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = version; - hash = "sha256-leQkNa2FK7Wagpr+TKbfg/qkRMII03+dnWXoFZwwn9w="; + hash = "sha256-VcfQsDx3u7GTndF5GE0XCplPXVo9ClLJwqWLJFKzWEk="; }; patches = [ @@ -68,8 +68,8 @@ python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==80.9.0" "setuptools" \ - --replace-fail "wheel>=0.43,<0.46" "wheel" + --replace-fail "setuptools==82.0.0" "setuptools" \ + --replace-fail "wheel>=0.43,<0.47" "wheel" ''; # Remove esptool and platformio from requirements diff --git a/pkgs/by-name/et/etcd_3_5/package.nix b/pkgs/by-name/et/etcd_3_5/package.nix index 948684fb9d5e..19da109b3ddf 100644 --- a/pkgs/by-name/et/etcd_3_5/package.nix +++ b/pkgs/by-name/et/etcd_3_5/package.nix @@ -8,11 +8,11 @@ }: let - version = "3.5.26"; - etcdSrcHash = "sha256-bEWswJM7r6Kxy9im/TkXkEQN5tEIvQK6Azd7LbIVwYA="; - etcdServerVendorHash = "sha256-pwVAy8wQXBGE0MqE3v7OLukwcKIQhEW3BjwPdSMtAYM="; - etcdUtlVendorHash = "sha256-dIxu7MUG5Yk3+DkCgfsGEmpyEklqvyz7wpWylHTDIkQ="; - etcdCtlVendorHash = "sha256-NJ1jc/0J5+GUxu1r1g9t6pnlHjx3CnmBe5NR+qWK7Dc="; + version = "3.5.27"; + etcdSrcHash = "sha256-ne0uKpS7KQL/Efi5sMdnD8PQl5phDivBEM1PrsSxVf4="; + etcdServerVendorHash = "sha256-6vu0ttbes5uN+m/tW/zuPZgyc1z+VcNpoJauykxBUUY="; + etcdUtlVendorHash = "sha256-Z8Rc19p5Sigg71/r9yURE6LNHqHjah3b/ZfxI0nH4qc="; + etcdCtlVendorHash = "sha256-uAo50jN69YKuW3NCRtc9HE8AnqKWtZQ+sJvwgw1BJj0="; src = fetchFromGitHub { owner = "etcd-io"; diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix index 98d93face05c..cfcc629d5e26 100644 --- a/pkgs/by-name/et/eternal-terminal/package.nix +++ b/pkgs/by-name/et/eternal-terminal/package.nix @@ -45,9 +45,9 @@ stdenv.mkDerivation (finalAttrs: { "-DDISABLE_CRASH_LOG=TRUE" ]; - CXXFLAGS = lib.optionals stdenv.cc.isClang [ - "-std=c++17" - ]; + env = lib.optionalAttrs stdenv.cc.isClang { + CXXFLAGS = toString [ "-std=c++17" ]; + }; doCheck = true; diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 8380018141d9..b6372cd0a171 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -1,12 +1,12 @@ { lib, stdenv, - buildGo125Module, + buildGo126Module, fetchFromGitHub, fetchNpmDeps, cacert, git, - go_1_25, + go_1_26, gokrazy, enumer, mockgen, @@ -17,23 +17,23 @@ }: let - version = "0.300.8"; + version = "0.301.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-IbyE9Y9crdoaPy1/PkKaA1iOAUFOf2cYzoB9Cj3luSo="; + hash = "sha256-ns6Kl0sN8GeF0Br7HrRLdVmKaGMqT3Y5REuH9UJg+Yg="; }; - vendorHash = "sha256-j+tmZeVUqUpETIg8ILlxRRdN5/OV8pYmgH2FM1uweAY="; + vendorHash = "sha256-LGTT7WxBlWA4pCunvFDpsqDkUhTN96PohBKTLAffr0o="; commonMeta = { license = lib.licenses.mit; maintainers = with lib.maintainers; [ hexa ]; }; - decorate = buildGo125Module { + decorate = buildGo126Module { pname = "evcc-decorate"; inherit version src vendorHash; @@ -46,13 +46,13 @@ let }; in -buildGo125Module rec { +buildGo126Module rec { pname = "evcc"; inherit version src vendorHash; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-DGDPbc/N+c3lt1rIx/nAt1i44J//egPQXGWH7tomJTw="; + hash = "sha256-fblf49V+fn+9iuIwwOZ/iYMxUbjtWcm3iEs9mP9l59I="; }; nativeBuildInputs = [ @@ -64,7 +64,7 @@ buildGo125Module rec { nativeBuildInputs = [ decorate enumer - go_1_25 + go_1_26 gokrazy git cacert diff --git a/pkgs/by-name/ev/eventstore/package.nix b/pkgs/by-name/ev/eventstore/package.nix index fd730c0fd77c..51452be3c28b 100644 --- a/pkgs/by-name/ev/eventstore/package.nix +++ b/pkgs/by-name/ev/eventstore/package.nix @@ -27,7 +27,7 @@ buildDotnetModule rec { }; # Fixes application reporting 0.0.0.0 as its version. - MINVERVERSIONOVERRIDE = version; + env.MINVERVERSIONOVERRIDE = version; dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; diff --git a/pkgs/by-name/ev/evil-winrm-py/package.nix b/pkgs/by-name/ev/evil-winrm-py/package.nix index e5a9696b7b6c..2283ff4a7a90 100644 --- a/pkgs/by-name/ev/evil-winrm-py/package.nix +++ b/pkgs/by-name/ev/evil-winrm-py/package.nix @@ -20,6 +20,8 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-IACFPPlkgyJh78p6Jy740CQqcySkMTV/8VVPSRJKTPI="; }; + pythonRelaxDeps = [ "pypsrp" ]; + # Removes the additional binary ewp postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/by-name/ex/exifprobe/package.nix b/pkgs/by-name/ex/exifprobe/package.nix index b1d5b1cf412c..584eb2abf667 100644 --- a/pkgs/by-name/ex/exifprobe/package.nix +++ b/pkgs/by-name/ex/exifprobe/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1c1fhc0v1m452lgnfcijnvrc0by06qfbhn3zkliqi60kv8l2isbp"; }; - CFLAGS = [ "-O2" ]; + env.CFLAGS = toString [ "-O2" ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/by-name/ex/exportarr/package.nix b/pkgs/by-name/ex/exportarr/package.nix index 805da4706900..eff10e663409 100644 --- a/pkgs/by-name/ex/exportarr/package.nix +++ b/pkgs/by-name/ex/exportarr/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { subPackages = [ "cmd/exportarr" ]; - CGO_ENABLE = 0; + env.CGO_ENABLE = 0; ldflags = [ "-s" diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index 5ee44bff56ac..1fe1f4887d92 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "fabric-ai"; - version = "1.4.404"; + version = "1.4.415"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; tag = "v${finalAttrs.version}"; - hash = "sha256-RkcbKRSXKsW4nyAtSD63fwZDoaDpqg1LgTRTICD4INs="; + hash = "sha256-R9ZxkZeqCA395zhIAqUfnvLO6HLkajPwKhTLUvPY9Cs="; }; - vendorHash = "sha256-dG4RPmsAB7yqZyJNBt1N+S9vwhgxdO6p3TeAdIJKMBk="; + vendorHash = "sha256-zDRJGo7k08TKL5WJSvlkE4KOVT9+xeA7aB+Quuu3ooM="; # Fabric introduced plugin tests that fail in the nix build sandbox. doCheck = false; diff --git a/pkgs/by-name/fa/fairywren/package.nix b/pkgs/by-name/fa/fairywren/package.nix index b7191088a237..65418233d048 100644 --- a/pkgs/by-name/fa/fairywren/package.nix +++ b/pkgs/by-name/fa/fairywren/package.nix @@ -22,13 +22,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2026-02-08"; + version = "0-unstable-2026-02-15"; src = fetchFromGitLab { owner = "aiyahm"; repo = "FairyWren-Icons"; - rev = "66295dee92a34c01174ac7fa3ac7d677d60af32e"; - hash = "sha256-6NK0+pggoezpBhOM+XxrzipT5Pv2vhSlwyEJ0M8WtBM="; + rev = "2bfc2dc20a6bf4d763cdd6633b6dcfa826903756"; + hash = "sha256-9e7BNDcr4/lW0zwhkz1aUZbI3lzaVs5elF6WGXSDO4g="; }; propagatedBuildInputs = [ diff --git a/pkgs/by-name/fc/fcrackzip/package.nix b/pkgs/by-name/fc/fcrackzip/package.nix index 4d89ece7d0ca..b90f8b92565f 100644 --- a/pkgs/by-name/fc/fcrackzip/package.nix +++ b/pkgs/by-name/fc/fcrackzip/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "0l1qsk949vnz18k4vjf3ppq8p497966x4c7f2yx18x8pk35whn2a"; }; - CFLAGS = "-std=gnu89"; + env.CFLAGS = "-std=gnu89"; # 'fcrackzip --use-unzip' cannot deal with file names containing a single quote # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430387 diff --git a/pkgs/by-name/fe/feedgnuplot/package.nix b/pkgs/by-name/fe/feedgnuplot/package.nix index b468221f8bbb..416a4fd61fd7 100644 --- a/pkgs/by-name/fe/feedgnuplot/package.nix +++ b/pkgs/by-name/fe/feedgnuplot/package.nix @@ -46,7 +46,7 @@ perlPackages.buildPerlPackage rec { ]); # Fontconfig error: Cannot load default config file - FONTCONFIG_FILE = fontsConf; + env.FONTCONFIG_FILE = fontsConf; postPatch = '' patchShebangs . diff --git a/pkgs/by-name/fe/feh/package.nix b/pkgs/by-name/fe/feh/package.nix index 54fdfc74f589..39a143428c55 100644 --- a/pkgs/by-name/fe/feh/package.nix +++ b/pkgs/by-name/fe/feh/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feh"; - version = "3.11.2"; + version = "3.11.3"; src = fetchFromGitHub { owner = "derf"; repo = "feh"; rev = finalAttrs.version; - hash = "sha256-bwp/hzkuwQTgPakE0zkNtBWrNUkVWt9btTD8MVx+Xq4="; + hash = "sha256-7I/aqm8mE6B/FLmkirgybr6QUZKU6p0inlvj0rFH/lU="; }; outputs = [ diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index d81b6ea6fa31..7ab150ed1668 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -6,10 +6,10 @@ let pname = "fflogs"; - version = "8.20.17"; + version = "8.20.36"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-2gul6DwuhB9iy3BR8u+rIIWz2G+nX1IA7c6cqq1QYlg="; + hash = "sha256-NwbRz6nqK4AxCEzZKHaAuw33CCjfF6C7oGsH2thNb+o="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/fi/fig2dev/package.nix b/pkgs/by-name/fi/fig2dev/package.nix index 73444a95bd14..a42db77a1cda 100644 --- a/pkgs/by-name/fi/fig2dev/package.nix +++ b/pkgs/by-name/fi/fig2dev/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpng ]; - GSEXE = "${ghostscript}/bin/gs"; + env.GSEXE = "${ghostscript}/bin/gs"; configureFlags = [ "--enable-transfig" ]; diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix index 57f7b0a7fc5c..3f6c43bc42e4 100644 --- a/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/pkgs/by-name/fi/firefoxpwa/package.nix @@ -56,8 +56,10 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - FFPWA_EXECUTABLES = ""; # .desktop entries generated without any store path references - FFPWA_SYSDATA = "${placeholder "out"}/share/firefoxpwa"; + env = { + FFPWA_EXECUTABLES = ""; # .desktop entries generated without any store path references + FFPWA_SYSDATA = "${placeholder "out"}/share/firefoxpwa"; + }; completions = "target/${stdenv.targetPlatform.config}/release/completions"; gtk_modules = map (x: x + x.gtkModule) [ libcanberra-gtk3 ]; diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 97b1630bfe10..712307f8fdb0 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -14,7 +14,6 @@ libiconv, pcre2, pkg-config, - sphinx, gettext, ncurses, python3, @@ -150,13 +149,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fish"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "fish-shell"; repo = "fish-shell"; tag = finalAttrs.version; - hash = "sha256-vUNmlEVQ5nxXSDfpgQ3l/+dzYW/MllhcfJhmFx4kY/A="; + hash = "sha256-9EhvCStAeL+ADkLy9b4gXPx+JrVzUZ5Fdkf+imY3Vw0="; }; env = { @@ -169,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-9Wi9KlMzTrecEkHyfW/H9WPHpQDEMpdGB8snFs7zFb4="; + hash = "sha256-RVg6Zciy9mqZQwM5P3ngJi2NjC0qwFH7XgVEanaKnsg="; }; patches = [ @@ -188,6 +187,10 @@ stdenv.mkDerivation (finalAttrs: { # * # * ./nix-darwin-path.patch + + # these tests fail, likely due to dumb terminal issues, but setting a TERM + # doesn't help. Skipping them. + ./skip-sgr-tests.patch ]; # Fix FHS paths in tests @@ -298,6 +301,10 @@ stdenv.mkDerivation (finalAttrs: { pkg-config rustc rustPlatform.cargoSetupHook + (python3.withPackages (ps: [ + ps.pexpect + ps.sphinx + ])) # Avoid warnings when building the manpages about HOME not being writable writableTmpDirAsHomeHook ]; @@ -342,15 +349,13 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) man-db; - # disable darwin pending https://github.com/NixOS/nixpkgs/pull/462090 getting through staging + # disable darwin checks due to multiple failures doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ coreutils glibcLocales - (python3.withPackages (ps: [ ps.pexpect ])) procps - sphinx ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # For the getconf command, used in default-setup-path.fish diff --git a/pkgs/by-name/fi/fish/skip-sgr-tests.patch b/pkgs/by-name/fi/fish/skip-sgr-tests.patch new file mode 100644 index 000000000000..f643a4ba8201 --- /dev/null +++ b/pkgs/by-name/fi/fish/skip-sgr-tests.patch @@ -0,0 +1,19 @@ +diff --git a/src/terminal.rs b/src/terminal.rs +--- a/src/terminal.rs ++++ b/src/terminal.rs +@@ -787,6 +787,7 @@ + SgrTerminalCommand::ExitAttributeMode, + }; + ++ #[ignore] + #[test] + fn sgr_combining() { + // No style, no content +@@ -823,6 +824,7 @@ + assert_eq!(String::from_utf8_lossy(outp.contents()), "\u{1b}[30;40m"); + } + ++ #[ignore] + #[test] + fn sgr_max_length() { + // Cut at max length diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix index e7237fb2869e..a765e6d66456 100644 --- a/pkgs/by-name/fl/flare-signal/package.nix +++ b/pkgs/by-name/fl/flare-signal/package.nix @@ -23,19 +23,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "flare"; - version = "0.18.3"; + version = "0.18.4"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = "flare"; tag = finalAttrs.version; - hash = "sha256-+25nDG/xw82Iv6gGYWmGHUBf4CbTLBTzrOqKdrCFIMQ="; + hash = "sha256-6a/up/UbaB9WQEiw8fmuh9Xjz73oBxO2k9jKhKwo0mc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-nY+rxWzZJoQRB+Pn4yjof+fCcI2GU2+QFCN73kgRLZ0="; + hash = "sha256-wjm3R43iMbXZeMe4dPyreXNqc+3FrDvaEeJJM+IYtz4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix index 66f2d85cfe3a..cc6b9231b022 100644 --- a/pkgs/by-name/fl/flaresolverr/package.nix +++ b/pkgs/by-name/fl/flaresolverr/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/FlareSolverr/FlareSolverr/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; mainProgram = "flaresolverr"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ diogotcorreia ]; inherit (undetected-chromedriver.meta) platforms; }; }) diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json index a29f47c045be..a3f3a55e1472 100644 --- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json @@ -1,21 +1,21 @@ { - "version": "12.10.3", + "version": "12.10.4", "sources": { "aarch64-linux": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.3/floorp-linux-aarch64.tar.xz", - "sha256": "b2f62db7941f819375a9f8627bd55442c30310e93cb270621fdf9e5c707801e3" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.4/floorp-linux-aarch64.tar.xz", + "sha256": "6fb5030be0209744dd9aac0fa5645c45a21d135d4e487836a300359a695327e5" }, "x86_64-linux": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.3/floorp-linux-x86_64.tar.xz", - "sha256": "fb866cd00da594c5c6435238e32ac2c13eaca40ead4936656aee88ea3446983f" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.4/floorp-linux-x86_64.tar.xz", + "sha256": "1cc457b0b23d29d863749a9a4f000b47fa480aa0579774bb39eff5978160df21" }, "aarch64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.3/floorp-macOS-universal.dmg", - "sha256": "56477ebaae97aee37c0a93294f8770ae901bf2e35d2be03540daf0a779db6dae" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.4/floorp-macOS-universal.dmg", + "sha256": "1fa4e85c9aa58d989f0aa01389c0b3a5f231ad08485606427498777daba81398" }, "x86_64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.3/floorp-macOS-universal.dmg", - "sha256": "56477ebaae97aee37c0a93294f8770ae901bf2e35d2be03540daf0a779db6dae" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.4/floorp-macOS-universal.dmg", + "sha256": "1fa4e85c9aa58d989f0aa01389c0b3a5f231ad08485606427498777daba81398" } } } diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix index 36ac3253dd53..f8131aec73d7 100644 --- a/pkgs/by-name/fl/fly/package.nix +++ b/pkgs/by-name/fl/fly/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "fly"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${finalAttrs.version}"; - hash = "sha256-fwWYZHtirrH0neNMFJzgjxUFAggBRWzFjQVJg68Tfrs="; + hash = "sha256-8aaXCsTeeufk6J0KwRLau3KL5LvGK/qXkRdUC0D3DSw="; }; vendorHash = "sha256-Ymxe64xtstMKISIHHCY5Z8RX3FxoS/8ocSZomcr4NXA="; diff --git a/pkgs/by-name/fm/fmi-reference-fmus/package.nix b/pkgs/by-name/fm/fmi-reference-fmus/package.nix index 223ffb3c9e39..175d114b8844 100644 --- a/pkgs/by-name/fm/fmi-reference-fmus/package.nix +++ b/pkgs/by-name/fm/fmi-reference-fmus/package.nix @@ -31,7 +31,10 @@ stdenv.mkDerivation (finalAttrs: { "-DFMI_VERSION=${toString FMIVersion}" (lib.cmakeBool "WITH_FMUSIM" false) ]; - CFLAGS = lib.optionalString (FMIVersion == 3) "-Wno-stringop-truncation"; + + env = lib.optionalAttrs (FMIVersion == 3) { + CFLAGS = "-Wno-stringop-truncation"; + }; meta = { # CMakeLists.txt explicitly states support for aarch64-darwin, but diff --git a/pkgs/by-name/fo/font-alias/package.nix b/pkgs/by-name/fo/font-alias/package.nix index 7ce6cb893415..4ec91e542e0b 100644 --- a/pkgs/by-name/fo/font-alias/package.nix +++ b/pkgs/by-name/fo/font-alias/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitLab, gitUpdater, autoreconfHook, @@ -8,9 +8,9 @@ util-macros, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "font-alias"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "font"; repo = "alias"; tag = "font-alias-${finalAttrs.version}"; - hash = "sha256-qglRNSt/PgFprpsvOVCeLMA+YagJw8DZMAfFdZ0m0/s="; + hash = "sha256-WGCC4OTerSRf+2sGNqggSBzVVv7gcuP6s3QQHBLahdM="; }; nativeBuildInputs = [ @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { cronyx mit ]; - maintainers = [ ]; - platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ qweered ]; }; }) diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index f8119264478a..424a316996cb 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -138,7 +138,7 @@ stdenv.mkDerivation { # recommended build flags for performance optimized foot builds # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#release-build - CFLAGS = if !doPgo then "-O3" else pgoCflags; + env.CFLAGS = if !doPgo then "-O3" else pgoCflags; # ar with gcc plugins for lto objects preConfigure = '' diff --git a/pkgs/by-name/fo/forgejo-mcp/package.nix b/pkgs/by-name/fo/forgejo-mcp/package.nix index 7bd1c675419c..9ee7fccf41e8 100644 --- a/pkgs/by-name/fo/forgejo-mcp/package.nix +++ b/pkgs/by-name/fo/forgejo-mcp/package.nix @@ -8,22 +8,29 @@ buildGoModule (finalAttrs: { pname = "forgejo-mcp"; - version = "2.9.1"; + version = "2.11.0"; src = fetchFromCodeberg { owner = "goern"; repo = "forgejo-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-9++EewwF2zxdYCwDdNVX/7liiHZNR1rmM0Z7w5r4v5k="; + hash = "sha256-mOxIMK4oke9MfKyirupw/b5ozG+1ZgUZP8vr2UTVfDo="; }; - vendorHash = "sha256-THdbGlinpH6ZtVveFEN/wy8ITG6pC+Zs6Leyx+2/hqI="; + vendorHash = "sha256-j5o/FZBowQvcatw14Fvs/8CTM5ZtQR6kwlroctaeKuM="; ldflags = [ "-s" "-X main.Version=${finalAttrs.version}" ]; + __darwinAllowLocalNetworking = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 21988b9c6d40..de78f697b58e 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -49,17 +49,17 @@ let in buildGoModule (finalAttrs: { pname = "forgejo-runner"; - version = "12.6.4"; + version = "12.7.0"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${finalAttrs.version}"; - hash = "sha256-v+b1YGUoIwzSGYUq/aUc5DceKUqWm0LA1Fd1/X/rf5w="; + hash = "sha256-pQYlacbctW+Cbm3abDps2ZpqX/iPhgAgJnBsaXcny6w="; }; - vendorHash = "sha256-MrumzEpSuLVmtrySnlI7Nb7GqxmW8Yk9agsaH4HA6QU="; + vendorHash = "sha256-nceLZzbSk56l3NLgusw6JKi1owniQVudNDgC7fsHxYQ="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index 4b5c28281cf2..86a8b7b5508c 100644 --- a/pkgs/by-name/fo/fortune-kind/package.nix +++ b/pkgs/by-name/fo/fortune-kind/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildNoDefaultFeatures = true; - MAN_OUT = "./man"; + env.MAN_OUT = "./man"; preBuild = '' mkdir -p "./$MAN_OUT"; diff --git a/pkgs/by-name/fr/freeswitch/package.nix b/pkgs/by-name/fr/freeswitch/package.nix index 1b43feeca048..c80de735f401 100644 --- a/pkgs/by-name/fr/freeswitch/package.nix +++ b/pkgs/by-name/fr/freeswitch/package.nix @@ -159,17 +159,19 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error" - # https://github.com/signalwire/freeswitch/issues/2495 - "-Wno-incompatible-pointer-types" - ]; + env = { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error" + # https://github.com/signalwire/freeswitch/issues/2495 + "-Wno-incompatible-pointer-types" + ]; - # Using c++14 because of build error - # gsm_at.h:94:32: error: ISO C++17 does not allow dynamic exception specifications - CXXFLAGS = "-std=c++14"; + # Using c++14 because of build error + # gsm_at.h:94:32: error: ISO C++17 does not allow dynamic exception specifications + CXXFLAGS = "-std=c++14"; - CFLAGS = "-D_ANSI_SOURCE"; + CFLAGS = "-D_ANSI_SOURCE"; + }; hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix index fd0dc3eebf34..ef3a202c00c6 100644 --- a/pkgs/by-name/fr/frr/package.nix +++ b/pkgs/by-name/fr/frr/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { # Without the std explicitly set, we may run into abseil-cpp # compilation errors. - CXXFLAGS = "-std=gnu++23"; + env.CXXFLAGS = "-std=gnu++23"; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index 1596054380c6..3948b8edb039 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "fzf"; - version = "0.67.0"; + version = "0.68.0"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf"; rev = "v${finalAttrs.version}"; - hash = "sha256-P6jyKskc2jT6zMLAMxklN8e/630oWYT4bWim20IMKvo="; + hash = "sha256-3hEAhpWUkAwXE9kU+mRl6nSvnsVyvlFiKW0P9BG/cxE="; }; vendorHash = "sha256-uFXHoseFOxGIGPiWxWfDl339vUv855VHYgSs9rnDyuI="; diff --git a/pkgs/by-name/g3/g3proxy/package.nix b/pkgs/by-name/g3/g3proxy/package.nix index c776135ffe49..0f1176e02b27 100644 --- a/pkgs/by-name/g3/g3proxy/package.nix +++ b/pkgs/by-name/g3/g3proxy/package.nix @@ -28,6 +28,20 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "-p" "g3proxy" + "-p" + "g3proxy-ctl" + "-p" + "g3proxy-lua" + "-p" + "g3proxy-ftp" + "-p" + "g3mkcert" + "-p" + "g3fcgen" + "-p" + "g3iploc" + "-p" + "g3statsd" ]; cargoTestFlags = finalAttrs.cargoBuildFlags; diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix index 67e9af2ac89e..df40c24b23c7 100644 --- a/pkgs/by-name/ga/gatus/package.nix +++ b/pkgs/by-name/ga/gatus/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gatus"; - version = "5.34.0"; + version = "5.35.0"; src = fetchFromGitHub { owner = "TwiN"; repo = "gatus"; rev = "v${finalAttrs.version}"; - hash = "sha256-+Ulttz13SzPnB+EFsyK2H/bv2vXn+uA/zv6UY9HKrgY="; + hash = "sha256-I1HjeJ4/yLLgcoIEOQCv3WQDNrpIAFhzDvVpz24T7gU="; }; - vendorHash = "sha256-xN38oaMcErkq4FtWi/Kzp9fhC5dk8CeJYehlwtVgf0M="; + vendorHash = "sha256-PBy/0My0TdlolpagDSdt7r2dPPLJOVHEsU1xaV8RFjg="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index c2c881c61b9f..a3efd641b279 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -14,18 +14,18 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.28.2"; + version = "0.29.5"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-IOc4Y8U2J4Dpl0A5gfffAayiHKISlFiHU2qg61fR1Tw="; + hash = "sha256-+gFSTq0CXMZa2OhP2gOuWa5WtteKW7Ys78lgnz7J72g="; }; nodejs = nodejs_22; - npmDepsHash = "sha256-XfD+PmmeLsbb9rC7DCmqu08/+cXZpGewMN5olrHhH4M="; + npmDepsHash = "sha256-RGiWtJkLFV1UfFahHPzxtzJIsPCseEwfSsPdLfBkavI="; dontPatchElf = stdenv.isDarwin; diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix index 55c66944929a..9fe7f3455ac3 100644 --- a/pkgs/by-name/gh/ghciwatch/package.nix +++ b/pkgs/by-name/gh/ghciwatch/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-kH5YTadpaUXDma+7SfBJxrOIsd9Gm0EU3MfhFmQ3U80="; # integration tests are not run but the macros need this variable to be set - GHC_VERSIONS = ""; + env.GHC_VERSIONS = ""; checkFlags = "--test \"unit\""; meta = { diff --git a/pkgs/by-name/gh/ghdl/package.nix b/pkgs/by-name/gh/ghdl/package.nix index 90f62294bad8..3d9943397e0b 100644 --- a/pkgs/by-name/gh/ghdl/package.nix +++ b/pkgs/by-name/gh/ghdl/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-vPeODNTptxIjN6qLoIHaKOFf3P3iAK2GloVreHPaAz8="; }; - LIBRARY_PATH = "${stdenv.cc.libc}/lib"; + env.LIBRARY_PATH = "${stdenv.cc.libc}/lib"; nativeBuildInputs = [ gnat diff --git a/pkgs/by-name/gi/git-crypt/package.nix b/pkgs/by-name/gi/git-crypt/package.nix index 46ff7e4602d2..aeb5635f37a4 100644 --- a/pkgs/by-name/gi/git-crypt/package.nix +++ b/pkgs/by-name/gi/git-crypt/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # https://github.com/AGWA/git-crypt/issues/232 - CXXFLAGS = [ + env.CXXFLAGS = toString [ "-DOPENSSL_API_COMPAT=0x30000000L" ]; diff --git a/pkgs/by-name/gi/git-vendor/package.nix b/pkgs/by-name/gi/git-vendor/package.nix index b8132fc6cdb2..a4ec7901f9f0 100644 --- a/pkgs/by-name/gi/git-vendor/package.nix +++ b/pkgs/by-name/gi/git-vendor/package.nix @@ -29,9 +29,11 @@ stdenv.mkDerivation { "out" ]; - PREFIX = (placeholder "out"); - BINPREFIX = "${placeholder "bin"}/bin"; - MANPREFIX = "${placeholder "man"}/share/man/man1"; + env = { + PREFIX = (placeholder "out"); + BINPREFIX = "${placeholder "bin"}/bin"; + MANPREFIX = "${placeholder "man"}/share/man/man1"; + }; buildInputs = [ # stubbing out a `git config` check that `make install` tries to do diff --git a/pkgs/by-name/gi/github-backup/package.nix b/pkgs/by-name/gi/github-backup/package.nix index a1e3c37b7510..8aee7c47230f 100644 --- a/pkgs/by-name/gi/github-backup/package.nix +++ b/pkgs/by-name/gi/github-backup/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "github-backup"; - version = "0.61.3"; + version = "0.61.5"; pyproject = true; src = fetchFromGitHub { owner = "josegonzalez"; repo = "python-github-backup"; tag = finalAttrs.version; - hash = "sha256-iZM/gXjEBJpqCkW54quNVsr6zrfAfRrcdRy6icecMHk="; + hash = "sha256-4xbz074SxcvxP02U7Wx93aLJmJP9c4uYOkmRJ5ySZiE="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index bba388654e88..710f952a5223 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -103,10 +103,12 @@ buildDotnetModule (finalAttrs: { 'true' ''; - DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = isNull glibcLocales; - LOCALE_ARCHIVE = lib.optionalString ( - !finalAttrs.DOTNET_SYSTEM_GLOBALIZATION_INVARIANT - ) "${glibcLocales}/lib/locale/locale-archive"; + env = { + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = isNull glibcLocales; + } + // lib.optionalAttrs (!isNull glibcLocales) { + LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; + }; postConfigure = '' # Generate src/Runner.Sdk/BuildConstants.cs @@ -220,7 +222,7 @@ buildDotnetModule (finalAttrs: { "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNode20RuntimeVersionInAlpineContainerAsync" "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNode24RuntimeVersionInAlpineContainerAsync" ] - ++ lib.optionals finalAttrs.DOTNET_SYSTEM_GLOBALIZATION_INVARIANT [ + ++ lib.optionals finalAttrs.env.DOTNET_SYSTEM_GLOBALIZATION_INVARIANT [ "GitHub.Runner.Common.Tests.Util.StringUtilL0.FormatUsesInvariantCulture" "GitHub.Runner.Common.Tests.Worker.VariablesL0.Constructor_SetsOrdinalIgnoreCaseComparer" "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation" diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index 4f39281009ae..e34c844ba02a 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -185,8 +185,7 @@ let mkdir -p $out/share/${pname}/ cp -R $src/* $out/share/${pname} - mkdir -p $out/share/pixmaps - cp gitkraken.png $out/share/pixmaps/ + install -Dm444 gitkraken.png $out/share/icons/hicolor/512x512/apps/gitkraken.png runHook postInstall ''; diff --git a/pkgs/by-name/gi/gitlab/package.nix b/pkgs/by-name/gi/gitlab/package.nix index a244ea5474d0..2e0616ee636b 100644 --- a/pkgs/by-name/gi/gitlab/package.nix +++ b/pkgs/by-name/gi/gitlab/package.nix @@ -228,14 +228,16 @@ let chmod 777 ee/frontend_islands/yarn.lock ''; - # One of the patches uses this variable - if it's unset, execution - # of rake tasks fails. - GITLAB_LOG_PATH = "log"; - FOSS_ONLY = !gitlabEnterprise; - SKIP_FRONTEND_ISLANDS_BUILD = lib.optionalString (!gitlabEnterprise) "true"; + env = { + # One of the patches uses this variable - if it's unset, execution + # of rake tasks fails. + GITLAB_LOG_PATH = "log"; + FOSS_ONLY = !gitlabEnterprise; + SKIP_FRONTEND_ISLANDS_BUILD = lib.optionalString (!gitlabEnterprise) "true"; - SKIP_YARN_INSTALL = 1; - NODE_OPTIONS = "--max-old-space-size=8192"; + SKIP_YARN_INSTALL = 1; + NODE_OPTIONS = "--max-old-space-size=8192"; + }; postConfigure = '' # Some rake tasks try to run yarn automatically, which won't work diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 430755541a16..c9f8ba26d34b 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -252,6 +252,7 @@ stdenv.mkDerivation (finalAttrs: { # we're using plain "-DG_DISABLE_CAST_CHECKS" ]; + DETERMINISTIC_BUILD = 1; }; postPatch = '' @@ -280,8 +281,6 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs gio/gdbus-2.0/codegen/gdbus-codegen gobject/glib-{genmarshal,mkenums} ''; - DETERMINISTIC_BUILD = 1; - postInstall = '' moveToOutput "share/glib-2.0" "$dev" moveToOutput "share/glib-2.0/gdb" "$out" diff --git a/pkgs/by-name/gl/global-platform-pro/package.nix b/pkgs/by-name/gl/global-platform-pro/package.nix index 1bc0cc605163..a89e1057c104 100644 --- a/pkgs/by-name/gl/global-platform-pro/package.nix +++ b/pkgs/by-name/gl/global-platform-pro/package.nix @@ -26,7 +26,7 @@ in maven.buildMavenPackage rec { pname = "global-platform-pro"; version = "25.10.20"; - GPPRO_VERSION = "v25.10.20-0-g72f85b9"; # git describe --tags --always --long --dirty + env.GPPRO_VERSION = "v25.10.20-0-g72f85b9"; # git describe --tags --always --long --dirty src = fetchFromGitHub { owner = "martinpaljak"; diff --git a/pkgs/by-name/gl/glom/package.nix b/pkgs/by-name/gl/glom/package.nix index a1b637990d8f..7b734670b04d 100644 --- a/pkgs/by-name/gl/glom/package.nix +++ b/pkgs/by-name/gl/glom/package.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # Fontconfig error: Cannot load default config file - FONTCONFIG_FILE = makeFontsConf { + env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; diff --git a/pkgs/by-name/gn/gnome-network-displays/package.nix b/pkgs/by-name/gn/gnome-network-displays/package.nix index b10568e8d94b..9e3ec5c16c23 100644 --- a/pkgs/by-name/gn/gnome-network-displays/package.nix +++ b/pkgs/by-name/gn/gnome-network-displays/package.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { Hence, this is not necessarily an upstream issue, but could be something wrong with how our gst_all_1 depend on each other. */ - CFLAGS = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; + env.CFLAGS = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; preConfigure = '' patchShebangs ./build-aux/meson/postinstall.py diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index 282a798ee945..79e21cdc05ee 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -15,17 +15,17 @@ let in buildGoModule (finalAttrs: { pname = "go-ethereum"; - version = "1.16.8"; + version = "1.17.0"; src = fetchFromGitHub { owner = "ethereum"; repo = "go-ethereum"; rev = "v${finalAttrs.version}"; - hash = "sha256-eMvLhOSWGC31ezZeqMMt8kmFHq9NU0kh5s2IBiw46NY="; + hash = "sha256-xTx2gcpDY4xuZOuUEmtV6m5NNO6YQ01tGzLr5rh9F/g="; }; proxyVendor = true; - vendorHash = "sha256-KP9oD87kn8MCvEf3ply8HbP8xIBlGAEtthGob8Yh++A="; + vendorHash = "sha256-egsqYaItRtKe97P3SDb6+7sbuvyGdNGIwCR6V2lgGOc="; doCheck = false; diff --git a/pkgs/by-name/go/golem/package.nix b/pkgs/by-name/go/golem/package.nix index 527d1d69ea48..0ba5fff942db 100644 --- a/pkgs/by-name/go/golem/package.nix +++ b/pkgs/by-name/go/golem/package.nix @@ -43,12 +43,14 @@ rustPlatform.buildRustPackage rec { (lib.getDev openssl) ]; - # Required for golem-wasm-rpc's build.rs to find the required protobuf files - # https://github.com/golemcloud/wasm-rpc/blob/v1.0.6/wasm-rpc/build.rs#L7 - GOLEM_WASM_AST_ROOT = "../golem-wasm-ast-1.1.0"; - # Required for golem-examples's build.rs to find the required Wasm Interface Type (WIT) files - # https://github.com/golemcloud/golem-examples/blob/v1.0.6/build.rs#L9 - GOLEM_WIT_ROOT = "../golem-wit-1.1.0"; + env = { + # Required for golem-wasm-rpc's build.rs to find the required protobuf files + # https://github.com/golemcloud/wasm-rpc/blob/v1.0.6/wasm-rpc/build.rs#L7 + GOLEM_WASM_AST_ROOT = "../golem-wasm-ast-1.1.0"; + # Required for golem-examples's build.rs to find the required Wasm Interface Type (WIT) files + # https://github.com/golemcloud/golem-examples/blob/v1.0.6/build.rs#L9 + GOLEM_WIT_ROOT = "../golem-wit-1.1.0"; + }; cargoHash = "sha256-zf/L7aNsfQXCdGpzvBZxgoatAGB92bvIuj59jANrXIc="; diff --git a/pkgs/by-name/go/goresym/package.nix b/pkgs/by-name/go/goresym/package.nix index f0f0531e11b4..db2f68308083 100644 --- a/pkgs/by-name/go/goresym/package.nix +++ b/pkgs/by-name/go/goresym/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "goresym"; - version = "3.1.2"; + version = "3.2"; src = fetchFromGitHub { owner = "mandiant"; repo = "goresym"; rev = "v${finalAttrs.version}"; - hash = "sha256-BgnT0qYPH8kMI837hnUK5zGhboGgRU7VeU5dKNcrj8g="; + hash = "sha256-VYC9D27/4Up0zIO2wdstdQM8+5FwK+i+nxN8FoYpW4Q="; }; subPackages = [ "." ]; diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix index 23e29af4ec99..40fe71bad33a 100644 --- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix +++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix @@ -28,12 +28,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpu-screen-recorder"; - version = "5.12.3"; + version = "5.12.4"; src = fetchgit { url = "https://repo.dec05eba.com/gpu-screen-recorder"; tag = finalAttrs.version; - hash = "sha256-sl5apGLA64xgHxk7C47aK+OTVPjAVkpxi2yhN6HoJyk="; + hash = "sha256-VceAqiWeDJEAqx96Y4WHUTsPLeb4HvkNbl4fmMi296g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gp/gpuvis/package.nix b/pkgs/by-name/gp/gpuvis/package.nix index 802627e8eb6a..012ad4ad4541 100644 --- a/pkgs/by-name/gp/gpuvis/package.nix +++ b/pkgs/by-name/gp/gpuvis/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { freetype ]; - CXXFLAGS = [ + env.CXXFLAGS = toString [ # GCC 13: error: 'uint32_t' has not been declared "-include cstdint" ]; diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index adbcdf648be2..3b5cb4b341e0 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -10,6 +10,7 @@ graphviz, libx11, libjpeg, + libjxl, libpng, libtiff, libtool, @@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { graphviz libx11 libjpeg + libjxl libpng libtiff libtool @@ -111,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { PNM, TIFF, and WebP. ''; license = with lib.licenses; [ mit ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ ambossmann ]; mainProgram = "gm"; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix index df1ca94e3107..b3909b3cfa85 100644 --- a/pkgs/by-name/gr/greenmask/package.nix +++ b/pkgs/by-name/gr/greenmask/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "greenmask"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; tag = "v${finalAttrs.version}"; - hash = "sha256-/At0boolTyge4VNy1EDpK09Yo7hLAdq6SvCbyBTKGbw="; + hash = "sha256-0XWVYkC5ltpJZ1VLG3G1gvTwGdgqY4nzmOvDDnbz0Ss="; }; vendorHash = "sha256-t2U65GAGBGdMRXPTkCQCuXfLuqohA6erTlvAN/xx/ek="; diff --git a/pkgs/by-name/gt/gtkmm4/package.nix b/pkgs/by-name/gt/gtkmm4/package.nix index 2ab6e28fe6fe..dde0fe3485ba 100644 --- a/pkgs/by-name/gt/gtkmm4/package.nix +++ b/pkgs/by-name/gt/gtkmm4/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # Tests require fontconfig. - FONTCONFIG_FILE = makeFontsConf { + env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; diff --git a/pkgs/by-name/gt/gtypist/package.nix b/pkgs/by-name/gt/gtypist/package.nix index facac531cc67..5b3c20feb5b0 100644 --- a/pkgs/by-name/gt/gtypist/package.nix +++ b/pkgs/by-name/gt/gtypist/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ymGAVOkfHtXvBD/MQ1ALutcByVnDGETUaI/yKEmsJS0="; }; - CFLAGS = "-std=gnu99"; + env.CFLAGS = "-std=gnu99"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix index 426dbb1a8eaa..18756a07c037 100644 --- a/pkgs/by-name/gv/gvm-libs/package.nix +++ b/pkgs/by-name/gv/gvm-libs/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gvm-libs"; - version = "22.35.6"; + version = "22.35.7"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; tag = "v${finalAttrs.version}"; - hash = "sha256-oXfxgoFxInx3MyolVxzwRP3EpMsa35G5sdt1GxBUmUU="; + hash = "sha256-A3FO2el1ytsXUJEWA+7zthcTN2WpEnNIO2fWQI+0bjc="; }; postPatch = '' diff --git a/pkgs/by-name/gv/gvproxy/package.nix b/pkgs/by-name/gv/gvproxy/package.nix index c22cba0a196e..ad8a4df44af3 100644 --- a/pkgs/by-name/gv/gvproxy/package.nix +++ b/pkgs/by-name/gv/gvproxy/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "gvproxy"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${finalAttrs.version}"; - hash = "sha256-ofxU4lUfBLGspe4N8Tr+U92fyLa+gFPm4LhPDYLMX2E="; + hash = "sha256-wwQ4Wf9KtXwYTpoCUMuMUpTQBPlgynGe/VFqP/79xUA="; }; vendorHash = null; diff --git a/pkgs/by-name/ha/hackedbox/package.nix b/pkgs/by-name/ha/hackedbox/package.nix index a53d96c0ff3e..bce90fa612ad 100644 --- a/pkgs/by-name/ha/hackedbox/package.nix +++ b/pkgs/by-name/ha/hackedbox/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - CXXFLAGS = "-std=c++98"; + env.CXXFLAGS = "-std=c++98"; buildInputs = [ freetype diff --git a/pkgs/by-name/ha/halide/package.nix b/pkgs/by-name/ha/halide/package.nix index adb1918eefc4..c48162371c5c 100644 --- a/pkgs/by-name/ha/halide/package.nix +++ b/pkgs/by-name/ha/halide/package.nix @@ -152,7 +152,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ ck3d - atila twesterhout ]; broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix index 5b3df29356f1..7ccf0617aae6 100644 --- a/pkgs/by-name/ha/haproxy/package.nix +++ b/pkgs/by-name/ha/haproxy/package.nix @@ -39,11 +39,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-DqLQ4VfN0q/z1gDCNl2t9Q5qKMQdPlLcztU84Qpm5TI="; + hash = "sha256-UGPszYGKC7Exp1KcqYJNqVJpf793feDIN2rWEKZhc6w="; }; buildInputs = [ diff --git a/pkgs/by-name/ha/har-to-k6/package.nix b/pkgs/by-name/ha/har-to-k6/package.nix index 563eb31c4a3c..ab4b3e499bce 100644 --- a/pkgs/by-name/ha/har-to-k6/package.nix +++ b/pkgs/by-name/ha/har-to-k6/package.nix @@ -8,18 +8,18 @@ buildNpmPackage rec { pname = "har-to-k6"; - version = "0.14.12"; + version = "0.14.13"; src = fetchFromGitHub { owner = "grafana"; repo = "har-to-k6"; tag = "v${version}"; - hash = "sha256-9LOL67K1hPPioN0eWPEucMb+jy6WcAYsO4Mm34T9NB4="; + hash = "sha256-RKg8ShzxxIaK6mmcmLjYT8Ofe2CM3U5/Lg/UEIRi30Q="; }; dontNpmBuild = true; - npmDepsHash = "sha256-dKt3TPZye/HO2j06EcN5G1iShaKazMpHUaWdwvEN5pk="; + npmDepsHash = "sha256-Z5aq9apwz1wvm0uam2pxzX+T+hKkk/kmXPy7IyrUHFM="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/he/helm/package.nix b/pkgs/by-name/he/helm/package.nix index 96c3fa7b7457..1d71ea4ee24a 100644 --- a/pkgs/by-name/he/helm/package.nix +++ b/pkgs/by-name/he/helm/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ pkg-config ]; - CXXFLAGS = [ + env.CXXFLAGS = toString [ "-DHAVE_LROUND" "-fpermissive" ]; diff --git a/pkgs/by-name/he/hentai-at-home/package.nix b/pkgs/by-name/he/hentai-at-home/package.nix index 9d819530488c..b94b3f0eeba5 100644 --- a/pkgs/by-name/he/hentai-at-home/package.nix +++ b/pkgs/by-name/he/hentai-at-home/package.nix @@ -22,10 +22,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper ]; - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = lib.optionalString ( - stdenvNoCC.buildPlatform.libc == "glibc" - ) "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + env = { + LANG = "en_US.UTF-8"; + } + // lib.optionalAttrs (stdenvNoCC.buildPlatform.libc == "glibc") { + LOCALE_ARCHIVE = "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + }; makeFlags = [ "all" ]; enableParallelBuilding = false; diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index ac7d3d50adc3..0a4546bd51f0 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2026-02-09"; + version = "0-unstable-2026-02-18"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "6c4fdbe1ad198fac36c320fd45c5957324a80b8e"; - hash = "sha256-mg5WZMIPGsFu9MxSrUcuJUPMbfMsF77el5yb/7rc10k="; + rev = "b3ccd4bb262f4e6d3248b46cede92b90c4a42094"; + hash = "sha256-xK5kl3OBZaF1VwziVMX+SZ2LT9Fbu5o8vRDt78uR7no="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix index f64c596e492f..142581a155cf 100644 --- a/pkgs/by-name/ho/honeycomb-refinery/package.nix +++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix @@ -17,7 +17,7 @@ buildGoModule (finalAttrs: { hash = "sha256-JHjjaK5WFRzDYuVkenfYowFsPnrF+Wjo85gQAbaVxO8="; }; - NO_REDIS_TEST = true; + env.NO_REDIS_TEST = true; patches = [ # Allows turning off the one test requiring a Redis service during build. diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix index d4e4f9f48528..0d2668a79dd9 100644 --- a/pkgs/by-name/hp/hplip/package.nix +++ b/pkgs/by-name/hp/hplip/package.nix @@ -203,12 +203,6 @@ python3Packages.buildPythonApplication { ++ lib.optional withStaticPPDInstall "--enable-cups-ppd-install" ++ lib.optional withQt5 "--enable-qt5"; - # Prevent 'ppdc: Unable to find include file ""' which prevent - # generation of '*.ppd' files. - # This seems to be a 'ppdc' issue when the tool is run in a hermetic sandbox. - # Could not find how to fix the problem in 'ppdc' so this is a workaround. - CUPS_DATADIR = "${cups}/share/cups"; - makeFlags = let out = placeholder "out"; @@ -234,6 +228,12 @@ python3Packages.buildPythonApplication { enableParallelInstalling = false; env = { + # Prevent 'ppdc: Unable to find include file ""' which prevent + # generation of '*.ppd' files. + # This seems to be a 'ppdc' issue when the tool is run in a hermetic sandbox. + # Could not find how to fix the problem in 'ppdc' so this is a workaround. + CUPS_DATADIR = "${cups}/share/cups"; + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-int" "-Wno-error=implicit-function-declaration" diff --git a/pkgs/by-name/ht/httpstat/package.nix b/pkgs/by-name/ht/httpstat/package.nix index 4807cb9c716b..fc9382a891fe 100644 --- a/pkgs/by-name/ht/httpstat/package.nix +++ b/pkgs/by-name/ht/httpstat/package.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication (finalAttrs: { buildInputs = [ glibcLocales ]; runtimeDeps = [ curl ]; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; meta = { description = "Curl statistics made simple"; diff --git a/pkgs/by-name/hy/hyperrogue/package.nix b/pkgs/by-name/hy/hyperrogue/package.nix index e6b287554de2..cd0492506027 100644 --- a/pkgs/by-name/hy/hyperrogue/package.nix +++ b/pkgs/by-name/hy/hyperrogue/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { HYPERROGUE_USE_GLEW = 1; HYPERROGUE_USE_PNG = 1; HYPERROGUE_USE_ROGUEVIZ = 1; - }; - CXXFLAGS = [ - "-I${lib.getDev SDL}/include/SDL" - "-DHYPERPATH='\"${placeholder "out"}/share/hyperrogue/\"'" - "-DRESOURCEDESTDIR=HYPERPATH" - ]; + CXXFLAGS = toString [ + "-I${lib.getDev SDL}/include/SDL" + "-DHYPERPATH='\"${placeholder "out"}/share/hyperrogue/\"'" + "-DRESOURCEDESTDIR=HYPERPATH" + ]; + }; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/i3/i3minator/package.nix b/pkgs/by-name/i3/i3minator/package.nix index d94d0004a2a2..53d7211e170e 100644 --- a/pkgs/by-name/i3/i3minator/package.nix +++ b/pkgs/by-name/i3/i3minator/package.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication (finalAttrs: { sha256 = "07dic5d2m0zw0psginpl43xn0mpxw7wilj49d02knz69f7c416lm"; }; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; build-system = [ diff --git a/pkgs/by-name/ig/igprof/package.nix b/pkgs/by-name/ig/igprof/package.nix index 3cb0885b43f7..a0fc1c0a5e58 100644 --- a/pkgs/by-name/ig/igprof/package.nix +++ b/pkgs/by-name/ig/igprof/package.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: { pcre ]; nativeBuildInputs = [ cmake ]; - CXXFLAGS = [ + + env.CXXFLAGS = toString [ "-fPIC" "-O2" "-w" diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix index 7928a8510c45..a3136cda3809 100644 --- a/pkgs/by-name/in/incus-ui-canonical/package.nix +++ b/pkgs/by-name/in/incus-ui-canonical/package.nix @@ -20,14 +20,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "incus-ui-canonical"; - version = "0.19.5"; + version = "0.19.6"; src = fetchFromGitHub { owner = "zabbly"; repo = "incus-ui-canonical"; # only use tags prefixed by incus- they are the tested fork versions tag = "incus-${finalAttrs.version}"; - hash = "sha256-dwQshNQrP/3AWsFtDeMpUIm3l3Oqjj1jkKw98KT4u9M="; + hash = "sha256-H7H4v+MmxK0vh3ekZIquVwGYcXo/VUR0GU3P+vTK2Mw="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix index c35d687e2b12..06eb4b16fd16 100644 --- a/pkgs/by-name/in/incus/generic.nix +++ b/pkgs/by-name/in/incus/generic.nix @@ -109,7 +109,7 @@ buildGoModule (finalAttrs: { tags = [ "libsqlite3" ]; # required for go-cowsql. - CGO_LDFLAGS_ALLOW = "(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"; + env.CGO_LDFLAGS_ALLOW = "(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"; # add our lxc location to incus's acceptable rootFsPaths # this is necessary for tmpfs/tmpfs-overlay to work diff --git a/pkgs/by-name/in/infnoise/package.nix b/pkgs/by-name/in/infnoise/package.nix index f5c6f3855403..762f9a629e81 100644 --- a/pkgs/by-name/in/infnoise/package.nix +++ b/pkgs/by-name/in/infnoise/package.nix @@ -27,9 +27,11 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - GIT_COMMIT = finalAttrs.src.rev; - GIT_VERSION = finalAttrs.version; - GIT_DATE = "2023-02-14"; + env = { + GIT_COMMIT = finalAttrs.src.rev; + GIT_VERSION = finalAttrs.version; + GIT_DATE = "2023-02-14"; + }; buildInputs = [ libftdi ]; diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix index 970360e24eda..bef78dac84be 100644 --- a/pkgs/by-name/in/inlyne/package.nix +++ b/pkgs/by-name/in/inlyne/package.nix @@ -16,6 +16,7 @@ libGL, openssl, oniguruma, + vulkan-loader, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -72,6 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: { postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/inlyne \ + --add-needed ${lib.getLib vulkan-loader}/lib/libvulkan.so \ --add-rpath ${ lib.makeLibraryPath [ libGL diff --git a/pkgs/by-name/in/intel-vaapi-driver/package.nix b/pkgs/by-name/in/intel-vaapi-driver/package.nix index b461933e2d85..33f06004ae1b 100644 --- a/pkgs/by-name/in/intel-vaapi-driver/package.nix +++ b/pkgs/by-name/in/intel-vaapi-driver/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { }; # Set the correct install path: - LIBVA_DRIVERS_PATH = "${placeholder "out"}/lib/dri"; + env.LIBVA_DRIVERS_PATH = "${placeholder "out"}/lib/dri"; postInstall = lib.optionalString enableHybridCodec '' ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/ diff --git a/pkgs/by-name/in/invoiceplane/fix-yarn-lockfile.patch b/pkgs/by-name/in/invoiceplane/fix-yarn-lockfile.patch deleted file mode 100644 index dc25725398f5..000000000000 --- a/pkgs/by-name/in/invoiceplane/fix-yarn-lockfile.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/yarn.lock b/yarn.lock -index 227d51e2..11c80f04 100644 ---- a/yarn.lock -+++ b/yarn.lock -@@ -1397,10 +1397,10 @@ safe-json-parse@~1.0.1: - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - --sass@^1.89.2: -- version "1.97.2" -- resolved "https://registry.yarnpkg.com/sass/-/sass-1.97.2.tgz#e515a319092fd2c3b015228e3094b40198bff0da" -- integrity sha512-y5LWb0IlbO4e97Zr7c3mlpabcbBtS+ieiZ9iwDooShpFKWXf62zz5pEPdwrLYm+Bxn1fnbwFGzHuCLSA9tBmrw== -+sass@^1.97: -+ version "1.97.3" -+ resolved "https://registry.yarnpkg.com/sass/-/sass-1.97.3.tgz#9cb59339514fa7e2aec592b9700953ac6e331ab2" -+ integrity sha512-fDz1zJpd5GycprAbu4Q2PV/RprsRtKC/0z82z0JLgdytmcq0+ujJbJ/09bPGDxCLkKY3Np5cRAOcWiVkLXJURg== - dependencies: - chokidar "^4.0.0" - immutable "^5.0.2" diff --git a/pkgs/by-name/in/invoiceplane/package.nix b/pkgs/by-name/in/invoiceplane/package.nix index a0b8b6faf144..43573cbe8312 100644 --- a/pkgs/by-name/in/invoiceplane/package.nix +++ b/pkgs/by-name/in/invoiceplane/package.nix @@ -3,7 +3,6 @@ fetchFromGitHub, nixosTests, fetchYarnDeps, - applyPatches, php, yarnConfigHook, yarnBuildHook, @@ -12,13 +11,12 @@ fetchzip, }: let - version = "1.7.0"; + version = "1.7.1"; # Fetch release tarball which contains language files # https://github.com/InvoicePlane/InvoicePlane/issues/1170 languages = fetchzip { - #url = "https://github.com/InvoicePlane/InvoicePlane/releases/download/v${version}/v${version}.zip"; - url = "https://github.com/InvoicePlane/InvoicePlane/releases/download/v1.7.0/v1.7.0.zip"; - hash = "sha256-D5wZg745xjbBsEPUbvle8ynErFB4xn9zdxOGh0xKCCU="; + url = "https://github.com/InvoicePlane/InvoicePlane/releases/download/v${version}/v${version}.zip"; + hash = "sha256-DpQazuLOJnNGrrQo7l6uQReoKZEd5es2DT0a50NuQB0="; }; in php.buildComposerProject2 (finalAttrs: { @@ -29,16 +27,13 @@ php.buildComposerProject2 (finalAttrs: { owner = "InvoicePlane"; repo = "InvoicePlane"; tag = "v${version}"; - hash = "sha256-6fuUmXe8mFSnLYwQCwBzxmSQxM06rQXe00IKUZvWnpM="; + hash = "sha256-Nci5GaCMYIjewq0W5emE6TDgc6JPz4bVVF3okNtHUag="; }; - # Fixes error: Couldn't find any versions for "sass" that matches "^1.97" in our cache - patches = [ ./fix-yarn-lockfile.patch ]; - # Composer.lock validation currently fails for unknown reason - composerStrictValidation = false; + composerStrictValidation = true; - vendorHash = "sha256-/fNVq3WJCr9f/NE0s1x8N48W3ZMRUxdh1Qf3pLl0Lpg="; + vendorHash = "sha256-adKvKWo55SSbEKpgMJzR9vJQA8DnNXOTfSzp7t8s2Nk="; nativeBuildInputs = [ yarnConfigHook @@ -50,7 +45,7 @@ php.buildComposerProject2 (finalAttrs: { offlineCache = fetchYarnDeps { inherit (finalAttrs) src patches; - hash = "sha256-YDknkQzdRKRRMXS6/cPRSrfhhIyTIDRnFPNGQueu74A="; + hash = "sha256-rJlOYMnzFKui+caIFD4d82Q/RcDYnadeJ1G56fcNNQY="; }; postBuild = '' diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix index 99cecc3c54dd..47b75758430e 100644 --- a/pkgs/by-name/ir/irpf/package.nix +++ b/pkgs/by-name/ir/irpf/package.nix @@ -90,7 +90,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with lib.maintainers; [ - atila rafaelrc ]; mainProgram = "irpf"; diff --git a/pkgs/by-name/is/isso/package.nix b/pkgs/by-name/is/isso/package.nix index 2b1959ae6203..cd8486a3de53 100644 --- a/pkgs/by-name/is/isso/package.nix +++ b/pkgs/by-name/is/isso/package.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication (finalAttrs: { npmHooks.npmConfigHook ]; - NODE_PATH = "$npmDeps"; + env.NODE_PATH = "$npmDeps"; preBuild = '' ln -s ${finalAttrs.npmDeps}/node_modules ./node_modules diff --git a/pkgs/by-name/is/isync/package.nix b/pkgs/by-name/is/isync/package.nix index 6e514b3dec23..b22d6bcfcf14 100644 --- a/pkgs/by-name/is/isync/package.nix +++ b/pkgs/by-name/is/isync/package.nix @@ -8,7 +8,6 @@ db, cyrus_sasl, zlib, - perlPackages, autoreconfHook, # Disabled by default as XOAUTH2 is an "OBSOLETE" SASL mechanism and this relies # on a package that isn't really maintained anymore: @@ -42,14 +41,16 @@ stdenv.mkDerivation (finalAttrs: { perl ] ++ lib.optionals withCyrusSaslXoauth2 [ makeWrapper ]; + buildInputs = [ - perlPackages.TimeDate openssl db cyrus_sasl zlib ]; + doCheck = true; + postInstall = lib.optionalString withCyrusSaslXoauth2 '' wrapProgram "$out/bin/mbsync" \ --prefix SASL_PATH : "${ @@ -61,8 +62,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "http://isync.sourceforge.net/"; - # https://sourceforge.net/projects/isync/ + homepage = "https://isync.sourceforge.io"; changelog = "https://sourceforge.net/p/isync/isync/ci/v${finalAttrs.version}/tree/NEWS"; description = "Free IMAP and MailDir mailbox synchronizer"; longDescription = '' @@ -72,7 +72,9 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + Necoro + ]; mainProgram = "mbsync"; }; }) diff --git a/pkgs/by-name/ja/jaero/package.nix b/pkgs/by-name/ja/jaero/package.nix index a2945aa3de7b..ce0e678e0e1b 100644 --- a/pkgs/by-name/ja/jaero/package.nix +++ b/pkgs/by-name/ja/jaero/package.nix @@ -75,5 +75,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; license = lib.licenses.mit; maintainers = with lib.maintainers; [ noderyos ]; + mainProgram = "JAERO"; }; }) diff --git a/pkgs/applications/video/jellyfin-desktop/non-fatal-unique-app.patch b/pkgs/by-name/je/jellyfin-desktop/non-fatal-unique-app.patch similarity index 100% rename from pkgs/applications/video/jellyfin-desktop/non-fatal-unique-app.patch rename to pkgs/by-name/je/jellyfin-desktop/non-fatal-unique-app.patch diff --git a/pkgs/applications/video/jellyfin-desktop/default.nix b/pkgs/by-name/je/jellyfin-desktop/package.nix similarity index 86% rename from pkgs/applications/video/jellyfin-desktop/default.nix rename to pkgs/by-name/je/jellyfin-desktop/package.nix index 12ac1682972f..0c62dc24ed2d 100644 --- a/pkgs/applications/video/jellyfin-desktop/default.nix +++ b/pkgs/by-name/je/jellyfin-desktop/package.nix @@ -5,27 +5,22 @@ cmake, ninja, python3, - wrapQtAppsHook, - qtbase, - qtdeclarative, - qtwebchannel, - qtwebengine, + kdePackages, mpv-unwrapped, - mpvqt, libcec, SDL2, libxrandr, cacert, nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jellyfin-desktop"; version = "2.0.0"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-desktop"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ITlYOrMS6COx9kDRSBi4wM6mzL/Q2G5X9GbABwDIOe4="; fetchSubmodules = true; }; @@ -36,15 +31,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja - wrapQtAppsHook + kdePackages.wrapQtAppsHook ] ++ lib.optional stdenv.hostPlatform.isDarwin python3; buildInputs = [ - qtbase - qtdeclarative - qtwebchannel - qtwebengine + kdePackages.qtbase + kdePackages.qtdeclarative + kdePackages.qtwebchannel + kdePackages.qtwebengine mpv-unwrapped # input sources @@ -55,7 +50,7 @@ stdenv.mkDerivation rec { libxrandr cacert ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) mpvqt; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) kdePackages.mpvqt; cmakeFlags = [ "-DCHECK_FOR_UPDATES=OFF" @@ -97,4 +92,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "jellyfin-desktop"; }; -} +}) diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index cc99cc5f41d9..f8aa92275e96 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "jenkins"; - version = "2.541.1"; + version = "2.541.2"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war"; - hash = "sha256-ixJniqb5VQsGglsAb5CWGGsXp7hX6baK0/mA2fQw/JQ="; + hash = "sha256-3J1TLlTUt+t9eO3NMheHbdSBG0nRo7ZuWZrUpkLVcZM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/k8/k8sgpt/package.nix b/pkgs/by-name/k8/k8sgpt/package.nix index dc409a18ed61..a2e828265cf4 100644 --- a/pkgs/by-name/k8/k8sgpt/package.nix +++ b/pkgs/by-name/k8/k8sgpt/package.nix @@ -1,25 +1,35 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, + installShellFiles, }: buildGoModule (finalAttrs: { pname = "k8sgpt"; - version = "0.4.8"; + version = "0.4.28"; + + nativeBuildInputs = [ + installShellFiles + ]; src = fetchFromGitHub { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${finalAttrs.version}"; - hash = "sha256-TaJBGU+nLMVOL1uiHPan8p2DfuAWTr57Lt2BtfNq6dA="; + hash = "sha256-hY1gyKy37SIASyhlWD+2aAeyfgfFpoBtm2XXIwCrh/Y="; }; - vendorHash = "sha256-960gfOCpqY2gCbHR+fYFeV9UjztWMRVQKHIg/n3ELxk="; + vendorHash = "sha256-6RgcIGGhtgxWR90gQWxXYxID6L5bZLrLLH0S+MSIO2w="; # https://nixos.org/manual/nixpkgs/stable/#var-go-CGO_ENABLED env.CGO_ENABLED = 0; + preCheck = '' + export HOME=$TMPDIR + ''; + # https://nixos.org/manual/nixpkgs/stable/#ssec-skip-go-tests ldflags = [ "-s" @@ -29,6 +39,13 @@ buildGoModule (finalAttrs: { "-X main.date=1970-01-01-00:00:01" ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd k8sgpt \ + --bash <($out/bin/k8sgpt completion bash) \ + --zsh <($out/bin/k8sgpt completion zsh) \ + --fish <($out/bin/k8sgpt completion fish) + ''; + meta = { description = "Giving Kubernetes Superpowers to everyone"; mainProgram = "k8sgpt"; diff --git a/pkgs/by-name/ka/kanban/package.nix b/pkgs/by-name/ka/kanban/package.nix index f63dfdfe46c5..f0b5c5169f94 100644 --- a/pkgs/by-name/ka/kanban/package.nix +++ b/pkgs/by-name/ka/kanban/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-w1NoWgaUBny//3t1S5z/juPOYFomwJKtTq/M4qKoNv0="; }; - GIT_COMMIT_HASH = finalAttrs.src.rev; + env.GIT_COMMIT_HASH = finalAttrs.src.rev; cargoHash = "sha256-N+c2jnJ7a+Nh2UibkaOByh4tKDX52VovYIpeHTpawXo="; diff --git a/pkgs/by-name/ka/kaufkauflist/package.nix b/pkgs/by-name/ka/kaufkauflist/package.nix index 8e4ad879104a..9ba0a388d6a9 100644 --- a/pkgs/by-name/ka/kaufkauflist/package.nix +++ b/pkgs/by-name/ka/kaufkauflist/package.nix @@ -39,7 +39,7 @@ buildNpmPackage rec { npmDepsHash = "sha256-HDv6sW6FmKZpUjymrUjz/WG9XrKgLmM6qHMAxP6gBtU="; - ESBUILD_BINARY_PATH = lib.getExe esbuild'; + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; postInstall = '' mkdir -p $out/share/kaufkauflist $out/share/pocketbase diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 1c4665d12b89..9315468c33f0 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -18,13 +18,13 @@ }: let - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; tag = version; - hash = "sha256-81CWJJr+vOF6WJbO/7sZuAkBfy7cNsUUTpxTUnaM0fg="; + hash = "sha256-dXVpuxs2+v6voNn+gUZbYa6XxRDwKWnLd3mASLYHHl0="; }; in flutter338.buildFlutterApplication { diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index 99c6c33e470e..5b54a534a156 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -1744,11 +1744,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "19a78f63e83d3a61f00826d09bc2f60e191bf3504183c001262be6ac75589fb8", + "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.8" + "version": "0.7.9" }, "tray_manager": { "dependency": "direct main", @@ -2134,6 +2134,6 @@ }, "sdks": { "dart": ">=3.9.0 <4.0.0", - "flutter": ">=3.41.0" + "flutter": ">=3.41.2" } } diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index 4f34d3079c0d..20b56e9e0eff 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keycloak"; - version = "26.5.3"; + version = "26.5.4"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip"; - hash = "sha256-OMx2E4Q1Pob73iqWo/sfYI14+IMW0cp/22wMUKcqQvg="; + hash = "sha256-jRINK5PdsRTbWbDMYzatkEpfXcN6o3hwsul/U4ZuXjg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json index 265dea7973f0..ceb18b185f2b 100644 --- a/pkgs/by-name/ke/keyguard/deps.json +++ b/pkgs/by-name/ke/keyguard/deps.json @@ -2,13 +2,13 @@ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, "https://dl.google.com/dl/android/maven2": { - "androidx/activity#activity-compose/1.12.2": { - "module": "sha256-pZJU96p3GRIwZ8zeHE6k6R63ezNkKvfjO56uKn3foS8=", - "pom": "sha256-qGFmmNnjkd5hbp8iMYtE7KDUD/UnNXMpyIORhG3YC/w=" + "androidx/activity#activity-compose/1.12.3": { + "module": "sha256-Y6vhDGYC0g/z9pyYd8LkX7f6rj6n8NFW6miXDD+T7A0=", + "pom": "sha256-FkToc2bmv2RoGsn6N1ARkSYuI7ZfsZ7pn4fZ3ANg1VU=" }, - "androidx/activity#activity/1.12.2": { - "module": "sha256-EjVtLiZrkw8/gedDEvXR1lwQL/V/ugc3WB4ZTPJ47Jc=", - "pom": "sha256-iccimeo7jvtD9jGyGYpEwLMSHmERBihkCulpbN1ZLRw=" + "androidx/activity#activity/1.12.3": { + "module": "sha256-4EAH4J24hWV/U0cTLmN8um+KH6nF65Hsy9+q1FOEFrs=", + "pom": "sha256-SBJc8T28WVY0RccPXScdGiinEKc+E0GVUNdcohAvF+k=" }, "androidx/annotation#annotation-experimental/1.4.1": { "module": "sha256-KsL3EG4S8mNCW0pN/ICYlEf7iVZ1/pAthnWap0/RK30=", @@ -72,29 +72,29 @@ "module": "sha256-v/9LDjPLqtkw2ftaMObNNcPSrb24Rt8uuceKADhBB4c=", "pom": "sha256-SaDxmRPra1qLygAXrWN5qth88KA9qJcjPf5jgOSEhdc=" }, - "androidx/camera#camera-camera2/1.5.2": { - "module": "sha256-5d3ICA0H9g6cxpCggZBp4NAIgl1LeR1vXWL0JBh0Uwg=", - "pom": "sha256-UeSlEI6nMFGeTFnoxO5BPstBAHUm7PkcM9X8mfBzsVs=" + "androidx/camera#camera-camera2/1.5.3": { + "module": "sha256-PiHLETbKUoJvcaf8zswxahq7zVxeYcggTl8S21qsHAU=", + "pom": "sha256-708f7ELa5RGM2ZC1+O78TscT12FVjvTJ9SLxilE20vQ=" }, - "androidx/camera#camera-core/1.5.2": { - "module": "sha256-z3dLVUXO3jnXJsd2Aow/uj16qe05le7cWraIAZXR4gs=", - "pom": "sha256-7WC3iQTu8zz8kFGW9ip1OJnKubKgAWn6k3krl/4yxkU=" + "androidx/camera#camera-core/1.5.3": { + "module": "sha256-0aLiTAVGmo7LdidS1XLOAoCsai5Z5Yrp0qNmkEE4l8U=", + "pom": "sha256-/pptlg130stpBjn1DZYCkioONEoSz9Wjm10HxX9/mnM=" }, - "androidx/camera#camera-extensions/1.5.2": { - "module": "sha256-UEYoZ9/gc9Syj6Bo/+3fIFkTTZWQB5k8p04Q7725x9Y=", - "pom": "sha256-zNYw15SkP5c7gkP/7zGWDE2IEQG2Y9/WkrcgDu/9Ir8=" + "androidx/camera#camera-extensions/1.5.3": { + "module": "sha256-NVKHyj73svPUy1gq5Q7j4kr6jEhxQzM+sCcIThMSxcY=", + "pom": "sha256-uAHyzekaCdIr1lMBnwnIm80vPbTzEoJoKQixDbV7hvg=" }, - "androidx/camera#camera-lifecycle/1.5.2": { - "module": "sha256-tSnBN7PFbtduTVTYbPvzIswLVdIj5/CCjzAiY5XaCDo=", - "pom": "sha256-Et7w1/P1Clw/IXcecj0fiZv6w7ajpvbNbQsW0+z49Dg=" + "androidx/camera#camera-lifecycle/1.5.3": { + "module": "sha256-xxOQ/fTiZgatTVYFMH0kPytAxwIR2whbUImSvAaObnQ=", + "pom": "sha256-f2CIBcyu0978bUtRfdnqps3hQAJ5SIGIde1brqn+i7Y=" }, - "androidx/camera#camera-video/1.5.2": { - "module": "sha256-pUF+XaJYBTcp0pRcpJ61znLNpuYNWvBg2Fa0jvW5xiw=", - "pom": "sha256-4udVWc11ZXRcxV8HhXI8m8ZAP6MdnTXQodqSVyN+uzU=" + "androidx/camera#camera-video/1.5.3": { + "module": "sha256-mscmkDjPTkjBorZfcvKjuo2HXB1g6NPHF4hXTwwbhQA=", + "pom": "sha256-EAMxEthDuHKVVzXmYaBnLJcvj+DzkWPjGktb7w0s9pM=" }, - "androidx/camera#camera-view/1.5.2": { - "module": "sha256-+/p1CNGqTpqvYuvo9U922DMHVJl+i/IMMCixsMWy+Dc=", - "pom": "sha256-hacVJTrO0XIEzEbeqJ3KCS2r23F6qcdYLXLo+fZQHaU=" + "androidx/camera#camera-view/1.5.3": { + "module": "sha256-iLicwHfHPu4IrokCQJeF8hxklr/I/KTRRCHm2GUuibc=", + "pom": "sha256-WK9sOwKDlIP78csNNkx8VHVLcAAqnpfXgvXjYbKUgHU=" }, "androidx/collection#collection-jvm/1.5.0": { "jar": "sha256-cLNZJOS6vN/6N9Dlde4DnFai2XEjNCYkxItgMjNwQ0E=", @@ -112,41 +112,41 @@ "module": "sha256-v+t72E8/fdp71ztnCdSh9h9aN/hDcouuCKBn49+aCu8=", "pom": "sha256-LWXI0LNtS0+q3ESv+breI9hx1xWe7fKz8C2AKzS3elc=" }, - "androidx/compose/animation#animation-android/1.11.0-alpha01": { - "module": "sha256-9oLHBmlFxSSRXFnMYTmKBkhyoPxM4vvQ4qGizc4DvbI=", - "pom": "sha256-UsNLz1ZoroFYeVmu/xZYVClfVJk17ZnlXLqOUcrGwYA=" + "androidx/compose/animation#animation-android/1.11.0-alpha03": { + "module": "sha256-eeH3sdUdzYoS9uXmVuyYpZgyPAsnUphPnFQwjuzBeRI=", + "pom": "sha256-g7DNxLDd4RPU0Y+tIBYgDl5kIHa83Zq4Dkqr2VHhTQY=" }, - "androidx/compose/animation#animation-core-android/1.11.0-alpha01": { - "module": "sha256-GzYgTqKuA5WsPbNKJP+swCTSqS7jjI422riwv2aZ+8k=", - "pom": "sha256-eSsGiOXxamBQxyjEgpLv6HB9ORmcGc76YDpZDdwBWUI=" + "androidx/compose/animation#animation-core-android/1.11.0-alpha03": { + "module": "sha256-649tPDMRWC4J1qnETbWcfzavUmAu02o4ixaUOkCL4/g=", + "pom": "sha256-sfwbOHfhfp2LhtVnZZQWQ5mJxvOa4zbYA06npwNRxBI=" }, - "androidx/compose/animation#animation-core/1.11.0-alpha01": { - "module": "sha256-K2ZmuEqhnDy+JK/W/LvrKe6MEABhfDGGmZFNYpcZaoE=", - "pom": "sha256-FzTKuaiRE8w9MU9TragRcTlfHb+krHBzuWYNwXOJM1o=" + "androidx/compose/animation#animation-core/1.11.0-alpha03": { + "module": "sha256-xbNngWBNXVyybbkYdbPnT48cBdGNHBbe5Ilr+GiSfwA=", + "pom": "sha256-CkAtabPVpJ2htxq2rlwlo+eY8vPkJYHu1TuNgY0xMaE=" }, - "androidx/compose/animation#animation/1.11.0-alpha01": { - "module": "sha256-xN3Fq5fYQrQUmiuk6+wXFVswe7jedEqWn3OIXN8RXjc=", - "pom": "sha256-9cRv9h2vPIIIxivYJ3WpczN6VPp1/v2MiUJcxydQG1w=" + "androidx/compose/animation#animation/1.11.0-alpha03": { + "module": "sha256-t88A7z3lVwVunbeqRVGIEBnnQiBmpVd0HqEEX2TJeSo=", + "pom": "sha256-NGEruWOj/wLJPQYhD064wwoUnatKRZWuOc0vh5drrIs=" }, - "androidx/compose/foundation#foundation-android/1.11.0-alpha01": { - "module": "sha256-IsVEYnPw/3xYcocnze+Pr/D8+kKgzmpNtMyvNQKKzCs=", - "pom": "sha256-mRuNZK7GFHzmFxZ9ptUjUN6XpUO9Y2vtkgxLthqUDU0=" + "androidx/compose/foundation#foundation-android/1.11.0-alpha03": { + "module": "sha256-pPGuV2zBxPEFuUbW2vzH1l8b5KujubmdUcHHGEAY1h0=", + "pom": "sha256-OzTqUDw13tkjKgqncpU4XsFd9fnPNkqC5baftj6e1Js=" }, - "androidx/compose/foundation#foundation-layout-android/1.11.0-alpha01": { - "module": "sha256-ngVWOgIaj94uekD8SC2HaJJjrL4YPKcg2+3v3Nk/71U=", - "pom": "sha256-/bUlfxbn5/w1gvUUGttwKy2LDkvw5gkxX3Oi4dDMIzA=" + "androidx/compose/foundation#foundation-layout-android/1.11.0-alpha03": { + "module": "sha256-OHHmLIL2gmuSWvM5v/7SpkeY2VmxIbDrZOgsEIO1c5I=", + "pom": "sha256-oCMYst59pcoCmZmQONprkhTwRAb+jkX0rPmghA+vS58=" }, - "androidx/compose/foundation#foundation-layout/1.11.0-alpha01": { - "module": "sha256-Tfzlj4GZSmO0VBWF+nKwWR/6OUGkjhtfcN/f3OfuEtQ=", - "pom": "sha256-hTjRs1/bkpP1fbipcmtmk5q8mNaL4JiFi1LzBq+ShDA=" + "androidx/compose/foundation#foundation-layout/1.11.0-alpha03": { + "module": "sha256-7AWphMqON6cb2YFr66Fiy2IiD1MSbJNaMTeHN/Jrl74=", + "pom": "sha256-WCXWRf5p15HwbwREGNLQDcTy+P2j4TXnejA21Q12h04=" }, - "androidx/compose/foundation#foundation/1.11.0-alpha01": { - "module": "sha256-4Au13WpA5FDipAwBtKA786oHVUAPZ9qZKla53zdtvFk=", - "pom": "sha256-Cn2ih4eCkbcr/ifsKttkcejMDO/M3iM++Y7pOLBLMlc=" + "androidx/compose/foundation#foundation/1.11.0-alpha03": { + "module": "sha256-gqStMAzh3WCAbj7r4/uKMDVT1j4Zo2oXG2nlg9xRoz8=", + "pom": "sha256-onvQHUGXWijJcapohKX5XeMtH1R+HR7y4HLbBvnFdQQ=" }, - "androidx/compose/material#material-android/1.11.0-alpha01": { - "module": "sha256-1SsmmJLqLnYmyG+bOtmFue4KmmEjdmzhtZurBUyUS18=", - "pom": "sha256-wyc3KLLvtEz71j0ahDimhWsSZsVeKM2UQi8dNQEW0EI=" + "androidx/compose/material#material-android/1.11.0-alpha03": { + "module": "sha256-9GY4NL48M8UGHRsJVhOmJxamTPMO5i/BQ8bm88h0PUg=", + "pom": "sha256-AnU8p1PhQM9EREhLKVpjDIsbExKG9+SIQQz+n6xddVE=" }, "androidx/compose/material#material-icons-core-android/1.7.6": { "module": "sha256-eietGojQmSEqfhomiis0BXeFUrAtAgvl8Gprn2o+yUI=", @@ -164,89 +164,89 @@ "module": "sha256-7NczNuE23rRe267g3qEPelSQHh54FcS9FicJeXmJN4M=", "pom": "sha256-rFSvA/qAXWNsC/pFi+Fqw1mL+7NtvsGA9loGGFA/o70=" }, - "androidx/compose/material#material-ripple-android/1.11.0-alpha01": { - "module": "sha256-9NMQziwKdTBJR8TOaBMjgI9dEdJJOXgxYQrYxDybiDg=", - "pom": "sha256-vfzps/wQzkQPpQK0slGdK7z6hK0turfQZ4kQpK28lUI=" + "androidx/compose/material#material-ripple-android/1.11.0-alpha03": { + "module": "sha256-Ldw/+hSoyKF80axK50hWsE6H3OttsuhNozYubA7SdD0=", + "pom": "sha256-qG+jVHLEvOisPFIflVjxWVP4wf4FSXycElkszhRDevM=" }, - "androidx/compose/material#material-ripple/1.11.0-alpha01": { - "module": "sha256-saRZgeoouHscF/0+XESAPvuNaJX/xvjjeIws7zTenGk=", - "pom": "sha256-jy+X6cBHCQI2bm6605MUNLf2HiArHvKP9Fii2LfoIgM=" + "androidx/compose/material#material-ripple/1.11.0-alpha03": { + "module": "sha256-sugubkeRVYpmWbwi+80psvXkfgmfUrRMobIKV1ndvR8=", + "pom": "sha256-Czu5JN+f836fzWFSHJd3s4LYQkzhct/AqqGdp64AAU0=" }, - "androidx/compose/material#material/1.11.0-alpha01": { - "module": "sha256-hVea887nxj/C3tM1FWn9DUpPXfmDyjxMuF+U7HyeFxo=", - "pom": "sha256-xHmGBwW0B40Gs2RSwcl/61R/vz8nmaciyvgsliaNGS0=" + "androidx/compose/material#material/1.11.0-alpha03": { + "module": "sha256-Gn/Fv1ydmUGwnTVcSWwZFrttLRdwePGWl3Jp3OpAC9M=", + "pom": "sha256-IJ3Hv6BTWQjSAAgpTTSvM0y4GPYKs9yB4VygJ1e/PM4=" }, - "androidx/compose/material3#material3-android/1.5.0-alpha10": { - "module": "sha256-h0O/Y0xZ6llPrb5cOJSH7wlVunKhySm/fdahkK3yfD8=", - "pom": "sha256-HFIeFkBqu0CvXcT0o+Lus9UXCwpU6AEXYr2Q+7mbJeg=" + "androidx/compose/material3#material3-android/1.5.0-alpha12": { + "module": "sha256-9sr038hawOwPKyuCLpCVql8/ECGNOnmbtAMyGmwl/nc=", + "pom": "sha256-sDDt5fu2Ng890BchSdbt43HJg08198KsX2Eoa/vIalc=" }, - "androidx/compose/material3#material3/1.5.0-alpha10": { - "module": "sha256-0IJfi0eMA5pdYPTwBCQpvV7Nkyx0pWHcnRJe5pUrlpU=", - "pom": "sha256-tAy8aDozUiFSzjQZpaTuraR/OwRq4hPJRjbKIN6c4rg=" + "androidx/compose/material3#material3/1.5.0-alpha12": { + "module": "sha256-pOEzDkKsdPUme9E9rJ8105NZiFZFA0qi9rqp/dceFbo=", + "pom": "sha256-AMf4uoKMUR+qbyOqLsNP3BWFfBm6BKwhc+Z+5zMj1/s=" }, - "androidx/compose/runtime#runtime-android/1.11.0-alpha01": { - "module": "sha256-48s7zBaB2RpfNIHJ9rHWX5BI1jDc7YvgfZ0P5DHb9IU=", - "pom": "sha256-MI1qyntEDbgUNbrq8gHufr+jBKHs4KHazwCWFum/UhA=" + "androidx/compose/runtime#runtime-android/1.11.0-alpha03": { + "module": "sha256-QAS7JvumGss4lqo0oKFYL+2/WauBQMwsysdJZC5aLVo=", + "pom": "sha256-WOnYOepGf4RPHPKZ1O8OD5XjDxo3X/GdeltXC5fLJnM=" }, - "androidx/compose/runtime#runtime-annotation-android/1.11.0-alpha01": { - "module": "sha256-/IeepSVyA8GtdqeuC62UFboL23qk5kqf5ms9uvpYZd0=", - "pom": "sha256-NZ9HyWUGDQnYkutH9OAMky3yAte0KUZbkS9YBPog1e0=" + "androidx/compose/runtime#runtime-annotation-android/1.11.0-alpha03": { + "module": "sha256-AWXSF0wOyj+j0pI6Ulx0WDbyrI1NjJPDniIZOKJ1eCs=", + "pom": "sha256-mXD61z+lkoqK4rrdCmTG/oAkULyYVJycI92hxwIGPfI=" }, - "androidx/compose/runtime#runtime-annotation-jvm/1.11.0-alpha01": { + "androidx/compose/runtime#runtime-annotation-jvm/1.11.0-alpha03": { "jar": "sha256-+J3ai81zh20PwWVohEsr15RD7nymKBCHTSXH3Ko5S9Y=", - "module": "sha256-DMhlZA3o9aZ4k4JpQ9d2VElJsG1FkOLfZdBxW0/UmTI=", - "pom": "sha256-Q6o4C1X0QE1PpZr1ZfEOwGm5rIPONU2dbuf7KUlu2yU=" + "module": "sha256-4C6LlxoUEiKbAE6+R79iXiLqOlkklVl7JBqphvgZ1sQ=", + "pom": "sha256-VAvOrRqyiBpEWgcvmfnmYlhmr+d7liIKTqA2oOwXyjo=" }, - "androidx/compose/runtime#runtime-annotation/1.11.0-alpha01": { - "jar": "sha256-XUzoJpn1AaDI4eZyZY8fgIlTTgaYm/JTvfqxHixzBZU=", - "module": "sha256-bUtT1TjgiziNze9p71CrMjVv5TY70jMzEBGspJvlYK0=", - "pom": "sha256-h93O5ebb02ODiCmWbpVpzoPAc0noPSeteWCHrou+6UE=" + "androidx/compose/runtime#runtime-annotation/1.11.0-alpha03": { + "jar": "sha256-X7cr2oRcHymJ9+EOgWSsVU0WLcg5OJa1O57p9tN70V0=", + "module": "sha256-RQdGT0bJ5+D0x7+QogZOJFqvXco8iqhuAOVfiIqcCeM=", + "pom": "sha256-K7fHpdsXmjDcoS2CefWJ8JkijEwexR8nUJxA4Nsg5dE=" }, - "androidx/compose/runtime#runtime-desktop/1.11.0-alpha01": { - "jar": "sha256-AXB+Axbtkp2NIhyonFbJ98kJ1eFesQti7QmZffppuPU=", - "module": "sha256-fJAGWnEnNH8yVgIoY1hACfG3WiB5AHZJLuKNHJtfcCc=", - "pom": "sha256-oMuXvW8wWhW/aYmyqX9zQGd2urNGL8rGlmccfuHxzS0=" + "androidx/compose/runtime#runtime-desktop/1.11.0-alpha03": { + "jar": "sha256-gAnNzxEDoQGOP+yHxOgKVE0Plyh5ChE2Ji+27cY8Wl4=", + "module": "sha256-W/J7Xn8f/EUmwD0pIIRrHWwY5mT15aQA4O15JEoQizU=", + "pom": "sha256-BMWnRZ61zhO9gnRtiiQclqUzdkUWXIx0OmRBCW6bghE=" }, - "androidx/compose/runtime#runtime-retain-android/1.11.0-alpha01": { - "module": "sha256-QD/k7KBLw9/y9TMogrUvqeTF3u0AOfuiSVbSrZsAzXc=", - "pom": "sha256-fdvWczC+A98H64tc7a8vk4CcYCQATlQKD/BPX+RYDZ0=" + "androidx/compose/runtime#runtime-retain-android/1.11.0-alpha03": { + "module": "sha256-y7+/kIqVr8rinz9LQJHbjHT4LxtAOjoJtUtv7JWTbXA=", + "pom": "sha256-UI3eH5z2VjQrHHpwwFLY0hi4zLfM95y0lyfjh3OOM/8=" }, - "androidx/compose/runtime#runtime-retain-desktop/1.11.0-alpha01": { - "jar": "sha256-Rj7pwek9G5E0WL/syW0SijV0qAL0HIyXgdcyDDtV7Ys=", - "module": "sha256-c6HyFiOX2IgTM/cjAvnie57hJWmoPYFmU4ZhvVyjozo=", - "pom": "sha256-ptLtKzOjTE420RKgmV8rpkQP/9J0Hq/g0c0b39wSQvw=" + "androidx/compose/runtime#runtime-retain-desktop/1.11.0-alpha03": { + "jar": "sha256-AgW/XwUYgjJMF/jgOKfFkvHKm5TfqyoPMAwSbHoDzUQ=", + "module": "sha256-ODsFgHezBMe0ec620p7MpbtwobRMRKwUDrlqiC7Ca5w=", + "pom": "sha256-K4UHxAcYez7Z6dJOP+uos91l9U7Cy1XGSYh44JJS2vw=" }, - "androidx/compose/runtime#runtime-retain/1.11.0-alpha01": { - "jar": "sha256-rxY11W6En8ruAC2dqeHeZsy3FULLodGWdkRBGU3BVEM=", - "module": "sha256-chOZtGSZmmCSTg2Xshhrp3BacWxvadGBC/4meq8Vs6U=", - "pom": "sha256-GEEJ40mYMXlXxVKLbUKeyBs8r+ut+HP0kiW0mgINTMA=" + "androidx/compose/runtime#runtime-retain/1.11.0-alpha03": { + "jar": "sha256-eXb85gvFEnxTR4l8i29gEaY+aJrth2uO2NUZnGg3/do=", + "module": "sha256-ib2o4O8ziWluCBzPNap03d2Qs1w1eNZNbaI3VWUUwME=", + "pom": "sha256-1XqB8ZF6iNWgjz6QEKqlCyJY5ZYia71A9YwdriAvUx8=" }, - "androidx/compose/runtime#runtime-saveable-android/1.11.0-alpha01": { - "module": "sha256-/e1Tabq2V+60aKVXmpjENI7kC16aPDMhxK2CiB+7/Ls=", - "pom": "sha256-Uopn5tXuFPH95pFoyW7FrMrb/VG2sSYIKMCWXTVeuAA=" + "androidx/compose/runtime#runtime-saveable-android/1.11.0-alpha03": { + "module": "sha256-hcIeG5Z7PERpXtAgrYfOCw6MMLSrLso0TkGREJfihws=", + "pom": "sha256-Lky9WhrpLk+qvQ4LA5KNesS4iUQA0Pfc7KobV9vorKc=" }, "androidx/compose/runtime#runtime-saveable-android/1.7.0": { "module": "sha256-FPU88sgBBcde61vxmQRDmtXfpDJ93ZRIKdy3KDraCWA=", "pom": "sha256-NB5w5ZLSQyjAvfAz9nk5Wz1r6Ps/T/hh2GBkvUrZw3E=" }, - "androidx/compose/runtime#runtime-saveable-desktop/1.11.0-alpha01": { - "jar": "sha256-7yTiTMjJw7mHEAf731ie2aquz5WXmma3SEgG+fDiTZE=", - "module": "sha256-Vjp9kQaAeqlrsehU7wgpxkmiseTYS0ykPYttxUPgkjk=", - "pom": "sha256-DuFti3Ev/O9BoTYKBxwiUSZuIu5BqUKUebXn0n87Iyk=" + "androidx/compose/runtime#runtime-saveable-desktop/1.11.0-alpha03": { + "jar": "sha256-mKQOPLeVTLreM38yPt6yYBsRz22F9iXqkNbt1oegYWo=", + "module": "sha256-s5q8WghC/B5GYacZZzkiJyqbh6W7kDZatfw1ov9UJsQ=", + "pom": "sha256-kGaYW6c6K4WAYFHXSJpbZ6el67x6+Bkel/tE6s+k98o=" }, - "androidx/compose/runtime#runtime-saveable/1.11.0-alpha01": { - "jar": "sha256-+ivj7IPEsSm8t6mxXOH8sNHXYzTn7dt7jzXOmt97CBE=", - "module": "sha256-hBbdSFRwMBAbXazKwNDJ9PQOfAE8VTGfEs8ogMdNdmE=", - "pom": "sha256-IkKAzMHMfIZoA28Y1onRL7WxRPYFcE+D30caBP3kJ1Y=" + "androidx/compose/runtime#runtime-saveable/1.11.0-alpha03": { + "jar": "sha256-tsbzy7D8Am+Wt/9C21CAzpBPf7aX+hm15BKlUP2+1g8=", + "module": "sha256-4swWXaKm/mobxKPTHohqENtFQaW6Py5oSyol68MJ/Ts=", + "pom": "sha256-Z4q4vjCeQiJWQFFPcAopkAtMm+qtCNUhXhbNoJj7meA=" }, "androidx/compose/runtime#runtime-saveable/1.7.0": { "module": "sha256-V096AtKqST7Zo0pfOFZyJm6XS77qNQMnRU6gCL3S7Zc=", "pom": "sha256-UG3TGS4UUkxsHClvNFl7hGoyZPqtF820AuHszCJNDko=" }, - "androidx/compose/runtime#runtime/1.11.0-alpha01": { - "jar": "sha256-n+xUo2/+U8IdcQtyCqHpEIdOfyWrDH5DOCBF9Y6TC+U=", - "module": "sha256-AZaPnAxYKTQJFFzmjLItQbBpmZFaqHzGAxmpOwPvmHQ=", - "pom": "sha256-0vPdxSpqf3+X15yFuYlBZsG5SzVL3mSyFcgJ0aoTnbk=" + "androidx/compose/runtime#runtime/1.11.0-alpha03": { + "jar": "sha256-ZFiIBjUdkEIviMJYd0E43yAMmUR0rKo4Jwvw52sXKAI=", + "module": "sha256-jsteuP/Tn5Iq2Ek5ja2D9eJmFdaMjDFv3G+DvtYw6MY=", + "pom": "sha256-EHNLYq/mIvGF9L/6sx+SyF4kesaNKMb0aYQl3GZW60Y=" }, "androidx/compose/runtime#runtime/1.7.0": { "module": "sha256-e5NRsP9t+SdtAtQPEnZa5Vv1xt+4/430x338oTj7n8E=", @@ -256,81 +256,81 @@ "module": "sha256-sR6bZBtlR39obhm0mdqkNbr0INE7t56Y2wXsAYktsi4=", "pom": "sha256-0vrrNhehR8vOsH6B2tI8+wHi/QiJ3hO5kJWQChpe030=" }, - "androidx/compose/ui#ui-android/1.11.0-alpha01": { - "module": "sha256-pgiRY16uyCJ8OGNzZR/Y3BcWOUhCFAS/Oovphh4oYhg=", - "pom": "sha256-GmegWG2wZyu/ULSPmjwvo4xcTwzEf7Fp38ay9n+ThXA=" + "androidx/compose/ui#ui-android/1.11.0-alpha03": { + "module": "sha256-65ckKZpw5gTp3RAznlHuxRQ/kAlcbGzkEuvxKPmNLEQ=", + "pom": "sha256-JP0mfpnBMNsDUD7DNMsV7XyhZmbybnnubDJzUQA3ZK0=" }, - "androidx/compose/ui#ui-geometry-android/1.11.0-alpha01": { - "module": "sha256-u7KcdaFaKncXEsU7qrH2EnIz012K3ojXcnJ91prVOSA=", - "pom": "sha256-ItYm0VJZ/30Aqj7BfW/2W+vQEGjQiizfM7/gv5+2rT8=" + "androidx/compose/ui#ui-geometry-android/1.11.0-alpha03": { + "module": "sha256-vQhx8IQqp+bW0cPHheh06LKVmvGFFV86yLDh6zMIi+0=", + "pom": "sha256-squIRNxvkwzuyfYC/e/RtPG5ii/2pHe7Bx5U4VftfiI=" }, "androidx/compose/ui#ui-geometry/1.0.1": { "module": "sha256-4v6ktWj/k+NAvEsYyKPCqbr98+EhDZ7TADbB2YiL42k=", "pom": "sha256-a8eueqmlaUSxbzq4pWXDMtMHt5ZHH2wPUepXvtq7wgg=" }, - "androidx/compose/ui#ui-geometry/1.11.0-alpha01": { - "module": "sha256-cJHla91+1MYg8sOLNGv0r6fVR8EtV30sQ0NWPr0Ipko=", - "pom": "sha256-vxLLfdYpzzd9s/qEQEUD13uEQTjRlh/dzVAhWW3F6hA=" + "androidx/compose/ui#ui-geometry/1.11.0-alpha03": { + "module": "sha256-jYMvcP6L/GvgAX+S5ykH01Fka8OIv+sv40pvL0dHWx8=", + "pom": "sha256-D1ZTSDKNfkuwA9Q547MozSkpi4AgECbnffxt8gvOEPQ=" }, - "androidx/compose/ui#ui-graphics-android/1.11.0-alpha01": { - "module": "sha256-jfYSLV8BXwsejTBXDBuA+QsLpJ7A383ef7NPQH5OXr0=", - "pom": "sha256-+sX8viMZVHFDsybQqmiKlinWLBQ+kBjz5ztiELM+3l4=" + "androidx/compose/ui#ui-graphics-android/1.11.0-alpha03": { + "module": "sha256-EpuZu+PMKxyYOzS3S5lcRudxn1H31LdohPNGg2ha1dc=", + "pom": "sha256-uBpa1P5tTWn4aMm8DOO89xVB8AnVS7kF/nCEXlIw2mY=" }, "androidx/compose/ui#ui-graphics/1.0.1": { "module": "sha256-rZzkDe7HIbiYjEOrhH2APQC+6Ixnz8g43uVlaR8125U=", "pom": "sha256-GONZWSUbahn/IUhSZDDJtpPpDm2Zv6ebCEm9lJ1e5VY=" }, - "androidx/compose/ui#ui-graphics/1.11.0-alpha01": { - "module": "sha256-uyjydaynl5EOEqyhP4Topu/S3xuTHcJ+yccjTTaxOC4=", - "pom": "sha256-VVw+fGtkwZ3MP1oVOcvsw6xKsdVwj8cOXf2DRyU9nqo=" + "androidx/compose/ui#ui-graphics/1.11.0-alpha03": { + "module": "sha256-WBFyNHafLc6RDKybcRNwKbJBJ7uGHlhTx/z/ZNfRnMo=", + "pom": "sha256-DTZ/e/VdQPWNJj/GDi3ASD/oGs6396XJ4NaQdUlV3qE=" }, - "androidx/compose/ui#ui-text-android/1.11.0-alpha01": { - "module": "sha256-s+UWB+/pqOAWSYM5PW4MIU+V3IoXluGibMPHU2MxK2g=", - "pom": "sha256-3X5XbIoq1Zomy98uFIFYMDqAj6p/55nkj75JPSqgDnQ=" + "androidx/compose/ui#ui-text-android/1.11.0-alpha03": { + "module": "sha256-TfwYX1QyEG0zNivkiaVaUAwEVcTiG2g/ArD+PZJ8V5Y=", + "pom": "sha256-5NuTNSgisk+JhKfo8r1fRXrXw6G3LFDCAky5Q7LN/uE=" }, "androidx/compose/ui#ui-text/1.0.1": { "module": "sha256-Q6HslNPOzF870g8cU1UasDoLpyivGHGnS/I5xBh5Xxs=", "pom": "sha256-sclCzOWe1DTUcgZ7yUk4f7XLxgJ/dAsCWQzrjggKgbw=" }, - "androidx/compose/ui#ui-text/1.11.0-alpha01": { - "module": "sha256-PLBhoRaZG317ktJzb1pkss80GgPjGiRyn+2ZGA3keC0=", - "pom": "sha256-SSeBP5mRMoWvpI46X7eSRZ4PvZmJVRRMv5Ky+cUzPKQ=" + "androidx/compose/ui#ui-text/1.11.0-alpha03": { + "module": "sha256-080ZxOdrqmNWt/SbhtUmc0qDY3mQ1F4ekPqa60oZIdQ=", + "pom": "sha256-UwnfViF+J0IJGN7KRnd7aJYnt8xRaWzopKYC13/S5+4=" }, - "androidx/compose/ui#ui-tooling-preview-android/1.11.0-alpha01": { - "module": "sha256-oehfDBjTowMavCLyKztI5DP4WgN62L52X9/5WFpYF0I=", - "pom": "sha256-B18Meh6BhyktA2dqoD0eWP6PXgi9PiRPl8GicXYwqxw=" + "androidx/compose/ui#ui-tooling-preview-android/1.11.0-alpha03": { + "module": "sha256-KMi32Yc3J7aAbzvqGw8GHUQsyXgLqiNni7D2iQXDMnk=", + "pom": "sha256-BpSWGt8Kc/vjnaN/j76idZFO1KnpSUlfl30uUhGXU0M=" }, - "androidx/compose/ui#ui-tooling-preview/1.11.0-alpha01": { - "module": "sha256-+t09kG8qgFP37vh5122hE+Sp9bfrL1OxpzPxFF/CxHU=", - "pom": "sha256-lpWOQOW0rjbG+e6J8oB/302R9NikDhkx+V3dqOY5O3Q=" + "androidx/compose/ui#ui-tooling-preview/1.11.0-alpha03": { + "module": "sha256-Q1Diw33X4ME8JmDrUX40nFzjQ6vXctJy4ombvRI79/0=", + "pom": "sha256-9g2o9L76qT0Yazjr1pJi+67a/z8Z4tt5K284yvDrp0I=" }, - "androidx/compose/ui#ui-unit-android/1.11.0-alpha01": { - "module": "sha256-4dEmbeIB1sipYABgRmh/+d9+Dybwqg1ADX0CRJWSTGs=", - "pom": "sha256-C0i6yYvS50SBY9Fg7aQJE7L9xdQi8kSNNpyo1Pzij7Q=" + "androidx/compose/ui#ui-unit-android/1.11.0-alpha03": { + "module": "sha256-wWXLhgSyYGSqncrSk6rAAXVclY/v7qM6LXfqaa83WLk=", + "pom": "sha256-e0elY3wTE9hyvYmT40XPQwmsHxIpkJRoM81wfqm5DU0=" }, "androidx/compose/ui#ui-unit/1.0.1": { "module": "sha256-PbEuW0fW9tqR7Ub+uQL+URKCyEbk7xr/u5FHefprEII=", "pom": "sha256-jrCYEDVgGvGhTFv4p/Ae99S0702VciEhxhF/o9CO7lk=" }, - "androidx/compose/ui#ui-unit/1.11.0-alpha01": { - "module": "sha256-qJdYyUlYQl6Wjtny2fG9K+lR9PqT3i072d9oC6B+Am4=", - "pom": "sha256-fGtNKwFdWw4WtGu08w9fPbycv7ERzziIxF0UGf2YINs=" + "androidx/compose/ui#ui-unit/1.11.0-alpha03": { + "module": "sha256-yYZPE7oPbxsugOcMm86iWicnHZWU0ooxSu7it05488I=", + "pom": "sha256-rbwCyFmnuVORMBA+6zhc0Oy79LjYP8s7qSOb7ZNV6Mo=" }, - "androidx/compose/ui#ui-util-android/1.11.0-alpha01": { - "module": "sha256-aAPm1eSr77fvnvfHvBOuJKGDaO3nVbpA/TOfb3ihdf4=", - "pom": "sha256-aAIsjy5oRIbk8W+1TKgyHnlCn8nK+ACDUkpXZweRiYo=" + "androidx/compose/ui#ui-util-android/1.11.0-alpha03": { + "module": "sha256-iEm8wLOcSIjnA/xik6ptJfTtQ6QRwfeQSCVSt9nTp/k=", + "pom": "sha256-DdxS+xmls12r/92wQR3SvVOAr8daA7kiVxDHq5aspyY=" }, - "androidx/compose/ui#ui-util/1.11.0-alpha01": { - "module": "sha256-FqS5bHnISwSF5tezGrNTdruVDcDtj0Ltf6TWI7JCt3Q=", - "pom": "sha256-GjNpFpfsR2wwfsVoz8bubbUdlah89O5wb9DqBGPs3Ik=" + "androidx/compose/ui#ui-util/1.11.0-alpha03": { + "module": "sha256-w1Vh0bhvwl8nJf/iR2gl10oV9L6OwEsUsn2RH4yloaQ=", + "pom": "sha256-J7QMxgJ1SrL148i40glo7nwvIsDj5FwG5mYVgT697BY=" }, "androidx/compose/ui#ui/1.0.1": { "module": "sha256-VwMaasm2DltWeS6/XN5uFoEv9WbtkZDL0YiwC0bBN3k=", "pom": "sha256-IfZaw0n3m8YNhGbQ64DNBj8YUvRMrKShyfN8GandvWY=" }, - "androidx/compose/ui#ui/1.11.0-alpha01": { - "module": "sha256-2lJCLh3yAWTQH7EeBdi7KtLOLmtK4b3bEQpjGZk2Sws=", - "pom": "sha256-SyMyIMs5TwVqebk1wcguu1/45txyD4Z3sl9BwJ2OLGY=" + "androidx/compose/ui#ui/1.11.0-alpha03": { + "module": "sha256-WAv6/saodXHWvI7oZdXWvxpowb67163kAh4I2TtU3Uc=", + "pom": "sha256-UVuklXGpoP2RS9az1LLvzM44EoqgIWZqSJpynOSQk70=" }, "androidx/core#core-google-shortcuts/1.1.0": { "module": "sha256-UOPdyUI2kQ5hRYijrCmm/XZbg526DMWDmkmNMYKX+I8=", @@ -563,17 +563,17 @@ "androidx/localbroadcastmanager#localbroadcastmanager/1.0.0": { "pom": "sha256-oAAEH1ofeSg8UXXhu2DPNoN4D0Acap00++l1ElP6b/k=" }, - "androidx/navigationevent#navigationevent-android/1.0.1": { - "module": "sha256-MM1uvecTRhLJOL6KyKG7UPyGiraQCjCegi1etXdHP20=", - "pom": "sha256-45CQfgZe+MNCy4izl06lcnLYIhJNxF0zufp5R8SJ5Q0=" + "androidx/navigationevent#navigationevent-android/1.0.2": { + "module": "sha256-Qn0tBgZVTxADC8iYbujj7NufkKeZ91x9gPF8NHho9VQ=", + "pom": "sha256-6hyPWTuUdy1qlTr2o3NGkO+Si99B9jhcPt4LLK52N9M=" }, - "androidx/navigationevent#navigationevent-compose-android/1.0.1": { - "module": "sha256-SBG714SXiBiftTi6xFePvdTXdCQiHsu+bAyqwSU7dqk=", - "pom": "sha256-OQziKphXlHvIvoJ6tmaTAa5jDGe+utDdu/9uoC2sU+g=" + "androidx/navigationevent#navigationevent-compose-android/1.0.2": { + "module": "sha256-ssDJOJFE5mGsDnMvsm2h94KhXWuldauLEcchp9gdgaI=", + "pom": "sha256-H4gPrcx30oHrscvKmn1M8kLYGomv0zT+67TUMTWzJsU=" }, - "androidx/navigationevent#navigationevent-compose/1.0.1": { - "module": "sha256-KALUd6Dw9CZ9+voyMRd2gsasxDouET6vN7hgAqHFwRc=", - "pom": "sha256-zIkB0X4mBgv69cACJvAMqesF5dOpBlpifyPq30OU0B0=" + "androidx/navigationevent#navigationevent-compose/1.0.2": { + "module": "sha256-pEsV/ji2lKgbMxfiXuIE6k/Ouo+fg+uEKgmkvu+PKZg=", + "pom": "sha256-ClhMslr+DeELit6aDVFPevU6JGnzIwCnYprOFgY44wg=" }, "androidx/navigationevent#navigationevent-desktop/1.0.0-rc01": { "jar": "sha256-goOJbYf20+Id1bEnhebHyjt/FcvE0DkbIK0j5UtSBRU=", @@ -584,10 +584,10 @@ "module": "sha256-hJVBipgbbhZIw0zk3MGetdlJBh3zOSc5WpBYZJyeAog=", "pom": "sha256-uKIgBLAycoS5/Dw4frFUq1aN7VWDlXftJBkapPmDztk=" }, - "androidx/navigationevent#navigationevent/1.0.1": { + "androidx/navigationevent#navigationevent/1.0.2": { "jar": "sha256-PXBoRNxJYGyxqjzX1rJ/R/GA38TG1Le4DqR4/4jcvZM=", - "module": "sha256-NrRI1xJsSW2bEryrKNzWguxI7IP6x+VizS5LZSeB7xE=", - "pom": "sha256-h9uD3BBM9BeKnov3Wy44nbkXa1iDoTuNeiqEEGkG99k=" + "module": "sha256-hA2TsFuCeQbhZfcXoDeKDszN6z4NEUkOoU1atbEIJic=", + "pom": "sha256-GwQqB6oi1U8GaFw38JPepPJtnvrlsgEDlLDGWE6IgUM=" }, "androidx/print#print/1.0.0": { "pom": "sha256-YkgsBZSEG+4ku5lqu2y3syCmo7d9yp8KC6T+O+VTCqc=" @@ -1101,8 +1101,8 @@ "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" }, - "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.3.4": { - "pom": "sha256-5q1aqJMEwGwpBwpX+G2/4crk6/Jgq6TfqM0jB3dSlXg=" + "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.3.5": { + "pom": "sha256-6zHCk1pgbpppADJCiD+/U2SclHxa4orGy6g+JvsMNRA=" }, "com/google/errorprone#error_prone_annotations/2.27.0": { "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", @@ -1134,8 +1134,8 @@ "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, - "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.11.0-alpha01": { - "pom": "sha256-RSoZkV86EWHuFuwIgnYnulH4/5+Qo+j5iwf6mP7uxb8=" + "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.11.0-alpha02": { + "pom": "sha256-MU2vfNXg5KBkAF+cfuVA2xRoE9ywWMiBM4tHjynNKLw=" }, "org/jetbrains/kotlin#abi-tools-api/2.2.21": { "jar": "sha256-I5kB8xfBibS0zIvF6WaUPcGeOSWVOeZouqXX7xjrkWo=", @@ -1576,30 +1576,35 @@ "jar": "sha256-8d0j+K40qOkTZnI5kerQ1kmdGj6RY85VDCALAtdqhys=", "pom": "sha256-JlupWajhPDoGEz8EtTkWnBAY2v/U0z9TxFOrTLOG9XA=" }, - "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.3.4": { - "pom": "sha256-5q1aqJMEwGwpBwpX+G2/4crk6/Jgq6TfqM0jB3dSlXg=" + "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.3.5": { + "pom": "sha256-6zHCk1pgbpppADJCiD+/U2SclHxa4orGy6g+JvsMNRA=" }, - "com/google/devtools/ksp#symbol-processing-aa-embeddable/2.3.4": { - "jar": "sha256-fBgymdBy+aeXWFx1r6jI2tT5LYt9lhIyyWo4QPfR24E=", - "pom": "sha256-/aTXENrHut7eJx8lxeMGU45keskeEUM3QhJBbCbVw8g=" + "com/google/devtools/ksp#symbol-processing-aa-embeddable/2.3.5": { + "jar": "sha256-V1z6wqb00KtiLrbH5HPU0Z9YexHoeHM+uDpLD9/xtnk=", + "pom": "sha256-sNRWU0K1ZPuSXqED3cF9xDGarbh48sZ7DeWU5kQu3jU=" }, "com/google/devtools/ksp#symbol-processing-api/2.3.4": { "jar": "sha256-ogZEVp7MAUZ9Pv5Pi5eHqHGc4n7RK2o0da4dgr+xag4=", "module": "sha256-CeHgekumVOL2LGcXt5q6UBzRwss5Y4mYBHk8hSZXRcA=", "pom": "sha256-i2CIr7LQAKVuOyzUNR7Bd8yCySDeOAshZye6ImIsSh8=" }, - "com/google/devtools/ksp#symbol-processing-common-deps/2.3.4": { + "com/google/devtools/ksp#symbol-processing-api/2.3.5": { + "jar": "sha256-ogZEVp7MAUZ9Pv5Pi5eHqHGc4n7RK2o0da4dgr+xag4=", + "module": "sha256-LLOemUDUIF0GGk0zCJ0FkPytXQNQ6T3CNxOd4LrlgrY=", + "pom": "sha256-1TuhIleJh3IPAuRJb2VVOjrAhi6Yfo/TPKt2fnaGZfA=" + }, + "com/google/devtools/ksp#symbol-processing-common-deps/2.3.5": { "jar": "sha256-YY22G1qnU4OO+G5ybnPzWb6MKbbNRn42hxvBfqhnNdA=", - "module": "sha256-4ui18pwyYied8RhQwA3Y7qZ5VGmrDrh48TpP5iASBHE=", - "pom": "sha256-D1026RIIPU4Ih2EbOkxdRNJKNRylWMprcztSzy3mzQM=" + "module": "sha256-Sc7EWjxSMV0J9pMIDp+Me05Eg16Tlg1rxC+Hi5gyrTg=", + "pom": "sha256-KrbIwowFjErZJVkoIb7UAtcqyO2Hd8JPx4uNRsIKf7A=" }, - "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.3.4": { - "jar": "sha256-EUAFlhEAHWHWv6iNm26eFZpvk5eXLBiDunWjag/RiYs=", - "module": "sha256-ZNxa9DCsnHuM2Dk1jnxsYV0Sb3l3Z9WuTFT5bYdV1Nw=", - "pom": "sha256-wTexjcryswzt0whrGQ0ttWv7kk3fSRq+xABoX6kT5kk=" + "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.3.5": { + "jar": "sha256-Q8cnGGSR7pSCsFkBNNa1pPzMQdhYq8gELc84+2to2yo=", + "module": "sha256-3T5ygkMhkqDGNFm/oG5zfqmWdqnO/MK/MMPfQfuMUGU=", + "pom": "sha256-dp/pMzxQy0Xrif/G8exXD/JiUXHi0IJqkNYirMZnc5w=" }, - "com/google/devtools/ksp#symbol-processing/2.3.4": { - "pom": "sha256-aca5FnrBekZ5p2QL7buycogKvU9/6o3Bab+42yyravA=" + "com/google/devtools/ksp#symbol-processing/2.3.5": { + "pom": "sha256-dXf0aXXXoV6rcr2Ab4TzPLgRUZFMfM93f7oE/SYreOg=" }, "com/google/errorprone#error_prone_annotations/2.11.0": { "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" @@ -2196,11 +2201,28 @@ "module": "sha256-4CIocRU3cyeBEx4o2ej7ixD2GWoFDEFv8gtWdlJMows=", "pom": "sha256-U8IQKP+BBqdUQbw8bdnlefd9qCRaOhcqNrwdPIpJxR4=" }, + "io/github/kdroidfilter#composenativetray-jvm/1.0.4": { + "jar": "sha256-fdOyU44yQJNkB3uTfxu3mNtuTSuMBD5r2Tgrkyt4MKw=", + "module": "sha256-0Ci0XdOeEeQxL8FxTuAfkOfDb5ZMwJoGiS+w5UatadI=", + "pom": "sha256-vHzn67Kgc0N3qXrSU0SJ+auF/Nr2ZGhOi4mILWLgY4E=" + }, + "io/github/kdroidfilter#composenativetray/1.0.4": { + "module": "sha256-wV5MA8ZRl2xvpei7zdYz9r7OrRzbiWF3J4TIaei8UfU=", + "pom": "sha256-b2n68NsqCaMFti8TRSWd4R709iEd60cTlww0Lbm9eWw=" + }, + "io/github/kdroidfilter#platformtools.core-jvm/0.7.1": { + "module": "sha256-ulIw0F9s54bJijOELWtyu4ybc7gxFUdETgIA44wDfMQ=", + "pom": "sha256-Ft4YP/Nw8ZAHYDeeJRi6Yx0PZyGCXk0YH7KEx9cFE3c=" + }, "io/github/kdroidfilter#platformtools.core-jvm/0.7.4": { "jar": "sha256-2YH0dLp7Lk9ymfCt8cfQVF1Tx/BxbqXh2uFTqQPuWBc=", "module": "sha256-535ga1GLa78jQxCAOnWJEaXpFbFScK36cQOklaO52mw=", "pom": "sha256-MID9+r/i4uOuh2rvK7EUJgbi3KDZRaYKD2uT0fengU0=" }, + "io/github/kdroidfilter#platformtools.core/0.7.1": { + "module": "sha256-ycvngLvcKTECE6bP7gC3hZZElLlpQjhZ5FkEQkjY6yc=", + "pom": "sha256-IdjOaKJZ0RWaCVLV9RpQAXcomx9ppANGWxrE7a8shgo=" + }, "io/github/kdroidfilter#platformtools.core/0.7.4": { "jar": "sha256-reaoCgAWiypY8gdevCv+myB3p4MqZbg7zJjnmcLz+68=", "module": "sha256-BnBl7qWfisbpZ4lo6j23VKVCxmzo7apZntzt0eF93tk=", @@ -2819,107 +2841,107 @@ "module": "sha256-5Z+aDYcs4zt44W18XqY2lgRuYXKTSozo1Cdyawd5GTQ=", "pom": "sha256-+01/UV0FOzQ9G+gAao4Ehw3SFbi1L89/DJvIv+7WgMY=" }, - "org/jetbrains/compose#compose-gradle-plugin/1.11.0-alpha01": { - "jar": "sha256-/GPmlVeWs4+rorx1z/26T1VHNLgNE8VoMVuzIJCYbUw=", - "module": "sha256-SDqZTgls18F0rr6lpFaiFxnmg8ttXEDkKnLEVG0sOyU=", - "pom": "sha256-poVXHglvnnM7DAzdArDe1MVUOG35hvTs5DIx1Bz8hhA=" + "org/jetbrains/compose#compose-gradle-plugin/1.11.0-alpha02": { + "jar": "sha256-bPrrgGIf40G6et88thJUOO7hVUc8tJoQhG2pgGjjzLI=", + "module": "sha256-3vFAUnJMfh34NitxEsV3xLX8B/sOxrBZNTZ97m65nr8=", + "pom": "sha256-SoEkH2hy9NEcMj1VVXxqmm8hsCXItqXH6kbvcHooX5U=" }, - "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.11.0-alpha01": { - "jar": "sha256-8hP9OdeUNzC+pmM9gcKzVljopdMxfk6VeSJ4eivDkhM=", - "module": "sha256-Cjejqkik6crJERbX0YAj5Qv8IK0ly9Vs0dF16bkTkXE=", - "pom": "sha256-jh8YAMVpHc1Bs9W5lEx1DFOImgeRCNn0IrAx6toYwsQ=" + "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.11.0-alpha02": { + "jar": "sha256-SJ5dxY8cu+GCdv4T+zeg86zLIFQSFChMxQMxoyZYh84=", + "module": "sha256-cfdyqLbsaWmxN86P07veDQimNSWk+JUL83QvZ4nCEHU=", + "pom": "sha256-Tn13xM8D9zdHM5grKdLcsdfXKISSdIpbqFPNBCxP4h0=" }, - "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.11.0-alpha01": { - "pom": "sha256-lRiX1AecAikQivvWay3HTkuCsKwuJ9o/25Fnp2/C4Mg=" + "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.11.0-alpha02": { + "pom": "sha256-i3B+g3V2Ilv2R8OgfG15a5GL1G/PfmasO9ayaV4UvKk=" }, - "org/jetbrains/compose/animation#animation-core-desktop/1.11.0-alpha01": { - "jar": "sha256-ncJqdKBZXZrXAoSeL0sRP4Oj5Xk4TE+FNT4pjWgIQfU=", - "module": "sha256-wR2nWR0DhlMhJjC6C6Xlq4f3zNTAofOF/uX3P07uLEg=", - "pom": "sha256-5XA89GQ+4NQoXkeMAiSi8i0CIb7TJyRbHO4cuD/QHp0=" + "org/jetbrains/compose/animation#animation-core-desktop/1.11.0-alpha02": { + "jar": "sha256-QXRugfMgmj/B5/25zySiC4bKlvYHw2NYlEKV0pXEQE4=", + "module": "sha256-f0TogsjVgN7PkH2Az67h/rlJs3R7+Io5KPGRAK5FiF0=", + "pom": "sha256-peuhw2RNBSS6TdZucuD7IFE8bSNPYEPUOU/NR28WyNA=" }, - "org/jetbrains/compose/animation#animation-core/1.11.0-alpha01": { - "jar": "sha256-YlqY7eDXEHzYsrJXowWzY2aI9BDTQj2Nd76OvKCKcgE=", - "module": "sha256-Kg6caIjwAXO9Ttw/uDOAFRnYwFuTr1MTu8nupD3iCKI=", - "pom": "sha256-lie3xvDQ7T3NMOZ6Wh8A4TCLakCxL7iawj3m3dg51GY=" + "org/jetbrains/compose/animation#animation-core/1.11.0-alpha02": { + "jar": "sha256-jyeBkT7IU2R25GzcOBGC1qAnrIDAGY7vGoEYs+v4wIc=", + "module": "sha256-kh6FQHxANZ+APDxrxvP7AjXM9+HWJ17Ge1+wa9lebvY=", + "pom": "sha256-w1z8fEeysc3yZM1KOaWwO0gGHFKttgahZ5mprtLjuyI=" }, - "org/jetbrains/compose/animation#animation-desktop/1.11.0-alpha01": { - "jar": "sha256-XFea4+FKF5rk2aqp+R4RV8FjxHFnKMjiS/t/IoF0qd8=", - "module": "sha256-S1QYYFbp2m0+Y1yI7rt6O9B/EHkUP7vdzUQulezgDRo=", - "pom": "sha256-oFkv3vc3LcYWD7Qi9vCFZRH2znKuaLMXGblocZ/Iumw=" + "org/jetbrains/compose/animation#animation-desktop/1.11.0-alpha02": { + "jar": "sha256-VvZeSnkhUZbTwzPKcSYezbzy/+70zcS9LuHuy7wZomg=", + "module": "sha256-nnumctfY5IJhD2S8wPjtoI9zBxajffEVZzt/3nDPyHQ=", + "pom": "sha256-D6WPiuNakYPP/XTjVYjL/vK2/UcKeuogQX0YMl0D2Jg=" }, - "org/jetbrains/compose/animation#animation/1.11.0-alpha01": { - "jar": "sha256-JEboZEL36nNcZba2FmqJ1KhKioUL2vgwxPdEzHXbl3g=", - "module": "sha256-e5GLHjDG7ncL0ipA98npMRJcX7bRwLyGU/TRsVLQ/JE=", - "pom": "sha256-DkhFzvKJUKxLI8uOuHmk8UgbIjU7xmw3z6z1ILhdo5c=" + "org/jetbrains/compose/animation#animation/1.11.0-alpha02": { + "jar": "sha256-R1+ISL30cFKWeMvvDC9Em6FciWh79DwldpIQ8gZzrFQ=", + "module": "sha256-x8EzOOoQM/kFoywYO6WpA9ef9Qp2S4KhxMXxdDdAEO0=", + "pom": "sha256-OyJA9F54KswL+PXLuSc+8OtRTOOD+cXzpXZakzssWn0=" }, - "org/jetbrains/compose/annotation-internal#annotation/1.11.0-alpha01": { - "jar": "sha256-6o74Dj9D8P9r/jZxRGjkP9WMp6Sb8BVU53X2FxEqfy8=", - "module": "sha256-Hem+/RzUubddYO7xAQclWe0hlAIgzg+ErAtslfzuqM8=", - "pom": "sha256-kyL2D8EzyzOtopKh66ENLcPNnUMwh+lyo8Cb3Hkqr48=" + "org/jetbrains/compose/annotation-internal#annotation/1.11.0-alpha02": { + "jar": "sha256-W5d4D16GuXccYieOq7lRLw+EImViqRoQGHScvgZUAvM=", + "module": "sha256-d1XT/baIGiMsJQaysgeJaYETs8h1F+Bb4FLUrgtIFbU=", + "pom": "sha256-Kq1QWsshQXVpcsxcLe0hnHVkcFGE9G/dzVF/dh+24E0=" }, - "org/jetbrains/compose/collection-internal#collection/1.11.0-alpha01": { - "jar": "sha256-Hhtt/IjLu7CvqDxsbM34EJ/6SjybKeGA14qSA+2IulI=", - "module": "sha256-bINf9u0O+3PtdalmcYRmcEPnIlOIFsrePSfqbClfQJM=", - "pom": "sha256-nGJ8mwdyjMDfjoeLMXgjvA/VfPByX6HaxWRELtsDQCE=" + "org/jetbrains/compose/collection-internal#collection/1.11.0-alpha02": { + "jar": "sha256-6vHKDBKzevWbJ3RdX2qCOv6N2M9WwWZEri2UGfTIsbg=", + "module": "sha256-evtwaKHtIoT2QMf5lYteJ2VbwbxkoJflslgfNFaNuQc=", + "pom": "sha256-A4IxewhBnYh5ESe9AZy8j4B8eJx74QHuwbktIlUFtmU=" }, - "org/jetbrains/compose/components#components-resources-android/1.11.0-alpha01": { - "module": "sha256-zm13zgD3qW0MvELxXNzzKy+FJrfyrk9iyFLYIyfWYM4=", - "pom": "sha256-1R9pu+C6srY7NBjhcQUAPhUgBCjd3RjtlDDE7+LcLCw=" + "org/jetbrains/compose/components#components-resources-android/1.11.0-alpha02": { + "module": "sha256-eMbKIxXZyn7J04Li+uuXnaJdOH0HuEW53M0wlwTvVrQ=", + "pom": "sha256-4AXSqpTwoRPCWPHHtbUEjasjEd+PCMKL764Nr6Ild6I=" }, - "org/jetbrains/compose/components#components-resources-desktop/1.11.0-alpha01": { - "jar": "sha256-elPKIE+Hzbr2PMJo0Sr1Ose5kQUZkXoWeohLOPxQVZ4=", - "module": "sha256-LjKoZDyjMxRQi66T4O+GfKWgncs7XAy39MdVil004ts=", - "pom": "sha256-YH+qLLVdOx8cW+81p7pIviEincZgsKzFmhFHwBIKvmU=" + "org/jetbrains/compose/components#components-resources-desktop/1.11.0-alpha02": { + "jar": "sha256-vMW7KvZGH9W+CdHh8e/qZqa2Lm6YlOlULFP5pR8OfQY=", + "module": "sha256-nosw+lwpnecaGLzVk6mfgcwy8zLPNgANCmCVJGpRRUE=", + "pom": "sha256-mDSMfQRUrOh5unhaRIATY7hn6DiOgJt9sngXBW8Uc84=" }, - "org/jetbrains/compose/components#components-resources/1.11.0-alpha01": { - "jar": "sha256-fS8C1ezIZbjJuBzDAm20wLoszxgMG+aESJblZYEEW5o=", - "module": "sha256-Rluzab2w0693yrT+JGrNy27x2ailXTv4jmiANpKdq50=", - "pom": "sha256-pxbc+Z78W7UTv9ysfdESRiYJIvt9HaMVYI9fTKIZf90=" + "org/jetbrains/compose/components#components-resources/1.11.0-alpha02": { + "jar": "sha256-l0640hW4pKrOZwkdYrYyRH5nIWVoINod++sX32KiWiQ=", + "module": "sha256-a3LxJIm6X6njDGqyebYoMKlioD6wpzldxiplXLwuGRY=", + "pom": "sha256-rNQjErxX+vDvaKRzB5Vg01czlVulyWDTzTLBRuHE7jA=" }, - "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.11.0-alpha01": { - "pom": "sha256-6zX+48k4TPMPkLXD9sUaD4/91uwxfulpVFvX7q13mUA=" + "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.11.0-alpha02": { + "pom": "sha256-MlCvSHntvR/QXLVmajuaZH3CcApw5srsmN52d6hUpfw=" }, "org/jetbrains/compose/desktop#desktop-jvm-macos-arm64/1.8.2": { "pom": "sha256-S290UtIXCU0UQhfHocanMKEPZ2oLfu/nhdcmMuotNMQ=" }, - "org/jetbrains/compose/desktop#desktop-jvm/1.11.0-alpha01": { + "org/jetbrains/compose/desktop#desktop-jvm/1.11.0-alpha02": { "jar": "sha256-4uLpZyo2ddh4wjrmtc3e5KNp3ud3SSQ7SfExCWeT6ek=", - "module": "sha256-Pf1M2vwBNO62lLUKTAHv0RiHe8Ut8S8ca5BBcaIRvLU=", - "pom": "sha256-HziuZgwfLcORy3E985lj90K0CfzQ1a03ps3bZKDnlWM=" + "module": "sha256-wfyYAcVbN0h090zqY+O2IoHaS+D7UUqkPC6AfLmbMO4=", + "pom": "sha256-B0JpPb1oQRIZWI85WbxQb1kv9di27/FfWEioK2DQsHM=" }, - "org/jetbrains/compose/desktop#desktop/1.11.0-alpha01": { - "module": "sha256-j9JrDxVDofc4pQHe5PgdBozz+c8tp4R0vpaRngcttVI=", - "pom": "sha256-gTm5kgkbsLpWtFG62lEBDUsE9mR8TQC0Q087xu3d7RE=" + "org/jetbrains/compose/desktop#desktop/1.11.0-alpha02": { + "module": "sha256-PIkisxtjPK2/0bEyBixPX3nwQfiMqpRmo+5twdpglKU=", + "pom": "sha256-0moyqgwz2RgEfNW05gYh+rbXye5Mjtd4bmZerr/a6hU=" }, - "org/jetbrains/compose/foundation#foundation-desktop/1.11.0-alpha01": { - "jar": "sha256-CNb8knvIliVzSkPJ9pmYQGJTeHv2dQifbZbs56FqbW4=", - "module": "sha256-vmFBISY0uaxdiFy9JU1PFPqJvDFF+AsZL+qS1xJnZfw=", - "pom": "sha256-nxN0sAvMF4AJUve+9+g54UleP13DNhVW8wYSiSWrBXk=" + "org/jetbrains/compose/foundation#foundation-desktop/1.11.0-alpha02": { + "jar": "sha256-HYmSGGSm3vb3efKfsRm0rrRwrmiWBFIDmrRZ/HldBXg=", + "module": "sha256-lF5aLNvRTQg2ZvXR9LY0zzxNIkP5EwrwK+vbxlHhH9E=", + "pom": "sha256-Fmf6C2dT/i70PMDiwjX9HxJDGRSUaOBty3nwpFAMWMQ=" }, - "org/jetbrains/compose/foundation#foundation-layout-desktop/1.11.0-alpha01": { - "jar": "sha256-S+ar9GoZlH6aWPZSBdNBTAU903MQ0BBmythKBEcVWKs=", - "module": "sha256-iP18LIyOMB8L9w2w+b/ugz6/ViZ15QcZnStHBK5gYnQ=", - "pom": "sha256-XaWtl39LJRwnEykUD/WoVmUvqQKpDcEeifk+kjQwLlE=" + "org/jetbrains/compose/foundation#foundation-layout-desktop/1.11.0-alpha02": { + "jar": "sha256-21Oe49CwaRHgH7QPx4V5eWKoElxXs8gvi2kEcmJ4cdY=", + "module": "sha256-Yqlki7RYceNEDa/NH2FKeXBC2/IO2UF7TYAK2qk3Qn0=", + "pom": "sha256-4G16jmPi4FdPRAatkJkUdF/ALC85Jyv4d0Je94fszMs=" }, - "org/jetbrains/compose/foundation#foundation-layout/1.11.0-alpha01": { - "jar": "sha256-daYVmcWaofgEF11vviTRXLpAu2KV+Ba4mq015Km4iVA=", - "module": "sha256-LNrJ9yanitmOk4seqzVHqsm390yuIuRSmk40ijrCmrg=", - "pom": "sha256-5cC1nt1f6+Z7lXSVfOhlqo3VFYC+L8kOtk9fa/Z1JR4=" + "org/jetbrains/compose/foundation#foundation-layout/1.11.0-alpha02": { + "jar": "sha256-OAGmXyeGltBFKuPofrZ4LnSBImBBM5iO+ZbeC9/69mU=", + "module": "sha256-+oNedTnzlsBgb/HBPPskcH7yqS4qVefuf6ohfkTuqzE=", + "pom": "sha256-wyibdj1MAqoBQc3FaiXueo44TgTZswBAU9E3zKirLjc=" }, - "org/jetbrains/compose/foundation#foundation/1.11.0-alpha01": { - "jar": "sha256-qFTIzwhUpN39CSmXWuUOInoJvMy2/BbQiZF3Vy19rNA=", - "module": "sha256-si2lkTH/k32A0OyufR1p6cQrbzqAY2UUpQX3q9s/CeE=", - "pom": "sha256-4QM3RvCG0yiBiMRivQuUTweuf/FtKK4awvdO4O8O6kE=" + "org/jetbrains/compose/foundation#foundation/1.11.0-alpha02": { + "jar": "sha256-n41Vi7kIvZ9ejOl7L/Gp9Syrp4OtJL6SkKsUaiOTfwI=", + "module": "sha256-4PaPhZkedjeqnt7uXi85On7wShlV2Bh4K6FSc9zA25I=", + "pom": "sha256-JpKyw+vc58o9Bx4oFbnyC7fVlMI4ydiRWdTd4Hetg/0=" }, - "org/jetbrains/compose/hot-reload#hot-reload-gradle-plugin/1.0.0": { - "jar": "sha256-NVGyox2E7Pla0UDP3FsEs7a1Br8VZhh63vm5GgXGawQ=", - "module": "sha256-BESHhjuIvcse0ymXqNij1sVogVgHfYUKmbNSihWuJWI=", - "pom": "sha256-KjpWO0MhAFxK+EbO3aCr2EA/avxtSdojD7q4EOrvB+k=" + "org/jetbrains/compose/hot-reload#hot-reload-gradle-plugin/1.1.0-alpha04": { + "jar": "sha256-H8Gkbs4ETzk+TFBA9OzC1tOYTjYTmFJ1YgVZ/slLgM0=", + "module": "sha256-K6C8tuXX4V4I2afzv18x2y9AjzJ2CHBtoEgri9WsOhQ=", + "pom": "sha256-YmGZQUWShZpIfb3lp/vEPSy9BYiekiLLoXCN/4i2H+A=" }, - "org/jetbrains/compose/material#material-desktop/1.11.0-alpha01": { - "jar": "sha256-b8NvGWmqnWHXtjlwY7K/M1LcG+FV+LRjgNpeI6mWLQQ=", - "module": "sha256-T8741tlmi3ICPFN4gTeeeGBj9pJ9jLnBS59UpVBFAuw=", - "pom": "sha256-Nu+y1t9/pq52DUv96oITjOsfGUoU4+YagGKrr8brBKA=" + "org/jetbrains/compose/material#material-desktop/1.11.0-alpha02": { + "jar": "sha256-tGKrlKcpO7oWPMEwHo/aGpAJwJT9Ab2VdA62rKrKdME=", + "module": "sha256-vU9Zv/AjSecZ9jEeDJkr+14aNL1ur/hMOGXBKryMmqU=", + "pom": "sha256-WJGmZn1INgHpkSUxQGQk0mIQbhX/xVrAJZLv9l79dkg=" }, "org/jetbrains/compose/material#material-icons-core-desktop/1.7.3": { "jar": "sha256-vPbIU7bbL/FI0tOq07en6lTZP8e0Lgr9hA622vGhxoE=", @@ -2941,139 +2963,147 @@ "module": "sha256-sfqa12veAdmGn5uwxxKc0rByeU8jfgTRXj73yKZqSHI=", "pom": "sha256-3NyiJy7t6vlAZmO5s4zMl8cXnoWqHKeJMuxhIuVZlYw=" }, - "org/jetbrains/compose/material#material-ripple-desktop/1.11.0-alpha01": { - "jar": "sha256-UB+RUBTxTzT/hJsBXt8Px7IM4MuTfUSiiq/+rqzjJ6s=", - "module": "sha256-gmHcnLKkj6ToyYEg4vAnzRzThY+Ao3gr3LxWbkBzECU=", - "pom": "sha256-ZyEOURIRy+0d6Q7VIa6kI7aO3iBmVkmUUXgRseECrYo=" + "org/jetbrains/compose/material#material-ripple-desktop/1.11.0-alpha02": { + "jar": "sha256-4RrP5Q08NNDxOgnY5IC9K9Aot/GRAcWSNe2iVIbHriY=", + "module": "sha256-fHOmsaOlLIqgAZAcs+z9n2LOCINhq9IVuobLgJ3uHak=", + "pom": "sha256-SzmgH4zKWjMTORljL/CISFYbefhnCNDbAcRpsWv/g9s=" }, - "org/jetbrains/compose/material#material-ripple/1.11.0-alpha01": { - "jar": "sha256-DrlOORitE+peDW9PBOd3iUrBJF9VWzAUIVXAVwTE2/4=", - "module": "sha256-CSxfJ+4VCyDiNR8La4d8E+0gx/mfyAmLLwEO7aJNwQ8=", - "pom": "sha256-/eoQarZoGFICq7PfEp6ZcA836rsFBbJRpMA+OK2kJb4=" + "org/jetbrains/compose/material#material-ripple/1.11.0-alpha02": { + "jar": "sha256-hMsSUSbxgYuavR5hhLA8gBWE6rjtVKtijNlq6w6Vi84=", + "module": "sha256-SauvZPkmCWzxB0RuVpZ6wONKbQyk1Aam7NG0hYYuQHc=", + "pom": "sha256-Ekmxg4SQL4G917TQYxFNXJRKMcUgjoOKAf/XIaY5vHI=" }, - "org/jetbrains/compose/material#material/1.11.0-alpha01": { - "jar": "sha256-HAXC5IKrbMtQVmZwkGQQOvaJimZabGvO/GNeQJtAG48=", - "module": "sha256-v0+L51rHjoYU/f5dpYmMi7b71jZIuFHbJdnvwgFqy84=", - "pom": "sha256-0sKm+9KmIhb5IjvKtujmbat/irNb+jpe+yaabR+14UQ=" + "org/jetbrains/compose/material#material/1.11.0-alpha02": { + "jar": "sha256-jBwnWyR+qy3SPay9aKzyPGT3JA3HZABwjkqU/d03rHI=", + "module": "sha256-c4HjfbQ1zOX5EKEP8TfUSh5XaEf8FEhQysinTwPz4bw=", + "pom": "sha256-RrxqhAYwdiKb0ezM6DgiFIyhV4tmeNy1YcWTcLaekgI=" }, - "org/jetbrains/compose/material3#material3-desktop/1.11.0-alpha01": { - "jar": "sha256-qrlsbdCWWYYTk0QHNj6/HdBtt/vrMwnF0YnJraYhRbA=", - "module": "sha256-jaZmnrK1BnHSQhgkWCPSTndCEgil5Bf23rSuM7BY7Wk=", - "pom": "sha256-c3Rm1wbocMSwAD6oXhqtyh/w3Ea/koH+ivYBrRgyqlQ=" + "org/jetbrains/compose/material3#material3-desktop/1.11.0-alpha02": { + "jar": "sha256-tWXgwkrpsFIdeEHAF0I8MV7/K+lmo+D2Zj/cuQeL2I4=", + "module": "sha256-3hboQX83kx1ur2N+nvEZuXp6XiAMO8rwSzNHPdaYJgE=", + "pom": "sha256-39AR+h+rmwdyTCBhuQs9tm1E/DxBltohQyXtXXrdjuo=" }, - "org/jetbrains/compose/material3#material3/1.11.0-alpha01": { - "jar": "sha256-PNK1kEFDDITC7ue7mRSPcJ/k6xvz8BEc2u0jmBKm5R8=", - "module": "sha256-LxaWMXYQg9GM4MneSakeldgG/8vakL4+VqFzpxsKoBY=", - "pom": "sha256-+BQVfSrPmTGCRkav3E5MfNJWngAklcpwph09usQZ3tA=" + "org/jetbrains/compose/material3#material3/1.11.0-alpha02": { + "jar": "sha256-WJtEpykShNbpiS+I6wyZxi/qqR2K13Sd87rGtH8W5ns=", + "module": "sha256-O9NkcPaOsm0tLqpo/HaQwKXBVZTtOgupjjzpFMr8r+w=", + "pom": "sha256-jYu5S8RvD78hWKMhpEfFF5oVvZBNEjv2Rwv32Ka9jkA=" }, - "org/jetbrains/compose/runtime#runtime-desktop/1.11.0-alpha01": { + "org/jetbrains/compose/runtime#runtime-desktop/1.11.0-alpha02": { "jar": "sha256-t8ADxiSZ47twqzM805LBvwGYI6GNRnJc3uFfK7Dov6s=", - "module": "sha256-CCO0tdezo3y5MiMLnIX1GbUuaRghryeU6z0W1FYjZG4=", - "pom": "sha256-vBlIxMe2lKKc4aXBsGfpxd77nv0Xz+g8gFNXfbBzWZU=" + "module": "sha256-UY/TPFB3s1FF28w+adbPCoheQ4/Yt/EoCVPow4k2DZs=", + "pom": "sha256-kqYLu/8WIHuTvJVmP5TMQ1sIFQ3OE2vAeRLSavmiuZY=" }, - "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.11.0-alpha01": { + "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.11.0-alpha02": { "jar": "sha256-jESEmfklRX9ZCdXWF9Kln70JZ3Nw2aq5px6dDmknQ8s=", - "module": "sha256-DLQjXUAPiAsghGnSiA6HzsVPz1M1VnHYK7ZI1FfkZ8E=", - "pom": "sha256-fNc9DBbTtkQO8I/nfdYhLmXqgv0BMMqVGxWlv7meNwo=" + "module": "sha256-HIPTivJqiqUOioNcc63IStVHXcag3XIP24azsc3AQOo=", + "pom": "sha256-pY465e68hlcRHLGTbmvlz3PVM0WsAmUqfkRF3t8/T2o=" }, - "org/jetbrains/compose/runtime#runtime-saveable/1.11.0-alpha01": { - "jar": "sha256-AixKeFgUKW1OIi9Ye1tERjmmRhhqvw2qqRoA8DC+rL4=", - "module": "sha256-AWqaoIhlcLWyPvikxEfy/NSsG6EcWXx+YcCb9Fu9dOk=", - "pom": "sha256-oDCwlncv7FNkiFVVNjvyeS8O8G2+2kpbvV5vg7lksR0=" + "org/jetbrains/compose/runtime#runtime-saveable/1.11.0-alpha02": { + "jar": "sha256-4vwazciNws2JBlzaZelNWGDlG/GE7qBMQXnxda7oin4=", + "module": "sha256-hBcagWx+Gi5WZaGYqZorgDZAvAzex16mRQEMex9/i84=", + "pom": "sha256-alVmFmt0tv46IryP8fjGj42Xtubgwq2Gs1k+JQgR5bk=" }, "org/jetbrains/compose/runtime#runtime-saveable/1.8.0-rc01": { "module": "sha256-omkTSIkqQd6WrRyMiJg5nBjBjoIqw7/9wzf8Z/oSV+k=", "pom": "sha256-qo6egoMD5MH1T5/EDz0Q9++ZFulL/qOYL99XbAOyGos=" }, - "org/jetbrains/compose/runtime#runtime/1.11.0-alpha01": { - "jar": "sha256-7Pnaa1zVNw/QGULnuXFBV/rK5oo4HpxEJIEXVmLePbM=", - "module": "sha256-cQK4u1+4s9iGZ+Ho/soWstpWdUQ+v2lG+ow1+w2F/vs=", - "pom": "sha256-bVyw2bGKjAzU1cr7Nmsr8b4HSytK4sDFkC7K/E73rGg=" + "org/jetbrains/compose/runtime#runtime/1.11.0-alpha02": { + "jar": "sha256-kYwMgl9CuUFEiwHu4iOKS+XdKCMy4HNRzXaS5bapgoc=", + "module": "sha256-4lOUe4YzmUgtEMhZJqw434pZ0LcFktRHNPdYTlBHIv0=", + "pom": "sha256-qsmG38iD2WbLbyGbkvLFXJsqu/5qMXfRFNYcKcEKpd8=" }, - "org/jetbrains/compose/ui#ui-backhandler-desktop/1.11.0-alpha01": { - "jar": "sha256-av1/IJvpJ/xg/xwj0hSNFO2jNXKj8+Gq5lM3r3pzeho=", - "module": "sha256-Mdsd4OK21xEHn+zofGx9IZiOJ4QrfCsvqk4FzcHczKY=", - "pom": "sha256-CmMoOTLlithugs2E3m4DOSvTf3KfGeIZzVwM+6v5uoo=" + "org/jetbrains/compose/ui#ui-backhandler-desktop/1.11.0-alpha02": { + "jar": "sha256-Fq0gw9K5fijmFDXj2f1F8OFefMrN7wH8nHV5JC4M3mE=", + "module": "sha256-xfJ/G19sIpqCElUeE7dGXCKym4KBSirO95UsF9FREWM=", + "pom": "sha256-AO/xB1vRs/BJfsgAAwQPoBXsnHj9BiZcnPILHukAvtM=" }, - "org/jetbrains/compose/ui#ui-backhandler/1.11.0-alpha01": { - "jar": "sha256-bgnBQ3iz4ezt5XD1ceStbpJVGsmWCrqjq8B//k8yOBk=", - "module": "sha256-VgFNE/TdepnflfXwtFNCUwiyRM+ejAAQp1UUnEL3UZQ=", - "pom": "sha256-og+tI/N80eDeyR7S3MnFNFlqxGDIwcokRoKa2smsS6Q=" + "org/jetbrains/compose/ui#ui-backhandler/1.11.0-alpha02": { + "jar": "sha256-5F7G0bs/BdgKCc835iMHngj5jjKVzK5B+fo6zCge05k=", + "module": "sha256-ry+INT6ptCh+PkbJKvNxoggvoDmyCV6sCyaBDKnqWIU=", + "pom": "sha256-RbBP2OQFKdv92/Ku2gJBUIAakRV3w3JovFW/yP42VHY=" }, - "org/jetbrains/compose/ui#ui-desktop/1.11.0-alpha01": { - "jar": "sha256-n+ATF1gfpBLrj7Xh/FEiL+VBN75h8zA0fHuBZxFXxbw=", - "module": "sha256-TZ9OPLer5oBC9QjprGPChH+sVwG7FLotzcY4BSYwSXc=", - "pom": "sha256-SDvQYmEy4Pq917fTFlKerdt+r0HbpRHCVbJff6uD5oc=" + "org/jetbrains/compose/ui#ui-desktop/1.11.0-alpha02": { + "jar": "sha256-8Ox933vXHri1tbsbOCgr3CsNXhMIQbTAvhVG/oj5Jps=", + "module": "sha256-uGOqwemPzBJRtBo7rl5n7B5Ka/6xZ9AQ+gbNVqmJYmg=", + "pom": "sha256-PAd7bm+3cm5RV3VcDrNoC8uw1r5eO1LY4R2NLLpnf3U=" }, - "org/jetbrains/compose/ui#ui-geometry-desktop/1.11.0-alpha01": { - "jar": "sha256-YAsNeAZSEmID4UD9hx5S48GAHhZLIA05gl9dxSwxlI4=", - "module": "sha256-YtwVWnO4/kqkdO2vmXrDcFlF9A0gkmRi3/wQLPO/NRo=", - "pom": "sha256-pTrSote2mysL8T+u1wlLKAu5Vd/ZsyOb36Kr66P3E+c=" + "org/jetbrains/compose/ui#ui-geometry-desktop/1.11.0-alpha02": { + "jar": "sha256-gapQCZ8tY65CytVoBBzxAkjnjBlwH38xys2pQ2nE+RM=", + "module": "sha256-Ka5XaKl7RC0mFcbt3e20Ch3FxCaQmIUEQ+z2D7zNUHg=", + "pom": "sha256-v9PfeFSm3tt91YGoGm3gstT0Nmw4Ujso/FtQRywJTmk=" }, - "org/jetbrains/compose/ui#ui-geometry/1.11.0-alpha01": { - "jar": "sha256-oMvKkKH02CNPXyQQMFlLsoA4apzd7ssboEOW871SF0s=", - "module": "sha256-O38H1ACJ0aQGKFMVueHF0rOZj/u71pusRgAaqfHGJrw=", - "pom": "sha256-ES3V3ZsXUyG6hRr3vq8/vNwmHIdIacUxuzc/MJLRQoo=" + "org/jetbrains/compose/ui#ui-geometry/1.11.0-alpha02": { + "jar": "sha256-1oXOPgOOtHw+0mhM6V3yDnV32hEr9+zTWPlO3f++ooM=", + "module": "sha256-KKzX20FHsiGJmqcwxrRU7R3Q3ui7uMbWhod291LwocM=", + "pom": "sha256-qpIAwPJ/+0Jhp/7jKEHdarHP/hbnXkck1BSvgztiZ5w=" }, - "org/jetbrains/compose/ui#ui-graphics-desktop/1.11.0-alpha01": { - "jar": "sha256-76eFegrDp0IAQV8jWZkjbk/BRpOM2ao2STlOndFiIaE=", - "module": "sha256-zU+oVmTJKqK3aeuRmmpyR/BeiHFJdPD1F49IYQhm8FQ=", - "pom": "sha256-FX8+UbWWyjqZC8gdKr168AtNnBXt+fhnuw9oK5bow30=" + "org/jetbrains/compose/ui#ui-graphics-desktop/1.11.0-alpha02": { + "jar": "sha256-8lqjMo35CKMVeSGfmlLA5nMnudtisULKrF+gHBznLeg=", + "module": "sha256-4wvF8g3a1kHEbQvK9Rk6fM/kwEG+65xAZoklCmMoEXU=", + "pom": "sha256-YgRR66YVu2okrOvq9KSrdDwBQ6c8vvfVZvaBKlcLYFY=" }, - "org/jetbrains/compose/ui#ui-graphics/1.11.0-alpha01": { - "jar": "sha256-NFJutnVmr8jdx8lCWy3+HWXFpuTWqHMjc/YQKP1ni0k=", - "module": "sha256-6vLuCYiijNvTBwWBxDLS0EMY1DcCjHkprG1cvZ+W1/g=", - "pom": "sha256-KdJrmYiAyzjNGFqlaaITCaO+j4X+cFEENEe3zrn2qfM=" + "org/jetbrains/compose/ui#ui-graphics/1.11.0-alpha02": { + "jar": "sha256-sVd90kKOy/Ze9QFqO47eco+OV04UotpUk3cYi3V9HvE=", + "module": "sha256-9OkUVKfg4GROqESBc0n8LE8xBQJVjqWoGpQXp/QYC3w=", + "pom": "sha256-6Ew+MYbLy51lsAQhf1oklOEoVXldZ3Kmiei4is/x+58=" }, - "org/jetbrains/compose/ui#ui-text-desktop/1.11.0-alpha01": { - "jar": "sha256-Uvo8HAeeQ5Su30/NQpcXqlNts6Ap5QDXC9ZBrIhr3Mw=", - "module": "sha256-2yxRolmfKgpcEOSQLyU+iqNJDO7bdMGw7JNexQuORXI=", - "pom": "sha256-LFnwOqf8vow2ORDHTLgJ3aXNk5cdwbJVygVztOqK1no=" + "org/jetbrains/compose/ui#ui-text-desktop/1.11.0-alpha02": { + "jar": "sha256-y10+DcEC7hYsAt1nBOtuj5y0iem8kQXEI2a07pwFKEc=", + "module": "sha256-EEn0izKZ2PQjOMynbsVCqLJ+9Xtyz3XSGQHTRILYImI=", + "pom": "sha256-2hSwVbSRkT9DRLzh1oInl1fIEZ0v2GayLNKxPTbkzfk=" }, - "org/jetbrains/compose/ui#ui-text/1.11.0-alpha01": { - "jar": "sha256-OmhcNXB+bcCk9dKL6EOO0l0rayOy7m22XlA9w4TDXzg=", - "module": "sha256-3e/3xqsjhoqnDB8bDnTVbk/EFVqBeGppXIrJiF49q7I=", - "pom": "sha256-sw+MAOaWQm/uyrN5iIYmOWtmZ+h+10p2Xbmno6Q5+No=" + "org/jetbrains/compose/ui#ui-text/1.11.0-alpha02": { + "jar": "sha256-tNJuFjRRpdz9bNtSgXsXb8YkBk18hDY+gAzWMw5Rw/c=", + "module": "sha256-lgNQ1rIJ1DOqZxnJ4h8k58Di3rkQX9rfWln2x64EiRc=", + "pom": "sha256-B7A+x6dQE0lG8zuqzHErX0RV+NRojGfhETBvwZ5LfZY=" }, - "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.11.0-alpha01": { - "jar": "sha256-/OglTJPaY6dshLADTDRQM61+HepCyh1ZKzUpCH/FZpQ=", - "module": "sha256-WDMzi+evtzaIxxnPVltxN+43gq/NjpljiHf6pAgGgfM=", - "pom": "sha256-XQ5Kk+amTGlefVle6FqzX3E2dgFgPJlGKQnLhbZnq2c=" + "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.11.0-alpha02": { + "jar": "sha256-oIw35vNxgxazZOQzlloYPGN2yC3cbsXjbCbd/GzhBD0=", + "module": "sha256-/wbRzPUPA3e3g88iXGC0VuZlglzL6rCFZKot7WP9+go=", + "pom": "sha256-98UNCn5soShN4IdN2BRHHXTa+r6JsB+HiPxfYOdEx3w=" }, - "org/jetbrains/compose/ui#ui-tooling-preview/1.11.0-alpha01": { - "jar": "sha256-mu8bK0I/eMalu2COTbVmhx0fCgvdysH0GmvTbPMFESQ=", - "module": "sha256-qVK3arwCYnYJgHqCo6kg1NPiG9LvCjJ9nSzwkpiG74c=", - "pom": "sha256-qSQQRzoE3h8L1Uzp2bUIp3ABfzYnStNg7mvXAz2AFMs=" + "org/jetbrains/compose/ui#ui-tooling-preview/1.11.0-alpha02": { + "jar": "sha256-fmSpiXh0jIfy5kSxUTh70j2Ut9rnURFNEQlU/A3r2aM=", + "module": "sha256-akYm8Xmil58dJnSeX1O//u6mkfulY3/f3nulNTYtPD4=", + "pom": "sha256-xtR/De93hLkrjtuqvrwzWgSroL6WesynfPFllQ92Pjs=" }, - "org/jetbrains/compose/ui#ui-uikit/1.11.0-alpha01": { + "org/jetbrains/compose/ui#ui-uikit/1.11.0-alpha02": { "jar": "sha256-50RvAIm1JYQJHqw9n19sT2FfllK7+MU8GC+J1FbB19Q=", - "module": "sha256-oKTDj6xCCPPkEsSm/vvt1zLCFHWUCNcY+Ce421EUaII=", - "pom": "sha256-glJbLxrjH4Ve2L8Q7Rh3/g2deUZMZzVdjEoFR3lXFWs=" + "module": "sha256-pytYnOLNPW5NS7iqR9IYs6NOHkSA2SAjI/7aM/gdYaw=", + "pom": "sha256-JEFov+jDwOkIUyMk2r9pxfcSzIg1CSBJwRAeQ6gWdcM=" }, - "org/jetbrains/compose/ui#ui-unit-desktop/1.11.0-alpha01": { - "jar": "sha256-OoB/8YG5lZClXqEg+aBZW5pL2AyEydemV54nIEHj4KA=", - "module": "sha256-OF6FhNA7ap7QGbAsIaEoaqY7x9rjN479u/cf2+SizrM=", - "pom": "sha256-mkU59dcOiRe5zxvnBgLzdxa2BoaaxGBl2/lwgttKRpM=" + "org/jetbrains/compose/ui#ui-unit-desktop/1.11.0-alpha02": { + "jar": "sha256-1uBXxPS+IH670+V1/ZHoJ5usSxt0QW5csM9fQxU51io=", + "module": "sha256-vARSZJsNVqaI/SFsQIjxuEWydqD31PSkxEiUdun3TFg=", + "pom": "sha256-CuAyuCcIv3WoZV0745nwbYph8jcaFjjUmtK07uC+lec=" }, - "org/jetbrains/compose/ui#ui-unit/1.11.0-alpha01": { - "jar": "sha256-a7Ys1Xhj5nphn7WMkKLjJ2x8R//BVhahqFRxoQxIh58=", - "module": "sha256-KB/1ppAZHSB5huetoIn5Kxi/9emRUtW7JgXDKtF91f0=", - "pom": "sha256-78qlKYeByTmLc8kjWUpFvTzc3mLQijOYWIJd0TEOcv0=" + "org/jetbrains/compose/ui#ui-unit/1.11.0-alpha02": { + "jar": "sha256-czm5BdLz6GZixc3d7mHa8/3XNQ7oyReLt4mkZr4/jsI=", + "module": "sha256-YoANGOxbIqlGhRgZvCQu6B12gmB3pdfYpFTuowNDHk8=", + "pom": "sha256-mQk/4GD6CJGXhsERff3hIOmk1XtYwY4E7pMLOGFIURE=" }, - "org/jetbrains/compose/ui#ui-util-desktop/1.11.0-alpha01": { - "jar": "sha256-ct4h8/pYJTNkR57YiGF1nAj7Ms+IZkQ8d5/7qaSIPwg=", - "module": "sha256-CXlr/60pbYuAepSC1eXpoULDi0H1Hy8O6yt8/V28GR8=", - "pom": "sha256-R7iqO91zXzpKPcsUwAg4NWLZiASwpSZKnr4ZWqu48D0=" + "org/jetbrains/compose/ui#ui-util-desktop/1.11.0-alpha02": { + "jar": "sha256-BXSOE4e2PLWsj3monEefTe3YHMsnb2C0h1amjZn/yC8=", + "module": "sha256-w7sjvOQZ6oIvgt2jr5EoIva+XoJ1lW6/2/fyiSqsL00=", + "pom": "sha256-5DgtPFmB/c3P7dRI8n/k7duVaTKTODY2Ybwy3nDKRhI=" }, - "org/jetbrains/compose/ui#ui-util/1.11.0-alpha01": { - "jar": "sha256-cKP9cMhOy4dr9RCEwtnYhftldgjYyDLPXxf3ojuh6Hc=", - "module": "sha256-WBn0/X6m4Fyla1lD2ThOuXRbXajmM3QSPwLsoQ1O0tY=", - "pom": "sha256-NU8EIsoC3oqPn4SDoOvDWvD3mUgmJnOg6RICocVB6Fg=" + "org/jetbrains/compose/ui#ui-util/1.11.0-alpha02": { + "jar": "sha256-uq3Ti35OiIFRGa2Ccsxmbj2z8BggQRAatpnULXNyeAU=", + "module": "sha256-NBfxL3Vhd2xG7X1XgyUltuoNpyRusNybAOLkQDRtA7U=", + "pom": "sha256-vfgfVhrWDsvJaWG1N9sHQJP4ves/hVoLGIhCZowtG/c=" }, - "org/jetbrains/compose/ui#ui/1.11.0-alpha01": { - "jar": "sha256-62pXf3iHnDx0wqqBVdtY4OkfIDnom1V14Rab7vy2Qoo=", - "module": "sha256-b+7WjOfDKTM3fFilF/vjXuFMPGEuOI6nOc2wEM2fKrU=", - "pom": "sha256-1Fai3dnMUbWhcwaUaI9QxFNMi6GDNKs9zycbmhzD8oY=" + "org/jetbrains/compose/ui#ui/1.11.0-alpha02": { + "jar": "sha256-/5CpJDvXYv7Oqvnj548Qg32BVEX93QvxBpWKIheylTc=", + "module": "sha256-PiYr/pWzJ6awnaPR2Fu7DpD7p7OyQWqX97Ig8qmikKc=", + "pom": "sha256-o9qSezPxty0zSeau+eU6nc18uHqDJGG7TkYS6XbxYMQ=" + }, + "org/jetbrains/intellij/deps/kotlinx#kotlinx-coroutines-bom/1.8.0-intellij-14": { + "pom": "sha256-HUFjTSKbHviGsEg6F+S225NrRkP5QBqzS+UWCc+6YD0=" + }, + "org/jetbrains/intellij/deps/kotlinx#kotlinx-coroutines-core-jvm/1.8.0-intellij-14": { + "jar": "sha256-7wQ4Vu+POHA5FpYPrBacNZ2Y1f69Vx1n/M3+dbo3jeM=", + "module": "sha256-Z3M5jeX7L0MyuzdL5AGgNdLxTBM4/rNEYR81hFmZx/c=", + "pom": "sha256-zgsI7fz5rY8Sp2+ZcAUQqOX0Md4tqrFvnwOsUkJbK64=" }, "org/jetbrains/kotlin#abi-tools-api/2.3.10-RC": { "jar": "sha256-FRHeSPkD7pB233FQnRydv2p3blR4tzPgrfuFtUfZkhQ=", @@ -3394,14 +3424,10 @@ "pom": "sha256-QlA7zusRzeFIh3T7DE+chWM6juD6XSLTNyYMLfUKkrY=" }, "org/jetbrains/kotlinx#atomicfu/0.27.0": { + "jar": "sha256-oiN62Ro9NklP+yVW9MWYicgfeuO177RF0S7NCQs3xuk=", "module": "sha256-umecB1fjmeaKmfl9c4QosvtwB3F93/Dx3uuoYrr0RpA=", "pom": "sha256-e3Fbn9t9MTr8hRjV/Kv0LrSfzNbNf/RHNqEF6AmUBdg=" }, - "org/jetbrains/kotlinx#atomicfu/0.28.0": { - "jar": "sha256-09oifhoGwZVcEQFM3vpZlpqwygUHqB6ooP0Fq2xNvJw=", - "module": "sha256-U1VoySkaPadwXEtAU16s7fhrJI31cKxSZpyQfUu4VYs=", - "pom": "sha256-yboB7z5omdQs8HDVm6OdVy/FhjvylscpqZciwGR99so=" - }, "org/jetbrains/kotlinx#kotlinx-browser/0.5.0": { "jar": "sha256-pZr+a8slswkUsKLQrp7Zunrc+vmRG3MkpaW9mBUK8QI=", "module": "sha256-x4N0GbmT1yzN0Te0FRZzh7l0qfbKRFDn9JuBQ+Za86Y=", @@ -3424,9 +3450,6 @@ "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.2": { "pom": "sha256-+vDGU45T3cBJmmNmTY52PCFlgLLhjnIsy98bQxpq/iY=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { - "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" - }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" }, @@ -3438,11 +3461,6 @@ "module": "sha256-6eSnS02/4PXr7tiNSfNUbD7DCJQZsg5SUEAxNcLGTFM=", "pom": "sha256-ZY9Xa5bIMuc4JAatsZfWTY4ul94Q6W36NwDez6KmDe8=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { - "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", - "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", - "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" - }, "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": { "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=", "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", @@ -3598,27 +3616,27 @@ "module": "sha256-P5j9AD7azty/SCtgHTy8ZxnpXE7n9vspohlwkUkJjIw=", "pom": "sha256-kVpAWb16DNBtGkid9T0u8/V992N0ABl0Dr13l8Un6Yw=" }, - "org/jetbrains/runtime#jbr-api/1.5.0": { - "jar": "sha256-ZX7efX+OF1yQmyPKoQ/NTUpREwT9k4qpzIRXtDeJUNU=", - "pom": "sha256-/jziiqT0Ga0GcErRyoIzTQ6HFmfKWxE8UVfnUXzhMh4=" + "org/jetbrains/runtime#jbr-api/1.9.0": { + "jar": "sha256-fjcoTjO1swTuYXTcqpLblJslfMTImRyoZefa9RE9gnk=", + "pom": "sha256-M7lsUL7ccqirVffzfSN8X+MwugWvMRZHeKGpgP1N3E8=" }, - "org/jetbrains/skiko#skiko-awt-runtime-linux-x64/0.9.37": { - "jar": "sha256-ja8onspL0RRHxaR7i7+u4Ef6uxQ3tDPpqeJ2MElor9k=", - "pom": "sha256-r7uncDqPq0GkQgmn7vTKLKyBTKJ6BF1g0O4zywk5Xjs=" + "org/jetbrains/skiko#skiko-awt-runtime-linux-x64/0.9.40": { + "jar": "sha256-VjMtGqeGZqy1G5GeecIojhD4KELLkqtzIpsCNZRM/fI=", + "pom": "sha256-glRhS3l9v9Qz0tkiiuTClIjlTzD9oArRDGQZ5uWQnmI=" }, "org/jetbrains/skiko#skiko-awt-runtime-macos-arm64/0.9.4.2": { "jar": "sha256-bi6GlwC5lL5fRjFIDmdTNXmXETE0iyrlUjbddNJyIWE=", "pom": "sha256-k6Jnui8eKqWK/PvEZXpogmQnbXPYBOI1pzhcO1lEVMk=" }, - "org/jetbrains/skiko#skiko-awt/0.9.37": { - "jar": "sha256-kHtHB8vAuCuHTQ8W6PErR1FurglxJKLNU9zp14GcltY=", - "module": "sha256-S3oEdp60G05A1yZbmw8tA9RON0txbxM3jTodgWpSkgg=", - "pom": "sha256-q+ieYCqjfKoLsYypYwya4J8Fpgbouod8/3s2c8giWoQ=" + "org/jetbrains/skiko#skiko-awt/0.9.40": { + "jar": "sha256-BaPltFmyP5KSrFdgrb+0A0nazpkHvjKhEBHK8rDfEAk=", + "module": "sha256-Fv7SvwRB0CQ5bXZA7jBNUWiRsF/vEt1VLUxKPvoUFXs=", + "pom": "sha256-N5ILQ3mM8VxBqUhH14hIf84ygGqu31B4tH6HDiuBg44=" }, - "org/jetbrains/skiko#skiko/0.9.37": { - "jar": "sha256-cnPbKwiENaMKptPPRl8cgtCR4cU43r13F6OXirP4l9o=", - "module": "sha256-4EOcMa16ei4a1hcwSTEIvDYQybS8DHat+ZEMbK0F+Vc=", - "pom": "sha256-aGh+4KTwmjfRJXSu2K5MuYfZPnL0kHoRGC8ZqPJh2K8=" + "org/jetbrains/skiko#skiko/0.9.40": { + "jar": "sha256-YqEQBKlNK4I7mJNkAFGSk7cppyj3VFDaxJPht2QRTJg=", + "module": "sha256-8d8yj5ajHt3SeEVqzL5SgFsFzMrWbhEMw6F0MiKj2+Q=", + "pom": "sha256-tqgf1kDx33uN8/wcleMs1PB9MYEJKl5Mw7iHNQzY3oM=" }, "org/jgrapht#jgrapht-core/1.5.2": { "jar": "sha256-36WW6fDQg48bXoHdDNYOOnbCwpCsJaCgKf/eWM9eTBQ=", @@ -3803,6 +3821,13 @@ "org/tensorflow#tensorflow-lite-metadata/0.2.0": { "jar": "sha256-6fGLikHwF+kDPLDthciiuiMHKSzf4l6uNlkj56MdKnA=", "pom": "sha256-D+MTJug7diLLzZx11GeykfAf/jzG4+dmUawFocHHo2A=" + }, + "org/jetbrains/compose/desktop#desktop-jvm-linux-arm64/1.11.0-alpha02": { + "pom": "sha256-INXuoJ8sUBzIGbUKGbGv2Bsa5pT5vadziMS7cd6ZOb4=" + }, + "org/jetbrains/skiko#skiko-awt-runtime-linux-arm64/0.9.40": { + "jar": "sha256-L9JHTj02sANpf1Kclv9nk4v3iDOu2twWDp68OYTyJx0=", + "pom": "sha256-c2q1pyWFqoRuQlR3eYBCexNZoVDXHiB7ti/i0IbSsQk=" } } } diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix index bc0bc295ab21..1e80a9299b5d 100644 --- a/pkgs/by-name/ke/keyguard/package.nix +++ b/pkgs/by-name/ke/keyguard/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keyguard"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "AChep"; repo = "keyguard-app"; - tag = "r20260125.1"; - hash = "sha256-ALVf0ECUSxXFS7U5fxn6X10jSHf7tBk7cYm2/+Bk5HE="; + tag = "r20260201"; + hash = "sha256-7n6/YgRzte2qsgQEfqppdpp5t8+xBjfOKjvNotAgJB0="; }; postPatch = '' diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix index ae8f28a9e782..cabb918a7497 100644 --- a/pkgs/by-name/ki/kine/package.nix +++ b/pkgs/by-name/ki/kine/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kine"; - version = "0.14.11"; + version = "0.14.12"; src = fetchFromGitHub { owner = "k3s-io"; repo = "kine"; rev = "v${finalAttrs.version}"; - hash = "sha256-4MbzSRgzh2m5V4Pn9EnDmyyotD1Cv2i2uWmyVPc80bk="; + hash = "sha256-/8qTtnlZhEDkb+V7KOB2VT9dkQRTYFSZN8Cmx2i9BGw="; }; - vendorHash = "sha256-RyL7N0n7Nacq0UZc4+bY2vD9sXZnJiX2HaEWtP51k8E="; + vendorHash = "sha256-AVlq/1+ESjx8tcndaDHk5xDY0jFCJ7LqIjuj1Ccm/dE="; ldflags = [ "-s" diff --git a/pkgs/by-name/ki/kinect-audio-setup/package.nix b/pkgs/by-name/ki/kinect-audio-setup/package.nix index 76cd1370d66b..16c26dfd17a8 100644 --- a/pkgs/by-name/ki/kinect-audio-setup/package.nix +++ b/pkgs/by-name/ki/kinect-audio-setup/package.nix @@ -17,7 +17,7 @@ let # redirects to the following url: licenseUrl = "https://www.microsoft.com/en-us/legal/terms-of-use"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kinect-audio-setup"; # On update: Make sure that the `firmwareURL` is still in sync with upstream. @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { version = "0.5"; # This is an MSI or CAB file - FIRMWARE = requireFile { + env.FIRMWARE = requireFile { name = "UACFirmware"; sha256 = "08a2vpgd061cmc6h3h8i6qj3sjvjr1fwcnwccwywqypz3icn8xw1"; message = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.ao2.it/kinect-audio-setup.git"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-bFwmWh822KvFwP/0Gu097nF5K2uCwCLMB1RtP7k+Zt0="; }; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { install -Dm755 kinect_upload_fw/kinect_upload_fw $out/libexec/ # 7z extract "assume yes on all queries" "only extract/keep files/directories matching UACFIRMWARE.* recursively" - 7z e -y -r "${FIRMWARE}" "UACFirmware.*" >/dev/null + 7z e -y -r "${finalAttrs.env.FIRMWARE}" "UACFirmware.*" >/dev/null # The filename is bound to change with the Firmware SDK mv UACFirmware.* $out/lib/firmware/UACFirmware @@ -93,4 +93,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.unfree; }; -} +}) diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix index 4437e3c1c939..7eb4dd7cb451 100644 --- a/pkgs/by-name/ki/kiro-cli/package.nix +++ b/pkgs/by-name/ki/kiro-cli/package.nix @@ -3,7 +3,6 @@ stdenv, fetchurl, autoPatchelfHook, - makeBinaryWrapper, undmg, versionCheckHook, xz, @@ -42,15 +41,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - makeBinaryWrapper - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - autoPatchelfHook - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - undmg - ]; + nativeBuildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + undmg + ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib @@ -68,16 +65,14 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall '' + lib.optionalString stdenv.hostPlatform.isLinux '' - install -Dm755 bin/kiro-cli $out/bin/.kiro-wrapped + install -Dm755 bin/kiro-cli -t $out/bin install -Dm755 bin/kiro-cli-chat $out/bin/kiro-cli-chat install -Dm755 bin/kiro-cli-term $out/bin/kiro-cli-term - makeBinaryWrapper $out/bin/.kiro-wrapped $out/bin/kiro \ - --prefix PATH : $out/bin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin $out/Applications cp -r "../Kiro CLI.app" "$out/Applications/" - ln -s "$out/Applications/Kiro CLI.app/Contents/MacOS/kiro-cli" $out/bin/kiro + ln -s "$out/Applications/Kiro CLI.app/Contents/MacOS/kiro-cli" $out/bin/kiro-cli for bin in kiro-cli-chat kiro-cli-term; do if [[ -e "$out/Applications/Kiro CLI.app/Contents/MacOS/$bin" ]]; then ln -s "$out/Applications/Kiro CLI.app/Contents/MacOS/$bin" "$out/bin/$bin" @@ -96,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = [ lib.maintainers.jamesward ]; - mainProgram = "kiro"; + mainProgram = "kiro-cli"; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix index fec52abf278c..78786443a763 100644 --- a/pkgs/by-name/ki/kiro/package.nix +++ b/pkgs/by-name/ki/kiro/package.nix @@ -14,7 +14,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = extraCommandLineArgs; - version = "0.9.47"; + version = "0.10.0"; pname = "kiro"; # You can find the current VSCode version in the About dialog: diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json index 27ddca4b561c..4b4299655054 100644 --- a/pkgs/by-name/ki/kiro/sources.json +++ b/pkgs/by-name/ki/kiro/sources.json @@ -1,14 +1,14 @@ { "x86_64-linux": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.9.47/tar/kiro-ide-0.9.47-stable-linux-x64.tar.gz", - "hash": "sha256-30hUVXqudiwKAKQp8BtVBpjniGEMEH6CafPbjH5x+30=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.10.0/tar/kiro-ide-0.10.0-stable-linux-x64.tar.gz", + "hash": "sha256-P9s/9l+y44tZ3QRKWDqA9G4N3Z2NErp/f6SYo3ztrAQ=" }, "x86_64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.9.47/kiro-ide-0.9.47-stable-darwin-x64.dmg", - "hash": "sha256-K78V0LTO1HlQSW8+Ot0ysYvDm9O4wRghBw89MlpQbMg=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.10.0/kiro-ide-0.10.0-stable-darwin-x64.dmg", + "hash": "sha256-fFvBOuxlaIpH7A2v6i4s8Qgly8zAJ6VEHvlkWGNZ1oo=" }, "aarch64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.9.47/kiro-ide-0.9.47-stable-darwin-arm64.dmg", - "hash": "sha256-ovEsvLyfb8iI7hlrSyFjkJrzPxX5F/eltDcROKZfw2M=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.10.0/kiro-ide-0.10.0-stable-darwin-arm64.dmg", + "hash": "sha256-gnqAj2rgF20zCl/718RvnWrIdw3kR5JSVLATsxFyzNY=" } } diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index 9cd9d0ed1757..06df3c4cd49f 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -150,8 +150,10 @@ buildPythonApplication rec { "fortify3" ]; - env.CGO_ENABLED = 0; - GOFLAGS = "-trimpath"; + env = { + CGO_ENABLED = 0; + GOFLAGS = "-trimpath"; + }; configurePhase = '' export GOCACHE=$TMPDIR/go-cache diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index 6919ba9ec52d..f76750056487 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; strictDeps = true; - CFLAGS = [ + env.CFLAGS = toString [ "-O2" "-DNDEBUG" ]; diff --git a/pkgs/by-name/ko/kompute/package.nix b/pkgs/by-name/ko/kompute/package.nix index da8f2cefc385..ef0d89b472e7 100644 --- a/pkgs/by-name/ko/kompute/package.nix +++ b/pkgs/by-name/ko/kompute/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://kompute.cc/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ atila ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/kr/krita-unwrapped/package.nix b/pkgs/by-name/kr/krita-unwrapped/package.nix index 18eb4de3e7b1..b354e813bce2 100644 --- a/pkgs/by-name/kr/krita-unwrapped/package.nix +++ b/pkgs/by-name/kr/krita-unwrapped/package.nix @@ -39,10 +39,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "krita-unwrapped"; - version = "5.2.14"; + version = "5.2.15"; src = fetchurl { url = "mirror://kde/stable/krita/${finalAttrs.version}/krita-${finalAttrs.version}.tar.gz"; - hash = "sha256-VWkAcmwv8U5g97rB6OkVAQDyzZJmnKXcdKxYUe+sKIc="; + hash = "sha256-m5T4Qh2XZ8KU3vWY+xBwfd5usje67KJZBmn7DUuQOzk="; }; patches = [ @@ -153,7 +153,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://krita.org/"; maintainers = with lib.maintainers; [ sifmelcara - nek0 ]; mainProgram = "krita"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/kr/krunkit/package.nix b/pkgs/by-name/kr/krunkit/package.nix index 230317284893..fa0f6df93c4f 100644 --- a/pkgs/by-name/kr/krunkit/package.nix +++ b/pkgs/by-name/kr/krunkit/package.nix @@ -13,18 +13,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "krunkit"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "containers"; repo = "krunkit"; tag = "v${finalAttrs.version}"; - hash = "sha256-dsEZZiLgHyd6xeXZCdDd4zsxzwQeIhAK+lewY2ZfvpY="; + hash = "sha256-2O2v4etlXN61f8Goog+/e/6FTCtt7xSJnkq+w2KGxUM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-i0cC3aOEqcvOcwTPbM6AazMzd8Q+QLwuhnvPGv3ntsc="; + hash = "sha256-ckUunlnyf5BXq/EzFYPF8fI996/NgQaXUuVdOgfj1yk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ks/kseexpr/package.nix b/pkgs/by-name/ks/kseexpr/package.nix index 2df3ab19c848..fafad3921687 100644 --- a/pkgs/by-name/ks/kseexpr/package.nix +++ b/pkgs/by-name/ks/kseexpr/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://invent.kde.org/graphics/kseexpr"; description = "Embeddable expression evaluation engine"; - maintainers = with lib.maintainers; [ nek0 ]; + maintainers = [ ]; license = lib.licenses.lgpl3Plus; }; }) diff --git a/pkgs/by-name/la/lager/package.nix b/pkgs/by-name/la/lager/package.nix index 248c8ee0f4cf..3d5ed2498317 100644 --- a/pkgs/by-name/la/lager/package.nix +++ b/pkgs/by-name/la/lager/package.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/arximboldi/lager"; description = "C++ library for value-oriented design using the unidirectional data-flow architecture — Redux for C++"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ nek0 ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/lc/lc3tools/package.nix b/pkgs/by-name/lc/lc3tools/package.nix index c9ef1484bb24..461a85ea2aea 100644 --- a/pkgs/by-name/lc/lc3tools/package.nix +++ b/pkgs/by-name/lc/lc3tools/package.nix @@ -41,10 +41,12 @@ stdenv.mkDerivation { readline ]; - # lumetta published this a while ago but handrolled his configure - # jank in the original packaging makes this necessary: - LIBS = "${flex}/lib:${ncurses}/lib:${readline}/lib"; - INCLUDES = "${flex}/include:${ncurses}/include:${readline}/include"; + env = { + # lumetta published this a while ago but handrolled his configure + # jank in the original packaging makes this necessary: + LIBS = "${flex}/lib:${ncurses}/lib:${readline}/lib"; + INCLUDES = "${flex}/include:${ncurses}/include:${readline}/include"; + }; # it doesn't take `--prefix` prefixKey = "--installdir "; diff --git a/pkgs/by-name/ld/ldeep/package.nix b/pkgs/by-name/ld/ldeep/package.nix index cf5a34e95931..e93ba12dc0eb 100644 --- a/pkgs/by-name/ld/ldeep/package.nix +++ b/pkgs/by-name/ld/ldeep/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "ldeep"; - version = "1.0.89"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; tag = finalAttrs.version; - hash = "sha256-aod+0wd4Ek8mTiP4H5C5vUJ+94THMrFGDGVzWEH3G+U="; + hash = "sha256-WnsW50mh5ZESdk0hlsO78cREAj1FPNHRu3ivh3qUaEg="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index ccd3519533a6..7408f52b3567 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "2.139.1"; + version = "2.141.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-I4NYtvef+6wnd3IMffwAeuCg4dvGz6gLRcYHwXWwdtM="; + hash = "sha256-G6mmTAs4Y4XE1GnXusJhJEg68EqTLpW8SaCmpidYR8M="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/le/lepton-eda/package.nix b/pkgs/by-name/le/lepton-eda/package.nix index e685ec889d41..6e2895785fca 100644 --- a/pkgs/by-name/le/lepton-eda/package.nix +++ b/pkgs/by-name/le/lepton-eda/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--with-gtk3" ]; - CFLAGS = [ + env.CFLAGS = toString [ "-DSCM_DEBUG_TYPING_STRICTNESS=2" ]; diff --git a/pkgs/by-name/le/lexy/package.nix b/pkgs/by-name/le/lexy/package.nix index 97a2d11c7320..da9f80a5879d 100644 --- a/pkgs/by-name/le/lexy/package.nix +++ b/pkgs/by-name/le/lexy/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "lexy"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; src = fetchFromGitHub { owner = "antoniorodr"; repo = "lexy"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ff+4QymAAxLK61Zdic26TcUzFEvH1A8X6puynMivKaY="; + hash = "sha256-mw8ZldWmo0p/58dVpkTiKnmEKFcPco/axYD3jD2Wbto="; }; build-system = [ diff --git a/pkgs/by-name/li/libaccounts-glib/package.nix b/pkgs/by-name/li/libaccounts-glib/package.nix index 02dfa6431f80..998f305c801f 100644 --- a/pkgs/by-name/li/libaccounts-glib/package.nix +++ b/pkgs/by-name/li/libaccounts-glib/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "subdir('tests')" "" ''; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; mesonFlags = [ "-Dinstall-py-overrides=true" diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index f393ee46823c..7c7ae06fd369 100644 --- a/pkgs/by-name/li/libcamera/package.nix +++ b/pkgs/by-name/li/libcamera/package.nix @@ -127,11 +127,13 @@ stdenv.mkDerivation rec { "-Drpi-awb-nn=disabled" ]; - # Fixes error on a deprecated declaration - env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env = { + # Fixes error on a deprecated declaration + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - # Silence fontconfig warnings about missing config - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + # Silence fontconfig warnings about missing config + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + }; meta = { description = "Open source camera stack and framework for Linux, Android, and ChromeOS"; diff --git a/pkgs/by-name/li/libe57format/package.nix b/pkgs/by-name/li/libe57format/package.nix index fe9d3bc5cbb2..892083d77d6a 100644 --- a/pkgs/by-name/li/libe57format/package.nix +++ b/pkgs/by-name/li/libe57format/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-JARpxp6Z2VioBfY0pZSyQU2mG/EllbaF3qteSFM9u8o="; }; - CXXFLAGS = [ + env.CXXFLAGS = toString [ # GCC 13: error: 'int16_t' has not been declared in 'std' "-include cstdint" ]; diff --git a/pkgs/by-name/li/libei/package.nix b/pkgs/by-name/li/libei/package.nix index 6a47e6bc0f54..93e90b41467c 100644 --- a/pkgs/by-name/li/libei/package.nix +++ b/pkgs/by-name/li/libei/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, fetchFromGitLab, + fetchpatch, libevdev, libxkbcommon, meson, @@ -12,6 +13,9 @@ protobufc, systemd, buildPackages, + epoll-shim, + basu, + evdev-proto, }: let munit = fetchFromGitHub { @@ -33,12 +37,28 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-PqQpJz88tDzjwsBuwxpWcGAWz6Gp6A/oAOS87uxGOGs="; }; + patches = lib.optionals stdenv.hostPlatform.isBSD [ + # From https://gitlab.freedesktop.org/libinput/libei/-/merge_requests/357 + (fetchpatch { + name = "peercred-bsd.patch"; + url = "https://gitlab.freedesktop.org/libinput/libei/-/commit/4f11112be0c0a89e8f078c0b4bcc103dbc6ac875.patch"; + hash = "sha256-Z6oZphzyfHMdAQninbUvEtxr738sx/SQV8o0fkF25iI="; + }) + ]; + buildInputs = [ libevdev libxkbcommon protobuf protobufc + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd + ] + ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ + basu + epoll-shim + evdev-proto ]; nativeBuildInputs = [ meson @@ -56,6 +76,10 @@ stdenv.mkDerivation (finalAttrs: { )) ]; + mesonFlags = lib.optionals stdenv.hostPlatform.isFreeBSD [ + "-Dsd-bus-provider=basu" + ]; + postPatch = '' ln -s "${munit}" ./subprojects/munit patchShebangs ./proto/ei-scanner @@ -67,6 +91,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.freedesktop.org/libinput/libei"; license = lib.licenses.mit; maintainers = [ lib.maintainers.pedrohlc ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; }) diff --git a/pkgs/by-name/li/libfolia/package.nix b/pkgs/by-name/li/libfolia/package.nix index 75612f075e9f..5269e5c5a101 100644 --- a/pkgs/by-name/li/libfolia/package.nix +++ b/pkgs/by-name/li/libfolia/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 - CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; + env.CXXFLAGS = toString [ "-DU_USING_ICU_NAMESPACE=1" ]; passthru = { updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/by-name/li/libkrun-efi/package.nix b/pkgs/by-name/li/libkrun-efi/package.nix index e140e811a2ee..4dd223a7ef52 100644 --- a/pkgs/by-name/li/libkrun-efi/package.nix +++ b/pkgs/by-name/li/libkrun-efi/package.nix @@ -8,18 +8,27 @@ libkrun-efi, moltenvk, pkg-config, + buildPackages, rustc, rustPlatform, rutabaga_gfx, nix-update-script, stdenv, - buildPackages, meson, ninja, vulkan-headers, withGpu ? true, }: let + version = "1.17.4"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "libkrun"; + tag = "v${version}"; + hash = "sha256-Th4vCg3xHb6lbo26IDZES7tLOUAJTebQK2+h3xSYX7U="; + }; + virglrenderer = stdenv.mkDerivation (finalAttrs: { pname = "virglrenderer"; version = "0.10.4d-krunkit"; @@ -59,17 +68,30 @@ let maintainers = [ lib.maintainers.quinneden ]; }; }); + + initBinary = buildPackages.pkgsCross.aarch64-multiplatform.pkgsStatic.stdenv.mkDerivation { + pname = "libkrun-init"; + inherit version src; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + cd init + $CC -O2 -static -Wall -o init init.c + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -D init $out/init + runHook postInstall + ''; + }; in stdenv.mkDerivation (finalAttrs: { pname = "libkrun-efi"; - version = "1.15.1"; - - src = fetchFromGitHub { - owner = "containers"; - repo = "libkrun"; - tag = "v${finalAttrs.version}"; - hash = "sha256-VhlFyYJ/TH12I3dUq0JTus60rQEJq5H4Pm1puCnJV5A="; - }; + inherit version src; outputs = [ "out" @@ -77,8 +99,8 @@ stdenv.mkDerivation (finalAttrs: { ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - hash = "sha256-dK3V7HCCvTqmQhB5Op2zmBPa9FO3h9gednU9tpQk+1U="; + inherit src; + hash = "sha256-0xpAyNe1jF1OMtc7FXMsejqIv0xKc1ktEvm3rj/mVFU="; }; nativeBuildInputs = [ @@ -102,6 +124,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional withGpu "GPU=1"; + preBuild = '' + cp ${initBinary}/init init/init + ''; + passthru = { tests.withoutGpu = libkrun-efi.override { withGpu = false; }; updateScript = nix-update-script { }; diff --git a/pkgs/by-name/li/libmatthew_java/package.nix b/pkgs/by-name/li/libmatthew_java/package.nix index c11ae7a4a681..a6ad4e205932 100644 --- a/pkgs/by-name/li/libmatthew_java/package.nix +++ b/pkgs/by-name/li/libmatthew_java/package.nix @@ -15,8 +15,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-${finalAttrs.version}.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-${finalAttrs.version}.tar.gz"; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; - JAVA_HOME = jdk; - PREFIX = "\${out}"; + + env = { + JAVA_HOME = jdk; + PREFIX = "\${out}"; + }; + buildInputs = [ jdk ]; meta = { diff --git a/pkgs/by-name/li/libnest2d/package.nix b/pkgs/by-name/li/libnest2d/package.nix index eec7acc9f86c..a43427264c93 100644 --- a/pkgs/by-name/li/libnest2d/package.nix +++ b/pkgs/by-name/li/libnest2d/package.nix @@ -37,7 +37,8 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake ]; - CLIPPER_PATH = "${clipper.out}"; + env.CLIPPER_PATH = clipper.out; + cmakeFlags = [ "-DLIBNEST2D_HEADER_ONLY=OFF" ]; meta = { diff --git a/pkgs/by-name/li/libnixxml/package.nix b/pkgs/by-name/li/libnixxml/package.nix index f825d46a920a..1919f788cc0a 100644 --- a/pkgs/by-name/li/libnixxml/package.nix +++ b/pkgs/by-name/li/libnixxml/package.nix @@ -45,7 +45,8 @@ stdenv.mkDerivation { "--with-gd" "--with-glib" ]; - CFLAGS = [ + + env.CFLAGS = toString [ "-Wall" "-std=c90" ]; diff --git a/pkgs/by-name/li/libpar2/package.nix b/pkgs/by-name/li/libpar2/package.nix index 2b1a3b69ebcf..2d29d4d81eb7 100644 --- a/pkgs/by-name/li/libpar2/package.nix +++ b/pkgs/by-name/li/libpar2/package.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./libpar2-0.4-external-verification.patch ]; - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; + env = lib.optionalAttrs stdenv.cc.isClang { + CXXFLAGS = "-std=c++11"; + }; meta = { homepage = "https://parchive.sourceforge.net/"; diff --git a/pkgs/by-name/li/libretrack/package.nix b/pkgs/by-name/li/libretrack/package.nix index 22e4c7198518..28a007312faa 100644 --- a/pkgs/by-name/li/libretrack/package.nix +++ b/pkgs/by-name/li/libretrack/package.nix @@ -32,7 +32,7 @@ flutter329.buildFlutterApplication rec { ]; # https://github.com/juliansteenbakker/flutter_secure_storage/issues/965 - CXXFLAGS = [ "-Wno-deprecated-literal-operator" ]; + env.CXXFLAGS = toString [ "-Wno-deprecated-literal-operator" ]; postInstall = '' substituteInPlace snap/gui/org.proninyaroslav.libretrack.desktop \ diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix index 8bec04fcdad1..5f042c43f9ce 100644 --- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix @@ -36,7 +36,7 @@ let pname = "librewolf-bin-unwrapped"; - version = "147.0.3-2"; + version = "147.0.4-1"; in stdenv.mkDerivation { @@ -46,8 +46,8 @@ stdenv.mkDerivation { url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz"; hash = { - x86_64-linux = "sha256-BBrZUlbA569mktjDMayR4Nb05ilhbsANKZ6yY2jZZ34="; - aarch64-linux = "sha256-m4EkgutlR3QgEDVgtKmYkVvj7jzaZjl0cn2X4UJ6GJg="; + x86_64-linux = "sha256-zqWq8FgdSLWAaoWvmCnIc9FlTmQtcCgLoK9XuXsWS4M="; + aarch64-linux = "sha256-SieZ3R0tqrVLpxClWEiznjPk1YS/37MHaJYHF/UyAvk="; } .${stdenv.hostPlatform.system} or throwSystem; }; diff --git a/pkgs/by-name/li/libspf2/package.nix b/pkgs/by-name/li/libspf2/package.nix index cd77d8072305..3873102de1b6 100644 --- a/pkgs/by-name/li/libspf2/package.nix +++ b/pkgs/by-name/li/libspf2/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am ''; - CFLAGS = "-Wno-error=implicit-function-declaration"; + env.CFLAGS = "-Wno-error=implicit-function-declaration"; doCheck = true; diff --git a/pkgs/by-name/li/libthreadar/package.nix b/pkgs/by-name/li/libthreadar/package.nix index 60b786662501..60d35b030630 100644 --- a/pkgs/by-name/li/libthreadar/package.nix +++ b/pkgs/by-name/li/libthreadar/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gcc-unwrapped ]; - CXXFLAGS = [ "-std=c++14" ]; + env.CXXFLAGS = toString [ "-std=c++14" ]; configureFlags = [ "--disable-build-html" diff --git a/pkgs/by-name/li/libtrace/package.nix b/pkgs/by-name/li/libtrace/package.nix index 33dc67f8f6ab..587daf602726 100644 --- a/pkgs/by-name/li/libtrace/package.nix +++ b/pkgs/by-name/li/libtrace/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtrace"; - version = "4.0.29-1"; + version = "4.0.30-1"; src = fetchFromGitHub { owner = "LibtraceTeam"; repo = "libtrace"; tag = finalAttrs.version; - hash = "sha256-Gt7mGs1/ltVRON5mmltDI6ukZ+LquTnUSFF/QHG9ocI="; + hash = "sha256-zUSc/ZrXo1EV+XB2KYtNPZqd8GzmunO9rCjSKppMMcw="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libudev-devd/package.nix b/pkgs/by-name/li/libudev-devd/package.nix new file mode 100644 index 000000000000..a0a5d232b1c8 --- /dev/null +++ b/pkgs/by-name/li/libudev-devd/package.nix @@ -0,0 +1,48 @@ +{ + stdenv, + lib, + fetchFromGitHub, + meson, + ninja, + pkg-config, + evdev-proto, + freebsd, +}: + +stdenv.mkDerivation rec { + name = "libudev-devd"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "wulf7"; + repo = "libudev-devd"; + rev = "v${version}"; + hash = "sha256-CrRPJMJRYiYyEIy5XPFk286S87/paf6OfGkEdRPv28I="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + freebsd.libdevinfo + evdev-proto + ]; + + mesonFlags = [ + "-Denable-gpl=true" + ]; + + meta = { + description = "libudev-compatible interface for devd"; + homepage = "https://github.com/wulf7/libudev-devd"; + license = with lib.licenses; [ + bsd2 + gpl2 + ]; + maintainers = with lib.maintainers; [ artemist ]; + platforms = lib.platforms.freebsd; + }; +} diff --git a/pkgs/by-name/li/libxmi/package.nix b/pkgs/by-name/li/libxmi/package.nix index b9c9cf118f30..8373958b7751 100644 --- a/pkgs/by-name/li/libxmi/package.nix +++ b/pkgs/by-name/li/libxmi/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "03d4ikh29l38rl1wavb0icw7m5pp7yilnv7bb2k8qij1dinsymlx"; }; - CFLAGS = "-std=gnu89"; + env.CFLAGS = "-std=gnu89"; # For the x86_64 GNU/Linux arch to be recognized by 'configure' preConfigure = "cp ${libtool}/share/libtool/build-aux/config.sub ."; diff --git a/pkgs/by-name/li/ligolo-ng/package.nix b/pkgs/by-name/li/ligolo-ng/package.nix index 50b59a1fa42a..ac04681ef196 100644 --- a/pkgs/by-name/li/ligolo-ng/package.nix +++ b/pkgs/by-name/li/ligolo-ng/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "ligolo-ng"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "nicocha30"; repo = "ligolo-ng"; tag = "v${finalAttrs.version}"; - hash = "sha256-ND0SFB0xj4WK6okNzChZWfK5bhNc4PTWuZoq/PodTW0="; + hash = "sha256-fh1TRJlF3NsLNLJBQXyA4if3goxPF1lYyPIaSOrawQM="; }; - vendorHash = "sha256-oc85xNPMFeaPC7TMcSh3i3Msd8sCJ5QGFmi2fKjcyvk="; + vendorHash = "sha256-dOh8IRsluAy0vdHEXmevQxPCU33afNeuNPTq4Sxxb2g="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/li/lilypond/package.nix b/pkgs/by-name/li/lilypond/package.nix index c81b8a6df53d..3c583d8d96e9 100644 --- a/pkgs/by-name/li/lilypond/package.nix +++ b/pkgs/by-name/li/lilypond/package.nix @@ -147,7 +147,11 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.all; }; - FONTCONFIG_FILE = lib.optional stdenv.hostPlatform.isDarwin (makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }); + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + FONTCONFIG_FILE = ( + makeFontsConf { + fontDirectories = [ freefont_ttf ]; + } + ); + }; }) diff --git a/pkgs/by-name/li/libertine-g/package.nix b/pkgs/by-name/li/linux-libertine-g/package.nix similarity index 76% rename from pkgs/by-name/li/libertine-g/package.nix rename to pkgs/by-name/li/linux-libertine-g/package.nix index 1608db181d9e..b8f2cb13a868 100644 --- a/pkgs/by-name/li/libertine-g/package.nix +++ b/pkgs/by-name/li/linux-libertine-g/package.nix @@ -4,12 +4,12 @@ fetchzip, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "linux-libertine-g"; - version = "2012-01-16"; + version = "20120116"; src = fetchzip { - url = "http://www.numbertext.org/linux/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + url = "http://www.numbertext.org/linux/e7a384790b13c29113e22e596ade9687-LinLibertineG-${finalAttrs.version}.zip"; hash = "sha256-UGTB7jsI6peivCtEt96RCSi5XHCrnjCSs0Ud5bF7uxk="; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Graphite versions of Linux Libertine and Linux Biolinum font families for LibreOffice and OpenOffice.org"; homepage = "https://numbertext.org/linux/"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ qweered ]; license = lib.licenses.ofl; }; -} +}) diff --git a/pkgs/by-name/li/linuxdoc-tools/package.nix b/pkgs/by-name/li/linuxdoc-tools/package.nix index 7d3feb00d414..45cd774c6d00 100644 --- a/pkgs/by-name/li/linuxdoc-tools/package.nix +++ b/pkgs/by-name/li/linuxdoc-tools/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ("--enable-docs=txt info lyx html rtf" + lib.optionalString withLatex " pdf") ]; - LEX = "flex"; + env.LEX = "flex"; postInstall = '' wrapProgram $out/bin/linuxdoc \ diff --git a/pkgs/by-name/li/lirc/package.nix b/pkgs/by-name/li/lirc/package.nix index ed1e36cafe29..730b003723a3 100644 --- a/pkgs/by-name/li/lirc/package.nix +++ b/pkgs/by-name/li/lirc/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { libx11 ]; - DEVINPUT_HEADER = "${linuxHeaders}/include/linux/input-event-codes.h"; + env.DEVINPUT_HEADER = "${linuxHeaders}/include/linux/input-event-codes.h"; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/by-name/lo/log4shib/package.nix b/pkgs/by-name/lo/log4shib/package.nix index ef90d78fecbd..3b421146e8cb 100644 --- a/pkgs/by-name/lo/log4shib/package.nix +++ b/pkgs/by-name/lo/log4shib/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; - CXXFLAGS = "-std=c++11"; + env.CXXFLAGS = "-std=c++11"; meta = { description = "Forked version of log4cpp that has been created for the Shibboleth project"; diff --git a/pkgs/by-name/ls/lsb-release/package.nix b/pkgs/by-name/ls/lsb-release/package.nix index 46c6d2839022..4e5f82c2c8ab 100644 --- a/pkgs/by-name/ls/lsb-release/package.nix +++ b/pkgs/by-name/ls/lsb-release/package.nix @@ -7,6 +7,7 @@ }: replaceVarsWith { + name = "lsb_release"; # Needed for lsb_release script name pname = "lsb_release"; version = lib.trivial.release; diff --git a/pkgs/by-name/ls/lsof/package.nix b/pkgs/by-name/ls/lsof/package.nix index f438a33b5465..8976e83d5069 100644 --- a/pkgs/by-name/ls/lsof/package.nix +++ b/pkgs/by-name/ls/lsof/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; # Stop build scripts from searching global include paths - LSOF_INCLUDE = "${lib.getDev stdenv.cc.libc}/include"; + env.LSOF_INCLUDE = "${lib.getDev stdenv.cc.libc}/include"; configurePhase = let genericFlags = "LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB"; diff --git a/pkgs/by-name/lv/lv/package.nix b/pkgs/by-name/lv/lv/package.nix index a60851fa7ba9..b0684b25532b 100644 --- a/pkgs/by-name/lv/lv/package.nix +++ b/pkgs/by-name/lv/lv/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { # Upstream needs quite a bit of porting to c23: # https://github.com/ttdoda/lv/issues/3 - NIX_CFLAGS_COMPILE = "-std=gnu17"; + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; preAutoreconf = "cd src"; postAutoreconf = "cd .."; diff --git a/pkgs/by-name/ma/maestral-gui/package.nix b/pkgs/by-name/ma/maestral-gui/package.nix index ba047ae40420..0d2ecbeee604 100644 --- a/pkgs/by-name/ma/maestral-gui/package.nix +++ b/pkgs/by-name/ma/maestral-gui/package.nix @@ -6,7 +6,7 @@ nixosTests, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "maestral-qt"; version = "1.9.5"; pyproject = true; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FCn9ELbodk+zCJNmlOVoxE/KSSqbxy5HTB1vpiu7AJA="; }; @@ -39,14 +39,22 @@ python3.pkgs.buildPythonApplication rec { dontWrapQtApps = true; makeWrapperArgs = with python3.pkgs; [ - # Firstly, add all necessary QT variables - "\${qtWrapperArgs[@]}" - # Add the installed directories to the python path so the daemon can find them - "--prefix PYTHONPATH : ${makePythonPath (requiredPythonModules maestral.propagatedBuildInputs)}" - "--prefix PYTHONPATH : ${makePythonPath [ maestral ]}" + "--prefix" + "PYTHONPATH" + ":" + (makePythonPath (requiredPythonModules maestral.propagatedBuildInputs)) + "--prefix" + "PYTHONPATH" + ":" + (makePythonPath [ maestral ]) ]; + preFixup = '' + # Add all necessary QT variables + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + postInstall = '' install -Dm444 -t $out/share/icons/hicolor/512x512/apps src/maestral_qt/resources/maestral.png ''; @@ -58,10 +66,12 @@ python3.pkgs.buildPythonApplication rec { passthru.tests.maestral = nixosTests.maestral; + __structuredAttrs = true; + meta = { description = "GUI front-end for maestral (an open-source Dropbox client) for Linux"; homepage = "https://maestral.app"; - changelog = "https://github.com/samschott/maestral/releases/tag/v${version}"; + changelog = "https://github.com/samschott/maestral/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ peterhoeg @@ -70,4 +80,4 @@ python3.pkgs.buildPythonApplication rec { platforms = lib.platforms.linux; mainProgram = "maestral_qt"; }; -} +}) diff --git a/pkgs/by-name/ma/mainsail/package.nix b/pkgs/by-name/ma/mainsail/package.nix index b9d6961fc1f9..2118f7775d5a 100644 --- a/pkgs/by-name/ma/mainsail/package.nix +++ b/pkgs/by-name/ma/mainsail/package.nix @@ -21,7 +21,7 @@ buildNpmPackage rec { nodejs = nodejs_20; # Prevent Cypress binary download. - CYPRESS_INSTALL_BINARY = 0; + env.CYPRESS_INSTALL_BINARY = 0; preConfigure = '' # Make the build.zip target do nothing, since we will just copy these files later. diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix index b684305768a5..196f6769ed02 100644 --- a/pkgs/by-name/ma/materialize/package.nix +++ b/pkgs/by-name/ma/materialize/package.nix @@ -92,7 +92,6 @@ in rustPlatform.buildRustPackage rec { pname = "materialize"; version = "0.87.2"; - MZ_DEV_BUILD_SHA = "000000000000000000000000000000000000000000000000000"; src = fetchFromGitHub { owner = "MaterializeInc"; @@ -112,6 +111,7 @@ rustPlatform.buildRustPackage rec { ''; env = { + MZ_DEV_BUILD_SHA = "000000000000000000000000000000000000000000000000000"; # needed for internal protobuf c wrapper library PROTOC = lib.getExe protobuf; PROTOC_INCLUDE = "${protobuf}/include"; diff --git a/pkgs/by-name/ma/mathjax/package.nix b/pkgs/by-name/ma/mathjax/package.nix index 83d12cb011c9..1bbe418c7726 100644 --- a/pkgs/by-name/ma/mathjax/package.nix +++ b/pkgs/by-name/ma/mathjax/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mathjax"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "mathjax"; repo = "mathjax"; tag = finalAttrs.version; - hash = "sha256-ri8j/S0mS0I12y3o8NCCMcR3FHeuaNKg/+zEkNB2uXU="; + hash = "sha256-ptM7dLG4wc9XoYOtn0R92LVH4J0tbP8J/0TpGqrVIaQ="; }; installPhase = '' diff --git a/pkgs/by-name/ma/matrix-conduit/package.nix b/pkgs/by-name/ma/matrix-conduit/package.nix index caa8fb5676c7..c108a821edec 100644 --- a/pkgs/by-name/ma/matrix-conduit/package.nix +++ b/pkgs/by-name/ma/matrix-conduit/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-conduit"; - version = "0.10.11"; + version = "0.10.12"; src = fetchFromGitLab { owner = "famedly"; repo = "conduit"; tag = "v${finalAttrs.version}"; - hash = "sha256-IJrDdmlyut8V2jJ7rUoREqoeriYO/15E+JiUCI4Pwlg="; + hash = "sha256-OBrbZlrhh8QqAlaC38Y9g2PH5503CzZAf7Kg7Wflgds="; }; - cargoHash = "sha256-jSkoVA8Ib5S5NTzGtmT/40NwR+8HmKYjGlfbJGWghRA="; + cargoHash = "sha256-JN3Vs3Epv1P66EdsFMY5ojVV+a9rrPcW0/7NrEepo78="; # Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite. preBuild = '' @@ -59,6 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ pstn SchweGELBin + Kladki ]; mainProgram = "conduit"; }; diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix index 8d05f31cf4ac..fbdb9cf03a8e 100644 --- a/pkgs/by-name/ma/mautrix-signal/package.nix +++ b/pkgs/by-name/ma/mautrix-signal/package.nix @@ -42,7 +42,9 @@ buildGoModule rec { tags = lib.optional withGoolm "goolm"; - CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ]; + env = lib.optionalAttrs withGoolm { + CGO_LDFLAGS = toString [ cppStdLib ]; + }; vendorHash = "sha256-TFz5P8czj8J9+QTFHjffCldw8Je2+DiM49W7jv5rY/I="; diff --git a/pkgs/by-name/mh/mhabit/package.nix b/pkgs/by-name/mh/mhabit/package.nix index 82aec6204858..4d7552d03a40 100644 --- a/pkgs/by-name/mh/mhabit/package.nix +++ b/pkgs/by-name/mh/mhabit/package.nix @@ -35,7 +35,7 @@ flutter338.buildFlutterApplication { ]; # https://github.com/juliansteenbakker/flutter_secure_storage/issues/965 - CXXFLAGS = [ "-Wno-deprecated-literal-operator" ]; + env.CXXFLAGS = toString [ "-Wno-deprecated-literal-operator" ]; postInstall = '' install -Dm644 flatpak/io.github.friesi23.mhabit.desktop --target-directory=$out/share/applications diff --git a/pkgs/by-name/mi/midisheetmusic/package.nix b/pkgs/by-name/mi/midisheetmusic/package.nix index b5cce6f2adaf..4ce1d6558f35 100644 --- a/pkgs/by-name/mi/midisheetmusic/package.nix +++ b/pkgs/by-name/mi/midisheetmusic/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation { ''; # This fixes tests that fail because of missing fonts - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; installPhase = '' mkdir -p $out/share/applications $out/share/pixmaps $out/bin diff --git a/pkgs/by-name/mi/minijail-tools/package.nix b/pkgs/by-name/mi/minijail-tools/package.nix index c050c48c7048..fd85d8900e2e 100644 --- a/pkgs/by-name/mi/minijail-tools/package.nix +++ b/pkgs/by-name/mi/minijail-tools/package.nix @@ -1,8 +1,8 @@ { lib, + python3, python3Packages, pkgsBuildTarget, - pkgsBuildHost, minijail, }: @@ -11,24 +11,28 @@ let in python3Packages.buildPythonApplication { - format = "setuptools"; + pyproject = true; pname = "minijail-tools"; inherit (minijail) version src; postPatch = '' - substituteInPlace Makefile --replace /bin/echo echo + substituteInPlace Makefile --replace-fail /bin/echo echo ''; + build-system = [ + python3Packages.setuptools + ]; + postConfigure = '' substituteInPlace tools/compile_seccomp_policy.py \ - --replace "'constants.json'" "'$out/share/constants.json'" + --replace-fail "'constants.json'" "'$out/share/constants.json'" ''; preBuild = '' make libconstants.gen.c libsyscalls.gen.c ${targetClang}/bin/${targetClang.targetPrefix}cc -S -emit-llvm \ libconstants.gen.c libsyscalls.gen.c - ${pkgsBuildHost.python3.interpreter} tools/generate_constants_json.py \ + ${python3.pythonOnBuildForHost.interpreter} tools/generate_constants_json.py \ --output constants.json \ libconstants.gen.ll libsyscalls.gen.ll ''; diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/by-name/mi/minijail/package.nix similarity index 83% rename from pkgs/tools/system/minijail/default.nix rename to pkgs/by-name/mi/minijail/package.nix index 4e687011ba33..c2a72c604cd7 100644 --- a/pkgs/tools/system/minijail/default.nix +++ b/pkgs/by-name/mi/minijail/package.nix @@ -6,14 +6,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "minijail"; version = "2025.07.02"; src = fetchFromGitiles { url = "https://chromium.googlesource.com/chromiumos/platform/minijail"; - rev = "linux-v${version}"; - sha256 = "sha256-GRnr2O6ZpWtRDGJ6Am0XPT426Xh7wxTJsoEqyTUECYY="; + tag = "linux-v${finalAttrs.version}"; + hash = "sha256-GRnr2O6ZpWtRDGJ6Am0XPT426Xh7wxTJsoEqyTUECYY="; }; buildInputs = [ libcap ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify3" ]; installPhase = '' - ./platform2_preinstall.sh ${version} $out/include/chromeos + ./platform2_preinstall.sh ${finalAttrs.version} $out/include/chromeos mkdir -p $out/lib/pkgconfig $out/include/chromeos $out/bin \ $out/share/minijail @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://chromium.googlesource.com/chromiumos/platform/minijail/+/refs/heads/main/README.md"; description = "Sandboxing library and application using Linux namespaces and capabilities"; - changelog = "https://chromium.googlesource.com/chromiumos/platform/minijail/+/refs/tags/linux-v${version}"; + changelog = "https://chromium.googlesource.com/chromiumos/platform/minijail/+/refs/tags/linux-v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ pcarrier @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "minijail0"; }; -} +}) diff --git a/pkgs/by-name/mi/mirakurun/package.nix b/pkgs/by-name/mi/mirakurun/package.nix index 825ff812f01c..4317d296276b 100644 --- a/pkgs/by-name/mi/mirakurun/package.nix +++ b/pkgs/by-name/mi/mirakurun/package.nix @@ -37,7 +37,7 @@ buildNpmPackage rec { ]; # workaround for https://github.com/webpack/webpack/issues/14532 - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; postInstall = let diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index acf407b845a6..0a4a371900a6 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.187.0", + "version": "3.189.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.187.0/mirrord_linux_x86_64", - "hash": "sha256-3a3xCVn0j4UgV5TIRu95TwEnUdKZX/usWInW6XGPa98=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.189.0/mirrord_linux_x86_64", + "hash": "sha256-tZHYPPCOFbWuohpTloc9ugUytal3KJDYXvu1CnXxTxI=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.187.0/mirrord_linux_aarch64", - "hash": "sha256-3pA3LvHEeg1maRRNoEKkYlbBAn9eXh59EcuxjLpcFTs=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.189.0/mirrord_linux_aarch64", + "hash": "sha256-4WQTq5Jnmi8T7EbPFNvkirGQgcDmB6P9pT/3oXBC87k=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.187.0/mirrord_mac_universal", - "hash": "sha256-C4lV7fh/BdawZ1P26EcigaJ/v75BSApqu6csEH27uz8=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.189.0/mirrord_mac_universal", + "hash": "sha256-oEAfW/4Dlbv6pc8W8sRaBqS2g144W3DsNN+AJpu+eP0=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.187.0/mirrord_mac_universal", - "hash": "sha256-C4lV7fh/BdawZ1P26EcigaJ/v75BSApqu6csEH27uz8=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.189.0/mirrord_mac_universal", + "hash": "sha256-oEAfW/4Dlbv6pc8W8sRaBqS2g144W3DsNN+AJpu+eP0=" } } } diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index fe2a836f5c14..b193ccc874a8 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage (finalAttrs: { updateScript = nix-update-script { extraArgs = [ # Ignore subcrate releases (fox, aqua-registry) - "--version-regex=^v([0-9]+\\.[0-9]+\\.[0-9])$" + "--version-regex=^v([0-9]+\\.[0-9]+\\.[0-9]+)$" ]; }; tests = { diff --git a/pkgs/by-name/mi/mission-planner/package.nix b/pkgs/by-name/mi/mission-planner/package.nix index fcc76a92180a..662ae3430fa9 100644 --- a/pkgs/by-name/mi/mission-planner/package.nix +++ b/pkgs/by-name/mi/mission-planner/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { runHook postUnpack ''; - AOT_FILES = [ + env.AOT_FILES = toString [ "MissionPlanner.exe" "MissionPlanner.*.dll" ]; diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix index bbe3726b7a42..655fc61a26fb 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.2.0"; + version = "2.2.1"; pyproject = true; src = fetchFromGitHub { owner = "mistralai"; repo = "mistral-vibe"; tag = "v${finalAttrs.version}"; - hash = "sha256-q79/xP+kaovkch5wXzXumQb9l4wSspXg2cl7mD0Q2f8="; + hash = "sha256-vJnykMcnwQDmzq0L4OhPzortliggtK8Hz+iG2cGu8BM="; }; build-system = with python3Packages; [ @@ -86,6 +86,7 @@ python3Packages.buildPythonApplication (finalAttrs: { "test_updates_index_on_file_deletion" "test_updates_index_on_file_rename" "test_updates_index_on_folder_rename" + "test_watcher_toggle_flow_off_on_off" ]; disabledTestPaths = [ diff --git a/pkgs/by-name/mk/mktemp/package.nix b/pkgs/by-name/mk/mktemp/package.nix index e0b6f1e88470..56d24f7ede8a 100644 --- a/pkgs/by-name/mk/mktemp/package.nix +++ b/pkgs/by-name/mk/mktemp/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.7"; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. - NROFF = "${groff}/bin/nroff"; + env.NROFF = "${groff}/bin/nroff"; patches = [ # Pull upstream fix for parallel install failures. diff --git a/pkgs/by-name/mm/mmtc/package.nix b/pkgs/by-name/mm/mmtc/package.nix index 623b9e3ed060..15057ca33a36 100644 --- a/pkgs/by-name/mm/mmtc/package.nix +++ b/pkgs/by-name/mm/mmtc/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellCompletion artifacts/mmtc.{bash,fish} --zsh artifacts/_mmtc ''; - GEN_ARTIFACTS = "artifacts"; + env.GEN_ARTIFACTS = "artifacts"; meta = { description = "Minimal mpd terminal client that aims to be simple yet highly configurable"; diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix index 99191d5ae593..f8f85c6b3b67 100644 --- a/pkgs/by-name/mo/mochi/package.nix +++ b/pkgs/by-name/mo/mochi/package.nix @@ -1,6 +1,7 @@ { appimageTools, fetchurl, + imagemagick, lib, makeWrapper, stdenv, @@ -27,7 +28,8 @@ let extraInstallCommands = '' install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/ - install -Dm444 ${appimageContents}/${pname}.png -t $out/share/pixmaps/ + ${lib.getExe imagemagick} ${appimageContents}/${pname}.png -resize 512x512 ${pname}_512.png + install -Dm444 ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ --replace-fail 'Exec=AppRun --no-sandbox' 'Exec=${pname}' ''; diff --git a/pkgs/by-name/mo/modelscan/package.nix b/pkgs/by-name/mo/modelscan/package.nix index a3b180618484..d506e3d3211d 100644 --- a/pkgs/by-name/mo/modelscan/package.nix +++ b/pkgs/by-name/mo/modelscan/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "modelscan"; - version = "0.8.5"; + version = "0.8.8"; pyproject = true; src = fetchFromGitHub { owner = "protectai"; repo = "modelscan"; tag = "v${finalAttrs.version}"; - hash = "sha256-8VupkPiHebVtOqMdtkBflAI1zPRdDSvHCEq3ghjASaE="; + hash = "sha256-mN2X6Zbai7xm8bdr2hi9fwzIsfQtukeGcOIS32G4hA0="; }; pythonRelaxDeps = [ "rich" ]; diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index a0ccf8aff638..3bd95f8b1322 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -31,13 +31,13 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "modrinth-app-unwrapped"; - version = "0.10.27"; + version = "0.10.30"; src = fetchFromGitHub { owner = "modrinth"; repo = "code"; tag = "v${finalAttrs.version}"; - hash = "sha256-5KHxoOozqZMvq91oKZ18Hmt0W8r9Va0AJr0hWMmBCfs="; + hash = "sha256-qHRdWPpsMWgITx0i24zgm8K+I7LzFDOewOGfvjgbxgg="; }; patches = [ @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '1.0.0-local' '${finalAttrs.version}' ''; - cargoHash = "sha256-OQVHG0iUyYcpc63N4Y3i8oWohDO4JBUIk3LEAf6ifL0="; + cargoHash = "sha256-hqEBGyMaAz8B11eHMm/r+6ItLnHmvSD9sD1uVNNQfxA="; mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; data = ./deps.json; @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 1; - hash = "sha256-N57RSuVRX33AhQBjHbxR0g9q62rYVqAlYJ1dhuUu0xw="; + hash = "sha256-+/PGCoHAC9Hsl2YEdjvUBzDJi9iBf+ZxT/6yjDE3yBo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/morse-linux/package.nix b/pkgs/by-name/mo/morse-linux/package.nix new file mode 100644 index 000000000000..7d0a5be31e4f --- /dev/null +++ b/pkgs/by-name/mo/morse-linux/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitLab, + alsa-lib, + pulseaudio, + pkg-config, + xmlto, + docbook_xsl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "morse"; + version = "2.6"; + + src = fetchFromGitLab { + owner = "esr"; + repo = "morse-classic"; + tag = finalAttrs.version; + hash = "sha256-wk/Jcp2YWUlecV3OMELD6IWrlj3IC8kh0U4geMxG4fw="; + }; + + buildInputs = [ + alsa-lib + pulseaudio + ]; + + nativeBuildInputs = [ + pkg-config + xmlto + docbook_xsl + ]; + + postPatch = '' + substituteInPlace Makefile --replace-fail "xmlto" "xmlto --skip-validation" + ''; + + env.NIX_CFLAGS_COMPILE = "-std=gnu99"; + + installPhase = '' + runHook preInstall + install -Dm755 morse -t "$out/bin/" + install -Dm755 QSO -t "$out/bin/" + install -Dm644 morse.1 -t "$out/share/man/man1/" + install -Dm644 QSO.1 -t "$out/share/man/man1/" + runHook postInstall + ''; + + meta = { + description = "Training program about morse-code for aspiring radio hams"; + homepage = "https://gitlab.com/esr/morse-classic"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ + matthewcroughan + sarcasticadmin + ]; + platforms = lib.platforms.linux; + mainProgram = "morse"; + }; +}) diff --git a/pkgs/by-name/mo/movit/package.nix b/pkgs/by-name/mo/movit/package.nix index 12e8be4d619f..a36ebab3f3db 100644 --- a/pkgs/by-name/mo/movit/package.nix +++ b/pkgs/by-name/mo/movit/package.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { "dev" ]; - GTEST_DIR = "${gtest.src}/googletest"; - nativeBuildInputs = [ pkg-config ]; @@ -45,13 +43,15 @@ stdenv.mkDerivation rec { libepoxy ]; - env = - lib.optionalAttrs stdenv.cc.isGNU { - NIX_CFLAGS_COMPILE = "-std=c++17"; # needed for latest gtest - } - // lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_LDFLAGS = "-framework OpenGL"; - }; + env = { + GTEST_DIR = "${gtest.src}/googletest"; + } + // lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-std=c++17"; # needed for latest gtest + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_LDFLAGS = "-framework OpenGL"; + }; enableParallelBuilding = true; diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index 924bd54e79bc..7de4709498f7 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -13,6 +13,7 @@ libsecret, nix-update-script, pkg-config, + polkit, python3, qt6, rustPlatform, @@ -23,20 +24,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "mozillavpn"; - version = "2.32.0"; + version = "2.33.1"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-STp/BCh3gELF0UgkMF2uUV9U5JgTNsqoh+Cog8fQy2c="; + hash = "sha256-DsartzFmJFmG++seImaZXnCKZurFXtxTGmSX7DeK3M8="; }; patches = [ - # VPN-7309: Qt 6.10 QML loading fixes (#10832) - (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/5e7a26efd5acc3cdeeda8d1954459bff1a7e373e.patch"; - hash = "sha256-CdvEuASPNYzQwyCMKXWZObOHH55WRFsxGYlEP8b20Mc="; - }) ]; netfilter = buildGoModule { @@ -52,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-bJTOTHlCYSrlhy6GewpK8qhBGRH49xNkFqOXZug5lNA="; + hash = "sha256-yEZBW1Jc4GUx4eZ3CVlNVKF+MNUtR6qvcOJZz2TgTO4="; }; buildInputs = [ @@ -60,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { libgcrypt libgpg-error libsecret + polkit qt6.qt5compat qt6.qtbase qt6.qtnetworkauth @@ -87,14 +84,15 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'set(ADDON_BUILD_ARGS ' 'set(ADDON_BUILD_ARGS -q ${qt6.qttools.dev}/bin ' substituteInPlace src/cmake/linux.cmake \ - --replace-fail '/usr/share/dbus-1' "$out/share/dbus-1" \ - --replace-fail '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" + --replace-fail '/usr/share/dbus-1' '${"$"}{CMAKE_INSTALL_DATADIR}/dbus-1' \ + --replace-fail '${"$"}{POLKIT_POLICY_DIR}' '${"$"}{CMAKE_INSTALL_DATADIR}/polkit-1/actions' \ + --replace-fail '${"$"}{SYSTEMD_UNIT_DIR}' '${"$"}{CMAKE_INSTALL_LIBDIR}/systemd/system' substituteInPlace extension/CMakeLists.txt \ - --replace-fail '/etc' "$out/etc" + --replace-fail '/etc' '${"$"}{CMAKE_INSTALL_SYSCONFDIR}' substituteInPlace extension/socks5proxy/bin/CMakeLists.txt \ - --replace-fail '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" + --replace-fail '${"$"}{SYSTEMD_UNIT_DIR}' '${"$"}{CMAKE_INSTALL_LIBDIR}/systemd/system' ln -s '${finalAttrs.netfilter.goModules}' linux/netfilter/vendor @@ -114,6 +112,11 @@ stdenv.mkDerivation (finalAttrs: { (lib.makeBinPath [ wireguard-tools ]) ]; + postInstall = '' + mkdir "$out/share/polkit-1/rules.d" + cp ../linux/org.mozilla.vpn.rules-others "$out/share/polkit-1/rules.d/org.mozilla.vpn.rules" + ''; + passthru.updateScript = _experimental-update-script-combinators.sequence [ (nix-update-script { }) (nix-update-script { diff --git a/pkgs/by-name/mp/mpd/package.nix b/pkgs/by-name/mp/mpd/package.nix index 850a8880a5d9..51df5dbb4064 100644 --- a/pkgs/by-name/mp/mpd/package.nix +++ b/pkgs/by-name/mp/mpd/package.nix @@ -257,9 +257,11 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional (builtins.elem "documentation" features_) "man"; - CXXFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ - "-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0" - ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + CXXFLAGS = toString [ + "-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0" + ]; + }; mesonFlags = [ (lib.mesonBool "test" true) diff --git a/pkgs/by-name/mp/mpvpaper/package.nix b/pkgs/by-name/mp/mpvpaper/package.nix index 5b1edf675698..33d26f584fde 100644 --- a/pkgs/by-name/mp/mpvpaper/package.nix +++ b/pkgs/by-name/mp/mpvpaper/package.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; mainProgram = "mpvpaper"; - maintainers = with lib.maintainers; [ atila ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix b/pkgs/by-name/ms/msalsdk-dbusclient/package.nix deleted file mode 100644 index 70fa05c2a30b..000000000000 --- a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - dpkg, - sdbus-cpp, -}: -stdenv.mkDerivation rec { - pname = "msalsdk-dbusclient"; - version = "1.0.1"; - - src = fetchurl { - url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/msalsdk-dbusclient/msalsdk-dbusclient_${version}_amd64.deb"; - hash = "sha256-AVPrNxCjXGza2gGETP0YrlXeEgI6AjlrSVTtqKb2UBI="; - }; - - nativeBuildInputs = [ dpkg ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - install -m 755 usr/lib/libmsal_dbus_client.so $out/lib/ - patchelf --set-rpath ${ - lib.makeLibraryPath [ - stdenv.cc.cc - sdbus-cpp - ] - } $out/lib/libmsal_dbus_client.so - - runHook postInstall - ''; - - passthru.updateScript = ./update.sh; - meta = { - description = "Microsoft Authentication Library cross platform Dbus client for talking to microsoft-identity-broker"; - homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-cpp"; - license = lib.licenses.unfree; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ rhysmdnz ]; - }; -} diff --git a/pkgs/by-name/ms/msalsdk-dbusclient/update.sh b/pkgs/by-name/ms/msalsdk-dbusclient/update.sh deleted file mode 100755 index e804eeb935ee..000000000000 --- a/pkgs/by-name/ms/msalsdk-dbusclient/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p curl gzip dpkg common-updater-scripts - -index_file=$(curl -sL https://packages.microsoft.com/ubuntu/22.04/prod/dists/jammy/main/binary-amd64/Packages.gz | gzip -dc) - -latest_version="0" - -echo "$index_file" | while read -r line; do - if [[ "$line" =~ ^Package:[[:space:]]*(.*) ]]; then - Package="${BASH_REMATCH[1]}" - fi - if [[ "$line" =~ ^Version:[[:space:]]*(.*) ]]; then - Version="${BASH_REMATCH[1]}" - fi - - if ! [[ "$line" ]] && [[ "${Package}" == "msalsdk-dbusclient" ]]; then - if ( dpkg --compare-versions ${Version} gt ${latest_version} ); then - latest_version="${Version}" - - echo $latest_version - fi - - Package="" - Version="" - fi -done | tail -n 1 | (read version; update-source-version msalsdk-dbusclient $version) diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix index abf900d725fc..95af07f541d6 100644 --- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix @@ -14,13 +14,13 @@ }: buildDotnetModule (finalAttrs: { pname = "msbuild-structured-log-viewer"; - version = "2.3.139"; + version = "2.3.143"; src = fetchFromGitHub { owner = "KirillOsenkov"; repo = "MSBuildStructuredLog"; rev = "v${finalAttrs.version}"; - hash = "sha256-5i5qEwUzk9bUn2F/wcMfIOodcfn4d9ApdADes5e1nIo="; + hash = "sha256-Gjk6hxgFSiSLDP9B4UUsNEaadLjTn8WrPmFRbIUerAA="; }; env.AVALONIA_TELEMETRY_OPTOUT = "1"; diff --git a/pkgs/by-name/ms/msbuild/package.nix b/pkgs/by-name/ms/msbuild/package.nix index 6d8010e4e0cb..ce9f87d20088 100644 --- a/pkgs/by-name/ms/msbuild/package.nix +++ b/pkgs/by-name/ms/msbuild/package.nix @@ -55,9 +55,11 @@ mkPackage rec { glibcLocales ]; - # https://github.com/NixOS/nixpkgs/issues/38991 - # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = lib.optionalString stdenv.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive"; + env = lib.optionalAttrs stdenv.hostPlatform.isLinux { + # https://github.com/NixOS/nixpkgs/issues/38991 + # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) + LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; + }; postPatch = '' # not patchShebangs, there is /bin/bash in the body of the script as well diff --git a/pkgs/by-name/ms/msieve/package.nix b/pkgs/by-name/ms/msieve/package.nix index 3370bc459f32..c80468d07815 100644 --- a/pkgs/by-name/ms/msieve/package.nix +++ b/pkgs/by-name/ms/msieve/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ecm ]; - ECM = if ecm == null then "0" else "1"; + env.ECM = if ecm == null then "0" else "1"; # Doesn't hurt Linux but lets clang-based platforms like Darwin work fine too makeFlags = [ diff --git a/pkgs/by-name/n2/n2n/package.nix b/pkgs/by-name/n2/n2n/package.nix index 3900b2da8268..5e5ffccc2ec8 100644 --- a/pkgs/by-name/n2/n2n/package.nix +++ b/pkgs/by-name/n2/n2n/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ./autogen.sh ''; - PREFIX = placeholder "out"; + env.PREFIX = placeholder "out"; meta = { description = "Peer-to-peer VPN"; diff --git a/pkgs/by-name/na/nasty/package.nix b/pkgs/by-name/na/nasty/package.nix index d29c224af1ef..fcdfe5cceebe 100644 --- a/pkgs/by-name/na/nasty/package.nix +++ b/pkgs/by-name/na/nasty/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { # does not apply cleanly with patchPhase/fetchpatch # https://sources.debian.net/src/nasty/0.6-3/debian/patches/02_add_largefile_support.patch - CFLAGS = "-D_FILE_OFFSET_BITS=64"; + env.CFLAGS = "-D_FILE_OFFSET_BITS=64"; buildInputs = [ gpgme ]; diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix index 0aba55f33e3e..d1b8ce1c8f47 100644 --- a/pkgs/by-name/na/navidrome/package.nix +++ b/pkgs/by-name/na/navidrome/package.nix @@ -64,7 +64,9 @@ buildGoModule (finalAttrs: { "-X github.com/navidrome/navidrome/consts.gitTag=v${finalAttrs.version}" ]; - CGO_CFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-return-local-addr" ]; + env = lib.optionalAttrs stdenv.cc.isGNU { + CGO_CFLAGS = toString [ "-Wno-return-local-addr" ]; + }; postPatch = '' patchShebangs ui/bin/update-workbox.sh diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index 792ffea51433..3b38bcc0481a 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -68,16 +68,16 @@ let in buildGoModule (finalAttrs: { pname = "netbird-${componentName}"; - version = "0.64.6"; + version = "0.65.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-og5azhvqxtjyAZaMaQDIa4jvaPbPDobQZ/xznxHl6lc="; + hash = "sha256-7OLCrmgkRViFhzxhyuRZGua6Bu8ntWdYNNlEpC0tB+o="; }; - vendorHash = "sha256-54ohzpyAzyD1YX90W7y7qDzFgqLksIFGUOOrGWImT6I="; + vendorHash = "sha256-zMjbciItpzzCmUoLZy+gEF9etQy2dRmZrRVg4iSC0+o="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config; diff --git a/pkgs/by-name/ne/netcap/package.nix b/pkgs/by-name/ne/netcap/package.nix index f08dfe02bcfa..92768c3334e3 100644 --- a/pkgs/by-name/ne/netcap/package.nix +++ b/pkgs/by-name/ne/netcap/package.nix @@ -40,22 +40,27 @@ buildGoModule (finalAttrs: { ]; ldflags = [ - "-s -w" + "-s" + "-w" ]; tags = lib.optionals (!withDpi) [ "nodpi" ]; - CGO_LDFLAGS = lib.optionalString withDpi '' - -L${ndpi}/lib -lndpi - -L${libprotoident}/lib -lndpi - ''; + env = lib.optionalAttrs withDpi { + CGO_LDFLAGS = toString [ + "-L${ndpi}/lib" + "-lndpi" + "-L${libprotoident}/lib" + "-lndpi" + ]; - CGO_CFLAGS = lib.optionalString withDpi '' - -I${ndpi}/include - -I${libprotoident}/include - ''; + CGO_CFLAGS = toString [ + "-I${ndpi}/include" + "-I${libprotoident}/include" + ]; + }; postInstall = '' mv $out/bin/cmd $out/bin/net diff --git a/pkgs/by-name/ne/netcdffortran/package.nix b/pkgs/by-name/ne/netcdffortran/package.nix index 50c745633639..0891559c5b78 100644 --- a/pkgs/by-name/ne/netcdffortran/package.nix +++ b/pkgs/by-name/ne/netcdffortran/package.nix @@ -27,8 +27,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - FFLAGS = [ "-std=legacy" ]; - FCFLAGS = [ "-std=legacy" ]; + env = { + FFLAGS = toString [ "-std=legacy" ]; + FCFLAGS = toString [ "-std=legacy" ]; + }; meta = { description = "Fortran API to manipulate netcdf files"; diff --git a/pkgs/by-name/ne/netop/package.nix b/pkgs/by-name/ne/netop/package.nix index e303475d1804..103fa61fd84a 100644 --- a/pkgs/by-name/ne/netop/package.nix +++ b/pkgs/by-name/ne/netop/package.nix @@ -16,8 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-Rnp2VNAi8BNbKqkGFoYUb4C5db5BS1P1cqpWlroTmdQ="; }; - LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ]; - LIBPCAP_VER = libpcap.version; + env = { + LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ]; + LIBPCAP_VER = libpcap.version; + }; cargoHash = "sha256-WGwtRMARwRvcUflN3JYL32aib+IG1Q0j0D9BEfaiME4="; diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix index a2e87e041013..bd821281dcfe 100644 --- a/pkgs/by-name/ne/newsboat/package.nix +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -66,12 +66,14 @@ stdenv.mkDerivation (finalAttrs: { gettext ]; - # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set - # these for all platforms, since upstream's gettext crate behavior might - # change in the future. - GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; - GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; - GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; + env = { + # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set + # these for all platforms, since upstream's gettext crate behavior might + # change in the future. + GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; + GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; + GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; + }; makeFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/ni/nirius/package.nix b/pkgs/by-name/ni/nirius/package.nix index 30fc65aa9a72..d55ec4204e99 100644 --- a/pkgs/by-name/ni/nirius/package.nix +++ b/pkgs/by-name/ni/nirius/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nirius"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "nirius"; rev = "nirius-${finalAttrs.version}"; - hash = "sha256-KAh45AcNB9Y4ahxamtI6/z3l1xg6yf17h4rnZl3w89I="; + hash = "sha256-e/3FOlA29u214gs8Y4Tvk+XJUhT5Bn4GLrptbqrDRw8="; }; - cargoHash = "sha256-p123QvlB/j0b5kFjICcTI/5ZKL8pzGfIvH80doAhqFA="; + cargoHash = "sha256-4tdPm4+ykEjGeYpQxR3M8Zh84VMDkkQXAaWlehunZ8c="; meta = { description = "Utility commands for the niri wayland compositor"; diff --git a/pkgs/by-name/ni/nix-heuristic-gc/package.nix b/pkgs/by-name/ni/nix-heuristic-gc/package.nix index 07a43fa9a1d7..4158c0d01421 100644 --- a/pkgs/by-name/ni/nix-heuristic-gc/package.nix +++ b/pkgs/by-name/ni/nix-heuristic-gc/package.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonPackage rec { # NIX_SYSTEM suggested at # https://github.com/NixOS/nixpkgs/issues/386184#issuecomment-2692433531 - NIX_SYSTEM = nixVersions.nixComponents_2_30.nix-store.stdenv.hostPlatform.system; + env.NIX_SYSTEM = nixVersions.nixComponents_2_30.nix-store.stdenv.hostPlatform.system; buildInputs = [ boost diff --git a/pkgs/by-name/ni/nix-weather/package.nix b/pkgs/by-name/ni/nix-weather/package.nix index 3f6aa492a66b..00f904a9144d 100644 --- a/pkgs/by-name/ni/nix-weather/package.nix +++ b/pkgs/by-name/ni/nix-weather/package.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; # This is where `build.rs` puts manpages - MAN_OUT = "./man"; + env.MAN_OUT = "./man"; postInstall = '' cd crates/nix-weather diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix index 95bebd4c0e40..339a85f4789c 100644 --- a/pkgs/by-name/ni/nix-web/package.nix +++ b/pkgs/by-name/ni/nix-web/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = cargoFlags; cargoTestFlags = cargoFlags; - NIX_WEB_BUILD_NIX_CLI_PATH = "${nixPackage}/bin/nix"; + env.NIX_WEB_BUILD_NIX_CLI_PATH = "${nixPackage}/bin/nix"; meta = { description = "Web interface for the Nix store"; diff --git a/pkgs/by-name/ni/nixos-init/src/env_generator.rs b/pkgs/by-name/ni/nixos-init/src/env_generator.rs index 69995b601e59..50fc1b22ea88 100644 --- a/pkgs/by-name/ni/nixos-init/src/env_generator.rs +++ b/pkgs/by-name/ni/nixos-init/src/env_generator.rs @@ -18,12 +18,23 @@ struct Config(HashMap); /// Reads the JSON config for the systemd generator environment and prints it in KEY=VALUE format /// to stdout. This makes the configured environment variables available for all systemd /// generators. +/// +/// In case of the PATH variable, it extends the PATH read from the environment with the one from +/// the config. fn env_generator_impl() -> Result<()> { let content = fs::read(CONFIG_PATH).with_context(|| format!("Failed to read {CONFIG_PATH}"))?; let config: Config = serde_json::from_slice(&content).context("Failed to parse config")?; let mut buffer = Vec::new(); - for (key, value) in config.0 { + for (key, mut value) in config.0 { + // If the config contains the PATH env variable, read the current PATH and extend it with + // the one from the config. + if key == "PATH" + && let Some(current_path) = std::env::var("PATH").ok() + { + value.push(':'); + value.push_str(¤t_path); + } writeln!(&mut buffer, "{key}=\"{value}\"").context("Failed to write to buffer")?; } diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index b3cea3b15d68..df6beac95412 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -143,7 +143,17 @@ def run_wrapper( env = os.environ | extra_env if sudo: sudo_args = shlex.split(os.getenv("NIX_SUDOOPTS", "")) - run_args = ["sudo", *sudo_args, *run_args] + # Using --preserve-env is less than ideal since it will cause + # the following warn during usage: + # > warning: $HOME ('/home/') is not owned by you, + # > falling back to the one defined in the 'passwd' file ('/root') + # However, right now it is the only way to guarantee the semantics + # expected for the commands, e.g. activation with systemd-run + # expects access to environment variables like LOCALE_ARCHIVE, + # NIXOS_NO_CHECK. + # For now, for anyone that the above warn bothers you, please + # use `sudo nixos-rebuild` instead of `--sudo` flag. + run_args = ["sudo", "--preserve-env", *sudo_args, *run_args] logger.debug( "calling run with args=%r, kwargs=%r, extra_env=%r", diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 5a9f61be1f25..b0ef88b2963e 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -487,6 +487,7 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: call( [ "sudo", + "--preserve-env", "nix-env", "-p", Path("/nix/var/nix/profiles/system"), @@ -504,6 +505,7 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None: call( [ "sudo", + "--preserve-env", *nr.nix.SWITCH_TO_CONFIGURATION_CMD_PREFIX, config_path / "bin/switch-to-configuration", "switch", diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py index b11e039adf60..a47ebe31f9bb 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py @@ -27,7 +27,7 @@ def test_run(mock_run: Any) -> None: extra_env={"FOO": "bar"}, ) mock_run.assert_called_with( - ["sudo", "test", "--with", "flags"], + ["sudo", "--preserve-env", "test", "--with", "flags"], check=False, text=True, errors="surrogateescape", @@ -164,14 +164,14 @@ def test_ssh_host() -> None: @patch("subprocess.run", autospec=True) def test_custom_sudo_args(mock_run: Any) -> None: - with patch.dict(p.os.environ, {"NIX_SUDOOPTS": "--custom sudo --args"}): + with patch.dict(p.os.environ, {"NIX_SUDOOPTS": "--custom foo --args"}): p.run_wrapper( ["test"], check=False, sudo=True, ) mock_run.assert_called_with( - ["sudo", "--custom", "sudo", "--args", "test"], + ["sudo", "--preserve-env", "--custom", "foo", "--args", "test"], check=False, env=None, input=None, diff --git a/pkgs/by-name/no/nomore403/package.nix b/pkgs/by-name/no/nomore403/package.nix index 5b29ac4b93fb..0e34e433ee9e 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.0.1"; + version = "1.1.8"; src = fetchFromGitHub { owner = "devploit"; repo = "nomore403"; - tag = finalAttrs.version; - hash = "sha256-qA1i8l2oBQQ5IF8ho3K2k+TAndUTFGwb2NfhyFqfKzU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-hbhVpk6Zn7FMbsNnUbHdE8Ox5EzpIeB78MBvudpkabI="; }; - vendorHash = "sha256-IGnTbuaQH8A6aKyahHMd2RyFRh4WxZ3Vx/A9V3uelRg="; + vendorHash = "sha256-17bXTAXntWlaT4nCrqovW/bowml6KUJDlgjq0b9jmWA="; ldflags = [ "-s" diff --git a/pkgs/by-name/no/nostui/package.nix b/pkgs/by-name/no/nostui/package.nix index ee987669e91e..d7a113a01d9b 100644 --- a/pkgs/by-name/no/nostui/package.nix +++ b/pkgs/by-name/no/nostui/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-7i76JPg6MAk4/sO8/JI4ody4iYFJPeLkD2SWncFhT4o="; }; - GIT_HASH = "000000000000000000000000000000000000000000000000000"; + env.GIT_HASH = "000000000000000000000000000000000000000000000000000"; checkFlags = [ # skip failing test due to nix build timestamps diff --git a/pkgs/by-name/ns/ns-3/package.nix b/pkgs/by-name/ns/ns-3/package.nix index ffeac414ee46..64f4beb62aa4 100644 --- a/pkgs/by-name/ns/ns-3/package.nix +++ b/pkgs/by-name/ns/ns-3/package.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { "build" + lib.optionalString enableDoxygen " doxygen" + lib.optionalString withManual "sphinx"; # to prevent fatal error: 'backward_warning.h' file not found - CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH"; + env.CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH"; # Make generated python bindings discoverable in customized python environment passthru = { diff --git a/pkgs/by-name/ns/nsis/package.nix b/pkgs/by-name/ns/nsis/package.nix index 172d5d0459a5..05e25a5ed97d 100644 --- a/pkgs/by-name/ns/nsis/package.nix +++ b/pkgs/by-name/ns/nsis/package.nix @@ -32,14 +32,16 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ scons ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - CPPPATH = symlinkJoin { - name = "nsis-includes"; - paths = [ zlib.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - }; + env = { + CPPPATH = symlinkJoin { + name = "nsis-includes"; + paths = [ zlib.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + }; - LIBPATH = symlinkJoin { - name = "nsis-libs"; - paths = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + LIBPATH = symlinkJoin { + name = "nsis-libs"; + paths = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + }; }; sconsFlags = [ diff --git a/pkgs/by-name/nu/nushell-plugin-bson/package.nix b/pkgs/by-name/nu/nushell-plugin-bson/package.nix index d0208edde789..df0ab8b9d969 100644 --- a/pkgs/by-name/nu/nushell-plugin-bson/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-bson/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { llvmPackages.libclang ]; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + env.LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; passthru.update-script = nix-update-script { }; meta = { diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index a55f6ca8e712..1cd5d65610a5 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -21,7 +21,6 @@ let mainProgram = "obsidian"; license = lib.licenses.obsidian; maintainers = with lib.maintainers; [ - atila conradmearns zaninime qbit diff --git a/pkgs/by-name/oi/oil-buku/package.nix b/pkgs/by-name/oi/oil-buku/package.nix index 34635a0fdcb8..d1249f4ce694 100644 --- a/pkgs/by-name/oi/oil-buku/package.nix +++ b/pkgs/by-name/oi/oil-buku/package.nix @@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation rec { description = "Search-as-you-type cli frontend for the buku bookmarks manager using peco"; homepage = "https://github.com/AndreiUlmeyda/oil"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ atila ]; + maintainers = [ ]; mainProgram = "oil"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 9ab7c89b2021..36624111cf6c 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -9,13 +9,13 @@ }: let pname = "open-webui"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-2n2JGgnWEGsWVLnkWc+RilTybt3KXah8UzUUPINxzfE="; + hash = "sha256-lakk5VB8zJCf011OqziWWyj4qfXNrw9PwB2Ol137F2U="; }; frontend = buildNpmPackage rec { @@ -32,7 +32,7 @@ let url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-gaf4+/H3nqgebPtxnEeUw2uw5xVh+FE6UFqD3mRjhv0="; + npmDepsHash = "sha256-0F7mlLcvDtbXUHkgiv2VYQyBdqCRyGC2d31MWgVwMKc="; # See https://github.com/open-webui/open-webui/issues/15880 npmFlags = [ diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index 01513613237b..a65e2ae4b94e 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitHub, unstableGitUpdater, nodejs, @@ -12,7 +12,7 @@ discord-development, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "openasar"; version = "0-unstable-2025-11-21"; diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix index 1933adc7c552..56b42254e725 100644 --- a/pkgs/by-name/op/opencloud/package.nix +++ b/pkgs/by-name/op/opencloud/package.nix @@ -28,13 +28,13 @@ let in buildGoModule (finalAttrs: { pname = "opencloud"; - version = "5.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "opencloud"; tag = "v${finalAttrs.version}"; - hash = "sha256-ncV7aPT56NNJawNLVuHfTlHMpXsW+3Rq/NEaTnoKz/c="; + hash = "sha256-LZoQKXHDHHNLmu7FflQMCFUPlGS8eG7kZr8dmFku8Sk="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix index b2d5a4a68660..586971f2073b 100644 --- a/pkgs/by-name/op/opencloud/web.nix +++ b/pkgs/by-name/op/opencloud/web.nix @@ -10,20 +10,20 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencloud-web"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZeIcWeKYa43dyhg8xXdx1vQTPOjqSRPqcoaBRtbnzRc="; + hash = "sha256-Xx/uDn4m7Uu+4GMNB9vqsT+CozXhEo+2YGRMaMrjldM="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 1; - hash = "sha256-KRoZOc61cklG2MflfHpCd9I5fOIuHPuiRR+w6sdRa2U="; + hash = "sha256-v2XOBO1/BWaJslj2Z2k9RanSS2CsW2Yx72o/lX7Eo2I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencode-desktop/package.nix b/pkgs/by-name/op/opencode-desktop/package.nix index eb81fc2913d3..8d9043bfe385 100644 --- a/pkgs/by-name/op/opencode-desktop/package.nix +++ b/pkgs/by-name/op/opencode-desktop/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ; cargoRoot = "packages/desktop/src-tauri"; - cargoHash = "sha256-Sfw/1380knqusED8OJcCn0D7erkX1sLtQq9m6Dd0v4Y="; + cargoHash = "sha256-6YOygSNNhAAD49ZkhWS03qGwVP2mvwItzJeyg0/ARLg="; buildAndTestSubdir = finalAttrs.cargoRoot; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index f231234be1ad..ecfba6332291 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -14,12 +14,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.2.5"; + version = "1.2.9"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-0Zr7705Ya9Aj6ZmwVL6t289JN4XwDYafgGA5cuYOJh4="; + hash = "sha256-MPr+bJ3GVuVf5P/wCHxg+fk3+4Aca4EaV5NVtshAhuk="; }; node_modules = stdenvNoCC.mkDerivation { @@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-hK7ad7tG60K0VARAlZJsSxKjiHU78XQYl/tbIReBusc="; + outputHash = "sha256-jxCPz0vSIuF/E6idil2eEH92sWuo+7bGEAhr4JrNWj0="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index f3b81bd51a94..ea6735f171dc 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -67,7 +67,7 @@ buildDotnetModule (finalAttrs: { buildInputs = finalAttrs.runtimeDeps; - OTD_CONFIGURATIONS = "${finalAttrs.src}/OpenTabletDriver.Configurations/Configurations"; + env.OTD_CONFIGURATIONS = "${finalAttrs.src}/OpenTabletDriver.Configurations/Configurations"; doCheck = true; testProjectFile = "OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj"; diff --git a/pkgs/by-name/op/openzwave/package.nix b/pkgs/by-name/op/openzwave/package.nix index 1d27e9bf8640..a593b6c93ed4 100644 --- a/pkgs/by-name/op/openzwave/package.nix +++ b/pkgs/by-name/op/openzwave/package.nix @@ -46,8 +46,10 @@ stdenv.mkDerivation { "PREFIX=${placeholder "out"}" ]; - FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; - FONTCONFIG_PATH = "${fontconfig.out}/etc/fonts/"; + env = { + FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + FONTCONFIG_PATH = "${fontconfig.out}/etc/fonts/"; + }; postPatch = '' substituteInPlace cpp/src/Options.cpp \ diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix index 69580d239a92..88675756c747 100644 --- a/pkgs/by-name/or/orbiton/package.nix +++ b/pkgs/by-name/or/orbiton/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.71.0"; + version = "2.72.1"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; tag = "v${version}"; - hash = "sha256-KJqHSl5ebCLl5kiAYkG1VeGEb/TZUuF/4fnslWA6KKY="; + hash = "sha256-tQufX7LIRrPDCid2lfKKEJjZHInVDRVmoCd1oYiSCfk="; }; vendorHash = null; diff --git a/pkgs/by-name/ou/outfly/package.nix b/pkgs/by-name/ou/outfly/package.nix index 100b5810e37d..28942b48e1ce 100644 --- a/pkgs/by-name/ou/outfly/package.nix +++ b/pkgs/by-name/ou/outfly/package.nix @@ -13,16 +13,17 @@ libxcursor, libx11, libxi, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "outfly"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromCodeberg { owner = "outfly"; repo = "outfly"; tag = "v${version}"; - hash = "sha256-FRvu3FgbT3i5888ll573nhb7naYx04Oi8nrcfgEHxUo="; + hash = "sha256-BOm5SxpWowq5LCTqRqDkbKGPnZo0pJYz8w3kB/WnH9M="; }; runtimeInputs = [ @@ -48,7 +49,7 @@ rustPlatform.buildRustPackage rec { --add-rpath ${lib.makeLibraryPath runtimeInputs} ''; - cargoHash = "sha256-5t6PPlfV/INqb4knz1Bv6dqw47RxUmVO0DSlQNUIQL4="; + cargoHash = "sha256-UXqS4JfKuLxeTW1MDMnKLzw8oHf1Gpgv8SktTtf12mc="; desktopItems = [ (makeDesktopItem { @@ -58,6 +59,8 @@ rustPlatform.buildRustPackage rec { categories = [ "Game" ]; }) ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Breathtaking 3D space game in the rings of Jupiter"; homepage = "https://yunicode.itch.io/outfly"; diff --git a/pkgs/by-name/p4/p4/package.nix b/pkgs/by-name/p4/p4/package.nix index 186fd7dfcaec..5e443e93a83a 100644 --- a/pkgs/by-name/p4/p4/package.nix +++ b/pkgs/by-name/p4/p4/package.nix @@ -39,10 +39,10 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { # Upstream replaces minor versions, so use archived URL. url = "https://web.archive.org/web/20240526153453id_/https://ftp.perforce.com/perforce/r24.1/bin.tools/p4source.tgz"; - sha256 = "sha256-6+DOJPeVzP4x0UsN9MlZRAyusapBTICX0BuyvVBQBC8="; + hash = "sha256-6+DOJPeVzP4x0UsN9MlZRAyusapBTICX0BuyvVBQBC8="; }; - postPatch = lib.optionals stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # same error as https://github.com/pocoproject/poco/issues/4586 substituteInPlace zlib/zutil.h \ --replace-fail '#if defined(MACOS) || defined(TARGET_OS_MAC)' '#if defined(MACOS)' @@ -79,26 +79,30 @@ stdenv.mkDerivation (finalAttrs: { "-sLIBC++DIR=${lib.getLib stdenv.cc.libcxx}/lib" ]; - CCFLAGS = - # The file contrib/optimizations/slide_hash_neon.h is missing from the - # upstream distribution. It comes from the Android/Chromium sources. - lib.optionals stdenv.hostPlatform.isAarch64 [ "-I${androidZlibContrib}" ]; + env = { + CCFLAGS = toString ( + # The file contrib/optimizations/slide_hash_neon.h is missing from the + # upstream distribution. It comes from the Android/Chromium sources. + lib.optionals stdenv.hostPlatform.isAarch64 [ "-I${androidZlibContrib}" ] + ); - "C++FLAGS" = - # Avoid a compilation error that only occurs for 4-byte longs. - lib.optionals stdenv.hostPlatform.isi686 [ "-Wno-narrowing" ] - # See the "Header dependency changes" section of - # https://www.gnu.org/software/gcc/gcc-11/porting_to.html for more - # information on why we need to include these. - ++ - lib.optionals - (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0.0")) - [ - "-include" - "limits" - "-include" - "thread" - ]; + "C++FLAGS" = toString ( + # Avoid a compilation error that only occurs for 4-byte longs. + lib.optionals stdenv.hostPlatform.isi686 [ "-Wno-narrowing" ] + # See the "Header dependency changes" section of + # https://www.gnu.org/software/gcc/gcc-11/porting_to.html for more + # information on why we need to include these. + ++ + lib.optionals + (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0.0")) + [ + "-include" + "limits" + "-include" + "thread" + ] + ); + }; preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' export MACOSX_SDK=$SDKROOT diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix index f9a9f1d4914e..64b5a12279f0 100644 --- a/pkgs/by-name/pa/pacu/package.nix +++ b/pkgs/by-name/pa/pacu/package.nix @@ -13,14 +13,14 @@ let in python.pkgs.buildPythonApplication (finalAttrs: { pname = "pacu"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; src = fetchFromGitHub { owner = "RhinoSecurityLabs"; repo = "pacu"; tag = "v${finalAttrs.version}"; - hash = "sha256-Td5H4O6/7Gh/rvP191xjCJmIbyc4ezZC5Fh4FZ39ZUM="; + hash = "sha256-Hrks6mvvmmdCMxprB/SPlkfcSu6uyoEVtb0eUD3CALo="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/pa/paho-mqtt-c/package.nix b/pkgs/by-name/pa/paho-mqtt-c/package.nix index 8136333668bb..4deba05b29ff 100644 --- a/pkgs/by-name/pa/paho-mqtt-c/package.nix +++ b/pkgs/by-name/pa/paho-mqtt-c/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "paho.mqtt.c"; - version = "1.3.15"; + version = "1.3.16"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.c"; tag = "v${finalAttrs.version}"; - hash = "sha256-ULoqeed6Bm8wp1sUIL3Lk6oMm7DF3LzhHOcFO6gpB9c="; + hash = "sha256-ETSx3dvGP9Kjf7v8zglnUvMK6nOcgUnryJ5QUVvEgT4="; }; postPatch = '' diff --git a/pkgs/by-name/pa/pango/package.nix b/pkgs/by-name/pa/pango/package.nix index 0f6edca0299a..964396c84070 100644 --- a/pkgs/by-name/pa/pango/package.nix +++ b/pkgs/by-name/pa/pango/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # Fontconfig error: Cannot load default config file - FONTCONFIG_FILE = makeFontsConf { + env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix index cdc313662455..2cece2e2e8c0 100644 --- a/pkgs/by-name/pa/paretosecurity/package.nix +++ b/pkgs/by-name/pa/paretosecurity/package.nix @@ -17,13 +17,13 @@ buildGoModule (finalAttrs: { webkitgtk_4_1 ]; pname = "paretosecurity"; - version = "0.3.14"; + version = "0.3.15"; src = fetchFromGitHub { owner = "ParetoSecurity"; repo = "agent"; rev = finalAttrs.version; - hash = "sha256-Exl1PGTf1i5DKDcU5XOwYE6rEbrD+1wPnjB4rcz3lhA="; + hash = "sha256-2oGDxnbxuyAMWjEUFKzwYz72/FYUbUZHSFoZk2pMfeY="; }; vendorHash = "sha256-jAcUf4VjtKB/Q2wHOVnCgcmPp5XNMqV8Ei9kpWoGO4Q="; diff --git a/pkgs/by-name/pa/parseable/package.nix b/pkgs/by-name/pa/parseable/package.nix index b9ad8934f384..e69eb7bdd8e1 100644 --- a/pkgs/by-name/pa/parseable/package.nix +++ b/pkgs/by-name/pa/parseable/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-Asb6064TqvL9kNkWBMj4Z+1j1yIM+iBWsN+R5EuMOVA="; }; - LOCAL_ASSETS_PATH = fetchzip { + env.LOCAL_ASSETS_PATH = fetchzip { url = "https://parseable-prism-build.s3.us-east-2.amazonaws.com/v${finalAttrs.version}/build.zip"; hash = "sha256-gWzfucetsJJSSjI9nGm7I8xLo0t1VKb4AertiEGuLWA="; }; diff --git a/pkgs/by-name/pc/pcmciaUtils/package.nix b/pkgs/by-name/pc/pcmciautils/package.nix similarity index 86% rename from pkgs/by-name/pc/pcmciaUtils/package.nix rename to pkgs/by-name/pc/pcmciautils/package.nix index 9bdd4c1ecc11..4d6f8f0287da 100644 --- a/pkgs/by-name/pc/pcmciaUtils/package.nix +++ b/pkgs/by-name/pc/pcmciautils/package.nix @@ -9,8 +9,9 @@ kmod, udev, udevCheckHook, - firmware ? config.pcmciaUtils.firmware or [ ], # Special pcmcia cards. - configOpts ? config.pcmciaUtils.config or null, # Special hardware (map memory & port & irq) + # config.pcmciaUtils as backwards compat for renamed package + firmware ? config.pcmcia-utils.firmware or config.pcmciaUtils.firmware or [ ], # Special pcmcia cards. + configOpts ? config.pcmcia-utils.config or config.pcmciaUtils.config or null, # Special hardware (map memory & port & irq) }: # used to generate postInstall script. # FIXME: should add an option to choose between hotplug and udev. diff --git a/pkgs/by-name/pd/pdfslicer/package.nix b/pkgs/by-name/pd/pdfslicer/package.nix index b2834f28cdcf..de9635d0b3bb 100644 --- a/pkgs/by-name/pd/pdfslicer/package.nix +++ b/pkgs/by-name/pd/pdfslicer/package.nix @@ -56,9 +56,10 @@ stdenv.mkDerivation (finalAttrs: { qpdf ]; - CXXFLAGS = + env = lib.optionalAttrs (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "13") { # Pending upstream compatibility with GCC 13 - lib.optional (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "13") "-Wno-changes-meaning"; + CXXFLAGS = "-Wno-changes-meaning"; + }; meta = { description = "Simple application to extract, merge, rotate and reorder pages of PDF documents"; diff --git a/pkgs/by-name/pf/pfsshell/package.nix b/pkgs/by-name/pf/pfsshell/package.nix index 88373f689c6f..b1356ef647af 100644 --- a/pkgs/by-name/pf/pfsshell/package.nix +++ b/pkgs/by-name/pf/pfsshell/package.nix @@ -1,30 +1,34 @@ { + cmake, lib, stdenv, fetchFromGitHub, + fuse, meson, ninja, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { - version = "1.1.1"; + version = "1.1.1-unstable-2025-07-13"; pname = "pfsshell"; src = fetchFromGitHub { - owner = "uyjulian"; + owner = "ps2homebrew"; repo = "pfsshell"; - rev = "v${finalAttrs.version}"; - sha256 = "0cr91al3knsbfim75rzl7rxdsglcc144x0nizn7q4jx5cad3zbn8"; + rev = "8192de3907a05bb1844afcb1ae490179a38d4ed6"; + fetchSubmodules = true; + hash = "sha256-drQNnCIqwM+Lnix5LewkD2ov8G6Mbu60xVKQKvCFbPY="; }; nativeBuildInputs = [ + fuse meson ninja + pkg-config ]; - # Build errors since 1.1.1 when format hardening is enabled: - # cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] - hardeningDisable = [ "format" ]; + mesonFlags = [ (lib.mesonBool "enable_pfsfuse" true) ]; meta = { inherit (finalAttrs.src.meta) homepage; diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix index e92b8944672f..c3e61ebf5450 100644 --- a/pkgs/by-name/pg/pgdog/package.nix +++ b/pkgs/by-name/pg/pgdog/package.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: { pname = "pgdog"; - version = "0.1.29"; + version = "0.1.30"; src = fetchFromGitHub { owner = "pgdogdev"; repo = "pgdog"; tag = "v${finalAttrs.version}"; - hash = "sha256-8aFBb+bkdht0aQmqSwEy266rQM3iuE2vpqgtZzbhszU="; + hash = "sha256-oobSNeafVWwYmvYs4REV7RuqVMIob3JruMjgN/wzNFA="; }; - cargoHash = "sha256-IjVVHDHm7qe0w8HvsmZb7u830EFXZDcYmlpqpqjLzSk="; + cargoHash = "sha256-Cm/wJtNwHuJklk8b39Fk+SzxWjGE2qGcJD/ekydcBxE="; # Hardcoded paths for C compiler and linker postPatch = '' diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index 0c6df2b3eea4..1d2b4e70e8d2 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "photoqt"; - version = "5.1"; + version = "5.2"; src = fetchurl { url = "https://photoqt.org/downloads/source/photoqt-${finalAttrs.version}.tar.gz"; - hash = "sha256-GQT0JDuhrtQh9u5R2DBIlYWEHsSJ8cvDp3+0s6I0iHY="; + hash = "sha256-ufgDXKN7LY8Uy0uwL+QKvjH3O/F1EIAx2MPYYS1/els="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index bab902f14162..cc3805e0adc1 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "13.0.2"; + version = "13.0.5"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; tag = finalAttrs.version; - hash = "sha256-xNSw4gG0KrnyCplDvZNJeHyg6CTWli7rEA4JzZCcvFo="; + hash = "sha256-AHrVwRe0uMBZwHqCYkbRTkyO8tqsZs7w2BveX89Mlb8="; }; - vendorHash = "sha256-McdSiXpJHOURYvaiJXOcW03h/7SeBwDVx0EPbLAInvk="; + vendorHash = "sha256-Et/HsW56GhFwHNyXtcBOL0D39A2Rv1vPnxOZhhEM278="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pi/pick/package.nix b/pkgs/by-name/pi/pick/package.nix index b6e8d6390302..aa00357abe68 100644 --- a/pkgs/by-name/pi/pick/package.nix +++ b/pkgs/by-name/pi/pick/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ ncurses ]; - PREFIX = placeholder "out"; + env.PREFIX = placeholder "out"; meta = { inherit (finalAttrs.src.meta) homepage; diff --git a/pkgs/by-name/pi/pinta/deps.json b/pkgs/by-name/pi/pinta/deps.json index c3f40bcc9293..35e933ae1875 100644 --- a/pkgs/by-name/pi/pinta/deps.json +++ b/pkgs/by-name/pi/pinta/deps.json @@ -1,78 +1,78 @@ [ { "pname": "GirCore.Adw-1", - "version": "0.6.3", - "hash": "sha256-wV4zTybD7yJldzQORBK2iI/77Fv3C9kjZvtj/S6v48k=" + "version": "0.7.0", + "hash": "sha256-7bnrJnNJJLiz5dGMX2pACJbmMoAaqQdN3ZGePZq/Z54=" }, { "pname": "GirCore.Cairo-1.0", - "version": "0.6.3", - "hash": "sha256-IJLzVmWkuCzdyiIqlzXyl8/ZDC6hmnh/bf4+i2HOpLw=" + "version": "0.7.0", + "hash": "sha256-w8Uh7RQXphqsXT/5POMgMpVO0u0vNtGL+Tu043jKptc=" }, { "pname": "GirCore.FreeType2-2.0", - "version": "0.6.3", - "hash": "sha256-CsH4zQkZukyVw653sphDf5eveuvzY3HVphoO6fvjZiA=" + "version": "0.7.0", + "hash": "sha256-UHfYBDyrliB32VF/SJ+KsLx8ZCBVDKAwfhcLRaqxfv4=" }, { "pname": "GirCore.Gdk-4.0", - "version": "0.6.3", - "hash": "sha256-3R7ikDBuQJ1iaVb8yuewdLggZ1IVecLuhmjaw1Hzm0s=" + "version": "0.7.0", + "hash": "sha256-lPipLMR86A3QvYH6OzxKGj29Vn8lpHM/MRtpKyUgVRA=" }, { "pname": "GirCore.GdkPixbuf-2.0", - "version": "0.6.3", - "hash": "sha256-HZr3YmNLumXTGIN2CvxYZS9mHzvOvpMhUVJ1/DJlWN4=" + "version": "0.7.0", + "hash": "sha256-dS4ZmahrGO/2Poin7PltVt4JXpW7mKnKwj1fQPGBpVc=" }, { "pname": "GirCore.Gio-2.0", - "version": "0.6.3", - "hash": "sha256-pYc13vCSAH9Or7plQYffBzB/9b83oPNRBf5+HDeT/7w=" + "version": "0.7.0", + "hash": "sha256-nktBWddrIwA+4Ibjc/IMWnCi/OL3bMp7UGMRAUEF9r0=" }, { "pname": "GirCore.GLib-2.0", - "version": "0.6.3", - "hash": "sha256-Lsl44qroh+ENO7yBFoySrNgxs8FBeT0nH6PKJ5u+LAI=" + "version": "0.7.0", + "hash": "sha256-u3jwn7fQONG4M4i4gX6glR1zKn2JNI05QieFf1Gsays=" }, { "pname": "GirCore.GObject-2.0", - "version": "0.6.3", - "hash": "sha256-+gerXQbv8HNcFjA76AvtzAG3d+CRb7pPYDaAL+iUPz4=" + "version": "0.7.0", + "hash": "sha256-bmCHh0NyjG8YumCCI2zR8lrb6lhD6uF3MsA9tE1aWIA=" }, { "pname": "GirCore.GObject-2.0.Integration", - "version": "0.6.3", - "hash": "sha256-ujkhIzrqeKOcwdwjgzMh3eTcZ2N5PfgvItfyNj7Kc3s=" + "version": "0.7.0", + "hash": "sha256-kDLz5+dEtGxqmkNV42wqjX3mRAiBO1PFLtBDwjpBKCU=" }, { "pname": "GirCore.Graphene-1.0", - "version": "0.6.3", - "hash": "sha256-+pDFEj94WNbXD7Fso1xuxkkETjej/O/d1JNW8eV6UPA=" + "version": "0.7.0", + "hash": "sha256-onPgy8jEf8LRL/xaG+t7OFfXEg5LraGQruLRSBR0K28=" }, { "pname": "GirCore.Gsk-4.0", - "version": "0.6.3", - "hash": "sha256-vV66rP1vVloB+DA1xPL2iSrJwEmdUDdl209RcRpNP9Q=" + "version": "0.7.0", + "hash": "sha256-lDvFt1HIVNekOjChHw4JkfjHBQas9qxp5KuQxPApctM=" }, { "pname": "GirCore.Gtk-4.0", - "version": "0.6.3", - "hash": "sha256-unQkwxnaoIihD+FWKnJgJNAR4i99qcTcN78SG8WhrZk=" + "version": "0.7.0", + "hash": "sha256-PFkomZCs+gPQbNF0WYGskIJT7kkMypBL5zjeZL7+Lwg=" }, { "pname": "GirCore.HarfBuzz-0.0", - "version": "0.6.3", - "hash": "sha256-8I7+SMTeXBNe6Q/rE7R6WiAYRPuLjfSeDjwllP/n9tM=" + "version": "0.7.0", + "hash": "sha256-tUEqdvad1bqtpuXwkOmzRg2WdxwqUA//69OGFN7oOXQ=" }, { "pname": "GirCore.Pango-1.0", - "version": "0.6.3", - "hash": "sha256-4qPtnqcd1gjt/bz6vyq7L4iA8TyDYTlqkkDD6H150Hs=" + "version": "0.7.0", + "hash": "sha256-rAGq1CAOl0k3l2BN/b6r6Q0Upq6GHGAM8P42eYabgLQ=" }, { "pname": "GirCore.PangoCairo-1.0", - "version": "0.6.3", - "hash": "sha256-O8SVg5F8OBazisAwxDB66zlup2hB6hvmO7ubdpSJXpI=" + "version": "0.7.0", + "hash": "sha256-d3RbSDFmB8UosYsQGzhHFBCZ5hcPtIpdmQcylYVSLe4=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", @@ -436,8 +436,8 @@ }, { "pname": "System.CommandLine", - "version": "2.0.0-beta4.22272.1", - "hash": "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc=" + "version": "2.0.1", + "hash": "sha256-NDBiPUt/ZZIMBcLHpF/6IMX/UpfsC/XnH3p4i4MHCFw=" }, { "pname": "System.Diagnostics.Debug", @@ -726,7 +726,7 @@ }, { "pname": "Tmds.DBus", - "version": "0.21.2", - "hash": "sha256-1rxUexOuj0raH8FvvUKeGdcWr3u8KmuAySe/4isy6S0=" + "version": "0.22.0", + "hash": "sha256-rrI1KUW9CTWEZOPJA2aoe+6hSvyOFoqP+vl6lyaZtuI=" } ] diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index 0b25513580cb..520044178312 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, glibcLocales, gtk4, + glib, intltool, libadwaita, wrapGAppsHook4, @@ -12,13 +13,13 @@ buildDotnetModule rec { pname = "Pinta"; - version = "3.0.5"; + version = "3.1.1"; src = fetchFromGitHub { owner = "PintaProject"; repo = "Pinta"; rev = version; - hash = "sha256-teBk3+t0iFaqOh0Bzpz6mAlQ/reEd84wZSVXnYIXAio="; + hash = "sha256-ZlsXba1ppdAQeZW1ihrEu+deA0o6gZJk50wxJuW95Dk="; }; nativeBuildInputs = [ @@ -28,6 +29,7 @@ buildDotnetModule rec { runtimeDeps = [ gtk4 + glib libadwaita ]; @@ -52,8 +54,8 @@ buildDotnetModule rec { # TODO: use upstream build system postBuild = '' # Substitute translation placeholders - intltool-merge -x po/ xdg/pinta.appdata.xml.in xdg/pinta.appdata.xml - intltool-merge -d po/ xdg/pinta.desktop.in xdg/pinta.desktop + intltool-merge -x po/ xdg/com.github.PintaProject.Pinta.metainfo.xml.in xdg/com.github.PintaProject.Pinta.metainfo.xml + intltool-merge -d po/ xdg/com.github.PintaProject.Pinta.desktop.in xdg/com.github.PintaProject.Pinta.desktop # Build translations dotnet build Pinta \ diff --git a/pkgs/by-name/pi/pixieditor/deps.json b/pkgs/by-name/pi/pixieditor/deps.json index e9fa64d94cb5..24900dfa0d0f 100644 --- a/pkgs/by-name/pi/pixieditor/deps.json +++ b/pkgs/by-name/pi/pixieditor/deps.json @@ -249,6 +249,11 @@ "version": "6.9.0", "hash": "sha256-MwPAPFD/gs9WZ8gB5BQMEwYswd3EEIpLlvMN5vmz1Wc=" }, + { + "pname": "DeviceId.Mac", + "version": "6.9.0", + "hash": "sha256-bQ59eaeDGRgk4ow7bk7U9yEnJgiV2Ok9U3fbBIOdRVw=" + }, { "pname": "DiscordRichPresence", "version": "1.3.0.28", diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix index 7221d9d3564d..ffd013ab9fb1 100644 --- a/pkgs/by-name/pi/pixieditor/package.nix +++ b/pkgs/by-name/pi/pixieditor/package.nix @@ -23,6 +23,7 @@ makeDesktopItem, copyDesktopItems, + desktopToDarwinBundle, nix-update-script, }: @@ -70,6 +71,9 @@ buildDotnetModule (finalAttrs: { nativeBuildInputs = [ copyDesktopItems + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle ]; buildInputs = [ @@ -85,15 +89,20 @@ buildDotnetModule (finalAttrs: { dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; - dotnetFlags = - lib.optionals stdenv.hostPlatform.isx86_64 [ "-p:Runtimeidentifier=linux-x64" ] - ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-p:Runtimeidentifier=linux-arm64" ]; + dotnetFlags = [ + "-p:RuntimeIdentifier=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" + ]; buildType = "ReleaseNoUpdate"; projectFile = [ "src/PixiEditor.Desktop/PixiEditor.Desktop.csproj" "src/PixiEditor/PixiEditor.csproj" - "src/PixiEditor.Linux/PixiEditor.Linux.csproj" + ( + if stdenv.hostPlatform.isLinux then + "src/PixiEditor.Linux/PixiEditor.Linux.csproj" + else + "src/PixiEditor.MacOs/PixiEditor.MacOs.csproj" + ) "src/PixiEditor.Platform.Standalone/PixiEditor.Platform.Standalone.csproj" ]; executables = [ "PixiEditor.Desktop" ]; @@ -183,6 +192,8 @@ buildDotnetModule (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" ]; }; }) diff --git a/pkgs/by-name/pm/pmacct/package.nix b/pkgs/by-name/pm/pmacct/package.nix index 491735246210..e58d1558dd26 100644 --- a/pkgs/by-name/pm/pmacct/package.nix +++ b/pkgs/by-name/pm/pmacct/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional gnutlsSupport gnutls; - MYSQL_CONFIG = lib.optionalString withMysql "${lib.getDev libmysqlclient}/bin/mysql_config"; + env.MYSQL_CONFIG = lib.optionalString withMysql "${lib.getDev libmysqlclient}/bin/mysql_config"; configureFlags = [ "--with-pcap-includes=${libpcap}/include" diff --git a/pkgs/by-name/po/poco/package.nix b/pkgs/by-name/po/poco/package.nix index 3d6dd586095f..fd6eb26914f9 100644 --- a/pkgs/by-name/po/poco/package.nix +++ b/pkgs/by-name/po/poco/package.nix @@ -52,8 +52,10 @@ stdenv.mkDerivation rec { "dev" ]; - MYSQL_DIR = libmysqlclient; - MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql"; + env = { + MYSQL_DIR = libmysqlclient; + MYSQL_INCLUDE_DIR = "${env.MYSQL_DIR}/include/mysql"; + }; cmakeFlags = let diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index 2786cd00360b..3ff7d7425ec6 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { ./system-defaults-dir.patch ]; - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/po/pony-corral/package.nix b/pkgs/by-name/po/pony-corral/package.nix index 99abd5f40b33..1ee6b5310d74 100644 --- a/pkgs/by-name/po/pony-corral/package.nix +++ b/pkgs/by-name/po/pony-corral/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corral"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ponylang"; repo = "corral"; rev = finalAttrs.version; - hash = "sha256-zbOlk92oyy17VyUalYnUZPxAO+8wjRMCqcwLx0lLL1g="; + hash = "sha256-pJ6/+PYxMpJcj1e9v2Al8vIWFizJnLMIw7LlVU9ogS0="; }; strictDeps = true; diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix index c59118e77735..b676a3576041 100644 --- a/pkgs/by-name/po/postfix-tlspol/package.nix +++ b/pkgs/by-name/po/postfix-tlspol/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "postfix-tlspol"; - version = "1.8.25"; + version = "1.8.26"; src = fetchFromGitHub { owner = "Zuplu"; repo = "postfix-tlspol"; tag = "v${finalAttrs.version}"; - hash = "sha256-33kIgPQT/AXP+ZjBKcO+Ulzcxa5FbD4+Y3QHoHnzu10="; + hash = "sha256-H8T/AsAsynLlGcAyx/2aH2ZRZOKrgzMav9E4kJnDXBY="; }; vendorHash = null; diff --git a/pkgs/by-name/pr/pragha/package.nix b/pkgs/by-name/pr/pragha/package.nix index e4d45b2e43c1..c6acc17d9575 100644 --- a/pkgs/by-name/pr/pragha/package.nix +++ b/pkgs/by-name/pr/pragha/package.nix @@ -103,9 +103,10 @@ stdenv.mkDerivation (finalAttrs: { # ++ lib.optional withRygel rygel ; - CFLAGS = [ "-DHAVE_PARANOIA_NEW_INCLUDES" ]; - - env.NIX_CFLAGS_COMPILE = "-I${lib.getDev gst_all_1.gst-plugins-base}/include/gstreamer-1.0"; + env = { + CFLAGS = toString [ "-DHAVE_PARANOIA_NEW_INCLUDES" ]; + NIX_CFLAGS_COMPILE = "-I${lib.getDev gst_all_1.gst-plugins-base}/include/gstreamer-1.0"; + }; postInstall = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") diff --git a/pkgs/by-name/pr/primusLib/package.nix b/pkgs/by-name/pr/primus-lib/package.nix similarity index 100% rename from pkgs/by-name/pr/primusLib/package.nix rename to pkgs/by-name/pr/primus-lib/package.nix diff --git a/pkgs/by-name/pr/primus/package.nix b/pkgs/by-name/pr/primus/package.nix index cb1a886ea962..0f4293694c87 100644 --- a/pkgs/by-name/pr/primus/package.nix +++ b/pkgs/by-name/pr/primus/package.nix @@ -7,29 +7,29 @@ stdenv, pkgsi686Linux, lib, - primusLib, + primus-lib, writeScriptBin, runtimeShell, - primusLib_i686 ? - if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.primusLib else null, + primus-lib_i686 ? + if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.primus-lib else null, useNvidia ? true, }: let # We override stdenv in case we need different ABI for libGL - primusLib_ = primusLib.override { inherit stdenv; }; - primusLib_i686_ = primusLib_i686.override { stdenv = pkgsi686Linux.stdenv; }; + primus-lib_ = primus-lib.override { inherit stdenv; }; + primus-lib_i686_ = primus-lib_i686.override { stdenv = pkgsi686Linux.stdenv; }; - primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; }; + primus = if useNvidia then primus-lib_ else primus-lib_.override { nvidia_x11 = null; }; primus_i686 = - if useNvidia then primusLib_i686_ else primusLib_i686_.override { nvidia_x11 = null; }; + if useNvidia then primus-lib_i686_ else primus-lib_i686_.override { nvidia_x11 = null; }; ldPath = lib.makeLibraryPath ( lib.filter (x: x != null) ( [ primus primus.glvnd ] - ++ lib.optionals (primusLib_i686 != null) [ + ++ lib.optionals (primus-lib_i686 != null) [ primus_i686 primus_i686.glvnd ] diff --git a/pkgs/by-name/pr/prisma-engines_7/package.nix b/pkgs/by-name/pr/prisma-engines_7/package.nix index 39b5444528b9..44caa13976ca 100644 --- a/pkgs/by-name/pr/prisma-engines_7/package.nix +++ b/pkgs/by-name/pr/prisma-engines_7/package.nix @@ -11,19 +11,19 @@ # function correctly. rustPlatform.buildRustPackage (finalAttrs: { pname = "prisma-engines_7"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; tag = finalAttrs.version; - hash = "sha256-1CwpUtNuqxGNjBmmmo/Aet8XrmnCQfDToI7vZaNupDI="; + hash = "sha256-a4skrL5r6tfFMMD+yikm5wgkiAOXom6FC5fuAYPzT5I="; }; - cargoHash = "sha256-U5d/HkuWnD/XSrAJr5AYh+WPVGDOcK/e4sC0udPZoyU="; + cargoHash = "sha256-DkuqGzcHHqW3u6ZVz6xCJjeF+l8Y44pYMNaeFjb7vIc="; # Use system openssl. - OPENSSL_NO_VENDOR = 1; + env.OPENSSL_NO_VENDOR = 1; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pr/prisma_6/package.nix b/pkgs/by-name/pr/prisma_6/package.nix index 6dbd49fde35e..bf2ac5b5fc27 100644 --- a/pkgs/by-name/pr/prisma_6/package.nix +++ b/pkgs/by-name/pr/prisma_6/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { # Fetch CLI workspace dependencies deps_json=$(pnpm list --filter ./packages/cli --prod --depth Infinity --json) - deps=$(jq -r '[del(.. | .unsavedDependencies?) | .. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json") + deps=$(jq -r '[.. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json") # Remove unnecessary external dependencies find . -name node_modules -type d -prune -exec rm -rf {} + diff --git a/pkgs/by-name/pr/prisma_7/package.nix b/pkgs/by-name/pr/prisma_7/package.nix index 93fc219f2092..f4b2320fa0c5 100644 --- a/pkgs/by-name/pr/prisma_7/package.nix +++ b/pkgs/by-name/pr/prisma_7/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "prisma_7"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma"; tag = finalAttrs.version; - hash = "sha256-oDfb/RwSa63ErWHF86q5xPPUUsRUV2DwNHARTV5gxyk="; + hash = "sha256-X3tLHUJ+tSjo4DPgmo43KMXHPP5BZK14kCj7sBgjPu8="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-HZsrHYUh4nxUgwVbmJ+fV4/OZvEWDKkD4CT8hIt1SRY="; + hash = "sha256-HkEoPY0rrRZL53EI1NupnWnCMvtcViSVA2GIiwBr8wo="; }; patchPhase = '' @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { # Fetch CLI workspace dependencies deps_json=$(pnpm list --filter ./packages/cli --prod --depth Infinity --json) - deps=$(jq -r '[del(.. | .unsavedDependencies?) | .. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json") + deps=$(jq -r '[.. | strings | select(startswith("link:../")) | sub("^link:../"; "")] | unique[]' <<< "$deps_json") # Remove unnecessary external dependencies find . -name node_modules -type d -prune -exec rm -rf {} + diff --git a/pkgs/by-name/pr/professor/package.nix b/pkgs/by-name/pr/professor/package.nix index 3c9765514cb0..63221b12a055 100644 --- a/pkgs/by-name/pr/professor/package.nix +++ b/pkgs/by-name/pr/professor/package.nix @@ -49,8 +49,10 @@ stdenv.mkDerivation { yoda ]; - CPPFLAGS = [ "-I${eigen}/include/eigen3" ]; - PREFIX = placeholder "out"; + env = { + CPPFLAGS = toString [ "-I${eigen}/include/eigen3" ]; + PREFIX = placeholder "out"; + }; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/by-name/pr/proj/package.nix b/pkgs/by-name/pr/proj/package.nix index 610fcb26d9bf..7c2529f008fe 100644 --- a/pkgs/by-name/pr/proj/package.nix +++ b/pkgs/by-name/pr/proj/package.nix @@ -59,9 +59,11 @@ stdenv.mkDerivation (finalAttrs: { "-DNLOHMANN_JSON_ORIGIN=external" "-DEXE_SQLITE3=${buildPackages.sqlite}/bin/sqlite3" ]; - CXXFLAGS = [ + + env.CXXFLAGS = toString [ # GCC 13: error: 'int64_t' in namespace 'std' does not name a type - "-include cstdint" + "-include" + "cstdint" ]; preCheck = diff --git a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix index 5016e1ae3b7e..ea877b581c35 100644 --- a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix @@ -19,7 +19,7 @@ buildGoModule rec { hash = "sha256-NafQWP1NxHTwmOND8ovy3oVia7qq0rCwZYE3VNlMBKQ="; }; - CGO_LDFLAGS = "-ldcgm"; + env.CGO_LDFLAGS = "-ldcgm"; buildInputs = [ dcgm diff --git a/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix b/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix index 12ed985a6260..3ae9843f851a 100644 --- a/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix @@ -38,7 +38,7 @@ buildGoModule.override { stdenv = clangStdenv; } (finalAttrs: { libz ]; - CGO_LDFLAGS = "-l bpf"; + env.CGO_LDFLAGS = "-l bpf"; hardeningDisable = [ "zerocallusedregs" ]; diff --git a/pkgs/by-name/pr/protoc-gen-grpc-java/data.nix b/pkgs/by-name/pr/protoc-gen-grpc-java/data.nix index b2a3a038ec1b..aa05c32a18ca 100644 --- a/pkgs/by-name/pr/protoc-gen-grpc-java/data.nix +++ b/pkgs/by-name/pr/protoc-gen-grpc-java/data.nix @@ -1,14 +1,14 @@ { - version = "1.78.0"; + version = "1.79.0"; hashes = { - linux-aarch_64 = "sha256-yVyvCriifgHlP4z/jolH9qiEGvqjV/pLBnm0r0VzGIY="; - linux-ppcle_64 = "sha256-wD7g3cHI1rXb6RQemW7/D9w6qF3om09wckNToYHa1BU="; - linux-s390_64 = "sha256-Dubkn+X+3fYOy+SeW6V5QxSqPizGPZBoXSSlqHun56k="; - linux-x86_32 = "sha256-ALYeBWy/IjhmFOG0Llj5luCOtSYBKtgIsjdDKcIP6v8="; - linux-x86_64 = "sha256-wC3U11e2eUByoWdcKp8jJjG2TD1TwewZ7/sFBIWagv8="; - osx-aarch_64 = "sha256-sHInlUATIKcRMDlfGj2KZTS3MRAIzOjXj4y3zhdtqiY="; - osx-x86_64 = "sha256-sHInlUATIKcRMDlfGj2KZTS3MRAIzOjXj4y3zhdtqiY="; - windows-x86_32 = "sha256-bIUQUaveyBKreBwBFr9o3RtyQr3cb+/TfbGxp8WyuPg="; - windows-x86_64 = "sha256-DHxx0rr2wfxfpRQlJ39BdI7kCUmO8rTX3JHvGKdSAeA="; + linux-aarch_64 = "sha256-RFuSS6TT9Vq9ZR9xAX1ZJVK+cGs5GK8NeDe3BGgTdHM="; + linux-ppcle_64 = "sha256-YecCAFYMSLpHMbeQed97Ckz+OUr0UJJR3PILRgV8le8="; + linux-s390_64 = "sha256-CS2U2by6/6D97C6JR6qBW6ho3azKrnwGTjhaI0r7nSI="; + linux-x86_32 = "sha256-pRfe/Sd5X1oTY4m+zxYHA6UJT/DvGUKwmtlER46UjCg="; + linux-x86_64 = "sha256-PRa3CxiFSYiynEHiDQbKM1jEcAjtueaYa5JsW8p5CBY="; + osx-aarch_64 = "sha256-ew3L4svALrrwPlcespX0PAuj2Rm12ej+NAFYRsmIcok="; + osx-x86_64 = "sha256-ew3L4svALrrwPlcespX0PAuj2Rm12ej+NAFYRsmIcok="; + windows-x86_32 = "sha256-K2ypGzXYmW0frvyjzqKHS1zHY3EswYMAjfu40TFfIXw="; + windows-x86_64 = "sha256-N6BMw6NWgL8XugjonWlNKS8Cjm97ok70tb2KHEP6LlI="; }; } diff --git a/pkgs/by-name/pr/protoc-gen-js/package.nix b/pkgs/by-name/pr/protoc-gen-js/package.nix index 57ede878199f..324ad5d431b2 100644 --- a/pkgs/by-name/pr/protoc-gen-js/package.nix +++ b/pkgs/by-name/pr/protoc-gen-js/package.nix @@ -40,7 +40,9 @@ buildBazelPackage' rec { removeRulesCC = false; removeLocalConfigCC = false; - LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool"; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + LIBTOOL = "${cctools}/bin/libtool"; + }; fetchAttrs = { preInstall = '' diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix index 885bf4d5de3d..373a1bab4b58 100644 --- a/pkgs/by-name/pr/proxysql/package.nix +++ b/pkgs/by-name/pr/proxysql/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - GIT_VERSION = finalAttrs.version; + env.GIT_VERSION = finalAttrs.version; dontConfigure = true; diff --git a/pkgs/by-name/ps/pspp/package.nix b/pkgs/by-name/ps/pspp/package.nix index 3ef4dbbe2423..bb720dc07489 100644 --- a/pkgs/by-name/ps/pspp/package.nix +++ b/pkgs/by-name/ps/pspp/package.nix @@ -55,9 +55,11 @@ stdenv.mkDerivation rec { iconv ]; - C_INCLUDE_PATH = - "${libxml2.dev}/include/libxml2/:" + lib.makeSearchPathOutput "dev" "include" buildInputs; - LIBRARY_PATH = lib.makeLibraryPath buildInputs; + env = { + C_INCLUDE_PATH = + "${libxml2.dev}/include/libxml2/:" + lib.makeSearchPathOutput "dev" "include" buildInputs; + LIBRARY_PATH = lib.makeLibraryPath buildInputs; + }; doCheck = false; diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix index d79ac9089f77..4eecd6d3558d 100644 --- a/pkgs/by-name/py/pytr/package.nix +++ b/pkgs/by-name/py/pytr/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "pytr"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; src = fetchFromGitHub { owner = "pytr-org"; repo = "pytr"; tag = "v${version}"; - hash = "sha256-VfNoovNGvu1tNbYYiIX8KTOfll0WrHxJsLk/Yoyhu6s="; + hash = "sha256-2x0Kwg4upKLwFYslyIvXcssdO4W8l0Gs3qvy6kJYNnI="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/qb/qbootctl/package.nix b/pkgs/by-name/qb/qbootctl/package.nix index d7f8607fb5c0..aace7b25fe1a 100644 --- a/pkgs/by-name/qb/qbootctl/package.nix +++ b/pkgs/by-name/qb/qbootctl/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { linuxHeaders ]; - CFLAGS = [ "-I${linuxHeaders}/include" ]; + env.CFLAGS = toString [ "-I${linuxHeaders}/include" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/qc/qcdnum/package.nix b/pkgs/by-name/qc/qcdnum/package.nix index 0b147eddce75..96887b55ff2c 100644 --- a/pkgs/by-name/qc/qcdnum/package.nix +++ b/pkgs/by-name/qc/qcdnum/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gfortran ]; buildInputs = [ zlib ]; - FFLAGS = [ + env.FFLAGS = toString [ "-std=legacy" # fix build with gfortran 10 ]; diff --git a/pkgs/by-name/qd/qdelay/package.nix b/pkgs/by-name/qd/qdelay/package.nix index 834d2ab4416a..8eda65088db0 100644 --- a/pkgs/by-name/qd/qdelay/package.nix +++ b/pkgs/by-name/qd/qdelay/package.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qdelay"; - version = "1.0.8"; + version = "1.1.0"; src = fetchFromGitHub { owner = "tiagolr"; repo = "qdelay"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-URBbXopXB3pm5vJ9Afa9H3upYdfqgT/NhujgPL54NV4="; + hash = "sha256-hGUZhnA+aix17hTJZ9hE+W+5HEhI9IMYk05avzFaKAg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix index b7de34d8c949..9c1db1eebfdf 100644 --- a/pkgs/by-name/qw/qwen-code/package.nix +++ b/pkgs/by-name/qw/qwen-code/package.nix @@ -14,16 +14,16 @@ buildNpmPackage (finalAttrs: { pname = "qwen-code"; - version = "0.10.1"; + version = "0.10.5"; src = fetchFromGitHub { owner = "QwenLM"; repo = "qwen-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-5o0czo6NmygF78vFkIWjK/Ab5yRaYNZm5vOck355NJE="; + hash = "sha256-k6o8X98f7zMgB5gsw1cX8rfxE88LTgz5qgDTZ+rLeMA="; }; - npmDepsHash = "sha256-RwncE9D6MRXLCJUNjoQFxQ40y+Q9/LQUrqnGfzQCduU="; + npmDepsHash = "sha256-L5Ga/TZ1dhlZWx9cCk988dIax4w92B2L4uviUSsgn1c="; # npm 11 incompatible with fetchNpmDeps # https://github.com/NixOS/nixpkgs/issues/474535 diff --git a/pkgs/by-name/ra/rapidfuzz-cpp/package.nix b/pkgs/by-name/ra/rapidfuzz-cpp/package.nix index 3df57342a13e..348a309d47a3 100644 --- a/pkgs/by-name/ra/rapidfuzz-cpp/package.nix +++ b/pkgs/by-name/ra/rapidfuzz-cpp/package.nix @@ -26,10 +26,13 @@ stdenv.mkDerivation (finalAttrs: { "-DRAPIDFUZZ_BUILD_TESTING=ON" ]; - CXXFLAGS = lib.optionals stdenv.cc.isClang [ - # error: no member named 'fill' in namespace 'std' - "-include algorithm" - ]; + env = lib.optionalAttrs stdenv.cc.isClang { + CXXFLAGS = toString [ + # error: no member named 'fill' in namespace 'std' + "-include" + "algorithm" + ]; + }; nativeCheckInputs = [ catch2_3 diff --git a/pkgs/by-name/rc/rcs/package.nix b/pkgs/by-name/rc/rcs/package.nix index 839c47a30bbe..73fec8b194e5 100644 --- a/pkgs/by-name/rc/rcs/package.nix +++ b/pkgs/by-name/rc/rcs/package.nix @@ -17,16 +17,17 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-Q93+EHJKi4XiRo9kA7YABzcYbwHmDgvWL95p2EIjTMU="; }; - ac_cv_path_ED = "${ed}/bin/ed"; - DIFF = "${diffutils}/bin/diff"; - DIFF3 = "${diffutils}/bin/diff3"; - disallowedReferences = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.diffutils buildPackages.ed ]; - env.NIX_CFLAGS_COMPILE = "-std=c99"; + env = { + NIX_CFLAGS_COMPILE = "-std=c99"; + ac_cv_path_ED = "${ed}/bin/ed"; + DIFF = "${diffutils}/bin/diff"; + DIFF3 = "${diffutils}/bin/diff3"; + }; hardeningDisable = lib.optional stdenv.cc.isClang "format"; diff --git a/pkgs/by-name/re/readeck/package.nix b/pkgs/by-name/re/readeck/package.nix index 55ff948ef227..80d53127f561 100644 --- a/pkgs/by-name/re/readeck/package.nix +++ b/pkgs/by-name/re/readeck/package.nix @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { npmRoot = "web"; - NODE_PATH = "$npmDeps"; + env.NODE_PATH = "$npmDeps"; preBuild = '' make generate diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 8cb13b2b97c6..5dd0f206c18c 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "release-plz"; - version = "0.3.155"; + version = "0.3.156"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${finalAttrs.version}"; - hash = "sha256-rgi/qh9tZlJFIHc01RRvUFD4sRWOTX1ScD2FwjAhL14="; + hash = "sha256-XJACR1/wpN4NhV/zEgYwA1f+3AHTwJeoQ2dgGlJqpBo="; }; - cargoHash = "sha256-VkQeNIvc6Ms1qBuqMfTQSr9p6yl3rYtWJbw4b9WaVEg="; + cargoHash = "sha256-OlBhTlfM5LV1mRRYjnQFioap/lMCrav9ggj5wiI1Qqo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/re/renode-bin/package.nix b/pkgs/by-name/re/renode-bin/package.nix index edf34d337346..d8314e908541 100644 --- a/pkgs/by-name/re/renode-bin/package.nix +++ b/pkgs/by-name/re/renode-bin/package.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "renode"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-oNlTz5LBggPkjKM4TJO2UDKQdt2Ga7rBTdgyGjN8/zA="; + hash = "sha256-YmKcqjMe1L1Ot6vhPuLkg0+8qnDeSS2zll+vpO3FaU8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix index 4db16793187f..17d05dbf3a33 100644 --- a/pkgs/by-name/re/resterm/package.nix +++ b/pkgs/by-name/re/resterm/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "resterm"; - version = "0.22.0"; + version = "0.23.3"; src = fetchFromGitHub { owner = "unkn0wn-root"; repo = "resterm"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-ePWzD1y6UuNcM0nz1TaonUC83whhCg7kpO01xnpki5g="; + sha256 = "sha256-FS+pStcAuoslrso1kmriyKhr2I8MdvvUnH262hMKLEg="; }; - vendorHash = "sha256-q459U/zHaqaOwTlNtKc2hhpLWA8gMwIfwrmxThE3Ic4="; + vendorHash = "sha256-UnjH2d0w+ttIE2QTsYvpvNVYT6m9d0TGcrIhNE0SjTI="; # modernc.org/libc (via modernc.org/sqlite) tries to read /etc/protocols modPostBuild = '' diff --git a/pkgs/by-name/rg/rgrc/package.nix b/pkgs/by-name/rg/rgrc/package.nix index 3dbd8ab0061d..2bae26bfdb41 100644 --- a/pkgs/by-name/rg/rgrc/package.nix +++ b/pkgs/by-name/rg/rgrc/package.nix @@ -10,17 +10,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rgrc"; - version = "0.6.9"; + version = "0.6.12"; src = fetchFromGitHub { owner = "lazywalker"; repo = "rgrc"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sc0JmcnxW9WZ78ayJtSWTZBoVgqnFGUO2dKGi8U05S0="; + hash = "sha256-PgfLDVO1OyHlJYbUzZCkKv7SV/nSPFjUhi5qpdxCDYw="; }; - cargoHash = "sha256-wEE08Rqga5Ffz6IgYyQto0gB8bXCZ6Myc3r6uM5XTCs="; + cargoHash = "sha256-ek9Cf33fW6kS0L+u8mQYqsqZmv7dfptHFd+t3odtCO4="; + buildFeatures = [ "embed-configs" ]; nativeBuildInputs = [ installShellFiles ]; checkFlags = [ "--skip=test_command_exists" ]; diff --git a/pkgs/by-name/ro/routino/package.nix b/pkgs/by-name/ro/routino/package.nix index 1eca5a57a1f9..f237c5246024 100644 --- a/pkgs/by-name/ro/routino/package.nix +++ b/pkgs/by-name/ro/routino/package.nix @@ -46,7 +46,9 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - CLANG = lib.optionalString stdenv.cc.isClang "1"; + env = lib.optionalAttrs stdenv.cc.isClang { + CLANG = "1"; + }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/by-name/ru/rustfetch/package.nix b/pkgs/by-name/ru/rustfetch/package.nix new file mode 100644 index 000000000000..a79134cb102e --- /dev/null +++ b/pkgs/by-name/ru/rustfetch/package.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "rustfetch"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "lemuray"; + repo = "rustfetch"; + tag = "v${finalAttrs.version}"; + hash = "sha256-iGcxDKl36kbEi+OiH4gB2+HxP37bpqAMZguIXDzq3Jw="; + }; + cargoHash = "sha256-87wfFczmgCft4ke/RQKi54wvqFKGRJMtqhkwQgDCedg="; + + meta = { + description = "CLI tool designed to fetch system information in the fastest and safest way possible"; + homepage = "https://github.com/lemuray/rustfetch"; + changelog = "https://github.com/lemuray/rustfetch/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ lefaucheur0769 ]; + mainProgram = "rustfetch"; + }; +}) diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 55f18669f618..1f6f75f1a1db 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.7-unstable-2026-02-12"; + version = "11.7-unstable-2026-02-20"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "7ce9e00589f550f9abc30c84e163c34ed1f511fe"; - hash = "sha256-gcOFlW5usE7oBqFAmOCEVoXTQNCbMQ0jPR3roN5ZcPk="; + rev = "d4abc485036d30b65bc80ef041690a1d1fc371c8"; + hash = "sha256-nJskuS4WM58na0ohsNppqKiOLa98TInXkaWvPzhctoY="; }; buildInputs = diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix index 1b75e28938fd..73452dc2f3bf 100644 --- a/pkgs/by-name/sa/sagoin/package.nix +++ b/pkgs/by-name/sa/sagoin/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellCompletion artifacts/sagoin.{bash,fish} --zsh artifacts/_sagoin ''; - GEN_ARTIFACTS = "artifacts"; + env.GEN_ARTIFACTS = "artifacts"; meta = { description = "Command-line submission tool for the UMD CS Submit Server"; diff --git a/pkgs/by-name/sc/scala-next/package.nix b/pkgs/by-name/sc/scala-next/package.nix index fcbad76bd645..82ac76e12e8c 100644 --- a/pkgs/by-name/sc/scala-next/package.nix +++ b/pkgs/by-name/sc/scala-next/package.nix @@ -1,10 +1,10 @@ { scala, fetchurl }: scala.bare.overrideAttrs (oldAttrs: { - version = "3.7.3"; + version = "3.8.1"; pname = "scala-next"; src = fetchurl { inherit (oldAttrs.src) url; - hash = "sha256-KmIgDOX4TtioGvcDJ0+sGxq+fFqlKM/hZNBb0Q+7Z8A="; + hash = "sha256-6RdU/L3zUQE7uiC7T1q8TptJCoMnKxk84CLXQ9Q0Ao8="; }; }) diff --git a/pkgs/by-name/sc/scipopt-gcg/package.nix b/pkgs/by-name/sc/scipopt-gcg/package.nix index e314a8816fc9..d484f66315fe 100644 --- a/pkgs/by-name/sc/scipopt-gcg/package.nix +++ b/pkgs/by-name/sc/scipopt-gcg/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - maintainers = with lib.maintainers; [ fettgoenner ]; + maintainers = with lib.maintainers; [ pmeinhold ]; changelog = "https://gcg.or.rwth-aachen.de/doc-3.5.0/RN${lib.versions.major version}${lib.versions.minor version}.html"; description = "Branch-and-Price & Column Generation for Everyone"; license = lib.licenses.lgpl3Plus; diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix index 82aa2fdeca4f..5b2a2f4e1356 100644 --- a/pkgs/by-name/sc/scipopt-papilo/package.nix +++ b/pkgs/by-name/sc/scipopt-papilo/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; meta = { - maintainers = with lib.maintainers; [ fettgoenner ]; + maintainers = with lib.maintainers; [ pmeinhold ]; description = "Parallel Presolve for Integer and Linear Optimization"; license = lib.licenses.lgpl3Plus; homepage = "https://github.com/scipopt/papilo"; diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix index a390c425bb2b..bb9906062a8e 100644 --- a/pkgs/by-name/sc/scipopt-scip/package.nix +++ b/pkgs/by-name/sc/scipopt-scip/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; meta = { - maintainers = with lib.maintainers; [ fettgoenner ]; + maintainers = with lib.maintainers; [ pmeinhold ]; changelog = "https://scipopt.org/doc-${finalAttrs.version}/html/RN${lib.versions.major finalAttrs.version}.php"; description = "Solving Constraint Integer Programs"; license = lib.licenses.asl20; diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix index 21a6159efc25..36bfe673c7af 100644 --- a/pkgs/by-name/sc/scipopt-soplex/package.nix +++ b/pkgs/by-name/sc/scipopt-soplex/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Sequential object-oriented simPlex"; license = with lib.licenses; [ asl20 ]; mainProgram = "soplex"; - maintainers = with lib.maintainers; [ fettgoenner ]; + maintainers = with lib.maintainers; [ pmeinhold ]; changelog = "https://soplex.zib.de/doc-${finalAttrs.version}/html/CHANGELOG.php"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/sc/scipopt-ug/package.nix b/pkgs/by-name/sc/scipopt-ug/package.nix index 6e1ff4653aac..28c0b668b0db 100644 --- a/pkgs/by-name/sc/scipopt-ug/package.nix +++ b/pkgs/by-name/sc/scipopt-ug/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; meta = { - maintainers = with lib.maintainers; [ fettgoenner ]; + maintainers = with lib.maintainers; [ pmeinhold ]; changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php"; description = "Ubiquity Generator framework to parallelize branch-and-bound based solvers"; license = lib.licenses.lgpl3Plus; diff --git a/pkgs/by-name/sc/scipopt-zimpl/package.nix b/pkgs/by-name/sc/scipopt-zimpl/package.nix index cb9d82e4466b..86fef3fafafc 100644 --- a/pkgs/by-name/sc/scipopt-zimpl/package.nix +++ b/pkgs/by-name/sc/scipopt-zimpl/package.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; meta = { - maintainers = with lib.maintainers; [ fettgoenner ]; + maintainers = with lib.maintainers; [ pmeinhold ]; platforms = lib.platforms.linux; broken = stdenv.isDarwin; changelog = "https://zimpl.zib.de/download/CHANGELOG.txt"; - description = "Zuse Institut Mathematical Programming Language"; + description = "Zuse Institute Mathematical Programming Language"; longDescription = '' ZIMPL is a little language to translate the mathematical model of a problem into a linear or (mixed-)integer mathematical program diff --git a/pkgs/by-name/sc/scite/package.nix b/pkgs/by-name/sc/scite/package.nix index 94865c79ca06..c73a7f6b132e 100644 --- a/pkgs/by-name/sc/scite/package.nix +++ b/pkgs/by-name/sc/scite/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { "prefix=${placeholder "out"}" ]; - CXXFLAGS = [ + env.CXXFLAGS = toString [ # GCC 13: error: 'intptr_t' does not name a type "-include cstdint" "-include system_error" diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index e2f0555ae501..39743975c2b6 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2026-02-12"; + version = "0-unstable-2026-02-18"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "c9e695ef7709d9f2e5d8e44e36e27b56b881366f"; - hash = "sha256-IH3oEmaTzeiUARJSWgurG9ZYBGDMWMOMyQO6zg7WwLw="; + rev = "a050623bb0e35e3e0ba635c48faddecf42ff225c"; + hash = "sha256-yZiM3ykAII6PK4PCvu+knyHLg7orbCT9eYGvZWuU1F4="; }; dontBuild = true; diff --git a/pkgs/by-name/se/search-vulns/package.nix b/pkgs/by-name/se/search-vulns/package.nix index e419934a7a78..b669d34839ac 100644 --- a/pkgs/by-name/se/search-vulns/package.nix +++ b/pkgs/by-name/se/search-vulns/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "search-vulns"; - version = "1.0.2"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "ra1nb0rn"; repo = "search_vulns"; tag = "v${finalAttrs.version}"; - hash = "sha256-xdZq4Er+0CT59Iv0mEcmkZcUM+xbBi/x+TtBNCiyhbY="; + hash = "sha256-lQyd5FmiBlno+BEXou70XOAv1hkwxIs0BCoNESYjjZM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/se/send/package.nix b/pkgs/by-name/se/send/package.nix index 9c6ebdbb96b7..51486020a37c 100644 --- a/pkgs/by-name/se/send/package.nix +++ b/pkgs/by-name/se/send/package.nix @@ -28,14 +28,14 @@ buildNpmPackage rec { env = { PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "true"; + + NODE_OPTIONS = "--openssl-legacy-provider"; }; makeCacheWritable = true; npmPackFlags = [ "--ignore-scripts" ]; - NODE_OPTIONS = "--openssl-legacy-provider"; - postInstall = '' cp -r dist $out/lib/node_modules/send/ ln -s $out/lib/node_modules/send/dist/version.json $out/lib/node_modules/send/version.json diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix index 3057a4975dee..e32c77a8af7b 100644 --- a/pkgs/by-name/se/server-box/package.nix +++ b/pkgs/by-name/se/server-box/package.nix @@ -36,7 +36,7 @@ flutter338.buildFlutterApplication { ]; # https://github.com/juliansteenbakker/flutter_secure_storage/issues/965 - CXXFLAGS = [ "-Wno-deprecated-literal-operator" ]; + env.CXXFLAGS = toString [ "-Wno-deprecated-literal-operator" ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/by-name/sg/sg-323/package.nix b/pkgs/by-name/sg/sg-323/package.nix index ec1fff454bf5..d2d70e1b6ce4 100644 --- a/pkgs/by-name/sg/sg-323/package.nix +++ b/pkgs/by-name/sg/sg-323/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "SG-323"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "greyboxaudio"; repo = "SG-323"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-yAC4YQt8f5kQ03ECAxvoM9wcqna98F4XKcwUQg6l4E0="; + hash = "sha256-7zqIWLF9gcqHFg2LYauvF+6qUTIohYC5vZEn76siS7o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix index 7e4ef2aec05a..753ff850f06f 100644 --- a/pkgs/by-name/sh/shairport-sync/package.nix +++ b/pkgs/by-name/sh/shairport-sync/package.nix @@ -53,13 +53,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "shairport-sync"; - version = "4.3.7"; + version = "5.0"; src = fetchFromGitHub { repo = "shairport-sync"; owner = "mikebrady"; tag = finalAttrs.version; - hash = "sha256-bfOgUeUCxQeCmKKBlvIXptM5lJxgZiH4lOhLJSNih8g="; + hash = "sha256-JmzJqod3XMNZPMuZV8ZD8GIz17k7IkJs04dgvINYm/k="; }; nativeBuildInputs = [ @@ -73,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: { "${glib.dev}" ] ++ optional enableAirplay2 [ + libplist.bin unixtools.xxd ]; diff --git a/pkgs/by-name/sh/sharing/package.nix b/pkgs/by-name/sh/sharing/package.nix index dcad6dd71b16..185080b2c5da 100644 --- a/pkgs/by-name/sh/sharing/package.nix +++ b/pkgs/by-name/sh/sharing/package.nix @@ -22,7 +22,7 @@ buildNpmPackage rec { # The prepack script runs the build script, which we'd rather do in the build phase. npmPackFlags = [ "--ignore-scripts" ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; meta = { description = "Command-line tool to share directories and files to mobile devices"; diff --git a/pkgs/by-name/sh/shrinkray/package.nix b/pkgs/by-name/sh/shrinkray/package.nix index 666d26cc3efb..c7e16519b944 100644 --- a/pkgs/by-name/sh/shrinkray/package.nix +++ b/pkgs/by-name/sh/shrinkray/package.nix @@ -12,14 +12,14 @@ python3.pkgs.buildPythonApplication rec { pname = "shrinkray"; - version = "26.2.4.1"; + version = "26.2.20.0"; pyproject = true; src = fetchFromGitHub { owner = "DRMacIver"; repo = "shrinkray"; tag = "v${version}"; - hash = "sha256-y8NZJ80KM+wW58YAWT7Cx3uh08imI7sbs487GbANyJg="; + hash = "sha256-KsIWFR5gyFt35yLz/102hET+JMhEU0ukhzwb9MzewSs="; }; postPatch = '' substituteInPlace tests/test_main.py \ diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix index 24bb7dece09d..9a8ff69c487b 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix @@ -1,7 +1,7 @@ { callPackage, commandLineArgs }: callPackage ./generic.nix { inherit commandLineArgs; } { pname = "signal-desktop-bin"; - version = "7.89.0"; + version = "7.90.0"; libdir = "usr/lib64/signal-desktop"; bindir = "usr/bin"; @@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } { bsdtar -xf $downloadedFile -C "$out" ''; - url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/10118373-signal-desktop/signal-desktop-7.89.0-1.fc42.aarch64.rpm"; - hash = "sha256-cqGdY5CEWK5T04Pa9ZAyOqmlsO476vGXkos6gdWahcU="; + url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/10149422-signal-desktop/signal-desktop-7.90.0-1.fc42.aarch64.rpm"; + hash = "sha256-+6aIB/UF7oZ7I4MtDsYCOhQxiaTpIyXGZ5WLdJto7Us="; } diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix index f618aef3d511..1e8dab02080b 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "signal-desktop-bin"; - version = "7.89.0"; + version = "7.90.0"; src = fetchurl { url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg"; - hash = "sha256-Y2xUCWDRsb+A2GypvxZPc1VChRX3ElgrPOeeu4w4FRU="; + hash = "sha256-61JsAPeGVNJpuUDAv3nA0WNr15C+e5NvsT0ICT2dolc="; }; sourceRoot = "."; diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix index eb88c0016db0..3a5c5b3d8f2d 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix @@ -1,12 +1,12 @@ { callPackage, commandLineArgs }: callPackage ./generic.nix { inherit commandLineArgs; } rec { pname = "signal-desktop-bin"; - version = "7.89.0"; + version = "7.90.0"; libdir = "opt/Signal"; bindir = libdir; extractPkg = "dpkg-deb -x $downloadedFile $out"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-qGzQ+ZtOCKu69EBEoxVjR5PzgtlrSNBW6SBZ9eG3ooU="; + hash = "sha256-m9tBldv1WvfdLrORIuJQYBQ72rBRHgXSAk0PrwZtAB4="; } diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index 3db9fbcefd72..4ab27f9f738a 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -24,23 +24,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.86.16"; + version = "0.87.1"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-rpZdT0nkOhdf9YFG5eDxSLQPv5CtUuX9+y6V7GxzvaA="; + hash = "sha256-yr2+yM7RmUQ7mNDMCcaM5cCpudof14JuO5J6D944k0U="; }; - cargoHash = "sha256-TrsxEe4+qCBYK+6/YN3T/fD+m6U0Hor98M5sTpdFk7Q="; + cargoHash = "sha256-rqxp+RZuuT+nFudNeCgA8g04C9KT1Qi59K4b2avL5u4="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-0YimfYIKxlljERPnseQ8j3hpS1XPXINNhBnrAdnkEfM="; + hash = "sha256-dNAHAk7UxFQvbsGSnbw3Nb0N4UARflUWL1+OE3shZMU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index c5cd14cbb745..e2f1426fdf9c 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -1,11 +1,11 @@ { stdenv, lib, - nodejs_22, + nodejs_24, pnpm_10, fetchPnpmDeps, pnpmConfigHook, - electron_39, + electron_40, python3, makeWrapper, callPackage, @@ -23,9 +23,9 @@ withAppleEmojis ? false, }: let - nodejs = nodejs_22; + nodejs = nodejs_24; pnpm = pnpm_10; - electron = electron_39; + electron = electron_40; libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; }; signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; }; @@ -54,13 +54,13 @@ let ''; }); - version = "7.89.0"; + version = "7.90.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-2/cmbNDeFqq+VtJvMIfC/Yg31Mc7AlH+TJGI2Vp+SuY="; + hash = "sha256-MkvIv9ohFtu4e3IK4hciWC32xiw18/kdm7pHEc436Bc="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -147,15 +147,15 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 1; hash = if withAppleEmojis then - "sha256-QBiKYgiSUoHOxr2jZv3DxP56/VMW8rAZzEQlMQDk2VA=" + "sha256-sXDAAbrRFgOT+wRZqHAjEudmcUdBEbpkPWJpiB+MqDw=" else - "sha256-ELbzV97TOGC3MLB/Cs5xk1MBPXXUYKAClji8oEiMP5Y="; + "sha256-uEXm4lFTJ7U9I/I1UiETy1fIHzAPP7tr9SsPQ5lWsFw="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1770853842; + SOURCE_DATE_EPOCH = 1771441806; }; preBuild = '' diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index cc8254927814..7981bc0ee861 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -97,13 +97,16 @@ stdenv.mkDerivation (finalAttrs: { install -Dm0644 documentation/sile.pdf $out/share/doc/sile/manual.pdf ''; - FONTCONFIG_FILE = makeFontsConf { - fontDirectories = [ - gentium-plus - ]; + env = { + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ + gentium-plus + ]; + }; + LUA = "${finalAttrs.finalPackage.passthru.luaEnv}/bin/lua"; }; + strictDeps = true; - env.LUA = "${finalAttrs.finalPackage.passthru.luaEnv}/bin/lua"; enableParallelBuilding = true; @@ -158,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { poppler-utils finalAttrs.finalPackage ]; - inherit (finalAttrs) FONTCONFIG_FILE; + env.FONTCONFIG_FILE = finalAttrs.env.FONTCONFIG_FILE; } '' output=$(mktemp -t selfcheck-XXXXXX.pdf) diff --git a/pkgs/by-name/si/simpleBluez/package.nix b/pkgs/by-name/si/simplebluez/package.nix similarity index 72% rename from pkgs/by-name/si/simpleBluez/package.nix rename to pkgs/by-name/si/simplebluez/package.nix index 97ad1fe35b7d..c365edb6e432 100644 --- a/pkgs/by-name/si/simpleBluez/package.nix +++ b/pkgs/by-name/si/simplebluez/package.nix @@ -8,15 +8,15 @@ lib, }: stdenv.mkDerivation (finalAttrs: { - pname = "simpleBluez"; + pname = "simplebluez"; - version = "0.7.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "OpenBluetoothToolbox"; repo = "SimpleBLE"; rev = "v${finalAttrs.version}"; - hash = "sha256-CPBdPnBeQ0c3VjSX0Op6nCHF3w0MdXGULbk1aavr+LM="; + hash = "sha256-SWZdVWBC8udwkn195FdvsXSniMtzd8+WfnMsARLYSQ4="; }; outputs = [ @@ -40,7 +40,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C++ abstraction layer for BlueZ over DBus"; homepage = "https://github.com/OpenBluetoothToolbox/SimpleBLE"; - license = lib.licenses.gpl3Only; + # SimpleBLE (which SimpleBluez is part of) is under the Business Source License 1.1 (BUSL-1.1) + # since version 0.9.0 + license = lib.licenses.bsl11; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ aciceri ]; }; diff --git a/pkgs/by-name/si/simpledbus/package.nix b/pkgs/by-name/si/simpledbus/package.nix index 1c1b91098107..60cba79849be 100644 --- a/pkgs/by-name/si/simpledbus/package.nix +++ b/pkgs/by-name/si/simpledbus/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simpledbus"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "OpenBluetoothToolbox"; repo = "SimpleBLE"; rev = "v${finalAttrs.version}"; - hash = "sha256-KNSrw+NhfHRuvDwkWpWTSnP6LWoSVWAa33fVikb60A8="; + hash = "sha256-SWZdVWBC8udwkn195FdvsXSniMtzd8+WfnMsARLYSQ4="; }; outputs = [ diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix index d352d6d571fd..102acd62b3ff 100644 --- a/pkgs/by-name/si/sirius/package.nix +++ b/pkgs/by-name/si/sirius/package.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { ] ); - CXXFLAGS = [ + env.CXXFLAGS = toString [ # GCC 13: error: 'uintptr_t' in namespace 'std' does not name a type "-include cstdint" ]; diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index de55564b2df3..90818ab0739f 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -36,20 +36,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.5.4"; + version = "3.5.5"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-uiI8cB/bi6P4PByOBUGK4d2DUelACThC+e5rBFv35ow="; + hash = "sha256-iGwREddg5Pzr6fM/YTYj28g+p8tkQa9EiM6py94UlSc="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-SQ7QBtPwQaQgp6S54dnwfV44SLos1QY5NotnpEz4OPY="; + vendorHash = "sha256-4yqUUP6b2KL+xLKQTiTPqIISyqdIsHpf+p1jsG/kquI="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_9; fetcherVersion = 1; - hash = "sha256-DxMeZqFqR5vybwEiYzYhYMn7S3P/boHrOXkS+57Yrz4="; + hash = "sha256-i11Hr/KA7Q27Z26AOmc6GNwSW/ZcwSyaNtNBJii5r2A="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/si/sizelint/package.nix b/pkgs/by-name/si/sizelint/package.nix index a0f0b1152951..f42f6c1c7b21 100644 --- a/pkgs/by-name/si/sizelint/package.nix +++ b/pkgs/by-name/si/sizelint/package.nix @@ -2,20 +2,23 @@ lib, rustPlatform, fetchFromGitHub, + git, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sizelint"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "a-kenji"; repo = "sizelint"; tag = "v${finalAttrs.version}"; - hash = "sha256-06RJrE0w1Xhj364dUUuYadxleX12mkB8yO+h1QLZhH0="; + hash = "sha256-1k1+7fVWhflEKyhOlb7kMn2xqeAM6Y5N9uHtOJvVn4A="; }; - cargoHash = "sha256-1kg1xfgzqrbZvazRavM4aW7oyRei9jKW0a+a6z2HLnc="; + nativeCheckInputs = [ git ]; + + cargoHash = "sha256-Z+pmlp/0LlKfc4QLosePw7TdLFYe6AnAVOJSw2DzlfI="; meta = { description = "Lint your file tree based on file sizes"; diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index 82552884fdbc..cedda3d8e2d2 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -1,6 +1,7 @@ { lib, tmux, + hexdump, fetchFromGitHub, installShellFiles, nix-update-script, @@ -11,7 +12,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "skim"; - version = "2.0.2"; + version = "3.4.0"; outputs = [ "out" @@ -23,20 +24,20 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "skim-rs"; repo = "skim"; tag = "v${finalAttrs.version}"; - hash = "sha256-V6ZIGPeGWTeNzOA9FDhARx63L3CVpUUpCILwIGg8NOY="; + hash = "sha256-s0aC+gHqxX/SEiWsqB4mgl27eZ65RtVmgXX/veus1IQ="; }; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim ''; - cargoHash = "sha256-xtrqY8jBB43Dpj4nOr2b0FziRvPjtRpWevAM8FeHqwc="; + cargoHash = "sha256-Y3WQlzzciYVqVjq0UtAb+4wZwKXLOUpYozriG/w5lJI="; nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = [ tmux ]; - - # frizbee requires nightly features - env.RUSTC_BOOTSTRAP = 1; + nativeCheckInputs = [ + tmux + hexdump + ]; postBuild = '' cat <