diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 675f7d710209..52b6e7231b96 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2331,7 +2331,7 @@ email = "assistant.moetron@gmail.com"; github = "Assistant"; githubId = 2748721; - matrix = "@assistant:pygmalion.chat"; + matrix = "@self:assistant.moe"; name = "Assistant Moetron"; }; astavie = { diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7b064b84501b..ea2ed1e64ea9 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -993,7 +993,10 @@ with lib.maintainers; }; ocaml = { - members = [ alizter ]; + members = [ + alizter + redianthus + ]; github = "ocaml"; scope = "Maintain the OCaml compiler and package set."; shortName = "OCaml"; diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 848fa1eb9b52..8dc6829d7182 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -435,3 +435,5 @@ - The `open-webui` package's postgres support have been moved to optional dependencies to comply with upstream changes in 0.6.26. - `prl-tools` has been moved out of `linuxPackages` because Parallels Guest Tools become driverless since 26.1.0. + +- `services.opentelemetry-collector` has a new option `validateConfigFile` option that checks the configuration file during build. It is enabled by default if the configuration file is in the Nix store. diff --git a/nixos/modules/services/continuous-integration/github-runner/options.nix b/nixos/modules/services/continuous-integration/github-runner/options.nix index a2df04e597d8..cb1020b7eab9 100644 --- a/nixos/modules/services/continuous-integration/github-runner/options.nix +++ b/nixos/modules/services/continuous-integration/github-runner/options.nix @@ -187,9 +187,7 @@ }; package = lib.mkPackageOption pkgs "github-runner" { } // { - apply = - # Support old github-runner versions which don't have the `nodeRuntimes` arg yet. - pkg: pkg.override (old: lib.optionalAttrs (old ? nodeRuntimes) { inherit (config) nodeRuntimes; }); + apply = pkg: pkg.override { inherit (config) nodeRuntimes; }; }; ephemeral = lib.mkOption { diff --git a/nixos/modules/services/monitoring/opentelemetry-collector.nix b/nixos/modules/services/monitoring/opentelemetry-collector.nix index 125dec00b6cf..a722c7a88b5f 100644 --- a/nixos/modules/services/monitoring/opentelemetry-collector.nix +++ b/nixos/modules/services/monitoring/opentelemetry-collector.nix @@ -13,12 +13,27 @@ let mkOption types getExe + isStorePath + literalMD ; cfg = config.services.opentelemetry-collector; opentelemetry-collector = cfg.package; settingsFormat = pkgs.formats.yaml { }; + generatedConf = + if cfg.configFile == null then + settingsFormat.generate "config.yaml" cfg.settings + else + cfg.configFile; + conf = + if cfg.validateConfigFile then + pkgs.runCommandLocal "config.yaml" { inherit generatedConf; } '' + cp $generatedConf $out + ${getExe opentelemetry-collector} validate --config=file:$out + '' + else + generatedConf; in { options.services.opentelemetry-collector = { @@ -43,6 +58,11 @@ in Specify a path to a configuration file that Opentelemetry Collector should use. ''; }; + + validateConfigFile = lib.mkEnableOption "Validate configuration file" // { + defaultText = literalMD "`true` if `configFile` is a store path"; + default = isStorePath cfg.configFile; + }; }; config = mkIf cfg.enable { @@ -61,28 +81,20 @@ in description = "Opentelemetry Collector Service Daemon"; wantedBy = [ "multi-user.target" ]; - serviceConfig = - let - conf = - if cfg.configFile == null then - settingsFormat.generate "config.yaml" cfg.settings - else - cfg.configFile; - in - { - ExecStart = "${getExe opentelemetry-collector} --config=file:${conf}"; - DynamicUser = true; - Restart = "always"; - ProtectSystem = "full"; - DevicePolicy = "closed"; - NoNewPrivileges = true; - WorkingDirectory = "%S/opentelemetry-collector"; - StateDirectory = "opentelemetry-collector"; - SupplementaryGroups = [ - # allow to read the systemd journal for opentelemetry-collector - "systemd-journal" - ]; - }; + serviceConfig = { + ExecStart = "${getExe opentelemetry-collector} --config=file:${conf}"; + DynamicUser = true; + Restart = "always"; + ProtectSystem = "full"; + DevicePolicy = "closed"; + NoNewPrivileges = true; + WorkingDirectory = "%S/opentelemetry-collector"; + StateDirectory = "opentelemetry-collector"; + SupplementaryGroups = [ + # allow to read the systemd journal for opentelemetry-collector + "systemd-journal" + ]; + }; }; }; } diff --git a/nixos/modules/services/networking/opengfw.nix b/nixos/modules/services/networking/opengfw.nix index 3cb1e9c63d7d..4b92a230842d 100644 --- a/nixos/modules/services/networking/opengfw.nix +++ b/nixos/modules/services/networking/opengfw.nix @@ -390,7 +390,7 @@ in serviceConfig = rec { WorkingDirectory = cfg.dir; - ExecReload = "kill -HUP $MAINPID"; + ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -HUP $MAINPID"; Restart = "always"; User = cfg.user; StandardOutput = mkIf (cfg.logFile != null) "append:${cfg.logFile}"; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index c3baf59db455..645852b646d3 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -117,6 +117,7 @@ let override = cfg.overrideFolders; conf = folders; baseAddress = curlAddressArgs "/rest/config/folders"; + ignoreAddress = curlAddressArgs "/rest/db/ignores"; }; } [ @@ -142,7 +143,8 @@ let let jsonPreSecretsFile = pkgs.writeTextFile { name = "${conf_type}-${new_cfg.id}-conf-pre-secrets.json"; - text = builtins.toJSON new_cfg; + # Remove the ignorePatterns attribute, it is handled separately + text = builtins.toJSON (builtins.removeAttrs new_cfg [ "ignorePatterns" ]); }; injectSecretsJqCmd = { @@ -209,6 +211,13 @@ let '' ${injectSecretsJqCmd} ${jsonPreSecretsFile} | curl --json @- -X POST ${s.baseAddress} '' + /* + Check if we are configuring a folder which has ignore patterns. + If it does, write the ignore patterns to the rest API. + */ + + lib.optionalString ((conf_type == "dirs") && (new_cfg.ignorePatterns != null)) '' + curl -d '{"ignore": ${builtins.toJSON new_cfg.ignorePatterns}}' -X POST ${s.ignoreAddress}?folder=${new_cfg.id} + '' )) (lib.concatStringsSep "\n") ] @@ -649,6 +658,26 @@ in Requires running Syncthing as a privileged user, or granting it additional capabilities (e.g. CAP_CHOWN on Linux). ''; }; + + ignorePatterns = mkOption { + type = types.nullOr (types.listOf types.str); + default = null; + description = '' + Syncthing can be configured to ignore certain files in a folder using ignore patterns. + Enter them as a list of strings, one string per line. + See the Syncthing documentation for syntax: + Patterns set using the WebUI will be overridden if you define this option. + If you want to override the ignore patterns to be empty, use `ignorePatterns = []`. + Deleting the `ignorePatterns` option will not remove the patterns from Syncthing automatically + because patterns are only handled by the module if this option is defined. Either use + `ignorePatterns = []` before deleting the option or remove the patterns afterwards using the WebUI. + ''; + example = [ + "// This is a comment" + "*.part // Firefox downloads and other things" + "*.crdownload // Chrom(ium|e) downloads" + ]; + }; }; } ) diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix index 2b93e942896c..29ec8c8ef9b1 100644 --- a/nixos/modules/services/web-apps/invidious.nix +++ b/nixos/modules/services/web-apps/invidious.nix @@ -7,16 +7,19 @@ }: let cfg = config.services.invidious; - # To allow injecting secrets with jq, json (instead of yaml) is used - settingsFormat = pkgs.formats.json { }; + inherit (lib) types; + # This need to be JSON to reduce number of + # breaking changes, for backwards + # compatibility with pre-25.11 + settingsFormat = pkgs.formats.json { }; settingsFile = settingsFormat.generate "invidious-settings" cfg.settings; generatedHmacKeyFile = "/var/lib/invidious/hmac_key"; generateHmac = cfg.hmacKeyFile == null; - commonInvidousServiceConfig = { + commonInvidiousServiceConfig = { description = "Invidious (An alternative YouTube front-end)"; wants = [ "network-online.target" ]; after = [ "network-online.target" ] ++ lib.optional cfg.database.createLocally "postgresql.target"; @@ -59,9 +62,51 @@ let RuntimeRandomizedExtraSec = lib.mkDefault "5min"; }; }; + + configScript = + scaleIndex: + '' + configParts=() + '' + # autogenerated hmac_key + + lib.optionalString generateHmac '' + configParts+=("$(${pkgs.jq}/bin/jq -R '{"hmac_key":.}' <"${generatedHmacKeyFile}")") + '' + # generated settings file + + '' + configParts+=("$(< ${settingsFile})") + '' + # optional database password file + + lib.optionalString (cfg.database.host != null) '' + configParts+=("$(${pkgs.jq}/bin/jq -R '{"db":{"password":.}}' ${cfg.database.passwordFile})") + '' + # optional extra settings file + + lib.optionalString (cfg.extraSettingsFile != null) '' + configParts+=("$(< ${lib.escapeShellArg cfg.extraSettingsFile})") + '' + # explicitly specified hmac key file + + lib.optionalString (cfg.hmacKeyFile != null) '' + configParts+=("$(< ${lib.escapeShellArg cfg.hmacKeyFile})") + '' + # configure threads for secondary instances + + lib.optionalString (scaleIndex > 0) '' + configParts+=('{"channel_threads":0, "feed_threads":0}') + '' + # configure different ports for the instances + + '' + configParts+=('{"port":${toString (cfg.port + scaleIndex)}}') + '' + # merge all parts into a single configuration with later elements overriding previous elements + + '' + mergedConfig="$(${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)' <<<"''${configParts[*]}")" + export INVIDIOUS_CONFIG=$(echo "$mergedConfig" | ${pkgs.yq-go}/bin/yq -P) + + exec ${cfg.package}/bin/invidious + ''; + mkInvidiousService = scaleIndex: - lib.foldl' lib.recursiveUpdate commonInvidousServiceConfig [ + lib.foldl' lib.recursiveUpdate commonInvidiousServiceConfig [ # only generate the hmac file in the first service (lib.optionalAttrs (scaleIndex == 0) { preStart = lib.optionalString generateHmac '' @@ -73,47 +118,10 @@ let }) # configure the secondary services to run after the first service (lib.optionalAttrs (scaleIndex > 0) { - after = commonInvidousServiceConfig.after ++ [ "invidious.service" ]; - wants = commonInvidousServiceConfig.wants ++ [ "invidious.service" ]; + after = commonInvidiousServiceConfig.after ++ [ "invidious.service" ]; + wants = commonInvidiousServiceConfig.wants ++ [ "invidious.service" ]; }) - { - script = '' - configParts=() - '' - # autogenerated hmac_key - + lib.optionalString generateHmac '' - configParts+=("$(${pkgs.jq}/bin/jq -R '{"hmac_key":.}' <"${generatedHmacKeyFile}")") - '' - # generated settings file - + '' - configParts+=("$(< ${lib.escapeShellArg settingsFile})") - '' - # optional database password file - + lib.optionalString (cfg.database.host != null) '' - configParts+=("$(${pkgs.jq}/bin/jq -R '{"db":{"password":.}}' ${lib.escapeShellArg cfg.database.passwordFile})") - '' - # optional extra settings file - + lib.optionalString (cfg.extraSettingsFile != null) '' - configParts+=("$(< ${lib.escapeShellArg cfg.extraSettingsFile})") - '' - # explicitly specified hmac key file - + lib.optionalString (cfg.hmacKeyFile != null) '' - configParts+=("$(< ${lib.escapeShellArg cfg.hmacKeyFile})") - '' - # configure threads for secondary instances - + lib.optionalString (scaleIndex > 0) '' - configParts+=('{"channel_threads":0, "feed_threads":0}') - '' - # configure different ports for the instances - + '' - configParts+=('{"port":${toString (cfg.port + scaleIndex)}}') - '' - # merge all parts into a single configuration with later elements overriding previous elements - + '' - export INVIDIOUS_CONFIG="$(${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)' <<<"''${configParts[*]}")" - exec ${cfg.package}/bin/invidious - ''; - } + { script = configScript scaleIndex; } ]; serviceConfig = { diff --git a/nixos/modules/services/web-apps/open-web-calendar.nix b/nixos/modules/services/web-apps/open-web-calendar.nix index 525c9eb8c28c..f136ef8b75f5 100644 --- a/nixos/modules/services/web-apps/open-web-calendar.nix +++ b/nixos/modules/services/web-apps/open-web-calendar.nix @@ -130,7 +130,7 @@ in open_web_calendar.app:app ''; EnvironmentFile = settingsFormat.generate "open-web-calendar.env" cfg.settings; - ExecReload = "kill -s HUP $MAINPID"; + ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -s HUP $MAINPID"; KillMode = "mixed"; PrivateTmp = true; RuntimeDirectory = "open-web-calendar"; diff --git a/nixos/modules/services/web-apps/weblate.nix b/nixos/modules/services/web-apps/weblate.nix index 17c470ffaf99..36346ab5e012 100644 --- a/nixos/modules/services/web-apps/weblate.nix +++ b/nixos/modules/services/web-apps/weblate.nix @@ -374,7 +374,7 @@ in --bind='unix:///run/weblate.socket' \ weblate.wsgi ''; - ExecReload = "kill -s HUP $MAINPID"; + ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -s HUP $MAINPID"; KillMode = "mixed"; PrivateTmp = true; WorkingDirectory = dataDir; diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 973bccc83891..ddaccf8199a1 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -166,7 +166,7 @@ in serviceConfig = { Type = "notify"; ExecStart = "${cfg.package}/bin/crio"; - ExecReload = "/bin/kill -s HUP $MAINPID"; + ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -s HUP $MAINPID"; TasksMax = "infinity"; LimitNOFILE = "1048576"; LimitNPROC = "1048576"; diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index b6ab82b1acb5..8145c099eead 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -10,11 +10,13 @@ let json = pkgs.formats.json { }; inherit (lib) mkOption types; + inherit (pkgs) stdenv; # Provides a fake "docker" binary mapping to podman dockerCompat = pkgs.runCommand "${cfg.package.pname}-docker-compat-${cfg.package.version}" { + nativeBuildInputs = [ pkgs.installShellFiles ]; outputs = [ "out" "man" @@ -31,7 +33,14 @@ let basename=$(basename $f | sed s/podman/docker/g) ln -s $f $man/share/man/man1/$basename done - ''; + '' + + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + export HOME=$(mktemp -d) # work around `docker ` + installShellCompletion --cmd docker \ + --bash <($out/bin/docker completion bash) \ + --zsh <($out/bin/docker completion zsh) \ + --fish <($out/bin/docker completion fish) + ''; in { diff --git a/nixos/tests/mpich-example.c b/nixos/tests/mpich-example.c deleted file mode 100644 index c48e3c45b72e..000000000000 --- a/nixos/tests/mpich-example.c +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include -#include - -int -main (int argc, char *argv[]) -{ - int rank, size, length; - char name[BUFSIZ]; - - MPI_Init (&argc, &argv); - MPI_Comm_rank (MPI_COMM_WORLD, &rank); - MPI_Comm_size (MPI_COMM_WORLD, &size); - MPI_Get_processor_name (name, &length); - - printf ("%s: hello world from process %d of %d\n", name, rank, size); - - MPI_Finalize (); - - return EXIT_SUCCESS; -} diff --git a/nixos/tests/syncthing/folders.nix b/nixos/tests/syncthing/folders.nix index dbce02b279f2..264b2307aa39 100644 --- a/nixos/tests/syncthing/folders.nix +++ b/nixos/tests/syncthing/folders.nix @@ -42,6 +42,14 @@ in } ]; }; + folders.baz = { + path = "/var/lib/syncthing/baz"; + devices = [ + "b" + "c" + ]; + ignorePatterns = [ ]; + }; }; }; }; @@ -70,6 +78,16 @@ in } ]; }; + folders.baz = { + path = "/var/lib/syncthing/baz"; + devices = [ + "a" + "c" + ]; + ignorePatterns = [ + "notB" + ]; + }; }; }; }; @@ -90,6 +108,16 @@ in ]; type = "receiveencrypted"; }; + folders.baz = { + path = "/var/lib/syncthing/baz"; + devices = [ + "a" + "b" + ]; + ignorePatterns = [ + "notC" + ]; + }; }; }; }; @@ -131,5 +159,29 @@ in # Bar on C is untrusted, check that content is not in cleartext c.fail("grep -R plaincontent /var/lib/syncthing/bar") + + # Test baz + + a.wait_for_file("/var/lib/syncthing/baz") + b.wait_for_file("/var/lib/syncthing/baz") + c.wait_for_file("/var/lib/syncthing/baz") + + # A creates the file notB, C should get it, B should ignore it + a.succeed("echo notB > /var/lib/syncthing/baz/notB") + a.succeed("echo controlA > /var/lib/syncthing/baz/controlA") + c.wait_for_file("/var/lib/syncthing/baz/notB") + c.wait_for_file("/var/lib/syncthing/baz/controlA") + b.wait_for_file("/var/lib/syncthing/baz/controlA") + + # B creates the file notC, A should get it, C should ignore it + b.succeed("echo notC > /var/lib/syncthing/baz/notC") + b.succeed("echo controlB > /var/lib/syncthing/baz/controlB") + a.wait_for_file("/var/lib/syncthing/baz/notC") + a.wait_for_file("/var/lib/syncthing/baz/controlB") + c.wait_for_file("/var/lib/syncthing/baz/controlB") + + # Check that files have been correctly ignored + b.fail("cat /var/lib/syncthing/baz/notB") + c.fail("cat /var/lib/syncthing/baz/notC") ''; } diff --git a/pkgs/README.md b/pkgs/README.md index 55c28934440f..4118b92c2e14 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -58,7 +58,7 @@ Because entries in the Nix store are inert and do nothing by themselves, package For example: * Any package which does not follow upstream security policies should be considered vulnerable. In particular, packages that vendor or fork web engines like Blink, Gecko or Webkit need to keep up with the frequent updates of those projects. - * Any security-critical fast-moving package such as Chrome or Firefox (or their forks) must have at least one active committer among the maintainers. + * Any security-critical fast-moving package such as Chrome or Firefox (or their forks) must have at least one committer among the maintainers, who actively reviews, merges and backports updates. This ensures no critical fixes are delayed unnecessarily, endangering unsuspecting users. * Services which typically work on web traffic are working on untrusted input. * Data (such as archives or rich documents) commonly shared over untrusted channels (e.g. email) is untrusted. diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix index 49ab14ef4ccc..e094742ff39d 100644 --- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix +++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; publisher = "betterthantomorrow"; - version = "2.0.536"; - hash = "sha256-Q6T8Ab8kwOjdFM63SjTNEOgd+a6fL1PRGRredHzwg7U="; + version = "2.0.538"; + hash = "sha256-lJ9AnTNN9TkPDh9u2KV1BLn/fgZOWSOXNOTAdV+r6s4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix index d75c424fd981..a4fb9a86b9bf 100644 --- a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix +++ b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix @@ -13,19 +13,19 @@ let vsix = stdenvNoCC.mkDerivation (finalAttrs: { name = "gitlens-${finalAttrs.version}.zip"; pname = "gitlens-vsix"; - version = "17.6.1"; + version = "17.6.2"; src = fetchFromGitHub { owner = "gitkraken"; repo = "vscode-gitlens"; tag = "v${finalAttrs.version}"; - hash = "sha256-D0huUzjvyJTLxGgtTl1ZUQVwJx2uwO/uWGvcGfT8MyA="; + hash = "sha256-RN5PH8OvMUSqvVqt00VhfYQyazBBU5YLxzUEXaVB0+A="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-ZJAXjG1OF3Ey0LKJ4zadoRmbJg+qX2wAZCV4Ozrbyyg="; + hash = "sha256-R8E25vkc9kLjAEQ8UqxFhfvVbW5qMCWQUt3iWqJoSPE="; }; postPatch = '' diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix index 9e7d22319a7d..8f1704c5f510 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "debugpy"; publisher = "ms-python"; - version = "2025.10.0"; - hash = "sha256-NDCNiKLCU7/2VH43eTyOMBTZ3oxzA7JwCBit9+JHfmY="; + version = "2025.14.1"; + hash = "sha256-zmIv93uKBxgyI1cYh9WeF2g8ujm0Z++eoLN01aXaDF8="; }; meta = { diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index ab350c2509ae..7fc41a067fcd 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -48,11 +48,14 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/gui/src/SslCertificate.cpp \ - --replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";' + --replace-fail 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";' + + substituteInPlace CMakeLists.txt cmake/Version.cmake src/gui/CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 3.4)" "cmake_minimum_required(VERSION 3.10)" '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \ - --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml" + --replace-fail "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml" ''; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index a721ebfa285f..fa6eabd52df1 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -42,6 +42,11 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + postInstall = if stdenv.hostPlatform.isDarwin then '' diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index f4f3dff1d4f3..aa4814fc3d3c 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -203,8 +203,9 @@ let # Let killall expect "containerd-shim" in the Nix store substituteInPlace install.sh \ + --replace-fail '"''${K3S_DATA_DIR}"' "" \ --replace-fail '/data/[^/]*/bin/containerd-shim' \ - '/nix/store/.*k3s-containerd.*/bin/containerd-shim' + '/nix/store/[^/]*k3s-containerd[^/]*/bin/containerd-shim' remove_matching_line() { line_to_delete=$(grep -n "$1" install.sh | cut -d : -f 1 || true) 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 e17dac25316c..e93ffbfa246e 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.3.1esr"; + version = "140.4.0esr"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/af/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/af/thunderbird-140.4.0esr.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "e956f9633664fbea309bfaa7e61be6e393f8cd9f15c282f2c6489c2664e8162f"; + sha256 = "9e7479434b4c228b3305b9f199aa986f454b7dc3c016a8290779d897d2bf2ca4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ar/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ar/thunderbird-140.4.0esr.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9ed23fd8154194da58dfa601a1d582645151ddfa8261fb29882bc6df960d289f"; + sha256 = "9b1bfa25f5e30974332e21541b4d481b53440a08b885f04e77a1e63c822553b0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ast/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ast/thunderbird-140.4.0esr.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0b352e82a6ff35dc7f5cc733f8bd27913a145665eefc5cc073b055699e55ea1f"; + sha256 = "b73fca0ffbeef0cab7fe709f7ac36ff885e04cac141a03f574a37660f31061fd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/be/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/be/thunderbird-140.4.0esr.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "acf154e3aac9ba3476a7eb66eb8acd661fdd6bc8a3a14f3df45b9e84f413684c"; + sha256 = "5c8cf71aeed0930901b777e3af2be05f8539d4b5572272b96d064ca6c5cfbb43"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/bg/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/bg/thunderbird-140.4.0esr.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2d6fe53a1c65a722e469e4c2951c32e9b6d549f6684e72d9622e9a0de13e88d2"; + sha256 = "0fdd856a077c9bd05f9d0db1b51e9cbcbb63cc18aeca91eace69f2bb2e6962f3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/br/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/br/thunderbird-140.4.0esr.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "ba866ad75eebbbb857f487949a5b3e94ae801f24a1a101c6f68d2e03cf7d33f4"; + sha256 = "c99f08fb9ef698bee4776c49e596a9eb1087df0a898b4171a7e694c97ffff7b4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ca/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ca/thunderbird-140.4.0esr.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "953e7d88493c83fd7069fb9a2c2b40108f9c7b80dc87eabba447f018fe8789fd"; + sha256 = "d330bd3366c25b8e4fe25c1b09a666bed678df72a53c7932dc091f65e9f8a728"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/cak/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/cak/thunderbird-140.4.0esr.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "bb8766aa96bf876b7c594c3a454baa12d1e3006f6d7d99b05a540e7689ef63a0"; + sha256 = "e57ec80db6d5c8237d888d51a3b064bb395c3409be2fbf553f51025782c199aa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/cs/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/cs/thunderbird-140.4.0esr.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "f8ec6daa98ebdbcf0386c3e3637101b06c6641f1e7bd9ddb43f27d5839a21712"; + sha256 = "1d2067204a024a99cfe8b7684860caf6f74d64dbe63c6535026aebd8bd4c85a7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/cy/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/cy/thunderbird-140.4.0esr.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "2a6958a2333335d29a3d52b374792b11562efd080f72a90b8c764aa930165c5d"; + sha256 = "34831a0cffd3bb229edb880ac5790437cd0f6e7797936b90f7d744f8e37fd88e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/da/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/da/thunderbird-140.4.0esr.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "dc68ab3c693832d16bb5e4ef6bf4cdddef3002c908ad8d89f92f7c1c8af059dd"; + sha256 = "73e4e88d6780b1c833895ac95b9cbba958dd94f9c2ecac47019bbf3ab7975fc7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/de/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/de/thunderbird-140.4.0esr.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "d4c0f68036223d0d07615239fc11261a0b55369c449f93b5e6e1388a33bb521e"; + sha256 = "f490462e072b9ed530c1d40c0ad897dca0edac3d470d9c113d936bb0c4d80ae7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/dsb/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/dsb/thunderbird-140.4.0esr.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "d8c1a6caf6f133f38bb3b8fd1ef6dc0e8c73e9ba1c026da6806896ed6bb2800f"; + sha256 = "ab3816f52bf003c0423359b558ef1d3716e151937cfcee860bab294bc2abf9f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/el/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/el/thunderbird-140.4.0esr.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "09cfaa0bdd0dca490dac907823be0f4904280bd465be8f372befd0a40198f98c"; + sha256 = "ef27570d7c9598df0b05c178cd976b48b68ab97973cca97ff5fba485b94b5023"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/en-CA/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/en-CA/thunderbird-140.4.0esr.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "429cce649039c4cdfe7d7191a0fc5d63505ae62fbdf6052280850d0a5ce09f75"; + sha256 = "7144e845b5322773b1bc83374b65a5949b977ab1514584902360e8bf48d3b9cf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/en-GB/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/en-GB/thunderbird-140.4.0esr.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e5334909c6d9e994890930c68d16af1bc87c2a919edd1ddcbf94dfa248587280"; + sha256 = "82da909b7beff292511a5cf5dfa1d1abd48736c32b320853771c6bec8b45954e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/en-US/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/en-US/thunderbird-140.4.0esr.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "c83d482d6319b52f37145398de4968eca2088f5ba9e1da0797fff8534c8ceaac"; + sha256 = "86b461f0f53969e0da2e097ae7b353e90728c7064bddf1740d3548ca36f8d679"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/es-AR/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/es-AR/thunderbird-140.4.0esr.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "2e4d597b016d7644f2833fe90166fb19987fca8a3b7a7919de12d166fb1cf9d8"; + sha256 = "f26300b57e09dc77dddb528c3567fd3e3e3862308b64548f0e8ef764ad8e00ad"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/es-ES/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/es-ES/thunderbird-140.4.0esr.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f164b261572c8b0dccc01353a7a4c8548272cd58c76a55387b9f573e8586d6e8"; + sha256 = "784091614b011ee33cc77e447724605982b1a51ad9742e9fa42b379c65feccdc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/es-MX/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/es-MX/thunderbird-140.4.0esr.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "28623be55dc8636b3d41cae572e5c34c1ec743fbb939a9989ff61852add1c258"; + sha256 = "a6f84d6d512a4fa29966d6f4e834e63239bd2cb19915aebef3a04b09a0fc6ade"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/et/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/et/thunderbird-140.4.0esr.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "3ffe29447c94c79d16930a1be2ca274e3d65e729e830d5b304b2d3ad727ecb3f"; + sha256 = "2022fb0653d798484ca7facdcbe51cdd0f1246a57ee4586e3a15e3347295a822"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/eu/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/eu/thunderbird-140.4.0esr.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "1eabcd128257ba2f97218b43653c7a8269a686961bb579599fb3fdcdbaa2d706"; + sha256 = "8246129b0f728f910c7213893251e4b9ae3a82a6044e586a9899ed642cb53c4e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/fi/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/fi/thunderbird-140.4.0esr.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "dfbde834b2827c71e911b389786c809f7c05801b1bbbbd824ab9db4cdbeb1e50"; + sha256 = "76daa6d966fbc65e7e88fd85c9cd6d04e9a7391baa9c260f2d2f28dbac2af242"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/fr/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/fr/thunderbird-140.4.0esr.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "5fd7c4b0711a78f9087095e528402f0fe5a6e770da74d7dd4884f5d0da9006a9"; + sha256 = "77ce1cb334889472a9d2a8c1c5e448d0a3e3bf68767bc4e21b9e1b1f4e276427"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/fy-NL/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/fy-NL/thunderbird-140.4.0esr.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e373fbc067f55f1c26a3874607499e3b0c7e32896d5e644f40a8b201951224a4"; + sha256 = "703c98a57f0bcc603c0cfdee4af06a9fcfd37f0770f93fd2036b78d98736fe98"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ga-IE/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ga-IE/thunderbird-140.4.0esr.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "1693d0f2a785f6d07dc3c6c6e7a6185366b879841230e6203f6a641f4f87adea"; + sha256 = "d2b0141eaa64ed130f9098edc5671d02cf1abc16f6636a49b9a72ce334a7639c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/gd/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/gd/thunderbird-140.4.0esr.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "838fd1a6af7326ea8554b08d5b9f5b2626687b35ef317cb9e6a491d4c9c41acb"; + sha256 = "23bc5c1f4aa6125c80b7a09ca20dd2d572004b7627d9c7cf08eb4053a1d45dd0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/gl/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/gl/thunderbird-140.4.0esr.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f50487f1bbbd2929e373cdbc157b46ee1807eb688e7ae39de93d6ded24a0b0f4"; + sha256 = "185ba84a675a4556209e3ac4d59c5bc29c9aca27f27a72df21ca772eb4f12d0b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/he/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/he/thunderbird-140.4.0esr.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e8c0d2e8732cad25cc59920416babae37e41a203ca0403e34b47f451cef75326"; + sha256 = "565c4cbbca17a804021d8bebd27d4a5359456dabdaed546b7511c3436f72f6a7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hr/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/hr/thunderbird-140.4.0esr.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "6a7f0a9e1699439a95359d1308f53a65ca6c43c6fde7a783869ca7f485095f1a"; + sha256 = "de2c998771fe24a62d3b9ebc7d731e4953a2cbd9b6c2cfa5e704af1ebc14276f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hsb/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/hsb/thunderbird-140.4.0esr.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "5cdf82e0cc6481080e9d4462908158032f12b6968da3afb2e20db7c3b6802d87"; + sha256 = "012bdb4197d09e61b2c439cef50d3bf63b87efd4dc515d78b0740c51bd0e998b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hu/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/hu/thunderbird-140.4.0esr.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "662d03dd63318d1cd387d63c3451992b0f86d54c8ca362e722301db9a1419d03"; + sha256 = "d7ac0038cc7ecf98450af9d84b029b80501e6c380d2d93f3c75f7fe66c04050a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hy-AM/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/hy-AM/thunderbird-140.4.0esr.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "eb7296de57519701feae045894777714a52bb0993bdae7b540d4e88153978b2d"; + sha256 = "b987dfa97aabc384aeac5ee2c9863742bc50c284298a915713b15ded16b061ae"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/id/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/id/thunderbird-140.4.0esr.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "41d80326c0b7b1ca341ddd2dfa1e61d61f962e47680da37970945253f5664d7b"; + sha256 = "99f372091e98e94c6694eb68e0524d7df574b3c46a642ee48cfa3a08dffb1f99"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/is/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/is/thunderbird-140.4.0esr.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b51fb83ed7711b9f57780839ddfcb785b31640d7b5d3a6a9f43e9d6a9ce8a52a"; + sha256 = "b4d093d0c594dfffde08d61ad00903d1823d0f017e438c214d1dec6d371aa55c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/it/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/it/thunderbird-140.4.0esr.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f9b65a59c9f3b86d357a12dffb5839e5db51a62ec274e78e0919fd3f6964bf17"; + sha256 = "34777daa70b34d0f1bccb960c5f533013ab6a21f573035b7de272ad037b6896d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ja/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ja/thunderbird-140.4.0esr.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d37693281d5a3d0eedca544f119b3dd77aae3b0d7d15c162336e6d7aa6619a33"; + sha256 = "80c9e021d4becaef8445b4c07d3d4ab5a24801399be682424b6c9008b53e8b1d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ka/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ka/thunderbird-140.4.0esr.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "c5d56da1151b5f1e1bbfe6f80b3c60531a053ef15f7cf01205fbdb6b0599c0e4"; + sha256 = "6860257e57a462300a7c12a6e38da9486cb7aaf2d98fd8f1ed784297d0b8ae75"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/kab/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/kab/thunderbird-140.4.0esr.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "136ba1746163a811136d9e3b220039e74b4d987027e693a5c387a8f9491bdfbc"; + sha256 = "f5c7736d8d5241a639cfb0d07745851e41abb06b63ced06f43a89625e1070da7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/kk/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/kk/thunderbird-140.4.0esr.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "d3f34e5a7f45bd6c8915964faaf62dbd0bba3affe14ed3e690ec225f34067b2c"; + sha256 = "e706c43bab79837b9fcc86db23280be1deab36c64bfa63ea8bdd39165967799b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ko/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ko/thunderbird-140.4.0esr.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "ff13e6ba995f2178e60d6d6a3ef18733945319f7be5dde45520f9c8c48131547"; + sha256 = "951515b4b0ea6c1d08762bfbfca898e0a03a679dad307ffbe7fa38de1339dd2e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/lt/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/lt/thunderbird-140.4.0esr.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "e061e0e159bc68f623b0f8f80faed4ef069d3855f32b546dccb8ef9c9017bc3f"; + sha256 = "6f3d25bac59daaf3d32f4a067eedc0a8ea62f425eba8647eca68bb88b6e4b75a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/lv/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/lv/thunderbird-140.4.0esr.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3b678a9dade8e7e5e99d6cd14abb79b9873a7df5522a224386f0f72ed1c02c0e"; + sha256 = "83cec3a24afbec3f8f800b4f1598ca541541129a553275c9315473b2461c2679"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ms/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ms/thunderbird-140.4.0esr.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "50b1c3e4143dbba8369836854d002e044c0735562b990e2dcf34e9c25e25c27d"; + sha256 = "6ea0e003d0303f627d8adfc698ef654e03e678d982bd90b643b6c242c00872c1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/nb-NO/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/nb-NO/thunderbird-140.4.0esr.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "8acf2090a3e4b116826069ece232538eeb84fa519d9060536950044f5fd9c353"; + sha256 = "9b2079b576b66ceea88b3d973fa2e6bf7568c208eaab6e2f6a8a1d6f842300ff"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/nl/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/nl/thunderbird-140.4.0esr.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "dfd2f250932a5fa400dd808b0b2afcef244976744389f7e68113a279d9ed6953"; + sha256 = "9d81daccda08998bc4a50f66b9b5be13a9c2e9a68f424d15e51284095df74726"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/nn-NO/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/nn-NO/thunderbird-140.4.0esr.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "136229be6bcaa7d306a6796ee947be4dcb85d16423581fb22485bfdb803e6991"; + sha256 = "24c5a0c63e00014d880d4a6127f27da8205f5b78f1788bee61babef7c0e2028e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pa-IN/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/pa-IN/thunderbird-140.4.0esr.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "788312b3105bbb376b8d5fa634c22a7e67a6b18535ffc29566c8ab94622222a4"; + sha256 = "65117032aaf4733dde8b9aa4666d59b67c2edd67a9966d37020d0f710fbd62e6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pl/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/pl/thunderbird-140.4.0esr.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "13de91e131bc03c7e223e6d4e3dc0f751898029e8dee122d668487ab2beed46a"; + sha256 = "3937967a1e9af3626b201f55c755a9191ecef2db4ab787dca680e972cda4da8c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pt-BR/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/pt-BR/thunderbird-140.4.0esr.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "b0be7c8d1093ce5bb4188b7f29e138b415a5b981b86ef4b7d61ff1ffbe4d2fa3"; + sha256 = "5fa0ca3c8791b422990e6313504d7f2ca770df87509a3ede2eac24f3b33cceda"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pt-PT/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/pt-PT/thunderbird-140.4.0esr.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "fc72f8be624ea97ab3df23f96d9060117c4599a0b150df9e52f6fc8cf5e52f57"; + sha256 = "b2e8c123afad95ce3c6b874329ac8331273dc94d68636b77c975f17af9585527"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/rm/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/rm/thunderbird-140.4.0esr.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "d5833f037c0fe6a058660d5b20974690ac95666125e621b66154f523f2994bb1"; + sha256 = "3188d7d85179f4a967ddd8d5ea07bbfe0332ed29a55dea8e7d06326b91333e09"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ro/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ro/thunderbird-140.4.0esr.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "2d92168df1964adddb4ebdbd4631c2518a2726a877f072a9893c962d3d6188f9"; + sha256 = "72945101d3ec5c4e5c5f15a3cb15ea701299bf435f42ca524262e8c8df1032f3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ru/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ru/thunderbird-140.4.0esr.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "54d31a257426a014ccf389db7ce828262fae25672259ffadb41831bc90572640"; + sha256 = "2bffef84ce47c2c11c90b02bbb2513ad7b350dcc4de46f44feef953341311104"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sk/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sk/thunderbird-140.4.0esr.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "335d00c141b40803163407b8901eb02d1770b2d9e26a7f04268482cd11135ca4"; + sha256 = "6effb978b4531ce8f895921442ec297643a9764ced9499f0ff145e67af0778e9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sl/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sl/thunderbird-140.4.0esr.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "02f5d100993b535eb9797125e18bcd8b019d5932b7939633d04c50cf92f57513"; + sha256 = "ed6b0be98a5c2ae8da73d461ff1bc1c99870720a6ab700208a5923fec10d0c6c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sq/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sq/thunderbird-140.4.0esr.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "acc27f3458cc19087985ef1f1c404f98eca8b2c8c799f13fdbe0b9e121e2cbc6"; + sha256 = "49d04626241932d1b34528bde9e906a080c1472cd9f4d577e3fd603cb2539377"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sr/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sr/thunderbird-140.4.0esr.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5b377c0df4d23cf93d8b8dca9fd4c62089f4dcf5122885b93043765fd41ee479"; + sha256 = "d73974341c4a43f858671860b77e1db26068755f664e51f8338b21a229ffa4a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sv-SE/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sv-SE/thunderbird-140.4.0esr.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e124daec978a8bcf3fa42241e1cf8deacb375da6a4278535f23e7c9c4cad1bdc"; + sha256 = "6c56554d7d649a45f126e841637f7c3582e01b764856c17735b8f64c8643012c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/th/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/th/thunderbird-140.4.0esr.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "e736d9238bc6b4080c48cc8f0e261d044f7684b8d868a17f759c672bd473cdbc"; + sha256 = "81c03a0e3e17bec6141515532782e5cb5cd7e109bb6c612b28bb68e4b659ed45"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/tr/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/tr/thunderbird-140.4.0esr.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a8d79f5317d042679dd0bce602a0b719f6883b02b76f5ec69e2b6dae84c99fc8"; + sha256 = "28dc594425f84da8494b612dca6cae0dbee934b41a741a1f95e0163cf0e9c9a7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/uk/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/uk/thunderbird-140.4.0esr.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a8876dda0a5a79b58ee2e4fbf9c429c6a050b9e399b4a2f467425ebc9d0e7b1f"; + sha256 = "a892ff9e2adad8118f3cb88ec4775d36d30b96472069e9db43f29a094d590c40"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/uz/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/uz/thunderbird-140.4.0esr.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "99a143e3cd7da83ca51ed31cb517430206c86dcd747e7ded3ea4454f29dd9f04"; + sha256 = "5427a8bdaedcd7c25a84c1ec516185930ceb2c20cb5be812a302d9681702f2f9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/vi/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/vi/thunderbird-140.4.0esr.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "beac93fff89368f9e5f70e26efac6491034212e7ebcbb40e397ab5e6b227b31a"; + sha256 = "64bca02a6d78136c71048701eaf62f7211f2765c0f5de2a810f8662097388ec6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/zh-CN/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/zh-CN/thunderbird-140.4.0esr.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "32795b0feb937927c80bb5c62b4587b13103cab00d25f7b1f57ad53af145540d"; + sha256 = "bca2b193a249b7915457fd0a39020ba7edf559ec5d48339b890824c072b6c275"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/zh-TW/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/zh-TW/thunderbird-140.4.0esr.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7e57b8ffec05080c1ccd6f329660790aa8eec84679c768a0a7b7b40ed098aaaf"; + sha256 = "135a64f9dca152b1553990824d04acf1240f60f8b2039fdd1095ae3402c7143e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/af/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/af/thunderbird-140.4.0esr.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "141cbcdc5d7f1d5c45de0614f25c0001232f250ae039e2a029d7b721a1822632"; + sha256 = "653a06ca6cee5dec110a4a091230655f5d94b04d78841c27b6c4049da824da9a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ar/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ar/thunderbird-140.4.0esr.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "2e2c0d221e19b930e617e93e63d5a11a86bcaca7b3ba667beb0b924ff0ddd6fb"; + sha256 = "62a7e19b6574354979510de8f953da0a0dbf25f17a4a89ff3192afe04e0e8123"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ast/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ast/thunderbird-140.4.0esr.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "24261039a298823db9a9513ba3579118cb1b780234716236454714e3ad9242b0"; + sha256 = "35ecadc31d5edb35749265ab6169be8f6733d17d9b6d03cde182c046a12bad53"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/be/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/be/thunderbird-140.4.0esr.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "f07f276975c2353ffe69c037568d79396bbd0d9c0c3d6e9047936ded98dfa059"; + sha256 = "c6abcf864f94c02af2417aeee4858edaf886baa1911a90aed80aa63f9d2c8059"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/bg/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/bg/thunderbird-140.4.0esr.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "f31880553d9bc597d7d5009e0d10cfca2f7170f5c0bdd7f41e10be53ccc8c2d2"; + sha256 = "7d827acbc34d41dd0385c5b1a2d8ffeb744f67dadbf8f66dc5b00bb2c2b4d151"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/br/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/br/thunderbird-140.4.0esr.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "e56f2e56aee20a094d5362b56a455d0a3531df6ca1e5069d891b0635d16a0e26"; + sha256 = "02d56833bb8d8d8f008c0bafcd712c78239781254c1233a08f99a12b8c65c3f0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ca/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ca/thunderbird-140.4.0esr.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "d963a7daf319f196fb799aadc605c4927fe40795754fc8d7ecc26254d1ca376f"; + sha256 = "b55449b13271a1ca31fe33dd185eb96edcef8ac633b0abd9d1b9d5b7e060765f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/cak/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/cak/thunderbird-140.4.0esr.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "215e52a11c0f5fb8563ad9432c3578002cbfa840998b7419db09644f898e6ca3"; + sha256 = "374afe03f3bdf66a4d97aff966186f481353e166176df7336a656a4f27b0f76c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/cs/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/cs/thunderbird-140.4.0esr.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "71405c6a56bfb7b46d646199ff82109ef75c25f1e2b7e07ade7428c5ebfece07"; + sha256 = "b044018ee411e306f050b1f04decc11497b8002b302684452c2dce295f5ae004"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/cy/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/cy/thunderbird-140.4.0esr.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "96db58c3fc25f8196932fa11defe3c5a4a59682a8214a80691b09c9b0d5892eb"; + sha256 = "142a974d535c452f37c05b3f7a114341985c570372d336c37562c61cfc28d3c4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/da/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/da/thunderbird-140.4.0esr.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "69242a3c5cc752142291db634c92286266d4460d020471d12f1ea02baaf391d3"; + sha256 = "8561acea814f0e538dcaef45b41b97d00db11bc9bd4770c029c9ea0b57e87cca"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/de/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/de/thunderbird-140.4.0esr.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "8f36f835c7347c68267f620b3fa976c2708374447b2e9739452954023b94646c"; + sha256 = "c756bfe660c3a55b48f5dfc5718a54e2715052319c0ea080bf46d66f724429d7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/dsb/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/dsb/thunderbird-140.4.0esr.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "2d18cdf766b28b78293f6f49ba92956504669c04490e5ae8421727032fb0c698"; + sha256 = "b45b5d8ccab07292e81e402c957f0a33b81dfe4b3c79f5d9fa338dd8e4aa8447"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/el/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/el/thunderbird-140.4.0esr.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "93f112a14887a4afdd0a33794c60c3b3cef2f2ed04019219b0994e534744c561"; + sha256 = "085798ab3239a5bf6cfc2c3305f2aabb5f9257635b18ac00daf702dfa053c4da"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/en-CA/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/en-CA/thunderbird-140.4.0esr.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "096c889f4b020b48c2a4ef1e7f66b5b401b30f3d9304e74cdd8c75737bf781f5"; + sha256 = "8b85baac387d996b715a17640ebba501ac604f153821d8d545360b6fcaaf25aa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/en-GB/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/en-GB/thunderbird-140.4.0esr.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "3ac3ae104e943e18522a21454328b4c89a8b4b626564aea82ec1b9306819e561"; + sha256 = "0d38e70b450c8b22f9105351992f3a6c445f814d7a3ecd75a66284d128ed9896"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/en-US/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/en-US/thunderbird-140.4.0esr.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "978c2831a7b5e913d4d261cfa97af0c5900ba32e60a7cccf5425c8ff23f11c95"; + sha256 = "3ba3abc8e65bc421a35708aeb5daa8a8d8d8940c51808eeaf64abf120b62f7aa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/es-AR/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/es-AR/thunderbird-140.4.0esr.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "6182bec17e34784998c7e4cd76bfdc9712653f30a94331dfdb61d38b1540bf7b"; + sha256 = "eb4e6fb7219056961a9d6d8c3ab085fccf6c54c13ff401c9c72dd2f1155aedb5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/es-ES/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/es-ES/thunderbird-140.4.0esr.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "16416a0317dd208aac9e1d44067ec5f0ba609399033324d736f980f08409d1be"; + sha256 = "31b1e812bc548265acde111fb0130b7000e03d9569f0270d417979684ddc5f99"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/es-MX/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/es-MX/thunderbird-140.4.0esr.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "9cad4cf6d2efefecd36236b407b7a2204c02319cb673ac05921ed1afef0f0f4e"; + sha256 = "a80db313e50fed30f82e372390e74a742fc2a1697ba85f7a268bf482459c340a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/et/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/et/thunderbird-140.4.0esr.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "bd9fdece5679755582a058a3b8dee9bbe47f12b6264e08c3a977bb395c72248b"; + sha256 = "043b7ff50a97880cf5206462456188028ab752b745b3a320ad8b06d8576a7a32"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/eu/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/eu/thunderbird-140.4.0esr.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "6799ed256d553d1ba2338811a31cd47ee57a9d54c7db597062391f95b669921d"; + sha256 = "62d37c6a5f0f3d059156b8a0c74a4714a1c03ed333ecb49896662ceca30095d9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/fi/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/fi/thunderbird-140.4.0esr.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "c862d5bdf205a75b0304ccbee85ecb725cdfad848b75d99a6f6567ae59ef7cc7"; + sha256 = "29ed3c3e8f268dcbac74f2d2b5bb678ca820ce23719c50da783774d172deb484"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/fr/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/fr/thunderbird-140.4.0esr.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "196d1972c9f71cd8152f0dccf6642961b8b360423ad74a3facb40ca10b095b3a"; + sha256 = "befe452b31cb658e8aba6c0daa57c7dfcd1eaf8ce55763527351e3954ad6863b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/fy-NL/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/fy-NL/thunderbird-140.4.0esr.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "a2f7a4dc94fb17c0ceed511c6e591feb1894e1d707d4d74d69729f621690cd11"; + sha256 = "9acd83439e772bf06dd4db587e55c5489a172206a68683466d33f528004bebf1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ga-IE/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ga-IE/thunderbird-140.4.0esr.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "1786bc27d6849b482192dd2d2054f8a04ebf804399e8a99ddb67c98cbd57cdf7"; + sha256 = "7d7535c2ab59093c16277c0fc890288d08475b9004f738422eccb059a24acc32"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/gd/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/gd/thunderbird-140.4.0esr.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "35dbb7deab2e51d189dc2403f0b07b033c0d02d2208759a0469e530851576922"; + sha256 = "3a8880b124ee76086376e0467244397e4fe89c6761da929a11b54067d9f117cc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/gl/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/gl/thunderbird-140.4.0esr.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "92112627e51a1475b2d99e5db525de0c5584008411f41651f66078cefe0124ef"; + sha256 = "d26d3a80c189f4c96b25ce921b5b818b71976d4d9aa15aff65a860ad7f6969f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/he/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/he/thunderbird-140.4.0esr.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "809376eebee2424dc7642f659a394269d143030faf5d29e9e76f548d68dbc1e2"; + sha256 = "91a8eb69c96c29c8e285444bacfa433e53203745de0d0515fa37a42d76d52e6f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hr/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/hr/thunderbird-140.4.0esr.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "68463819531333131e3d160acf4c52a02914cbde0213da1f9337e98d5206057c"; + sha256 = "017e8f5acdc15ca9c54b3563797584a45bf35597b40f081764576e1c163cc3c1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hsb/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/hsb/thunderbird-140.4.0esr.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "dbd7bc581ffdc9a00028ccc4582582371518f001bbe25856177d5477907cd69a"; + sha256 = "77ef3bf47873f02ba8dc4f71da5b2dc6688aa8fbeafaeb14e5e1cd2c24ce9cb3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hu/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/hu/thunderbird-140.4.0esr.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "6a4fe0caeec91ef7a28bb3c958de33d4aecfa67ba80b7227e1bae6a2d9a25b41"; + sha256 = "5a3e5da48dbd8e70487466eafc47af1dacfe1d87927c78d95c9c3cb472c9793e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hy-AM/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/hy-AM/thunderbird-140.4.0esr.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "65f58458b447a59000d3e5ab32af9c95bb3b58857ec7501631f7e7b44f378aee"; + sha256 = "0fdd8e334e60b37cfd16b6809bf0c44c593092f2ba4b4bbdb02a6f9b1d00b513"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/id/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/id/thunderbird-140.4.0esr.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "d8ddd3f21ae3917649ec55a6509596dc4aa83cbb8f90ac0faace100f06b87bd3"; + sha256 = "b96547d1a2f5ccf89a993c716304da0956d0b4661bd09fb2e3cc829fb22d9642"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/is/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/is/thunderbird-140.4.0esr.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "fc75b9242bfb4b8d7688c0ff0f8426924b9376ef9e989725c971bcf39fde47b8"; + sha256 = "2cb684532b4e2d90a521a6313878b0c0a492c3570ff60ebf7a865c11f54bca57"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/it/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/it/thunderbird-140.4.0esr.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "de12e0c38756d5ece677d773bb3674b125b918644d6eb58de347404363067332"; + sha256 = "2956dc8fa8608e7aa39bb7af0c818a30d87ed3ca7d17827511c0802173f71d2a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ja/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ja/thunderbird-140.4.0esr.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "2262dcf37e3742b580e86f0dacc077e1a855879b8ca2056888f6817f7c0376c0"; + sha256 = "577c6c2050e266937ecf63844ae2c82809593ceb0a78673a4590a18703258a92"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ka/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ka/thunderbird-140.4.0esr.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "86bebe321ee191f714626b48fe9650e5b5eab11683b428312ba5e6d405fc236e"; + sha256 = "87087c07a1fa4f1dbc0b7cd13f1a601e001f159091d00532acaea0a1a561a88b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/kab/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/kab/thunderbird-140.4.0esr.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "7bee584e9c44edf6b86e329deed33dddbf43f9c427c9bf499754829d166eba8e"; + sha256 = "1f92f15bbddc682785023f47c1ae9d53c7a67eb28ec2ad976d44e94a127455c3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/kk/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/kk/thunderbird-140.4.0esr.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "909190b3e17f1b52e5c0512b5385d71cfd14cc0be92899f27ea07c41f4fc8351"; + sha256 = "d53cb8293321e123e89da7515d255673d141f93c476890eec91fd677fa221994"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ko/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ko/thunderbird-140.4.0esr.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "2c931f1ddcc65e5020f978e4a5cb49583e170bcb48cc72dff6697770430ad6fe"; + sha256 = "830b77adc70c000ab9646d737323134b94da7537643ee552a9dd802628b0b0cb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/lt/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/lt/thunderbird-140.4.0esr.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "06c55ea902253d74c648a957c048ab921edf706539b1adcb3a63e4046efa687e"; + sha256 = "64a00d688166d6ee20be52c863bc401da8170de84dc72e9860eab430b36eca99"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/lv/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/lv/thunderbird-140.4.0esr.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "636dd4ddfc78815789b7952ebfce1445690d121fc841fc386da9c5bd59db4f28"; + sha256 = "77e843c6d3c54d770f110e8b00e930b035992403ee7577fc497419bb32ca1832"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ms/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ms/thunderbird-140.4.0esr.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "8b571092ddf88999761e6da188e6521d0880db20f1ae3b1958ae624f6c447f4e"; + sha256 = "96fc422bd79875357fe766fc7813505c358310d9a7c6c67a14e9a0468d7e56a8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/nb-NO/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/nb-NO/thunderbird-140.4.0esr.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f061ffcfef6a56898cf66bf2261f74408b0d01e89dc5e6ff53dc94a9554f243f"; + sha256 = "4c6d1624e3e0fd78b59ef4fad8ffa05347e071123ae285ca91c5cc1df7fb2f0a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/nl/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/nl/thunderbird-140.4.0esr.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "531298208ce88fcd05cbcd9bc03de473714f2c77f11a8485b97bdaf271834b92"; + sha256 = "3f8b5bbc97b22763509c9df58a350b79acbf06ab7b7547256d3e59b4a4207f98"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/nn-NO/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/nn-NO/thunderbird-140.4.0esr.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "bc55ecda12d0dc53a6704d6229536003f4a720ae9c787b50d4e6f6bb4445a61a"; + sha256 = "71398757f66e9a302928a885e51e5992ef644717f0b187e78fd7d26186a8ee20"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pa-IN/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/pa-IN/thunderbird-140.4.0esr.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "abfdaa63bcbd4428530df6459a108f0a7c8bc6e80f3fbafa8e4899e8f05eb39a"; + sha256 = "16d133a601befc0487e0b801ee2228859b332b97fd63ba53f3b309d94b9bf394"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pl/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/pl/thunderbird-140.4.0esr.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "08f5fdbeb52a6cdcd9969fa233e2c985a640c9c0a59df61ae2fd7b0004f1fe46"; + sha256 = "b3de96dcfa150a834347d247a6aedcf8ebd4207ad1026db65471a0b27343c32f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pt-BR/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/pt-BR/thunderbird-140.4.0esr.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "c866a05e3c72d6e05073d1373cd7bdfb3fb8faf746375ec4f51e3946caa22f46"; + sha256 = "a3261296ac9c53cbf2a512dfb0a1c3f76a47dbfa1318ccfeec72c441fec11b78"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pt-PT/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/pt-PT/thunderbird-140.4.0esr.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "3936990bc963741ad780721dad715ba958c71818614523fb46621fb0dec147c6"; + sha256 = "3f04c4c9089a2879110a25494c367f8536938ac46dfb0da7773e9fba969b6484"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/rm/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/rm/thunderbird-140.4.0esr.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "ca044dc761fe2bebec563a37757b563cdfe2eec18e4cf2d451a1b7bd0e03a46f"; + sha256 = "960901f039310fc784e40a18aa9df2c9a4c1aaa1dd1e2644fa73aaf38245f262"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ro/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ro/thunderbird-140.4.0esr.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "13b98157852329a91240498112f841f03d90c239c41c57d0a31eec6a2eb01ad0"; + sha256 = "950bad41fa8870f96d96a6ca02978284485177247e0d001ed892b65d15043567"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ru/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ru/thunderbird-140.4.0esr.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "461a8c8433a5f49b979f03377f0ac7f2a81307660a83c4727b677a1487fd2a15"; + sha256 = "5e91ee670f3b7f7c6583df05f32178340ce1661b7cd55133b55567c94507dd36"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sk/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sk/thunderbird-140.4.0esr.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "a24ccc5a44a459a5c15d9dd59ba4395a31abccd0bf9238c9ca1c0f229716d5ee"; + sha256 = "8a542d2341ea2a6021f0e06e348a0863fd8b4740804c20993158fde498052db1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sl/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sl/thunderbird-140.4.0esr.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "0c5fc0afeb40f6bf238e541e56ce414a43ef54fa195888c3862aa78f5c371326"; + sha256 = "9bc0da52da2a2eca87ffbe7c88abded935d40050693b9f2197d9d804e4edca3b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sq/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sq/thunderbird-140.4.0esr.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "429bcc3349926e2ff220320092bfa0e24babb315dca3dc61a66f1f7a6b54c9c4"; + sha256 = "70bb5a66dff94c7c3a3466d6c56d099c0afdec01cc417799d2e84554dad16d25"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sr/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sr/thunderbird-140.4.0esr.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "442d0363c258c61cdb1690380181712f9159d1b3a3a9a12df62efe403f145797"; + sha256 = "f454f8a278f4b74d2488b0633d87a97c85afec2f92d4a5746f4b883609f2c921"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sv-SE/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sv-SE/thunderbird-140.4.0esr.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "055c4212a3650e53f43ab6fa859e03e7475fe0b6da1b4a87c5671dec827f53eb"; + sha256 = "2d82dce3eb19d242321cc1f0d693f26007f87e5150ca1326d3a470e317a1df02"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/th/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/th/thunderbird-140.4.0esr.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "37a9840af005b2aca0e024223bdc388f19b6e9d8ab381519266667b01eda8eac"; + sha256 = "7993bd083a6ad9dd278197feecec87a8b912287b8e75d4ec4db1732b99f19a7d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/tr/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/tr/thunderbird-140.4.0esr.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "dbc8ae7228249b490dc845e3030e1c625facd625f322b6c1ba1b5201038a7f2c"; + sha256 = "ba88ee6a56e2fec8ac64349ddcf94376c2c6f2bd20cec079d677fc6b1f92f3c9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/uk/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/uk/thunderbird-140.4.0esr.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "5436eca8f68ee7833c2e3a3bcee56db0d3d66b3bd3a98059c07508181f4c8116"; + sha256 = "a178dcf466e3f68d3f4538939079e3ecf04b9d504eaa27d9c6722f272a511c12"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/uz/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/uz/thunderbird-140.4.0esr.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "af154fd7ec1c00bf8b5e0f8c2d8a03050caf5030923fa579736507cadc60f9d4"; + sha256 = "99ed1858ff772bd1ea99bbe56dd5d631317e1849d7bfee3b288345b6579d3742"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/vi/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/vi/thunderbird-140.4.0esr.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "2c0310ea5985ef44a8edf9cbb2505e14f79f18d88852a1d6830b150daf4bdae9"; + sha256 = "495f013bc162106a4cf15710c8c52fb22ab9c8983aa44e3371d9e99d1cc0c517"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/zh-CN/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/zh-CN/thunderbird-140.4.0esr.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d20df69fe34109f124e939af4dc52234c9e36e106491dac8f1fa8b82bd638871"; + sha256 = "f744c06612923b08fff2de9a5bb978b8da1a0dc0512a84b14beca5d449779e94"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/zh-TW/thunderbird-140.3.1esr.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/zh-TW/thunderbird-140.4.0esr.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "d837f2211c60a8d9c14cf2ce125806631061f6bab758247d8baec0797207ef42"; + sha256 = "d7693ba6cfd087d370276ad062404a7cf62b6ed20cff20f48cfdac354945e4b4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/af/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/af/Thunderbird%20140.4.0esr.dmg"; locale = "af"; arch = "mac"; - sha256 = "20f115cd2954afbaceeef193405212e80711cf76d0e0b6199a7edfd292bac237"; + sha256 = "2b9f86934b94ab0341ac43f3ff668012f46e12630df25ead6597f150aafd25e5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ar/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ar/Thunderbird%20140.4.0esr.dmg"; locale = "ar"; arch = "mac"; - sha256 = "63a4e846d880eb81fb2a8fb81face1dd9ac0a0815a82a14f0e5c3cde898d33aa"; + sha256 = "cfa4570ad1891a744cfd51415cdc3c0ec95523f73a9827623c3633cc80c05986"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ast/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ast/Thunderbird%20140.4.0esr.dmg"; locale = "ast"; arch = "mac"; - sha256 = "4338e715e946f662471891008b5bc6e7adc8393cf5a96ab86a382ce04cbce6c5"; + sha256 = "d51481eaa3c4b2a055d666fdd7f345ffa6dea80400548ee63cec74eda1285547"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/be/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/be/Thunderbird%20140.4.0esr.dmg"; locale = "be"; arch = "mac"; - sha256 = "c4210d35120f742302b26db54acb8a6310c8c287908f996de72914010324786b"; + sha256 = "6be488c6788b722285db1fca3ae6ac470f08a3a6878303d836e789b516fbd203"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/bg/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/bg/Thunderbird%20140.4.0esr.dmg"; locale = "bg"; arch = "mac"; - sha256 = "edbbda1f4982b1730b0f722bbf17cc05ad8b70e66c16af7812885e40e3606098"; + sha256 = "93594488a516d5056589ba103394dde8b43fd70e9cbf8559ca5d91d3de56b321"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/br/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/br/Thunderbird%20140.4.0esr.dmg"; locale = "br"; arch = "mac"; - sha256 = "f1fa61c3db825155265371a382ce9fc3ea07fcdf375a6b0d10035afcd4f9aac2"; + sha256 = "6ce35f02916b1ec15d7a386ac1426a2014cbc0750f4a6dfdf5f0c22278ec7be4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ca/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ca/Thunderbird%20140.4.0esr.dmg"; locale = "ca"; arch = "mac"; - sha256 = "75f5bf743b9d1fafa3f7f2ddf8689ed01ac507e8d4b896e3177f4c995f59706f"; + sha256 = "0252b5b1415ae3e5fe6293ca43c250d7481b1bf0076686ca7bf64e21743b3a6f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/cak/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/cak/Thunderbird%20140.4.0esr.dmg"; locale = "cak"; arch = "mac"; - sha256 = "79c78160253c67a3e3429806703a9840ee9b5df047b6b4c0095ad4eeb683af66"; + sha256 = "6c49a96f648868f795fbe435f069a8efbef15c63a6d65b3e3dc2cf7bfbc79d1e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/cs/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/cs/Thunderbird%20140.4.0esr.dmg"; locale = "cs"; arch = "mac"; - sha256 = "115c1e9acd7dc63b8ef5b3d47d53d4b061137a2bb2d9d5cb015f098de6222b85"; + sha256 = "ce445f8af666fc8cb34cd0df92e327a60138f63567803453b6ecc291e97959fb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/cy/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/cy/Thunderbird%20140.4.0esr.dmg"; locale = "cy"; arch = "mac"; - sha256 = "6f690c8e1fa4465a147045c8f4b5f0e0bdc29723d69677a5fc29a66653954da2"; + sha256 = "fb5f92217bd85a29ed1a75c799cf4b14bd980c3166c9aff829180c443bce6ab6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/da/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/da/Thunderbird%20140.4.0esr.dmg"; locale = "da"; arch = "mac"; - sha256 = "ef54483cab54bfa8d00577c3741ab3c856190798ddfd154bd355822f7af7df8e"; + sha256 = "cbda1405b9280bfc344a8ea9e225cdfe9e5c9c12bed22183a34d76a9fee6de59"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/de/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/de/Thunderbird%20140.4.0esr.dmg"; locale = "de"; arch = "mac"; - sha256 = "a2972ac2e3227e05b95b34df8ea9dbd46c3d8b6164bddba830af562b1c87ce1e"; + sha256 = "fb8b7f3c43f10ddab84719f5df783e412cbcdd4e3e524b4e617d331339243491"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/dsb/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/dsb/Thunderbird%20140.4.0esr.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "9bc1a18d9987eb3a99767a6479cec05a8e3427a59235c3e0ddd585584cff915e"; + sha256 = "a095527bb12b1934118531e031afc98f1f4872381c9b5ff0f5c31d255484698a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/el/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/el/Thunderbird%20140.4.0esr.dmg"; locale = "el"; arch = "mac"; - sha256 = "c97bfbf95583470c947478a4c97d8cc92702e7ec8ceda7f633b1acd0ef08ab61"; + sha256 = "7d8e522a227219a7eb911a5fe505f05d2c8796c6455cb84da46a149ef0299ffe"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/en-CA/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/en-CA/Thunderbird%20140.4.0esr.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "1a8f768a30315f0c5014d859b32ed0f5c5c1c72811b81c18a89fba9df7ed6d09"; + sha256 = "ece5a57536fa76d3aabcb4b762fd6d546d5e90c9a4deaf3449435b74786b26bb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/en-GB/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/en-GB/Thunderbird%20140.4.0esr.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "00930cbc380314c64919c41efaeff5ac236f1828ac8f8fef7611c857da29a860"; + sha256 = "e530d5a57bd3ba2425656c8f71682251533d099436d03da5ac5fdeff55033f82"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/en-US/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/en-US/Thunderbird%20140.4.0esr.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "9b44c8ad3bfba131ab62d67c3a5af11ba73dd37edd19f9ed299380aa6d1ce9b0"; + sha256 = "eb0a1bc6ddbeb9cfdafa51098608d3f5eb4ad5a4ac6d8000d10bc8d0c4f1f1de"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/es-AR/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/es-AR/Thunderbird%20140.4.0esr.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "32686eb688f3a732acc6401b0e0883ee21860e0395808ef876fe39016e161952"; + sha256 = "375de958e67df4c3ea923e22cc8d3f6a927849c454c1172a032d00287a12b537"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/es-ES/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/es-ES/Thunderbird%20140.4.0esr.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "b515957a2a876f7d2fab1007c52746909abaacd221a894014291f4baa46a75bc"; + sha256 = "64eb6e25c5f67b0051778b461b5ec0f61cd4a3daf66daaa5dd718dfe47a6677f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/es-MX/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/es-MX/Thunderbird%20140.4.0esr.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "ad97b8b7cac5028d315e9b003600aeaaa16046545e58b5d7d825c1ce5ff958ac"; + sha256 = "0c1ba25c421ac64c125c322c546388f1b73e0276460a0256ff140ee4cb8230fe"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/et/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/et/Thunderbird%20140.4.0esr.dmg"; locale = "et"; arch = "mac"; - sha256 = "77d9cf797a1a5df00634178b672dea6227025d4d0919a1f42254421e9ab72468"; + sha256 = "ff8c80fdf745473cb4c1ca1b7751d03849138c32ba72eb94ad2919505497556f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/eu/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/eu/Thunderbird%20140.4.0esr.dmg"; locale = "eu"; arch = "mac"; - sha256 = "e9665feb488e63a974c5e137685856dd46ae74d9d09b3db32ca623366b019a82"; + sha256 = "24dc4be9dfc2342c9b649d9fdb5ecd5dfd98b109c5f57aa2d7517269924e36df"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/fi/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/fi/Thunderbird%20140.4.0esr.dmg"; locale = "fi"; arch = "mac"; - sha256 = "75083a46cb5b4fc0a5beba54fc8c96d54473fdfd58dcf48ca9f29f7e9006d236"; + sha256 = "87343610642c8314d104f6bb97524660be3fdbfaa3b138fc247b1d4bcbdd5aa0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/fr/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/fr/Thunderbird%20140.4.0esr.dmg"; locale = "fr"; arch = "mac"; - sha256 = "4d37be8922dccf766c6c04b15823de2f8f30b9c9ef0816b9f464ba25b2edf5c1"; + sha256 = "5ae2035849c929f9b565ef69849b902d6e81dca34dd06f5d91ae491cd6bdda19"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/fy-NL/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/fy-NL/Thunderbird%20140.4.0esr.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "5346cb9a49fa822940000dea8401f537f02af2ea4fd97f377ca2ec8286b7e056"; + sha256 = "a20274e0ed2581ae4435266f24653ee8d00982133ad7f7eb7fc2c11b0e64cd9d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ga-IE/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ga-IE/Thunderbird%20140.4.0esr.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "ba48461b4db3b3994487f7bc85f5e0e7c279afa85a07ce29c8713d618e08b24e"; + sha256 = "f4b61cebd660abce11dbfa62291aa8b0067b4b64515c4dff54619dc33330bf3c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/gd/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/gd/Thunderbird%20140.4.0esr.dmg"; locale = "gd"; arch = "mac"; - sha256 = "f60a683e321af703876c0db82d8a0688f6b1c6ad973f131c81d69dd92d23cb8e"; + sha256 = "57e511186cff193c0872e45a2f3a5948351f2c1c01edf6b09b4ad3e63965da49"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/gl/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/gl/Thunderbird%20140.4.0esr.dmg"; locale = "gl"; arch = "mac"; - sha256 = "0a912b86029f48d9398a44cd003700d91c718e221e755d842a5747493faaa799"; + sha256 = "893b8013605c2046e7e8cde74ce1c094b06163235ea25de5d0cd8716b9c58606"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/he/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/he/Thunderbird%20140.4.0esr.dmg"; locale = "he"; arch = "mac"; - sha256 = "ba7b5793af2091ec563ff56fe3583b0d60a4f3a11bd9dd12acc158e2e08609e4"; + sha256 = "87087c308b4850153bf8dbd23282437973842595a5cc39c5cba975f2a5d8ed88"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hr/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/hr/Thunderbird%20140.4.0esr.dmg"; locale = "hr"; arch = "mac"; - sha256 = "c4cdd8c36b112eb9a7740323ee1afc86b4b60b78f15a8b38740f6cb7d7234c94"; + sha256 = "5a0bed361a38af3bbce176f7f5c84a16eaa0d0077ef79ac10878da7173a8f4e0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hsb/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/hsb/Thunderbird%20140.4.0esr.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "d76cd753cbc5476b7c1c9b9089a800ad703b79e9f00a5b411c533bd4e12e9864"; + sha256 = "560e2af4758eea43cc3e91947d9bcac1d229df45c980bb5b3037b6b91cce799c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hu/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/hu/Thunderbird%20140.4.0esr.dmg"; locale = "hu"; arch = "mac"; - sha256 = "7fecb8178db42fb1624847991a88197cb7a25ad0b5b43da3c0ec5dd5e9ef7ed4"; + sha256 = "2cd75e419d4e5ed054e761cb908eb7376b01faccf2535447b11fcf8d50d79939"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hy-AM/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/hy-AM/Thunderbird%20140.4.0esr.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "7cb89e818872a645d5f427dcfedde9b9be60c8770dc346875f634a50f124e7ee"; + sha256 = "4f39be919b15d2b36b22003bb4aed0fb9b48ee517d60a9cadcbe0cfcdc759903"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/id/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/id/Thunderbird%20140.4.0esr.dmg"; locale = "id"; arch = "mac"; - sha256 = "df77301b219a03897931bf94c9c6e677149f7c02dabacbea080a43f47d5e2e08"; + sha256 = "5d8915b78bd539e87011a585c6e439ad27ccb40188f3999a30fff53e79d71263"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/is/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/is/Thunderbird%20140.4.0esr.dmg"; locale = "is"; arch = "mac"; - sha256 = "47aac46979211e862345d767f22a0739ac1adb385e11cdc7f53bda47f3f59d92"; + sha256 = "4cad9a68ea2e713a81376caaa85335b5dd8d3febfc06b9fec04f2f49861be88f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/it/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/it/Thunderbird%20140.4.0esr.dmg"; locale = "it"; arch = "mac"; - sha256 = "7844c40d0cf241bcc6dc3e5f695f0aee540500ca23b62d43d3a65acb2b3fe1e0"; + sha256 = "b5c8bb87de852fd8d45ec09c366de6a939cc020bf4c56bcbe74ae862c854cddc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ja-JP-mac/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ja-JP-mac/Thunderbird%20140.4.0esr.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "6773857a1d1e275c19616a00d859cb122a0bb62bf2edf3809e81ad3ecf837e0c"; + sha256 = "76d516e46a3f2bd5fc0da7ee0d6c73f8ec14685fc1fce7cfd18ee408c6c0fa30"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ka/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ka/Thunderbird%20140.4.0esr.dmg"; locale = "ka"; arch = "mac"; - sha256 = "a5d6516204d4dceed0dd2fe5a021a30bbae66e3f0c8743749179fb1119e1d3f7"; + sha256 = "ed617ed9ac2a7c68d116dffa9b7ecc0f359968d1d3663ab461367158e8d0a004"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/kab/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/kab/Thunderbird%20140.4.0esr.dmg"; locale = "kab"; arch = "mac"; - sha256 = "67f8fc4a908d1a93fc8d3338c887569d3eb17bd2f177bf430b309bd954f9718f"; + sha256 = "a79feaef4fb690c9a56d139921676475f3cf8ce259e9d1f201d005437ecedaec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/kk/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/kk/Thunderbird%20140.4.0esr.dmg"; locale = "kk"; arch = "mac"; - sha256 = "97a00e5a3b9fa2a93ea74f0fdf6a4a6d85cd97701e064eeb28fb288f09a4b7f1"; + sha256 = "55872e2ab16ab4af4267b137a6f54029c34e34828109cacf8b21b45add5b123a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ko/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ko/Thunderbird%20140.4.0esr.dmg"; locale = "ko"; arch = "mac"; - sha256 = "8626dae3c88f63bbf7b4d324279102240ed26cebf53ff5a794f48fe218fb84e5"; + sha256 = "1ef3cb988025f9e638c7ecbe5e90d839ed1135c99db12432b5a4e955799287b3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/lt/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/lt/Thunderbird%20140.4.0esr.dmg"; locale = "lt"; arch = "mac"; - sha256 = "17b6759a5671eb94feed2481fc80f211b37d95f89879f71ddefa74da5ab9f245"; + sha256 = "f9d6057adb85028064b00cf7f10cd8338b2130ecf491b2195e65af3e797f0d41"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/lv/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/lv/Thunderbird%20140.4.0esr.dmg"; locale = "lv"; arch = "mac"; - sha256 = "fec5316838fcb3d5c08381bd425c7b3395baf836b43c14c988862138fa7f7856"; + sha256 = "8d544eaa938ea79d6268748bb283bd92b1448c059ca646fdaf36c4471c8acd00"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ms/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ms/Thunderbird%20140.4.0esr.dmg"; locale = "ms"; arch = "mac"; - sha256 = "b086d9eab3043be43fccb8c86635ab205f267df86e7e711c5378e9652e4666a0"; + sha256 = "b1112f7b01008a9c968a7880842f1650b6d8b15b74ae196d481422ce46d8f775"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/nb-NO/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/nb-NO/Thunderbird%20140.4.0esr.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "fff8619e734a0e1d2445e2a1b5f483f16acc7821fcd4a4e362de1de5e2f966dc"; + sha256 = "daa01be94e6b2a830d606795563a24e68fe60990b9c9cb71231653cea29767b5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/nl/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/nl/Thunderbird%20140.4.0esr.dmg"; locale = "nl"; arch = "mac"; - sha256 = "33dc51ec3b5bc0791df31c84883c8e246fa8a477a251359b0200b40a0f5eeadd"; + sha256 = "a7f000a5241c94142d6386f69a886a3736493a5702ad5ff647abec6a5fd90c6c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/nn-NO/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/nn-NO/Thunderbird%20140.4.0esr.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "7f8b72cc02e6162713ed05c0b2bf80057ed935604b45241f4638dcf2c095969c"; + sha256 = "6494f87cde0f105ae0b3d051ece6c92dfd3e878853410e29f25d6a70ee928f74"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pa-IN/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/pa-IN/Thunderbird%20140.4.0esr.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "858a024b316f96b629f1042c2cfad47c54da571887e5600d57b05856420bfdd6"; + sha256 = "704d3065d7a47a9c7af2d45c0139811c2e168c4d8a501fc45a36ed06b170eb12"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pl/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/pl/Thunderbird%20140.4.0esr.dmg"; locale = "pl"; arch = "mac"; - sha256 = "20124dc0ffda461f68ae1efc1e7277f439126d73d02f0c659961591853b7eadd"; + sha256 = "c305ee51b4e0d3ff187d729f7841586e3f17e28430918f9c93e15bea9e3121c6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pt-BR/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/pt-BR/Thunderbird%20140.4.0esr.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "d9691bc4f1fa9c95ec2b140ea005eb292293de90cf70d30700f10c63b430c41a"; + sha256 = "014d2e9b86a455e7666ca53fc1f7ce3f65f97404d9c2a3232e0c688ca1cfe8ce"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pt-PT/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/pt-PT/Thunderbird%20140.4.0esr.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "4b3a13d53f3c5042db0ee51df9d830e3f4fcb3f5beb76d08a4d7e879c33f752d"; + sha256 = "df1b3fc88b7fdd32a6d43dcd4bfa73bdf3ba7480f7318800eeac410c4d9e29b3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/rm/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/rm/Thunderbird%20140.4.0esr.dmg"; locale = "rm"; arch = "mac"; - sha256 = "7e1b52adac3cfd0f99251d6d50eb4db7537d65cd2728f7e6ff318cef1388b34a"; + sha256 = "03387e02dc528c23603759a063e56aa4d1beef35124cb62bb0d826fdfe3a8135"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ro/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ro/Thunderbird%20140.4.0esr.dmg"; locale = "ro"; arch = "mac"; - sha256 = "e671f0073aa33f92ab9d8876d105dd03bc2127d0ad9e27f450e9c40436780d67"; + sha256 = "0a65227549c1f1db305d96b8bd55670f6cb5d81c174f919f8dd255d190aa13e1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ru/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ru/Thunderbird%20140.4.0esr.dmg"; locale = "ru"; arch = "mac"; - sha256 = "4402f6f45c5e187cbe324f078439cb8638cdd66128e667761b7c494f363e6306"; + sha256 = "7e7c650538d825081b56dd77a1f8274e5df2583657a0b15fb44956b1c1b98f91"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sk/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sk/Thunderbird%20140.4.0esr.dmg"; locale = "sk"; arch = "mac"; - sha256 = "515a38a46266d3e3da73dcd530a8d503194e6107b2a600c5592fcc0f57408181"; + sha256 = "7af96995e67e314cd278623abf9af23778af25323cae3dcfa8fa9af7b8165c7e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sl/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sl/Thunderbird%20140.4.0esr.dmg"; locale = "sl"; arch = "mac"; - sha256 = "bd1b726a9246a8100b3205568c727e7d1f63a7d383b8b9453af7a15ecd236261"; + sha256 = "7d659882c6a9270ebc6cacf396db2735bab463b0cd69b551946a6a95c08f53c9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sq/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sq/Thunderbird%20140.4.0esr.dmg"; locale = "sq"; arch = "mac"; - sha256 = "766cd20dc1f533a398cb360681833ba48e11f6fe6929503082ab2c6ec2c76d3a"; + sha256 = "d50e1e2cffefb92e708bf6f32864d34fda53e03046a22015fa945a9dabbfca5f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sr/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sr/Thunderbird%20140.4.0esr.dmg"; locale = "sr"; arch = "mac"; - sha256 = "f7573ef1e846ebc0b32025e948a261602278f49eadb94b4d925f57ea50bf15f0"; + sha256 = "ca5afcb5032e9072d94ebbb3542213785e8e3402384b6ef6298a948faa2841f6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sv-SE/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sv-SE/Thunderbird%20140.4.0esr.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "2a17943aa5793632c0659cdc900392e350eea8e9610787923e75ba6d962ba6c4"; + sha256 = "65e2775d6c2f3c95928889c3faae8a03412eba5f0f4cca0d9fa28ca6f853b879"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/th/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/th/Thunderbird%20140.4.0esr.dmg"; locale = "th"; arch = "mac"; - sha256 = "c76af30c8339fe81ba5f1a96ab3975943377ecf01bb862a3f2806ba4a35ed7cb"; + sha256 = "38f9ed2272ddf921886546d8be2db62a24e9e4c8fad4073806fb47fde589017b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/tr/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/tr/Thunderbird%20140.4.0esr.dmg"; locale = "tr"; arch = "mac"; - sha256 = "b23c300baa227ee40d580498437cb68444e49a6e5006ade9eca64e49f4bf04f7"; + sha256 = "2e6ddd14745d0577c553166791323a8b83e571900b56eeccb65f4358abb5b2a0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/uk/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/uk/Thunderbird%20140.4.0esr.dmg"; locale = "uk"; arch = "mac"; - sha256 = "54f58b050f72a98143bc6ed14a64723879a76986d113bcd95ee7e6c8a27ad82b"; + sha256 = "9986d7cd69b8e6561ad72af8bd3096e7df0ae5710f0c0ea2a8d995730e881665"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/uz/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/uz/Thunderbird%20140.4.0esr.dmg"; locale = "uz"; arch = "mac"; - sha256 = "15711d642b42cb5e75a4b7bc5e8de929f296d7dff14ff17225b5ff54ea028896"; + sha256 = "4b9ef669d6899b0353cddcfa0589285cd12bb45ede26604c2aaf176e8cc9fe55"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/vi/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/vi/Thunderbird%20140.4.0esr.dmg"; locale = "vi"; arch = "mac"; - sha256 = "b9499aaa463763e4bd1970d73e33bfef0fbadcf2e2d04689b8c45ac22d4959cd"; + sha256 = "f749a2f83d2ce179e485cb93ee2b71313924adfadda0786d6b0de77abee3a7c6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/zh-CN/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/zh-CN/Thunderbird%20140.4.0esr.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "5b0ed3b9d0f0efc6ea79012e78a0f23a522d81e9efcff9f9a53fed4819184cc0"; + sha256 = "14cc428227819eff46e6d4a28c530a72afa7b795c897d194bbb1fb130ed734f8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/zh-TW/Thunderbird%20140.3.1esr.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/zh-TW/Thunderbird%20140.4.0esr.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "c98421d56e8b46ab9768a45d2d55d0b7657671184abaf8b6834b359b48ef76ec"; + sha256 = "d7eb52fe22b210177bd27f8a10da57f510bb37ab62d5c0deaff2a21ba5c0e734"; } ]; } diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix index f81a7db70d85..6129fd149edf 100644 --- a/pkgs/by-name/ar/armadillo/package.nix +++ b/pkgs/by-name/ar/armadillo/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "15.0.3"; + version = "15.2.0"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-n1XsEPCpH7ZHmrTtKzelJEWu6RdwaiONFwtSIMAi/kM="; + hash = "sha256-L3HAZh/EpG4t1Wt2Uc87tZKLSZpLEN8x78GkJB7fAEM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index 08bbd94b9e98..a1e68c3d6965 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "12.5.1"; + version = "12.6.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-F85GYOOheQ1Gx4NAWErfRwUjmjjRIv6EbXrlUPt9TX4="; + hash = "sha256-wV3LzrATUlNdPuqh/uB+EPeAPqbfWXEEhtctOIxJrWs="; }; proxyVendor = true; - vendorHash = "sha256-ayv4qwiOHbZkLWIA8RIJ2GiS2QZlDeJnnbDXIHP7BCE="; + vendorHash = "sha256-NDwPDij1dFpBjgePyQ7y2f4BIMl92ugDAYNOZJk+6bs="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 553c3235aaa0..c0b420dc2d94 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -16,20 +16,20 @@ let sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/production/fe5d1728063e86edeeda5bebd2c8e14bf4d0f96a/linux/x64/Cursor-1.7.38-x86_64.AppImage"; - hash = "sha256-52QJVbXO3CYeL4vVZ249xabS7AoYFDOxKCQ6m3vB+vE="; + url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/linux/x64/Cursor-1.7.52-x86_64.AppImage"; + hash = "sha256-nhDDdXE5/m9uASiQUJ4GHfApkzkf9ju5b8s0h6BhpjQ="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/production/fe5d1728063e86edeeda5bebd2c8e14bf4d0f96a/linux/arm64/Cursor-1.7.38-aarch64.AppImage"; - hash = "sha256-4yUjLAiC7wZYYmAnVNUbRuvLBrpAfC/Kb9y/nONtwkM="; + url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/linux/arm64/Cursor-1.7.52-aarch64.AppImage"; + hash = "sha256-96zL0pmcrEyDEy8oW2qWk6RM8XGE4Gd2Aa3Hhq0qvk0="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/fe5d1728063e86edeeda5bebd2c8e14bf4d0f96a/darwin/x64/Cursor-darwin-x64.dmg"; - hash = "sha256-x56I8XaOvFK7GDlfyAHD18DdUwZrKf7hlXAROplqKU0="; + url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/darwin/x64/Cursor-darwin-x64.dmg"; + hash = "sha256-0//Sv57iEgRm/exnUnKVpdyk6fwxAnx0PDg2mVaB9J8="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/fe5d1728063e86edeeda5bebd2c8e14bf4d0f96a/darwin/arm64/Cursor-darwin-arm64.dmg"; - hash = "sha256-14H1jvVmSsywkFm6M3BFLAwUzorehrbVvo9OJo6cEdk="; + url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/darwin/arm64/Cursor-darwin-arm64.dmg"; + hash = "sha256-g8Fk9+MDwzLTNitxJMApypfiLWEjze0PR2OIPC774j8="; }; }; @@ -39,7 +39,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = finalCommandLineArgs; - version = "1.7.38"; + version = "1.7.52"; pname = "cursor"; # You can find the current VSCode version in the About dialog: diff --git a/pkgs/by-name/dn/dns-collector/package.nix b/pkgs/by-name/dn/dns-collector/package.nix index a52e8cfe8f8d..23140923c324 100644 --- a/pkgs/by-name/dn/dns-collector/package.nix +++ b/pkgs/by-name/dn/dns-collector/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "dns-collector"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "dmachard"; repo = "dns-collector"; tag = "v${finalAttrs.version}"; - hash = "sha256-2NHJs2KdSDw36ePG8s/YSU4wlWG+14NQ6oWJYqMv2Wk="; + hash = "sha256-LQJxK2MZtFeFm5keNoNSDHXmxS8z9/fsCV02BGsph74="; }; subPackages = [ "." ]; @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { "-X github.com/prometheus/common/version.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-N0gaDyOlRvFR1Buj/SKoOjwkVMRxd8Uj7iT/cDBfM9A="; + vendorHash = "sha256-nZheY/CbzDR/GB4Nu3xiWXsxrrvu/AKZE0gquBrfXXM="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/do/dockerfmt/package.nix b/pkgs/by-name/do/dockerfmt/package.nix index a07d22af7c8a..98bbbfa00381 100644 --- a/pkgs/by-name/do/dockerfmt/package.nix +++ b/pkgs/by-name/do/dockerfmt/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "dockerfmt"; - version = "0.3.7"; + version = "0.3.9"; src = fetchFromGitHub { owner = "reteps"; repo = "dockerfmt"; tag = "v${finalAttrs.version}"; - hash = "sha256-cNxPe0LOZyUxyw43fmTQeoxvXcT9K+not/3SvChBSx4="; + hash = "sha256-eTsYL2UAVW2M1aQGc5X1gT5cXpXKgshLmN+U5Qro/Qw="; }; vendorHash = "sha256-fLGgvAxSAiVSrsnF7r7EpPKCOOD9jzUsXxVQNWjYq80="; diff --git a/pkgs/by-name/eg/eget/package.nix b/pkgs/by-name/eg/eget/package.nix index 751e81a62008..c518330c8637 100644 --- a/pkgs/by-name/eg/eget/package.nix +++ b/pkgs/by-name/eg/eget/package.nix @@ -6,17 +6,16 @@ installShellFiles, nix-update-script, testers, - eget, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "eget"; version = "1.3.4"; src = fetchFromGitHub { owner = "zyedidia"; repo = "eget"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-jhVUYyp6t5LleVotQQme07IJVdVnIOVFFtKEmzt8e2k="; }; @@ -25,7 +24,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.Version=v${version}" + "-X main.Version=v${finalAttrs.version}" ]; nativeBuildInputs = [ @@ -34,6 +33,7 @@ buildGoModule rec { ]; postInstall = '' + rm $out/bin/{test,tools} pandoc man/eget.md -s -t man -o eget.1 installManPage eget.1 ''; @@ -41,16 +41,16 @@ buildGoModule rec { passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { - package = eget; + package = finalAttrs.finalPackage; command = "eget -v"; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; }; - meta = with lib; { + meta = { description = "Easily install prebuilt binaries from GitHub"; homepage = "https://github.com/zyedidia/eget"; - license = licenses.mit; - maintainers = with maintainers; [ zendo ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ zendo ]; }; -} +}) diff --git a/pkgs/by-name/ei/eigen2/cmake-4-build.patch b/pkgs/by-name/ei/eigen2/cmake-4-build.patch new file mode 100644 index 000000000000..2fa18bbfc9d3 --- /dev/null +++ b/pkgs/by-name/ei/eigen2/cmake-4-build.patch @@ -0,0 +1,47 @@ +diff --git i/CMakeLists.txt w/CMakeLists.txt +index bb12a7cf5..932187427 100644 +--- i/CMakeLists.txt ++++ w/CMakeLists.txt +@@ -1,5 +1,5 @@ + project(Eigen) +-cmake_minimum_required(VERSION 2.6.2) ++cmake_minimum_required(VERSION 3.10) + + set(INCLUDE_INSTALL_DIR + "${CMAKE_INSTALL_PREFIX}/include/eigen2" +diff --git i/doc/examples/CMakeLists.txt w/doc/examples/CMakeLists.txt +index 9db5b1f58..b535ae80e 100644 +--- i/doc/examples/CMakeLists.txt ++++ w/doc/examples/CMakeLists.txt +@@ -8,12 +8,10 @@ ADD_EXECUTABLE(${example} ${example_src}) + if(EIGEN_STANDARD_LIBRARIES_TO_LINK_TO) + target_link_libraries(${example} ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO}) + endif() +-GET_TARGET_PROPERTY(example_executable +- ${example} LOCATION) + ADD_CUSTOM_COMMAND( + TARGET ${example} + POST_BUILD +- COMMAND ${example_executable} ++ COMMAND ${example} + ARGS >${CMAKE_CURRENT_BINARY_DIR}/${example}.out + ) + ADD_DEPENDENCIES(all_examples ${example}) +diff --git i/doc/snippets/CMakeLists.txt w/doc/snippets/CMakeLists.txt +index 7458830b0..153dbfc68 100644 +--- i/doc/snippets/CMakeLists.txt ++++ w/doc/snippets/CMakeLists.txt +@@ -14,12 +14,10 @@ ADD_EXECUTABLE(${compile_snippet_target} + if(EIGEN_STANDARD_LIBRARIES_TO_LINK_TO) + target_link_libraries(${compile_snippet_target} ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO}) + endif() +-GET_TARGET_PROPERTY(compile_snippet_executable +- ${compile_snippet_target} LOCATION) + ADD_CUSTOM_COMMAND( + TARGET ${compile_snippet_target} + POST_BUILD +- COMMAND ${compile_snippet_executable} ++ COMMAND ${compile_snippet_target} + ARGS >${CMAKE_CURRENT_BINARY_DIR}/${snippet}.out + ) + ADD_DEPENDENCIES(all_snippets ${compile_snippet_target}) diff --git a/pkgs/by-name/ei/eigen2/package.nix b/pkgs/by-name/ei/eigen2/package.nix index 2df45c985510..961879811827 100644 --- a/pkgs/by-name/ei/eigen2/package.nix +++ b/pkgs/by-name/ei/eigen2/package.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # CMake 2.6.2 is deprecated and is no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + patches = [ ./cmake-4-build.patch ]; + meta = with lib; { homepage = "https://eigen.tuxfamily.org"; description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; diff --git a/pkgs/by-name/eq/eq10q/package.nix b/pkgs/by-name/eq/eq10q/package.nix index 5a6de756f6f9..3e758c0c94ca 100644 --- a/pkgs/by-name/eq/eq10q/package.nix +++ b/pkgs/by-name/eq/eq10q/package.nix @@ -45,13 +45,17 @@ stdenv.mkDerivation rec { # Fix build with lv2 1.18: https://sourceforge.net/p/eq10q/bugs/23/ find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \ -exec sed -i {} -e 's/const _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \; + + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" ''; installFlags = [ "DESTDIR=$(out)" ]; fixupPhase = '' - cp -r $out/var/empty/local/lib $out - rm -R $out/var + mkdir -p $out/lib + mv $out/usr/local/lib/* $out/lib/ + rm -R $out/usr ''; meta = { diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 1e294851f6a1..b64a7d7d8514 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "14.18.0"; + version = "14.20.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-1yTcMzyznr0b/ObVEECdJuBUi03aiTAwgcTdJ1QFcWY="; + hash = "sha256-CX/2luy78Du6gsGG3ex0Q5amu93MqebTUF9of7D6H4M="; }; - npmDepsHash = "sha256-VJquJ7mDBHeclgd/jsAPyRLEFOQp27tUXGAQJX3bXyQ="; + npmDepsHash = "sha256-laYq6NNGsJ2YGhg6i0iFCVk+qyRqYdZPSSWzVHailcc="; nativeBuildInputs = [ python3 diff --git a/pkgs/games/flightgear/openscenegraph-flightgear.nix b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix similarity index 100% rename from pkgs/games/flightgear/openscenegraph-flightgear.nix rename to pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix diff --git a/pkgs/games/flightgear/default.nix b/pkgs/by-name/fl/flightgear/package.nix similarity index 86% rename from pkgs/games/flightgear/default.nix rename to pkgs/by-name/fl/flightgear/package.nix index 42c793c335b6..056b3269774a 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/by-name/fl/flightgear/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitLab, - wrapQtAppsHook, callPackage, libglut, freealut, @@ -28,9 +27,7 @@ udev, fltk13, apr, - qtbase, - qtquickcontrols2, - qtdeclarative, + qt5, glew, curl, }: @@ -71,7 +68,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - wrapQtAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ libglut @@ -98,21 +95,24 @@ stdenv.mkDerivation rec { udev fltk13 apr - qtbase - qtquickcontrols2 + qt5.qtbase + qt5.qtquickcontrols2 glew - qtdeclarative + qt5.qtdeclarative curl ]; qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ]; - meta = with lib; { + meta = { description = "Flight simulator"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ + raskin + iedame + ]; + platforms = lib.platforms.linux; hydraPlatforms = [ ]; # disabled from hydra because it's so big - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; mainProgram = "fgfs"; }; } diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index e25f348ef2ce..e1e7f11d8e47 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -33,6 +33,7 @@ let "TestCloneIfRequired" "TestActionCache" "TestRunContext_GetGitHubContext" + "TestSetJobResult_SkipsBannerInChildReusableWorkflow" # These tests rely on outbound IP address "TestHandler" @@ -41,17 +42,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "11.1.2"; + version = "11.2.0"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-/rkBrG8hRn52M1ybjbWtSDFYsJ4fHzw9qAoc5325g9A="; + hash = "sha256-hjrn36Fm2kIKqn16DOPcrMF38dhsGOZVHCTrhkS99QQ="; }; - vendorHash = "sha256-eVOmUozNLHRiNwIhbf7ebVNdRiMAtLMdYI7pnALvl8U="; + vendorHash = "sha256-QokVTTfMGAJG4Jqfs7mfGXrC4QSZfOXesfF2OeN0L9M="; # See upstream Makefile # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index 59e81b9cc729..b558288d28d7 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -25,6 +25,18 @@ }: let + ebur128Src = fetchFromGitHub { + owner = "jiixyj"; + repo = "libebur128"; + rev = "v1.2.6"; + hash = "sha256-UKO2k+kKH/dwt2xfaYMrH/GXjEkIrnxh1kGG/3P5d3Y="; + }; + mimallocSrc = fetchFromGitHub { + owner = "microsoft"; + repo = "mimalloc"; + tag = "v2.2.4"; + hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o="; + }; radaeSrc = fetchFromGitHub { owner = "drowe67"; repo = "radae"; @@ -34,13 +46,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freedv"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; tag = "v${finalAttrs.version}"; - hash = "sha256-+hVh5GgSz8MWib10dVV6gx9EvocvLAJm2Eid/4y//2E="; + hash = "sha256-awWeq0ueKAK+4mAM0Nv3SsSv/mIFQ+/TqCPw9wjed1w="; }; patches = [ @@ -48,11 +60,20 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' + cp -R ${ebur128Src} ebur128 + cp -R ${mimallocSrc} mimalloc cp -R ${radaeSrc} radae - chmod -R u+w radae + chmod -R u+w ebur128 mimalloc radae substituteInPlace radae/cmake/BuildOpus.cmake \ --replace-fail "https://gitlab.xiph.org/xiph/opus/-/archive/main/opus-main.tar.gz" "${libopus.src}" \ --replace-fail "./autogen.sh && " "" + substituteInPlace cmake/BuildEbur128.cmake \ + --replace-fail "GIT_REPOSITORY https://github.com/jiixyj/libebur128.git" "URL $(realpath ebur128)" \ + --replace-fail 'GIT_TAG "v''${EBUR128_VERSION}"' "" \ + --replace-fail "git apply" "patch -p1 <" + substituteInPlace cmake/BuildMimalloc.cmake \ + --replace-fail "GIT_REPOSITORY https://github.com/microsoft/mimalloc.git" "URL $(realpath mimalloc)" \ + --replace-fail "GIT_TAG v2.2.4" "" substituteInPlace cmake/BuildRADE.cmake \ --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath radae)" \ --replace-fail "GIT_TAG main" "" diff --git a/pkgs/by-name/fr/frozen/meson.build b/pkgs/by-name/fr/frozen/meson.build index 1db9546491ce..a551018bad0f 100644 --- a/pkgs/by-name/fr/frozen/meson.build +++ b/pkgs/by-name/fr/frozen/meson.build @@ -7,7 +7,7 @@ project( 'werror=true' ], license: 'Apache-2.0', - version: '20210223' + version: '1.7' ) library( diff --git a/pkgs/by-name/fr/frozen/package.nix b/pkgs/by-name/fr/frozen/package.nix index dfd96c7ce58a..6f3c8fbe729f 100644 --- a/pkgs/by-name/fr/frozen/package.nix +++ b/pkgs/by-name/fr/frozen/package.nix @@ -6,16 +6,15 @@ ninja, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "frozen"; - # pin to a newer release if frozen releases again, see cesanta/frozen#72 - version = "unstable-2021-02-23"; + version = "1.7"; src = fetchFromGitHub { owner = "cesanta"; repo = "frozen"; - rev = "21f051e3abc2240d9a25b2add6629b38e963e102"; - hash = "sha256-BpuYK9fbWSpeF8iPT8ImrV3CKKaA5RQ2W0ZQ03TciR0="; + tag = finalAttrs.version; + hash = "sha256-dOQb6wVufkqOSVZa2o8A1DLad0zvo2xQzmu09J2ZT7E="; }; nativeBuildInputs = [ @@ -41,4 +40,4 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ thillux ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix index b1e7acd4a5c1..5270a47e3e06 100644 --- a/pkgs/by-name/gi/git-town/package.nix +++ b/pkgs/by-name/gi/git-town/package.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "git-town"; - version = "22.0.0"; + version = "22.1.0"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; tag = "v${version}"; - hash = "sha256-yLDzMKyg9t5VNFXRS+FDD6W0Z80eNNywfZAMOhxNSZU="; + hash = "sha256-hM6aEH4xiMgRWvIzja9QQUZvwdufG1FYooeUO1qJpbU="; }; vendorHash = null; diff --git a/pkgs/by-name/gl/glm/package.nix b/pkgs/by-name/gl/glm/package.nix index 1cda3e6bf26b..d9daa49d4f4c 100644 --- a/pkgs/by-name/gl/glm/package.nix +++ b/pkgs/by-name/gl/glm/package.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.1"; + version = "1.0.2"; pname = "glm"; src = fetchFromGitHub { owner = "g-truc"; repo = "glm"; rev = version; - sha256 = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE="; + sha256 = "sha256-2xKv1nO+OdwA0r+I9OZ+OCL9dJFg/LJsQfIvIF76vc0="; }; outputs = [ diff --git a/pkgs/by-name/go/go2rtc/package.nix b/pkgs/by-name/go/go2rtc/package.nix index 2ba89c7d06f4..39dbedf1bb94 100644 --- a/pkgs/by-name/go/go2rtc/package.nix +++ b/pkgs/by-name/go/go2rtc/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "go2rtc"; - version = "1.9.10"; + version = "1.9.11"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "go2rtc"; tag = "v${version}"; - hash = "sha256-SWFVcfOfSCKuNJlahsZRY21n17vL1VjtDRiSZ5o3VGc="; + hash = "sha256-MJb88RwASZnURnqb8nmCKvf8G3VW+Vd1JlNtbh7i/Ps="; }; - vendorHash = "sha256-k01+xngNA4SMCJa9Vhg+MxDgf973sUcrVXppwAz4MBs="; + vendorHash = "sha256-iOMIbeNh2+tNSMc5BR2h29a7uAru9ER/tPBI59PeeDY="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix index a8aee6571366..495f99d32624 100644 --- a/pkgs/by-name/ho/homepage-dashboard/package.nix +++ b/pkgs/by-name/ho/homepage-dashboard/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { --set-default HOMEPAGE_CONFIG_DIR /var/lib/homepage-dashboard \ --set-default NIXPKGS_HOMEPAGE_CACHE_DIR /var/cache/homepage-dashboard \ --add-flags "$out/share/homepage/server.js" \ - --set PATH "${lib.makeBinPath [ unixtools.ping ]}" + --prefix PATH : "${lib.makeBinPath [ unixtools.ping ]}" ${if enableLocalIcons then installLocalIcons else ""} diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 6bbd714f5f05..f41c80aa8e9a 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "33.3.1"; + version = "33.3.2"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-qbC1FVhnkVlsT+lOSeM6wDbKV2c5iTHgBxZENGEBnUI="; + hash = "sha256-qJfywH5rwfgTy8k7Db3vC09Lx+UP50iWSsXnTIQWJQo="; }; - npmDepsHash = "sha256-/HxMh5v3CfCpPCF8cf8Z2NXDBovJFvMaQfYFZvuyNX0="; + npmDepsHash = "sha256-MzeUHVJXmtLWNh2iNA0RiXw1fi5Cf/sWeCQG2YCMxvU="; nativeBuildInputs = [ remarshal diff --git a/pkgs/by-name/is/ispike/package.nix b/pkgs/by-name/is/ispike/package.nix index fb1754934fe4..3688511138ac 100644 --- a/pkgs/by-name/is/ispike/package.nix +++ b/pkgs/by-name/is/ispike/package.nix @@ -3,9 +3,13 @@ stdenv, fetchurl, cmake, - boost, + boost186, }: +let + boost = boost186; +in + stdenv.mkDerivation rec { pname = "ispike"; version = "2.1.1"; @@ -17,6 +21,11 @@ stdenv.mkDerivation rec { postPatch = '' sed -i "1i #include " include/iSpike/YarpConnection.hpp + + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace src/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" ''; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch b/pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch new file mode 100644 index 000000000000..5e59b385b4f8 --- /dev/null +++ b/pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch @@ -0,0 +1,31 @@ +From 61f2d2f7e308c42cce652db4a172cfa4b0ff6bf1 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Sat, 18 Oct 2025 22:45:37 +0200 +Subject: [PATCH] tests/testhash.c: Properly request shutdown of test2 threads + +So they can be destroyed properly. Fixes sometimes-occuring SIGSEGVs. +--- + tests/testhash.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tests/testhash.c b/tests/testhash.c +index 0769aa6..cb6ed24 100644 +--- a/tests/testhash.c ++++ b/tests/testhash.c +@@ -134,7 +134,12 @@ int test2(void) + } + + for (i = 0; i < ttl; i++) { +- ks_thread_destroy(&threads[i]); ++ ks_thread_request_stop(threads[i]); ++ } ++ ++ for (i = 0; i < ttl; i++) { ++ ks_thread_join(threads[i]); ++ if (ks_thread_destroy(&threads[i]) != KS_STATUS_SUCCESS) return 0; + } + + +-- +2.51.0 + diff --git a/pkgs/by-name/li/libks/package.nix b/pkgs/by-name/li/libks/package.nix index ec0937c50037..811b7097c7ef 100644 --- a/pkgs/by-name/li/libks/package.nix +++ b/pkgs/by-name/li/libks/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchpatch, cmake, + ctestCheckHook, pkg-config, libuuid, openssl, @@ -28,6 +29,9 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/openwrt/telephony/5ced7ea4fc9bd746273d564bf3c102f253d2182e/libs/libks/patches/01-find-libm.patch"; sha256 = "1hyrsdxg69d08qzvf3mbrx2363lw52jcybw8i3ynzqcl228gcg8a"; }) + + # Remove when https://github.com/signalwire/libks/pull/246 merged & in release + ./1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch ]; dontUseCmakeBuildDir = true; @@ -43,6 +47,25 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.isLinux libuuid ++ lib.optional stdenv.hostPlatform.isDarwin libossp_uuid; + nativeCheckInputs = [ + ctestCheckHook + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + disabledTests = [ + # Runs into certificate error on aarch64 + # [ERROR] [...] testhttp.c:95 init_ssl [...] SSL ERR: CERT CHAIN FILE ERROR + "testhttp" + + # Runs into what seems like an overflow / memory corruption in the testing framework on the community runner. + # Doesn't happen on local ARM hardware, maybe due to unexpectedly high core count? + "testthreadmutex" + ]; + + # Something seems to go wrong with testwebsock2 when using parallelism + enableParallelChecking = false; + passthru = { tests.freeswitch = freeswitch; updateScript = nix-update-script { }; @@ -53,6 +76,7 @@ stdenv.mkDerivation rec { description = "Foundational support for signalwire C products"; homepage = "https://github.com/signalwire/libks"; maintainers = with lib.maintainers; [ misuzu ]; + teams = [ lib.teams.ngi ]; platforms = platforms.unix; license = licenses.mit; }; diff --git a/pkgs/by-name/li/libui-ng/darwin-no-universal.patch b/pkgs/by-name/li/libui-ng/darwin-no-universal.patch new file mode 100644 index 000000000000..587490d0ab85 --- /dev/null +++ b/pkgs/by-name/li/libui-ng/darwin-no-universal.patch @@ -0,0 +1,13 @@ +--- a/meson.build ++++ b/meson.build +@@ -72,10 +72,6 @@ + libui_macosx_version_min = '-mmacosx-version-min=10.8' + add_global_arguments(libui_macosx_version_min, language: libui_darwin_langs) + add_global_link_arguments(libui_macosx_version_min, language: libui_darwin_langs) +- +- libui_arch = ['-arch', 'x86_64', '-arch', 'arm64'] +- add_global_arguments(libui_arch, language: libui_darwin_langs) +- add_global_link_arguments(libui_arch, language: libui_darwin_langs) + endif + + if libui_MSVC diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix index 54312f6918fd..d58d382a9a5a 100644 --- a/pkgs/by-name/li/libui-ng/package.nix +++ b/pkgs/by-name/li/libui-ng/package.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation { hash = "sha256-pnfrSPDIvG0tFYQoeMBONATkNRNjY/tJGp9n2I4cN/U="; }; - postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' - substituteInPlace meson.build --replace "'-arch', 'arm64'" "" - ''; + patches = [ + ./darwin-no-universal.patch + ]; nativeBuildInputs = [ cmocka diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix index 260272bf87ae..6a31cf80f004 100644 --- a/pkgs/by-name/li/live-server/package.nix +++ b/pkgs/by-name/li/live-server/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "live-server"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "lomirus"; repo = "live-server"; - rev = "v${finalAttrs.version}"; - hash = "sha256-0IP7F8+Vdl/h4+zcghRqowvzz6zjQYDTjMSZPuGOOj4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-FKX1rbRKWkWsxzJZDicVAUqrHBwEe2o7EXIouK74UMA="; }; - cargoHash = "sha256-MMeeUoj3vYd1lv15N3+qjHbn991IVMhIUCMd0isCNhk="; + cargoHash = "sha256-gaBYnhljcMqSEPViaOPMtuHjoDP8iY64UizlfK+fcQA="; nativeBuildInputs = [ pkg-config ]; @@ -30,10 +30,13 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Local network server with live reload feature for static pages"; downloadPage = "https://github.com/lomirus/live-server/releases"; homepage = "https://github.com/lomirus/live-server"; - changelog = "https://github.com/lomirus/live-server/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/lomirus/live-server/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; mainProgram = "live-server"; - maintainers = [ lib.maintainers.philiptaron ]; + maintainers = with lib.maintainers; [ + philiptaron + doronbehar + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index 4938520f0f1e..a2a71085d428 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.59.5"; + version = "0.59.7"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-raJXFBApLb17jiDdia60gchqayDVDbgC+hztXjz0Ofs="; + hash = "sha256-qOb4viLMZme6sJzWxJuYkubQ3D67j5gkkLTRkcL2QKI="; }; - vendorHash = "sha256-hg9vzosB6yVS0e0McekIuchWaByYS02kbbtilKjCo7s="; + vendorHash = "sha256-JMynPCH5Zvzz8nYI7DPu9TzU+rWJemPwyDdlPkFiqds="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config; diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix index 0a867bf501f3..352805263d4b 100644 --- a/pkgs/by-name/oh/oh-my-zsh/package.nix +++ b/pkgs/by-name/oh/oh-my-zsh/package.nix @@ -19,14 +19,14 @@ }: stdenv.mkDerivation rec { - version = "2025-09-27"; + version = "2025-10-15"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "242e2faa51675494cbfa78a81f3ff47d81039863"; - sha256 = "sha256-xYwo5/ONf5nRgfVSnEadPUkPDaOsJhk7doqRs4zp39E="; + rev = "d1c04d8a33f9127d03b69617c5367db5ceebc8a7"; + sha256 = "sha256-Nt/7UZJl+7Kw7trMByuyhjE7RnccgAzW1oNwKsIx3Jw="; }; strictDeps = true; diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 4f303a9d42d0..1d38172673f5 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -22,12 +22,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "0.15.8"; + version = "0.15.10"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-6brfh6yTFGnhUo9kZ5VAcC1whhMPJYYwVIT7j6g+wkw="; + hash = "sha256-aP0CLHfuF21GXIvBTgs8RWpcCXOwy1oPW2P8jEU/4u4="; }; tui = buildGoModule { @@ -111,10 +111,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputHash = { - x86_64-linux = "sha256-EfH8fBgP0zsKVu26BxFq1NCwWLG6vlOhDD/WQ7152hA="; - aarch64-linux = "sha256-Bwwe9PTYwEJvTLhB2+6yzC4pB2/1J/JGI8S1TSrdOuM="; - x86_64-darwin = "sha256-TBSBpuPE+V7oanEMW6F8PvCZSLqIokibsyO1NtbLQnM="; - aarch64-darwin = "sha256-+wUulok3OdJ0YewuyOkv5zbiC+3QzhokfT3aCdL5akk="; + x86_64-linux = "sha256-iJbflfKwDwKrJQgy5jxrEhkyCie2hsEMmiLf2btE60E="; + aarch64-linux = "sha256-wQ+ToXRi+l24WM24PHGCw6acD9cvLDldOv9WvOzHYGU="; + x86_64-darwin = "sha256-DyvteSN+mEFZojH8mY4LNQE2C6lCWwrIVbJUFn4lAh0="; + aarch64-darwin = "sha256-oICPefgikykFWNDlxCXH4tILdjv4NytgQdejdQBeQ+A="; } .${stdenv.hostPlatform.system}; outputHashAlgo = "sha256"; diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 11749bbc3444..976f85ba7c0f 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton10-20"; + version = "GE-Proton10-21"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-sJkaDEnfAuEqcLDBtAfU6Rny3P3lOCnG1DusWfvv2Fg="; + hash = "sha256-Oa9+DjEeZZiJEr9H7wnUtGb6v/JXHk0qt0GAGcp3JFQ="; }; dontUnpack = true; diff --git a/pkgs/by-name/ra/rar/package.nix b/pkgs/by-name/ra/rar/package.nix index 45794631b5b9..c8ff6a36e996 100644 --- a/pkgs/by-name/ra/rar/package.nix +++ b/pkgs/by-name/ra/rar/package.nix @@ -4,35 +4,27 @@ fetchurl, autoPatchelfHook, installShellFiles, + perl, }: let - version = "7.01"; + version = "7.12"; downloadVersion = lib.replaceStrings [ "." ] [ "" ] version; # Use `./update.sh` to generate the entries below srcs = { - i686-linux = { - url = "https://www.rarlab.com/rar/rarlinux-x32-${downloadVersion}.tar.gz"; - hash = "sha256-1CSbxM7arGpn4Yj5fHEFKcDURFPrC2+XptLoaDH8LDs="; - }; x86_64-linux = { url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz"; - hash = "sha256-34iWajylsSmIOuAT6kV7c2537qWFHc+gT+JT/trWrw8="; + hash = "sha256-Yw2andExNnJzZnvuB5rRA/Rp8bfNvJtCpPKDzCmTurI="; }; aarch64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz"; - hash = "sha256-BjEJFzKyRpN4XL6KYW7ykQcSxqF4tYr2dCFf50JHH38="; + hash = "sha256-lQeOD1n/0F6+ZlpVfp1NHAcxVqJ3fZFn9sQg7kSKg8U="; }; x86_64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz"; - hash = "sha256-1ExnVDre49wWwB/BKP/L9xdYOMx8qkeZfmObJ7xm4dY="; + hash = "sha256-Wzp5Izpc4usNldBEb3OZCeNyByTTJegoxbDD8HNnCPo="; }; }; - manSrc = fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/rar.1?h=rar&id=8e39a12e88d8a3b168c496c44c18d443c876dd10"; - name = "rar.1"; - hash = "sha256-93cSr9oAsi+xHUtMsUvICyHJe66vAImS2tLie7nt8Uw="; - }; in stdenv.mkDerivation { pname = "rar"; @@ -48,9 +40,17 @@ stdenv.mkDerivation { nativeBuildInputs = [ installShellFiles + perl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + postPatch = '' + perl -0777 -i -pe 's/ ([\w .-]+\n) ~+\n/=head1 \U$1/g' rar.txt + perl -0777 -i -pe 's/ (Copyrights)/=head1 \U$1/g;' rar.txt + mv rar.txt rar.1.pod + pod2man -c "RAR User's Manual" -n "RAR" -r "rar ${version}" -s 1 rar.1.pod > rar.1 + ''; + installPhase = '' runHook preInstall @@ -58,14 +58,11 @@ stdenv.mkDerivation { install -Dm755 default.sfx -t "$out/lib" install -Dm644 {acknow.txt,license.txt} -t "$out/share/doc/rar" install -Dm644 rarfiles.lst -t "$out/etc" + installManPage rar.1 runHook postInstall ''; - postInstall = '' - installManPage ${manSrc} - ''; - passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/by-name/ra/rar/update.sh b/pkgs/by-name/ra/rar/update.sh index f81562727f29..2ac315343d48 100755 --- a/pkgs/by-name/ra/rar/update.sh +++ b/pkgs/by-name/ra/rar/update.sh @@ -42,12 +42,12 @@ updateHash() { hash=$(nix store prefetch-file --json "$url" | jq -r .hash) currentHash=$(cd "$DIRNAME" && nix "${NIX_FLAGS[@]}" eval --raw "$NIXPKGS_ROOT#legacyPackages.$nix_arch.rar.src.outputHash") - sed -i "s|$currentHash|$hash|g" "$DIRNAME/default.nix" + sed -i "s|$currentHash|$hash|g" "$DIRNAME/package.nix" } updateVersion() { local -r version="$1" - sed -i "s|version = \"[0-9.]*\";|version = \"$version\";|g" "$DIRNAME/default.nix" + sed -i "s|version = \"[0-9.]*\";|version = \"$version\";|g" "$DIRNAME/package.nix" } latestVersion="${1:-}" @@ -70,7 +70,6 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then exit 0 fi -updateHash "$latestVersion" x32 linux i686-linux updateHash "$latestVersion" x64 linux x86_64-linux updateHash "$latestVersion" arm macos aarch64-darwin updateHash "$latestVersion" x64 macos x86_64-darwin diff --git a/pkgs/by-name/st/stxxl/package.nix b/pkgs/by-name/st/stxxl/package.nix index d045a889a016..324e0c76115b 100644 --- a/pkgs/by-name/st/stxxl/package.nix +++ b/pkgs/by-name/st/stxxl/package.nix @@ -34,6 +34,11 @@ stdenv.mkDerivation rec { inherit parallelSupport; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Implementation of the C++ standard template library STL for external memory (out-of-core) computations"; homepage = "https://github.com/stxxl/stxxl"; diff --git a/pkgs/by-name/sy/systemd-lsp/package.nix b/pkgs/by-name/sy/systemd-lsp/package.nix index 219cf112c3b0..ab0b87c851c8 100644 --- a/pkgs/by-name/sy/systemd-lsp/package.nix +++ b/pkgs/by-name/sy/systemd-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "systemd-lsp"; - version = "2025.07.14"; + version = "2025.10.16"; src = fetchFromGitHub { owner = "JFryy"; repo = "systemd-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-JjrPgpQ94C01nZ3E1NE88TBzI03YFs+x37edtYStlnc="; + hash = "sha256-xhk1jUAA81Rkq9Nmcw+XyWrSbq3ygRvS615Z56j0WBM="; }; - cargoHash = "sha256-G1cQWOgtx+Bmi05ji9Z4TBj5pnhglNcfLRoq2zSmyK0="; + cargoHash = "sha256-6hePUny2iBjslkIk8wVXHnuAHzG3WpBdcj8D5FM9Bc4="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/te/teapot/package.nix b/pkgs/by-name/te/teapot/package.nix index 0fee424811fb..7bfa9a9f6f8e 100644 --- a/pkgs/by-name/te/teapot/package.nix +++ b/pkgs/by-name/te/teapot/package.nix @@ -46,6 +46,11 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_HELP=OFF" ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = { description = "Table Editor And Planner, Or: Teapot"; longDescription = '' diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index ee92352468e8..55a1b4ad9517 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -1,60 +1,99 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, - makeWrapper, - testers, - television, + callPackage, + installShellFiles, nix-update-script, - extraPackages ? [ ], + testers, + targetPackages, + extraPackages ? null, }: -rustPlatform.buildRustPackage (finalAttrs: { - pname = "television"; - version = "0.13.5"; - src = fetchFromGitHub { - owner = "alexpasmantier"; - repo = "television"; - tag = finalAttrs.version; - hash = "sha256-IlFOYnZ9xPQaRheielKqAckyVlSVQMhnO4wCtVixlNQ="; - }; +assert + (extraPackages == null) + || lib.warn "Overriding television with the 'extraPackages' attribute is deprecated. Please use `television.withPackages (p: [ p.fd ...])` instead."; - cargoHash = "sha256-QKUspbC1bmSeZP0n/O5roEqQkrja+fVKLhAvgzqNS9E="; +let + television = rustPlatform.buildRustPackage (finalAttrs: { + pname = "television"; - nativeBuildInputs = [ makeWrapper ]; + version = "0.13.5"; - postInstall = lib.optionalString (extraPackages != [ ]) '' - wrapProgram $out/bin/tv \ - --prefix PATH : ${lib.makeBinPath extraPackages} - ''; - - # TODO(@getchoo): Investigate selectively disabling some tests, or fixing them - # https://github.com/NixOS/nixpkgs/pull/423662#issuecomment-3156362941 - doCheck = false; - - passthru = { - tests.version = testers.testVersion { - package = television; - command = "XDG_DATA_HOME=$TMPDIR tv --version"; + src = fetchFromGitHub { + owner = "alexpasmantier"; + repo = "television"; + tag = finalAttrs.version; + hash = "sha256-IlFOYnZ9xPQaRheielKqAckyVlSVQMhnO4wCtVixlNQ="; }; - updateScript = nix-update-script { }; - }; - meta = { - description = "Blazingly fast general purpose fuzzy finder TUI"; - longDescription = '' - Television is a fast and versatile fuzzy finder TUI. - It lets you quickly search through any kind of data source (files, git - repositories, environment variables, docker images, you name it) using a - fuzzy matching algorithm and is designed to be easily extensible. - ''; - homepage = "https://github.com/alexpasmantier/television"; - changelog = "https://github.com/alexpasmantier/television/releases/tag/${finalAttrs.version}"; - license = lib.licenses.mit; - mainProgram = "tv"; - maintainers = with lib.maintainers; [ - louis-thevenet - getchoo + cargoHash = "sha256-QKUspbC1bmSeZP0n/O5roEqQkrja+fVKLhAvgzqNS9E="; + + strictDeps = true; + nativeBuildInputs = [ + installShellFiles ]; - }; -}) + + # TODO(@getchoo): Investigate selectively disabling some tests, or fixing them + # https://github.com/NixOS/nixpkgs/pull/423662#issuecomment-3156362941 + doCheck = false; + + postInstall = '' + installManPage target/${stdenv.hostPlatform.rust.cargoShortTarget}/assets/tv.1 + + installShellCompletion --cmd tv \ + television/utils/shell/completion.bash \ + television/utils/shell/completion.fish \ + television/utils/shell/completion.nu \ + television/utils/shell/completion.zsh + ''; + + passthru = { + updateScript = nix-update-script { }; + + withPackages = + f: + callPackage ./wrapper.nix { + television = finalAttrs.finalPackage; + extraPackages = f targetPackages; + }; + + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "XDG_DATA_HOME=$TMPDIR tv --version"; + }; + wrapper = testers.testVersion { + package = finalAttrs.finalPackage.withPackages (pkgs: [ + pkgs.fd + pkgs.git + ]); + + command = "XDG_DATA_HOME=$TMPDIR tv --version"; + }; + }; + }; + + meta = { + description = "Blazingly fast general purpose fuzzy finder TUI"; + longDescription = '' + Television is a fast and versatile fuzzy finder TUI. + It lets you quickly search through any kind of data source (files, git + repositories, environment variables, docker images, you name it) using a + fuzzy matching algorithm and is designed to be easily extensible. + ''; + homepage = "https://github.com/alexpasmantier/television"; + changelog = "https://github.com/alexpasmantier/television/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "tv"; + maintainers = with lib.maintainers; [ + louis-thevenet + getchoo + RossSmyth + ]; + }; + }); +in + +if extraPackages == null then television else television.withPackages (lib.const extraPackages) diff --git a/pkgs/by-name/te/television/wrapper.nix b/pkgs/by-name/te/television/wrapper.nix new file mode 100644 index 000000000000..75725f0051df --- /dev/null +++ b/pkgs/by-name/te/television/wrapper.nix @@ -0,0 +1,33 @@ +{ + lib, + symlinkJoin, + television, + makeBinaryWrapper, + extraPackages, +}: + +symlinkJoin { + inherit (television) version; + pname = "${television.pname}-with-pkgs"; + + paths = [ television ]; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + postBuild = '' + wrapProgram $out/bin/tv \ + --prefix PATH : "${lib.makeBinPath extraPackages}" + ''; + + meta = { + inherit (television.meta) + description + longDescription + homepage + changelog + license + mainProgram + maintainers + ; + }; +} diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix index 8ed3f8939cab..a53e2d224ef2 100644 --- a/pkgs/by-name/te/termius/package.nix +++ b/pkgs/by-name/te/termius/package.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "9.28.0"; - revision = "234"; + version = "9.32.2"; + revision = "240"; src = fetchurl { # find the latest version with @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; - hash = "sha512-2zGt4nL8E99s4J9vmzKoOGgEI3XnEx3m7JwFkWuT5wYv/JWoJWnh9dNWlHzRHPpLU8/lAZUG2F4AVYCmPGa96A=="; + hash = "sha512-TPfQ413zbnuKAhflLZPvLeVdrqdUEi+I/inWAs8SJ1j8rYW1TrHDyMB8S/HpWboRWXmUhPHulNXfGpHKUu453Q=="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/te/tetgen/package.nix b/pkgs/by-name/te/tetgen/package.nix index 56b6bcbe9297..d2b307a24b56 100644 --- a/pkgs/by-name/te/tetgen/package.nix +++ b/pkgs/by-name/te/tetgen/package.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = { description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; mainProgram = "tetgen"; diff --git a/pkgs/by-name/ti/tinyalsa/package.nix b/pkgs/by-name/ti/tinyalsa/package.nix index c1d2c67a0b3c..2f911bc7014e 100644 --- a/pkgs/by-name/ti/tinyalsa/package.nix +++ b/pkgs/by-name/ti/tinyalsa/package.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation { "-Wno-error=sign-compare" ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { homepage = "https://github.com/tinyalsa/tinyalsa"; description = "Tiny library to interface with ALSA in the Linux kernel"; diff --git a/pkgs/by-name/ur/uri/package.nix b/pkgs/by-name/ur/uri/package.nix index 5b788d8d424a..fadb45516731 100644 --- a/pkgs/by-name/ur/uri/package.nix +++ b/pkgs/by-name/ur/uri/package.nix @@ -41,6 +41,14 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ]; + # CMake 2.8 is deprecated and is no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 2.8)" \ + "cmake_minimum_required(VERSION 3.10)" + ''; + postBuild = "make doc"; postInstall = '' diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 60ff9bb9cdc4..aa6b909aa062 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -1,26 +1,26 @@ { - lib, - stdenv, + btrfs-progs, buildGoModule, fetchFromGitHub, - btrfs-progs, - writableTmpDirAsHomeHook, installShellFiles, + lib, + stdenv, versionCheckHook, + writableTmpDirAsHomeHook, }: buildGoModule (finalAttrs: { pname = "werf"; - version = "2.49.0"; + version = "2.51.0"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; tag = "v${finalAttrs.version}"; - hash = "sha256-K999EgTbyQeLO1xm94WeOAQ5Ld3stOuAI4LGs4fSU5g="; + hash = "sha256-ZvEX834FLSQ5va5hbWxDibx0D6r9RZ8y4S6kNhVUEpM="; }; proxyVendor = true; - vendorHash = "sha256-Vjce/pmFRusBOJEQjgrlhS4LPlOy4nOWwCm7o5BB+OQ="; + vendorHash = "sha256-qy0eDvDSvudNRSmYwl3YUOpZJ/I0GQ6ITUVQCZCG4eU="; subPackages = [ "cmd/werf" ]; diff --git a/pkgs/by-name/xn/xnec2c/package.nix b/pkgs/by-name/xn/xnec2c/package.nix index 5daa9c72b5f4..ea2e3a0076ba 100644 --- a/pkgs/by-name/xn/xnec2c/package.nix +++ b/pkgs/by-name/xn/xnec2c/package.nix @@ -16,13 +16,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation (finalAttrs: { pname = "xnec2c"; - version = "4.4.16"; + version = "4.4.17"; src = fetchFromGitHub { owner = "KJ7LNW"; repo = "xnec2c"; tag = "v${finalAttrs.version}"; - hash = "sha256-W8JwbCSXt5cjgncOzV1wltPnJxwWC6B29eaT8emIU9Y="; + hash = "sha256-ZxKpClB5IBfcpIOJsGVSiZU8WGu/8Yzeru96uCKkCGQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xp/xpwn/package.nix b/pkgs/by-name/xp/xpwn/package.nix index 24f2e9eb1e52..31c4d8d825c6 100644 --- a/pkgs/by-name/xp/xpwn/package.nix +++ b/pkgs/by-name/xp/xpwn/package.nix @@ -51,6 +51,11 @@ stdenv.mkDerivation { openssl ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { broken = stdenv.hostPlatform.isDarwin; homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix index 4da00adcaff1..03ae14ae1972 100644 --- a/pkgs/by-name/ya/yazi/plugins/mount/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mount/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "mount.yazi"; - version = "25.5.31-unstable-2025-08-11"; + version = "25.5.31-unstable-2025-10-13"; src = fetchFromGitHub { owner = "yazi-rs"; repo = "plugins"; - rev = "e95c7b384e7b0a9793fe1471f0f8f7810ef2a7ed"; - hash = "sha256-TUS+yXxBOt6tL/zz10k4ezot8IgVg0/2BbS8wPs9KcE="; + rev = "9a52857eac61ede58d11c06ca813c3fa63fe3609"; + hash = "sha256-YM53SsE10wtMqI1JGa4CqZbAgr7h62MZ5skEdAavOVA="; }; meta = { diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index eb002cf895a6..d79515d18ded 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -28,6 +28,14 @@ stdenv.mkDerivation { inherit lua; }; + # CMake 2.8.3 is deprecated and is no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 2.8.3)" \ + "cmake_minimum_required(VERSION 3.10)" + ''; + patches = [ ./0.9.1-discover-luajit.patch ]; meta = { diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix index be7818a9cab5..a982ae8b7b33 100644 --- a/pkgs/development/mobile/webos/cmake-modules.nix +++ b/pkgs/development/mobile/webos/cmake-modules.nix @@ -29,6 +29,13 @@ stdenv.mkDerivation rec { setupHook = ./cmake-setup-hook.sh; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.7)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace webOS/webOS.cmake \ + --replace-fail "cmake_minimum_required(VERSION 2.8.7)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "CMake modules needed to build Open WebOS components"; license = licenses.asl20; diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix index 9cd3fb152e31..6ce1bfdefb88 100644 --- a/pkgs/development/mobile/webos/novacom.nix +++ b/pkgs/development/mobile/webos/novacom.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { webos.cmake-modules ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.7)" "cmake_minimum_required(VERSION 3.10)" + ''; + postInstall = '' install -Dm755 -t $out/bin ../scripts/novaterm substituteInPlace $out/bin/novaterm --replace "exec novacom" "exec $out/bin/novacom" diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix index 617ec9c83651..65a54306d41d 100644 --- a/pkgs/development/mobile/webos/novacomd.nix +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -49,6 +49,11 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) novacomd; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.7)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Daemon for communicating with WebOS devices"; mainProgram = "novacomd"; diff --git a/pkgs/development/ocaml-modules/dolmen/model.nix b/pkgs/development/ocaml-modules/dolmen/model.nix new file mode 100644 index 000000000000..7c299fbc7cfb --- /dev/null +++ b/pkgs/development/ocaml-modules/dolmen/model.nix @@ -0,0 +1,25 @@ +{ + buildDunePackage, + dolmen, + dolmen_loop, + farith, + ppx_deriving, + zarith, +}: + +buildDunePackage { + pname = "dolmen_model"; + inherit (dolmen) src version; + + propagatedBuildInputs = [ + dolmen + dolmen_loop + farith + ppx_deriving + zarith + ]; + + meta = dolmen.meta // { + description = "Dolmen library for verifying models generated by automated theorem provers and SMT solvers"; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix index c7ec05e6b1bf..43db542b5a1f 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.17.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix @@ -1217,18 +1217,30 @@ with self; ]; }; - ppx_derive_at_runtime = janePackage { - pname = "ppx_derive_at_runtime"; - hash = "sha256-Y/z4BKFRt3z1lUGdc7SznIv/ys//dZHoPSnsouj1GtI="; - meta.description = "Define a new ppx deriver by naming a runtime module"; - propagatedBuildInputs = [ - base - expect_test_helpers_core - ppx_jane - ppxlib - ]; - meta.broken = lib.versionAtLeast ppxlib.version "0.36"; - }; + ppx_derive_at_runtime = janePackage ( + { + pname = "ppx_derive_at_runtime"; + meta.description = "Define a new ppx deriver by naming a runtime module"; + propagatedBuildInputs = [ + base + expect_test_helpers_core + ppx_jane + ppxlib + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-bbUV2t8MhqDCHDJp7fqJTnRrfZdYO8DLnygqQF0+ouY="; + } + else + { + version = "0.17.0"; + hash = "sha256-Y/z4BKFRt3z1lUGdc7SznIv/ys//dZHoPSnsouj1GtI="; + } + ) + ); ppx_diff = janePackage ( { @@ -1425,18 +1437,30 @@ with self; ]; }; - ppx_jsonaf_conv = janePackage { - pname = "ppx_jsonaf_conv"; - hash = "sha256-v7CYOJ1g4LkqIv5De5tQjjkBWXqKHbvqfSr0X5jBUuM="; - meta.description = "[@@deriving] plugin to generate Jsonaf conversion functions"; - propagatedBuildInputs = [ - base - jsonaf - ppx_jane - ppxlib - ]; - meta.broken = lib.versionAtLeast ppxlib.version "0.36"; - }; + ppx_jsonaf_conv = janePackage ( + { + pname = "ppx_jsonaf_conv"; + meta.description = "[@@deriving] plugin to generate Jsonaf conversion functions"; + propagatedBuildInputs = [ + base + jsonaf + ppx_jane + ppxlib + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-BnkYY+Td9zV++PuPs/gm5U58rCZjew1OJQ2k8KE+dfA="; + } + else + { + version = "0.17.0"; + hash = "sha256-v7CYOJ1g4LkqIv5De5tQjjkBWXqKHbvqfSr0X5jBUuM="; + } + ) + ); ppx_js_style = janePackage ( { @@ -1543,13 +1567,25 @@ with self; ]; }; - ppx_pattern_bind = janePackage { - pname = "ppx_pattern_bind"; - hash = "sha256-IVDvFU9ERB2YFJOgP/glYcO4KhEH5VdQ7wCCfreboqA="; - meta.description = "PPX for writing fast incremental bind nodes in a pattern match"; - propagatedBuildInputs = [ ppx_let ]; - meta.broken = lib.versionAtLeast ppxlib.version "0.36"; - }; + ppx_pattern_bind = janePackage ( + { + pname = "ppx_pattern_bind"; + meta.description = "PPX for writing fast incremental bind nodes in a pattern match"; + propagatedBuildInputs = [ ppx_let ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-O3FtpXrFoyMI3iPL3BUwquREy+8TygOlyaTUGBUPk4Q=$"; + } + else + { + version = "0.17.0"; + hash = "sha256-IVDvFU9ERB2YFJOgP/glYcO4KhEH5VdQ7wCCfreboqA="; + } + ) + ); ppx_pipebang = janePackage { pname = "ppx_pipebang"; @@ -1570,26 +1606,38 @@ with self; doCheck = false; # test rules broken }; - ppx_quick_test = janePackage { - pname = "ppx_quick_test"; - hash = "sha256-Kxb0IJcosC4eYlUjEfZE9FhY8o1/gDHHLWD5Cby5hXY="; - meta.description = "Spiritual equivalent of let%expect_test, but for property based tests"; - propagatedBuildInputs = [ - async - async_kernel - base - base_quickcheck - core - core_kernel - expect_test_helpers_core - ppx_expect - ppx_here - ppx_jane - ppx_sexp_conv - ppx_sexp_message - ]; - meta.broken = lib.versionAtLeast ppxlib.version "0.36"; - }; + ppx_quick_test = janePackage ( + { + pname = "ppx_quick_test"; + meta.description = "Spiritual equivalent of let%expect_test, but for property based tests"; + propagatedBuildInputs = [ + async + async_kernel + base + base_quickcheck + core + core_kernel + expect_test_helpers_core + ppx_expect + ppx_here + ppx_jane + ppx_sexp_conv + ppx_sexp_message + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-nSgi0MAmOWhk53x6U5Wmv/5zTxBiErWQqoT6ATBOv3w="; + } + else + { + version = "0.17.0"; + hash = "sha256-Kxb0IJcosC4eYlUjEfZE9FhY8o1/gDHHLWD5Cby5hXY="; + } + ) + ); ppx_sexp_conv = janePackage ( { @@ -1711,17 +1759,29 @@ with self; ) ); - ppx_typed_fields = janePackage { - pname = "ppx_typed_fields"; - hash = "sha256-aTPEBBc1zniZkEmzubGkU064bwGnefBOjVDqTdPm2w8="; - meta.description = "GADT-based field accessors and utilities"; - propagatedBuildInputs = [ - core - ppx_jane - ppxlib - ]; - meta.broken = lib.versionAtLeast ppxlib.version "0.36"; - }; + ppx_typed_fields = janePackage ( + { + pname = "ppx_typed_fields"; + meta.description = "GADT-based field accessors and utilities"; + propagatedBuildInputs = [ + core + ppx_jane + ppxlib + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-M+UhZst98gRg6pVg828UZn8AEFK2a/KAzGkuUkWoBaI="; + } + else + { + version = "0.17.0"; + hash = "sha256-aTPEBBc1zniZkEmzubGkU064bwGnefBOjVDqTdPm2w8="; + } + ) + ); ppx_typerep_conv = janePackage ( { @@ -2040,21 +2100,33 @@ with self; ]; }; - streamable = janePackage { - pname = "streamable"; - hash = "sha256-FtrAX4nsacCO5HTVxwLgwwT8R2sASJ05qu4gT2ZVSDg="; - meta.description = "Collection of types suitable for incremental serialization"; - propagatedBuildInputs = [ - async_kernel - async_rpc_kernel - base - core - core_kernel - ppx_jane - ppxlib - ]; - meta.broken = lib.versionAtLeast ppxlib.version "0.36"; - }; + streamable = janePackage ( + { + pname = "streamable"; + meta.description = "Collection of types suitable for incremental serialization"; + propagatedBuildInputs = [ + async_kernel + async_rpc_kernel + base + core + core_kernel + ppx_jane + ppxlib + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-3d7tByQCOfA44wSBKbHXDvyomenWVaEDMHujlK++n8Y="; + } + else + { + version = "0.17.0"; + hash = "sha256-FtrAX4nsacCO5HTVxwLgwwT8R2sASJ05qu4gT2ZVSDg="; + } + ) + ); textutils = janePackage { pname = "textutils"; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index 1b32c0eb997c..93a91be6b7ed 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -4,27 +4,36 @@ fetchpatch, applyPatches, buildDunePackage, + ocaml, cppo, gettext, fileutils, ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "gettext"; version = "0.5.0"; src = applyPatches { src = fetchurl { - url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-${version}.tbz"; + url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${finalAttrs.version}/gettext-${finalAttrs.version}.tbz"; hash = "sha256-CN2d9Vsq8YOOIxK+S+lCtDddvBjCrtDKGSRIh1DjT10="; }; - # Disable dune sites - # See https://github.com/gildor478/ocaml-gettext/pull/37 - patches = fetchpatch { - url = "https://github.com/gildor478/ocaml-gettext/commit/5462396bee53cb13d8d6fde4c6d430412a17b64d.patch"; - hash = "sha256-tOR+xgZTadvNeQpZnFTJEvZglK8P+ySvYnE3c1VWvKQ="; - }; + patches = [ + # Disable dune sites + # See https://github.com/gildor478/ocaml-gettext/pull/37 + (fetchpatch { + url = "https://github.com/gildor478/ocaml-gettext/commit/5462396bee53cb13d8d6fde4c6d430412a17b64d.patch"; + hash = "sha256-tOR+xgZTadvNeQpZnFTJEvZglK8P+ySvYnE3c1VWvKQ="; + }) + ] + # Compatibility with OCaml ≥ 5.4 + # See https://github.com/gildor478/ocaml-gettext/pull/41 + ++ lib.optional (lib.versionAtLeast ocaml.version "5.4") (fetchpatch { + url = "https://github.com/gildor478/ocaml-gettext/commit/5d521981e39dcaeada6bbe7b15c5432d6de5d33c.patch"; + hash = "sha256-82ajmpyXSd2RdVq/ND4lS8PIugRSkKe5oL8BL9CsLo4="; + }); }; nativeBuildInputs = [ cppo ]; @@ -46,4 +55,4 @@ buildDunePackage rec { maintainers = [ ]; mainProgram = "ocaml-gettext"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix index 2ec614fbb543..d8426a8fc52b 100644 --- a/pkgs/development/ocaml-modules/smtml/default.nix +++ b/pkgs/development/ocaml-modules/smtml/default.nix @@ -7,10 +7,12 @@ menhir, bos, cmdliner, + dolmen_model, dolmen_type, fpath, hc, menhirLib, + mtime, # fix eval on legacy ocaml versions ocaml_intrinsics ? null, patricia-tree, @@ -23,15 +25,15 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "smtml"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "formalsec"; repo = "smtml"; - tag = "v${version}"; - hash = "sha256-WXGYk/zJnW6QzHKCHl0lkmYb/pG90/sAOK40wYzK35U="; + tag = "v${finalAttrs.version}"; + hash = "sha256-WETSvhy5OfztOTqJimym0OaZLo053nl8pcoQlyyP8I0="; }; nativeBuildInputs = [ @@ -41,10 +43,12 @@ buildDunePackage rec { propagatedBuildInputs = [ bos cmdliner + dolmen_model dolmen_type fpath hc menhirLib + mtime ocaml_intrinsics patricia-tree prelude @@ -63,14 +67,19 @@ buildDunePackage rec { mdx.bin ]; - doCheck = !(lib.versions.majorMinor ocaml.version == "5.0" || stdenv.hostPlatform.isDarwin); + doCheck = + !( + lib.versions.majorMinor ocaml.version == "5.0" + || lib.versions.majorMinor ocaml.version == "5.4" + || stdenv.hostPlatform.isDarwin + ); meta = { description = "SMT solver frontend for OCaml"; homepage = "https://formalsec.github.io/smtml/smtml/"; downloadPage = "https://github.com/formalsec/smtml"; - changelog = "https://github.com/formalsec/smtml/releases/tag/v${version}"; + changelog = "https://github.com/formalsec/smtml/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.ethancedwards8 ]; }; -} +}) diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index f8201fcd2dc9..59132f26cbfb 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -11,13 +11,13 @@ buildPecl rec { pname = "memcached"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "php-memcached-dev"; repo = "php-memcached"; rev = "v${version}"; - sha256 = "sha256-V4d6bY0m1nuEfjZjt3qio4/HOBcSlD9+XMEl1GPfbhs="; + sha256 = "sha256-sweEM4TVId+6ySffulmebZpz390dZXb+G3zFZvc45L8="; }; internalDeps = [ php.extensions.session ]; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 85e6dbd38bb9..b4126b588bb6 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpstan"; - version = "2.1.29"; + version = "2.1.31"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; tag = finalAttrs.version; - hash = "sha256-8HPMXJ64qkV6fXfdr6fZTp2m1EhcWiq0cE51VQHuyro="; + hash = "sha256-vQTZ59qEqZYLoh8eAX+wqBvLTHKTvMIOkFDfuEG9k9M="; }; - vendorHash = "sha256-mSlxWkqhniphYUOjE0zucOqN9gKe3Th0GEikB7DyYVY="; + vendorHash = "sha256-ysGcIpsYpZSuysG5Fw5IVSyO/GSnAkF79GnPF8Dttpk="; composerStrictValidation = false; doInstallCheck = true; diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index 104d66bdf3df..605d88b41637 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -15,36 +15,36 @@ }: let - version = "0.12.0"; + version = "0.12.1"; hashes = { "aarch64-darwin" = { platform = "darwin-arm64"; hash = { - "8.1" = "sha256-AH8FzXjIPojCxTQqDChuZPUTDnVPeOeS5a0wNXjlyEk="; - "8.2" = "sha256-SdivilTHbr28fHaYxK7o1QIT+sWZGHQDjWC2EgtkBbM="; - "8.3" = "RUnmwI5q4jXHkiRuR/PwqnztEX/7y59DA/L7BelreVk="; - "8.4" = "sha256-y76rICDyrA/ogRxK+4C3JvJ4ch1fNLBrY01zMmcldnw="; - "8.5" = "W7BwODGEcRc6E7jpX1nojak7jDV5X+0tjgk32F82wvQ="; + "8.1" = "sha256-a9FLBAYX3hSHcR0AqScKNlpIK36V3FXK3w8Oq3m+VSQ="; + "8.2" = "sha256-1pJI38OKV4ER4m6bGfMjQIXfSjwBgz6+YsBfVlGE3g8="; + "8.3" = "G82BIJ5ha5hBq/zlZfxwC2HVgBuih+wvSUe2e3fUqcg="; + "8.4" = "sha256-MDn49LuXMR66TjTLdKYodPSya37m7LEZSAJRi6h+fTQ="; + "8.5" = "4BihkHnZIJ+lExoYzE/LcMTQp/IQOexzVsUQQkczYOQ="; }; }; "aarch64-linux" = { platform = "debian-aarch64+libssl3"; hash = { - "8.1" = "sha256-Zg1DdzJKfovGwA+cTR5hDQ1Or8oPRrtsyBu3Zt+/6yg="; - "8.2" = "sha256-tV7aoi9aiUrpOufmN4pQKi0Q0Ad6wrajq9SnaeZGlKg="; - "8.3" = "sha256-zJN+RSzFXjOB3Uajk1Adrphbz7NAbWMcuB88RRK7SlY="; - "8.4" = "qvXUg3GqqN3UUtDPQz1H2BiG/b8SomGLyIPR1NIkFUA="; - "8.5" = "GZZa4a+MfoQPlpIA6zOEnD4UdErh/9fLhMp20rOmGIE="; + "8.1" = "sha256-zYOckcqgarf3a/dbnv6dj3fq8l2eKO08DnkjAqoGUAE="; + "8.2" = "sha256-TrObjYHv0n5XjR7y1VnL5ROTZYKd9WKM4Sb0ToMk+qc="; + "8.3" = "sha256-m5wJcskJSDn1C+6X2D7wv5qyiq4MDMZgNo6l/w56hUw="; + "8.4" = "3dFTZUm9g+kzIcQtbILa+ETnNCEmg/03O7gcIPBpils="; + "8.5" = "PFhnzciKFD62y48BY2wOP9aOMQL6JC69qPqZNQpEVDY="; }; }; "x86_64-linux" = { platform = "debian-x86-64+libssl3"; hash = { - "8.1" = "sha256-NTCRrTuiPDbKBauY+9nQm4oJn9TwHQvNfynSKk/bZ7w="; - "8.2" = "sha256-9GwMHf0GIErr0vZieCH5D5tvJiekpOdBo/u1P30L9lc="; - "8.3" = "sha256-180n5Naz6dQRCQCj7r0CJhRqfmEHjM7jgkmWRAvyFaY="; - "8.4" = "nGgvhtuita+rTtns+33xDDEaIXcd3aYiCAClizWtE1E="; - "8.5" = "wvxZ7jUrqXImzH1LEUmvxpxKL4NE0tAtu9M25P82d0w="; + "8.1" = "sha256-qJcMtjoQ4iej70SjqnSPF2sNbhMDdTQ6ThX/J4bgZuo="; + "8.2" = "sha256-/lIDyQue7Azgx12A4nx3baFbOjHV+ubX6u0wELPhPyI="; + "8.3" = "sha256-Jh17Gg1r7/yjX7aJxKSRQdptH6Nf1p3rPlIzqhpp7tQ="; + "8.4" = "y+KBe+6gCJ9bdkCIgUDeQLsBE/AsydHULBwjEhjdDAk="; + "8.5" = "+wTZw3w55viegnGGQWw55gRx2Hv/XsIDlkVVemklpro="; }; }; }; diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix index 2b941d458943..a6fb3c8f3563 100644 --- a/pkgs/development/php-packages/spx/default.nix +++ b/pkgs/development/php-packages/spx/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.4.21"; + version = "0.4.22"; in buildPecl { inherit version; @@ -16,7 +16,7 @@ buildPecl { owner = "NoiseByNorthwest"; repo = "php-spx"; rev = "v${version}"; - hash = "sha256-3rVnKUZZXLxoKCW717pCiPOVWDudQpoN8lC1jQzpwuw="; + hash = "sha256-P53g/o4i+QETWdErZaGA3AREvnr8kL9h0B1BMQlKdFA="; }; configureFlags = [ diff --git a/pkgs/development/python-modules/color-matcher/default.nix b/pkgs/development/python-modules/color-matcher/default.nix new file mode 100644 index 000000000000..330c3adba7a7 --- /dev/null +++ b/pkgs/development/python-modules/color-matcher/default.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchPypi, + setuptools, + numpy, + imageio, + docutils, + ddt, + matplotlib, +}: +let + pname = "color-matcher"; + version = "0.6.0"; +in +buildPythonPackage { + inherit pname version; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-e6igB4LD5eWTHdp7H7nFcqzoLeDGyXZUQyt8/gqnSEM="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + numpy + imageio + docutils + ddt + matplotlib + ]; + + postPatch = '' + ln -s */requires.txt requirements.txt + ''; + + # Some tests are broken and many require internet access + doCheck = false; + + meta = { + description = "Package enabling color transfer across images"; + homepage = "https://github.com/hahnec/color-matcher"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ blenderfreaky ]; + # requires py2app which is not packaged for darwin + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix index 30e901e3cbc7..72365208b378 100644 --- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix +++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix @@ -9,21 +9,18 @@ protobuf, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "google-cloud-vpc-access"; - version = "1.13.2"; + version = "1.14.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "google_cloud_vpc_access"; inherit version; - hash = "sha256-bfTho0kyaAQRWjAZJWFd/NFJ+EY7ZEtdOGcbb3MnJ6s="; + hash = "sha256-N1CpDs/TgSCjJOnNwOJCaS7MWur95uoztvl+R5DjYC0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 0b14e1b6686c..92f962a1bc7f 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -2,20 +2,17 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "mailchecker"; - version = "6.0.18"; + version = "6.0.19"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; - hash = "sha256-xX6Vr7hEi4o1OQjKUUrVEKZIOppbA+4hlN1XrV1vEnk="; + hash = "sha256-MuLQdGiFZbhd/1Zc+VnTo3UW3EAyISzz/c1F3D0F2UE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 28c03cb655f2..40f7d8e83db9 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "12.0.5"; + version = "12.0.6"; pyproject = true; src = fetchFromGitHub { owner = "py-mine"; repo = "mcstatus"; tag = "v${version}"; - hash = "sha256-gtLWUIxG40MsmavA4KrHJ3btCR/zKdstwiUiZGsoNcw="; + hash = "sha256-lo96dZ7YaqZz/fmhuo8XWm5tSsB6ixtdxkZ3Hd6mq78="; }; build-system = [ diff --git a/pkgs/development/python-modules/openstep-parser/default.nix b/pkgs/development/python-modules/openstep-parser/default.nix index dbdbcc081e59..9375a5c16c34 100644 --- a/pkgs/development/python-modules/openstep-parser/default.nix +++ b/pkgs/development/python-modules/openstep-parser/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "openstep-parser"; - version = "2.0.1"; + version = "2.0.3"; pyproject = true; src = fetchFromGitHub { owner = "kronenthaler"; repo = "openstep-parser"; tag = version; - hash = "sha256-gvfzBLLaal0Vad3C4m4wIKwJpmlhewsK4A5yeN8l6qU="; + hash = "sha256-ivPvkvVWXw5ftaGvwBR+JxBIlisI0p6k3i/8V2HlaqQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pcodec/default.nix b/pkgs/development/python-modules/pcodec/default.nix index c1bc8b0480b8..bb36f4c92053 100644 --- a/pkgs/development/python-modules/pcodec/default.nix +++ b/pkgs/development/python-modules/pcodec/default.nix @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "pcodec"; - version = "0.4.6"; + version = "0.4.7"; pyproject = true; src = fetchFromGitHub { owner = "pcodec"; repo = "pcodec"; tag = "v${version}"; - hash = "sha256-5NB+PoCS6yGT8N+MD4mdMRRMKCmlQcqdFPTW924UVgU="; + hash = "sha256-B96kMozVXLoLv0xP2o5IkI+d+4j0wIy4G4VruFS9b6M="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-vHADxRV9DOYhUg3IOm1HNk3RHB0/WKluD2PH3Hg8k7s="; + hash = "sha256-N1KOCZKpz+7yzCefv8AUk1kEmpct//mVCp7a8EW02oA="; }; buildAndTestSubdir = "pco_python"; diff --git a/pkgs/development/python-modules/scanpy/default.nix b/pkgs/development/python-modules/scanpy/default.nix index 095f5bbf08df..133513e646ad 100644 --- a/pkgs/development/python-modules/scanpy/default.nix +++ b/pkgs/development/python-modules/scanpy/default.nix @@ -44,14 +44,14 @@ buildPythonPackage rec { pname = "scanpy"; - version = "1.11.4"; + version = "1.11.5"; pyproject = true; src = fetchFromGitHub { owner = "scverse"; repo = "scanpy"; tag = version; - hash = "sha256-EvNelorfLOpYLGGZ1RSq4+jk6emuCWCKBdUop24iLf4="; + hash = "sha256-GnZ1qJ4SaTLDzfLAH6IHrYeuMBo8PglKUlj4f3ljeR0="; }; build-system = [ diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix index b3d093d603ee..35876032eea4 100644 --- a/pkgs/development/python-modules/stringzilla/default.nix +++ b/pkgs/development/python-modules/stringzilla/default.nix @@ -21,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-0CIekVxChvH912vFnBF2FR1YyIpxi3SD7KhBlh7yFGA="; }; + # Define _POSIX_C_SOURCE to enable POSIX signal handling for ARM capability detection + # See: https://github.com/ashvardanian/StringZilla/pull/263 + env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE=200809L"; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # error: unsupported option '-mfloat-abi=' for target 'aarch64-apple-darwin' substituteInPlace setup.py \ @@ -46,6 +50,9 @@ buildPythonPackage rec { description = "SIMD-accelerated string search, sort, hashes, fingerprints, & edit distances"; homepage = "https://github.com/ashvardanian/stringzilla"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ + aciceri + dotlambda + ]; }; } diff --git a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix index 89e27908b5e2..2ba55fd2e30e 100644 --- a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix +++ b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "tree-sitter-language-pack"; - version = "0.9.1"; + version = "0.10.0"; pyproject = true; # Using the GitHub sources necessitates fetching the treesitter grammar parsers by using a vendored script. @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tree_sitter_language_pack"; inherit version; - hash = "sha256-LaU5dR7MULnmu/yji1dQGjxV5nGGqTnVvxSdnLciCXQ="; + hash = "sha256-oWGLKYKLZEIu1rKhEYdZnFUheBNI/t2EIPAfb1A5ofw="; }; # Upstream bumped dependencies aggressively, but we can still use older diff --git a/pkgs/development/python-modules/tree-sitter-yaml/default.nix b/pkgs/development/python-modules/tree-sitter-yaml/default.nix index 261118b68894..cc48a319bb92 100644 --- a/pkgs/development/python-modules/tree-sitter-yaml/default.nix +++ b/pkgs/development/python-modules/tree-sitter-yaml/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "tree-sitter-yaml"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-yaml"; tag = "v${version}"; - hash = "sha256-Z2L/aQWIyZ8cSqbfjm/i10fJP++yZ2tZgho0U3asA0g="; + hash = "sha256-BX6TOfAZLW+0h2TNsgsLC9K2lfirraCWlBN2vCKiXQ4="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-QvqvyjnCgSuSiiY4SB5nB9S7LnGP1F+tySxue359SWY="; + hash = "sha256-mrLuGmauboKHHk0zADPXpwgZfc83syXk0jmD93Y9Jq4="; }; build-system = [ diff --git a/pkgs/development/python-modules/wslink/default.nix b/pkgs/development/python-modules/wslink/default.nix index c58032bcc291..e09cacf22404 100644 --- a/pkgs/development/python-modules/wslink/default.nix +++ b/pkgs/development/python-modules/wslink/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "wslink"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "kitware"; repo = "wslink"; tag = "v${version}"; - hash = "sha256-IFXxMN+OXJ/J2BSegxOBjE4iSA27pLyCpyyx4hmo9NU="; + hash = "sha256-g1I8qCuqfv+pA3IP7b57PZ7vCsykpfJNG97NgJ+N5lE="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index e457eff0879f..ba7a72a117c1 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -231,21 +231,15 @@ let ); mpi = self.openmpi; - ## Meta ## - # Emulate common ROCm meta layout - # These are mainly for users. I strongly suggest NOT using these in nixpkgs derivations - # Don't put these into `propagatedBuildInputs` unless you want PATH/PYTHONPATH issues! - # See: https://rocm.docs.amd.com/en/docs-5.7.1/_images/image.004.png - # See: https://rocm.docs.amd.com/en/docs-5.7.1/deploy/linux/os-native/package_manager_integration.html - meta = with self; rec { + meta = { # eval all pkgsRocm release attrs with # nix-eval-jobs --force-recurse pkgs/top-level/release.nix -I . --select "p: p.pkgsRocm" --no-instantiate - release-attrPaths = (builtins.fromJSON (builtins.readFile ./release-attrPaths.json)).attrPaths; release-packagePlatforms = let platforms = [ "x86_64-linux" ]; + attrPaths = (builtins.fromJSON (builtins.readFile ./release-attrPaths.json)).attrPaths; in lib.foldl' ( acc: path: @@ -253,162 +247,7 @@ let lib.recursiveUpdate acc (lib.setAttrByPath (lib.splitString "." path) platforms) else acc - ) { } self.meta.release-attrPaths; - - rocm-developer-tools = symlinkJoin { - name = "rocm-developer-tools-meta"; - paths = [ - aqlprofile - rocm-core - rocr-debug-agent - roctracer - rocdbgapi - rocprofiler - rocgdb - rocm-language-runtime - ]; - }; - rocm-ml-sdk = symlinkJoin { - name = "rocm-ml-sdk-meta"; - paths = [ - rocm-core - miopen-hip - rocm-hip-sdk - rocm-ml-libraries - ]; - }; - rocm-ml-libraries = symlinkJoin { - name = "rocm-ml-libraries-meta"; - paths = [ - llvm.clang - llvm.openmp - rocm-core - miopen-hip - rocm-hip-libraries - ]; - }; - rocm-hip-sdk = symlinkJoin { - name = "rocm-hip-sdk-meta"; - paths = [ - rocprim - rocalution - hipfft - hiprt - rocm-core - hipcub - hipblas - hipblaslt - rocrand - rocfft - rocsparse - rccl - rocthrust - rocblas - hipsparse - hipfort - rocwmma - hipsolver - rocsolver - rocm-hip-libraries - rocm-hip-runtime-devel - ]; - }; - rocm-hip-libraries = symlinkJoin { - name = "rocm-hip-libraries-meta"; - paths = [ - rocblas - hipfort - rocm-core - rocsolver - rocalution - rocrand - hipblas - hipblaslt - rocfft - hipfft - hiprt - rccl - rocsparse - hipsparse - hipsolver - rocm-hip-runtime - ]; - }; - rocm-openmp-sdk = symlinkJoin { - name = "rocm-openmp-sdk-meta"; - paths = [ - rocm-core - llvm.clang - llvm.openmp # openmp-extras-devel (https://github.com/ROCm/aomp) - rocm-language-runtime - ]; - }; - rocm-opencl-sdk = symlinkJoin { - name = "rocm-opencl-sdk-meta"; - paths = [ - rocm-core - rocm-runtime - clr - clr.icd - rocm-opencl-runtime - ]; - }; - rocm-opencl-runtime = symlinkJoin { - name = "rocm-opencl-runtime-meta"; - paths = [ - rocm-core - clr - clr.icd - rocm-language-runtime - ]; - }; - rocm-hip-runtime-devel = symlinkJoin { - name = "rocm-hip-runtime-devel-meta"; - paths = [ - clr - rocm-core - hipify - rocm-cmake - llvm.clang - llvm.openmp - rocm-runtime - rocm-hip-runtime - ]; - }; - rocm-hip-runtime = symlinkJoin { - name = "rocm-hip-runtime-meta"; - paths = [ - rocm-core - rocminfo - clr - rocm-language-runtime - ]; - }; - rocm-language-runtime = symlinkJoin { - name = "rocm-language-runtime-meta"; - paths = [ - rocm-runtime - rocm-core - rocm-comgr - llvm.openmp # openmp-extras-runtime (https://github.com/ROCm/aomp) - ]; - }; - rocm-all = symlinkJoin { - name = "rocm-all-meta"; - paths = [ - rocm-developer-tools - rocm-ml-sdk - rocm-ml-libraries - rocm-hip-sdk - rocm-hip-libraries - rocm-openmp-sdk - rocm-opencl-sdk - rocm-opencl-runtime - rocm-hip-runtime-devel - rocm-hip-runtime - rocm-language-runtime - ]; - }; + ) { } attrPaths; }; rocm-bandwidth-test = self.callPackage ./rocm-bandwidth-test { diff --git a/pkgs/development/rocm-modules/6/rocm-tests/default.nix b/pkgs/development/rocm-modules/6/rocm-tests/default.nix index 84762ff70e73..794915893917 100644 --- a/pkgs/development/rocm-modules/6/rocm-tests/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-tests/default.nix @@ -1,4 +1,6 @@ { + lib, + linkFarm, clr, ollama, python3Packages, @@ -8,6 +10,22 @@ stdenv, }: # This package exists purely to have a bunch of passthru.tests attrs +let + availableRocmDrvs = lib.pipe rocmPackages [ + (lib.mapAttrsToList ( + name: value: { + inherit name; + evaluated = builtins.tryEval value; + } + )) + (builtins.filter (x: x.evaluated.success)) + (map (x: { + inherit (x) name; + value = x.evaluated.value; + })) + (builtins.filter (x: lib.isDerivation x.value && (x.value.meta.available or true))) + ]; +in stdenv.mkDerivation { name = "rocm-tests"; nativeBuildInputs = [ @@ -20,6 +38,12 @@ stdenv.mkDerivation { inherit rocmPackages; acceleration = "rocm"; }; + rocmPackagesDerivations = linkFarm "rocmPackagesDerivations" ( + map (x: { + name = x.name; + path = x.value; + }) availableRocmDrvs + ); torch = python3Packages.torch.override { inherit rocmPackages; rocmSupport = true; diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 0f443d89bca2..681aaaf9e971 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -15,8 +15,8 @@ let hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc="; }; "10" = { - version = "10.18.3"; - hash = "sha256-eX0AWbxfwzVtecaBYVoTfHs15O/AOkRJqKGr/LzEvcc="; + version = "10.19.0"; + hash = "sha256-HF9e5ZJn5OLhv9M19DKhjcSPmplECU1dJkl1fnJa03Y="; }; }; diff --git a/pkgs/games/soi/cmake-4-build.patch b/pkgs/games/soi/cmake-4-build.patch new file mode 100644 index 000000000000..e0d18c3a70cd --- /dev/null +++ b/pkgs/games/soi/cmake-4-build.patch @@ -0,0 +1,60 @@ +diff --git i/CMakeLists.txt w/CMakeLists.txt +index 1298088..73a5c2d 100644 +--- i/CMakeLists.txt ++++ w/CMakeLists.txt +@@ -1,11 +1,11 @@ + #CMake script for Spheres of Influence + #Run 'cmake ' to generate a makefile +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.10) + + #definitions + set(PROJECT_NAME "Spheres\ of\ Influence") + set(APP_NAME soi) +-set(PROJECT_VERSION 0 1 2) ++set(PROJECT_VERSION "0.1.2") + set(DESCRIPTION "A physics-based 3D puzzle game") + set(README README.txt) + set(LICENSE ${README}) +@@ -52,7 +52,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} + "${CMAKE_SOURCE_DIR}/${EXTRA_MODULES_IN}") + + #declare the project +-project(${PROJECT_NAME}) ++project(${PROJECT_NAME} VERSION ${PROJECT_VERSION}) + + #grab source files + file(GLOB_RECURSE HEADERS ${CMAKE_SOURCE_DIR}/src/*.h) +@@ -105,18 +105,13 @@ endif() + #declare the target program + add_executable(${APP_NAME} ${SOURCES} ${EXTRA_SOURCES} ${HEADERS}) + +-#extract the proper versioning breakdown +-list(GET PROJECT_VERSION 0 VERSION_MAJOR ) +-list(GET PROJECT_VERSION 1 VERSION_MINOR ) +-list(GET PROJECT_VERSION 2 VERSION_PATCH ) +- + #add some useful preprocessor defines + set_property( + TARGET ${APP_NAME} PROPERTY COMPILE_DEFINITIONS + ${COMPILEDEFS} + # PROJECT_NAME="${PROJECT_NAME}" + # AUTHOR_NAMES="${AUTHORS}" +-# PROJECT_VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ++# PROJECT_VERSION="${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}" + ) + + #pass on the flags +@@ -168,9 +163,9 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_NAME}) + set(CPACK_PACKAGE_DESCRIPTION_FILE ${README}) + set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${DESCRIPTION}) + set(CPACK_PACKAGE_DESCRIPTION ${DESCRIPTION}) +-set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) +-set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) +-set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}) ++set(CPACK_PACKAGE_PROJECT_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) ++set(CPACK_PACKAGE_PROJECT_VERSION_MINOR ${PROJECT_VERSION_MINOR}) ++set(CPACK_PACKAGE_PROJECT_VERSION_PATCH ${PROJECT_VERSION_PATCH}) + #set(CPACK_PACKAGE_EXECUTABLES "${APP_NAME}";${PROJECT_NAME}) + set(CPACK_RESOURCE_FILE_README ${README}) + set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/${LICENSE}) diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index c99a422fe27d..d46f093092e1 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { "-DLUABIND_LIBRARY=${luabind}/lib/libluabind09.a" ]; + # CMake 2.6 is deprecated and is no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + patches = [ ./cmake-4-build.patch ]; + meta = with lib; { description = "Physics-based puzzle game"; mainProgram = "soi"; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 80beae4c400d..1cf9b2ead31d 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -47,32 +47,52 @@ let inherit hash; }; - structuredExtraConfig = with lib.kernel; { - # CPUFreq governor Performance - CPU_FREQ_DEFAULT_GOV_PERFORMANCE = lib.mkOverride 60 yes; - CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = lib.mkOverride 60 no; + structuredExtraConfig = + with lib.kernel; + { + # CPUFreq governor Performance + CPU_FREQ_DEFAULT_GOV_PERFORMANCE = lib.mkOverride 60 yes; + CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = lib.mkOverride 60 no; - # Full preemption - PREEMPT = lib.mkOverride 60 yes; - PREEMPT_VOLUNTARY = lib.mkOverride 60 no; + # Preemption + PREEMPT = lib.mkOverride 60 yes; + PREEMPT_VOLUNTARY = lib.mkOverride 60 no; - # Google's BBRv3 TCP congestion Control - TCP_CONG_BBR = yes; - DEFAULT_BBR = yes; + # Google's BBRv3 TCP congestion Control + TCP_CONG_BBR = yes; + DEFAULT_BBR = yes; - # Preemptive Full Tickless Kernel at 250Hz - HZ = freeform "250"; - HZ_250 = yes; - HZ_1000 = no; + # Preemptive tickless idle kernel + HZ = freeform "250"; + HZ_250 = yes; + NO_HZ = no; + NO_HZ_FULL = lib.mkOverride 60 no; + NO_HZ_IDLE = yes; - # RCU_BOOST and RCU_EXP_KTHREAD - RCU_EXPERT = yes; - RCU_FANOUT = freeform "64"; - RCU_FANOUT_LEAF = freeform "16"; - RCU_BOOST = yes; - RCU_BOOST_DELAY = freeform "0"; - RCU_EXP_KTHREAD = yes; - }; + # CPU idle governors favored + CPU_IDLE_GOV_HALTPOLL = yes; # Already enabled + CPU_IDLE_GOV_LADDER = yes; + CPU_IDLE_GOV_TEO = yes; + + # RCU_BOOST and RCU_EXP_KTHREAD + RCU_EXPERT = yes; + RCU_FANOUT = freeform "64"; + RCU_FANOUT_LEAF = freeform "16"; + RCU_BOOST = yes; + RCU_BOOST_DELAY = freeform "0"; + RCU_EXP_KTHREAD = yes; + RCU_NOCB_CPU = yes; + RCU_DOUBLE_CHECK_CB_TIME = yes; + + # x86 features + X86_FRED = yes; + X86_POSTED_MSI = yes; + } + // lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor version) "6.13") { + # Lazy preemption + PREEMPT = lib.mkOverride 70 no; + PREEMPT_LAZY = yes; + }; extraPassthru.updateScript = { command = [ diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index 12b10c58c598..f12a7636ffbd 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation { pname = "rtw88"; - version = "0-unstable-2025-09-05"; + version = "0-unstable-2025-10-20"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtw88"; - rev = "bb0ed9d5709afd30e928d2d11f7b650e03c8c72b"; - hash = "sha256-ySIj9ZSIwdsn3WDFZ48xUGTFLA1BMU+hjvpDwifq4k4="; + rev = "9bc8fecb61d4ad59e46b4dbd003d60ef2d8437a8"; + hash = "sha256-/nA0U1Ry+xt4F4GC9ymMDFhkiHAqeodv7uUXAaALmdg="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 69b76f17421b..a4f12d7b676b 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -57,7 +57,7 @@ in }; jetty_12 = common { - version = "12.1.2"; - hash = "sha256-GtaEIXqOSutgrSJJ/+oFuGSe7y8omVX7sBgcG3GJzvs="; + version = "12.1.3"; + hash = "sha256-+DCfP0tFBouTZqOEzCFaQ4dl78xPFudUzS9hAzUkc7Y="; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix index c8dc591c7e2a..fc797bcd6ee5 100644 --- a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "frser-sqlite-datasource"; - version = "3.8.0"; - zipHash = "sha256-wk0zEGQjDdz8bIc7e5aiaqg7AaTS6u8zp+WJy5YlWlQ="; + version = "3.8.2"; + zipHash = "sha256-TJMKHB1loDiBrTWKpIUNfcMTBXhorxqvLrdBEuUspto="; meta = with lib; { description = "Use a SQLite database as a data source in Grafana"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix index fd2ec7dbff1e..93d24f61d4e5 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-pyroscope-app"; - version = "1.8.1"; - zipHash = "sha256-dAjvcWUtk518lx4eHalJJxUVSna9+A/Ow9mmsrBX+nQ="; + version = "1.10.1"; + zipHash = "sha256-Q9dzJGXLKGVVDwDF/D4FkrZb4ri6RmUW7usB7eYXcBo="; meta = with lib; { description = "Integrate seamlessly with Pyroscope, the open-source continuous profiling platform, providing a smooth, query-less experience for browsing and analyzing profiling data"; license = licenses.agpl3Only; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d065d7a589e7..1084db40b90f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11603,7 +11603,7 @@ with pkgs; k3s_1_33 k3s_1_34 ; - k3s = k3s_1_33; + k3s = k3s_1_34; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; @@ -13314,8 +13314,6 @@ with pkgs; factorio-utils = callPackage ../by-name/fa/factorio/utils.nix { }; - flightgear = libsForQt5.callPackage ../games/flightgear { }; - freeciv = callPackage ../by-name/fr/freeciv/package.nix { sdl2Client = false; gtkClient = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 86e4c306066e..290ed9741029 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -424,6 +424,8 @@ let dolmen_lsp = callPackage ../development/ocaml-modules/dolmen/lsp.nix { }; + dolmen_model = callPackage ../development/ocaml-modules/dolmen/model.nix { }; + dolmen_type = callPackage ../development/ocaml-modules/dolmen/type.nix { }; dolog = callPackage ../development/ocaml-modules/dolog { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9523371a1569..d33cccb45a51 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2843,6 +2843,8 @@ self: super: with self; { collidoscope = callPackage ../development/python-modules/collidoscope { }; + color-matcher = callPackage ../development/python-modules/color-matcher { }; + color-operations = callPackage ../development/python-modules/color-operations { }; color-parser-py = callPackage ../development/python-modules/color-parser-py { };