diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b8108f1c4aea..ba6458af23e0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10802,6 +10802,12 @@ githubId = 79042825; name = "Jan Kremer"; }; + JulianFP = { + name = "Julian Partanen"; + github = "JulianFP"; + githubId = 70963316; + keys = [ { fingerprint = "C61D 7747 43DE EF05 4E4A 3AC1 6FE2 79EB 5C9F 3466"; } ]; + }; juliendehos = { email = "dehos@lisic.univ-littoral.fr"; github = "juliendehos"; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 1a58662adafa..af7885c30afd 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -1150,14 +1150,6 @@ in ''; } - { - assertion = any (host: host.rejectSSL) (attrValues virtualHosts) -> versionAtLeast cfg.package.version "1.19.4"; - message = '' - services.nginx.virtualHosts..rejectSSL requires nginx version - 1.19.4 or above; see the documentation for services.nginx.package. - ''; - } - { assertion = all (host: !(host.enableACME && host.useACMEHost != null)) (attrValues virtualHosts); message = '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8b26b710dfad..0934c25ff9d6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -929,6 +929,7 @@ in { sourcehut = handleTest ./sourcehut {}; spacecookie = handleTest ./spacecookie.nix {}; spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {}; + spiped = runTest ./spiped.nix; sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {}; sslh = handleTest ./sslh.nix {}; ssh-agent-auth = handleTest ./ssh-agent-auth.nix {}; diff --git a/nixos/tests/spiped.nix b/nixos/tests/spiped.nix new file mode 100644 index 000000000000..a39fc2fd722b --- /dev/null +++ b/nixos/tests/spiped.nix @@ -0,0 +1,73 @@ +{ pkgs, ... }: +let + key = pkgs.runCommand "key" { } "${pkgs.openssl}/bin/openssl rand 32 > $out"; +in +{ + name = "spiped"; + meta = with pkgs.lib.maintainers; { + maintainers = [ tomfitzhenry ]; + }; + + nodes = { + server = + { pkgs, lib, ... }: + { + services.caddy = { + enable = true; + settings = { + apps.http.servers.default = { + listen = [ ":80" ]; + routes = [ + { + handle = [ + { + body = "hello world"; + handler = "static_response"; + status_code = 200; + } + ]; + } + ]; + }; + }; + }; + + systemd.services."spiped@server" = { + wantedBy = [ "multi-user.target" ]; + overrideStrategy = "asDropin"; + }; + systemd.services."spiped@client" = { + wantedBy = [ "multi-user.target" ]; + overrideStrategy = "asDropin"; + }; + services.spiped = { + enable = true; + config = { + server = { + source = "localhost:8080"; + target = "localhost:80"; + keyfile = key; + decrypt = true; + }; + client = { + source = "localhost:8081"; + target = "localhost:8080"; + keyfile = key; + encrypt = true; + }; + }; + }; + }; + }; + + testScript = + { nodes, ... }: + '' + server.wait_for_unit("caddy") + server.wait_for_open_port(80) + server.wait_for_open_port(8080) + server.wait_for_open_port(8081) + + server.succeed("curl http://localhost:8081 | grep hello") + ''; +} diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 921fef456289..64ce75717edb 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -1,39 +1,42 @@ -{ lib, stdenv -, fetchFromGitHub +{ + lib, + stdenv, + fetchFromGitHub, -, cmake -, gettext -, wrapGAppsHook3 -, pkg-config + cmake, + gettext, + wrapGAppsHook3, + pkg-config, -, adwaita-icon-theme -, alsa-lib -, binutils -, glib -, gsettings-desktop-schemas -, gtk3 -, gtksourceview4 -, librsvg -, libsndfile -, libxml2 -, libzip -, pcre -, poppler -, portaudio -, zlib -# plugins -, withLua ? true, lua + adwaita-icon-theme, + alsa-lib, + binutils, + glib, + gsettings-desktop-schemas, + gtk3, + gtksourceview4, + librsvg, + libsndfile, + libxml2, + libzip, + pcre, + poppler, + portaudio, + zlib, + # plugins + withLua ? true, + lua, }: stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "xournalpp"; repo = "xournalpp"; rev = "v${version}"; - sha256 = "sha256-8UAAX/kixqiY9zEYs5eva0G2K2vlfnYd1yyVHMSfSeY="; + hash = "sha256-72e47fVP0c8KioRHUqyEQIUgrLm+xMPE2Mm6+2v7pZk="; }; postPatch = '' @@ -41,12 +44,18 @@ stdenv.mkDerivation rec { --replace-fail "addr2line" "${binutils}/bin/addr2line" ''; - nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook3 ]; + nativeBuildInputs = [ + cmake + gettext + pkg-config + wrapGAppsHook3 + ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ [ + ] + ++ [ glib gsettings-desktop-schemas gtk3 @@ -72,11 +81,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; - homepage = "https://xournalpp.github.io/"; - changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl2Plus; + homepage = "https://xournalpp.github.io/"; + changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; + platforms = platforms.unix; mainProgram = "xournalpp"; }; } diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 0a6e43f9e17a..8efda6070896 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.30.4"; + version = "1.30.5"; src = fetchurl { name = "fluidd-v${version}.zip"; - url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-r9RYNfbMa0axxS5kVBsFmvnuznsZz4s0ZfsIJVczHlI="; + url = "https://github.com/fluidd-core/fluidd/releases/download/v${version}/fluidd.zip"; + sha256 = "sha256-Ry9aD8pSFw076yIywik0ov+ZPNRsI9srM4YJBW/1bY8="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index 7471d7ce5e97..82b30866f842 100644 --- a/pkgs/applications/misc/lunatask/default.nix +++ b/pkgs/applications/misc/lunatask/default.nix @@ -1,12 +1,12 @@ { lib, appimageTools, fetchurl }: let - version = "2.0.9"; + version = "2.0.11"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-tV3giMBF3DN8Aop1B1D7pGp3HYPMQlcZ52JrOhxFrEE="; + sha256 = "sha256-aGU8WsC3jLg8xOF7HzW6oGxizBa3afiT+qS1oyi1r7o="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 26855ca78429..0cf36580bd08 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.30.0-beta.1"; + version = "7.30.0-beta.2"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-p7FhdB/GysBXKjExioe5kP3uutHgcSdFfcwI/l4Kn8E="; + hash = "sha256-mIdbaS4XNDh3wPTUHAyBqMQ67usp312e1McuFAGPrq0="; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 58506961e8fd..716f7bd019d7 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "128.3.1esr"; + version = "128.3.2esr"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/af/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/af/thunderbird-128.3.2esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "daec0c206763600ea16dc09db4c11ed82132bf6ed4275307f5635677891f3d43"; + sha256 = "68e754e3280b0e47e2160d2538dbe959edde3b987a62f05c42bee02e554fbeeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ar/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ar/thunderbird-128.3.2esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "04801b87ddc17b059a61cf4d16e2d7eda45ca96c0de497e93e02b24be8590176"; + sha256 = "06eb5688aeab9fd9c544c45079a5a711bef6bf0710d0abfc508e33d072827ee0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ast/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ast/thunderbird-128.3.2esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "046a8218164d1dc3f7e1b7d1f134c9fb94f9fe30702e7f0ce8474145725590c3"; + sha256 = "434d20e1d20acb0aefbce5d15fb3d015eee1dc474a5b5afae90b7575308c27b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/be/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/be/thunderbird-128.3.2esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "2c1bec26b01f2ac25df9537f34582c18677fc93203e94c378323f0ff161ab6bb"; + sha256 = "a4def49f05a1a479c3ac0f1267d4ab65de84d7acbcc79e1c52e55e814bad8342"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/bg/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/bg/thunderbird-128.3.2esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "64a6c820bc35b416aff30822417486104bbde4842efec785db6b2e1f35b66b70"; + sha256 = "d6d4770f6707dc8a246eafaa0c3a360fb49117eb2adbb12e99a02b4de2cf1805"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/br/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/br/thunderbird-128.3.2esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "9074dd4e49c2a73f62cf0454d29e8bdd417dbf129489baca9848912cc60c8fe8"; + sha256 = "e2352aacca362ce56571b1f50009304355e5c2575e0aea3e84f81d386f7e5553"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ca/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ca/thunderbird-128.3.2esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "ded677ad4962afc9372067f8c87f0d1623275a03cc98b125fd721ef3c3df6028"; + sha256 = "67c31bb9599c181bbaf250c2479188d7fc2e208322aa51737aed83ed9f91299a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/cak/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cak/thunderbird-128.3.2esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7ca0781d25f77cc72dcfc1b8ad88fa222a90c8af2fad1535c30f6e0df04cc2bd"; + sha256 = "b7b44e214374a526264522345e5907b76d080603b0fc6b2c4bae9621b78279a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/cs/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cs/thunderbird-128.3.2esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e8f6bd963a49342d176c4b45ceb7038c3a18a6002060237cd06c807f27338c29"; + sha256 = "72149f69323530b8e369fb2689a8baad097f23fe3a6039bfe56b24c0a3290744"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/cy/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cy/thunderbird-128.3.2esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "97486ec291bbec41a3813a1e289bd044ea3ccea71a66c9182cf13481bb17765a"; + sha256 = "207ee0a8bd84e9e8b1c759a1c9987207f701d0da2dd6c036d759475896a0f2c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/da/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/da/thunderbird-128.3.2esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2f83197baae9097bf2a13f3d781416e32e711de14f2e9e6f3be4ef909975b5c5"; + sha256 = "b69247826491468475cae337ed62c0314ce8ca4de33ed3d8630114fddcaec41a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/de/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/de/thunderbird-128.3.2esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "d5164afcd92be1e64887d056b0a97a2c8b8a8e0f8b52d0d71380ab44deb54c16"; + sha256 = "a0ef4564aa205006fd448ddd8d03f398a1fd525c156bbcbcba297a6a2c932cb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/dsb/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/dsb/thunderbird-128.3.2esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "74552c085365a7a381b634dd2db32620acd3cdb4e3dd8d93d24344c45149d027"; + sha256 = "58eb03368703f0fdd760f04102fd3f1dddf525147fb7e5e4f1919e080935d6ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/el/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/el/thunderbird-128.3.2esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "abb4db492bf0599dc08a0af742a863729abd45b67134a450faf9bb4dc9fbd048"; + sha256 = "1a1c48242ab368a8039edb04093c64cc41aa1885cbe67567340f324ce429dbe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/en-CA/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-CA/thunderbird-128.3.2esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "149e106c120954f9d6c8021a426d487e482deba81aa2916cef9bbfebe100f6a4"; + sha256 = "f13a13039d3006320a71a01a6ffdcfebdfa446abd0aadc6858b4296dbbd01106"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/en-GB/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-GB/thunderbird-128.3.2esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "553f881b15952c5cc4ee31f7fe6d5425a8aecb2e292968972c6a920f2fea89e4"; + sha256 = "10d698906140a7b104484a3e90875b1f0fc2d1d7abe3bfcc2c82ab793a8c7992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/en-US/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-US/thunderbird-128.3.2esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6a4738c5b07b2c6e8668cccf2c3c24f78e2d8ae7a04a1963638e8404d96f12d4"; + sha256 = "72c185256191a6f1f8b4e497b65dde1fedd919a2251261ccad6da06c62dd627b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/es-AR/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-AR/thunderbird-128.3.2esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9b886923b198af374e589666abe029d6cf905f5a0e77acccb35817815a3bf42e"; + sha256 = "211d5fbe5d72d5365c74153817fc95eb376d7eb2f1fba9aea1522491fe718afc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/es-ES/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-ES/thunderbird-128.3.2esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6fad8af3dfba46a88889a147931f202bbaecbf44db174e33237974b0e1d461aa"; + sha256 = "6fcf5a499accf6882dae1c1f1a69da600a8b8ba28a902a6c7a3b4d8de51d17e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/es-MX/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-MX/thunderbird-128.3.2esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "76dbaa277644f72c11b2826973253daea1cd263265aac3d393303f3d4eca736a"; + sha256 = "aeba0e0b1637ce57d8ef11e73efbc39e5843c03d1efaf2e9519e60a03d6f50de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/et/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/et/thunderbird-128.3.2esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "89a9ce893dd7002dfb6e249309f25f45bc93ee84a7895c7911d41d7934643686"; + sha256 = "04b7e75de0df9fb9ca09ea2910a618d9c6ed60d9b71c2505ec8850b183ee98a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/eu/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/eu/thunderbird-128.3.2esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8743449758bd59afbb83e82bd62ea0f53c2a6c4c61ad095604d5b50a4b7323a4"; + sha256 = "5499fac8f11acc67b1590ca43dad0c136e9c0a00134ff14469265845154b791d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/fi/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fi/thunderbird-128.3.2esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5a59846d72690a074f4bddafe97d7f088341e8de0c43e958a6d2df7021b016da"; + sha256 = "3254378b2ee27f7462129428176a92277315c0089915c0f3a80dfa435bd2205e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/fr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fr/thunderbird-128.3.2esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6de6c9b793215ab2b1c1ccb93bcb535a99a165085842064dadd0a5b42a57b71a"; + sha256 = "56861692b1c421d7f5a90657397b86e678cb6c162853362e69aaa7db4f28925f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/fy-NL/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fy-NL/thunderbird-128.3.2esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "ae85b76c1b512ba5d062ea4f157a587056afa859c238b511f8eeb412ae583682"; + sha256 = "63dca4a0a7c71b4d717f92213d8b7524b1eca29ad50e4540edaac148badf0586"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ga-IE/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ga-IE/thunderbird-128.3.2esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "59168b9e0dec31685222fd9bd8b83d0f230d3308484a4a2ea5416dacd7f49728"; + sha256 = "70ded506c128d9e7962dcf8621b772840834f44d59ab1a6a8c8c543175242858"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/gd/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/gd/thunderbird-128.3.2esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "4c35f2ea2fb781301d87649111c6d770e94f8487fbe8925f6156cd7227e50961"; + sha256 = "e65b6d02421f5b37d19c6b65cba400d12f64418b80410ffebafdc83b11758eeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/gl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/gl/thunderbird-128.3.2esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "da4c2677e61e8759c5f4ff5f51f737201f047b5166636000bf73377a0b39c0eb"; + sha256 = "a92eb0bfd1efba1f5b5efe794b915050d3a67c116e78b84b0abce563553efbd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/he/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/he/thunderbird-128.3.2esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "94085a1d0106c7ce6bad8383fa85e530a79f8a38157ad94e5352f45847c7ba31"; + sha256 = "5fe6d0a4b259ddb0e85d192659e205610a11c5f1d32498dc84ff4956ce0ecc52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hr/thunderbird-128.3.2esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "49a4dd6bc68b28a96fc59235fa16db4903561eea11a836e62e55f284a1526a23"; + sha256 = "05d9d2a86ae030b7c036292ebbdccd5095efb26c32bb9ceb618f1e049514aa94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hsb/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hsb/thunderbird-128.3.2esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e9e4ca0683a0eeecdacc7d92d8a59fea75459f7cfbdfe2f4406fed041429f041"; + sha256 = "e9a807e8ac2ee94d2ff214e92e1b69cba5f00c3b9c6cbc0244fea2e9ac2386aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hu/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hu/thunderbird-128.3.2esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "379bfeb3e5554643b009d7f62074ccf6e95a6c46807f938e73054625b752f77c"; + sha256 = "0347ccb486557e961ef46979f4a221b8fed55307379d9eb3e77afafc4d07d736"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/hy-AM/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hy-AM/thunderbird-128.3.2esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "37ada95839dacc8907a2dc89bdc424d7dc73aa18f9ecf6c69afd8807e4470d4e"; + sha256 = "636762093f4697a778696bd56864aa8eaae04e48c7f4a4129b116247cd78b998"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/id/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/id/thunderbird-128.3.2esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "204f8b79def7de4a490487588c2e9558259d88ae92a96754579b183639c64e8d"; + sha256 = "291f1bddffcc0dc308a7532455e232d6e587bc8e0a803b4f6dd85f6f80346135"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/is/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/is/thunderbird-128.3.2esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "17ee110e6e07d69f63b64d38ead0691a6ca521428c3716230f8a0aca6e23c800"; + sha256 = "01ace7af5465472c958e3e3ff1784c6b3978a46f3b008fe1a0a556e825d8b327"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/it/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/it/thunderbird-128.3.2esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "d17a2eb22847628217e7a918c33de0ab20db2576a28ebe177f37fbd9d84bbb9b"; + sha256 = "1ba69fa4e8baaf106a3006dd651c92be6b3ba19701ca8c553fd0c3fc7e34425f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ja/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ja/thunderbird-128.3.2esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "07f36b8b7458d725c8df846f1fce58e7ed2569b4324e4b7cfa1750fbd21b0088"; + sha256 = "98c79c493f9c23a698bf2a6627975cf918bead4e2e7ae9bdf8b132e8e5e205ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ka/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ka/thunderbird-128.3.2esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "d6675e3d23156b74f38b3805d3fca6fad8df6a1ec6adb311c1c783d928772531"; + sha256 = "e4e9a739ead52440b1bf0b9dc535d530c812b4d2a91bf6828cbc635f8273a8d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/kab/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/kab/thunderbird-128.3.2esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "a4cc73ef677a343d49b61009de05bffacad1c8cbf368d8ac79e87fe12a24f1c8"; + sha256 = "e36858baf702c8402fa72ac4f1805852dd5d371766e47482f1bc7cb1a73c59fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/kk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/kk/thunderbird-128.3.2esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4d3d0010e55a9665a6f330e73acc8a9d924587d216c3ec2558e24ba83789194d"; + sha256 = "53e88b687cc6db2abeb3e1f90f861df946c06c6026f4a5cc05a598b3f98ea2ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ko/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ko/thunderbird-128.3.2esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "55ed9d48ec45a9cd04705a8be89701262c7cf2aa16f545f08b361d89d30bd160"; + sha256 = "6a18161a3977fe91e5c878dbf28f9de76c919f753dc1e29211168ecd0bb76ea4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/lt/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/lt/thunderbird-128.3.2esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4f84a793e672bdfca124eaf1f64c2753a2a424d2c689403ea8f06ab18d2c0922"; + sha256 = "6cf21bbaf1fee99a86f036e49c56a6c789795375db7b7c2b2d66c9cf4db2009d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/lv/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/lv/thunderbird-128.3.2esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "28e40e746c71f4d391a3fa4c640e0c248698fba1bcc4f3fa245d98774da0b393"; + sha256 = "ee6207c449bfaf50acbb8d666a87439080ddc6c151324064c6114ddbacfc03bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ms/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ms/thunderbird-128.3.2esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "fb3c86acd2353143535397dd0dc0c478ab1a77ca13a7b44f2d726bfdbacbafae"; + sha256 = "6f73ddde1f47f484819c14e80e9f91be095b6229a69b7ea584b670acfe88af74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/nb-NO/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nb-NO/thunderbird-128.3.2esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9ed19c21dcc40642559eed238d40d39b19f6582060f92814279e111e481f72d5"; + sha256 = "64f324a7d0c3cfce88383ca8cb844e29df33f9b740bc6d02c718e8e436a555bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/nl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nl/thunderbird-128.3.2esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6ced73e12b0c29295e00f32c72d86389c586c0442cda1592a74285b2509a0a55"; + sha256 = "d7a982d8ba02c6ddad2c1891ae09f5cff5aa80b19e6d2fc26848f8df593fd1a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/nn-NO/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nn-NO/thunderbird-128.3.2esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "1b2601fd6f4ba3c5442a9108d3647be6ddfa63afb582ea12a949fc082e7ab925"; + sha256 = "0d572d3d4f79958083603e2238b3cfe1a5c7d333a1de5a55f0c320ae8415b4fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pa-IN/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pa-IN/thunderbird-128.3.2esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "6489cbfa303b20bd0cf44592ef4ad2594447c440694077c8987d48049aee7235"; + sha256 = "ded2cd04fec68d5639c5ebf93a9f50ebd7855cd316b8135c4be36d15dc03d6e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pl/thunderbird-128.3.2esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "db7dc4b36b5a76e9e7fbd703d02e3d6cb3fb48d2263144bb75418e59c9038f91"; + sha256 = "a7b4c48be5aaa11b836069862bf471d19f7297575b579411938cd9a1b5f19886"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pt-BR/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pt-BR/thunderbird-128.3.2esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "378bcb5617eccb26bc86d6357b35edb343b2f339ee4e35d114aafb788bf35261"; + sha256 = "32a1c309b143c5b2c9d9993c65f3f475ddc279c683d5c6434c1fa92176908e49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/pt-PT/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pt-PT/thunderbird-128.3.2esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f33c33c70d8271061bbbafbccc325206c9b37f56637907a87e4d11aefc4675bc"; + sha256 = "9f3b43fef1200627869eeef5d0814a7831ef6be2b9893cef94f6060ac579f4f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/rm/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/rm/thunderbird-128.3.2esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "40e60095cc4f7e10b052b15a80b1e58228c94b6c77cf5f90b5fcc8cadf094472"; + sha256 = "900a77024280148075888fc3dfadeaa7944b7fbe96cbcf359e3cc4cd421ef71d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ro/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ro/thunderbird-128.3.2esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4b3d0eb8cfe07e345c2effe075b391ce82d75db4ed3c5015e25762a1919abe0d"; + sha256 = "7d556f80f1fa9b60f93ec0a9bfdcc02cb063569515ff5e285aec2b8d6ef3b0f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/ru/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ru/thunderbird-128.3.2esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "76ab341bfb48acadd8ba0211be37e37912f002e5f814e60cb0c92182c6ffe5c7"; + sha256 = "bbbf234d7b1e8c7cdd71f582f1c4cf1b14ae2e9e695e9edfd56e7358ffcf9daa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sk/thunderbird-128.3.2esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "9af224be897872875d06abefb82f7d0b6230b3d10bb4ce7c33accab3a1303b7e"; + sha256 = "665f506a18615247a57c7b936d3b4f0fef7240967c2e64e206ca44fe8842f65f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sl/thunderbird-128.3.2esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c66eb160c777449c032212972200997cf3303d916f50019db88a4ab21d737126"; + sha256 = "6cb65f62b5759336d08cf4735cd4eb4a4dfa3664786e06988dc5db3fa74267b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sq/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sq/thunderbird-128.3.2esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "dfb18940364e6686a2ae369fb6f5b410e978c42efc7e506288603d0c76ce22c1"; + sha256 = "578d0542d3e0b4615653832d4474d5253ab7f11aafecc4a4bfb370ff14d09c85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sr/thunderbird-128.3.2esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0b1c98eb37db5c6ff1d216a598e352d1a77ec3a94bab7fa49790ba275714c188"; + sha256 = "69f922567c45c44c2902255c6abc58312f625d2be421cbf986a488addc96af92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/sv-SE/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sv-SE/thunderbird-128.3.2esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a2916749179de24c63b8f393d19a3ba4ec5f6e77584f44ac5ebc24a4b0c94ca1"; + sha256 = "338f53c983182a93febd49671b73e519da023e6d9653d16dcb1e96d62589d095"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/th/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/th/thunderbird-128.3.2esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "bb25041295fac38b2888e95c40835ca289f10be95d71ab32fedb7d0dcaee1c04"; + sha256 = "89498e7b762e95e27d5a5cb7b33cfdcb04057f7c25bbec594f02b5ba11049cd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/tr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/tr/thunderbird-128.3.2esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "4a512e2bdf3ccadade3166a8acf62935244fc63b760db6e7c35a74299e49144b"; + sha256 = "e08daa81402551cada7b056d40ddcd77f19d19584552349895cb6d206fc3e3b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/uk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/uk/thunderbird-128.3.2esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "9094442afcaabeab3424972cfede908526c7d3ddd600adcae6c345450fb42be9"; + sha256 = "d008cdb485bfa80654acbda091761f31cea620b5fda06cea86df9920f807da90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/uz/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/uz/thunderbird-128.3.2esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "d4969535da853732d20475bfca72d871c76f39131cdac0d00607e0bc5ccabf5c"; + sha256 = "6d73e85cc68bc9dbe519a46e217f2c62d4b002757cac6f3eee73142642259575"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/vi/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/vi/thunderbird-128.3.2esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "95bc29e5c14fadafaf5598687f4242ec80cccbd5724988fe471282ea65473e18"; + sha256 = "6f7b1aa7b314f9f7a23bea9f7e5dcf654891f14eadf543603e057a62e56eb1c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/zh-CN/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/zh-CN/thunderbird-128.3.2esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "bc578ed3316fa130328219d7ae34c40250b57ad47394c4e2113d2d53031c3879"; + sha256 = "4b63f9cc7e02e1048273de888df5238c4e308a5b62caa97b9177ac9daddfaef1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-x86_64/zh-TW/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/zh-TW/thunderbird-128.3.2esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "2ec4a508e96715026c4c4541d83e5f14b67c88c9e31e22bfb4ff6280eacbc1c7"; + sha256 = "c3697d78a62dd49b6c9c264809fa3a208edee853fd6f2371a90a3180d88e3ec8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/af/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/af/thunderbird-128.3.2esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "75b27678d06857225ad241c90101d39b1e3e42c8a1f1e17f817bc13287bf185c"; + sha256 = "d396f5bd5a22cf7e7edff3ea71cc05922c4b0326859f7460f363eb31df09ddcd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ar/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ar/thunderbird-128.3.2esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e2bf282b127efea3c1deeb9a375b42b4425ba30bcd730eb911dda3cd93034a77"; + sha256 = "c095953766c3aa7f1308a8931017b202ef63783562404344efbab9a9367f38b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ast/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ast/thunderbird-128.3.2esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "035213d412786ec052430d4860278fc5c0ffe4b999a5924f3bf1a13683e73d3d"; + sha256 = "1039b107a3adcadc4d1e329416792fe668c0588a4a1e1283caed89789b2c49e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/be/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/be/thunderbird-128.3.2esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "8d0aab6ed5c1cb36cc70939545ec0eee2566483bbe89a1b319c63718201ea01f"; + sha256 = "43a3da378465f4e3b7a6adcd55dfbb9a100392d06dd96e49a3d50ae756a3ca02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/bg/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/bg/thunderbird-128.3.2esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f22334ee6b9f47bb6de1623d457aa3a50932dc1f0e047037b07a86793134eca8"; + sha256 = "03be328293a1039ea0c4d05fc8ea091c073d95c4b72dfb4f348f5982647ac5db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/br/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/br/thunderbird-128.3.2esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "0c2e506a17eb9d3d23fc366212644b3e3f78be621adbe2410a1ef8ab0803d86e"; + sha256 = "11e5309a82b6ae36906d2285aefca39db32247501cf60a582bfe69a879646a9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ca/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ca/thunderbird-128.3.2esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "0fc351e87d10b1f33391990716581b4417f1f9759351732ca765e29e9c077c74"; + sha256 = "9a17b59732a651b3247f7af810bd633f07e608ba66c1e7d00b341baac9f0ec69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/cak/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cak/thunderbird-128.3.2esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "653eedb42f9327be63d4ccde4e9a15e431235130d70c5e1e4b90ad1766fabd65"; + sha256 = "2796ae01d6fa7b48d22837d0c6f10ba6bf00ffbd35794bb1f38e3a136c8cccb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/cs/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cs/thunderbird-128.3.2esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "afab7db6f33f730ad5dcbad73c68aa679eeac995a8f87cd3dd69ffeb9cc05507"; + sha256 = "f2e65539e93222d4a7e552b7f670be776853b65aeb2f7fb144d68072b3bdd50d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/cy/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cy/thunderbird-128.3.2esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d4efd6a9bde2a8177c2322ed797c73a347913c7c34eefad3c8059efa3b291e87"; + sha256 = "a59825b1692b9dffeb39bf30ea8b5f36cc30445dcd5ea184cc8487fc01fdff75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/da/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/da/thunderbird-128.3.2esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ed872e714c0ee80a9ae40ca91ef2675aeac20125ae53245b41003614c8ba2a9e"; + sha256 = "d0c8b043c86e83ccc86a728743489a48cb0cc4e46d6976bd3595752a306c0774"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/de/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/de/thunderbird-128.3.2esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "3feabd14c409d43f07973ae4054ce5a3c13ce1b1023bfe9c9614bad39a36f432"; + sha256 = "917ce52fc4d81ebbe5276240b41565fbce6bdfc53ffa7753db97e7e640a2f90a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/dsb/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/dsb/thunderbird-128.3.2esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "0f9f5e55650af7cb264b300286f426d730a9f6594a1e6a5d9f1305dfa067c767"; + sha256 = "2c6ffd2c7e140d7710e5d702008f85892761e834e81ee1dd80f561e1aa56ddf6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/el/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/el/thunderbird-128.3.2esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "7f399e76ed236a3067f0e179c1d902561770234a20cfbb78345b4156549a1eab"; + sha256 = "9213a7c441951f9a07766ccff191da85cab2a24fd7fbce1f19bae077387e5c08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/en-CA/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-CA/thunderbird-128.3.2esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0bc5ef5a3e472463ebf823b16efb36cff728c432829ec73fea7f9bed1c6fcd81"; + sha256 = "77895c740967e60406ca466afbcf294be052a6ee81d5c4b2cd531750d23fa661"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/en-GB/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-GB/thunderbird-128.3.2esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "22d878733613360bae796d07249fa6be2ecfb12680c7102dc7d6d3a2fb947a89"; + sha256 = "4c547974c874a4ce973b02a890fd12ac917d89c8ebf0a9d332262092ef8b9be9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/en-US/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-US/thunderbird-128.3.2esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "0c0a466b278372a784b551922c4c47ca1af8161ee024d17588524d92e4364dbe"; + sha256 = "161b7ea35c5d4c1ecdb8cf0229fbcf3ea152c09c22543e0762eece4b7d6bb6eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/es-AR/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-AR/thunderbird-128.3.2esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c60187c27a612747e8cd05ec3d6ad704da2c9fbf48ea4d9bf1a70be778047b43"; + sha256 = "bb83137654be3e90cd5c0836342f00b85b065663f5318f562b09bcd2714084e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/es-ES/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-ES/thunderbird-128.3.2esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a06dd9c977dbef9679b02a9a36ad75b0929791d7dcbd5a5c05912d338201e8df"; + sha256 = "4744ecee5a3e72560aa25efd25c793b8786764aa7d9f8ac33cf1a33ccbe28a76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/es-MX/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-MX/thunderbird-128.3.2esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "a776bfe85b70468620ad977659908d61e79925fb8bfd36a4ace30dc06ebffcdf"; + sha256 = "6a63c009191b205ced9f8147cfe36a801e9a02d5d74a9a57f66960c78a9b3671"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/et/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/et/thunderbird-128.3.2esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c1e860a0361fdaac8811f25eb2aeaba7973ebbbdcbf769fc42791c7638aa4fae"; + sha256 = "aa2cc826ecbe7397b21a7c5b603026105a5db5ae3d8046ca806749b2133e38b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/eu/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/eu/thunderbird-128.3.2esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "88383b1d46ae04586637692c6dcd3a59795519a64db0feb830bdef66b55f8f76"; + sha256 = "28762f614cc70ebbd3d4863a671257cbbccb5d60258d7d07f7d1e42ca3c1b2ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/fi/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fi/thunderbird-128.3.2esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "fa11ef201144fd9f51fa36c8d7cdf3106f445bfdeed203db7f2fe50ad315527a"; + sha256 = "f5b844a279088b43538b4e3f96cfa1c8614710398022d3cf0d4c3c4fbacea456"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/fr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fr/thunderbird-128.3.2esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "5427eb293b84db327fd6002dc84f39531c5a34aff7fe3b01e591a4ff5e243b07"; + sha256 = "4e75cc4efc0bef081cf6e0b74ac7dd74f450dd87a1a0bfbabdc8cdcc383be3c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/fy-NL/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fy-NL/thunderbird-128.3.2esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6a6a3e6d7f2a26f1cc70e6d26741e882e12344836b83735fe0cc15c560b3f554"; + sha256 = "11ec4e4be64feac976e21dadcca77145dc4fea225c0d00c9dceaa509ec61cabc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ga-IE/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ga-IE/thunderbird-128.3.2esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ff9f0296f2694213d58c330e68b56aa657392bfcccd765ac0bf2847155ed014d"; + sha256 = "b4eaace12a57f7b24f56f476fbaa9e9606f25d1f82b34e67cb1a0e10d191e3d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/gd/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/gd/thunderbird-128.3.2esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "79a080ab46a998ae7584ba26afae53418764b206e44993bb56bed846a6317be2"; + sha256 = "1f669d83cc4caf91bfdd61b9e63e282f90f0d7cbb96c1100c0f904d003f9e076"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/gl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/gl/thunderbird-128.3.2esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "19187ae587048da83c6a0a99e8f72fddf0cdc92c4481d40c534a0664a65d920a"; + sha256 = "5eb51acfb2955bc0038e299d77ed8491648b4d7293d31d8a01648b67dc1e575e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/he/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/he/thunderbird-128.3.2esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e37fd7a629ba735e5916f61a6d46ca71e5698a6d16b73442ed74534f87703ecf"; + sha256 = "87f4fb6eaf8f32e9b041a8d5e5da6072b1106492a9da75a4cac4255ccb818121"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hr/thunderbird-128.3.2esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "86c8c6f34e76873060b34b33a235b5696191f3d58042be62f5de59cbb82261e9"; + sha256 = "d93a01b31369d687865d1bafca101b349c697bc7e7b48ff470831849b0444814"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hsb/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hsb/thunderbird-128.3.2esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "80489dfdf52594c34798629d7fef66e67a8b5aaac3c6275e25c092ed0de015bc"; + sha256 = "78d421c94906c39d64013679d786579ae60a574adebdb4b4729a2861e392b5ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hu/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hu/thunderbird-128.3.2esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "2277897b93514a1995886d637b668a469ffed943c05e91f7e209fab23ee1232a"; + sha256 = "cb6a581fb55422aedb80ad1cf2b67dc07a82f0e3817612454bd0894522a77051"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/hy-AM/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hy-AM/thunderbird-128.3.2esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "b321af1421b2649d5ddc42a23e31ea76068062cf8a956495969835dd0e0fe7a7"; + sha256 = "b7f29b312f7c26fd5f876d864006eea66977e14e5ff6c761d25b00dedb520272"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/id/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/id/thunderbird-128.3.2esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "4c38b3f5afb7b65a8a8089c2d258016dc4c8e60154499bb4ea2c110a29a7f7bc"; + sha256 = "b8942767658f68d76c071a3d4c22bde09e09886a036f3b1e5fb46af18ca76434"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/is/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/is/thunderbird-128.3.2esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d7c2925526dac179bf7c857b9044058818c5a49aeacca405fe120e01a0fdc28d"; + sha256 = "7023c95b4036be5a1f6d8924e746b92aef9e76e8e82726a221473bd540dc3bf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/it/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/it/thunderbird-128.3.2esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "4c637d4998c5d8db04a7356401eb64cd362476f91ff037979b94487548e9f0d4"; + sha256 = "cd594a8bf3e316e9598007ede696e785013f5a11bd68b14ce742d97abb7cef8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ja/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ja/thunderbird-128.3.2esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "4591a2d3b55f402fe47b2f7342f34fcc0e5ad6f5147f72929bef8fd59598cef1"; + sha256 = "c17eca728cf0a861f25fb9cb419ed2c20f979c19c15582b6a17a99544881d723"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ka/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ka/thunderbird-128.3.2esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "032fbf3360e7facac683e28a205b53e9a1db756c8bd41330a15f7120ed645b1a"; + sha256 = "495c8d23f24dd7660e9d4836d4cb18ca48c7f3b0edb255cf18daa627ad78d6ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/kab/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/kab/thunderbird-128.3.2esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "5fec42cf09826f24ffeb20a3c7f0c200a1b257e4af4a8d223c4b7f98fb35eec2"; + sha256 = "6fd780bbecad88ab558c76938599a54677e93689d0d451e96beddc886569e3a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/kk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/kk/thunderbird-128.3.2esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "200e305315c566f34d2242fd37bee6f2726d8b6bacb37c74b0e5597e9296df60"; + sha256 = "92d2e2e9e80f75285aabb3ac62edc6db028b15b752a6cbcbb3795566cbeb744f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ko/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ko/thunderbird-128.3.2esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "06f60ced2c75f13ffae69cf2355089c2b343e72b9e61cd97edf01f401c11fb77"; + sha256 = "4ea9a6c97b458928a66341d86ed0fd274b27b1e3a2259971b8bf795ab36656c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/lt/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/lt/thunderbird-128.3.2esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5d3074b599a9c61357b872f041dbedba6f8667f92a833e6889e16bf2a0ba31fb"; + sha256 = "5037fd5bff06a053331b2ad6312f35af1dd881b2b017fb92ac4c433bf7c10a20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/lv/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/lv/thunderbird-128.3.2esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "dbffd3f40caa2b2a7f2201f645e27ee5060a124c304079f99055a0ba6bad513c"; + sha256 = "0498e5ae2815fcb979230f3166cfeed89d02bddc9c7ed73646600fca2eb44aec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ms/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ms/thunderbird-128.3.2esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "2fe336e4ab817e8100ba448a4888cd0bf66728e2779f8179ecfea55bc255e20c"; + sha256 = "bfbb9fa1a5c1d4aa4c9c73c7e02628c1f01c314fc252370fc6a96896a666db57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/nb-NO/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nb-NO/thunderbird-128.3.2esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c3096875a2400685f1c4333531eeb3594f598b774f138e746c909976b16b895e"; + sha256 = "da6ce60429e87f38ff66ce975f4a63e1f2e6f8b2a7ba4f895a32760c09fa02da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/nl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nl/thunderbird-128.3.2esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "3302794bdc4ba877d01b0ba80fca2661098e707f2abb0304bd2c29fc6cb3cc4b"; + sha256 = "514646876e7654bc5a7141d919cce98eff22e07180a37d6765f87629fc48724b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/nn-NO/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nn-NO/thunderbird-128.3.2esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "770457094739c924397e643ed303f57a57b9491229abab8d98699a0507d9db1d"; + sha256 = "dda61d6545277b5d8f53100712796e2ebbf3c8b759c4bee0f5c467bf8419d9ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pa-IN/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pa-IN/thunderbird-128.3.2esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8be61392ae2faeba72ae3eaf698339357a1e5112be77fafc5f104bfde3a5155b"; + sha256 = "02b524802db090431e2c1888b1fee5148d22ae7ae7a6d4a22c18afda11bf5c84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pl/thunderbird-128.3.2esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0e0c57066ef2851b6729ba1c6aa192b2b7693cc5e367e4016b458cb45871030a"; + sha256 = "43991a49c7e68753599b4b7b6e5b0d23f199d57b85824ccc56b9b4bfa2c4f7e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pt-BR/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pt-BR/thunderbird-128.3.2esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "89db9f5388ab006923def3d3818e61c0d0417e26f3c3a7049da453ae82e215b2"; + sha256 = "d9af07aadc66ce20772407de1a458756545775b95b70c8c56c71a6b3ca48cd94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/pt-PT/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pt-PT/thunderbird-128.3.2esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "678301cd525223c99b5b6f129fddba153bd9766478a8733ebe69ae0eaae40880"; + sha256 = "523bcc1b478dcc9e54a1f4c6743fc546ea0b18956d907149641d34598ffccc6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/rm/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/rm/thunderbird-128.3.2esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3e6f814093d3dcd8df427574bb10c56ea6bd917c1dc532d8334b8880b7e91b90"; + sha256 = "5a6fef50c1acfb0cd2e91d9e03aad4afd688436dcca5280bdb49ba144e97a439"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ro/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ro/thunderbird-128.3.2esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "39c23d82b6dacff632753ba2ba9f0a194c2891cfcc1e67efbbde1f8421085ac0"; + sha256 = "298aeaa7ae0afaa6531a566e2e8ce072adcc62f7646cf33bfbd3acc450335881"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/ru/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ru/thunderbird-128.3.2esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c9d051f3faec44babcd36e6fb6c9619142dee3d775185ea86305392f88d45aeb"; + sha256 = "c017f418996a8cc7fb7bd2c4062df1ba1dcf4c2b8df7d23a44fe7e0aebd00b2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sk/thunderbird-128.3.2esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "509b5a60e239d4a8cf9a6f91ef4267de44ccc21f9314b232170093fa450af44b"; + sha256 = "84079eedbd6c2a5cf4733f256a583b302209dc84a30d2305b859bd10efa87c1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sl/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sl/thunderbird-128.3.2esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "aa5b49aaa7fa64f9e9ea9a01d75da4f5c89c65449d56861b48083ca00a0822cd"; + sha256 = "99651a3c3c28cfc1d664066bf0c197951622e55b21ba4be8f157606d63c2dafb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sq/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sq/thunderbird-128.3.2esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "3ffca31bd4bf981110a55eef165d789e253eec7c206b08c880fc3a0b92da58fc"; + sha256 = "47953845a4f03c67148bb183a629a349f3e90bb4c425fc148b1b2cab9f0631e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sr/thunderbird-128.3.2esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "0e25ba5b8ba286e81bfeb481f354b69bd56fc727340ce6fde36124a7ce9d330c"; + sha256 = "266e2d380f3607a3da4e68b9567d936a47552bd49173d1a44ecce572cc7338ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/sv-SE/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sv-SE/thunderbird-128.3.2esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ab8be644fc47332387f67b3bbe7ad5920bd908e99bf029b85c896a44d3fe8a80"; + sha256 = "0e97466c633f662293b53e7e61b15034d1f88718232e8cfeb32797d4110dd3af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/th/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/th/thunderbird-128.3.2esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6965ca5780abcd2e8e69244e883d171ce541a4d2075a99ae6c0682f4b76c081a"; + sha256 = "18bb3e26ed34c2896a2b5e57d2f740e3870354785e762b7aa827a17b9b8d5708"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/tr/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/tr/thunderbird-128.3.2esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e3fcb1b58165e4a7f3553ecf5e9c2759fb831fe25c504365ff0bcd2f0756a186"; + sha256 = "6c1d1f511ee94247f02e4b26d7125ef7e4cd839a508c1be7018127378e80915f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/uk/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/uk/thunderbird-128.3.2esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "89e8999739ac1c9979c702e946130d7bd2f0d9ad209a926ee205425d54bfcf40"; + sha256 = "5b36b7f5efe32bf58d14d74d773cb4cdf092fe3e89e1f2facf63183699967d48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/uz/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/uz/thunderbird-128.3.2esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "71e9b2d9ca7dcfc1b71524e1dc0fbd17f078e690838eee5e711b753bbccc4b45"; + sha256 = "ade3f2442dcc5b6dcce7a8114209bc7bdd3730f7e1ffd9b63b71a452fd9f657a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/vi/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/vi/thunderbird-128.3.2esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "13d3365e9643664cbf5006fbf0de101950ca1874283c49792d1ccff437a45158"; + sha256 = "9224b6c394daeddb695b7ccc30c21e5cbf6356db2bd1f7a6746a292a9f077b6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/zh-CN/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/zh-CN/thunderbird-128.3.2esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a283f7503a4b0af6349dd87c6be3aa9f4e8227ae98754515b635d602c756569c"; + sha256 = "fe17248658dd5ebcbe3f5d3dd82fa3c20f6b2a82b49e037369d8d8fa9a331083"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.1esr/linux-i686/zh-TW/thunderbird-128.3.1esr.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/zh-TW/thunderbird-128.3.2esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ba88abbc91d4e55687eed8fe41aa0e52622b688752341430f7b32d134a750d09"; + sha256 = "057c904f9c5e37a9b43d8410f422bf5838f18c63135add2b3f3270e2c900ea09"; } ]; } diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 9484a1c42dcf..b14b63d8f72d 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -9,16 +9,9 @@ packaging, proton-core, proton-keyring-linux, - proton-keyring-linux-secretservice, proton-vpn-api-core, - proton-vpn-connection, - proton-vpn-killswitch, - proton-vpn-killswitch-network-manager, - proton-vpn-logger, + proton-vpn-local-agent, proton-vpn-network-manager, - proton-vpn-network-manager-openvpn, - proton-vpn-network-manager-wireguard, - proton-vpn-session, pycairo, pygobject3, withIndicator ? true, @@ -28,14 +21,14 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.4.4"; + version = "4.6.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; rev = "refs/tags/v${version}"; - hash = "sha256-e581FgXrk1cfjsl/UaG9M+3VBYXcV0mggeLeEW9s9KM="; + hash = "sha256-GCfr6x0KbIJr2r4UcFtMjuyHZVyDLKPvgtjdpTCb5Ro="; }; nativeBuildInputs = [ @@ -60,16 +53,9 @@ buildPythonApplication rec { packaging proton-core proton-keyring-linux - proton-keyring-linux-secretservice proton-vpn-api-core - proton-vpn-connection - proton-vpn-killswitch - proton-vpn-killswitch-network-manager - proton-vpn-logger + proton-vpn-local-agent proton-vpn-network-manager - proton-vpn-network-manager-openvpn - proton-vpn-network-manager-wireguard - proton-vpn-session pycairo pygobject3 ]; diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix index fb24f903f522..d3d349969bb2 100644 --- a/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -195,7 +195,7 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = true; - nativeCheckInputs = [ mpiCheckPhaseHook ]; + nativeInstallCheckInputs = [ mpiCheckPhaseHook ]; installCheckPhase = '' runHook preInstallCheck @@ -211,7 +211,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open Source High-Performance Computational Chemistry"; mainProgram = "nwchem"; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ sheepforce markuskowa ]; homepage = "https://nwchemgit.github.io"; license = licenses.ecl20; diff --git a/pkgs/applications/version-management/git-extras/default.nix b/pkgs/applications/version-management/git-extras/default.nix index 2e10c633b02a..53382b2c2403 100644 --- a/pkgs/applications/version-management/git-extras/default.nix +++ b/pkgs/applications/version-management/git-extras/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "git-extras"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "tj"; repo = "git-extras"; rev = version; - sha256 = "sha256-Zzk133ZJv91zbFz0U9tiv8pb0pAIBt9Y/8PYIaABMGc="; + sha256 = "sha256-0XZwEhDjh+rL6ZEWb60+GUw7hFOS3Xr32hgPNJcOL9I="; }; postPatch = '' diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix b/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix index 2834cfcc44ff..a49e8e338bea 100644 --- a/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix +++ b/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix @@ -2,4 +2,8 @@ makeSetupHook { name = "mpi-checkPhase-hook"; + + substitutions = { + topology = ./topology.xml; + }; } ./mpi-check-hook.sh diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh index 41b6d864c8a5..d7275b62244d 100644 --- a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh +++ b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh @@ -44,6 +44,17 @@ setupMpiCheck() { # Disable CPU pinning export OMPI_MCA_hwloc_base_binding_policy=none export PRTE_MCA_hwloc_default_binding_policy=none + + # OpenMPI get confused by the sandbox environment and spew errors like this (both to stdout and stderr): + # [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery. + # [1729458724.473282] [localhost:78 :0] tcp_iface.c:893 UCX ERROR scandir(/sys/class/net) failed: No such file or directory + # These messages contaminate test output, which makes the difftest to fail. + # The solution is to use a preset cpu topology file and disable ucx model. + + # Disable sysfs cpu topology directory discovery. + export PRTE_MCA_hwloc_use_topo_file="@topology@" + # Use the network model ob1 instead of ucx. + export OMPI_MCA_pml=ob1 ;; MPICH) # Fix to make mpich run in a sandbox diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml b/pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml new file mode 100644 index 000000000000..616ed839f004 --- /dev/null +++ b/pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index 4320f1380e02..0699cd2dde08 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "80e0cac4747e61d1fbb5374ec4ac41d3499042e2", - "hash": "sha256-gwu9AvxrfW1QSgUy3Q4di1xa964ZMZpRkgdFQlit9+4=", - "version": "2.15.0", - "depsHash": "sha256-TDZUrzVcmKn4izRn8E+uf6Mh22fRsHeVm5h+wRZAX8o=", - "clientDepsHash": "sha256-7R5+Yam9Y4+bj/8wrAE25g4sivg/sw5G0pAZFGPRpMI=" + "rev": "d80752cc9d7ace01fee57a627b7745adedc08589", + "hash": "sha256-iT2Ww+iRyGS5qBT3QcM7weiYq/6c408jTSPuZinNXgs=", + "version": "2.15.1", + "depsHash": "sha256-km/cx2IaJ2/1UxZk2uXHE46VF3MiR6hasYRuKKBitY4=", + "clientDepsHash": "sha256-3XsXCZrDMtZFs8xwqydfVouAuxarQl/KdMdHkq+Vp9A=" } diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index fb2bfbe7b18a..a346ef87102f 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication { pname = "exo"; - version = "0-unstable-2024-10-09"; + version = "0-unstable-2024-10-21"; pyproject = true; src = fetchFromGitHub { owner = "exo-explore"; repo = "exo"; - rev = "c1a26cd7fa447b2802a4bececfd7cb9d316c0600"; - hash = "sha256-jtcfGmk03Yf5IaswIvi6N9oMXzNPYlJBf4WMLkogUVo="; + rev = "82a708f974b9a720e127c38a383f22e129be6373"; + hash = "sha256-BhhcYOipdLAviTzWRdNLMMPiND4mYv9Mkn8/yxo0vXY="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index 7f1abd017617..7f9bb24d6f13 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20240909"; + version = "20241009"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-+e4azEWHYSh3Gy9Xa+Y8E7f7rAA8YlWlbvbva9kNXCI="; + hash = "sha256-tb+Z7ja6yG7n6DcxSvdFhMq2xTNs6mJ6pdPfEKeRUww="; }; dontUnpack = true; diff --git a/pkgs/by-name/fi/fireplace/package.nix b/pkgs/by-name/fi/fireplace/package.nix index f7791438ec55..1a41a09d851a 100644 --- a/pkgs/by-name/fi/fireplace/package.nix +++ b/pkgs/by-name/fi/fireplace/package.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { hash = "sha256-2NUE/zaFoGwkZxgvVCYXxToiL23aVUFwFNlQzEq9GEc="; }; + makeFlags = lib.optional stdenv.hostPlatform.isDarwin [ "CC=cc" ]; + meta = { description = "Cozy fireplace in your terminal"; homepage = "https://github.com/Wyatt915/fireplace"; diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix index 47917784aa79..8b9428c6b239 100644 --- a/pkgs/by-name/fu/furnace/package.nix +++ b/pkgs/by-name/fu/furnace/package.nix @@ -7,7 +7,7 @@ , pkg-config , makeWrapper , fftw -, fmt_8 +, fmt , freetype , libsndfile , libX11 @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fftw - fmt_8 + fmt freetype libsndfile rtmidi diff --git a/pkgs/by-name/gi/gitlab-release-cli/package.nix b/pkgs/by-name/gi/gitlab-release-cli/package.nix index 28119445dc2b..61e2d5d84161 100644 --- a/pkgs/by-name/gi/gitlab-release-cli/package.nix +++ b/pkgs/by-name/gi/gitlab-release-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gitlab-release-cli"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "release-cli"; rev = "v${version}"; - hash = "sha256-CCSice/uMf2OfFNEpwwhX6A0wrSsC1v9XWEhAAwQRso="; + hash = "sha256-AEDao1tehg15SmluHlivG/I+Y9Gcxjj7KUEGAmOZ1aY="; }; vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU="; diff --git a/pkgs/by-name/go/godot_4/package.nix b/pkgs/by-name/go/godot_4/package.nix index 25c36e07a1b3..829ece63d51e 100644 --- a/pkgs/by-name/go/godot_4/package.nix +++ b/pkgs/by-name/go/godot_4/package.nix @@ -28,7 +28,6 @@ wayland, wayland-scanner, withDbus ? true, - withDebug ? false, withFontconfig ? true, withPlatform ? "linuxbsd", withPrecision ? "single", @@ -67,6 +66,7 @@ stdenv.mkDerivation rec { "out" "man" ]; + separateDebugInfo = true; # Set the build name which is part of the version. In official downloads, this # is set to 'official'. When not specified explicitly, it is set to @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { production = true; # Set defaults to build Godot for use in production platform = withPlatform; target = withTarget; - debug_symbols = withDebug; + debug_symbols = true; # Options from 'platform/linuxbsd/detect.py' dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings @@ -159,8 +159,6 @@ stdenv.mkDerivation rec { ++ lib.optionals withSpeechd [ speechd-minimal ] ++ lib.optionals withUdev [ udev ]; - dontStrip = withDebug; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index 80abccbf1460..ff4a6ba44429 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -7,10 +7,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.19.3"; + version = "2.20.5"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-Re0L+2P/Sxzj+fnuZi5uK2Hk72d8EvQGdjhglVbt41M="; + hash = "sha256-VGSSGc2caNO7+IK1ArqjZGz+LaHWZsaO68Jr06BCcfE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index eb5c80011081..ca41bb550b6d 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -11,14 +11,14 @@ }: python3Packages.buildPythonApplication rec { pname = "harlequin"; - version = "1.24.1"; + version = "1.25.0"; pyproject = true; src = fetchFromGitHub { owner = "tconbeer"; repo = "harlequin"; rev = "refs/tags/v${version}"; - hash = "sha256-3Rb47zkWsC6RJhk1btQc/kwxpFFWVnxY2PJooHB7IzQ="; + hash = "sha256-iRl91GqYigD6t0aVVShBg835yhlPxgfZcQCdAGUoc1k="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ic/ice-bar/package.nix b/pkgs/by-name/ic/ice-bar/package.nix index a55201ae0a95..0a8c9fd3b041 100644 --- a/pkgs/by-name/ic/ice-bar/package.nix +++ b/pkgs/by-name/ic/ice-bar/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "ice-bar"; - version = "0.11.9"; + version = "0.11.11"; src = fetchurl { url = "https://github.com/jordanbaird/Ice/releases/download/${finalAttrs.version}/Ice.zip"; - hash = "sha256-nC7gIF4OdkUYoacbyr1cv5xpJkWDqhFW11UNZvgrQtE="; + hash = "sha256-Iepf+mFN7ym7aZu3xnJVJoQNDZmSFvt15QTGdXtvScs="; }; sourceRoot = "."; diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/by-name/la/lazpaint/package.nix similarity index 51% rename from pkgs/applications/graphics/lazpaint/default.nix rename to pkgs/by-name/la/lazpaint/package.nix index 18f4e8de7fed..6c9d1149a159 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/by-name/la/lazpaint/package.nix @@ -1,6 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, lazarus, fpc, pango, cairo, glib -, atk, gtk2, libX11, gdk-pixbuf, python3 -, makeWrapper +{ + lib, + stdenv, + fetchFromGitHub, + lazarus-qt, + fpc, + autoPatchelfHook, + libsForQt5, + libqt5pas, + xorg, + python3, }: let @@ -16,52 +24,67 @@ let rev = "v8.0"; hash = "sha256-5L05eGVN+xncd0/0XLFN6EL2ux4aAOsiU0BMoy0dKgg="; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "lazpaint"; - version = "7.2.2-unstable-2024-01-20"; + version = "7.2.2-unstable-2024-01-23"; src = fetchFromGitHub { owner = "bgrabitmap"; repo = "lazpaint"; - rev = "fe54c2e2561c51218a5a2755842ce3fc2e0ebb35"; - hash = "sha256-LaOTJiS+COJUlyJiN9H2kEKwv5lbJqOHsUXOnb+IQFA="; + rev = "45a7a471d531d6adb5ee557ff917a99af76e92f1"; + hash = "sha256-KgCxSK72Ow29T58mlcYCJiS4D0Ov2/p37c1FSNgKZew="; }; - nativeBuildInputs = [ lazarus fpc makeWrapper ]; + nativeBuildInputs = [ + lazarus-qt + fpc + libsForQt5.wrapQtAppsHook + autoPatchelfHook + ]; - buildInputs = [ pango cairo glib atk gtk2 libX11 gdk-pixbuf ]; + buildInputs = [ + libsForQt5.qtbase + libqt5pas + ]; - NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + runtimeDependencies = [ + xorg.libX11 + ]; preConfigure = '' - patchShebangs configure + patchShebangs --build configure ''; buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap cp -r --no-preserve=mode ${bgracontrols} bgracontrols - lazbuild --lazarusdir=${lazarus}/share/lazarus \ - --build-mode=Release \ + lazbuild --lazarusdir=${lazarus-qt}/share/lazarus \ + --build-mode=ReleaseQt5 \ bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ bgracontrols/bgracontrols.lpk \ lazpaintcontrols/lazpaintcontrols.lpk \ lazpaint/lazpaint.lpi + + runHook postBuild ''; - postBuild = '' - # Python is needed for scripts - wrapProgram $out/bin/lazpaint \ - --prefix PATH : ${lib.makeBinPath [ python3 ]} + # Python is needed for scripts + preFixup = '' + qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ python3 ]}) ''; - meta = with lib; { + meta = { description = "Image editor like PaintBrush or Paint.Net"; homepage = "https://lazpaint.github.io"; downloadPage = "https://github.com/bgrabitmap/lazpaint/"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ aleksana ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aleksana ]; mainProgram = "lazpaint"; }; } diff --git a/pkgs/by-name/me/merge-ut-dictionaries/package.nix b/pkgs/by-name/me/merge-ut-dictionaries/package.nix index ebe05f2fd1fd..130a89016a48 100644 --- a/pkgs/by-name/me/merge-ut-dictionaries/package.nix +++ b/pkgs/by-name/me/merge-ut-dictionaries/package.nix @@ -24,13 +24,13 @@ assert lib.assertMsg (dictionaries != [ ]) "merge-ut-dictionaries needs at least stdenvNoCC.mkDerivation { pname = "merge-ut-dictionaries"; - version = "0-unstable-2024-09-09"; + version = "0-unstable-2024-10-13"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "merge-ut-dictionaries"; - rev = "35dfcca5c8657f2bf78bc000baa349c322ecb771"; - hash = "sha256-s6m430nXrG5v6iA+Fp2CKDPfFoAZirw/c3WahLrsaL4="; + rev = "4e08ad0bc0e493a35e9408edf963a3e77257b4cf"; + hash = "sha256-o+4a2FdMfKnCrZ7b+gbVwCBxs72M0QY4C8EnNyBZqXU="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index c611ccdd7eaf..f5ca00cd6294 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; rev = "refs/tags/v${version}"; - hash = "sha256-mi3lM/BQ16dCVX/kVRNhIis4sh6M0TMuK05q/pXJiS8="; + hash = "sha256-7rZwrnzoVkcXg3Z5lCMVEMyB3f5pS1t33lqogwY3I7w="; }; - vendorHash = "sha256-aABtsS39yxBBFMN98fjr4gy6QeF3dobrZqeZmmv2ywQ="; + vendorHash = "sha256-ymXpuCc1Pv12kFcBf1STT2wiUXTyT4R1DHnDCeBWbSs="; ldflags = [ "-s" diff --git a/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix b/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix index 37551d7e0d04..356d4822b3c6 100644 --- a/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-edict2/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-edict2"; - version = "0-unstable-2024-07-28"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-edict2"; - rev = "b2112277d0d479b9218f42772356da3601b3e8cf"; - hash = "sha256-DIIp8FooWxyHMrQmq+2KUGEmYHKy+H6NtHrvRldxXqc="; + rev = "f68299b7113080d5e1981c97db490b3075874445"; + hash = "sha256-PdHGVudApWgQaxvAsdVui1XQR+4JHjGkhGHfcwL3wjc="; }; installPhase = '' diff --git a/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix b/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix index e7ab1d99a11c..b17b50058416 100644 --- a/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-jawiki"; - version = "0-unstable-2024-09-27"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-jawiki"; - rev = "773cc08e71c4daa3c06fc577853f715a2bb4d9aa"; - hash = "sha256-TDZvB8/ZrUtkAbCr3vMfyFfhQ4v5SYWEqPNjuGB1Ve4="; + rev = "a91b76a05c4187420e46ead1cc70c2267148004b"; + hash = "sha256-EuMxFSiwSFkcpetsQpuQU6yjX4BhSmS1LbVuLacw4w0="; }; installPhase = '' diff --git a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix index 686fe1e9fefb..a0c5b3761b59 100644 --- a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-neologd"; - version = "0-unstable-2024-07-28"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-neologd"; - rev = "b7035b88db25ad1a933f05a33f193711c6c3b2db"; - hash = "sha256-JPTrWaDtdNs/Z0uLRwaS8Qc/l4/Y7NtwLanivyefXnk="; + rev = "d37f0514dd8c4057f2f94a92617ac7994ece3519"; + hash = "sha256-Vj/5SNe5kC07qQRAOuqRZScoOpUXjLdX0JsakNm9tfk="; }; installPhase = '' diff --git a/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix b/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix index 264490ad6126..41852d7a2150 100644 --- a/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-skk-jisyo/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-skk-jisyo"; - version = "0-unstable-2024-07-27"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-skk-jisyo"; - rev = "7300f19e6a3f27334ed7af64589de8782549a13f"; - hash = "sha256-LJ1rP+uyh8K3IWCgKMDYt0EwEDiQqQL+wBdQCFbZM/k="; + rev = "f34f5801b1f29cff34633e4a03b887702f98ed54"; + hash = "sha256-W5ZZDSKvN5fLsFyrEKGMQl/S4q9WGLmewPqofztOPe0="; }; installPhase = '' diff --git a/pkgs/by-name/pa/paper-clip/package.nix b/pkgs/by-name/pa/paper-clip/package.nix index 032bb9b5dbc4..d7376dde2226 100644 --- a/pkgs/by-name/pa/paper-clip/package.nix +++ b/pkgs/by-name/pa/paper-clip/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "paper-clip"; - version = "5.5"; + version = "5.5.1"; src = fetchFromGitHub { owner = "Diego-Ivan"; repo = "Paper-Clip"; rev = "v${finalAttrs.version}"; - hash = "sha256-WCnWWVYaKq4U2RG3S4Xfja0NvreJIqU2VUJzpX7KI/E="; + hash = "sha256-Jdsx5ZhujP0SgEtr4NMbXsTkMYrkQj7Vs+SSYziWpiw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch b/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch deleted file mode 100644 index 6659f2d084d9..000000000000 --- a/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff --git a/src/snes/tutorials/makefile b/src/snes/tutorials/makefile -index fa15faad39e..7670e80931e 100644 ---- a/src/snes/tutorials/makefile -+++ b/src/snes/tutorials/makefile -@@ -13,6 +13,7 @@ ex55: ex55.o ex55k.o - # these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed - testex5f: ex5f.PETSc - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ - if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \ - echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \ - else \ -@@ -25,6 +26,7 @@ testex5f: ex5f.PETSc - ${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm; - testex19: ex19.PETSc - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \ - else \ -@@ -36,6 +38,7 @@ testex19: ex19.PETSc - ${RM} -f ex19_1.tmp; - testex19_mpi: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \ - else \ -@@ -48,6 +51,7 @@ testex19_mpi: - #use unpreconditioned norm because HYPRE device installations use different AMG parameters - runex19_hypre: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE"; \ - else \ -@@ -57,6 +61,7 @@ runex19_hypre: - ${RM} -f ex19_1.tmp - runex19_hypre_cuda: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/CUDA"; \ - else \ -@@ -66,6 +71,7 @@ runex19_hypre_cuda: - ${RM} -f ex19_1.tmp - runex19_hypre_hip: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/HIP"; \ - else \ -@@ -75,6 +81,7 @@ runex19_hypre_hip: - ${RM} -f ex19_1.tmp - runex19_cuda: - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -ksp_monitor -mg_levels_ksp_max_it 1 > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with CUDA"; \ - else \ -@@ -84,6 +91,7 @@ runex19_cuda: - ${RM} -f ex19_1.tmp - runex19_ml: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with ML"; \ - else \ -@@ -93,6 +101,7 @@ runex19_ml: - ${RM} -f ex19_1.tmp - runex19_fieldsplit_mumps: - -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ - if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with MUMPS"; \ - else \ -@@ -102,6 +111,7 @@ runex19_fieldsplit_mumps: - ${RM} -f ex19_6.tmp - runex19_superlu_dist: - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \ - if (${DIFF} output/ex19_superlu.out ex19.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuperLU_DIST"; \ - else \ -@@ -111,6 +121,7 @@ runex19_superlu_dist: - ${RM} -f ex19.tmp - runex19_suitesparse: - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ - if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuiteSparse"; \ - else \ -@@ -120,6 +131,7 @@ runex19_suitesparse: - ${RM} -f ex19_1.tmp - runex3k_kokkos: ex3k.PETSc - -@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ - if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex3k run successfully with Kokkos Kernels"; \ - else \ -diff --git a/src/vec/vec/tests/makefile b/src/vec/vec/tests/makefile -index d1f047820ec..aab400535dd 100644 ---- a/src/vec/vec/tests/makefile -+++ b/src/vec/vec/tests/makefile -@@ -5,6 +5,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules - - runex47: ex47.PETSc - -@H5OUT=`mktemp -t petsc.h5.XXXXXX`; ${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex47 -filename $${H5OUT} > ex47_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex47_1.tmp; \ - if (${DIFF} output/ex47_1.out ex47_1.tmp) then \ - echo "C/C++ example src/vec/vec/tests/ex47 run successfully with HDF5"; \ - else \ diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 498a14c96dc3..8d0db4a768db 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -9,6 +9,7 @@ lapack, mpiSupport ? true, mpi, # generic mpi dependency + mpiCheckPhaseHook, openssh, # required for openmpi tests petsc-withp4est ? false, hdf5-support ? false, @@ -52,12 +53,6 @@ stdenv.mkDerivation rec { --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool ''; - # Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr): - # [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery. - # [1684747490.391106] [localhost:14258:0] tcp_iface.c:837 UCX ERROR opendir(/sys/class/net) failed: No such file or directory - # These messages contaminate test output, which makes the quicktest suite to fail. The patch adds filtering for these messages. - patches = [ ./filter_mpi_warnings.patch ]; - configureFlags = [ "--with-blas=1" "--with-lapack=1" @@ -112,6 +107,7 @@ stdenv.mkDerivation rec { # the library is installed and available. doInstallCheck = true; installCheckTarget = "check_install"; + nativeInstallCheckInputs = [ mpiCheckPhaseHook ]; passthru = { inherit mpiSupport; diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index 83b1d4416a7f..8e5f9d295fb7 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -35,13 +35,13 @@ let pname = "pulsar"; - version = "1.121.0"; + version = "1.122.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-xouxKl4GTNZkT5wn8qbG2W2PbVAbsK9povmIL/Mikk4="; + x86_64-linux.hash = "sha256-Sx60cEQ2UAXqMujTaLkgN0Y3tIySg0TmaM0YroaX7nA="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-qRBX8jO5xDXkZ/6TWkgNa1NS3l+z8K/JyJDAa/3me5Q="; + aarch64-linux.hash = "sha256-Bhk1WZm9N771CC7j+TQsQCRSPwHOVTXCpleuhXC48K8="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); newLibpath = lib.makeLibraryPath [ diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix index 2cb4489cff97..3f252a80087e 100644 --- a/pkgs/by-name/sh/shpool/package.nix +++ b/pkgs/by-name/sh/shpool/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "shpool"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "shell-pool"; repo = "shpool"; rev = "v${version}"; - hash = "sha256-0ykGGzYL29SxxT0etTaBHooIE8NEUJeTIr/6vTBgY0Q="; + hash = "sha256-pSSMC4pUtB38c6UNOj+Ma/Y1jcSfm33QV1B4tA/MyKY="; }; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/bin/shpool' "$out/bin/shpool" ''; - cargoHash = "sha256-cuLscDki8Y68qtEZh7xDaLp5B6MyTkPWTQX5gHNtULQ="; + cargoHash = "sha256-NUo9Y/c4Wm3d8lbhdHEqu9Zp7tX8giq2wnYwz8SMTXo="; buildInputs = [ linux-pam diff --git a/pkgs/by-name/sn/snipaste/package.nix b/pkgs/by-name/sn/snipaste/package.nix index 45b35d04d68e..12cf92be8f51 100644 --- a/pkgs/by-name/sn/snipaste/package.nix +++ b/pkgs/by-name/sn/snipaste/package.nix @@ -5,18 +5,23 @@ }: appimageTools.wrapType2 rec { pname = "snipaste"; - version = "2.9.2-Beta"; + version = "2.10.2"; src = fetchurl { url = "https://download.snipaste.com/archives/Snipaste-${version}-x86_64.AppImage"; - hash = "sha256-oV69uABjzkbQdwb+1wRRxszhrwI4uyzhQZ4aXBnyeo8="; + hash = "sha256-u9e2d9ZpHDbDIsFkseOdJX2Kspn9TkhFfZxbeielDA8="; }; + passthru.updateScript = ./update.sh; + meta = { description = "Screenshot tools"; homepage = "https://www.snipaste.com/"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + ltrump + ]; mainProgram = "snipaste"; platforms = [ "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/sn/snipaste/update.sh b/pkgs/by-name/sn/snipaste/update.sh new file mode 100755 index 000000000000..1c6843fe6839 --- /dev/null +++ b/pkgs/by-name/sn/snipaste/update.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl coreutils jq common-updater-scripts + +latestTag=$(curl -sSfL https://www.snipaste.com/linux_version | jq -r ".subject") +latestVersion="$(expr "$latestTag" : 'v\(.*\)')" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; snipaste.version" | tr -d '"') + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +prefetch=$(nix-prefetch-url "https://download.snipaste.com/archives/Snipaste-$latestVersion-x86_64.AppImage") +hash=$(nix-hash --type sha256 --to-sri "$prefetch") +update-source-version snipaste "$latestVersion" "$hash" --ignore-same-version diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix index 476a49f32743..358e51f8ab64 100644 --- a/pkgs/by-name/yo/youtrack/package.nix +++ b/pkgs/by-name/yo/youtrack/package.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "youtrack"; - version = "2024.2.41254"; + version = "2024.3.47197"; src = fetchzip { url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip"; - hash = "sha256-17IukQTBKspspVDyHpv8DtkAnuAHrB+rXenu8h7Yfno="; + hash = "sha256-/XTZERUPA7AEvWQsnjDXDVVkmiEn+0D8qgQkOzTJFaA="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/zs/zsh-wd/package.nix b/pkgs/by-name/zs/zsh-wd/package.nix index 4a80ec499e89..b7b3817021c8 100644 --- a/pkgs/by-name/zs/zsh-wd/package.nix +++ b/pkgs/by-name/zs/zsh-wd/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "wd"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "mfaerevaag"; repo = "wd"; rev = "v${version}"; - hash = "sha256-8gL0+SZwVCQRokcYwSljDHtSusYY79/T9hqJGgAK1EU="; + hash = "sha256-UjeLsc6pz1t798Qy6cliYjP0qjXvUIPotbnUm8dBrFs="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix index 65d44c25e9d0..c920a5c677d6 100644 --- a/pkgs/data/fonts/iosevka/comfy.nix +++ b/pkgs/data/fonts/iosevka/comfy.nix @@ -20,12 +20,12 @@ let "comfy-wide-motion-fixed" # Slab | Wide | Monospaced | No | "comfy-wide-motion-duo" # | Slab | Wide | Duospaced | Yes | ]; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "protesilaos"; repo = "iosevka-comfy"; rev = version; - sha256 = "sha256-wDcBaNXIzOQ3/LBuW3YUnx/fjtJMeI+jsxLRBlsd1M0="; + sha256 = "sha256-z9OlxeD88HuPJF88CsAy3vd1SFpJF1qh5c/0AIeMA7o="; }; privateBuildPlan = src.outPath + "/private-build-plans.toml"; makeIosevkaFont = set: @@ -40,11 +40,11 @@ let src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; - rev = "v31.3.0"; - hash = "sha256-WrRxVrBJeyUwv0/DYTIHLi52+k2PilC7ay0tc5yq3Pw="; + rev = "v31.9.1"; + hash = "sha256-eAC4afBfHfiteYCzBNGFG2U/oCA7C5CdUlQVSO9Dg6E="; }; - npmDepsHash = "sha256-xw0GA1aIA/J5hfLQBSE+GJzXfbfWQI2k2pYdenlM9NY="; + npmDepsHash = "sha256-xwGR21+CpZRFdZYz8SQrSf1tkp3fjGudoMmP5TGgEe8="; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index db6edf8df3f0..305c9e50ca78 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.28.2"; + version = "1.28.4"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Z4pD6DeqJxhJQgT93xm7kGzwfl2A/S4d3nRfJtKtujM="; + hash = "sha256-AvCesDFMKsGXtvCJlQpXHNujm/0D1sOguP13JSqWiHQ="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gtk3 - # See https://github.com/mate-desktop/mate-panel/issues/1402 + # Optionally for the ca.desrt.dconf-editor.Settings schema # This is propagated for mate_panel_applet_settings_new and applet's wrapGAppsHook3 dconf-editor ]; diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix index 2bf6b754e297..f2c075beac67 100644 --- a/pkgs/development/compilers/flix/default.nix +++ b/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.51.0"; + version = "0.52.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-JeOw9mdmFAG0mMe8G/yanKCLPbCUPJxUBluNFFqjfbA="; + sha256 = "sha256-OJBeJyF/CmLyMNRpjcx06GB7Lc4htNTm2apbi8wQKL4="; }; dontUnpack = true; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 542164aeebf4..4e0976c5ebb1 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zef"; - version = "0.22.2"; + version = "0.22.4"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${finalAttrs.version}"; - hash = "sha256-uMVfBptiCungO+XJMlwV2Fhs2jgVNDOqUFqgJPV5RhM="; + hash = "sha256-blreXcpKvatu5Vo5YViIz5Yv2OAsQgs/SGEI2rABDoc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index ed142788c765..e7ad912dc3bd 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -6,6 +6,10 @@ let }; in { + icu76 = make-icu { + version = "76.1rc"; + hash = "sha256-HMY4hRYbF4Dsf1EGx+m0NRsCUA+Q/JGRpdGIgym/A5I="; + }; icu75 = make-icu { version = "75.1"; hash = "sha256-y5aN8+TS6H6LEcSaXQHHh70TuVRSgPxmQvgmUnYYyu8="; diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix index 09e7bb3c9654..7e137003b030 100644 --- a/pkgs/development/libraries/icu/make-icu.nix +++ b/pkgs/development/libraries/icu/make-icu.nix @@ -8,9 +8,13 @@ let pname = "icu4c"; + #release = lib.replaceStrings [ "." ] [ "-" ] version; + # To test rc versions of ICU replace the line above with the line below. + release = lib.replaceStrings [ "." ] [ "-" ] (if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version); + baseAttrs = { src = fetchurl { - url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceStrings [ "." ] [ "-" ] version}/icu4c-${lib.replaceStrings [ "." ] [ "_" ] version}-src.tgz"; + url = "https://github.com/unicode-org/icu/releases/download/release-${release}/icu4c-${lib.replaceStrings [ "." ] [ "_" ] version}-src.tgz"; inherit hash; }; @@ -75,7 +79,7 @@ let mkdir -p $static/lib mv -v lib/*.a $static/lib '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc + sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${lib.versions.majorMinor version}/pkgdata.inc '' + (let replacements = [ { from = "\${prefix}/include"; to = "${placeholder "dev"}/include"; } # --cppflags-searchpath @@ -83,7 +87,7 @@ let { from = "\${pkglibdir}/pkgdata.inc"; to = "${placeholder "dev"}/lib/icu/pkgdata.inc"; } # --incpkgdatafile ]; in '' - rm $out/share/icu/${version}/install-sh $out/share/icu/${version}/mkinstalldirs # Avoid having a runtime dependency on bash + rm $out/share/icu/${lib.versions.majorMinor version}/install-sh $out/share/icu/${lib.versions.majorMinor version}/mkinstalldirs # Avoid having a runtime dependency on bash substituteInPlace "$dev/bin/icu-config" \ ${lib.concatMapStringsSep " " (r: "--replace '${r.from}' '${r.to}'") replacements} diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix index f8f53522db13..9655393615b9 100644 --- a/pkgs/development/libraries/mbedtls/3.nix +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "3.6.1"; - hash = "sha256-SVWz2uOvGIplnBr4g6nwfxKMWVpzdZjusseAhw6GOJ8="; + version = "3.6.2"; + hash = "sha256-tSWhF8i0Tx9QSFmyDEHdd2xveZvpyd+HXR+8xYj2Syo="; } diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 1a34ade3cee0..4f5c7bbdcb10 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -53,8 +53,11 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "More Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; - # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h - platforms = intersectLists platforms.unix (platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86); + platforms = intersectLists + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/meson.build + (platforms.darwin ++ platforms.linux ++ platforms.windows) + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h + (platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86); # BE platforms are unsupported # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/31 badPlatforms = platforms.bigEndian; diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index a5c30114c4b9..67a309fcee04 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.12"; + version = "0.22.2"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-PIQ/OrZnm+WOlvTzCHb64/bj7/JGKBEbh6lHD0Pm0ro="; + hash = "sha256-rauk8rY3i5fWUrE8lszyC9KBVjTZ7zhXO98cMhIiiz8="; }; build-system = [ diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 699430682d4b..0c2664caa51c 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "5.0.1"; + version = "6.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-oooWPQ4O7+FjCzIoBwm+jgGTkG7eFwekbIAEbJh44I4="; + hash = "sha256-ZSrC3GhcyraK+lm9EF+6R1ufk7aEgi9T+CxTTpeaNFE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hiyapyco/default.nix b/pkgs/development/python-modules/hiyapyco/default.nix index 1e2b45a7dc60..e65e8e87f4eb 100644 --- a/pkgs/development/python-modules/hiyapyco/default.nix +++ b/pkgs/development/python-modules/hiyapyco/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hiyapyco"; - version = "0.6.1"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "zerwes"; repo = pname; rev = "refs/tags/release-${version}"; - hash = "sha256-KB/KFrR7IScIWyYbsU+4BbV0+SCeeWxYDD8lbxosRLc="; + hash = "sha256-uF5DblAg4q8L1tZKopcjJ14NIQVQF5flNHdZ/jnw71M="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/imgtool/default.nix b/pkgs/development/python-modules/imgtool/default.nix deleted file mode 100644 index ba083666336f..000000000000 --- a/pkgs/development/python-modules/imgtool/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pythonOlder, - setuptools, - cbor2, - click, - cryptography, - intelhex, - pyyaml, -}: - -buildPythonPackage rec { - pname = "imgtool"; - version = "2.1.0"; - pyproject = true; - - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-T3+831PETqqmImUEUQzLUvfvAMmXUDz5STSzMMlge2A="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - cbor2 - click - cryptography - intelhex - pyyaml - ]; - - pythonImportsCheck = [ "imgtool" ]; - - meta = with lib; { - description = "MCUboot's image signing and key management"; - mainProgram = "imgtool"; - homepage = "https://github.com/mcu-tools/mcuboot"; - license = licenses.asl20; - maintainers = with maintainers; [ samueltardieu ]; - }; -} diff --git a/pkgs/development/python-modules/lineax/default.nix b/pkgs/development/python-modules/lineax/default.nix index 8f547bc1d9d7..2680211c58fa 100644 --- a/pkgs/development/python-modules/lineax/default.nix +++ b/pkgs/development/python-modules/lineax/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "lineax"; - version = "0.0.6"; + version = "0.0.7"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "lineax"; rev = "refs/tags/v${version}"; - hash = "sha256-rM3H+q75F98eEIJkEszWgxD5C5vGK5RlYtVv8GD/VC0="; + hash = "sha256-HcFI55Ww/y7ZaUkawj7xWSb7VDTBec3u0ulWL8kTm2c="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix index a7cb8b7c5e7e..5e2809133764 100644 --- a/pkgs/development/python-modules/optimistix/default.nix +++ b/pkgs/development/python-modules/optimistix/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "optimistix"; - version = "0.0.8"; + version = "0.0.9"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "optimistix"; rev = "refs/tags/v${version}"; - hash = "sha256-0ehNApiBoiAb8LFBW81ZCRPsjTVQG8zRTVSAp7oHF8w="; + hash = "sha256-s8MRPyPObTpgLRm4bxU8F4Su7FKH+MHqtQsxIHb/DN4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/proton-core/default.nix b/pkgs/development/python-modules/proton-core/default.nix index 12df2934bff2..91bffd81e2ce 100644 --- a/pkgs/development/python-modules/proton-core/default.nix +++ b/pkgs/development/python-modules/proton-core/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "proton-core"; - version = "0.2.0"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-core"; rev = "refs/tags/v${version}"; - hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ="; + hash = "sha256-2Drlai/PYzi1z1CtDYfNhol2wamb/HNrvUhj0XsiyHg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix deleted file mode 100644 index 4bb419d21b20..000000000000 --- a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-keyring-linux, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-keyring-linux-secretservice"; - version = "0.0.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-keyring-linux-secretservice"; - rev = "refs/tags/v${version}"; - hash = "sha256-IZPT2bL/1YD2TH/djwIQHUE1RRbYMTkQDacjjoqDQWo="; - }; - - build-system = [ setuptools ]; - - dependencies = [ proton-keyring-linux ]; - - pythonImportsCheck = [ "proton.keyring_linux" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "ProtonVPN component to access Linux's keyring secret service API"; - homepage = "https://github.com/ProtonVPN/python-proton-keyring-linux-secretservice"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix index 51617e71a0f8..56bd41fea4a6 100644 --- a/pkgs/development/python-modules/proton-keyring-linux/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proton-keyring-linux"; - version = "0.0.2"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-keyring-linux"; rev = "refs/tags/v${version}"; - hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU="; + hash = "sha256-feIgRC0U7d96gFcmHqRF3/8k/bsxlPJs1/K+ki7uXys="; }; build-system = [ setuptools ]; @@ -28,7 +28,10 @@ buildPythonPackage rec { proton-core ]; - pythonImportsCheck = [ "proton.keyring_linux.core" ]; + pythonImportsCheck = [ + "proton.keyring_linux.core" + "proton.keyring_linux" + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index 219dd94b3142..b98536954e8d 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -2,12 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + cryptography, setuptools, + jinja2, proton-core, - proton-vpn-connection, - proton-vpn-logger, - proton-vpn-killswitch, - proton-vpn-session, + pynacl, + aiohttp, + pyopenssl, + pytest-asyncio, + requests, sentry-sdk, distro, pytestCheckHook, @@ -16,36 +19,47 @@ buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "0.32.2"; + version = "0.35.5"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; rev = "v${version}"; - hash = "sha256-n4TZkp2ZMSJ1w1wQUMsAhX8kmWu59udlsXXEhIM83mI="; + hash = "sha256-YdBsA8qKcWpR+L/I9rEFntR448kaxEjYuGDPS1ynsMU="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + ]; dependencies = [ + cryptography distro + jinja2 + pynacl proton-core - proton-vpn-connection - proton-vpn-logger - proton-vpn-killswitch - proton-vpn-session sentry-sdk ]; - pythonImportsCheck = [ "proton.vpn.core" ]; + pythonImportsCheck = [ + "proton.vpn.core" + "proton.vpn.connection" + "proton.vpn.killswitch.interface" + "proton.vpn.logging" + "proton.vpn.session" + ]; nativeCheckInputs = [ + aiohttp + pyopenssl + pytest-asyncio + requests pytestCheckHook pytest-cov-stub ]; - preCheck = '' + postInstall = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) ''; diff --git a/pkgs/development/python-modules/proton-vpn-connection/default.nix b/pkgs/development/python-modules/proton-vpn-connection/default.nix deleted file mode 100644 index 7da811dc3a31..000000000000 --- a/pkgs/development/python-modules/proton-vpn-connection/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-core, - proton-vpn-killswitch, - proton-vpn-logger, - jinja2, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-connection"; - version = "0.14.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-connection"; - rev = "refs/tags/v${version}"; - hash = "sha256-Ze/te0G0tDzyZPGVVqvuJlZoHWJqJ36LnHO+Cy5nxx8="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - jinja2 - proton-core - proton-vpn-killswitch - proton-vpn-logger - ]; - - pythonImportsCheck = [ "proton.vpn.connection" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - disabledTests = [ - # Permission denied: '/run' - "test_ensure_configuration_file_is_deleted" - "test_ensure_generate_is_returning_expected_content" - "test_ensure_same_configuration_file_in_case_of_duplicate" - "test_ensure_configuration_file_is_created" - "test_wireguard_config_content_generation" - "test_wireguard_with_malformed_credentials" - "test_wireguard_with_non_certificate" - "test_wireguard_without_settings" - # Neiter udp or tcp are working - "test_ovpnconfig_with_settings" - "test_ovpnconfig_with_missing_settings_applies_expected_defaults" - "test_ovpnconfig_with_malformed_params" - "test_ovpnconfig_with_certificate_and_malformed_credentials" - "test_ovpnconfig_with_malformed_server" - "test_ovpnconfig_with_malformed_server_and_credentials" - ]; - - meta = { - description = "Defines the interface that VPN connection backends should implement"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-connection"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix deleted file mode 100644 index 8ff9321fc57c..000000000000 --- a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - networkmanager, - proton-vpn-api-core, - proton-vpn-killswitch, - proton-vpn-logger, - pycairo, - pygobject3, - pytestCheckHook, - iproute2, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-killswitch-network-manager-wireguard"; - version = "0.1.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-killswitch-network-manager-wireguard"; - rev = "v${version}"; - hash = "sha256-4sYD2X1U066FMjrtbTb31wvkCDWAw+eXod+pi0gGsCQ="; - }; - - nativeBuildInputs = [ - # Solves ImportError: cannot import name NM, introspection typelib not found - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - # Needed here for the NM namespace - networkmanager - proton-vpn-api-core - proton-vpn-killswitch - proton-vpn-logger - pycairo - pygobject3 - ]; - - postPatch = '' - substituteInPlace proton/vpn/killswitch/backend/linux/wireguard/killswitch_connection_handler.py \ - --replace '/usr/sbin/ip' '${iproute2}/bin/ip' - ''; - - pythonImportsCheck = [ "proton.vpn.killswitch.backend.linux.wireguard" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Implementation of the proton-vpn-killswitch interface using Network Manager with wireguard-protocol"; - homepage = "https://github.com/ProtonVPN/proton-vpn-killswitch-network-manager-wireguard"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix deleted file mode 100644 index c8d30741930c..000000000000 --- a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - networkmanager, - proton-vpn-api-core, - proton-vpn-killswitch, - proton-vpn-logger, - pycairo, - pygobject3, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-killswitch-network-manager"; - version = "0.5.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-killswitch-network-manager"; - rev = "refs/tags/v${version}"; - hash = "sha256-iUm+hpqgI4jG+1Cd9F6pBjodxHpq9/2ovXRT877biXQ="; - }; - - nativeBuildInputs = [ - # Solves ImportError: cannot import name NM, introspection typelib not found - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - # Needed here for the NM namespace - networkmanager - proton-vpn-api-core - proton-vpn-killswitch - proton-vpn-logger - pycairo - pygobject3 - ]; - - pythonImportsCheck = [ "proton.vpn.killswitch.backend.linux.networkmanager" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Implementation of the proton-vpn-killswitch interface using Network Manager"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch-network-manager"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix deleted file mode 100644 index ae83dd1e5baa..000000000000 --- a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-core, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-killswitch"; - version = "0.4.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-killswitch"; - rev = "v${version}"; - hash = "sha256-XZqjAhxgIiATJd3JcW2WWUMC1b6+cfZRhXlIPyMUFH8="; - }; - - build-system = [ setuptools ]; - - dependencies = [ proton-core ]; - - pythonImportsCheck = [ "proton.vpn.killswitch.interface" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Defines the ProtonVPN kill switch interface"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-logger/default.nix b/pkgs/development/python-modules/proton-vpn-logger/default.nix deleted file mode 100644 index 402b6e0e4910..000000000000 --- a/pkgs/development/python-modules/proton-vpn-logger/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - proton-core, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-logger"; - version = "0.2.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-logger"; - rev = "refs/tags/v${version}"; - hash = "sha256-/LfMjyTs/EusgnKEQugsdJzqDZBvaAhbsTUVLDCRw0I="; - }; - - build-system = [ - setuptools - ]; - - dependencies = [ proton-core ]; - - pythonImportsCheck = [ "proton.vpn.logging" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - preCheck = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - ''; - - meta = { - description = "General purpose logging package for the entire ProtonVPN Linux client"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-logger"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix deleted file mode 100644 index 25c9715e7e6b..000000000000 --- a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - proton-core, - proton-vpn-network-manager, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-network-manager-openvpn"; - version = "0.1.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-network-manager-openvpn"; - rev = "refs/tags/v${version}"; - hash = "sha256-eDBcpuz37crfAFX6oysB4FCkSmVLyfLJ0R2L0cZgjRo="; - }; - - nativeBuildInputs = [ - # Solves Namespace NM not available - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - proton-core - proton-vpn-network-manager - ]; - - pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager.protocol" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Adds support for the OpenVPN protocol using NetworkManager"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-openvpn"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix deleted file mode 100644 index e32a4b5a1b88..000000000000 --- a/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - setuptools, - proton-core, - proton-vpn-killswitch-network-manager-wireguard, - proton-vpn-network-manager, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-network-manager-wireguard"; - version = "0.4.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-network-manager-wireguard"; - rev = "v${version}"; - hash = "sha256-DZXixcm2VwXhbN4buABlkybDgXIg/mbeUVHOpdoj0Kw="; - }; - - nativeBuildInputs = [ - # Solves Namespace NM not available - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - proton-core - proton-vpn-killswitch-network-manager-wireguard - proton-vpn-network-manager - ]; - - preCheck = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - ''; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Adds support for the Wireguard protocol using NetworkManager"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-wireguard"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index fea0d2e304d0..4e32a915fad9 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -3,11 +3,13 @@ buildPythonPackage, fetchFromGitHub, gobject-introspection, + apt, + iproute2, setuptools, networkmanager, proton-core, proton-vpn-api-core, - proton-vpn-connection, + proton-vpn-local-agent, pycairo, pygobject3, pytest-asyncio, @@ -17,14 +19,14 @@ buildPythonPackage rec { pname = "proton-vpn-network-manager"; - version = "0.5.2"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-hTJE9sUjPMsE9d0fIA/OhoasumtfsWuFwn0aTm10PN4="; + hash = "sha256-dwWEcLowNlIoxeVQnEpmI+PK18DQRiW4A4qfWHSqRw8="; }; nativeBuildInputs = [ @@ -41,12 +43,23 @@ buildPythonPackage rec { networkmanager proton-core proton-vpn-api-core - proton-vpn-connection + proton-vpn-local-agent pycairo pygobject3 ]; - pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager" ]; + postPatch = '' + substituteInPlace proton/vpn/backend/linux/networkmanager/killswitch/wireguard/killswitch_connection_handler.py \ + --replace '/usr/sbin/ip' '${iproute2}/bin/ip' + substituteInPlace proton/vpn/backend/linux/networkmanager/killswitch/wireguard/wgkillswitch.py \ + --replace '/usr/bin/apt' '${apt}/bin/apt' + ''; + + pythonImportsCheck = [ + "proton.vpn.backend.linux.networkmanager" + "proton.vpn.backend.linux.networkmanager.killswitch.default" + "proton.vpn.backend.linux.networkmanager.killswitch.wireguard" + ]; nativeCheckInputs = [ pytestCheckHook @@ -54,6 +67,11 @@ buildPythonPackage rec { pytest-asyncio ]; + preCheck = '' + # Needed for Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) + ''; + meta = { description = "Provides the necessary functionality for other ProtonVPN components to interact with NetworkManager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager"; diff --git a/pkgs/development/python-modules/proton-vpn-session/default.nix b/pkgs/development/python-modules/proton-vpn-session/default.nix deleted file mode 100644 index ee27bfb9b466..000000000000 --- a/pkgs/development/python-modules/proton-vpn-session/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - cryptography, - distro, - proton-core, - proton-vpn-logger, - pynacl, - aiohttp, - pyopenssl, - pytest-asyncio, - requests, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-session"; - version = "0.6.7"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-session"; - rev = "refs/tags/v${version}"; - hash = "sha256-/5ju/2bxhqK6JWchkxFe3amBKHtO98GCVQWIrUsn+nQ="; - }; - - build-system = [ - setuptools - ]; - - dependencies = [ - cryptography - distro - proton-core - proton-vpn-logger - pynacl - ]; - - pythonImportsCheck = [ "proton.vpn.session" ]; - - postInstall = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - ''; - - nativeCheckInputs = [ - aiohttp - pyopenssl - pytest-asyncio - requests - pytestCheckHook - pytest-cov-stub - ]; - - meta = { - description = "Provides utility classes to manage VPN sessions"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-session"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ sebtm ]; - }; -} diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index ec0f4987e6bb..a63c65ffef9d 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.122"; + version = "9.2.123"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-YfOjjDlu2bkwUGGm0Sk0QfG+uJcezYKjQvditRLYPT8="; + hash = "sha256-uojU1x4VfiYFM3ZSwSy5qPpWBSEq9CKwByk2HFAXvXA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index be98accba181..85c30a91a48c 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -10,6 +10,7 @@ docutils, mistune, pygments, + sphinx, # tests pytestCheckHook, @@ -32,12 +33,12 @@ buildPythonPackage rec { docutils mistune pygments + sphinx ]; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { - broken = true; # https://github.com/omnilib/sphinx-mdinclude/issues/22 homepage = "https://github.com/omnilib/sphinx-mdinclude"; changelog = "https://github.com/omnilib/sphinx-mdinclude/blob/v${version}/CHANGELOG.md"; description = "Sphinx extension for including or writing pages in Markdown format"; @@ -50,6 +51,9 @@ buildPythonPackage rec { sphinx-mdinclude is a fork of m2r and m2r2, focused only on providing a Sphinx extension. ''; license = licenses.mit; - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ + flokli + JulianFP + ]; }; } diff --git a/pkgs/development/python-modules/ydata-profiling/default.nix b/pkgs/development/python-modules/ydata-profiling/default.nix index d9e88875777e..74be2546c623 100644 --- a/pkgs/development/python-modules/ydata-profiling/default.nix +++ b/pkgs/development/python-modules/ydata-profiling/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "ydata-profiling"; - version = "4.10.0"; + version = "4.11.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "ydataai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uB8E7qp1xohAdcIIt1T2DxwSu93XhJoI8/qn54fSvGY="; + hash = "sha256-3bgFPPGgLCcJfYr9vmwnHFwz3/zybRI8Aiu5VoOPsNA="; }; preBuild = '' diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index f50100bf6c81..9fd633197110 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "air"; - version = "1.52.3"; + version = "1.61.1"; src = fetchFromGitHub { owner = "air-verse"; repo = "air"; rev = "v${version}"; - hash = "sha256-TLTg9fYkIlTFDwkjRIQ7mAmKd+jA5Q9EPQ62fJ6zS9o="; + hash = "sha256-IwPUbz3JYKz0TeK/kbEUzqFp0l8u/AFu9KEAyR8zlSQ="; }; - vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw="; + vendorHash = "sha256-BY2KnAwlrIyqSHWFLD0QU93EXAv4ta/ibvYWiHXvYMc="; ldflags = [ "-s" diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index c6f5739a35ab..ae2a7d30b9db 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "7.3.6"; + version = "8.0.0"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-jXFEpcmv8bkm7Yyo2GUwoakMlAwArCoZ1jIDeyF87Ms="; + sha256 = "sha256-q3AkqhE0hD6+cCv5UeZ4uyUi6Adrmxv4jMGYN7Keias="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index d9a851d09824..f29d54a9eefe 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tflint-ruleset-aws"; - version = "0.32.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-sgAr4kUBjKIH+DgI5XqH/Zs3uL0yiYwlBa6vO0m++xM="; + hash = "sha256-osQhLnOuJQqyKm24mgaEuYKy69cPvnR3XHU0JgVKA84="; }; - vendorHash = "sha256-B2QFjJKwfQYZP8ypiv7bNkFNr3ejP42WA/bmv4Jz46c="; + vendorHash = "sha256-mhc8HJG+sI8pZG/D+91+pyi0RGK0WfZV6ZNuH1bUfhk="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 984afa184a22..1e465654badd 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -3,13 +3,11 @@ let in { stdenv -, autoreconfHook , autoconf269, automake, libtool , bison , buildPackages , fetchFromGitHub , fetchurl -, flex , gettext , lib , noSysDirs @@ -35,19 +33,6 @@ let version = "2.43.1"; - srcs = { - normal = fetchurl { - url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - hash = "sha256-vsqsXSleA3WHtjpC+tV/49nXuD9HjrJLZ/nuxdDxhy8="; - }; - vc4-none = fetchFromGitHub { - owner = "itszor"; - repo = "binutils-vc4"; - rev = "708acc851880dbeda1dd18aca4fd0a95b2573b36"; - sha256 = "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63"; - }; - }; - #INFO: The targetPrefix prepended to binary names to allow multiple binuntils # on the PATH to both be usable. targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; @@ -57,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: { pname = targetPrefix + "binutils"; inherit version; - src = srcs.${targetPlatform.system} or srcs.normal; + src = fetchurl { + url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; + hash = "sha256-vsqsXSleA3WHtjpC+tV/49nXuD9HjrJLZ/nuxdDxhy8="; + }; # WARN: this package is used for bootstrapping fetchurl, and thus cannot use # fetchpatch! All mutable patches (generated by GitHub or cgit) that are @@ -90,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: { # version detection in `libtool.m4` fails to detect the Darwin version correctly. ./0001-libtool.m4-update-macos-version-detection-block.patch ] - ++ lib.optional targetPlatform.isiOS ./support-ios.patch # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution # Patch from arch-community # https://github.com/archlinux/svntogit-community/blob/c8d53dd1734df7ab15931f7fad0c9acb8386904c/trunk/avr-size.patch @@ -117,9 +104,7 @@ stdenv.mkDerivation (finalAttrs: { bison perl ] - ++ lib.optionals targetPlatform.isiOS [ autoreconfHook ] ++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ] - ++ lib.optionals targetPlatform.isVc4 [ flex ] ; buildInputs = [ zlib gettext ] ++ lib.optionals hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/development/tools/misc/binutils/support-ios.patch b/pkgs/development/tools/misc/binutils/support-ios.patch deleted file mode 100644 index 74e56d130ed5..000000000000 --- a/pkgs/development/tools/misc/binutils/support-ios.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff --git a/bfd/config.bfd b/bfd/config.bfd -index f04a993f06..1e24a9d030 100644 ---- a/bfd/config.bfd -+++ b/bfd/config.bfd -@@ -238,7 +238,7 @@ case "${targ}" in - - # START OF targmatch.h - #ifdef BFD64 -- aarch64-*-darwin*) -+ aarch64-*-darwin* | aarch64-*-ios*) - targ_defvec=aarch64_mach_o_vec - targ_selvecs="arm_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec" - targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" -@@ -358,7 +358,7 @@ case "${targ}" in - targ_selvecs=arc_elf32_be_vec - ;; - -- arm-*-darwin*) -+ arm-*-darwin* | arm-*-ios*) - targ_defvec=arm_mach_o_vec - targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec" - targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" -@@ -678,7 +678,7 @@ case "${targ}" in - i[3-7]86-*-aix*) - targ_defvec=i386_coff_vec - ;; -- i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*) -+ i[3-7]86-*-darwin* | i[3-7]86-*-ios* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*) - targ_defvec=i386_mach_o_vec - targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" - targ64_selvecs=x86_64_mach_o_vec -@@ -762,7 +762,7 @@ case "${targ}" in - targ_defvec=x86_64_elf64_cloudabi_vec - want64=true - ;; -- x86_64-*-darwin*) -+ x86_64-*-darwin* | x86_64-*-ios*) - targ_defvec=x86_64_mach_o_vec - targ_selvecs="i386_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" - targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch" -@@ -1402,7 +1402,7 @@ case "${targ}" in - targ_selvecs="powerpc_elf32_le_vec powerpc_boot_vec" - targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec" - ;; -- powerpc-*-darwin* | powerpc-*-macos10* | powerpc-*-rhapsody*) -+ powerpc-*-darwin* | powerpc-*-ios* | powerpc-*-macos10* | powerpc-*-rhapsody*) - targ_defvec=mach_o_be_vec - targ_selvecs="mach_o_be_vec mach_o_le_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" - targ_archs="$targ_archs bfd_i386_arch" -diff --git a/configure.ac b/configure.ac -index aae94501e4..2cceb4dad4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -510,7 +510,7 @@ if test x$enable_libgomp = x ; then - ;; - *-*-solaris2* | *-*-hpux11*) - ;; -- *-*-darwin* | *-*-aix*) -+ *-*-darwin* | *-*-ios* | *-*-aix*) - ;; - nvptx*-*-*) - ;; -@@ -700,13 +700,13 @@ esac - - # Disable libffi for some systems. - case "${target}" in -- powerpc-*-darwin*) -+ powerpc-*-darwin* | powerpc-*-ios*) - ;; -- i[[3456789]]86-*-darwin*) -+ i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*) - ;; -- x86_64-*-darwin[[912]]*) -+ x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*) - ;; -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - noconfigdirs="$noconfigdirs target-libffi" - ;; - *-*-netware*) -@@ -788,7 +788,7 @@ esac - # Disable the go frontend on systems where it is known to not work. Please keep - # this in sync with contrib/config-list.mk. - case "${target}" in --*-*-darwin* | *-*-cygwin* | *-*-mingw*) -+*-*-darwin* | *-*-ios* | *-*-cygwin* | *-*-mingw*) - unsupported_languages="$unsupported_languages go" - ;; - esac -@@ -797,7 +797,7 @@ esac - # For testing, you can easily override this with --enable-libgo. - if test x$enable_libgo = x; then - case "${target}" in -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - # PR 46986 - noconfigdirs="$noconfigdirs target-libgo" - ;; -@@ -916,27 +916,27 @@ esac - case "${target}" in - *-*-chorusos) - ;; -- aarch64-*-darwin*) -+ aarch64-*-darwin* | aarch64-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- arm-*-darwin*) -+ arm-*-darwin* | arm-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- powerpc-*-darwin*) -+ powerpc-*-darwin* | powerpc-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- i[[3456789]]86-*-darwin*) -+ i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*) - noconfigdirs="$noconfigdirs ld gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- x86_64-*-darwin[[912]]*) -+ x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*) - noconfigdirs="$noconfigdirs ld gas gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" - ;; -@@ -1226,7 +1226,7 @@ case "${host}" in - hppa*-*) - host_makefile_frag="config/mh-pa" - ;; -- *-*-darwin*) -+ *-*-darwin* | *-*-ios*) - host_makefile_frag="config/mh-darwin" - ;; - powerpc-*-aix*) -@@ -1697,7 +1697,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. - build_lto_plugin=yes - ],[if test x"$default_enable_lto" = x"yes" ; then - case $target in -- *-apple-darwin[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;; -+ *-apple-darwin[[912]]* | *-apple-ios[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;; - # On other non-ELF platforms, LTO has yet to be validated. - *) enable_lto=no ;; - esac -@@ -1708,7 +1708,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. - # warn during gcc/ subconfigure; unless you're bootstrapping with - # -flto it won't be needed until after installation anyway. - case $target in -- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;; -+ *-cygwin* | *-mingw* | *-apple-darwin* | *-apple-ios* | *djgpp*) ;; - *) if test x"$enable_lto" = x"yes"; then - AC_MSG_ERROR([LTO support is not enabled for this target.]) - fi -@@ -2590,7 +2590,7 @@ rm -f conftest* - # Decide which environment variable is used to find dynamic libraries. - case "${host}" in - *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; -- *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; -+ *-*-darwin* | *-*-ios* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; - *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; - *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; - esac diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 8dc6c61283be..cd1b5d574916 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.13.22"; + version = "1.13.23"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-zFF8cHElrWtLOa5xtO5N0520JC47rGOQ7YshEf12tCw="; + hash = "sha256-Fe4K6nBVg0l4Z3CW+k0OpUF8JEu+uINsA+jdAFJGmx8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 8bc991d0bd4c..2ba9fe941dab 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.38.0"; + version = "0.40.0"; src = fetchCrate { inherit pname version; - hash = "sha256-NgaW/QsBaMMBbfUGyHwuu0fb3q3GmD8Qv5wG6qYPjvA="; + hash = "sha256-FXScN4xOaJOiEm9NV66wsfGOj7up1DPzLK7lMofXL2g="; }; - cargoHash = "sha256-KX3+tIdAyaWdaq2nabVTvoZRTXLSXEALFJYCa5nda4w="; + cargoHash = "sha256-v7K62jMGNwIo1XbkWpIXuoNkaRGRAqvZ/c9wdKfY+Xs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index aff5d11b3021..4775ba5b1635 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -29,7 +29,8 @@ assert releaseType == "alpha" || releaseType == "headless" - || releaseType == "demo"; + || releaseType == "demo" + || releaseType == "expansion"; let @@ -272,6 +273,7 @@ let cp -a doc-html $out/share/factorio ''; }; + expansion = alpha; }; in diff --git a/pkgs/games/factorio/update.py b/pkgs/games/factorio/update.py index c234b36264e8..6da1d9dfee7d 100755 --- a/pkgs/games/factorio/update.py +++ b/pkgs/games/factorio/update.py @@ -55,6 +55,7 @@ SYSTEMS = [ RELEASE_TYPES = [ ReleaseType("alpha", needs_auth=True), + ReleaseType("expansion", needs_auth=True), ReleaseType("demo"), ReleaseType("headless"), ] diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 60e88c026f9d..3c4139657b68 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,20 +2,20 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.110.tar.xz", + "name": "factorio_alpha_x64-2.0.7.tar.xz", "needsAuth": true, - "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", + "sha256": "14gsl01j06d0cfii2zsp0njak3hf8kgb9ig9i3prbch507bmfw6q", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.7/alpha/linux64", + "version": "2.0.7" }, "stable": { - "name": "factorio_alpha_x64-1.1.110.tar.xz", + "name": "factorio_alpha_x64-2.0.7.tar.xz", "needsAuth": true, - "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", + "sha256": "14gsl01j06d0cfii2zsp0njak3hf8kgb9ig9i3prbch507bmfw6q", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.7/alpha/linux64", + "version": "2.0.7" } }, "demo": { @@ -36,22 +36,40 @@ "version": "1.1.110" } }, - "headless": { + "expansion": { "experimental": { - "name": "factorio_headless_x64-1.1.110.tar.xz", - "needsAuth": false, - "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", + "name": "factorio_expansion_x64-2.0.7.tar.xz", + "needsAuth": true, + "sha256": "1zvk1skkm37kyikq4l1q285l8zhxc6lqvs1x2y2ccxwd4cdm6r96", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/headless/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.7/expansion/linux64", + "version": "2.0.7" }, "stable": { - "name": "factorio_headless_x64-1.1.110.tar.xz", - "needsAuth": false, - "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", + "name": "factorio_expansion_x64-2.0.7.tar.xz", + "needsAuth": true, + "sha256": "1zvk1skkm37kyikq4l1q285l8zhxc6lqvs1x2y2ccxwd4cdm6r96", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/headless/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.7/expansion/linux64", + "version": "2.0.7" + } + }, + "headless": { + "experimental": { + "name": "factorio_headless_x64-2.0.7.tar.xz", + "needsAuth": false, + "sha256": "0qi7vypm4iy3cp9qyl3cvvm606g9g37sa2pls4y7glxiwng4m9p6", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.7/headless/linux64", + "version": "2.0.7" + }, + "stable": { + "name": "factorio_headless_x64-2.0.7.tar.xz", + "needsAuth": false, + "sha256": "0qi7vypm4iy3cp9qyl3cvvm606g9g37sa2pls4y7glxiwng4m9p6", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/2.0.7/headless/linux64", + "version": "2.0.7" } } } diff --git a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix index 348b6aa7d288..e107d1dcd5e6 100644 --- a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix +++ b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "ollo69"; domain = "smartthinq_sensors"; - version = "0.40.1"; + version = "0.40.3"; src = fetchFromGitHub { inherit owner; repo = "ha-smartthinq-sensors"; rev = "v${version}"; - hash = "sha256-15s4xQKNsjrhae8Cp6U0Ay3s/o8L9BjLvc+1Tu+ss1s="; + hash = "sha256-mcxXBnVGrlVxbSi+IwmGJiWqy5PlQmHQl+hgW6i7NFc="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix index d515a1839bf9..edd4f6ad79d9 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix @@ -5,13 +5,13 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-ze+bsQbPeqfcZ2pWrI4aH3a1+uxus6wC2G9D+uVMrMU="; + hash = "sha256-h7U39dpgEsTboYjfpWxcdP3BkXNB2dQNuSiTCD7zPR0="; }; patches = [ ./dont-call-git.patch ]; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index edf194300676..2bf5cc37a441 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "26.0.0"; + version = "26.0.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-BWkF5iiR4J7NskrJUFmlP0N+HEkyZLnLJbMmbXCROxo="; + hash = "sha256-8dA38Xjvr5+LqyD222mOg8RIhw3gFbilPgVxlrdiCq4="; }; nativeBuildInputs = [ makeWrapper jre ]; @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { mkdir $out cp -r * $out - rm $out/bin/*.{ps1,bat} + rm $out/bin/*.{ps1,bat,orig} runHook postInstall ''; diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 429393553e26..10ca3b991bbd 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g4g7r68h30iw7spypc7hvvd7w1vx05mysmijdy6vkr947hxyhw4"; + sha256 = "1mfb5x6kwxwprprhzj2a1hff7vw37v1wd9hl70nqq23xr82w20wx"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vzkwsc7k43v5irpydrzrh4v9dmwikj9xcdafz21kvwh8903pgih"; + sha256 = "1z95jcq4cmk7zzy4jjgxjbigk0zaxm2gpf8p0s0jn3b5px0k3ljk"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09abzaywpzwnbkpdn8g340pi584k8lpcqzi63m7wahyyyairdqza"; + sha256 = "1h39ffp0zs0r46bfm8bbgvc8icwamq4icsf1qn32xskdssnb8xyr"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "nokogiri" "racc" "rack" "rack-session" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c72nzrs3jjag7xbawy8hzzxggmpfp4r23y6viril2xzxffqgy7m"; + sha256 = "1mrdaql56iqnqcg7n3frc0r48bca8b4g9f2ifc69f15dpps2wfsx"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14lvvaq994hihwb63jvdxbq03i5wgfk6llkibzsq1v0csphby1sx"; + sha256 = "06az0qalnvz0hv1wq8nn5q70gak9r50b6b95avmkz860lhbpx70d"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lrrb4r6p2wrdbjphkkd482h10hri77d1aj1ddhz3ynvbrkg0ay0"; + sha256 = "02zrp7x6k6sgd4rrpsh2b9k2h0qhx538fsb1grsw25ss8d9k2b2j"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xhb7hy7dxx5qy8hahdf2gpr65n0xisxrfapzd2g8czb59ammxk5"; + sha256 = "1r0i34jrsibwkbg61kjm1xjbc8ppy8r91bnach8rv7jgjrid4dyl"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dhhsiv2hk1jfqdxx9qqlmzhvshqjs9kqh13gl1jyzfhzmd0b38q"; + sha256 = "1dpdfa132zsfw5l754p2iwialbscvhp9dblq9fg65ww306s3g0pl"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "timeout"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p9cch94h3wj71mldyk85657r4cpr9p3z55bwxqvpiby2fn6svc3"; + sha256 = "1cwx0a7pbl2shm0jc0m7aylacb84j2p4f3h0v7f6aas2b8s6lkf1"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ihbywjdp57mcnbx2150rpsx79f3pfv313d1zwsz0qwmzdcvpsr3"; + sha256 = "07zw4r8n3ag3d8jfynngpk0cxjwwlh7pxg3hrz1fdww2fnl6nan8"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; activesupport = { dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cm2v3zkr58ljr1fswf67lkm8zwxr100qfdaxzzv46jlwmy1m3is"; + sha256 = "0p3167vw7csidyfl731hbp27xaz90w0v31l3fqzrsipci69p7qw0"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -2550,10 +2550,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07n5ijqxlp4jkd29s9v9b7p9rnspi7pffn4rp4h07dvds9w9xkyz"; + sha256 = "0fa7maxd1ydbnws0fym43pv8j2c6k5dkg0z0fkq31j8jr1aqk7ja"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2605,10 +2605,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0njacgg01934sd942byyjkcyy3iwidysdbhp8kjrjrinackmyfal"; + sha256 = "0ypihpilhxdz5p3sb5g37jn2sbfjhf2ydkxj097kkn7ri7a7702x"; type = "gem"; }; - version = "7.1.4"; + version = "7.1.4.1"; }; rainbow = { groups = ["default" "development"]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 9c27b1ee3297..9d7ac7df238c 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,7 +1,7 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.3.0"; + version = "4.3.1"; in ( applyPatches { @@ -9,10 +9,10 @@ in owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-nZtxildQmT/7JMCTx89ZSWxb9I7xMLGHTJv7v4gfdd4="; + hash = "sha256-JlpQGyVPTLcB3RcWMBrmYc1AAUT1JLfS4IDas9ZoWh4="; }; patches = patches ++ []; }) // { inherit version; - yarnHash = "sha256-V/kBkxv6akTyzlFzdR1F53b7RD0NYtap58Xt5yOAbYA="; + yarnHash = "sha256-e5c04M6XplAgaVyldU5HmYMYtY3MAWs+a8Z/BGSyGBg="; } diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 6bec9a2d8265..f43c3c1ea263 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.21"; + version = "2.10.22"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-d2ko6ejSdGDeroWIELrCBQjYYSobWp4R4XC58eN50xs="; + hash = "sha256-B+fSB3aTXAc/EjKSaFR2clieLNFszA2U2BdMsYJRZFE="; }; - vendorHash = "sha256-RmVDlboqwujTy8SVSwUu8mesSUmkNERi/sYQH7WAUUI="; + vendorHash = "sha256-0VkY1+3tlAfGDt+fhyMbmyT4TN0bw1HVJLi2+mivkrc="; doCheck = false; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 17c28c8f3bdd..c162829b6ec9 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.44.0"; + version = "1.44.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-0YZma3+Qk2P8lvVS7+Uma0YayuHxtK8lFTZXjTmPIuY="; + hash = "sha256-Qyc4R5hvSal82/qywriH7agluu6miAC4Y7UUM3VATCo="; }; - cargoHash = "sha256-QsUHJpSdI0Vz8hbK0Nqn3gxEpCkMGcj1R1CCgLIyEtE="; + cargoHash = "sha256-fsmwjr7EpzR/KKrGWoTeCOI7jmrlTYtjIksc205kRs8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix index c0e0a9d34820..f3051ba451f2 100644 --- a/pkgs/tools/networking/nexttrace/default.nix +++ b/pkgs/tools/networking/nexttrace/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${version}"; - sha256 = "sha256-LUIKVMI8ljPzAmrq3jYQ+ZDCGs2p+7EO8ECp1A1osUk="; + sha256 = "sha256-32QFgmvXQ+8ix1N9I6pJaIJGWOT67/FG0VVEhftwQQw="; }; - vendorHash = "sha256-1zjXy6x/IzBY7MrtAtynmoneEpjAnYv/H5IsMZtRQAo="; + vendorHash = "sha256-WRH9doQavcdH1sd2fS8QoFSmlirBMZgSzB/sj1q6cUQ="; doCheck = false; # Tests require a network connection. diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 233da21ec93e..021549e4f10e 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -1,12 +1,19 @@ -{ lib, stdenv, fetchurl, openssl, coreutils }: +{ + lib, + stdenv, + fetchurl, + openssl, + coreutils, + nixosTests, +}: stdenv.mkDerivation rec { pname = "spiped"; version = "1.6.2"; src = fetchurl { - url = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz"; - sha256 = "sha256-BdRofRLRHX+YiNQ/PYDFQbdyHJhwONCF9xyRuwYgRWc="; + url = "https://www.tarsnap.com/spiped/spiped-${version}.tgz"; + hash = "sha256-BdRofRLRHX+YiNQ/PYDFQbdyHJhwONCF9xyRuwYgRWc="; }; buildInputs = [ openssl ]; @@ -19,7 +26,7 @@ stdenv.mkDerivation rec { substituteInPlace libcperciva/POSIX/posix-l.sh \ --replace "rm" "${coreutils}/bin/rm" \ --replace "2>/dev/null" "2>stderr.log" - ''; + ''; installPhase = '' runHook preInstall @@ -28,11 +35,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests.spiped = nixosTests.spiped; + meta = { description = "Utility for secure encrypted channels between sockets"; - homepage = "https://www.tarsnap.com/spiped.html"; - license = lib.licenses.bsd2; - platforms = lib.platforms.unix; + homepage = "https://www.tarsnap.com/spiped.html"; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/security/step-kms-plugin/default.nix b/pkgs/tools/security/step-kms-plugin/default.nix index ba35b7c11087..9f2af377e39a 100644 --- a/pkgs/tools/security/step-kms-plugin/default.nix +++ b/pkgs/tools/security/step-kms-plugin/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-MxGhG8ehXT7ftXfoVHMSpyIr25tWj5Yq50nZZW/q5sQ="; + hash = "sha256-PaOe24rXu6e8jhjwpuQquPQidQDSxI1WOAMYJSLjbSI="; }; - vendorHash = "sha256-5TWofXHtiBhfsSg3UgSju+7EO+t9bUktsd/WUAH5R5U="; + vendorHash = "sha256-N8Wy4DHxP6yQOfWDmyVPSi9eHj8G01SSIxQmqKujRgo="; proxyVendor = true; diff --git a/pkgs/tools/security/xcrawl3r/default.nix b/pkgs/tools/security/xcrawl3r/default.nix index c12439f49d67..fd3a33eaac2b 100644 --- a/pkgs/tools/security/xcrawl3r/default.nix +++ b/pkgs/tools/security/xcrawl3r/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "xcrawl3r"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "hueristiq"; repo = "xcrawl3r"; rev = "refs/tags/${version}"; - hash = "sha256-K7UuWsteI8mEAGOF/g/EbT/Ch6sbmKhiiYB3npdDmFk="; + hash = "sha256-W1cvSvRnDGFp4br8s/nL+owIGWTJ1bVX6kvmeTLUuuI="; }; - vendorHash = "sha256-/yBSrZdlVMZgcKcONBSq7C5IFC30TJL0z6FZRXm+HUs="; + vendorHash = "sha256-fHdtqjFmT+8cmy2SxjjBvw5Rct7lA2ksGVmm/9ncbRI="; ldflags = [ "-s" diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index e640d32c55ed..6dbe584d8e00 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "10.0.1"; + version = "11.2.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-i1luJsAADk7VqrZAqnI52XGrbWeNLBMnzW0wxEO5LXQ="; + sha256 = "sha256-Pwt8HhbO+1wmEGYRny1W5HzKRWmvTneqN4fuAaKcYaA="; }; - vendorHash = "sha256-g8KN8M1jB4lTjXNfTw6gnjTCN4HDBTqtNS6c+5tJQv4="; + vendorHash = "sha256-uokBuQquSkdbHsI3hZ7/FxE93/QOZ6jD2zB8vDPeESI="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d8766820ddb..86b8914ce0e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17028,13 +17028,11 @@ with pkgs; bingrep = callPackage ../development/tools/analysis/bingrep { }; binutils-unwrapped = callPackage ../development/tools/misc/binutils { - autoreconfHook = autoreconfHook269; inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; }; binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils { - autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook; inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; @@ -20225,6 +20223,7 @@ with pkgs; icu73 icu74 icu75 + icu76 ; icu = icu74; @@ -30599,8 +30598,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation OpenGL; }; - lazpaint = callPackage ../applications/graphics/lazpaint { }; - caps = callPackage ../applications/audio/caps { }; lbdb = callPackage ../tools/misc/lbdb { }; @@ -34610,6 +34607,10 @@ with pkgs; factorio-demo = factorio.override { releaseType = "demo"; }; + factorio-space-age = factorio.override { releaseType = "expansion"; }; + + factorio-space-age-experimental = factorio.override { releaseType = "expansion"; experimental = true; }; + factorio-mods = callPackage ../games/factorio/mods.nix { }; factorio-utils = callPackage ../games/factorio/utils.nix { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 33a2019174d8..7f7236fd2b08 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -271,6 +271,7 @@ mapAliases ({ imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08 image-match = throw "image-match has been removed because it is no longer maintained"; # added 2023-06-10 imgaug = throw "imgaug has been removed as it is no longer maintained"; # added 2023-07-10 + imgtool = throw "imgtool has been promoted to a top-level attribute name: `mcuboot-imgtool`"; # added 2024-10-09 intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 ipdbplugin = throw "ipdbplugin has been removed because it has no longer maintained for 6 years"; # added 2024-05-21 @@ -417,6 +418,15 @@ mapAliases ({ prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 protonup = protonup-ng; # Added 2022-11-06 + proton-keyring-linux-secretservice = throw "proton-keyring-linux-secretservice functionality was integrated in the proton-keyring-linux module"; # added 2024-10-16 + proton-vpn-connection = throw "proton-vpn-connection functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 + proton-vpn-killswitch = throw "proton-vpn-killswitch functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 + proton-vpn-killswitch-network-manager = throw "proton-vpn-killswitch-network-manager functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16 + proton-vpn-killswitch-network-manager-wireguard = throw "proton-vpn-killswitch-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16 + proton-vpn-logger = throw "proton-vpn-logger functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 + proton-vpn-network-manager-openvpn = throw "proton-vpn-network-manager-openvpn functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16 + proton-vpn-network-manager-wireguard = throw "proton-vpn-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16 + proton-vpn-session = throw "proton-vpn-session functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16 proxy_tools = proxy-tools; # added 2023-11-05 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pushbullet = pushbullet-py; # Added 2022-10-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e5d2881e7a80..451ee82ee52e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6063,8 +6063,6 @@ self: super: with self; { imgsize = callPackage ../development/python-modules/imgsize { }; - imgtool = callPackage ../development/python-modules/imgtool { }; - imgw-pib = callPackage ../development/python-modules/imgw-pib { }; imia = callPackage ../development/python-modules/imia { }; @@ -10750,28 +10748,10 @@ self: super: with self; { proton-keyring-linux = callPackage ../development/python-modules/proton-keyring-linux { }; - proton-keyring-linux-secretservice = callPackage ../development/python-modules/proton-keyring-linux-secretservice { }; - proton-vpn-api-core = callPackage ../development/python-modules/proton-vpn-api-core { }; - proton-vpn-connection = callPackage ../development/python-modules/proton-vpn-connection { }; - - proton-vpn-killswitch = callPackage ../development/python-modules/proton-vpn-killswitch { }; - - proton-vpn-killswitch-network-manager = callPackage ../development/python-modules/proton-vpn-killswitch-network-manager { }; - - proton-vpn-killswitch-network-manager-wireguard = callPackage ../development/python-modules/proton-vpn-killswitch-network-manager-wireguard { }; - - proton-vpn-logger = callPackage ../development/python-modules/proton-vpn-logger { }; - proton-vpn-network-manager = callPackage ../development/python-modules/proton-vpn-network-manager { }; - proton-vpn-network-manager-openvpn = callPackage ../development/python-modules/proton-vpn-network-manager-openvpn { }; - - proton-vpn-network-manager-wireguard = callPackage ../development/python-modules/proton-vpn-network-manager-wireguard { }; - - proton-vpn-session = callPackage ../development/python-modules/proton-vpn-session { }; - protonup-ng = callPackage ../development/python-modules/protonup-ng { }; protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib {