diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 6e794d09bd5f..6ef8ff8e70a9 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -309,8 +309,7 @@ "members": { "AndersonTorres": 5954806, "adisbladis": 63286, - "panchoh": 471059, - "ttuegel": 563054 + "panchoh": 471059 }, "name": "emacs" }, @@ -407,12 +406,13 @@ "gnome": { "description": "Maintain GNOME desktop environment and platform.", "id": 3806133, - "maintainers": {}, + "maintainers": { + "jtojnar": 705123 + }, "members": { "bobby285271": 20080233, "dasj19": 7589338, - "hedning": 71978, - "jtojnar": 705123 + "hedning": 71978 }, "name": "GNOME" }, @@ -702,6 +702,7 @@ "Mic92": 96200, "Radvendii": 1239929, "edolstra": 1148549, + "lisanna-dettwyler": 72424138, "lovesegfault": 7243783, "xokdvium": 145775305 }, @@ -819,14 +820,13 @@ "description": "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects", "id": 4341481, "maintainers": { - "ttuegel": 563054 + "K900": 386765, + "NickCao": 15247171, + "SuperSandro2000": 7258858 }, "members": { "FRidh": 2129135, - "K900": 386765, "LunNova": 782440, - "NickCao": 15247171, - "SuperSandro2000": 7258858, "bkchr": 5718007, "ilya-fedin": 17829319, "mjm": 1181, @@ -896,8 +896,7 @@ "id": 7304571, "maintainers": { "Mic92": 96200, - "winterqt": 78392041, - "zowoq": 59103226 + "winterqt": 78392041 }, "members": {}, "name": "rust" diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 4488219ecf07..da75b6210d39 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -49,6 +49,7 @@ lpeglabel,,,,1.6.0,, lrexlib-gnu,,,,,, lrexlib-oniguruma,,,,,,junestepp lrexlib-pcre,,,,,, +lrexlib-pcre2,,,,,,wishstudio lrexlib-posix,,,,,, lsp-progress.nvim,,,,,5.1,gepbird lsqlite3,,,,,, diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 2cebb908bd09..687128b81f4e 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -30,7 +30,6 @@ let mapAttrsToList mergeAttrsList mkEnableOption - mkDefault mkIf mkMerge mkOption diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 92878f055ce8..caaecb7bc0ee 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -91,9 +91,9 @@ let # files required to exist also won't be present, so missingok is forced. user=$(${pkgs.buildPackages.coreutils}/bin/id -un) group=$(${pkgs.buildPackages.coreutils}/bin/id -gn) - sed -e "s/\bsu\s.*/su $user $group/" \ - -e "s/\b\(create\s\+[0-9]*\s*\|createolddir\s\+[0-9]*\s\+\).*/\1$user $group/" \ - -e "1imissingok" -e "s/\bnomissingok\b//" \ + sed -E -e "s/\bsu\s.*/su $user $group/" \ + -e "s/\b((create|createolddir)\b(\s+[0-9]+)?).*/\1 $user $group/" \ + -e "1imissingok" -e "s/\bnomissingok\b//" \ $out > logrotate.conf # Since this makes for very verbose builds only show real error. # There is no way to control log level, but logrotate hardcodes diff --git a/nixos/tests/logrotate.nix b/nixos/tests/logrotate.nix index 603a0f164c46..1e9cdfd45614 100644 --- a/nixos/tests/logrotate.nix +++ b/nixos/tests/logrotate.nix @@ -66,8 +66,10 @@ in checkConf = { su = "root utmp"; createolddir = "0750 root utmp"; + "createolddir " = "0750"; create = "root utmp"; "create " = "0750 root utmp"; + "create " = "0750"; }; # multiple paths should be aggregated multipath = { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix index f625dcfdccb2..d881cc24d8ce 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix @@ -13,18 +13,18 @@ writableTmpDirAsHomeHook, }: let - version = "0.8.0"; + version = "0.8.4"; src = fetchFromGitHub { owner = "dmtrKovalenko"; repo = "fff.nvim"; tag = "v${version}"; - hash = "sha256-JbV2dTQhTyZgDZYvFoR1mz9CeM2IPv59Qmp2iiJC8a0="; + hash = "sha256-w88NovzYVTiUVZmgvvmRvRq1didlbxMJYtKj1A3VB/Y="; }; fff-nvim-lib = rustPlatform.buildRustPackage { pname = "fff-nvim-lib"; inherit version src; - cargoHash = "sha256-L/Ens/wzw/jKaa1T3A2pLIBKs09saPEk/0bRhgRezPQ="; + cargoHash = "sha256-2LGrohseOYdroUFY3cHy57HzgfS34CBuIbN1AFuYTUg="; cargoBuildFlags = [ "-p" @@ -65,9 +65,12 @@ let openssl ]; - # This test requires curl and GitHub access checkFlags = [ + # This test requires curl and GitHub access "--skip=update_check::tests::test_update_check_end_to_end" + + # This test depends on catching a race window and is not deterministic + "--skip=drop_during_post_scan_does_not_crash" ]; env = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 38efcd09cd21..149a3f13e54d 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -228,7 +228,7 @@ let terminal = false; } // ( - if libName == "thunderbird" then + if lib.strings.hasPrefix "thunderbird" libName then { genericName = "Email Client"; comment = "Read and write e-mails or RSS feeds, or manage tasks on calendars."; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix index 60a4c49b9add..473ba3792a08 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix @@ -1,1193 +1,1193 @@ { - version = "140.11.0esr"; + version = "140.11.1esr"; sources = [ { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/af/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/af/thunderbird-140.11.1esr.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b92f2c488e5c2f68ee63597f7daaf2b76faa7f0a9e825dbd37c3669306eed02d"; + sha256 = "cd44e22f8f2ec9a8691ff5b19479bb80b1251d8ec821876ef7b73cc4d6ad38b1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/ar/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ar/thunderbird-140.11.1esr.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "58fce83355201936b52700357b051b9f31f001e398aa805725a79c2cd5e1cae2"; + sha256 = "51855dbbd4c59d414c211c138aa46dd8b513825c02830bc68fa469248493a9f0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/ast/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ast/thunderbird-140.11.1esr.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0e51493d439b3ec322d09de93558f7b15a95c0245e25302048ecb2150d669c5d"; + sha256 = "81099d46f5776631e2ac59c269c36e80a0878812fd7422509cb940261bc702a9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/be/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/be/thunderbird-140.11.1esr.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "4d5b117b55e36a9f0e657682ff3d1181fe13c712e1c5ecbc7090150096513a65"; + sha256 = "9310cb6f6ba5371861f8f3d4695cb599839d726dc62cb280b03461e2bcbfd677"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/bg/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/bg/thunderbird-140.11.1esr.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "5d74093e6da129fbe97702077333bf5ca3d4c1df68af39e24ed2f91b321f0658"; + sha256 = "88103bba753cf512319a05a6fc2fc1a4bf5ef51623a16e8ca06b6120eadd55e5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/br/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/br/thunderbird-140.11.1esr.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "8719e26924c3f2955ef25063f0836caf709d2e7a130a30c9945e211cfd562e58"; + sha256 = "b2507e3615fb3aa1f9b440304ecc14a5f3a82ea11cb1f26dfba049f247baba4c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/ca/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ca/thunderbird-140.11.1esr.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "fa02336ab2bad063df3ee611913614f9c940ce7bd954cc2833123cd2958769ae"; + sha256 = "286528d64bb61a45fc75ed3eb9acdb51d86dccdf69f4921225b72f2f9705cab0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/cak/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/cak/thunderbird-140.11.1esr.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b88b23543a4f66a63d3b7a02e0f2704a39ca036dc81ff0d9198514d9469a2a90"; + sha256 = "b055cda1a66326625cd9073e3ef59100011fb1fa94842bb1377982793e89fe13"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/cs/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/cs/thunderbird-140.11.1esr.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "8edd1389c73dc859e4a47622e224d1a1165ad2b0af843ee9f56aae29b173f01c"; + sha256 = "c7c986a1b2928d50793be7a768f41792a11b10840c4b89e362fdd87dff8b859c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/cy/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/cy/thunderbird-140.11.1esr.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c6316f59554880cc87cd3d5d6210084936070592006b4850bd7deef471a5a96c"; + sha256 = "fec3476eb18c24fa23119f0ead79a14f50e243c60e18729a42d7390065a7752e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/da/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/da/thunderbird-140.11.1esr.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "4349b8c2816c24074716df20d2493a56b97dc82fcc8698dcfe7b0c810726915f"; + sha256 = "e879bbac85ed9aff18564afcd652d5ab7bb99eb9e36134bba36dda3c988dc754"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/de/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/de/thunderbird-140.11.1esr.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b47e5153abcc8759ea091287ceaffca848e98c2a542386f610762ac8579382d8"; + sha256 = "72a5273c008060bc2a856eb33c49023ee1ed25f9826471cb2a04418b5d29ec6a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/dsb/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/dsb/thunderbird-140.11.1esr.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e0cc1d57517d28f410c69f7c46211f7e2a2387b4315552ad5ed6c4c43e5c3d58"; + sha256 = "ad5fdff483dfe20441a6b48d22dd3a82a2b7c20f7af06025744cc0a73f4e1504"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/el/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/el/thunderbird-140.11.1esr.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "799da3f47941597a64c7d968a06c2cf483224151e3132455e57efdadbeb2502e"; + sha256 = "0ecb235a03ceaf27e93f949d0a7f4534db48e2a1050ed10f644f70db794a78c5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/en-CA/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/en-CA/thunderbird-140.11.1esr.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "6fd8d2b1afe304077360c51c59e2b2a200c24444729da2cf3852e58c3b0e2776"; + sha256 = "5645c08f8630849b1efede22d46a8526ee157683458ce3929e1094a928be742e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/en-GB/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/en-GB/thunderbird-140.11.1esr.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ca9cd25fe197180cbf982b344416c767667a1bd793ae319526acaeda94f70c86"; + sha256 = "5172cc07af724e427f593687f348cc501628786cc5d6c943d1d194e04075721f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/en-US/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/en-US/thunderbird-140.11.1esr.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "98e6c251fccc2ff5cd842022c7f0ca6be54fea86be0a335ac40497b79335aa53"; + sha256 = "9b453e56b395aa06237891644bc412609291522105bd87c4cb902caf82ccfbe5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/es-AR/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/es-AR/thunderbird-140.11.1esr.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "f86fb26618b28b6a45354e08d05202638d6ea882f04ea8e88883cfc5c99e5368"; + sha256 = "d88f03eb618276e8be922fed996ae67f8d2cf9167c7c7c77302b67db9b5794a5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/es-ES/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/es-ES/thunderbird-140.11.1esr.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "2cc133e92cd5d32a6622a9896a2bb6180f9bfefecd05b5fc4d9a967ec6cb4c55"; + sha256 = "6ca15e9d2d58e1580ad08019c4272eec5e5f9be4b9f781628d0b0f42f7b572b9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/es-MX/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/es-MX/thunderbird-140.11.1esr.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "001821264a2949548e86d61642168196efc68ef616f1eddf06eb5b5a24e0d330"; + sha256 = "40196953a9f29207f64c535ea159673120eee51f03478518b8f86ff46a6d6d8a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/et/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/et/thunderbird-140.11.1esr.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d669b2e2d97b31d915884c308a83bdb88b0c616b38565bcdbdd34726130e3ead"; + sha256 = "78398e3d931c722bf35a30c3bc69218f2d396c6d4ff7cbb3130c01a20a23fa7c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/eu/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/eu/thunderbird-140.11.1esr.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "98b0eea50a1c5f3cd912c326acf317e8babccb4960bd991041bb32b247389bd7"; + sha256 = "a5acae7a5b8d31dae0fc3fe7c3c41b582011af654bc0846921ae2661576a1a48"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/fi/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/fi/thunderbird-140.11.1esr.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "623d2d1781a30ea27c333f5c7a2568403f4e3239a9306282f58b457f5cac16a7"; + sha256 = "97d66dc25f0fde8a1f9559164bc1eb641f4e5f8aca34cf0b1f0bb10bd19636cd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/fr/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/fr/thunderbird-140.11.1esr.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "18396c444b26e9d4f0fbd03df7104eac86c50465e91871add7d85f823fef85f8"; + sha256 = "1497140b897323600202a1c982c80e1f69607351d4b243575f37e8b372d97681"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/fy-NL/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/fy-NL/thunderbird-140.11.1esr.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "d15d42b1901e7ffa63cfbb14fa6d02b35612bfa9e6c5ff7136d40976244d66ef"; + sha256 = "e4126a7e2cc7ba4d0891896fb4a096971c2dbb2d932813d365dd90001e9b7c61"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/ga-IE/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ga-IE/thunderbird-140.11.1esr.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "bf9977082ee4131dbcab831175c78816816eb315f8304fc5cfd699830ebab237"; + sha256 = "03c1da05b74097d8103c4b98ac22077a01deef089d5509a2dcb89b235da91cc2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/gd/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/gd/thunderbird-140.11.1esr.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d61dbe8fa72f154455ab9418463170a2198f648dad525e4355d73938097740c1"; + sha256 = "ec118262c5c8c4430f574b3a0613f4da1f6ff5e3e6a2b0bee0248021a98f5e54"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/gl/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/gl/thunderbird-140.11.1esr.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8516a938dfd12ea7616de6b721ea636025856e08f1d5a44a21ad7ac02ea041b7"; + sha256 = "c585f158acc1cd998edb46d8c5221e760f5e921f778b396ec89daa000ff426d8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/he/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/he/thunderbird-140.11.1esr.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "4ac922c95bd029c9c87862f99f6c9b4930ca73578209b49dd4648fcd125eac35"; + sha256 = "81fae1be93af6bdc667f58cb6976376fdc334c4d5432c31d87fcf887dbe0f503"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/hr/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/hr/thunderbird-140.11.1esr.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "fdf68b53d08db62c62d8c3c6be06ee2bf0ce06b12a756345c810634df00600ae"; + sha256 = "1d3c4e0fbd28b3931584454b3b7e392c793c5e75cdd21067be4faccc1e4ecfe7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/hsb/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/hsb/thunderbird-140.11.1esr.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "60ba90e023e43c93c11c1d16417997cbe8e772214467d40a20539dea843f34dc"; + sha256 = "064ce5e72d37607aa8103a046913efd93b659257463fa897a46f0ab5bf2971ae"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/hu/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/hu/thunderbird-140.11.1esr.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d4e669bfcd670ce873d3ca175705f4569959159d085f8ca11ef8af311f53e9e9"; + sha256 = "2c366fce17fafd29c7f389a33674e117ac1d50074c3d3a35f7495bf868843b87"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/hy-AM/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/hy-AM/thunderbird-140.11.1esr.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "91b1352f803c6a5b532b7b25a5ff0717f6f837ab9c4fbfbf6669f2c29e3bb0ac"; + sha256 = "fd3aaace09db4cefa108c25eda88c9a3879c8ec227e572eaf2fd22729df7dc94"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/id/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/id/thunderbird-140.11.1esr.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "083552835b7a3a97393d43658a66b50d3ae60a0a3e1afe2020e188baa6f693f6"; + sha256 = "ff3eece338e9eb8fb6f09c8fcaa019254171fd5e6c4bd7af8f316d090367f00a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/is/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/is/thunderbird-140.11.1esr.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "2206b0d273a8e77f3fcbe4e2c564674f4cbd5330bd012da97cb44bb9534a0d20"; + sha256 = "9a2ce7350e387bc697093f39fac52b1e4c80fa0a9c736900d63551a4a381c357"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/it/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/it/thunderbird-140.11.1esr.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "c72a023c8b5646dc0ed77ac75f333bc08cc193faa724f13f8f8f5ec8d754f1a8"; + sha256 = "3983915b58c46a64978a7b3332923077059fda6cabef4faa39ce1e9dabbb2667"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/ja/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ja/thunderbird-140.11.1esr.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "c89f74260c96f81d37f3c9290884ec5e570ea14aaf119bebdc808c7246d2bb5c"; + sha256 = "0d7e7b11797826fed39ef5016301cddda761f39921b8d25288900358e3bf579a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/ka/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ka/thunderbird-140.11.1esr.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "08c9d4f3c96800a58d703fcc77018ec942b8d6d15fbc60508f0f06a15ac541ae"; + sha256 = "6952c4d12ac989b2073f112f02e14298756673945839ffcce2a887a562cdb9da"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/kab/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/kab/thunderbird-140.11.1esr.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "de09307614b9ff0f710f4a442aed5f9a4076891014c81cff8c351e7abc3db10a"; + sha256 = "7245abb39634a26a2987f5a5ca2cdfed4a1957c0cb29900ea82146d63517210c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/kk/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/kk/thunderbird-140.11.1esr.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a3b4c5feb8944b3dcb20a450a5d0074ea1369b3b29e744b0ecf5a803bae7f649"; + sha256 = "208deec2213742c05d3ab742b7f7c86a007892ebc372f8810c09b783e4976200"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/ko/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ko/thunderbird-140.11.1esr.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "54713df9ab0ee841f4d2fa3e28ca44ad350223def69d75820be2b7afeab3f8da"; + sha256 = "c8df67e9af8b1efc1e608f95b5075346db19283c285baabca27950545d6e3714"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/lt/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/lt/thunderbird-140.11.1esr.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "bf754fb783fac4a72d483972dc765bdc2a3ab9c5c03ade68e9d48662462a4852"; + sha256 = "75f859da709c8698679eb49d5336220efdcda50acc0dc415be6c6f0be08780b4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/lv/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/lv/thunderbird-140.11.1esr.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "7e3f214eb663e67829237b7a73b933941df8f6f11f5b9baf519be5149496949f"; + sha256 = "81cacd303205c11460037c372b25b0d79153c340e9be727f87f4950c924a1235"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/ms/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ms/thunderbird-140.11.1esr.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "a560655873a95eaf47fc5ac9666c30767b7833a17cd9ec8008e2f60fb6a02f0b"; + sha256 = "36023a03fdc7e1fea7fc5beb8baf8eed8683efd68e9971cf8d907e1306368de9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/nb-NO/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/nb-NO/thunderbird-140.11.1esr.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "0224994490adff5f8eb796dfba2e5f330690dca71728ab169064e3b8e0074114"; + sha256 = "499e5a4f08a0e82c38dbe5718878330f0ad35e9f6c0b93995d22661dfa8434e0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/nl/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/nl/thunderbird-140.11.1esr.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ccd9bdf7c69de85443873c75421163f5f8395e31b29fba208e97bbcfdca5ad5e"; + sha256 = "7f74580c216f949f68d29c3daba3094135b847b20a4796480526047c4a5ef938"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/nn-NO/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/nn-NO/thunderbird-140.11.1esr.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "6d77bdacb867f0c2abb0d2750da3841983b48b441e35a4dbabb8fb402c9a8d1e"; + sha256 = "df1e38486df5e06c8b2b8df51c5e34464fdd7ecf99ed7ce27b61c80496abf945"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/pa-IN/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/pa-IN/thunderbird-140.11.1esr.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9d463ab99916c14943a13abb1c415f818f486d73c95d16f32518cca4fd905838"; + sha256 = "2f9e63be4fe48eae42f9b2142de21697fa2b5f6e454f13f0c595a223c8d72dff"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/pl/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/pl/thunderbird-140.11.1esr.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "5d8033d4bec0f6640c8bb7c69ccd37f480a5f748d6d6baef7ba3361dbce3e070"; + sha256 = "02af40342348ff187b402c96b5ca5cc5214932a6598e9499bba02ae6fcc168a6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/pt-BR/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/pt-BR/thunderbird-140.11.1esr.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "c7c01331bd050c34b190cba204df8e375f9f52a32bd4817928b9d41a33e13525"; + sha256 = "1364587ed5d821a999df87278905725c361c0dcf6aa1b60b90995ebf65a1d2d2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/pt-PT/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/pt-PT/thunderbird-140.11.1esr.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "fbff692b874251334656f3aae98f247150738d43647be843b321989847f8f7e5"; + sha256 = "bde7be8accc37063c8817afe218c07445141c4964f077b47025819617e87d128"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/rm/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/rm/thunderbird-140.11.1esr.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "6c8a6588089ccc27010473efb436c14dcedfd29744c49df34e936fc5b702284e"; + sha256 = "62e733d827e128eeb60f094bad877a7a35c812c6969f920a8d333c68090c5f63"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/ro/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ro/thunderbird-140.11.1esr.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "7934360b2f0f7053d3873779d3ad24bb3ea4c9256e3e00dd0a32536f092472ca"; + sha256 = "bd15dc06055d993c1935574fdcbd15f5d00df6399a4e200292d1a47eb1a8e196"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/ru/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ru/thunderbird-140.11.1esr.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "1374c5a5b28c521e7fff8998b2c2f2c38f53628053e0f4863a4649e66b724636"; + sha256 = "0fd47d7dd9dc7b12d331420074fa219d3f1eafbdbf2fa1bdf198c20c72ebc1aa"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/sk/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/sk/thunderbird-140.11.1esr.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "2dd732798cd586a8d53bde53aeb0e329bbdb4d291192d14ea62740060e9e3a20"; + sha256 = "979378ef6cb26761e0960948974a184eaf01cb8ca260e6adc51334ccbc47af0a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/sl/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/sl/thunderbird-140.11.1esr.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "218022240ba064bbb6bdfdb8210f8d5ca85ba8a9426e8dbc2ee686b40b6ad2bd"; + sha256 = "ac1507b38c50a318b0e59687209979c9c4c0c389afa5583c8e610333e7495319"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/sq/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/sq/thunderbird-140.11.1esr.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "9fbfcd1c016a7a2527742453fe4c185743ae35d6e5b1a9999be5807e82af0b42"; + sha256 = "eb6c22097d6aef20d121e35ffff4e0599929e167817dd0d22059f07742fafdfe"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/sr/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/sr/thunderbird-140.11.1esr.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "8105a16f45c6c4f1a33d74af2f4b912197dbd8325ad0bc65111ef9abdbbf0ec9"; + sha256 = "31022daed19b0fc26d03aa5ba482e5f214e6d1a5579c16e6695fccf5fc0c9b76"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/sv-SE/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/sv-SE/thunderbird-140.11.1esr.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "55de876342ebb21470c50e4674fb60de5d49dcfeadcc5d70518acc902f688776"; + sha256 = "e69480753cb4487fd7aeafca2042fe5661345066fa452be31e879dcc9c370504"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/th/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/th/thunderbird-140.11.1esr.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "a1ddeb4a79418d6e9d71115abffde38f3dd3a163c76614a3271d5cdcddbac26d"; + sha256 = "d1e945026998163ca3c8ab37be348caed49c9f72864323e456ff9b8728c03c4f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/tr/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/tr/thunderbird-140.11.1esr.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "f409fe4660600306b1562045c9fa36d46c3cda34f14993aca93a74d81cad15ac"; + sha256 = "4bf8bce7b5e303d44e0c8a3a0e4f1002d637bc73f9c290ed42f97fc9a255fe4c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/uk/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/uk/thunderbird-140.11.1esr.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "16adf5e72cf4c095b206ef0cf9b2ab95a987eb0ad1ad99b08a4f94394c7af0f7"; + sha256 = "e4110dfb97f35d1373640374a213163362877d212cc65cd64bd20742aa24dd63"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/uz/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/uz/thunderbird-140.11.1esr.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2fe0a5d82ebfe9bdcc151883e74968370f3f5e50be2068c09e0c1eef5fdebb99"; + sha256 = "1874900326621f5888fbe669a37b0a04228d30f70c3d23bd037f05edce286faa"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/vi/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/vi/thunderbird-140.11.1esr.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "370b8e149517218510e7b39a9f68ae846c8753511dfbf4d8be0fef2c859d2566"; + sha256 = "41494dc6f259067ee48ad713cc4fb84d8f25cee723ff1a8bbad98771a1822d21"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/zh-CN/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/zh-CN/thunderbird-140.11.1esr.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "f2610f79812c5e3b4e1843ae0ae5c5358b60df6b57ce97a7fffc0b41f4dca5d6"; + sha256 = "2a1f12a9f87b72d45924f2d00037007a955dde55f82b1d5d6d520e15d90e5b8c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-x86_64/zh-TW/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/zh-TW/thunderbird-140.11.1esr.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "1d66cb9ae1c72e5e5b2e87f7de437a5b58d078616ec34c79c9e95e3b19c3f1bd"; + sha256 = "cb358b240ff255b98d9d4061ea99524ee4774aedafbf962c284d1871ec11000e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/af/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/af/thunderbird-140.11.1esr.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "5642a52219893f1aac7828d98c9ecdedf5db2905201418348c54d71150c46751"; + sha256 = "a451426fc9d84724255411a6464e05e7ac46f46912fc2c04182b349e3f02e44e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/ar/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ar/thunderbird-140.11.1esr.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "e6e1a6965ca1f2e6d80e9588ae1048e190a225285347dd62065bb13446175182"; + sha256 = "9f85ad16c9670be0f85d096a2db3713cb65c670c25977a92200687710fe6bfcb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/ast/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ast/thunderbird-140.11.1esr.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "352a67a58be9ee63af0c378c8c3ac0d3295e8d375705f99595afa29515a9e057"; + sha256 = "790e24d94ddd53798a1e9ac76b7c096aa2c7428f62ccdd04756c8a4b46d20402"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/be/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/be/thunderbird-140.11.1esr.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "cfe06d39497347676c42eb4dd7c6986942c33133da181cf3371afc9b3fdabb4c"; + sha256 = "7dcbd7b4817cb491a0c171524aa212f5786b9a93a5834a1e7b01e03d02b8dc58"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/bg/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/bg/thunderbird-140.11.1esr.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "2c55dac96f63c9c3966f75b92ba988819584e75ec463521417961ec828917871"; + sha256 = "425bc5719ac01c3600523d7b0d26e38cfb86e5be2de15550b0781b15dca61310"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/br/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/br/thunderbird-140.11.1esr.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "7e637c70a0ffdae8ada045c41edb6beaea9425c0738e77de31d8eaa98f7063b3"; + sha256 = "31a747ae4b6a429e3f630e4dbf19bae8cc1f97f1adf0b89d56162845d5e1ed7b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/ca/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ca/thunderbird-140.11.1esr.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "6a47882243b7bbeeec790719d12196d88610273bb8625f988c7c1d5f68c10de4"; + sha256 = "9caf9871fc73bfe2730ac231833cff6bbd60224c082ff26b1d8f2ffc407770ac"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/cak/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/cak/thunderbird-140.11.1esr.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "184b1cc6172b5786239fc21bba87310885f8780d1a1d4a612326727fd11c502b"; + sha256 = "ff8a4299610825a202b58ddea4e69eddbe8e1892319002eb8d031f513adf7709"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/cs/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/cs/thunderbird-140.11.1esr.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "519d0c25114340be589b05cf644a9c4cd016f38a92f08ee1368941cbae258507"; + sha256 = "64b86c5e360f93ad380d27c28bc126c8bc88c6028f9ba77fc799bdf75f5627cb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/cy/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/cy/thunderbird-140.11.1esr.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "30ee10fee030c5e0c5ee60180aaceb4fd75d21046fa9ee4506eb562921fb90d3"; + sha256 = "522a5db1ff214dcfc892004723338cb2c02f7d529c43b892a1bc2fb378277462"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/da/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/da/thunderbird-140.11.1esr.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "3dfe419895fcb7e8eb8c452a5bc7655fd60144d1fe5535473e20533992519e35"; + sha256 = "e400141a23886b4a88262a67b9ae69f9d342061c770ea94ed9b9e792b40c5a4b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/de/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/de/thunderbird-140.11.1esr.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "3791278dd35e47f0dc60e288c5b876159a762f700d77238180e4988cdc7f30a1"; + sha256 = "bff772a4f3a9eca47900d65715640db7c7d0605570470eb35c1d96537b64192c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/dsb/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/dsb/thunderbird-140.11.1esr.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9640ba71aca333db183fa8d3f39288ef665cd2b8bc182a3d90d7405e81cf9fe3"; + sha256 = "61c388aab0f7edb6fbbee05b51f13efc50f154e33ae9d20bb2b61f3784e55821"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/el/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/el/thunderbird-140.11.1esr.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "4d44933fc4ec240c1d09eb4865ab0ab842bdbb125caeb2645d585cf830f9034a"; + sha256 = "22a7e3f9ca36d5c6eaeb64076223a884c18e34016d1df8328f380dc966c191eb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/en-CA/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/en-CA/thunderbird-140.11.1esr.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c4295c9df9b2a636a24cb5866125bf86c9e0adc5519e9a22685ffa536d28cc50"; + sha256 = "c31862319d08a58c689aa25cc8fc619b64a63e8453817e0c2d312ecb0a9aa9ec"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/en-GB/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/en-GB/thunderbird-140.11.1esr.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "7476e3da85ba139ae2ba5d3c5d7b6e31e047bd091cc0deef5816ef2b2767138d"; + sha256 = "eefc9967520048074756116537a8d83419cd3f2e6fb172dedda9c55914e927f2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/en-US/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/en-US/thunderbird-140.11.1esr.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "43a83f1d322aa643d0bc28c21ea9f3df1af4ec5387c6e9d122d229e3949f9884"; + sha256 = "9ff43141905503ba3d8a0beb92dccf1f422c91b3d7c40c252b9d431093607f55"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/es-AR/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/es-AR/thunderbird-140.11.1esr.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5784e86f8d44449543f4fdead5207f8bd55e74b7247c9adca410a85f32a59314"; + sha256 = "75744354f8e6b8a6ac3b25c917aede6a1eca3e7d3861c1692cf4378b49e7cc84"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/es-ES/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/es-ES/thunderbird-140.11.1esr.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d30ee2c723db624e88f4366bec69b7a4f8f961a512a20639083704dfea9b7f38"; + sha256 = "139f1be50f0658100828cd3a0608ee31ef1952aa80048eb9a254c097ba7e04c9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/es-MX/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/es-MX/thunderbird-140.11.1esr.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "753add9de813171b500089dd31dbbbe9ff84f80728f27a526526e1597c65dc86"; + sha256 = "206f3efbdd7566986824e62124f6855c3b88679d4c4e9eee2041b26d01501fe7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/et/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/et/thunderbird-140.11.1esr.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "b1e88df784e6e4506272bf678107cbd22fff0f484775016143d70fcd02c7613b"; + sha256 = "6385a2b7201b295a9becb2e3326a87db7f26af19852141e82aaa1b9288e4cac1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/eu/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/eu/thunderbird-140.11.1esr.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "e1335eed845aab6cd905b0eb674a1b653f1c5ecdb57e733920a91d53fcf3bec2"; + sha256 = "1b115910849f6655d366f28949e998b1bc8b7b4c1b61d6af761fca6aba00a507"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/fi/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/fi/thunderbird-140.11.1esr.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "efbc84d63bbafe9fcc376d09745b9b0e05bb9d994284a09993fd6d31bdc7eedb"; + sha256 = "7afb20de6e21db2fcbc7be7622bbf7ec84948eae6d1a9bc98c9b894d375e7667"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/fr/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/fr/thunderbird-140.11.1esr.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "29cee6f757e1a52e2bd4f79802e8c84cf01efde0e59a3749b4de33662c9440c3"; + sha256 = "b8637b6e2478d662f55c942d49810801bfb1ae085db4970d76843fb553971e03"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/fy-NL/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/fy-NL/thunderbird-140.11.1esr.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "21f57dc54c76296f7483b382e3aaaff8ae2c6e1c39333a251d4d2a2ee1cd538c"; + sha256 = "dccb74f43b41a5c4c29a02e6ebeb947b8844f823c151be531548ef4b274accfb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/ga-IE/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ga-IE/thunderbird-140.11.1esr.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b4e7d46a39f4147c0e790733a05b9ad3d2312b802b7cc26d8450de8b0d61c26c"; + sha256 = "2a6e2d3631ae61956936f839c5926b0447dd435b0f01e23e6f9d2ef1943c66d4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/gd/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/gd/thunderbird-140.11.1esr.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "dda0dbbd8c80b96d78a56a7e3566dbd174e782f22ecc83b3791490dbb70acaca"; + sha256 = "b206f80708e217b928dae816e34d9a2150bfe30825853779c0ff24308f0b788b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/gl/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/gl/thunderbird-140.11.1esr.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "33acfbf6e5c6a0a9a16f244e71f24e66851aaf0cf44f0fd935fd3da89645f836"; + sha256 = "e934577623dc7f1e086207389b46221c5f126bb0068ab75ed8f328e8b153682d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/he/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/he/thunderbird-140.11.1esr.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "73baf62c2cce8618a351fcde5f128865b0f69636741959d938cd3b21a379885d"; + sha256 = "6625eb3e5714b4701c3f932837373fb125f1796939858396b186ea96dc7ea390"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/hr/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/hr/thunderbird-140.11.1esr.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "a78921e2d27c2b7afbf4a3c63f26596098911a76ffb0415325633b2e06b83a52"; + sha256 = "2c1009505352e4635d7f26ffd70d349eb3d42f8cbd82d3957007a6e78a0a301b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/hsb/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/hsb/thunderbird-140.11.1esr.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "fc24e8355fbea22b94083403d76402765f43eadb5db65170813eaae9f99280d1"; + sha256 = "959dc26e5dc95ad761b446d99968eba0a28d96df81e9bf1c5f7037f7d42c6f5c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/hu/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/hu/thunderbird-140.11.1esr.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "e3c8269ac0856a3de9aebe4333db9a93ea345166271bbb9b93fdbc970d11e8ad"; + sha256 = "67704499a7cbb17a403586f4b3f87da8029f347d01c0a815b88094afbf6d9a36"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/hy-AM/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/hy-AM/thunderbird-140.11.1esr.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "c1237cf706091f56a54335f202bb96fafa5f0f8533017467b700cc2393831b94"; + sha256 = "c25bde4dab387304e5e87ebf0874746600403a0077329dfe03324abe006fa5ff"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/id/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/id/thunderbird-140.11.1esr.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "29a82070680b4d9eab6bec02b608be92f50c931740526807cedaacb04e7c974a"; + sha256 = "67e1b9b33f16f19f90a6913d04db8d312378b73cac4da7e2146cde306e0b7143"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/is/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/is/thunderbird-140.11.1esr.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "87d27b14607bf9d0bf14c79957ac1e207797ebeafbd864b807041c3286815d65"; + sha256 = "89498071c81e3d4117976c91f5863512d700c3a26b9ea843c5e96163537d65a9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/it/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/it/thunderbird-140.11.1esr.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "539d0b5463cac1e39162af52832840836b7322285f811a2157825a1e7cf51c39"; + sha256 = "102f8e8510473e6a93dc91c1395232c24f0e54df1da4da63c08080b133c4b6c8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/ja/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ja/thunderbird-140.11.1esr.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "9f3f2e2b4bc4decb0322b24dbee80ec709e65100eb0a0fe528e8e68007a5d453"; + sha256 = "3aa0922fec0c4631f24623ed08c8c6912426caf2839ab4124c58417128b6dc11"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/ka/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ka/thunderbird-140.11.1esr.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "f95fa6f09899d9fd0016d0a3cba7222f0cd6bc34b1d1c83ffb6e0ce8b8ae34e3"; + sha256 = "f4239740b4e511088bde916f168dc9a05dc85984c3ff35e2d471ec2e8b606660"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/kab/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/kab/thunderbird-140.11.1esr.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "82b916f429bd32ce61482289cf0dce86b6d9a63d03842df09791e6b60660feb4"; + sha256 = "006acc5b65e26864e06f3fc8edd4e462e540ca03ec6e6d72a0e1fc73b531cd9b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/kk/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/kk/thunderbird-140.11.1esr.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "426e57863d9bca1f634896efff12aed09589f813b4f927296118ff1148828d7e"; + sha256 = "1fa3c1d87134b8e16d619ad6186eaf61827c50edde35e97e149d5d0fe9dd7ae0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/ko/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ko/thunderbird-140.11.1esr.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "3427624be4751eddc9e6f450139ea6ed03f54aa494e3f65bf20cd921dd423dd3"; + sha256 = "a79794232413e466978ee067190c47f668637477981e6938d82251c1b66fd185"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/lt/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/lt/thunderbird-140.11.1esr.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "14ae0abd72353cbcae9346c5905316e24b7b9993b4854c2bf4d2f9f4672efb6e"; + sha256 = "a89485d85e2e637e81de889ae6d69dd0407ff34a683d35d3ceacdc6abc3002a6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/lv/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/lv/thunderbird-140.11.1esr.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "02707c998f4a5691c01ec9dcf8d40e2173b70453993595199adfdffd9fc1b17e"; + sha256 = "90a05ad24b9de9adefc3ebe56999f63a44b809243593a32e53d7f9925188e850"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/ms/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ms/thunderbird-140.11.1esr.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "ee602c5600f1a5a3210ff825f7bcaf50c1c180fee9f8d57ff6b00d22b6bb0982"; + sha256 = "b309a1c322c0342a9bcfe48dfbf8c0fc73dd77b1237390c4cbf0b72c413496ef"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/nb-NO/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/nb-NO/thunderbird-140.11.1esr.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6103df1c4b1933ed5bdbf553771f751cb52ac4605d878ea68f7285214a2a6b79"; + sha256 = "525f8b1e56cc3ea5b1c16d190489758a0e7af3013ee6491fdd8d3b8620cd5c59"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/nl/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/nl/thunderbird-140.11.1esr.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "eb5b190973cf136cb05fb4fb6d3f9f5d318c8d67c2aba6ddd9e823ec0c4776fb"; + sha256 = "f5509e36added3e130d014988abbf023c0f9a580ef24fbf695efa5261e68cb96"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/nn-NO/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/nn-NO/thunderbird-140.11.1esr.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "57bafd959b5863f698e7c62bf16a93889798822a6eabddd90f67cefaa8e89dfd"; + sha256 = "972cd6c2f95376ab8af6878790be288076c871a75056cc30597f9f0d872ef560"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/pa-IN/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/pa-IN/thunderbird-140.11.1esr.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "b16f335be2aac579a588047ec61079180f6eefa7015414f3f5b02d1f6ac2b529"; + sha256 = "75ea1cd47d13fa174cb6b9f0e5fadf98cbf946e1433bd8521e5fcd270a6915d2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/pl/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/pl/thunderbird-140.11.1esr.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "4dd24ba47f02a3b8fc0f1e31aea67b4417ee43ec0629c612eae8b55b2a0be94d"; + sha256 = "a38797492d37e59ec4b43f0af22a89b84c5f5d75e4e0c4c8964e81a845b4d119"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/pt-BR/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/pt-BR/thunderbird-140.11.1esr.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "dd79a1f591485380e295ccee31b4d40a18848baef5b76fd7216cd83464fd5312"; + sha256 = "f8b008e467bc8d42a7a8bc94e62693b7cc922135ac1ff4371a5beeb090606f9a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/pt-PT/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/pt-PT/thunderbird-140.11.1esr.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "dc5485fcd9fe88bac72437bc7e8d1c38599e9c08050c07fc03dac90cf0d39eac"; + sha256 = "d78f6ece643f3245f6182d64fa5ae85559feda053920c9bdb3ab728a8eab83e5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/rm/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/rm/thunderbird-140.11.1esr.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "e80f37423de12b7b3777f1b956aeeb7c6ea8fb26771d77a59dbaca317fc98d0f"; + sha256 = "b6238ca303658ffe91c69295efcb0e47b7887b53c914eec189ba105a5a5140b9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/ro/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ro/thunderbird-140.11.1esr.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "0c4fde54a491677e615a5463021e4a05a867bb3b3df31ee94eac54aab3143d97"; + sha256 = "b21ba5df7ef7153d5e7e3fbbadffaec870a671293bf70056c867b69bf9130706"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/ru/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ru/thunderbird-140.11.1esr.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "79f2236adb60efdfbb9ef9e8d9decb9a44b6ac6b7754ec967703b50b5591fd5a"; + sha256 = "5504c9c7922aef8ab2895dcca5e0a91777bdf9c23b04b51e91311ff1e6c19cfb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/sk/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/sk/thunderbird-140.11.1esr.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "741f0c3314edb5208376d87faa461b33aa3f7faf5c4795fda0cbe21a15b6867c"; + sha256 = "7c5f26aa5dcaae38fbc304f2ddb378c9aebac38b6162c89f75952b4cbc20a4a9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/sl/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/sl/thunderbird-140.11.1esr.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "380fde76788d7d51182ec5f8fff1b9896f3adb9455cdcd19ca51d61da63dee49"; + sha256 = "a464a4c90cdbfa9e8e1b1911bc0fa1e6d14fa1ab79aeb9787c734823f52500db"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/sq/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/sq/thunderbird-140.11.1esr.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "9ef3447f06d5d27f2cce58cb896204a67fda3098c5b3dd7a55134c718b95aa14"; + sha256 = "983fd50f8065ff1128162c0bc02d3ce0831811e63ecf2232a60fb539463c700b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/sr/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/sr/thunderbird-140.11.1esr.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "51982b91d56f5d4d04ac01974423c45ba1f26dd31432303adf3ff6f3866cca8a"; + sha256 = "42287c4beab560a65eb160d2cb29ef76aea4ad617b04bfc2ca5e31ffa56c5526"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/sv-SE/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/sv-SE/thunderbird-140.11.1esr.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "36a4addf9af57ac5e763d0848da5a22bda1abd860924c9e89c4e12017e42fe44"; + sha256 = "665f3b3a5ecb750a4c9ed28cde5ed75cf2363ca17aa2d35c0fdcc4345c54139a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/th/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/th/thunderbird-140.11.1esr.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "78e9c86a55d42391a5ddd2f7c3f6421843134b479e08e70371ab78cabc0c8f96"; + sha256 = "e1ed90e486f2f5e0204bf42b281c92ebaf69512200d072d59bbb3e3dcc3976a9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/tr/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/tr/thunderbird-140.11.1esr.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "508510e80e585c6d95b7be37c268b916572f3ab94950070087c4852a1f024dd8"; + sha256 = "e152cb6a608fd4e8fd39dbd64836d08fe764da453117c15ebb182d0e6d86a14d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/uk/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/uk/thunderbird-140.11.1esr.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "19cb02c22e2b2c3457fde1a8ecea66bb94c90ab825b7779450a50499a68c1cc1"; + sha256 = "951b52b9092be3fdb102439d91d1637112b765236255ec5332023109f0989585"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/uz/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/uz/thunderbird-140.11.1esr.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "51ffd78c61d3d42d3981f9665fae4f81048b7e41761db01a59832bea702143f5"; + sha256 = "f8fb96e26415860d54a66defce161f3d838429a9d8350ce71e88f6caa43ea565"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/vi/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/vi/thunderbird-140.11.1esr.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "dd72b054b8526d33a5ec5500439b8a4a465e23f817e4d95b88749ebe07491a50"; + sha256 = "780b6fd4d2ba00b63a4c6e7627b67414cf9c3cd63104d6a66697886cea126b21"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/zh-CN/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/zh-CN/thunderbird-140.11.1esr.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a9396b9d57096320c4060549c6dd2dce7b391a7104b15ea7e1bf5ccfd605070b"; + sha256 = "bfb2f2624f6acf646fe355e8b225f43aff91074fe7769ec38a598cc70744398d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/linux-i686/zh-TW/thunderbird-140.11.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/zh-TW/thunderbird-140.11.1esr.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5fe6680e1a63dd8978ed84ef3ee28672b6e76a7302849ed1e7b953c338d8a6d0"; + sha256 = "ef6a6c877a3974f3f2c9ab43f019dd4aade5103cbb2ba231846f057f9d335240"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/af/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/af/Thunderbird%20140.11.1esr.dmg"; locale = "af"; arch = "mac"; - sha256 = "c0d105377d2dfbc09432759caec9e887ef24bead2f4f8ccf076d2c6dc6bbd90c"; + sha256 = "71384c413ed31247caf5162b2cd7afe37df565febad3dbbec4260204f1aca5df"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/ar/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ar/Thunderbird%20140.11.1esr.dmg"; locale = "ar"; arch = "mac"; - sha256 = "6cf8b5a74315518edf9cc41970142a899dd9862b3fab0c95fb846cc3f08e0403"; + sha256 = "c1f52fa77f922c748720965930e9896ecb8df86d9271632b64f732ac15f635e7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/ast/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ast/Thunderbird%20140.11.1esr.dmg"; locale = "ast"; arch = "mac"; - sha256 = "5deae254ce931228a7bfa24cef502d76685d97bbad7c7538cd1d9e384acc1094"; + sha256 = "4494a9119296b62c834a256baed1f6cfcc887a775749c476540532f775757b63"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/be/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/be/Thunderbird%20140.11.1esr.dmg"; locale = "be"; arch = "mac"; - sha256 = "307367780a699f8a1141a07ce717b074e2e05f9568226e0e20d3a94510b72cd5"; + sha256 = "666959b19337a26ff81f0ae8b48ac43368ea8e91b7c497073da5fff5b2ff14f3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/bg/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/bg/Thunderbird%20140.11.1esr.dmg"; locale = "bg"; arch = "mac"; - sha256 = "133c54309ea176ca6dec1e40a4a398b28a9a5b00f698b8825ce25c2387b04b35"; + sha256 = "633900af011489b54a465caa2767f51081bbe66c6da0840a94c96e53ab1e5e25"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/br/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/br/Thunderbird%20140.11.1esr.dmg"; locale = "br"; arch = "mac"; - sha256 = "983e82fc6242eeb101c77ee378e9d35d7916b6e4ebad760b9d9e4f4642a8a7a8"; + sha256 = "9841cba701ef1207bcb1c8cc5ba741968c4785a7f03f6005baa3026cb5d6e830"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/ca/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ca/Thunderbird%20140.11.1esr.dmg"; locale = "ca"; arch = "mac"; - sha256 = "a00eda61887f2ee6e374ece3519bc4c664fafeb879907dd69b92aacbbadc2a4f"; + sha256 = "f595c3892d7626ab90b96580933016533ffa30032c35d56afd6b11099d1788d1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/cak/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/cak/Thunderbird%20140.11.1esr.dmg"; locale = "cak"; arch = "mac"; - sha256 = "fe0a06706f10e1700219579778f28e3fd7cf8194d7de171731049f5f67ad76e3"; + sha256 = "7ee4bd5badecda67bc6c02ffaea353d8225b800a3e3dad631d1f78e28cce19d0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/cs/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/cs/Thunderbird%20140.11.1esr.dmg"; locale = "cs"; arch = "mac"; - sha256 = "4598356969edafc7b8ad38d646a680c74c657629e36e59b8863ab9d1e1b20855"; + sha256 = "367a85f54fbecd8476f598c9d5cc3eaa59846d9103c80b621698043fd8d46d8b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/cy/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/cy/Thunderbird%20140.11.1esr.dmg"; locale = "cy"; arch = "mac"; - sha256 = "7c80e60426516482539f8436c3b62519981b73d0efc80ab79524d89c1e98f5ee"; + sha256 = "13ac90da12ed2dbeb3f3715212d3aeaaad9b7e591e18d1b7fa1a131fd0903d11"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/da/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/da/Thunderbird%20140.11.1esr.dmg"; locale = "da"; arch = "mac"; - sha256 = "a7e6c2f92d62ca7533ee36ff5910ab44f96107a839687710cfe00787acef2aca"; + sha256 = "44e07909b0702b93a6a9ecc58db518cc53f37ad51892cadf3ae7fae71506ae1c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/de/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/de/Thunderbird%20140.11.1esr.dmg"; locale = "de"; arch = "mac"; - sha256 = "79ffaaaf076ea73f92a014cd4a793d4f07b1327a532d28aba8cf968c95afd470"; + sha256 = "fa754adbc3f907347052751567ef6f3ee5d77e6077f7e0fde20c4e7ac1b15677"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/dsb/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/dsb/Thunderbird%20140.11.1esr.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "8bb52ba66fc446d245ebcd67274fb07158d4e3c666e7326f7304fe61f28a0a53"; + sha256 = "87512955ada4e34c18e43652a3a98f66b289cda1d2eef6758b65d2417d073fba"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/el/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/el/Thunderbird%20140.11.1esr.dmg"; locale = "el"; arch = "mac"; - sha256 = "1b11344928fffd1d8d83a9f46b3330e1c3b2c55e2a30bec0d46fa0bc3e5cfea1"; + sha256 = "b440215c64da72c295aae50f268d56fd19213cbab62b52735daaa7f6bf2b3673"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/en-CA/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/en-CA/Thunderbird%20140.11.1esr.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "d57f4ccae55931e0ce2ea1e4ebf3a10a5c944975d04209abb2af4fa5d3480dcb"; + sha256 = "c06aeafe163740b4cd0c6a8794131a72567e1396a7bcb45a0bd719256bb97b65"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/en-GB/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/en-GB/Thunderbird%20140.11.1esr.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "6d6318fecbe9b07915696c414b8dce89f661c3960ca2a3f4cd8acff8776dc4d5"; + sha256 = "08963c43d94b2b8d0e16b746252da8d48c3015d92f512c63a2868f06ae0667b4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/en-US/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/en-US/Thunderbird%20140.11.1esr.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "ba39dc30d76462fb755356d2089396e1231c6db51b271f6526c0d2dcb1b65f12"; + sha256 = "2bc10b29aed42ce6b6148f351d02042ed81510938fdeaef291894f1f536ebddd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/es-AR/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/es-AR/Thunderbird%20140.11.1esr.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "87d01c861dd44a0de885aa7a5cf284ce4a1142224817166483275f3733cb08cd"; + sha256 = "5a596c72011d7e04fafa9edd17c48c5d56b0fa4b25b9774829ef1171519cb9e3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/es-ES/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/es-ES/Thunderbird%20140.11.1esr.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "98a48410700869d3f336907488d182745b7cb0ac3a4458771a0592a4cd0e7956"; + sha256 = "1a33b872d51c231746998398584840fcec9dbbb2ae5c9aaf85471805003d462e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/es-MX/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/es-MX/Thunderbird%20140.11.1esr.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "613f06d134d29145de5b042833b0be058c5f95ea4e34e05d6f93c414e50b923d"; + sha256 = "564f1c44ee6b2acb27daa93046af0e8b4df6030404ac2c15e69192a2db7b02af"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/et/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/et/Thunderbird%20140.11.1esr.dmg"; locale = "et"; arch = "mac"; - sha256 = "92ae0c1a8f5d0123aaca9823a126e2954793fd2dde377f8b0a3032af517d67e8"; + sha256 = "7f91c172337ab957fa2a432d81929ec7505e510f84ce5c51db5be98679782aa0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/eu/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/eu/Thunderbird%20140.11.1esr.dmg"; locale = "eu"; arch = "mac"; - sha256 = "40ef8aead02292abe9783b8b60a81a97ad4ae5570db802743bef96bb7db00c69"; + sha256 = "44778d36575fa0925e959042097896024fda1818e3148092da80b40afc711d25"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/fi/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/fi/Thunderbird%20140.11.1esr.dmg"; locale = "fi"; arch = "mac"; - sha256 = "c040c558cf401adad31c019303ca676f61eb8274119542910a6bf32b78eea815"; + sha256 = "0651b37a0e4783a082741e83393514cfb1c874fedba7d5383eca4015faf8111c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/fr/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/fr/Thunderbird%20140.11.1esr.dmg"; locale = "fr"; arch = "mac"; - sha256 = "6ff5989161dd3af2503822c014742dc25302915ca853d68847d48f621bd0426d"; + sha256 = "dcd4962c03ad913772dea4b21994efa6f2b4a8d7a9aaa7f25f8256c2f219c01e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/fy-NL/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/fy-NL/Thunderbird%20140.11.1esr.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "0c8e5562bc4bb76feb54f5f937dfa4ec94107794157b84ad20c592c2100b6714"; + sha256 = "e273ad2248947a28482f3bbbc940bb82a50c1e7c9f2b138a9bd672db47394e2d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/ga-IE/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ga-IE/Thunderbird%20140.11.1esr.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "f2779470f287e930982cc3dd12f6b1172720648d7700fb80e514abb103ba62ea"; + sha256 = "ef295ce6bb41f10ed2a9b46ad78b92693493886b4527e4b2f3b339cfcaed1006"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/gd/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/gd/Thunderbird%20140.11.1esr.dmg"; locale = "gd"; arch = "mac"; - sha256 = "6a45ec90be4dd2e2f42446e60095858a05983f0455214f8c9057413d942e7cd1"; + sha256 = "c20587243b2c52155f36383c9d7807c77888db10828d9a452aeb2ad2818d9940"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/gl/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/gl/Thunderbird%20140.11.1esr.dmg"; locale = "gl"; arch = "mac"; - sha256 = "4c164381c42c6a7fa6716dfed8a0bd4fa2596746ba335e80015237ddded63f59"; + sha256 = "5fb722d840f6ba1ad387618c4cc12948d0c3f29154eb27fbe80faa152a45fa72"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/he/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/he/Thunderbird%20140.11.1esr.dmg"; locale = "he"; arch = "mac"; - sha256 = "87582326e63bc8ec2317563ece155dc2ad684f4235027a0032448caa71c5f069"; + sha256 = "7467a99abe96bc08ed288fe233f5f4200f29dec876715471df94b5715b5b52da"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/hr/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/hr/Thunderbird%20140.11.1esr.dmg"; locale = "hr"; arch = "mac"; - sha256 = "7fcefaf1ab5c1eb6a2c36cb2898cda3dcde970d09ebdf0ecf60c064af3c560a8"; + sha256 = "3673ed4900ca38a8fc3ecf491c1106bfd8fd62f73b0f1b5d72c19f6a097e894f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/hsb/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/hsb/Thunderbird%20140.11.1esr.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "5aac55364ed2c50da2ac4f8f579910eef9195fa2250af00547a055717f7e5c80"; + sha256 = "0f8cc936971b3aad9b4825f7b6a44f49b3d1cb131fec95b9e09a298b6dfa7c4d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/hu/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/hu/Thunderbird%20140.11.1esr.dmg"; locale = "hu"; arch = "mac"; - sha256 = "d97b6100b90d392d274aaa65052eca9a7a417f6db2e4cee6e40012964dabda7e"; + sha256 = "b3b526480a8580f534f56a15792b8c04d356b78b8055e88f34ea7589d5ec395c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/hy-AM/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/hy-AM/Thunderbird%20140.11.1esr.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "bbee89f6ca5ca0f56dea90de3ff2e6b792501ef48895ccf646e575d2e448cb68"; + sha256 = "58ed43d6933d7b0d70935abcd816a035344b346bf5353b9c0b83b8e97e01be5c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/id/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/id/Thunderbird%20140.11.1esr.dmg"; locale = "id"; arch = "mac"; - sha256 = "8e068cbb8c35a1413e6f591a4c2e037d60f9b8c7957f371f927d3667e32da098"; + sha256 = "da3db2edf3773e80976c378c52b522d4019a69a1f14df0c08679587310561248"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/is/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/is/Thunderbird%20140.11.1esr.dmg"; locale = "is"; arch = "mac"; - sha256 = "8fe71cb128a77a789b8262fabaf88839bb427feca72c2b0ca9efd4a5af9424dd"; + sha256 = "db3966328ab4a5e9cf8783cccdca5955bfd7c049ca772d7f2e9955078d83989d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/it/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/it/Thunderbird%20140.11.1esr.dmg"; locale = "it"; arch = "mac"; - sha256 = "377cc031f4b9695ada777299c1b38b17f9c0066795d78a0949fa4a68bfb5af3b"; + sha256 = "7297c55daeeabcd2a60fb55699f1387609e7a3eb9bac3f81a86d1bdb31bd4299"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/ja-JP-mac/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ja-JP-mac/Thunderbird%20140.11.1esr.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "113a90bb2528fefad7a204edf11b82ba4a3a366e4cde5c0432612c26d2d8a7ac"; + sha256 = "78b03aa4af0af37662aff128570964017a730727d9e8baaa6d58ddbb850c15cb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/ka/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ka/Thunderbird%20140.11.1esr.dmg"; locale = "ka"; arch = "mac"; - sha256 = "38f90dd3d59e823ba6b7bb318edaaf3fa2242505f50d8393999ed9220e179fda"; + sha256 = "48a6a8fa454da3f2aabe9734ed3271354f26146b6bb63fd0e84c9ca66e525242"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/kab/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/kab/Thunderbird%20140.11.1esr.dmg"; locale = "kab"; arch = "mac"; - sha256 = "54bf27466b65e02ac9c1fe8d00f91c664a9443c4421eb863149d18d4dfdf9ed3"; + sha256 = "f93bbc335e9117b0bd8b4553a9f908d7088083251c59e8818cfd37f6f9ea000c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/kk/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/kk/Thunderbird%20140.11.1esr.dmg"; locale = "kk"; arch = "mac"; - sha256 = "bce820579e4716711a6d373e6d2567f62dc6fd2cdfe8d036277e098faea0e655"; + sha256 = "4898a0e073caf10b3d886f902a99658073f79484ab23faf8ac2d44b4e1066a5c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/ko/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ko/Thunderbird%20140.11.1esr.dmg"; locale = "ko"; arch = "mac"; - sha256 = "3a9a4b2ea318aa761fc52b52daa1c5d2217631cee0f8ee3589823a320f722a7c"; + sha256 = "bed653c957c9cf392b2b33acac927c7c695b051daafc5c3e2e1df0606b39f602"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/lt/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/lt/Thunderbird%20140.11.1esr.dmg"; locale = "lt"; arch = "mac"; - sha256 = "0b87f5235530a3730330f7e14fa29781b937dbf4f9a27b13263d00bdc5c6276d"; + sha256 = "a46821ce5e80703f5b98590343491f25aad4d42f46606729612c200f7826a5b0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/lv/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/lv/Thunderbird%20140.11.1esr.dmg"; locale = "lv"; arch = "mac"; - sha256 = "c5ad5ea37254485c18c0dbb7205d3ba8265fe86f4c8ba2bc3ee344488246e7ac"; + sha256 = "5745ed7e1e54f292e540124b027070fd132807955712722d7ec0b842655873ca"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/ms/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ms/Thunderbird%20140.11.1esr.dmg"; locale = "ms"; arch = "mac"; - sha256 = "259e50a383276d69a8c72ff40502e8742a7035eab18602bf0a75eb3f4e341bc9"; + sha256 = "c4f827aa57cde10bd59e24e34a285762d1f765027f6ad834735a2a4a97155b2c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/nb-NO/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/nb-NO/Thunderbird%20140.11.1esr.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "a3bec417128336032f73a98bae49659530f650523b1f8f52b060f9e5edf85db0"; + sha256 = "846c2a0f9b6d118911f2623e949192acc492b37b086e9356b52875357b623945"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/nl/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/nl/Thunderbird%20140.11.1esr.dmg"; locale = "nl"; arch = "mac"; - sha256 = "15e86acf07444cad144d85550cdbff72e45fb466da1a75db26c38d42ed709789"; + sha256 = "48e6e7be5ea330b39653bdbfca4835db02c9545c51627f8411f8886b70838da9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/nn-NO/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/nn-NO/Thunderbird%20140.11.1esr.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "c620030ca76c741a1939ce3d65e09ae811e3637ec18fe6e086f06ead9a28ac11"; + sha256 = "f1b28f4583fac39e57b173040df702d650011c1925082a91b3d630749a6db67f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/pa-IN/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/pa-IN/Thunderbird%20140.11.1esr.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "557e65648f7c5afb6b54caca23dbe20a019c3a5166cf07a552aa04c89152d41a"; + sha256 = "535cc3c913cb47b4d9dc540c17ba06d8a885904b2a44a0da4e039af010d70bb6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/pl/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/pl/Thunderbird%20140.11.1esr.dmg"; locale = "pl"; arch = "mac"; - sha256 = "8b84747a1d3a48476e516e3b01df30d171564ad6a2188631a691de28d905999c"; + sha256 = "4195b67da5ea25f656f44523a111fc0e5876b299b5293e015c651f9a12833062"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/pt-BR/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/pt-BR/Thunderbird%20140.11.1esr.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "002df94b930596360ffa8dd135ada74430fe8658d35f548c23bd95e4a1757190"; + sha256 = "e0b1ee7eacc6252d6bfb7233504c17c8ed178048dfb34fb1294d2624203e2cca"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/pt-PT/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/pt-PT/Thunderbird%20140.11.1esr.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "142b30e2ccd2984cbf0f12890a76a9cc2ab9b12d43eacad53aa25b42cbe803d0"; + sha256 = "2b9518c194259e570be52a866a13119f8a53effc8ccf47e602a0301bf51e5645"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/rm/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/rm/Thunderbird%20140.11.1esr.dmg"; locale = "rm"; arch = "mac"; - sha256 = "e69fb14acaf480b24164a81578edbd0d03685f142e22f161724a3e8bf2472397"; + sha256 = "3b184d62ac323cf4617693dbc3fded23edc0f6e24ae0184310e0b3114cce2442"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/ro/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ro/Thunderbird%20140.11.1esr.dmg"; locale = "ro"; arch = "mac"; - sha256 = "a42e49df05661150f259410904270d821dae42e505fc0722143880d5a8554a54"; + sha256 = "361ff7aec05dde3c141193fa02c51ff5233ed5c6164ad2f592c5c019029f0935"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/ru/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ru/Thunderbird%20140.11.1esr.dmg"; locale = "ru"; arch = "mac"; - sha256 = "a7b8008d9122cb7a17078ce2f201c252d47b87f5caadc8a3086a1433f07d3745"; + sha256 = "0a4f588fbff81465284f80e46556577860cf4e39e091c9e35c3e5478a4a4f568"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/sk/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/sk/Thunderbird%20140.11.1esr.dmg"; locale = "sk"; arch = "mac"; - sha256 = "f6f9aac10be4f06e9577a944f6c75cc15b004c020f75c4d030162a4d89cb83da"; + sha256 = "74104f7ff10755d3fffa97c9fc00c71011808a3247b9c895e72323ed393ba0c6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/sl/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/sl/Thunderbird%20140.11.1esr.dmg"; locale = "sl"; arch = "mac"; - sha256 = "74dae0a51778329bb23cf003e1b0548411d781f3e6b9c39dff127d76a1181e95"; + sha256 = "0a8aa57d7e45c3831a5a0ff67ca2a0617a9a580bd1bc543c6956d13d9fab5ebc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/sq/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/sq/Thunderbird%20140.11.1esr.dmg"; locale = "sq"; arch = "mac"; - sha256 = "4f3b352ccd3a382b95acf1581f2e9a5f07651339346296603d2252e87cb13b24"; + sha256 = "c1049a86ec71f56ca56fa9ce0af245fc84afc600274f572376c62dea9c06f1dc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/sr/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/sr/Thunderbird%20140.11.1esr.dmg"; locale = "sr"; arch = "mac"; - sha256 = "39cff58c6d1b7efb8de93febafcbc62df9e23275caa240cf3407d05d7b24b253"; + sha256 = "ea00bccc0d461dd18f8bceb3d5291f0d8938ec33cfe4f3a62f340eba1d7e0d0c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/sv-SE/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/sv-SE/Thunderbird%20140.11.1esr.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "ad33c82e60c152154a4a0263c8002811956693e6e2c594fcf7e302215d82e855"; + sha256 = "8cc6fed9ca0f5dd538b4b0f7847ed288d3dce1417e3711a8108d407506334116"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/th/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/th/Thunderbird%20140.11.1esr.dmg"; locale = "th"; arch = "mac"; - sha256 = "f06f41774defb3e1c65c1c5889bec7625aad21e2eaa948a7e871a93f0a50035a"; + sha256 = "c9ea193f65ded29b4b7fe95b976e2b3986991fc27ce2c36644c3b19d670897a1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/tr/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/tr/Thunderbird%20140.11.1esr.dmg"; locale = "tr"; arch = "mac"; - sha256 = "203f8d4f4c53631f4ab24143da4a370c6d5a190c704210a49272e3f72e486242"; + sha256 = "599f39c1e9afc484e93a889d4c61b6951cc4ea6bc3cc97c3b89d233e053f07b6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/uk/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/uk/Thunderbird%20140.11.1esr.dmg"; locale = "uk"; arch = "mac"; - sha256 = "55ac611bdcbe509da5a1f21b1bf07dace5a90820c69616b09132577d5577a39f"; + sha256 = "fa31863b8cbd39628cfa8c6e1e6152ba44d12e1b2545f02ba12651c0ea236b5a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/uz/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/uz/Thunderbird%20140.11.1esr.dmg"; locale = "uz"; arch = "mac"; - sha256 = "c98b8c3fde40db5c7236c1a58733c33f78ad7e6de5046f9c9d21c49b7cfb13e9"; + sha256 = "dc14d21c99880d48646d3207091d3ca6771da82384a8d89004964b6d013297ae"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/vi/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/vi/Thunderbird%20140.11.1esr.dmg"; locale = "vi"; arch = "mac"; - sha256 = "3bcf9ba5e0cd4127bebe63ec4dc3501a18590411c0033492b4eb4437f0c1cb2f"; + sha256 = "6284f3cb464dfd22a4277bdcbf8a02cbd4a8a2b3906ef0a4c8afcb189c509a08"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/zh-CN/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/zh-CN/Thunderbird%20140.11.1esr.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "e70d277005e3fc9c27342efcc0b4f2b9025d49429bcf6e590cebf6a1578d547e"; + sha256 = "56813d07d216c08b101b9368913ecdd95ad01163dfb925acce3942056ef7be40"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.0esr/mac/zh-TW/Thunderbird%20140.11.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/zh-TW/Thunderbird%20140.11.1esr.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "e2cf5fff0feeb0dd5da282090d132de49804661666fc77d02761973a89134853"; + sha256 = "950f3f82e472db1aa408ec50817e40225c38b4511d66ba727240e1c42cc64e10"; } ]; } diff --git a/pkgs/by-name/aw/awww/package.nix b/pkgs/by-name/aw/awww/package.nix index b3fe1dbc5ffc..c5990b3e2554 100644 --- a/pkgs/by-name/aw/awww/package.nix +++ b/pkgs/by-name/aw/awww/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, pkg-config, lz4, @@ -17,8 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "awww"; version = "0.12.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "LGFae"; repo = "awww"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/cr/cropgui/package.nix b/pkgs/by-name/cr/cropgui/package.nix index faf9579e5749..5b33a74447d0 100644 --- a/pkgs/by-name/cr/cropgui/package.nix +++ b/pkgs/by-name/cr/cropgui/package.nix @@ -1,7 +1,7 @@ { lib, python3Packages, - fetchFromGitea, + fetchFromCodeberg, makeWrapper, libjpeg, exiftool, @@ -11,8 +11,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "cropgui"; version = "0.9"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "jepler"; repo = "cropgui"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/ds/dssd/package.nix b/pkgs/by-name/ds/dssd/package.nix new file mode 100644 index 000000000000..6cda022a43c0 --- /dev/null +++ b/pkgs/by-name/ds/dssd/package.nix @@ -0,0 +1,47 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + dbus, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "dssd"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "ylxdzsw"; + repo = "dssd"; + tag = "v${finalAttrs.version}"; + hash = "sha256-gAV4gwrfvYfc2f1tDY/cNOFMrQzrzHSmEFsKg7ke/6c="; + }; + + cargoHash = "sha256-yX2/2TW3FNbqwzR6+5yP26E2Eps0bTJgJJrDIQG2KQU="; + + postPatch = '' + substituteInPlace dssd.service org.freedesktop.secrets.service \ + --replace-fail /usr/bin/dssd $out/bin/dssd + ''; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ dbus ]; + + postInstall = '' + install dssd.service -Dt $out/lib/systemd/user/ + install org.freedesktop.secrets.service -Dt $out/share/dbus-1/system-services/ + ''; + + __structuredAttrs = true; + strictDeps = true; + + meta = { + description = "Dead Simple Secret Daemon"; + homepage = "https://github.com/ylxdzsw/dssd"; + license = lib.licenses.mit; + mainProgram = "dssd"; + maintainers = with lib.maintainers; [ phanirithvij ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index c789986a2c19..bc3ca4bbae15 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -6,10 +6,10 @@ let pname = "fflogs"; - version = "9.3.17"; + version = "9.3.61"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-EYo65CerGE14kQadNIaVyANvyBig/yW1PfulAAE6dxo="; + hash = "sha256-QBiZR8wjhMsLguzBaM21mADlR1hKHdBuK66DcSzyVtQ="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch b/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch index 5e3608e27319..f68d082afd54 100644 --- a/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch +++ b/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Install fwupdplugin to out 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 1a56d3308..c7bf2c9aa 100644 +index 0d756bc0e748ba1c7be64bb9357f28fe8c5342e6..0cfca8e45b7ed6cc63be470ac0df916639ef52c4 100644 --- a/meson.build +++ b/meson.build -@@ -734,7 +734,7 @@ if build_standalone +@@ -719,7 +719,7 @@ if build_standalone if host_machine.system() == 'windows' libdir_pkg = bindir else diff --git a/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch b/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch index 1f3bfcf79f3e..1c1ce14a4b9b 100644 --- a/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch +++ b/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch @@ -11,7 +11,7 @@ Subject: [PATCH] Add output for installed tests 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/data/tests/meson.build b/data/tests/meson.build -index e15cab2fa..bad033dbf 100644 +index 377ba2ccaa5e13a87443cbe65406eb5a9a3af79b..2dfb5f251383464c38e2f3202c9dfb1107ac7798 100644 --- a/data/tests/meson.build +++ b/data/tests/meson.build @@ -139,7 +139,7 @@ configure_file( @@ -22,12 +22,12 @@ index e15cab2fa..bad033dbf 100644 + install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'), ) - if umockdev_integration_tests.allowed() + if umockdev.found() diff --git a/meson.build b/meson.build -index c7bf2c9aa..bf77bf6d6 100644 +index 0cfca8e45b7ed6cc63be470ac0df916639ef52c4..1561d1837a73425d9dda510d0ba25d16f92ed7f7 100644 --- a/meson.build +++ b/meson.build -@@ -241,8 +241,8 @@ else +@@ -243,8 +243,8 @@ else includedir = join_paths(prefix, get_option('includedir')) sysconfdir = join_paths(prefix, get_option('sysconfdir')) localstatedir = join_paths(prefix, get_option('localstatedir')) @@ -38,7 +38,7 @@ index c7bf2c9aa..bf77bf6d6 100644 daemon_dir = join_paths(libexecdir, 'fwupd') endif mandir = join_paths(prefix, get_option('mandir')) -@@ -722,6 +722,7 @@ gnome = import('gnome') +@@ -707,6 +707,7 @@ gnome = import('gnome') i18n = import('i18n') conf.set_quoted('FWUPD_PREFIX', prefix) @@ -47,10 +47,10 @@ index c7bf2c9aa..bf77bf6d6 100644 conf.set_quoted('FWUPD_LIBDIR', libdir) conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir) diff --git a/meson_options.txt b/meson_options.txt -index eb57391eb..420997355 100644 +index 6fe15e8beb8a85acdaca15f212bd3a917990ced2..b89ba371cee9dccf8457414f316ca697ef33216a 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -198,6 +198,11 @@ option( +@@ -193,6 +193,11 @@ option( value: 'fwupd-refresh', description: 'User account to use for fwupd-refresh.service (empty for DynamicUser)', ) @@ -63,7 +63,7 @@ index eb57391eb..420997355 100644 'tests', type: 'boolean', diff --git a/src/tests/host-emulate/meson.build b/src/tests/host-emulate/meson.build -index c36da65cd..f0b70d4d6 100644 +index c36da65cd67e6081a758ed2ab7327276fb82d804..f0b70d4d68de6f534f1c1ecd37e51619ad1d85e7 100644 --- a/src/tests/host-emulate/meson.build +++ b/src/tests/host-emulate/meson.build @@ -9,7 +9,7 @@ if build_standalone diff --git a/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch b/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch index 1efe00bed4ed..999acdd4e874 100644 --- a/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch +++ b/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch @@ -7,15 +7,15 @@ Subject: [PATCH] Add option for installation sysconfdir data/bios-settings.d/meson.build | 2 +- data/meson.build | 2 +- data/pki/meson.build | 4 ++-- - data/remotes.d/meson.build | 8 ++++---- + data/remotes.d/meson.build | 10 +++++----- docs/meson.build | 16 ++++++++-------- meson.build | 6 ++++++ meson_options.txt | 6 ++++++ plugins/uefi-capsule/meson.build | 4 ++-- - 8 files changed, 30 insertions(+), 18 deletions(-) + 8 files changed, 31 insertions(+), 19 deletions(-) diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build -index 2a2a07016..99df55afb 100644 +index 2a2a0701612e54a838d4d72f2bb00a793a31e0a3..99df55afb7636b090e2f57a5033bec6fe0017c15 100644 --- a/data/bios-settings.d/meson.build +++ b/data/bios-settings.d/meson.build @@ -2,6 +2,6 @@ if build_standalone and host_machine.system() == 'linux' @@ -27,7 +27,7 @@ index 2a2a07016..99df55afb 100644 ) endif diff --git a/data/meson.build b/data/meson.build -index 70d08c55e..5a5d8bf46 100644 +index 74a9104c333330ce2aacaa7cac45c87d6c5c8e53..3d9cc87b443078888c6e72075095d644a9258dab 100644 --- a/data/meson.build +++ b/data/meson.build @@ -29,7 +29,7 @@ if build_standalone @@ -38,27 +38,26 @@ index 70d08c55e..5a5d8bf46 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd'), install_mode: 'rw-r-----', ) - plugin_quirks += files('cfi.quirk', 'ds20.quirk', 'power.quirk', 'vendors.quirk') + plugin_quirks += files( diff --git a/data/pki/meson.build b/data/pki/meson.build -index b87068405..21f59753a 100644 +index 7574aebc60617d8d8456c210bb19fcaf25263e74..05e6642454123e715e2f80501cf1919f96905fde 100644 --- a/data/pki/meson.build +++ b/data/pki/meson.build -@@ -8,11 +8,11 @@ if supported_pkcs7 - install_data( - ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'], - install_tag: 'runtime', -- install_dir: join_paths(sysconfdir, 'pki', 'fwupd'), -+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd'), - ) - install_data( - ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'], - install_tag: 'runtime', -- install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata'), -+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata'), - ) - endif +@@ -1,10 +1,10 @@ + install_data( + ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'], + install_tag: 'runtime', +- install_dir: join_paths(sysconfdir, 'pki', 'fwupd'), ++ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd'), + ) + install_data( + ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'], + install_tag: 'runtime', +- install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata'), ++ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata'), + ) diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build -index b8d24c267..0dd4ad32a 100644 +index c0b4862ce6e13861da967cc2b8442849f63f0520..8bd00e9dbefd0ff386ad61f08ec861e7ad005090 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build @@ -12,7 +12,7 @@ if build_standalone and get_option('lvfs') != 'false' @@ -75,11 +74,20 @@ index b8d24c267..0dd4ad32a 100644 install: true, install_tag: 'runtime', - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), ++ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), + ) + configure_file( + input: 'lvfs-embargo.conf', +@@ -28,7 +28,7 @@ if build_standalone and get_option('lvfs') != 'false' + configuration: con3, + install: true, + install_tag: 'runtime', +- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) i18n.merge_file( input: 'lvfs.metainfo.xml', -@@ -59,7 +59,7 @@ configure_file( +@@ -67,7 +67,7 @@ configure_file( configuration: con2, install: get_option('vendor_metadata'), install_tag: 'runtime', @@ -88,7 +96,7 @@ index b8d24c267..0dd4ad32a 100644 ) configure_file( input: 'vendor-directory.conf', -@@ -67,5 +67,5 @@ configure_file( +@@ -75,5 +75,5 @@ configure_file( configuration: con2, install: true, install_tag: 'runtime', @@ -96,7 +104,7 @@ index b8d24c267..0dd4ad32a 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/docs/meson.build b/docs/meson.build -index b4d48b086..8a1f8fc8c 100644 +index b4d48b086baf03a2f713ab9c7cb17e60b2a9d12b..8a1f8fc8ca9fc21f278575233348ca918635c161 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -196,7 +196,7 @@ if build_docs @@ -161,10 +169,10 @@ index b4d48b086..8a1f8fc8c 100644 ) endif diff --git a/meson.build b/meson.build -index bf77bf6d6..f1f51e841 100644 +index 1561d1837a73425d9dda510d0ba25d16f92ed7f7..917770b38abb86056d6c42fa9c99dedf27ebe999 100644 --- a/meson.build +++ b/meson.build -@@ -248,6 +248,12 @@ endif +@@ -250,6 +250,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -178,7 +186,7 @@ index bf77bf6d6..f1f51e841 100644 gio = dependency( 'gio-2.0', diff --git a/meson_options.txt b/meson_options.txt -index 420997355..67b3058d5 100644 +index b89ba371cee9dccf8457414f316ca697ef33216a..0dc66c4ec1ecb1547a21c4ec673ac1032462d91e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,6 +14,12 @@ option( @@ -195,7 +203,7 @@ index 420997355..67b3058d5 100644 'build', type: 'combo', diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build -index f104f36d7..30356ea53 100644 +index c2eb3b4300437d0d6b87d934441e69c306ba99a8..5c90240170c11ad3c75840ab6913018b6f7de85f 100644 --- a/plugins/uefi-capsule/meson.build +++ b/plugins/uefi-capsule/meson.build @@ -23,7 +23,7 @@ if host_machine.system() == 'linux' diff --git a/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch b/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch index 7394273ebfed..8f044f425216 100644 --- a/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch +++ b/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Get the efi app from fwupd-efi 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index f1f51e841..aaefe55d9 100644 +index 917770b38abb86056d6c42fa9c99dedf27ebe999..f52f3ec12dd9def0a68ea1645f7d508acbb731b9 100644 --- a/meson.build +++ b/meson.build -@@ -646,7 +646,7 @@ endif +@@ -651,7 +651,7 @@ endif # EFI if build_standalone diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 9e679f45d6d2..8e9d9f3f1ae2 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -3,7 +3,6 @@ { lib, stdenv, - fetchpatch, # runPythonCommand runCommand, @@ -37,7 +36,6 @@ fwupd-efi, gnutls, gusb, - libcbor, libdrm, libgudev, libjcat, @@ -55,7 +53,6 @@ tpm2-tss, valgrind, xz, # for liblzma - flashrom, # mesonFlags hwdata, @@ -76,16 +73,12 @@ nixosTests, nix-update-script, - enableFlashrom ? false, enablePassim ? false, }: let isx86 = stdenv.hostPlatform.isx86; - # Experimental - haveFlashrom = isx86 && enableFlashrom; - runPythonCommand = name: buildCommandPython: @@ -129,7 +122,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "2.1.1"; + version = "2.1.4"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -147,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; tag = finalAttrs.version; - hash = "sha256-pb5BBA+3KTeZZ8WyNDaY9EKNTxp4MT/3G/MEgQ+Nysk="; + hash = "sha256-bKBEZR7Wzi9nZYH+KAzh1q+sh2t2Gl3puQmeogNdIsE="; }; patches = [ @@ -168,18 +161,6 @@ stdenv.mkDerivation (finalAttrs: { # EFI capsule is located in fwupd-efi now. ./0004-Get-the-efi-app-from-fwupd-efi.patch - - # FIXME: remove patches that fix CI on aarch64 after next release - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/b3d721360faa4de7dd6960d8f9f8f13aa310715f.patch"; - sha256 = "sha256-x37QCK7XBzUUjUj1m3jaNe1qvaqtszB9DGFyF8gC3Ig="; - name = "fix-mtdram-test-for-missing-kernel-module.patch"; - }) - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/9ad8b76dc6c5af005a2c712ae3a6f352b51e9eea.patch"; - sha256 = "sha256-h9zLTHeJbfDoamdfICKc0ohQ51yJC4I/CK0SQ4H6rRk="; - name = "fix-test_get_devices-on-non-x86-architectures.patch"; - }) ]; postPatch = '' @@ -207,7 +188,9 @@ stdenv.mkDerivation (finalAttrs: { ensureNewerSourcesForZipFilesHook # required for firmware zipping gettext gi-docgen + gnutls.bin gobject-introspection + libjcat.bin libxml2 meson ninja @@ -230,7 +213,6 @@ stdenv.mkDerivation (finalAttrs: { fwupd-efi gnutls gusb - libcbor libdrm libgudev libjcat @@ -247,13 +229,9 @@ stdenv.mkDerivation (finalAttrs: { tpm2-tss valgrind xz # for liblzma - ] - ++ lib.optionals haveFlashrom [ - flashrom ]; mesonFlags = [ - (lib.mesonEnable "docs" true) # We are building the official releases. (lib.mesonEnable "supported_build" true) (lib.mesonOption "systemd_root_prefix" "${placeholder "out"}") @@ -262,7 +240,6 @@ stdenv.mkDerivation (finalAttrs: { "--sysconfdir=/etc" (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc") (lib.mesonOption "efi_os_dir" "nixos") - (lib.mesonEnable "plugin_modem_manager" true) # HSI is auto-disabled on non-x86 upstream; auto_features=enabled overrides # that, breaking the fwupdtool installed test which expects rc=1 on non-x86. (lib.mesonEnable "hsi" isx86) @@ -276,9 +253,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!enablePassim) [ (lib.mesonEnable "passim" false) - ] - ++ lib.optionals (!haveFlashrom) [ - (lib.mesonEnable "plugin_flashrom" false) ]; # TODO: wrapGAppsHook3 wraps efi capsule even though it is not ELF @@ -356,6 +330,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { }; filesInstalledToEtc = [ "fwupd/fwupd.conf" + "fwupd/remotes.d/lvfs-embargo.conf" "fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" diff --git a/pkgs/by-name/ga/gamepad-mirror/package.nix b/pkgs/by-name/ga/gamepad-mirror/package.nix index a21f41375c82..cdde9f088a02 100644 --- a/pkgs/by-name/ga/gamepad-mirror/package.nix +++ b/pkgs/by-name/ga/gamepad-mirror/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, appstream, cmake, desktop-file-utils, @@ -27,8 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gamepad-mirror"; version = "0.3-unstable-2025-10-18"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "vendillah"; repo = "GamepadMirror"; rev = "aa86d55f21b4d206eab61d0bf7cd9ccafc8aa607"; diff --git a/pkgs/by-name/gi/git-pages/package.nix b/pkgs/by-name/gi/git-pages/package.nix new file mode 100644 index 000000000000..eae85b985d4d --- /dev/null +++ b/pkgs/by-name/gi/git-pages/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromCodeberg, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "git-pages"; + version = "0.9.0"; + __structuredAttrs = true; + + src = fetchFromCodeberg { + owner = "git-pages"; + repo = "git-pages"; + tag = "v${finalAttrs.version}"; + hash = "sha256-yuOiA8TmLV5RQ7rmhH0Ac/6gN1t6wgyUkvMOJqEMV4U="; + }; + + subPackages = [ "." ]; + + vendorHash = "sha256-NNIkzgRki2rtCVUnnhT44rEBcMZYiJPmsXySpxiHYR0="; + + ldflags = [ + "-s" + "-X main.versionOverride=${finalAttrs.src.tag}" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "-version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Scalable static site server for Git forges (like GitHub Pages or Netlify"; + homepage = "https://codeberg.org/git-pages/git-pages"; + changelog = "https://codeberg.org/git-pages/git-pages/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.bsd0; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "git-pages"; + }; +}) diff --git a/pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch b/pkgs/by-name/gr/grantlee/grantlee-nix-profiles.patch similarity index 100% rename from pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch rename to pkgs/by-name/gr/grantlee/grantlee-nix-profiles.patch diff --git a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch b/pkgs/by-name/gr/grantlee/grantlee-no-canonicalize-filepath.patch similarity index 100% rename from pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch rename to pkgs/by-name/gr/grantlee/grantlee-no-canonicalize-filepath.patch diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/by-name/gr/grantlee/package.nix similarity index 89% rename from pkgs/development/libraries/grantlee/5/default.nix rename to pkgs/by-name/gr/grantlee/package.nix index b0818c670a05..a32612b986e7 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/by-name/gr/grantlee/package.nix @@ -1,13 +1,12 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, - qtbase, - qtscript, + qt5, cmake, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "grantlee"; version = "5.3.1"; grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}"; @@ -20,10 +19,13 @@ mkDerivation rec { }; buildInputs = [ - qtbase - qtscript + qt5.qtbase + qt5.qtscript + ]; + nativeBuildInputs = [ + cmake + qt5.wrapQtAppsHook ]; - nativeBuildInputs = [ cmake ]; patches = [ ./grantlee-nix-profiles.patch @@ -63,6 +65,6 @@ mkDerivation rec { homepage = "https://github.com/steveire/grantlee"; maintainers = [ lib.maintainers.ttuegel ]; license = lib.licenses.lgpl21; - inherit (qtbase.meta) platforms; + inherit (qt5.qtbase.meta) platforms; }; } diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/pkgs/by-name/gr/grantlee/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/grantlee/5/setup-hook.sh rename to pkgs/by-name/gr/grantlee/setup-hook.sh diff --git a/pkgs/by-name/hi/hittekaart/package.nix b/pkgs/by-name/hi/hittekaart/package.nix index 4dac740a9750..068e298cc28f 100644 --- a/pkgs/by-name/hi/hittekaart/package.nix +++ b/pkgs/by-name/hi/hittekaart/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, python3, sqlite, }: @@ -10,8 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hittekaart"; version = "0.2.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dunj3"; repo = "hittekaart"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 8c74b38a637f..47d584108578 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -19,6 +19,7 @@ libxcrypt, mimalloc, openssl, + perl, python3, qt6Packages, woff2, @@ -58,6 +59,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' sed -i '/iconutil/d' UI/CMakeLists.txt + perl -0pi -e \ + 's/find_package\(ICU 78\.[0-9]+ EXACT REQUIRED COMPONENTS data i18n uc\)/find_package(ICU ${icu78.version} EXACT REQUIRED COMPONENTS data i18n uc)/ or die "ICU dependency not found\n"' \ + Meta/CMake/check_for_dependencies.cmake + # Don't set absolute paths in RPATH substituteInPlace Meta/CMake/lagom_install_options.cmake \ --replace-fail "\''${CMAKE_INSTALL_BINDIR}" "bin" \ @@ -86,6 +91,7 @@ stdenv.mkDerivation (finalAttrs: { cargo cmake ninja + perl pkg-config python3 rustPlatform.cargoSetupHook @@ -179,6 +185,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ fgaz jk + schembriaiden ]; platforms = [ "x86_64-linux" diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/by-name/le/lemonbar-xft/package.nix similarity index 100% rename from pkgs/applications/window-managers/lemonbar/xft.nix rename to pkgs/by-name/le/lemonbar-xft/package.nix diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/by-name/le/lemonbar/package.nix similarity index 100% rename from pkgs/applications/window-managers/lemonbar/default.nix rename to pkgs/by-name/le/lemonbar/package.nix diff --git a/pkgs/by-name/li/libappimage/package.nix b/pkgs/by-name/li/libappimage/package.nix index 7000e59b4d19..40918ba36fa4 100644 --- a/pkgs/by-name/li/libappimage/package.nix +++ b/pkgs/by-name/li/libappimage/package.nix @@ -10,7 +10,6 @@ pkg-config, boost, cairo, - fuse, glib, libarchive, librsvg, @@ -80,7 +79,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost - fuse libarchive squashfuse xdg-utils-cxx diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/by-name/li/libosmscout/package.nix similarity index 92% rename from pkgs/development/libraries/libosmscout/default.nix rename to pkgs/by-name/li/libosmscout/package.nix index 7c850d962ff1..8fe0cb9fc900 100644 --- a/pkgs/development/libraries/libosmscout/default.nix +++ b/pkgs/by-name/li/libosmscout/package.nix @@ -5,10 +5,8 @@ fetchpatch, cmake, pkg-config, - wrapQtAppsHook, marisa, - qttools, - qtlocation, + libsForQt5, }: stdenv.mkDerivation { @@ -37,12 +35,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ marisa - qttools - qtlocation + libsForQt5.qttools + libsForQt5.qtlocation ]; meta = { diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/by-name/ma/manuskript/package.nix similarity index 96% rename from pkgs/applications/editors/manuskript/default.nix rename to pkgs/by-name/ma/manuskript/package.nix index 400b73ee5062..ecc140a74ba6 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/by-name/ma/manuskript/package.nix @@ -3,7 +3,7 @@ zlib, fetchFromGitHub, python3Packages, - wrapQtAppsHook, + libsForQt5, }: python3Packages.buildPythonApplication (finalAttrs: { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-jOhbN6lMx04q60S0VOABmSNE/x9Er9exFYvWJe2INlE="; }; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; propagatedBuildInputs = [ python3Packages.pyqt5 diff --git a/pkgs/applications/misc/masterpdfeditor4/default.nix b/pkgs/by-name/ma/masterpdfeditor4/package.nix similarity index 94% rename from pkgs/applications/misc/masterpdfeditor4/default.nix rename to pkgs/by-name/ma/masterpdfeditor4/package.nix index ea54e30ebecd..84b70d3cad60 100644 --- a/pkgs/applications/misc/masterpdfeditor4/default.nix +++ b/pkgs/by-name/ma/masterpdfeditor4/package.nix @@ -2,11 +2,9 @@ stdenv, fetchurl, sane-backends, - qtbase, - qtsvg, autoPatchelfHook, lib, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation rec { @@ -20,12 +18,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg sane-backends stdenv.cc.cc ]; diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix index 57ee664c22b7..2ac745b9c1f2 100644 --- a/pkgs/by-name/ma/matrix-tuwunel/package.nix +++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix @@ -89,16 +89,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-tuwunel"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "matrix-construct"; repo = "tuwunel"; tag = "v${finalAttrs.version}"; - hash = "sha256-GIYG2fKiUSOx2aAumCZLrc4vuWj1UWJf8nXyuDdj1oI="; + hash = "sha256-bB42SEa/gkFlkjb4L12Uh7xI4+3NmJgfbUPU01NXaEQ="; }; - cargoHash = "sha256-V8byPrtgUQPri36pNtgOEtTlblxMAm90cSf8fgmx4tA="; + cargoHash = "sha256-czCKzV/DCMJK0sN/jP5Jo98Zdii9DIAGAVnFnK0YtmY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/by-name/mk/mkchromecast/package.nix similarity index 93% rename from pkgs/applications/networking/mkchromecast/default.nix rename to pkgs/by-name/mk/mkchromecast/package.nix index f0db4eec7065..5d95d8c485f1 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/by-name/mk/mkchromecast/package.nix @@ -6,7 +6,6 @@ sox, flac, lame, - wrapQtAppsHook, ffmpeg, vorbis-tools, pulseaudio, @@ -15,7 +14,7 @@ opus-tools, gst_all_1, enableSonos ? true, - qtwayland, + libsForQt5, }: let packages = [ @@ -44,7 +43,7 @@ python3Packages.buildPythonApplication { hash = "sha256-UMzOIxgeTpAFQZtYirOYPoVcKgiKdGx2zwVyWmo32w4="; }; - buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland; + buildInputs = lib.optional stdenv.hostPlatform.isLinux libsForQt5.qtwayland; propagatedBuildInputs = with python3Packages; ( @@ -66,7 +65,7 @@ python3Packages.buildPythonApplication { --replace 'platform.system() == "Linux"' 'True' ''; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; # Relies on an old version (0.7.7) of PyChromecast unavailable in Nixpkgs. # Is also I/O bound and impure, testing an actual device, so we disable. diff --git a/pkgs/applications/editors/molsketch/openbabel.patch b/pkgs/by-name/mo/molsketch/openbabel.patch similarity index 100% rename from pkgs/applications/editors/molsketch/openbabel.patch rename to pkgs/by-name/mo/molsketch/openbabel.patch diff --git a/pkgs/applications/editors/molsketch/default.nix b/pkgs/by-name/mo/molsketch/package.nix similarity index 95% rename from pkgs/applications/editors/molsketch/default.nix rename to pkgs/by-name/mo/molsketch/package.nix index f042627055e7..3aea780b0450 100644 --- a/pkgs/applications/editors/molsketch/default.nix +++ b/pkgs/by-name/mo/molsketch/package.nix @@ -4,8 +4,7 @@ fetchurl, cmake, pkg-config, - qttools, - wrapQtAppsHook, + libsForQt5, hicolor-icon-theme, openbabel, desktop-file-utils, @@ -45,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ hicolor-icon-theme diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/by-name/mo/moolticute/package.nix similarity index 89% rename from pkgs/applications/misc/moolticute/default.nix rename to pkgs/by-name/mo/moolticute/package.nix index fe87ff3a1429..dbcfa3829f0a 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/by-name/mo/moolticute/package.nix @@ -4,11 +4,7 @@ fetchFromGitHub, libusb1, pkg-config, - qmake, - qttools, - wrapQtAppsHook, - qtbase, - qtwebsockets, + libsForQt5, }: stdenv.mkDerivation rec { @@ -29,14 +25,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - qmake - qttools - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ libusb1 - qtbase - qtwebsockets + libsForQt5.qtbase + libsForQt5.qtwebsockets ]; doInstallCheck = true; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/by-name/my/mytetra/package.nix similarity index 93% rename from pkgs/applications/office/mytetra/default.nix rename to pkgs/by-name/my/mytetra/package.nix index 0fae90828e9f..373864b8f1b1 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/by-name/my/mytetra/package.nix @@ -2,10 +2,8 @@ lib, stdenv, fetchFromGitHub, - qmake, - qtsvg, makeWrapper, - wrapQtAppsHook, + libsForQt5, xdg-utils, }: @@ -21,11 +19,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - qmake + libsForQt5.qmake makeWrapper - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; - buildInputs = [ qtsvg ]; + buildInputs = [ libsForQt5.qtsvg ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/n6/n64recomp/package.nix b/pkgs/by-name/n6/n64recomp/package.nix index 73f99962aa96..f8f8a39cbf1c 100644 --- a/pkgs/by-name/n6/n64recomp/package.nix +++ b/pkgs/by-name/n6/n64recomp/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "n64recomp"; - version = "0-unstable-2026-05-17"; + version = "0-unstable-2026-05-27"; src = fetchFromGitHub { owner = "N64Recomp"; repo = "N64Recomp"; - rev = "70a894aad8d3491ca0fccee1f94dae8190845686"; - hash = "sha256-4y1Cb2lmVZi+IoIBY9AZuWa+XPoBejdd1rL/uTjM07E="; + rev = "ffb39cdad1da5de07eaaa48bd1db4a89a7986771"; + hash = "sha256-/MmRvLWxh/uaFXp0eiNdrnMKrrYQvjxmw/+/o5lXyFU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index 414f6ffd1322..c97bcf8f9141 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -48,13 +48,13 @@ let in buildGoModule (finalAttrs: { pname = "nezha"; - version = "2.0.11"; + version = "2.0.14"; src = fetchFromGitHub { owner = "nezhahq"; repo = "nezha"; tag = "v${finalAttrs.version}"; - hash = "sha256-XZPyzIiqf2UG1gE6uHiYSVPCP6G/lrKK+Y3vRgkPk20="; + hash = "sha256-dSFwU1p2lAI8CaNoQgdX/pkumIumZpdLgnn1XCkoeKU="; }; proxyVendor = true; @@ -94,7 +94,7 @@ buildGoModule (finalAttrs: { GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d cmd/dashboard -g main.go -o cmd/dashboard/docs ''; - vendorHash = "sha256-x347CkS4nw8hFUhmuewvrqNDE2a2lT3KmIQ1hc98NJE="; + vendorHash = "sha256-y7XvvpLrmoaU1gLtaN38T9rsS3Rpi313XAKaVcia6Q4="; ldflags = [ "-s" diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index 356de4c085d4..7e054548f497 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "nix-update"; - version = "1.15.0"; + version = "1.15.1"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-update"; tag = "v${finalAttrs.version}"; - hash = "sha256-M62YdrdAqK81MF0FL0bx6iKTDCaqOtPx3civlSg46uk="; + hash = "sha256-z7xXzpwsXY1x/xKeM7l2mN8dHFTp8qfgs/5xVsKjHr8="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/nu/nu-lint/package.nix b/pkgs/by-name/nu/nu-lint/package.nix index 0eb1c2fbacc5..751b4c996a02 100644 --- a/pkgs/by-name/nu/nu-lint/package.nix +++ b/pkgs/by-name/nu/nu-lint/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, nix-update-script, versionCheckHook, @@ -10,8 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu-lint"; version = "1.1.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "wvhulle"; repo = "nu-lint"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/by-name/of/ofono-phonesim/package.nix similarity index 82% rename from pkgs/development/tools/ofono-phonesim/default.nix rename to pkgs/by-name/of/ofono-phonesim/package.nix index 32a33f54b0ea..f5e929dd690d 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/by-name/of/ofono-phonesim/package.nix @@ -4,8 +4,7 @@ fetchzip, autoreconfHook, pkg-config, - wrapQtAppsHook, - qtbase, + libsForQt5, }: stdenv.mkDerivation { @@ -20,16 +19,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase ]; makeFlags = [ - "MOC=${qtbase.dev}/bin/moc" - "UIC=${qtbase.dev}/bin/uic" + "MOC=${libsForQt5.qtbase.dev}/bin/moc" + "UIC=${libsForQt5.qtbase.dev}/bin/uic" ]; meta = { diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/by-name/op/openhantek6022/package.nix similarity index 88% rename from pkgs/applications/science/electronics/openhantek6022/default.nix rename to pkgs/by-name/op/openhantek6022/package.nix index e92a92890c6c..481dd40bb622 100644 --- a/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/pkgs/by-name/op/openhantek6022/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, makeWrapper, cmake, - wrapQtAppsHook, - qtbase, - qttools, + libsForQt5, fftw, libusb1, libglvnd, @@ -26,14 +24,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ fftw libusb1 libglvnd - qtbase - qttools + libsForQt5.qtbase + libsForQt5.qttools ]; postPatch = '' @@ -51,6 +49,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/OpenHantek/OpenHantek6022"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ baracoder ]; - platforms = qtbase.meta.platforms; + platforms = libsForQt5.qtbase.meta.platforms; }; } diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/by-name/pd/pdfhummus/package.nix similarity index 96% rename from pkgs/development/libraries/pdfhummus/default.nix rename to pkgs/by-name/pd/pdfhummus/package.nix index e32984e33602..8cf89b119ded 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/by-name/pd/pdfhummus/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - qtbase, + libsForQt5, zlib, freetype, libjpeg, @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qtbase + libsForQt5.qtbase ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/po/polkit-stdin-agent/package.nix b/pkgs/by-name/po/polkit-stdin-agent/package.nix new file mode 100644 index 000000000000..7453f9fb7540 --- /dev/null +++ b/pkgs/by-name/po/polkit-stdin-agent/package.nix @@ -0,0 +1,47 @@ +{ + lib, + rustPlatform, + fetchFromGitea, + nix-update-script, + nixosTests, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "polkit-stdin-agent"; + version = "0.3.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "r-vdp"; + repo = "polkit-stdin-agent"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Nl/+IBbUEsxSKSWLXwUB3mV4iAG0z9mv+Bl6CSeFzR4="; + }; + + cargoHash = "sha256-Eb/7ejVmtG5FNSh66gZO3337KCPNi+xtYVC5qyFKJzg="; + + strictDeps = true; + __structuredAttrs = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Non-interactive polkit authentication agent that answers PAM prompts from a file descriptor"; + longDescription = '' + Registers a per-process polkit authentication agent for a wrapped + command and answers the PAM conversation from a file descriptor + instead of /dev/tty, giving run0 / systemd-run the same + "password on stdin" ergonomics as `sudo --stdin`. + + Used by `nixos-rebuild --elevate=run0 --ask-elevate-password` to + authenticate on a target host over SSH without allocating a TTY. + ''; + homepage = "https://codeberg.org/r-vdp/polkit-stdin-agent"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rvdp ]; + platforms = lib.platforms.linux; + mainProgram = "polkit-stdin-agent"; + }; +}) diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/by-name/pr/proxmark3/package.nix similarity index 95% rename from pkgs/tools/security/proxmark3/default.nix rename to pkgs/by-name/pr/proxmark3/package.nix index 2c0ac5017148..868e5796ddeb 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/by-name/pr/proxmark3/package.nix @@ -15,8 +15,7 @@ udevCheckHook, nix-update-script, withGui ? true, - wrapQtAppsHook, - qtbase, + libsForQt5, withPython ? true, python3, withBlueshark ? false, @@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { gcc-arm-embedded udevCheckHook ] - ++ lib.optional withGui wrapQtAppsHook; + ++ lib.optional withGui libsForQt5.wrapQtAppsHook; buildInputs = [ readline bzip2 @@ -68,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { whereami lua ] - ++ lib.optional withGui qtbase + ++ lib.optional withGui libsForQt5.qtbase ++ lib.optional withPython python3 ++ lib.optional withBlueshark bluez5; diff --git a/pkgs/development/libraries/qdjango/default.nix b/pkgs/by-name/qd/qdjango/package.nix similarity index 94% rename from pkgs/development/libraries/qdjango/default.nix rename to pkgs/by-name/qd/qdjango/package.nix index d0f1a66b440a..ad780ca0d750 100644 --- a/pkgs/development/libraries/qdjango/default.nix +++ b/pkgs/by-name/qd/qdjango/package.nix @@ -4,8 +4,7 @@ fetchFromGitHub, testers, doxygen, - qmake, - qtbase, + libsForQt5, }: stdenv.mkDerivation (finalAttrs: { @@ -49,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ doxygen - qmake + libsForQt5.qmake ]; dontWrapQtApps = true; @@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; preCheck = '' - export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + export QT_PLUGIN_PATH=${lib.getBin libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix} '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # at this point in the build, install_name for dylibs hasn't been patched yet so we need to set the library path. diff --git a/pkgs/applications/misc/qelectrotech/default.nix b/pkgs/by-name/qe/qelectrotech/package.nix similarity index 92% rename from pkgs/applications/misc/qelectrotech/default.nix rename to pkgs/by-name/qe/qelectrotech/package.nix index 7ce61dcf307f..7b05c2dec4c5 100644 --- a/pkgs/applications/misc/qelectrotech/default.nix +++ b/pkgs/by-name/qe/qelectrotech/package.nix @@ -5,10 +5,7 @@ installShellFiles, pkg-config, cmake, - qtbase, - qtsvg, - wrapQtAppsHook, - qttools, + libsForQt5, pugixml, }: let @@ -53,13 +50,13 @@ stdenv.mkDerivation rec { installShellFiles pkg-config cmake - wrapQtAppsHook - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qttools ]; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg pugixml ]; @@ -88,7 +85,7 @@ stdenv.mkDerivation rec { homepage = "https://qelectrotech.org/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ yvesf ]; - platforms = qtbase.meta.platforms; + platforms = libsForQt5.qtbase.meta.platforms; broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/misc/qelectrotech/system-pugixml.patch b/pkgs/by-name/qe/qelectrotech/system-pugixml.patch similarity index 100% rename from pkgs/applications/misc/qelectrotech/system-pugixml.patch rename to pkgs/by-name/qe/qelectrotech/system-pugixml.patch diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/by-name/ql/qlcplus/package.nix similarity index 89% rename from pkgs/applications/misc/qlcplus/default.nix rename to pkgs/by-name/ql/qlcplus/package.nix index 6bb2506b6ea4..2c3d79f1716f 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/by-name/ql/qlcplus/package.nix @@ -2,15 +2,10 @@ lib, stdenv, fetchFromGitHub, - qmake, pkg-config, udevCheckHook, - wrapQtAppsHook, udev, - qtmultimedia, - qtscript, - qtserialport, - qtwebsockets, + libsForQt5, alsa-lib, ola, libftdi1, @@ -31,17 +26,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - qmake + libsForQt5.qmake pkg-config udevCheckHook - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ udev - qtmultimedia - qtscript - qtserialport - qtwebsockets + libsForQt5.qtmultimedia + libsForQt5.qtscript + libsForQt5.qtserialport + libsForQt5.qtwebsockets alsa-lib ola libftdi1 diff --git a/pkgs/development/libraries/qmarkdowntextedit/default.nix b/pkgs/by-name/qm/qmarkdowntextedit/package.nix similarity index 93% rename from pkgs/development/libraries/qmarkdowntextedit/default.nix rename to pkgs/by-name/qm/qmarkdowntextedit/package.nix index ad75505c3642..56df28267e51 100644 --- a/pkgs/development/libraries/qmarkdowntextedit/default.nix +++ b/pkgs/by-name/qm/qmarkdowntextedit/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - qmake, + libsForQt5, }: stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { hash = "sha256-EYBX2SJa8o4R/zEjSFbmFxhLI726WY21XmCkWIqPeFc="; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ libsForQt5.qmake ]; dontWrapQtApps = true; diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/by-name/qm/qmediathekview/package.nix similarity index 91% rename from pkgs/applications/video/qmediathekview/default.nix rename to pkgs/by-name/qm/qmediathekview/package.nix index 0abe2d514ca7..e83a58bf02d1 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/by-name/qm/qmediathekview/package.nix @@ -3,11 +3,9 @@ stdenv, fetchFromGitHub, boost, - qtbase, xz, - qmake, pkg-config, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation rec { @@ -27,15 +25,15 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - qtbase + libsForQt5.qtbase xz boost ]; nativeBuildInputs = [ - qmake + libsForQt5.qmake pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/by-name/ra/radeon-profile/package.nix similarity index 87% rename from pkgs/tools/misc/radeon-profile/default.nix rename to pkgs/by-name/ra/radeon-profile/package.nix index 5299fde25113..a7de444b968a 100644 --- a/pkgs/tools/misc/radeon-profile/default.nix +++ b/pkgs/by-name/ra/radeon-profile/package.nix @@ -2,10 +2,7 @@ lib, stdenv, fetchFromGitHub, - qmake, - wrapQtAppsHook, - qtbase, - qtcharts, + libsForQt5, libxrandr, libdrm, }: @@ -16,12 +13,12 @@ stdenv.mkDerivation rec { version = "20200824"; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtcharts + libsForQt5.qtbase + libsForQt5.qtcharts libxrandr libdrm ]; diff --git a/pkgs/by-name/rg/rgx/package.nix b/pkgs/by-name/rg/rgx/package.nix index 9b3732a8f1f8..905a7798c861 100644 --- a/pkgs/by-name/rg/rgx/package.nix +++ b/pkgs/by-name/rg/rgx/package.nix @@ -8,22 +8,29 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rgx"; - version = "0.12.1"; + version = "0.12.3"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "brevity1swos"; repo = "rgx"; tag = "v${finalAttrs.version}"; - hash = "sha256-05WEJ3gefPjBHuMXWhr135VtYnbteZapiAtNKwm4wxU="; + hash = "sha256-01JnU+vDkEIYrEhl9KUGZx2+p2Xw76qjI9mpGsaTPLA="; }; - cargoHash = "sha256-CSGuf2jOjyLBfD0Fv3G01FioiyiXX8Bx/IiCkIBWbsQ="; + cargoHash = "sha256-ZjfLh+vYlKP0JLxLvnkB9Qr3aQ/Oki/KvQmjCF7G1Mg="; buildInputs = [ pcre2 ]; buildFeatures = [ "pcre2-engine" ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v(\\d+\\.\\d+\\.\\d+)$" + ]; + }; meta = { homepage = "https://github.com/brevity1swos/rgx"; @@ -33,7 +40,10 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 # or mit ]; - maintainers = with lib.maintainers; [ Cameo007 ]; + maintainers = with lib.maintainers; [ + Cameo007 + kybe236 + ]; mainProgram = "rgx"; }; }) diff --git a/pkgs/by-name/sa/satisfactorymodmanager/package.nix b/pkgs/by-name/sa/satisfactorymodmanager/package.nix index 45d4e79f1530..3172ab24f6c2 100644 --- a/pkgs/by-name/sa/satisfactorymodmanager/package.nix +++ b/pkgs/by-name/sa/satisfactorymodmanager/package.nix @@ -17,13 +17,13 @@ let in buildGoModule rec { pname = "satisfactorymodmanager"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "satisfactorymodding"; repo = "SatisfactoryModManager"; tag = "v${version}"; - hash = "sha256-VgLlMlCPLT8lu2tn+lrkqVCp2eoYhtyNnrWGGqesMd0="; + hash = "sha256-DayFHFNKmYgH+LfXbQ/7h57Rw0iqtu3/snbyDd/EfkI="; }; patches = [ diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index 2a5af425585d..9b0be766898d 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2026-05-12"; + version = "0-unstable-2026-05-28"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "7988b5e84c31616200ee2ffd2347386c6b3165a8"; - hash = "sha256-Jwa+YJcEy+6Ye0ILttv5iAmJ9t0mIk8e5XXEuA1nFjE="; + rev = "cbdb3678270cf5bf14a127934fd7ab332ecd3cbc"; + hash = "sha256-bjsss+ifkCqJKzirqbBS5PtD80fG9JPY6yPiHsf9DO8="; }; dontBuild = true; diff --git a/pkgs/by-name/se/searchix/package.nix b/pkgs/by-name/se/searchix/package.nix index 65189c897c82..33b27dac411f 100644 --- a/pkgs/by-name/se/searchix/package.nix +++ b/pkgs/by-name/se/searchix/package.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, fetchFromGitHub, versionCheckHook, nix-update-script, @@ -20,8 +20,7 @@ buildGoModule (finalAttrs: { pname = "searchix"; version = "0.4.7"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "alinnow"; repo = "searchix"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index 5bc40b4f28e4..1dc10fc3c775 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -69,13 +69,13 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "servo"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "servo"; repo = "servo"; tag = "v${finalAttrs.version}"; - hash = "sha256-DnjtKizYwadBYDqafFDuE/DRIjCqnK/L95zV0Fv0Xhc="; + hash = "sha256-zZitnAiexoroKx3TMu3sB0KDvIsBcT7Krwa6lJqY4yw="; # Breaks reproducibility depending on whether the picked commit # has other ref-names or not, which may change over time, i.e. with # "ref-names: HEAD -> main" as long this commit is the branch HEAD @@ -85,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-TJXWscTnsXxaWTfn7BugVMPamXOsyHXQhJskX04X7Zw="; + cargoHash = "sha256-hZBI3Vte/FvN7qJy2VGF0LVQIFSWa931BFFbaUfN814="; # set `HOME` to a temp dir for write access # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) @@ -171,6 +171,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { # undefined libmozjs_sys symbols during linking broken = stdenv.hostPlatform.isDarwin; + changelog = "https://github.com/servo/servo/releases/tag/${finalAttrs.src.tag}"; description = "Embeddable, independent, memory-safe, modular, parallel web rendering engine"; homepage = "https://servo.org"; license = lib.licenses.mpl20; diff --git a/pkgs/development/libraries/structuresynth/default.nix b/pkgs/by-name/st/structuresynth/package.nix similarity index 95% rename from pkgs/development/libraries/structuresynth/default.nix rename to pkgs/by-name/st/structuresynth/package.nix index 23b44fb28d19..226fd556b304 100644 --- a/pkgs/development/libraries/structuresynth/default.nix +++ b/pkgs/by-name/st/structuresynth/package.nix @@ -4,8 +4,7 @@ fetchFromGitHub, fetchpatch, cmake, - qtbase, - wrapQtAppsHook, + libsForQt5, libGL, libGLU, }: @@ -44,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGL libGLU - qtbase + libsForQt5.qtbase ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; meta = { diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/by-name/su/subsurface/package.nix similarity index 91% rename from pkgs/applications/misc/subsurface/default.nix rename to pkgs/by-name/su/subsurface/package.nix index 7922e5fd0eb6..fbc41a4b5e54 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/by-name/su/subsurface/package.nix @@ -5,9 +5,7 @@ autoreconfHook, writeShellScriptBin, cmake, - wrapQtAppsHook, pkg-config, - qmake, curl, grantlee, hidapi, @@ -18,12 +16,7 @@ libxslt, libzip, zlib, - qtbase, - qtconnectivity, - qtlocation, - qtsvg, - qttools, - qtpositioning, + libsForQt5, libxcomposite, bluez, writeScript, @@ -84,17 +77,17 @@ let hash = "sha256-PfSLFQeCeVNcCVDCZehxyNLQGT6gff5jNxMW8lAaP8c="; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ libsForQt5.qmake ]; buildInputs = [ - qtbase - qtlocation + libsForQt5.qtbase + libsForQt5.qtlocation libxcomposite ]; dontWrapQtApps = true; - pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins"; + pluginsSubdir = "lib/qt-${libsForQt5.qtbase.qtCompatVersion}/plugins"; installPhase = '' mkdir -p $out $(dirname ${pluginsSubdir}/geoservices) @@ -138,16 +131,16 @@ stdenv.mkDerivation { libxml2 libxslt libzip - qtbase - qtconnectivity - qtsvg - qttools - qtpositioning + libsForQt5.qtbase + libsForQt5.qtconnectivity + libsForQt5.qtsvg + libsForQt5.qttools + libsForQt5.qtpositioning ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook pkg-config ]; diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix index 085c68528982..b871e9db42b9 100644 --- a/pkgs/by-name/te/tenacity/package.nix +++ b/pkgs/by-name/te/tenacity/package.nix @@ -33,7 +33,6 @@ libopus, ffmpeg_7, soundtouch, - pcre, portaudio, linuxHeaders, at-spi2-core, @@ -150,7 +149,6 @@ stdenv.mkDerivation (finalAttrs: { libvorbis lilv lv2 - pcre portaudio serd sord diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/by-name/ti/tiled/package.nix similarity index 87% rename from pkgs/applications/editors/tiled/default.nix rename to pkgs/by-name/ti/tiled/package.nix index 2e87b827843d..51178cec800d 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/by-name/ti/tiled/package.nix @@ -1,28 +1,22 @@ { lib, stdenv, - env, fetchFromGitHub, pkg-config, qbs, - wrapQtAppsHook, - qtbase, - qtdeclarative, - qttools, - qtwayland, - qtsvg, + libsForQt5, zlib, zstd, libGL, }: let - qtEnv = env "tiled-qt-env" [ - qtbase - qtdeclarative - qtsvg - qttools - qtwayland + qtEnv = libsForQt5.env "tiled-qt-env" [ + libsForQt5.qtbase + libsForQt5.qtdeclarative + libsForQt5.qtsvg + libsForQt5.qttools + libsForQt5.qtwayland ]; in @@ -40,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config qbs - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ qtEnv diff --git a/pkgs/by-name/to/tonearm/package.nix b/pkgs/by-name/to/tonearm/package.nix index d63aa6788920..8a9b1fe44c04 100644 --- a/pkgs/by-name/to/tonearm/package.nix +++ b/pkgs/by-name/to/tonearm/package.nix @@ -2,7 +2,7 @@ buildGo126Module, cairo, copyDesktopItems, - fetchFromGitea, + fetchFromCodeberg, gdk-pixbuf, glib, glib-networking, @@ -41,8 +41,7 @@ in buildGo126Module (finalAttrs: { pname = "tonearm"; version = "1.4.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dergs"; repo = "Tonearm"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/up/uptime-kuma/package.nix b/pkgs/by-name/up/uptime-kuma/package.nix index c498932d617d..f4317ee785f6 100644 --- a/pkgs/by-name/up/uptime-kuma/package.nix +++ b/pkgs/by-name/up/uptime-kuma/package.nix @@ -9,16 +9,16 @@ buildNpmPackage (finalAttrs: { pname = "uptime-kuma"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; tag = finalAttrs.version; - hash = "sha256-TJCpmUT/E7Il9h7UM1rs2s8l2Vey+X3PZToFLTgxFdA="; + hash = "sha256-iqkf9/UAQOnSA+nncK/fmjbqZpIQeUmigI/78m5qKrM="; }; - npmDepsHash = "sha256-FnUjHi0l/WDBX0T65bomElcEG+mRc81n/s22npeHnlM="; + npmDepsHash = "sha256-chvykBfnARLto+Il9gumm6UTRSTPPBjg5pj4yGFiOcg="; patches = [ # Fixes the permissions of the database being not set correctly diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 0e65b7c55092..3c091d8e69b8 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.143.0"; + version = "1.144.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-K5NsQQ+r1XoOCfeYzZP3+2wdDpGNqWZLpe1hGqx11jA="; + hash = "sha256-K8RCFHVL+E8w0webp6Bg3dma7I32iGXx9gCKnFp4d0g="; }; vendorHash = null; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/by-name/vi/vite/package.nix similarity index 91% rename from pkgs/applications/science/misc/vite/default.nix rename to pkgs/by-name/vi/vite/package.nix index 1bdabe3875d6..845c479a5b34 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/by-name/vi/vite/package.nix @@ -4,14 +4,11 @@ fetchpatch, lib, cmake, - qtbase, - qttools, - qtcharts, libGLU, libGL, glm, glew, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation (finalAttrs: { @@ -36,12 +33,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtcharts + libsForQt5.qtbase + libsForQt5.qtcharts libGLU libGL glm diff --git a/pkgs/by-name/wa/wayle/package.nix b/pkgs/by-name/wa/wayle/package.nix index 266cd09b3ee8..2cf3af213b01 100644 --- a/pkgs/by-name/wa/wayle/package.nix +++ b/pkgs/by-name/wa/wayle/package.nix @@ -21,7 +21,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wayle"; - version = "0.3.0"; + version = "0.4.1"; __structuredAttrs = true; strictDeps = true; @@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "wayle-rs"; repo = "wayle"; tag = "v${finalAttrs.version}"; - hash = "sha256-4hnbv31BWu6KbdSHphHnpl80R0ByxS0RxsM5uqtNnCU="; + hash = "sha256-gTvjGvS9jWijB7xVMTZZkltGfqreKtXanZlt1ZgFiC4="; }; - cargoHash = "sha256-sXoqNF7hzE97PkRMBnxVFNPa92CgD5gYeMd0RmzPJzY="; + cargoHash = "sha256-iMtX/MNPzjXJG9ebDDdyQrLeqmW9idoty1vjhGLjT/E="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/we/wesnoth/package.nix b/pkgs/by-name/we/wesnoth/package.nix index 5f07b6c6f07d..c1b67c128435 100644 --- a/pkgs/by-name/we/wesnoth/package.nix +++ b/pkgs/by-name/we/wesnoth/package.nix @@ -17,7 +17,6 @@ fribidi, dbus, libpng, - pcre, openssl, icu, lua5_4, @@ -71,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { fribidi dbus libpng - pcre openssl icu lua diff --git a/pkgs/applications/science/math/wolfram-engine/l10ns.nix b/pkgs/by-name/wo/wolfram-engine/l10ns.nix similarity index 100% rename from pkgs/applications/science/math/wolfram-engine/l10ns.nix rename to pkgs/by-name/wo/wolfram-engine/l10ns.nix diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/by-name/wo/wolfram-engine/package.nix similarity index 98% rename from pkgs/applications/science/math/wolfram-engine/default.nix rename to pkgs/by-name/wo/wolfram-engine/package.nix index e8a83f45b3d7..0dcd79b98ea8 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/by-name/wo/wolfram-engine/package.nix @@ -34,7 +34,7 @@ lang ? "en", libGL, libGLU, - wrapQtAppsHook, + libsForQt5, }: let @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook installShellFiles - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix b/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix index 674dcc547a1b..49c5d473eceb 100644 --- a/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix +++ b/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix @@ -5,16 +5,16 @@ }: buildGoModule (finalAttrs: { pname = "woodpecker-pipeline-transform"; - version = "0.3.0"; + version = "1.0.0"; src = fetchFromCodeberg { owner = "lafriks"; repo = "woodpecker-pipeline-transform"; rev = "v${finalAttrs.version}"; - hash = "sha256-5bdNtVjk7TBoS0Z026th674ZXCRRc3DbtVOLl+acKhQ="; + hash = "sha256-UXQ+b3SI+MO0T993hslQaRVMdHdPt9RnjyhfmLtooAU="; }; - vendorHash = "sha256-4JRSrkxH8/NlSwUk6KagC5+mx+UXSLvo1thSRciAewc="; + vendorHash = "sha256-NE4KUbYA19YJPQW9quSYgm0exj3lToj9Zkiv05TgyOI="; meta = { description = "Utility to convert different pipelines to Woodpecker CI pipelines"; diff --git a/pkgs/development/gnuradio-modules/fosphor/default.nix b/pkgs/development/gnuradio-modules/fosphor/default.nix index eafe57d57583..34fba81b1341 100644 --- a/pkgs/development/gnuradio-modules/fosphor/default.nix +++ b/pkgs/development/gnuradio-modules/fosphor/default.nix @@ -37,6 +37,12 @@ mkDerivation { }; disabled = gnuradioOlder "3.9" || gnuradioAtLeast "3.11"; + # Boost 1.89 removed the boost_system stub library. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'COMPONENTS system chrono thread' 'COMPONENTS chrono thread' + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix deleted file mode 100644 index 2704d3a718f5..000000000000 --- a/pkgs/development/libraries/grantlee/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - qtbase, - cmake, - wrapQtAppsHook, -}: - -stdenv.mkDerivation rec { - pname = "grantlee"; - version = "5.3.1"; - - src = fetchFromGitHub { - owner = "steveire"; - repo = "grantlee"; - rev = "v${version}"; - hash = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY="; - }; - - nativeBuildInputs = [ - cmake - wrapQtAppsHook - ]; - buildInputs = [ qtbase ]; - - meta = { - description = "Libraries for text templating with Qt"; - longDescription = '' - Grantlee is a set of Free Software libraries written using the Qt framework. Currently two libraries are shipped with Grantlee: Grantlee Templates and Grantlee TextDocument. - The goal of Grantlee Templates is to make it easier for application developers to separate the structure of documents from the data they contain, opening the door for theming and advanced generation of other text such as code. - The syntax uses the syntax of the Django template system, and the core design of Django is reused in Grantlee. - ''; - - homepage = "https://github.com/steveire/grantlee"; - license = lib.licenses.lgpl21Plus; - }; -} diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 97a992d11795..f199025d9c34 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1807,6 +1807,43 @@ final: prev: { } ) { }; + lrexlib-pcre2 = callPackage ( + { + buildLuarocksPackage, + fetchFromGitHub, + fetchurl, + luaOlder, + }: + buildLuarocksPackage { + pname = "lrexlib-pcre2"; + version = "2.9.2-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/lrexlib-pcre2-2.9.2-1.rockspec"; + sha256 = "181878m8gq9wl7c4h9rsq1iig70n9rmyfbj86swz1v4vi7s7ks9p"; + }).outPath; + src = fetchFromGitHub { + owner = "rrthomas"; + repo = "lrexlib"; + rev = "rel-2-9-2"; + hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/rrthomas/lrexlib"; + maintainers = with lib.maintainers; [ wishstudio ]; + license.fullName = "MIT/X11"; + description = "Regular expression library binding (PCRE2 flavour)."; + longDescription = '' + Lrexlib is a regular expression library for Lua 5.1-5.4, which + provides bindings for several regular expression libraries. + This rock provides the PCRE2 bindings.''; + }; + } + ) { }; + lrexlib-posix = callPackage ( { buildLuarocksPackage, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 4ae9c0eb5dc6..c8d4f7c39424 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -45,6 +45,7 @@ openldap, openssl, pcre, + pcre2, pkg-config, readline, ripgrep, @@ -435,6 +436,15 @@ in ]; }; + lrexlib-pcre2 = prev.lrexlib-pcre2.overrideAttrs { + externalDeps = [ + { + name = "PCRE2"; + dep = pcre2; + } + ]; + }; + lrexlib-posix = prev.lrexlib-posix.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ (lib.getDev libc) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 4206059e92cc..dee8b59cae21 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,14 +26,14 @@ buildPythonPackage (finalAttrs: { pname = "aioesphomeapi"; - version = "45.0.2"; + version = "44.24.1"; # must track the major version that home-assistant pins pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${finalAttrs.version}"; - hash = "sha256-ajucVk5yF0akOIfBX28sjOndpmHQumJBUp5jnq//B+M="; + hash = "sha256-D2MJISyHz4s0Rk6wGMrYVJHfvA/Xbw2UEp2KqTqS2nA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dramatiq-eager-broker/default.nix b/pkgs/development/python-modules/dramatiq-eager-broker/default.nix index ae93a5c9535c..9a441bca8c99 100644 --- a/pkgs/development/python-modules/dramatiq-eager-broker/default.nix +++ b/pkgs/development/python-modules/dramatiq-eager-broker/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, uv-build, dramatiq, pytestCheckHook, @@ -13,8 +13,7 @@ buildPythonPackage rec { pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "yaal"; repo = "dramatiq-eager-broker"; tag = version; diff --git a/pkgs/development/python-modules/itables/default.nix b/pkgs/development/python-modules/itables/default.nix index 7b75a05e5e76..b367545cb49b 100644 --- a/pkgs/development/python-modules/itables/default.nix +++ b/pkgs/development/python-modules/itables/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "itables"; - version = "2.7.3"; + version = "2.8.0"; # itables has 4 different node packages, each with their own # package-lock.json, and partially depending on each other. @@ -39,7 +39,7 @@ buildPythonPackage rec { # the source tarball from pypi, which includes the javascript bundle already. src = fetchPypi { inherit pname version; - hash = "sha256-epaA2iCqZJWGgmXTl/GozAPY/bxZJ2DT3bELTWCB/3M="; + hash = "sha256-uDJfvb0GEATyHqYkJZROXnGmTCpkhJlk4KSwAM3nA2I="; }; pyproject = true; diff --git a/pkgs/development/python-modules/rpatool/default.nix b/pkgs/development/python-modules/rpatool/default.nix index 6d689a5dd2a5..0c77d9aaeed3 100644 --- a/pkgs/development/python-modules/rpatool/default.nix +++ b/pkgs/development/python-modules/rpatool/default.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, buildPythonPackage, setuptools, }: @@ -9,8 +9,7 @@ buildPythonPackage rec { pname = "rpatool"; version = "1.0.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "shiz"; repo = "rpatool"; tag = "v${version}"; diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index 92b5c2e7d75b..3693d485ae27 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -6,14 +6,15 @@ }: let + inherit (home-assistant) python3Packages; + manifestRequirementsCheckHook = import ./manifest-requirements-check-hook.nix { - inherit makeSetupHook; - inherit (home-assistant) python; + inherit makeSetupHook python3Packages; }; in lib.extendMkDerivation { - constructDrv = home-assistant.python.pkgs.buildPythonPackage; + constructDrv = python3Packages.buildPythonPackage; excludeDrvArgNames = [ "meta" "nativeBuildInputs" @@ -52,7 +53,7 @@ lib.extendMkDerivation { ''; nativeBuildInputs = - with home-assistant.python.pkgs; + with home-assistant.python3Packages; [ manifestRequirementsCheckHook packaging diff --git a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix index 757fcf33a633..bb830fefabe4 100644 --- a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix +++ b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix @@ -1,12 +1,12 @@ { - python, + python3Packages, makeSetupHook, }: makeSetupHook { name = "manifest-check-hook"; substitutions = { - pythonCheckInterpreter = python.interpreter; + pythonCheckInterpreter = python3Packages.python.interpreter; checkManifest = ./check_manifest.py; }; } ./manifest-requirements-check-hook.sh diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md index 7000d17c477c..b8b1fed85764 100644 --- a/pkgs/servers/home-assistant/custom-components/README.md +++ b/pkgs/servers/home-assistant/custom-components/README.md @@ -12,7 +12,7 @@ function arguments. Pass them into `dependencies` for them to be available to Home Assistant. Out-of-tree components need to use Python packages from -`home-assistant.python.pkgs` as to not introduce conflicting package +`home-assistant.python3Pacakges` as to not introduce conflicting package versions into the Python environment. diff --git a/pkgs/servers/home-assistant/custom-components/frigate/package.nix b/pkgs/servers/home-assistant/custom-components/frigate/package.nix index d2c28378a335..72a8a23c2e98 100644 --- a/pkgs/servers/home-assistant/custom-components/frigate/package.nix +++ b/pkgs/servers/home-assistant/custom-components/frigate/package.nix @@ -48,8 +48,8 @@ buildHomeAssistantComponent rec { pytest-timeout pytestCheckHook ] - ++ (homeassistant.getPackages "mqtt" homeassistant.python.pkgs) - ++ (homeassistant.getPackages "stream" homeassistant.python.pkgs); + ++ (homeassistant.getPackages "mqtt" homeassistant.python3Packages) + ++ (homeassistant.getPackages "stream" homeassistant.python3Packages); disabledTests = [ # https://github.com/blakeblackshear/frigate-hass-integration/issues/922 diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix index 2c013f73fb99..c9f8fb84a1fd 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix @@ -32,7 +32,7 @@ buildHomeAssistantComponent rec { pytest-cov-stub pytestCheckHook ] - ++ home-assistant.getPackages "camera" home-assistant.python.pkgs; + ++ home-assistant.getPackages "camera" home-assistant.python3Packages; disabledTests = [ # tests try to open sockets diff --git a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix index b3b4fb99e2d4..4a13ef623d24 100644 --- a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix +++ b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix @@ -43,7 +43,7 @@ buildHomeAssistantComponent rec { aioresponses pytest-freezegun ] - ++ home-assistant.getPackages "camera" home-assistant.python.pkgs; + ++ home-assistant.getPackages "camera" home-assistant.python3Packages; preCheck = '' patchShebangs --build tests/setup.sh diff --git a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix index e27df2137651..e0184650f843 100644 --- a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix +++ b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix @@ -36,7 +36,7 @@ buildHomeAssistantComponent rec { home-assistant pytestCheckHook ] - ++ (home-assistant.getPackages "stream" home-assistant.python.pkgs); + ++ (home-assistant.getPackages "stream" home-assistant.python3Packages); meta = { changelog = "https://github.com/AlexxIT/YandexStation/releases/tag/${src.tag}"; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e930d470b54a..7b168d613d2a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, fetchPypi, fetchpatch, - python314, + python314Packages, replaceVars, ffmpeg-headless, inetutils, @@ -244,10 +244,9 @@ let }) ]; - python = python314.override { - self = python; - packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); - }; + python3Packages = python314Packages.overrideScope ( + final: prev: lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]) final prev + ); componentPackages = import ./component-packages.nix; @@ -257,16 +256,18 @@ let getPackages = component: componentPackages.components.${component}; - componentBuildInputs = lib.concatMap (component: getPackages component python.pkgs) extraComponents; + componentBuildInputs = lib.concatMap ( + component: getPackages component python3Packages + ) extraComponents; # Ensure that we are using a consistent package set - extraBuildInputs = extraPackages python.pkgs; + extraBuildInputs = extraPackages python3Packages; # Don't forget to run update-component-packages.py after updating hassVersion = "2026.5.4"; in -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "homeassistant"; version = assert (componentPackages.version == hassVersion); @@ -274,7 +275,7 @@ python.pkgs.buildPythonApplication rec { pyproject = true; # check REQUIRED_PYTHON_VER in homeassistant/const.py - disabled = python.pythonOlder "3.14"; + disabled = python3Packages.pythonOlder "3.14"; # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; @@ -293,7 +294,7 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-o5S6rnOTqzPLZpMBxgmp9IpmLlEHLvHTH68ql2EkVbI="; }; - build-system = with python.pkgs; [ + build-system = with python3Packages; [ setuptools ]; @@ -345,7 +346,7 @@ python.pkgs.buildPythonApplication rec { "uv" ]; - dependencies = with python.pkgs; [ + dependencies = with python3Packages; [ # Mirror what gets installed for Home Assistant Container, which means # installing what is in requirements.txt. The PEP517 specification gets # embedded in wheel metadata but only represents a subset. @@ -419,7 +420,7 @@ python.pkgs.buildPythonApplication rec { # upstream only tests on Linux, so do we. doCheck = stdenv.hostPlatform.isLinux; - requirementsTest = with python.pkgs; [ + requirementsTest = with python3Packages; [ # test infrastructure (selectively from requirement_test.txt) freezegun pytest-asyncio @@ -438,7 +439,7 @@ python.pkgs.buildPythonApplication rec { nativeCheckInputs = requirementsTest ++ [ versionCheckHook ] - ++ (with python.pkgs; [ + ++ (with python3Packages; [ # Used in tests/non_packaged_scripts/test_alexa_locales.py beautifulsoup4 # Used in tests/scripts/test_check_config.py @@ -446,7 +447,7 @@ python.pkgs.buildPythonApplication rec { # Used in tests/helpers/test_httpx_client.py h2 ]) - ++ lib.concatMap (component: getPackages component python.pkgs) [ + ++ lib.concatMap (component: getPackages component python3Packages) [ # some components are needed even if tests in tests/components are disabled "frontend" "hue" @@ -504,12 +505,12 @@ python.pkgs.buildPythonApplication rec { availableComponents extraComponents getPackages - python + python3Packages supportedComponentsWithTests ; - pythonPath = python.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs); - frontend = python.pkgs.home-assistant-frontend; - intents = python.pkgs.home-assistant-intents; + pythonPath = python3Packages.makePythonPath (componentBuildInputs ++ extraBuildInputs); + frontend = python3Packages.home-assistant-frontend; + intents = python3Packages.home-assistant-intents; tests = { nixos = nixosTests.home-assistant; components = callPackage ./tests.nix { }; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index b91aba91147f..7273bc2de63a 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "2026.5.4"; pyproject = true; - disabled = python.version != home-assistant.python.version; + disabled = python.version != home-assistant.python3Packages.python.version; src = fetchFromGitHub { owner = "KapJI"; diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index c1c60a74c2d8..1c413a38b2a1 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -5,11 +5,11 @@ }: let - getComponentDeps = component: home-assistant.getPackages component home-assistant.python.pkgs; + getComponentDeps = component: home-assistant.getPackages component home-assistant.python3Packages; inherit (lib) concatMap; # some components' tests have additional dependencies - extraCheckInputs = with home-assistant.python.pkgs; { + extraCheckInputs = with home-assistant.python3Packages; { alexa = concatMap getComponentDeps [ "cloud" "frontend" @@ -185,7 +185,7 @@ lib.listToAttrs ( nativeCheckInputs = old.requirementsTest - ++ home-assistant.getPackages component home-assistant.python.pkgs + ++ home-assistant.getPackages component home-assistant.python3Packages ++ extraCheckInputs.${component} or [ ]; disabledTests = extraDisabledTests.${component} or [ ]; diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 484333b1fdfa..83cffd855342 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -34,7 +34,7 @@ from rich.console import Console from rich.table import Table COMPONENT_PREFIX = "homeassistant.components" -PKG_SET = "home-assistant.python.pkgs" +PKG_SET = "home-assistant.python3Packages" # If some requirements are matched by multiple or no Python packages, the # following can be used to choose the correct one diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 237d9282846f..21f291023b42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2783,8 +2783,6 @@ with pkgs; } ); - mytetra = libsForQt5.callPackage ../applications/office/mytetra { }; - nerd-fonts = recurseIntoAttrs (callPackage ../data/fonts/nerd-fonts { }); maple-mono = recurseIntoAttrs (callPackage ../data/fonts/maple-font { }); @@ -2874,8 +2872,6 @@ with pkgs; nwdiag = with python3Packages; toPythonApplication nwdiag; - ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { }; - ola = callPackage ../applications/misc/ola { protobuf = protobuf_21; }; @@ -2886,8 +2882,6 @@ with pkgs; open-interpreter = with python3Packages; toPythonApplication open-interpreter; - openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { }; - openmvs = callPackage ../applications/science/misc/openmvs { inherit (llvmPackages) openmp; }; @@ -3060,8 +3054,6 @@ with pkgs; po4a = perlPackages.Po4a; - proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { }; - pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot; pyinfra = with python3Packages; toPythonApplication pyinfra; @@ -3084,14 +3076,8 @@ with pkgs; mpi = openmpi; # this attribute should used to build MPI applications - qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; - - qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { }; - quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota; - radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { }; - rainbowstream = with python3.pkgs; toPythonApplication rainbowstream; rapidgzip = with python3Packages; toPythonApplication rapidgzip; @@ -3200,8 +3186,6 @@ with pkgs; strip-nondeterminism = perlPackages.strip-nondeterminism; - subsurface = libsForQt5.callPackage ../applications/misc/subsurface { }; - sumorobot-manager = python3Packages.callPackage ../applications/science/robotics/sumorobot-manager { }; @@ -3248,8 +3232,6 @@ with pkgs; extraFonts = true; }; - tiled = libsForQt5.callPackage ../applications/editors/tiled { }; - tinc = callPackage ../tools/networking/tinc { }; tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; @@ -6265,8 +6247,6 @@ with pkgs; gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer { }); - grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; - glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc; # Not moved to aliases while we decide if we should split the package again. @@ -6557,8 +6537,6 @@ with pkgs; libmicrohttpd = libmicrohttpd_1_0; - libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { }; - libpeas = callPackage ../development/libraries/libpeas { }; libpeas2 = callPackage ../development/libraries/libpeas/2.x.nix { }; @@ -6937,8 +6915,6 @@ with pkgs; pcre2 = callPackage ../development/libraries/pcre2 { }; - pdfhummus = libsForQt5.callPackage ../development/libraries/pdfhummus { }; - inherit (callPackage ../development/libraries/physfs { }) @@ -7008,8 +6984,6 @@ with pkgs; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; - qdjango = libsForQt5.callPackage ../development/libraries/qdjango { }; - quartoMinimal = quarto.override { rWrapper = null; python3 = null; @@ -7234,8 +7208,6 @@ with pkgs; streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix { }; - structuresynth = libsForQt5.callPackage ../development/libraries/structuresynth { }; - szurubooru = callPackage ../servers/web-apps/szurubooru { }; tclap = tclap_1_2; @@ -7812,7 +7784,7 @@ with pkgs; lib.makeExtensible ( self: lib.packagesFromDirectoryRecursive { - inherit (home-assistant.python.pkgs) callPackage; + inherit (home-assistant.python3Packages) callPackage; directory = ../servers/home-assistant/custom-components; } ) @@ -7909,8 +7881,6 @@ with pkgs; ]; }; - mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { }; - moodle = callPackage ../servers/web-apps/moodle { }; moodle-utils = callPackage ../servers/web-apps/moodle/moodle-utils.nix { }; @@ -8868,8 +8838,6 @@ with pkgs; activitywatch = callPackage ../applications/office/activitywatch/wrapper.nix { }; - masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; - inherit ({ pdfstudio2021 = callPackage ../applications/misc/pdfstudio { year = "2021"; }; @@ -9304,12 +9272,8 @@ with pkgs; m32edit = callPackage ../applications/audio/midas/m32edit.nix { }; - manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; - minari = python3Packages.toPythonApplication python3Packages.minari; - molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; - graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; }; graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat; @@ -9512,10 +9476,6 @@ with pkgs; fftw = fftwSinglePrec; }; - lemonbar = callPackage ../applications/window-managers/lemonbar { }; - - lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; - libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { }; libreoffice = hiPrio libreoffice-still; @@ -9607,8 +9567,6 @@ with pkgs; lua = lua5; }; - moolticute = libsForQt5.callPackage ../applications/misc/moolticute { }; - mopidyPackages = recurseIntoAttrs ( callPackages ../applications/audio/mopidy { python = python3; @@ -9834,8 +9792,6 @@ with pkgs; qbittorrent-enhanced-nox = qbittorrent-enhanced.override { guiSupport = false; }; - qelectrotech = libsForQt5.callPackage ../applications/misc/qelectrotech { }; - qemu-python-utils = python3Packages.toPythonApplication ( python3Packages.qemu.override { fuseSupport = true; @@ -9854,8 +9810,6 @@ with pkgs; wrapQemuBinfmtP = callPackage ../by-name/qe/qemu/binfmt-p-wrapper.nix { }; - qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; - qmplay2-qt5 = qmplay2.override { qtVersion = "5"; }; qmplay2-qt6 = qmplay2.override { qtVersion = "6"; }; @@ -10096,6 +10050,7 @@ with pkgs; thunderbird-bin = thunderbird-latest-bin; thunderbird-latest-bin = wrapThunderbird thunderbird-latest-bin-unwrapped { pname = "thunderbird-bin"; + libName = "thunderbird-bin-${thunderbird-latest-bin-unwrapped.version}"; }; thunderbird-latest-bin-unwrapped = callPackage ../applications/networking/mailreaders/thunderbird-bin @@ -10104,6 +10059,7 @@ with pkgs; }; thunderbird-esr-bin = wrapThunderbird thunderbird-esr-bin-unwrapped { pname = "thunderbird-esr-bin"; + libName = "thunderbird-bin-${thunderbird-esr-bin-unwrapped.version}"; }; thunderbird-esr-bin-unwrapped = callPackage ../applications/networking/mailreaders/thunderbird-bin { generated = import ../applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix; @@ -11061,8 +11017,6 @@ with pkgs; trilinos-mpi = trilinos.override { withMPI = true; }; - wolfram-engine = libsForQt5.callPackage ../applications/science/math/wolfram-engine { }; - wolfram-for-jupyter-kernel = callPackage ../applications/editors/jupyter-kernels/wolfram { }; ### SCIENCE/MOLECULAR-DYNAMICS @@ -11329,8 +11283,6 @@ with pkgs; python3 = python312; # fails to build otherwise }; - vite = libsForQt5.callPackage ../applications/science/misc/vite { }; - ### SCIENCE / PHYSICS hepmc3 = callPackage ../development/libraries/physics/hepmc3 { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 30978cf9c705..ba53d10159e4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1785,10 +1785,10 @@ with self; ArchiveTar = buildPerlPackage { pname = "Archive-Tar"; - version = "3.02"; + version = "3.10"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-3.02.tar.gz"; - hash = "sha256-gWM8h/c3hGGD01wPTJ1ALalHqEa0iBswzObZ6+PInRk="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-3.10.tar.gz"; + hash = "sha256-irvDaMxHIwjiqWDEpOi258pJJFefxGPH+oemplbITlY="; }; meta = { description = "Manipulates TAR archives"; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 351bae3541fa..d149e8cf82da 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -74,7 +74,7 @@ makeScopeWithSplicing' { qgpgme = callPackage ../development/libraries/qgpgme { }; - grantlee = callPackage ../development/libraries/grantlee/5 { }; + grantlee = pkgs.grantlee; herqq = callPackage ../by-name/he/herqq/package.nix { };