From 71499e0374cc468990c632ac0047ec614065c2ec Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Thu, 27 May 2021 17:03:16 +1000 Subject: [PATCH 01/95] singularity: 3.7.3 -> 3.7.4 (cherry picked from commit 044ba9b560ac3ddf74e2909b1a2810e1b66de6fa) --- pkgs/applications/virtualization/singularity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index fe66df0c6d9..2610e1f0fc6 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.7.3"; + version = "3.7.4"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-ZmfriHXStm1zUE9AyVa0KxNRdE9IjRZCBDdiFdiF2lw="; + sha256 = "sha256-wmY2movydH9E4HWYWMP8OyMluXWogYsmaPC5exJNAWQ="; }; goPackagePath = "github.com/sylabs/singularity"; From 4b2920f7d726f43e201e04ee321884bd1a29eecb Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 31 May 2021 21:50:53 +0900 Subject: [PATCH 02/95] firefox-bin: 88.0.1 -> 89.0 (cherry picked from commit bb2070754cc5fab4a4c40ba4fc5915dd470c592c) --- .../browsers/firefox-bin/release_sources.nix | 778 +++++++++--------- 1 file changed, 389 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index db1b6eccefa..136c2c4c717 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,975 @@ { - version = "88.0.1"; + version = "89.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ach/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ach/firefox-89.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "fbe4ef0bfa83e9e90930de50c565eb7759e5f57dcc3421c09704461e1bab3211"; + sha256 = "f55831518c6d1a590a48093a5737862418b543d3349c6fe0418d378cc78846d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/af/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/af/firefox-89.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "12d3645ba8482adea46ffb3fac4b0da13e6b95987b9a3725c758268f9b7919bb"; + sha256 = "a124ce560aabae43fa0fe7b5c2c88f286839bb01ef94185faae640ce8937afe6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/an/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/an/firefox-89.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "4617ff8785b07993c7c81ad277c08ed3cde61ae64fd2700707b413f52085b5fa"; + sha256 = "f2624d37b96a23d447dc16ea8b8a627db2cb497945d0c4cbe20cc20570d579e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ar/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ar/firefox-89.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "6647d9d711be4cc63ea5a302666dd69be48dcb089884ba0f9855c6cc32ba9beb"; + sha256 = "c01e143107753ea3363e6f8f0ca77c12f9f4803da342578c15c94554ca6d946d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ast/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ast/firefox-89.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0e2e27f7357d2598b681ba029e63fb752f63c557da18b3e1d2a65678528246be"; + sha256 = "d2bfb999bdb31daffee3774ba1f940a84ae5f4ca846a03852181b2ebb5ec9b10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/az/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/az/firefox-89.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "66f48578e7a4ebd2b64c3c11a803bd668aa63d5c72dcac8cb8e5e610ace3c54c"; + sha256 = "61c408e9333730c5cee83c48c8d0e1aa20c62b76e32159b68d0e529e92cf15d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/be/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/be/firefox-89.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "050da876d2fa8875a57a0246c2d72337f2b386f0a9f429906b5f1933f35edb64"; + sha256 = "5d53d478b0728e9bfc0445e9a9a6373e0105e416ed98f50398fcc8d6466e9690"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/bg/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/bg/firefox-89.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "ff37f9a70ead543dc7b5b36c5c99e3f1bffd474ff154cbba854270793240317f"; + sha256 = "0dce261fd2be11436ab182de4bd78ebf50da9f9cb439d100063e714b2e55cfc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/bn/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/bn/firefox-89.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "cdc0248a70211e73efd73d4c2a202b9d68837f1e9b6eff23c46a114da6a30c45"; + sha256 = "9d1dff74b8ee7d4e81900e079921b06ff332c3db1affe9691a23db74aa2e2990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/br/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/br/firefox-89.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "30cd2111be00e2cf7526910d02b90f0b7440ebc47e76a447ac41ac073797de64"; + sha256 = "db9c9c3db5636d1bc10e3ae627f37c1c55716debaec4e68d9b2e6771801802a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/bs/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/bs/firefox-89.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "2880580aec6a53f9b9341d3d31acf82bba3934d5086eed84649b4ff4d5874ccc"; + sha256 = "202a5b093879193327673a39f0f217323f0c0e2ede9f586fde0fe224b0bc034e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ca-valencia/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ca-valencia/firefox-89.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "81826cc131a301933bbce8b1bd5629265657b27193ab264434fadf4cd1db6b18"; + sha256 = "d607a4d86c66b8aeb74724e29ffdf22d287ba729b7962db19cdc64f6d03a8004"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ca/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ca/firefox-89.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "8ed6ff9b83193b815a9ee3ba066ecd7b9841d1022ce4edcdb0d18ab283c406a7"; + sha256 = "8a2c7d2b455f31b868779cd2254fc130ce4f84f6935f127c0c6a0dae85daabfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/cak/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/cak/firefox-89.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b74da38062d948de36f58f33146e1cfe2a114000c041b3d13863ca4d0fb7b072"; + sha256 = "e631bfdc8a6a71973b16bee03221ee882ac28a289e8ff92ee3319e05c0260d5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/cs/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/cs/firefox-89.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "86ccaa52061c1c0740cf49e9f6566fd64e447c51a2f3d4576341a728631e51d8"; + sha256 = "c08e64765f30591e3b4aeb4721e7f149b299dc19069476d0af453e38b2b68926"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/cy/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/cy/firefox-89.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "2ada972ae4bb948e7968a2e647cabb4e9a0de0f25b878894288e0c456a7c10c0"; + sha256 = "da30c1b07a2c1eb840d87da41cf36b4e0bbdfa2df6f82c9f4562e460a742b9f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/da/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/da/firefox-89.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "d1b75371b0104dc9c845108abe73194675aa59d7034c23fe223e4aee73ad1933"; + sha256 = "8263b20f80c5bad2dcf571c7cd71c0875a41e41550fa4b9062e90de1a544b81e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/de/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/de/firefox-89.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "727e5845111ed3650d71f1a73567a2a08983a60200ecdba51fb56a0818a7c139"; + sha256 = "122d301da28d961efd7418d925a6ed0a99c302c3935f94dff6b36129454d171b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/dsb/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/dsb/firefox-89.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "0c22bee8cce6f437fd656be89f223fd5e5ca9b1103104410902aa54849c1f9a0"; + sha256 = "7f4a167e9ba002628aac487f55d1f8b549257da18abb58938d250b16ae086597"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/el/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/el/firefox-89.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "882791aee0b2d41468199e432aa075f139ff18f7849a8104c5734e98f9064dee"; + sha256 = "51f50c9f3c9c8857d2fd155129ccad90e59343d120514d90c4adba8876547662"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/en-CA/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/en-CA/firefox-89.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "92f2d7fc7f73af9d649d51e99d9a116e1624911a018f10a1d5e98372a70b0390"; + sha256 = "990bd24aed34581e0c477737327867582a2995b6e69f601d4be967d49140be64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/en-GB/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/en-GB/firefox-89.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "b8714d6c55b9daad6aee75aa923efb90ae49298e6da24a6b917aeaf340d9cf7a"; + sha256 = "c56e3405009e405e565fb3dd69b8b6a22894cea9002568b2cf88b820d0f7d6db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/en-US/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/en-US/firefox-89.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "cd2dcac9fb08ab63738b35b143696ce05f42ead465003e6164f7a090ffc72416"; + sha256 = "5011b87e0795de19a05694b06965435c6896c907d51a31631e9c8d427602d159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/eo/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/eo/firefox-89.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "c6cb9b0c77712246307c4753c1af3a73031e7bc8fd519c00bbc9fd57c179e0f7"; + sha256 = "c6554905a466dc9d117bb91aaf0be3e0030467b492d44ef3374f01219d7bf0e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-AR/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/es-AR/firefox-89.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "eb1d036f9610eef44af2d32e758c9a29bfb9bc545033e467efc4f1a42b6a82d2"; + sha256 = "91e72c2251d2740129baac9d34ffa54b8b0631c5951b1b667f4e58d0c86ed1d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-CL/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/es-CL/firefox-89.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "0f485aedeaaba00409cb1967c78206c67e488813599f75f2a4dba9e70843672f"; + sha256 = "b719701fffa142991f78aae717a247c6b5310d9dc4832757a773b077be0bfc16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-ES/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/es-ES/firefox-89.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b529792912d9cb51bb0ff6718e3306433e3ce60d2411eb2096f148356f53dcd1"; + sha256 = "a4153f99eacb4cc4fe647e9285b76800ed1208e988a6ddb148bc4cdefbe23f55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-MX/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/es-MX/firefox-89.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b85b49e105589866a09371258091af3d07b1a6ba9f3e602352d0647dab6d239f"; + sha256 = "fce8b910fe58b8096a36ce28289f8125dc9074c02655ed5df1d1bfd97a67d2e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/et/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/et/firefox-89.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "fc1d6961720be961f92991c1881fdf884629ebeaec9b3dc994b8a554d6c74ce8"; + sha256 = "07165b740a9772c1ac102cdcac3d26aedef5beb6db8b3f222b4bdbd6abdb2fe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/eu/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/eu/firefox-89.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "85479fe2eeea6e87ed42a11447cecb002b454367a1ca5d0474a07a0537bacd06"; + sha256 = "11b35cf208f2568f06181858702ea4471bc040b3be1d2a192c40db431cc02a4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fa/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/fa/firefox-89.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "e6a82eb02c3a55b098137303a634c74a728011a50952842021772d5d98740496"; + sha256 = "a935878e3675c34d85103f3c002ea5fe7f86b12a5298bda38f2d398821ba0c0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ff/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ff/firefox-89.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b0f5370a62f414c469b14cb046ab8da2391325215e4025fc28998f3b7ac2b015"; + sha256 = "13860860e6f60e7ca9f7aadadee36645f7b8a4f1fbd6b9e0a7b3d94f04d77129"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fi/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/fi/firefox-89.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "977bdef5c8c249fb347792553bcc8df45d918847ab8be8acf2c0ed693149f10a"; + sha256 = "c84d9dbfbb89fe5573763ce54b533fd072bf17e22d9c6904dbf52401b635630d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/fr/firefox-89.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "116e04692aa319a97ec8d459006bba6306f47b35ab4851d58c8cb458a41c67b7"; + sha256 = "0e5abac1e39f3234603906c237a0f14b927853668b13f6ef8ea0d74e00407296"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fy-NL/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/fy-NL/firefox-89.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c7ad0294c58dcbfebb086e0831fcf9fe6a97451cedc2c19da5eefc6c288d5196"; + sha256 = "2ecf98f47651abc6f90ca79f98ab0b055b099f500db8cd684c60605e20549878"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ga-IE/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ga-IE/firefox-89.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "8b828caf41bb1ac0b4696a84f5a83d43bb0345cada7877f6889b7b1b057bc167"; + sha256 = "f1dccee366c64afc0a8d9037488cb57be9e6ef544ab4c1bfa3e7d8b7b91cb16d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gd/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/gd/firefox-89.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "877a2c355503b27d80945b81050269ceda6514629b196dbd89158406965b07fb"; + sha256 = "374a47ef2069c6a3dea4ac510ab10592ed48b25715d16d19ebafc3070efc7b11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/gl/firefox-89.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a286beeaf4d40f5b0d37c9323985521ba8f86a67f7f48420e5cf6c461e920b1e"; + sha256 = "393f39cdc555613553d27743e681c07501e253ead1562fd14d2523b1a3249723"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gn/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/gn/firefox-89.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "508c3424921cfce56148199a133e0dd1704ebbdb2d20c5169d23c42ecb5d449e"; + sha256 = "19c207a40e588d072cd056c056583f9745017691aee2caf5aa8e6f78680a53cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gu-IN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/gu-IN/firefox-89.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "2975ba7be697f7592b1f8c8b0f4099b06363a72096935b7483881f62739a37e9"; + sha256 = "ce4db1d47376ed287392b13c959c40dae98e9461428d8f8df5ff8d99730f1f10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/he/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/he/firefox-89.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "06bc66687abc0a4451aa636c9415e066081ff7d80203fc08556a7a590d948d37"; + sha256 = "9ec972022e45ed803c441c68e704874164a3cea4bdb9d26addf23097b3bb40d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hi-IN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hi-IN/firefox-89.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "d80a4be0f997a9dc84509f87160e7f915845c8adae99eeb5e40f704b07fa9ce1"; + sha256 = "dda729303a9183baff446f2a84de68333c9aa3a9d90a34e80548e4f46d84e045"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hr/firefox-89.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "603a831c5f88c6f7a3c3ac7b5236c4818cd89027374ef6fe518012f721ae710b"; + sha256 = "dcd696d7acd7f991591f2f93ab0d94a7c2e7a7d07c5e644792d890fe8c653f4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hsb/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hsb/firefox-89.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3f88023c28b4ed29d5b4cd24db70c5a4aafd661763f17e563fd50a2d52df8e06"; + sha256 = "a3b37e2df58a2ccd6ec422a8c61da35bfb9109c1464c3babedea6ec3be5fbaf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hu/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hu/firefox-89.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0796975d470dd462812babb11089c5686bee7a47c499cf2064a9030386d8205d"; + sha256 = "bfb9a458ab0c80037dce953b4c478765373e79a9368ad267f4da75cf22bcdf76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hy-AM/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hy-AM/firefox-89.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "3d6bb583508b0c2523519852c8bdca1d8c522e4c7ee52e16cc40a3bbcfb2f28c"; + sha256 = "a3e67a5cd54082cd00976f17b47f719f3f262af6a39f0d0f5107b71f5119fa3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ia/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ia/firefox-89.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5cb92b254d22838db46edfe62bdd566a3d34bfba58deaa7d36a4efd7e257c8eb"; + sha256 = "54175c830b7a28047788721645796b925e37803b23ce7c3f7f287a3a3e6943e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/id/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/id/firefox-89.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "aabf5e60d4cb953c712538326beaf053693a61008e00551d46e5261d284d804e"; + sha256 = "20f207ceb1b090ff6be21c36b928d93a53c7f2547adafa7a7559b7d914ae24e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/is/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/is/firefox-89.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "31131cb9fe7500c7f83aac790b08ad87aeede79d59ef2ebbf19c7fa376140e6b"; + sha256 = "79bee0347eab828d9022708131ff8eb32d1a895d1f39f1d074bc6fa536463289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/it/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/it/firefox-89.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "4de9bba3bd048e96980abbf2180ca6664566f88b0b095c4dcd5eb940d9eb1137"; + sha256 = "28909f3a4e9ee97e290c52a762e74529793ec218c848fd2b260094d9295425ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ja/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ja/firefox-89.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a073f1e1c466b875da47e46c55bc2b784b3f407273089db33025a9d99da5d7b3"; + sha256 = "1fc39129fcc4e05a6ffa62302f7a01bec771e2aba1aca084c9fca518f0f3ecb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ka/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ka/firefox-89.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "c834937d4a011ec3bf1c08b93e66cc8b6f7fcbdb2f2f64db09e1fe39b39698c8"; + sha256 = "513bdc1e8c8f6568eee0b24846d23bed788053cb3487799a3360ba97c3f5471f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/kab/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/kab/firefox-89.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "031907892957f23243df5d037111ba838af23adae39c62965376915b0b85c68a"; + sha256 = "39c7c01947863bf17fd0fe7360c1c02029f8c4eac6e27747c029c60f12a524fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/kk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/kk/firefox-89.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "43154e9101e01dafb91103d8f5f1fe12ea6b84039feab5b3ea12fe8b776db5de"; + sha256 = "0c99f13e466294845bec2f54ca8a10f3d03f87b9b2aee80416db799c5761a4e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/km/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/km/firefox-89.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "7e5e996c2a12a5f849d989e46cfd762858abc2580fbed99c70b5c2e007114880"; + sha256 = "3494d56e45a2a9071a0993191a438155ad4b76579e6a6f29d919254c567a0078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/kn/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/kn/firefox-89.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "b9cd7bc9d57b599532f38e1cf2332e6c5284f04c63e45c47480657b84522e657"; + sha256 = "4889cd958be7bcd108c374e0e0575f13f07210abeec076b8369186cf61f4ea7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ko/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ko/firefox-89.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "500bb904657afda7fd5f723cdd03337a1ceb2f00a17f9a6f107b363c26eb44c6"; + sha256 = "71da744479496c2c62449d42373af839b02cfb1ebe2e6ffebb662816aa8cf59d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/lij/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/lij/firefox-89.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "061bd89c3b9d9b9c4a76f0df31a17248029482f44679096233a85ab005dbe6ac"; + sha256 = "785afee6c3a9e26e8e81032ab5e9c94c886d1e950ce2174d63a9d7f6f15acdb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/lt/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/lt/firefox-89.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4c9609e7a9bb11db56c8216f1e4e3e480ccce4cd012ccc590c01396d589f9c8a"; + sha256 = "00de67ef54ad73ff1b8397f9d86ae90da57a0272268336ec7ce6f7790faf0a38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/lv/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/lv/firefox-89.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "541c09d7aadcc77306045ce53c0b735887e270c42c53a5066c5dd4408ff8452b"; + sha256 = "e28f07fccef57a2ca94b7b7074b518188599e851ad4e21a13b08b5b242407154"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/mk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/mk/firefox-89.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "da4749a1c1417b0c4d00b54571a6e4a86eec5295dd886ed71d5d8287512e6af9"; + sha256 = "6fb8c785136d3040865698d91cde31cece022072594aa61803cff9e63e2e5a10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/mr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/mr/firefox-89.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "1bbf941693b2ce0165240aff245c7287536276b84d3592f63f3f42385e79fcfe"; + sha256 = "c91ea884c587115fa2c9b6d6615f724937b77e24a22ff84de7bd50d843907432"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ms/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ms/firefox-89.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "447449f63e8a02e137b02de708c0c6999788b456d838b3b503ad37ac997640f3"; + sha256 = "36c50cbfef5e729f57797635aa1745c74872f6adb77daa0b4e5e804072c8d15d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/my/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/my/firefox-89.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "22ce8c15e71c270477f391282792cf9a1375ee377b6c19f0170630c62999da7d"; + sha256 = "cb17e54ee6ed511fcb7de27ab2bc9dea5c52417ffe807a572d65f8e8d202c05c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/nb-NO/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/nb-NO/firefox-89.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "7f27637af6797bdfc10a208e76552db8283e1aae82f4d985859b9dbfee377b51"; + sha256 = "08e7a9935376166b3344a85345a932b6ea90691f6f5c28d345fb210cae64252d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ne-NP/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ne-NP/firefox-89.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "9853db886cfe679a7f81e17b2e8223f40fee642c0c769cfb0f089b97fe26ee5f"; + sha256 = "b6791b6c336fb9b3683be41798620071f1ef569f3809c0f0ae9db90a1dd758b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/nl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/nl/firefox-89.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "e6b99f1b76d4a768d656c062cc044b2fa0a5af66bdfabacc669f5af6b408be0e"; + sha256 = "1bd8d6737393297378f127cf320ee0945970ac4688ee9aa3a045288fcde54f61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/nn-NO/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/nn-NO/firefox-89.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "e1a7400a6a1a49de0a24e2797dea2e3111f1712e6fb855192f82475918df7354"; + sha256 = "919312922060bc90e5a3398a76bc7e6f224dc3ae46275d7ba7a0fd596e46360b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/oc/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/oc/firefox-89.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "23d166c8d9ca49331699131390e3653442a014f08b0e8dab51a26156c695b7c7"; + sha256 = "65ed4ea16b6696fa5866db932b82767301c6f3eb72a9ed089c4ba5d2a439352a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pa-IN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/pa-IN/firefox-89.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "b725c7a5d8e415ba00fe0aab7afd24cad9c1edc6e7edd7e550a89b3004ea1b31"; + sha256 = "d996838f73d04f0bc91b22933e5c6bb2d2c7340a43933de48c352cf548097040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/pl/firefox-89.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b835f1c5dc1da4082a4ff3f6d5ce66b90abc19f465c6f2ff0284b14fc2b44cca"; + sha256 = "aa3167304eb7d5ceed1235be8d864b0d6ff48d47d680e62b613462378215d9a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pt-BR/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/pt-BR/firefox-89.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "494f7ce43f33ae5d3e7da325b2956b5aa520c99753826a525ac023191212c025"; + sha256 = "74f7801e8e2f9c60a9824380060769afb61771fa9516206ee85a882705eab3dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pt-PT/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/pt-PT/firefox-89.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "50ed069473845929d46af61e3fbbfcf9e94db70a54ef0fedd08349c4b7cd1120"; + sha256 = "961575b359317228991d81b76b9967658b18229ee8ef58480dcf19d6bfa57ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/rm/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/rm/firefox-89.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c6da3d38bcb69ebccf373159fdfdb9fac2fe3613c321a38d5182baea03e3818c"; + sha256 = "60780c817e379fc25d4234363c72fcf8a0cb3ae14c4ea87865d85c46aa206801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ro/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ro/firefox-89.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "b34610eb3f654053e053375f7c0c93730bb38ee436b1a7970e5375698e9a9ef0"; + sha256 = "20f1e503651308e2f1e0f41091c5699dd20b02a9fe32e0cb6541d00ba81d2b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ru/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ru/firefox-89.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "dca61fde2dbe956ba0ebe63d461f0a2b816c98567abdeefbb6e451824c22cd21"; + sha256 = "1f980091bf909f7f7f53d358b79c918e80df36f7ab389053c02051cacbb1ec44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/si/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/si/firefox-89.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "24dbd2c0b4b3361c3af2fd3eff703f74fb47ac27a81eee98877c3692fcaa6097"; + sha256 = "6be2db2f350b67befdbe0d12788c8b076ea592ad7cd40c0c27a5a1a90f73cfcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sk/firefox-89.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "2f222a2dd627796a9be5345534450a4b18e4b181c5cea09742b27cd7fff40e8f"; + sha256 = "2b975d58ab76144db56408acefd5e5f63a81a65d11d79abbbe724ef60cc0b7ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sl/firefox-89.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "5060e2da8fec071b6f4799c88a2f2e156a9943c9640e35f2958bbeb79a6b8254"; + sha256 = "2459093c57b5784ff0a496ca6a294086700684a85b6a5444a25a877e1bd51767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/son/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/son/firefox-89.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "2ce56f65cddd20c74162b68b7594053dc156fa713d2a5ffcbc4f0aa34b6a4287"; + sha256 = "1f5f111543d1db02a8b86ed760cb159e3dedbb4a44ca43b31bd78cc9cdcf3ec9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sq/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sq/firefox-89.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "cf68aea0c36405738962057f01c86323d1f71968aaa5eec693b52af55ebfdfcd"; + sha256 = "8a2c424aecf0e95d6acb41a66d07b750e85b74dfe5cb2154f9d84cbae51a2b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sr/firefox-89.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5ba52f0c4546532d75668cafd129137543764dad21480d897a99558ad6e3c5d3"; + sha256 = "cbef46fd1e72f542efc8959bf602fffc026a2866a2dc546d008fe8b08a24ed5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sv-SE/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sv-SE/firefox-89.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "8b17ba3c4dc2c625a59b44c64d887377cd7a3472f4562f1e0341b02d2f5daecc"; + sha256 = "c5a6dbca197540c22e370cf69183f32edd993242ca651a04c46ece8b43824a30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/szl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/szl/firefox-89.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "46d70b4b572b48e387083ea199f49e716c559c3331d1cb85999e619f3419576d"; + sha256 = "29a4470782609b31b494f3759e9cb3b5704790e4520acd1b33988877cd982b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ta/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ta/firefox-89.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "19405af9598548d36ba0cec286829eb6810aad3a5ceda3d038e53c947716f776"; + sha256 = "8a8311028e7681f6a51013ad9c15911bdf9e572544d9c26982ec056889d79fe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/te/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/te/firefox-89.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "84e059d870b748b0cccce94180be5b35e0130443a3e31b3e78b16512a0069d25"; + sha256 = "072a234399aa63cae9089da050b647ad042c8b346ea6943f1f2dbbabd5d454f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/th/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/th/firefox-89.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "dab86d509bb31c262bab2ec4e9193658e42ff3ef517a69c3757830d947de9798"; + sha256 = "f43f10f82d50a40e8b7d83295244d1edc9058826160fb7529397751fb4cce43b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/tl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/tl/firefox-89.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "e6b94d304eb6e10314abd8b1f893b0b704939250c823bc9ee56575612815fb44"; + sha256 = "2b30195f74227e71c21b7c7004faea8cf4c95da5fc2bfe4210d50392d35902a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/tr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/tr/firefox-89.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "214338ab9d55c50e667d1b79f7735adcfa848e95902f8a50e7c817f6a5096387"; + sha256 = "901fdb54ca10a0c90bc9253d6d1c6f683a7d5dc4ab8487e6aa0fff2b04e32f24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/trs/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/trs/firefox-89.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a021fe8271e5a39dee0c4a695a70f52206de3cab0300358966c33c5339147c12"; + sha256 = "85c3386e16611e2cd2b64a5095734c7c4703b9889df4e3656300d98b7a392ce3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/uk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/uk/firefox-89.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "49fc053833d0ab39767ff035edad9ae6c50a5e18e32e627af6bd6bf5a71b0f96"; + sha256 = "21fe9ab7f0a41ebabe2715f139f2343e0fb6e8057b42927a3044f7ba665eb80d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ur/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ur/firefox-89.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8c3ce3d99d31c1ead914d7b70761cecfe0ca6e11c3f6546ed19e03ed1c823f13"; + sha256 = "098d33b86191172fbf5348689b1d704df4cf3237e9dd789c67b95656a6b79e02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/uz/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/uz/firefox-89.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "a8667b0c2289847b59aeef4d7809b1834872e8702a9a7cd7988afad5778c1261"; + sha256 = "b891212d3cdd66b7edc970edea6aee044b906174054f2f06a55e5060ff751ada"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/vi/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/vi/firefox-89.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c885bd7b03ec6bf9f8842c67e34e790d458fe4746eb4f9d28e8fcb402d393c37"; + sha256 = "fff4b31a6889e1b5829b7713fe0f54d4a68cc3da3600f6bc69c6b652596fabca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/xh/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xh/firefox-89.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5f6e840eb00573c70328c05d9caf44ac36c48fca7611ac9a60491df80933def7"; + sha256 = "b73adfcec53fe584ace193f3f8c3c1ecd9b3346847cf620cd543d21fc4f14be1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/zh-CN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/zh-CN/firefox-89.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c6c72206aadd6b54b5456ec7021a5480d5acb33941d371e36c449db229c8e4b3"; + sha256 = "79c53f5f973bb9d85233c49c0c9e02b9e1df35f500e44b4bb541cb1c097d77ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/zh-TW/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/zh-TW/firefox-89.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d98c58530a4c1a66cae84430b9263f0317221ea217e26a67390faf147a3afb61"; + sha256 = "270a0e18b978ef33b8b71fd3690ca859e0c286ad1ce5302c5da5b7375f8928d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ach/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ach/firefox-89.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "3ced1adf6b286ba44757d7b01fddd80dcc733bf9d442589f07c8725ed8d0afa1"; + sha256 = "e239cc3380b017b549c5ec0824c0b351374412562a810f85faa3e39b020702d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/af/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/af/firefox-89.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "ee141cebc464565c4cc45d04a5c6f12220fa693bd4f3b631a029df57a2f514cb"; + sha256 = "6049bd79e3e3fe7f141a97941489b9be8bd1b5e907ff92f07907d0433c52f8ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/an/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/an/firefox-89.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "d14907a7a14ed3263da99f3cec6616e8a3aa91f75366afd15a6018a197139309"; + sha256 = "8fd1aefeac276a40ccfa434d376b895a7b9674ff67fd587121255df34cc5b1d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ar/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ar/firefox-89.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8054273b82ca17b1b1e0d5e838c1de8b363bfc5b8f3ea72e4ba6c17523e1ae66"; + sha256 = "4ddc0f938be2806d27cbb9810ff39749ea9f6b0fddab1bc4eae211ba121959c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ast/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ast/firefox-89.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "bccb4d0af2f07204c7d44771c09d5ab458098b6f388f1a57ded76c91425bdb67"; + sha256 = "f4ada3fdb3229992af94002e3b812bf95e3ade3af7e913ca990ca3164c04ab66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/az/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/az/firefox-89.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "f22ec26b5a52e857869cc22af13672f297878836d7a3969dfa65902f366df918"; + sha256 = "07e95af87afc048c1e0d273025e4ac2ce6d5e15f93bf4b2e6fd24699b9afee8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/be/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/be/firefox-89.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ca7cf7a1be8fa0043e7fffbf7f28dcc04b27bb0c7b8865e877293e898292ee2e"; + sha256 = "d967424a01532dd37a57c7e87063c022905a38d794c6077f99fc4d23a581bc2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/bg/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/bg/firefox-89.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f7672b0d6a94dd8bf1b4c997a0cdc8884d4af4e3d30a071a449cd2565bb9ae5d"; + sha256 = "c8b667539135c6cb2fb98663259d75757efbcc6ce374c85506b2972457f01bd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/bn/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/bn/firefox-89.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "94608024f27db272438321d59c1dd447288c241a16c87ff958a110c13dcc1add"; + sha256 = "436b1de6ffc38b2a17dcef6ed395e67e8f75058539bd10cc510b5db95add0b0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/br/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/br/firefox-89.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "56baf6c6f57c68bbd7b69ad925e6fe1da4d46b8d2f8711850f31c1e31c3ff793"; + sha256 = "0a0469ed2f2d338bf05f051f300bff65f42d53f34c6344fc81d7179faaff7b0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/bs/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/bs/firefox-89.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "2350f1ad88129e8eeee7179b6bd28a06aa6173125807fbe7896afbf04ecab359"; + sha256 = "a7907780adcbef8cd64793500a9f664d552f7c993c277c1e10d8afaee2c13acd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ca-valencia/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ca-valencia/firefox-89.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "8ac160032f48d637bf198e0bc06ddb7921d2eead3d14bb056fdb4c3195aacfad"; + sha256 = "8e7cb11f19878ac1dd7943be5132b59316c067e7f435e2456200115d0eb22470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ca/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ca/firefox-89.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f2a94bcbe73b43c9258412514bf02fa834d0018af6c15bb99927236b04d24e90"; + sha256 = "235c16a101af708376903609695a0e2cd1d863094f1a98ce2e916533abc33b38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/cak/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/cak/firefox-89.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ba366df74b7062c14803427c0c69bb7c28f66e78f6cd9beb81a1fa492f73fda3"; + sha256 = "735e1f803533c7ed092b10df7a3e7435588866ba94b88b37c9b2afda75891f0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/cs/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/cs/firefox-89.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7a30c5e10de398f28228af82916d41f0cb8848db29fe7dd034d0ce8bd0bdabba"; + sha256 = "881d8c7a1af57a90c81ab4d5c89d8d946d6666073509f9c194ff44466f44e4f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/cy/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/cy/firefox-89.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4f711ad9dfaf59a35e99284b8eb4cbcf3f459b9f9085b101de70d1a148c5d4b2"; + sha256 = "1c74c73b3e52ad625ede28e7043b650a8c90ed09862fb26fb1dda9497902ad54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/da/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/da/firefox-89.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "e064c9517420b95ff16a9d3e7346d21f9a42f506b476762c6372978ed8c16e73"; + sha256 = "41429f458803677eac22b654be2e9e3708d4007e3faf6496ef8a9ce31f558a79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/de/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/de/firefox-89.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "c334d22f7e28b188ec50c6aa1269f1c409181747953c157281c2a77b9e173439"; + sha256 = "de0b79f4b60172379b523a851ffa94e750aa68e6a008e740084028da2473b8cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/dsb/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/dsb/firefox-89.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "da4fadd3a07c19ec04ad1e8a9ed6de780114cd8859419b8119bfb12d6dacc044"; + sha256 = "b7cb7153c0e2ac1b0976eebb9a627ec608f49969b8571770409bfff5916d5ae9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/el/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/el/firefox-89.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e44ba8ab5ca51bc7efe4823a0a70b43adbfc75e63932ffbfe47a6fd0af1a7b3b"; + sha256 = "f764ff32d668f36cac903c808b46bf81afa81fda8231e9c500e71495573a10f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/en-CA/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/en-CA/firefox-89.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "1a67ce9de292df925ebec96fd47133735e725b844cdca8a62864f7aac4e16e64"; + sha256 = "8df9136b6895266dcae765d15a601ea69707c6c31b858682d4a0037262032452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/en-GB/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/en-GB/firefox-89.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "5350e887e76e323b7c81ab887b679cbb2d49c7d30c618f65c3426ac4717d0612"; + sha256 = "b9df457be4785e3ee38e44b8fc5daa265699f0fed60357b0e2ab6d650d5629e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/en-US/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/en-US/firefox-89.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "6f4e0157594d46d10edc3f73e401e31338356d731b8a2673a0726609c675be42"; + sha256 = "9b40343e4094acc2ef4813a2aa0b943a4e4f34538da4f9b4356c44120c928194"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/eo/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/eo/firefox-89.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "8b0343f789d3faca9290a33d72fff1ab9664eafc6ad56cf029156ae12cd7abe5"; + sha256 = "053aaad2a50948969c2dc85854a6da0a8ef276351eb84ccf3535af2f479b4472"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-AR/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/es-AR/firefox-89.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "76f317e2f262cfac1bb0b41be3e108d51174b8532aecc2250f82d17badcd7d1c"; + sha256 = "b128326043c53635ed3dd0fd7bfc2b52192bfc48ac4d95917ff72c9aa31b8b6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-CL/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/es-CL/firefox-89.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "160e6d9e69122f2ddfdde25a234f6bea63fe8c7367225cd4dcb6009f0eaceec4"; + sha256 = "5227c5108c01539d98c52224eb4b76c08db8577853cd2e5307ed548c11c73e10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-ES/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/es-ES/firefox-89.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6e205028086cacaf99234afc9f0621da65401651b0a43699dec688f271e1642f"; + sha256 = "c9d0120abbfc52d5a33c1905d460332d15c1d742f2b7902dd99e49881ac1b41a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-MX/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/es-MX/firefox-89.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "37eb7eef32fafd273855727fd9bfb6d510c682c94751cc5f4b7b29919215b8c7"; + sha256 = "b1d030328017cd2e03d8c3431582f7ee5c4a0d368074d310cf41d771bfe536e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/et/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/et/firefox-89.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "633e0339a52de8fd6f77a8066312b2daf57b45bde6cd57adcd0f6ee23240a1ce"; + sha256 = "897be30748bce6cd0772be06cca5f02a4768864f8ba433f7840aeb245bd7be6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/eu/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/eu/firefox-89.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3a3504b6b2c05ebd3e62c59a5d601725867986aea7b6a78466068bcdf7e8f064"; + sha256 = "93f97c38ce8393a6bad65d682a2ced7260e2313114979bbcbe9beb7650ea8fd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fa/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/fa/firefox-89.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "779667c40298064d4d6cb85b2c9e8f75b5a54874e101899385efb53be4732e60"; + sha256 = "9d5820a4facbdb6959cbbfca9db5158c049c5420744edc77afa933d3c3c7250c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ff/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ff/firefox-89.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "f372af781709a6e07db786f27fbcbeca71868ff6adca3019a53e51a63115d0f6"; + sha256 = "cfa3059f3f12a5f02b4f9cc076738d32f631fad945db99df3783f9cbfae68628"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fi/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/fi/firefox-89.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "a2e622bf0c5ddf95530fb8e02547a7c6f5e23edc61f5b5e387a0144f7d7eb5ae"; + sha256 = "806c05b03a7dd6f40ebf17f78e56d1829f7aade412ec8f54ddd25ae6bab4317c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/fr/firefox-89.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "92fb6b1a095048633e12033d701190762cfda7a0ca1126e1122f8ae90793e237"; + sha256 = "e0c6056f04d7c75491c020d0372ce8b2cc5f23959540fb0956b793e4c16ef736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fy-NL/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/fy-NL/firefox-89.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3fafb1d37961b75f63d46cb43c8dd4e4fa25471d47f1d75601940ea0df87f5fb"; + sha256 = "e9ae16b0b0f43e4b4e236d47836ed4aa03ccfe0dc6d6401dcd84012d0375d405"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ga-IE/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ga-IE/firefox-89.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0c562ee44f470672ae36f0e383c8ee77f982c9fc3c302572b6fb22ad1e4ad721"; + sha256 = "f37630c20e722165f2e03bbdb6d7d9d9dda86be17dcdc086d95403509309d32d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gd/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/gd/firefox-89.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5e29a4496f69c35d1cb2b69cd86091f368faf598a959052023a46366001a22a5"; + sha256 = "ae13cdb56c7363fbe96eb07355ac18952c35c2fe078e79438144b2780a363bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/gl/firefox-89.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "5f9caa18bc2425943ed6aba3974b5bf8578004b262797402d10ea10fad939afc"; + sha256 = "f0ee99e1b32c8ab573c4057520c8a4dc7d4639e98574da1a7f4339e9b9cba083"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gn/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/gn/firefox-89.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "38eb2039f153a6e0178b70bf2df455568927888935ab4c1cff7f7d3a31a9c56c"; + sha256 = "c94c8b272a781019e92d4f6ba41349041f0f5a795eccce66719bed137e39b66f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gu-IN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/gu-IN/firefox-89.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "1a7559932d13c6aa7b1dda6baa384269683de7ea3d37880592615513ee5835d0"; + sha256 = "9249604f06abd977e1c4992ed857950fa17b150435691df67bb97c1fe6a67adf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/he/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/he/firefox-89.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9819474d9fc40886ec70f5fdc84a84ad2f9244cb43f1cbe6dc9954f51686d913"; + sha256 = "5a035ba5537709127a368d89fc4b59fc2eddbe7b56ee9fd0e4fd7b91d4bfdd2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hi-IN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hi-IN/firefox-89.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "fb9d266b9d80b685176d8ef3711a7f91aef2b79d4f46a3201f14492c433ac579"; + sha256 = "2bdfa548c53bb05064d8a9daf7a83859290f0a1dbaa9979e54615978973c2401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hr/firefox-89.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4ea28d2eb6a0c5d888d581d0bd15557d4cce3dc5a09b8c858ccc7cbbeee10c2a"; + sha256 = "853c90ad71a8133c2c3282682aa1b4ab3fb45dcc574fe0f099a6fd1b79fea4a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hsb/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hsb/firefox-89.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "837f0c17da85db3194385717e13e36e41f01b3f735d33c48794831762b4dbfd1"; + sha256 = "c5d474cb0ea800ac062678b636b4f09586c430c31eb63438ade304ae009b8c22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hu/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hu/firefox-89.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f9cc01711910a92379872131ec8ba7f0620edf4b83f43308bbd9f7d2f0b4ebab"; + sha256 = "047ef8b66359959150acff1cd8fc5d3294075cd93028b1c397461bef6b940943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hy-AM/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hy-AM/firefox-89.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "9dff255e306dac4d98b12d0d3dc556152ccdcfb8f61e2f3314393fae39eb827d"; + sha256 = "67d8f771638ac429aaf585a6624a80c0a4369f0ef4de4906c1324a25ef54d3ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ia/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ia/firefox-89.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "855dd75e2fd4d14158bfe5ac2377105ee4c3a5e2a04fdd6fff1eed939f332a65"; + sha256 = "fae0a1445107a5632865f159d6ef367243e846fefbd8ae86fedd8e74307ac894"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/id/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/id/firefox-89.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "4fde420623110fe68b126d09c3ee72ddc88b1ce8a0f9b0d27990f619933db399"; + sha256 = "d48d736d7825249d72647e07fa0a497434373e8c2b43e31c88d4853c5e57b595"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/is/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/is/firefox-89.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d3c352ed8d91105449e50847ca80f484f93ae0d23ff6e7a21f9f66b7c39748bb"; + sha256 = "5534810b724fc9931a6aea47768c1c3990d7097127fc7ef96744d0fedd509535"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/it/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/it/firefox-89.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "6e52fbeda5410c5169ed3a6a6f4279659cf873ac474f4c43d9f78deb740ea853"; + sha256 = "3fb63402a8a4e495842c7de7c4aaf4b08e258e96371d20f40d0da21769af7d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ja/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ja/firefox-89.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "520f31cd27c1dfebe4fefc1b3fd6de17a4ff7f589e0ba4f8822c968e3a22e7d5"; + sha256 = "216996e405bce22f6836178c95f2db19cfcc138ca25eb01670b6243fd6b4595b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ka/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ka/firefox-89.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "74b52e2eb83b0f7f73ab049fcf8b8cc446ccd75d55feaf363f46ecedb35c119d"; + sha256 = "4184f7b69f0a075a580a8ec059c4ddc237ecd5fc019fc819b1b161cab6841fe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/kab/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/kab/firefox-89.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c77b40df85b97a7cb41b22188d158f100946b813850371d04a9db0702a3c43e0"; + sha256 = "9d5ec12b8a302644b0fdc0bd20e67b471b6426f075284fb21b1c23b8bb592df7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/kk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/kk/firefox-89.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "0c8a89395c091f2c56e7b992db7dc48f5116cf9c54e179fee976e2f5d9ea07b8"; + sha256 = "c37d42b7472c1b53d9d38a62510be2c559908dbe2a60cba6ee066821ad52dfa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/km/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/km/firefox-89.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "1b5198b18f01ef509943dacd6f9c02fd52c5196c466a054efd5464ee091a75db"; + sha256 = "13d81552dcf88f8ab5b294c0e500af4cf27d0cc6f8f3c2b9ecd60ccf28601fc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/kn/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/kn/firefox-89.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "91a1facfc9abb247b428c1598cc32f4c932bd8ea3e9c0affdafb156747789611"; + sha256 = "385af04026d1137d7f3d110a3070332ece0f02465686e330307d6f7dff09310c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ko/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ko/firefox-89.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6d98305b42ef4744681fd07031c71b38d10a847981fdf1b5b094c74d1c367817"; + sha256 = "d408b25b22b84500fad5014aff28a1f0fcafa47f35328121ec944682c8252a10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/lij/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/lij/firefox-89.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "431aa8855b211010f88efeb95ee46e05f38176e5656ad0c050922bce2ae4a81a"; + sha256 = "22f0806c3ce1c15ea10c5d7ca9b3148d0bc6274df88e6224efdbafa4ff1824db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/lt/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/lt/firefox-89.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "da7f416e9223ec1770b28d3d902785cd626496f82e5fd76c3ab091c4a2668a37"; + sha256 = "4f3af6bf854de0ba54631c3d462cdf4b8735de28075c249649db7219ec1cc1b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/lv/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/lv/firefox-89.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "364742b8aca7ea82e393f9194401f8acbf203dcbb0f8b13cf119d2324e3577de"; + sha256 = "a7d5920c2f93178f3d95bef5a5b16413a307ca468b023bfaf65cdfdeeaf58025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/mk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/mk/firefox-89.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "0048ddc6ea21b6c06890e914f5fa457435adcd4ec6f57c98a73262fdb8079e2f"; + sha256 = "ae8dda2d271962faafe1e27bc4448d86efb2283f1ecd3b546e077fbe73f25649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/mr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/mr/firefox-89.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "cbeb8be98074c6f57ccd0c917005ff04b8deda3ae8ef03126becd40591295ecc"; + sha256 = "6e632ecd870759209c2e05d119db8c3018ec23ec178fa066408c2db40283606c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ms/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ms/firefox-89.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "cdabbad9cf3b6012b086b5f3997c9338574a57315a5330b602a5ad2bcd40aa59"; + sha256 = "afb86390e11a6631583797f36471ab72780db95c42d80908edd2e30f2f8c7cee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/my/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/my/firefox-89.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4f44d11d8a15dd2f5f827377e4a6f64d68440fa5a3595011ee58715b9bce802d"; + sha256 = "709e24a1c4145da05b77d7e86351e617f8ffd1a7a1b0b39733e46640a953cd37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/nb-NO/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/nb-NO/firefox-89.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d61b79587b55540f845800462ca1cd52bfc7b380f60dd1bb51f15c16c511c066"; + sha256 = "63e00266d4ebb3212cbcc5a54a46bd2f56c595e6be29aed646b3313a488ad8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ne-NP/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ne-NP/firefox-89.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "3f076d3def39e76a68d12e9e8b2ce7c6d60892fc6187b660f24abe454382a347"; + sha256 = "1f1a7d20758e4c654ace094f2d79daef76247433474be9cf228d26e76819c64c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/nl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/nl/firefox-89.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "003d8a9b1e7e641b8c8eda226a43342f9c4c05fd616f50dd8fb0bcf7a07ef704"; + sha256 = "afb68f242b89b97a9495be420b91ad65aa0ee254932660defe141117acd83c66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/nn-NO/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/nn-NO/firefox-89.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "0cca3c831508fb2040b57fd710823dd6c8051defe1c2c71e94b168feefb24b4b"; + sha256 = "31e20f0e5171e9137999dbefdec33f9e97205ecef2b141766db275b66592c7df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/oc/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/oc/firefox-89.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "b4a2ff73e2bb3f81b3e1522c2cd87b36b3406a961eed68d43972784cb7467474"; + sha256 = "68a990d30be02eee79f1fc7a799e88a3e41749e44b28f5b59fd1741a458f668c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pa-IN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/pa-IN/firefox-89.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "14b692ec9884d2eee7b6f790413472943e90f80da2fca35121210ee0f9cfc23b"; + sha256 = "133c91f6932454e70fbc10bb881d00f859032be6d92a1b41dd1df31dfa57f376"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/pl/firefox-89.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a70084487dcdf2a6f5ad386284cf9dc97f7db971a5905e9460ed76bc4db47d20"; + sha256 = "a86f0230c57ecfeb12a41762a1bde5bfd49224b898f891215a094ca7056e2b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pt-BR/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/pt-BR/firefox-89.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "038641582e1a02b241860c99f4256e868b5feff4f0392b2c9107d2885894934c"; + sha256 = "a0ec38a70fc4ad0d0f67962df8d2478fa00f767b1797e69803d24913be5facb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pt-PT/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/pt-PT/firefox-89.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "5bfb803863b648d99cb7a61f1f3a667f66a371e896265003162594c7f769bef0"; + sha256 = "e443929ef871d56be734b8b3d766845583e174e51137e87193cef5aa83cdb55b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/rm/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/rm/firefox-89.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "64705af1fa78953feb1281eff94a38be82e2320f6013fe45abf593af2ef9a014"; + sha256 = "3c044dd647fbf331a4389719c4d1105c1e5cb58c3eb1636b56058730a9e956e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ro/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ro/firefox-89.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "7d9ba545a17b3d4aaa4bd79a990ad931ccddc88aae76a6d3fb95675f38f77f6e"; + sha256 = "5a9fa20d508d9de6559664e96050b8843eff0633d5d660f3fa7cce2da375660c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ru/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ru/firefox-89.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "2efcc64a1159f30ff00e495eeecde0d9243b0c75a4762f3e6fdd47ebdcbe1e70"; + sha256 = "99d6b8116f594f01936bb9528b2d03e2e78a6aa7371eb10e4de50593200a7bc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/si/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/si/firefox-89.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b4467e9ff46e28caea70472d9fa25f03137978508f0342d1e646aa77e8916018"; + sha256 = "b80d42d72e039cfb15b30a7054bb84f709d7bb509c299862054a5c65f588075b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sk/firefox-89.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "536f535124a6052e8d627928d3607cfa0301f90ed87de7701821f14f5fde40dd"; + sha256 = "e21b18c60376edd371b5a52966b7c8d339e0adc0b46e5ac98381a46cfa42056f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sl/firefox-89.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "2f50d761df9f8e4883972134ec989e8fbafebc29a4712bb4467eb0f2bb17f603"; + sha256 = "63b70e14e9c7cb579a49013f3f6b31ffcc88f1424a17987ffd2788b876e22c13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/son/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/son/firefox-89.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "55e11dde97be10ca510ac23e301a46e5314832bef10cd32e39503cb105d5b489"; + sha256 = "d77f34b17861c607125b1bbdf84f048634b6e7d3d3e35a8c0f4b55e3ce4351b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sq/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sq/firefox-89.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "10b41cd2ba7789182902196153491b4fed86d1a655fe1b3fb22cc3bfe95bd7b5"; + sha256 = "fb5b14076d7e6a12ea0c5f510dc15c94fa6a311285cec612f9c7a216c1d71af7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sr/firefox-89.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "133a16999527f53b57123d47a191ba415c04fae837d735a295569e64492ac3b9"; + sha256 = "9606afc3903197860f2b5d6cfddfbf32cb88c43f8edcdac6c94130d6a7dc4f9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sv-SE/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sv-SE/firefox-89.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d0fcfd1cdbdb051cd48cc141e826993ea429683199bf88fbf12ac2372a2a5c03"; + sha256 = "457c4ed993411a6407fd51a88c8f6993abaf26215e335f7d871c9445e2cf7cfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/szl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/szl/firefox-89.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "b9bb3914f6918b64249f3b32f744a8f089bfd37eaebbe983748bff288f54a6d5"; + sha256 = "d06c745ac74ad48a5083768774dcc72d020a34c9dd2cc9aed2551410de1b86ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ta/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ta/firefox-89.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "0d74e3c6e73fbb99dd6269925567e5127569fb3dded3de80d55a10b45e8a595b"; + sha256 = "acdc690bd1816fe043640d62b678de02c3386736bde18f31eefaba749847f6a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/te/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/te/firefox-89.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "d76e37e73ceea536957373bb774e4971041d09fbfb361274b90d763d39fda134"; + sha256 = "e2cbc4ff9b7682cc4ec3b49db69c841d95cf6336645c50025236885b24fc3090"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/th/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/th/firefox-89.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "fd81d3ec70a449f3122fea36edbc519cf06ef12bebc776ec746d980386ce3c94"; + sha256 = "83c88f10bddd3ed8e1100bc57bebeeb4d0ccab30f2093813c6e121adb04be5e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/tl/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/tl/firefox-89.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "53c67df49f0c01f5b2f8cd0e990b4d7794f2363740fa4ec2e61fbf6763830c35"; + sha256 = "3dd0c9dbb655c54db0b672ef3ca4b61bbe6a488185d92814e474da58b15ac7e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/tr/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/tr/firefox-89.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3d95619bf046b7afa7e8dcdd3b61b6eff44f7e96a2bb4bfe8abe518a729a24bb"; + sha256 = "442f82197c929080e432817a7cfe42fafee2640799596ab5fcc55d4dd6e7a296"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/trs/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/trs/firefox-89.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "2ea46a3f91c465514cd1721f6fc4ff96014b364a8120ef3c5782411c307b2a06"; + sha256 = "98f10ccebd94fb4d0fd68bee80a691248e0033e1e33f03f97dcd9e3b3c602712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/uk/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/uk/firefox-89.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7ad249c8355e8fab698cc9451f0716b0d88bb26fa7f7f95862c14d79f0b5210f"; + sha256 = "99cf2753defcec16447dc176b331ce6e6e70f66dacbc341e3f719cf9392d0acc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ur/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ur/firefox-89.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d0f6f7aab4499c7b01a1f2ba6a36f00f83cb3fc7c4f8d477f0cbf9c7df4f9dee"; + sha256 = "904484ad86e2e27d792b40aaa8a73857476c786cf500344305795bfbad87cba7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/uz/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/uz/firefox-89.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "49ce46676f8d1735d8a0439a9e0149a66aee20f3bbcd26308f00ab394cc4ac71"; + sha256 = "b44a544c6f473a0b4d1c4b408d5fbde422199e23b3b85957b60d2eaf27351b2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/vi/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/vi/firefox-89.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "afacb2c2cb34b2791f14cb9ebe13a38cc87863b0de15e81f92e65e41b51d8a53"; + sha256 = "e4f5417a5e294ab2b38744a260280c1307c47b072aa78657ba1143020c26c778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/xh/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/xh/firefox-89.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "c08da22b2ede0799cd802a6750f1b05150e2089521f74100cdac873802a7e39e"; + sha256 = "39ce93e0459299d54a99c317d0dd8b01cb694a8140d5036f09e13d72887a8d6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/zh-CN/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/zh-CN/firefox-89.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "55e00d8106a2516bb23f2dc48978a96e5102dffc100790103491447e48834810"; + sha256 = "7f6ae88c4eda5fb7893e7b35f9ae04df658f78919fe3476ba78fe2460a2896ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/zh-TW/firefox-88.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/zh-TW/firefox-89.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "849c7e52452bf72983e5e7ce1b958ffc20cdddd4a401b320b3d1a817c027db78"; + sha256 = "7e6db3c697021be17253b616d348e67df62ea3d86828af768881f67f4d340379"; } ]; } From b17110e2de69476088eb6a8dfc3295f52efcb6ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 01:47:59 +0000 Subject: [PATCH 03/95] brave: 1.24.86 -> 1.25.68 (cherry picked from commit f625036c9eb78d4c8cae069d82647628fa986f18) --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index fe4a33e65cf..feff2a74b14 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.24.86"; + version = "1.25.68"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "VKUs8PPyAbuH91Zck0QTiFCEUOMDlLT4Itv4MXi4Ygg="; + sha256 = "OBf42L6pctflNLjtcbnw2wKo7TisRSMF3SriDPFlB6I="; }; dontConfigure = true; From 2234f2089746a2abf288fb925e3d4ca330e00d8a Mon Sep 17 00:00:00 2001 From: Greizgh Date: Tue, 1 Jun 2021 22:07:44 +0200 Subject: [PATCH 04/95] sqlx-cli: 0.5.2 -> 0.5.5 (cherry picked from commit d8c7fbe7616d40d1ee68c803660de4c4ae6770d9) --- pkgs/development/tools/rust/sqlx-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index d13481804c4..c183ddb760f 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.5.2"; + version = "0.5.5"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - sha256 = "0jz0gddw1xp51rnap0dsyq4886x2glmr087r1lf3fxlnv6anaqn9"; + sha256 = "1051vldajdbkcxvrw2cig201c4nm68cvvnr2yia9f2ysmr68x5rh"; }; - cargoSha256 = "046blw366d6zjpq944g9n4cdhhv2w97qfi1ynljc9bnz03d8v39c"; + cargoSha256 = "1ry893gjrwb670v80ff61yb00jvf49yp6194gqrjvnyarjc6bbb1"; doCheck = false; cargoBuildFlags = [ "-p sqlx-cli" ]; From 8b0cabcf5c97345c9fb7e2e763521f5c5d20a924 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 3 Jun 2021 11:24:19 -0300 Subject: [PATCH 05/95] gitRepo: Add import to ssl module to avoid runtime error (#125373) Co-authored-by: Ricardo M. Correia (cherry picked from commit 8f166b95c9ee10743039d1f2b1c21f9edee5da88) --- .../version-management/git-repo/default.nix | 9 ++++-- .../git-repo/import-ssl-module.patch | 28 +++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/version-management/git-repo/import-ssl-module.patch diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 7b29e466160..75a9fe37764 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nix-update-script -, python3, git, gnupg, less +, python3, git, gnupg, less, openssh }: stdenv.mkDerivation rec { @@ -10,9 +10,12 @@ stdenv.mkDerivation rec { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ="; + sha256 = "sha256-SuHp6C5ueUErvRiWDQNEmCybFIa7Iu7C/FtnHys9XqU="; }; + # Fix 'NameError: name 'ssl' is not defined' + patches = [ ./import-ssl-module.patch ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python3 ]; @@ -34,7 +37,7 @@ stdenv.mkDerivation rec { # Important runtime dependencies postFixup = '' wrapProgram $out/bin/repo --prefix PATH ":" \ - "${lib.makeBinPath [ git gnupg less ]}" + "${lib.makeBinPath [ git gnupg less openssh ]}" ''; passthru = { diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/applications/version-management/git-repo/import-ssl-module.patch new file mode 100644 index 00000000000..efc3d2b1f8a --- /dev/null +++ b/pkgs/applications/version-management/git-repo/import-ssl-module.patch @@ -0,0 +1,28 @@ +Fix runtime error due missing import + +Traceback (most recent call last): + File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 1339, in + main(sys.argv[1:]) + File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 1304, in main + _Init(args, gitc_init=(cmd == 'gitc-init')) + File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 607, in _Init + _Clone(url, dst, opt.clone_bundle, opt.quiet, opt.verbose) + File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 912, in _Clone + if clone_bundle and _DownloadBundle(url, cwd, quiet, verbose): + File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 860, in _DownloadBundle + r = urllib.request.urlopen(url, context=ssl.create_default_context()) +NameError: name 'ssl' is not defined +builder for '/nix/store/4hvds8fv8xmzlm86yg9cf1lj6hrya7sg-amdvlk-src.drv' failed with exit code 1 + +diff --git a/repo b/repo +index 8b05def..f394b3e 100755 +--- a/repo ++++ b/repo +@@ -236,6 +236,7 @@ import optparse + import re + import shutil + import stat ++import ssl + + if sys.version_info[0] == 3: + import urllib.request From f035fa6ede597fa9473783382b594b94ed54fff4 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 3 Jun 2021 17:10:38 +0200 Subject: [PATCH 06/95] php74: 7.4.18 -> 7.4.20 https://www.php.net/ChangeLog-7.php#7.4.19 https://www.php.net/ChangeLog-7.php#7.4.20 (cherry picked from commit 23548b255290bdeb90f5caebb1ac306a1b323e28) --- pkgs/development/interpreters/php/7.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index dd5c6452a5e..79e736b30d5 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.4.18"; - sha256 = "0bw4q7svijsqi5vinaspzzqyli2pvmpz6yf83ndqixf6x4r5ji9f"; + version = "7.4.20"; + sha256 = "0d5ncz97y0271dsmz269wl4721vhq2fn6pmm9rxglc756p36pnha"; }); in base.withExtensions ({ all, ... }: with all; ([ From f11b59b21b237685dd7fa3893943cf00c62ff98d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 3 Jun 2021 17:11:10 +0200 Subject: [PATCH 07/95] php80: 8.0.5 -> 8.0.6 https://www.php.net/ChangeLog-8.php#8.0.6 (cherry picked from commit a3c966cc7aefe169fc0d6a73dd2f0d765177c23b) --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 5e392549e02..7f61169b811 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.5"; - sha256 = "1q08xx9pbn7plsnfh6j16jj294vm968ng1n5kaqw7apgxd7r6p8r"; + version = "8.0.6"; + sha256 = "0vjji49a8pbhzy1q6l4id95ixar2dqf1bkqbxffh64k0svdaka16"; }); in base.withExtensions ({ all, ... }: with all; ([ From fb4f4addaf671a894e4b27ab67ad20451ed8f7da Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 3 Jun 2021 20:46:34 +0200 Subject: [PATCH 08/95] php.packages.composer: 2.0.13 -> 2.1.0 (cherry picked from commit 5880c1c4bf29b4040d4464c592bc1d0b75adbfcf) --- pkgs/development/php-packages/composer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 6a9cffa8ae7..65f48fd2785 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.0.13"; + version = "2.1.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-EW/fB8ySavZGY1pqvJLYiv97AqXcNlOPgcUKfSc2bb8="; + sha256 = "0vp1pnf2zykszhyv36gl4j3013z4fqv9yqj9llvbvmmm9ml8z3ig"; }; dontUnpack = true; From 5527182b0b53d4e84839e8c5af5e324a184b4fa5 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 3 Jun 2021 03:12:42 +0900 Subject: [PATCH 09/95] thunderbird: 78.10.2 -> 78.11.0 (cherry picked from commit 7267b80c71df31360bab7fcfacb644081a850bf4) --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 34799f3898f..31a15d69487 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.10.2"; + version = "78.11.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "3sc6n3n9bqnsq9qn9myanvxpgdx20c803prla3p236hwidz7snmyp2097ggn42xp765km55n11drxalnslsxdypgjikbfdqal05hf5r"; + "1m12kx830pfzvby8j9i5nb9c5v71vlg4wr0qrjgg3pw5ml9j5x7myrqyfd49l2qppm3xjn08srvmf45avnwq0lrys4sb83iwsd46sf6"; }; nativeBuildInputs = [ From a593d12cec0f2d0c3f4613f60c6f14a27d0c85f9 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 3 Jun 2021 10:46:54 +0900 Subject: [PATCH 10/95] thunderbird-bin: 78.10.2 -> 78.11.0 (cherry picked from commit 79f71ef9aab48926e8cd0708afa45b0d611808f0) --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 3b4ab2839f0..82bf1800bb0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.10.2"; + version = "78.11.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/af/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/af/thunderbird-78.11.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "095f6e89aa3f1fcd2b2f92bb56777d10fa997dec6aa3098a3109511e2b07927b"; + sha256 = "061da958c7e0b52c76cc3152cf541eabd855e7189f976b9743792e52ab733ea8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/ar/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ar/thunderbird-78.11.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "2a4e1461f291711196ef0cc717824d364ddc35ef24e7fc202b05939c59e8409f"; + sha256 = "915ca02f6e7639adef01d8e332133762bd3f88df6a1c12e86a86c04010efcd69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/ast/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ast/thunderbird-78.11.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "361e614c83311619ab64e61b1ade46b3f36093b7ba9c5d3fdd8046bb7e0e7f59"; + sha256 = "6a1995efbca69e251ca70af570b02d94a99f83ef7927d667f9f856febc53ff40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/be/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/be/thunderbird-78.11.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "f86b8494488b18c9892daaf6d4c62234bfd060b8313107c4a638862d94ba1950"; + sha256 = "28c87eb1651bb4fd00d8b52b3f0a4e0520ceeed76305ea124915c238562f28a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/bg/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/bg/thunderbird-78.11.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "0f47d29aaa13aa5018f3cb28b10547586f22123f1cabc161610c83c60aa357eb"; + sha256 = "24bb2cd51bdf4e99fe88a13c70289f3896cb17c911d556150f1c6e216f3ef5ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/br/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/br/thunderbird-78.11.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "ada5fba11311e356fc1b016728bb5c229e85f1900c0b102e3a392de4124c8022"; + sha256 = "473fe2acadfa6e4f6ba8eddcfd4377c3eeb583f6510461e6f51b9dcd89d36ace"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/ca/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ca/thunderbird-78.11.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6f74a52f34f9449fb1530f308b738b7af2854b1cc9a5301a1f771bf36e0bcbc7"; + sha256 = "d128adb596f6be2a940a2544ad653c812c177b3d08ddac7de716fc3ce603b71c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/cak/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/cak/thunderbird-78.11.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "3fb516dce71d9e44ad509724a61c92f3d45cddf9c82f9fdf0f948fdbc2549583"; + sha256 = "cff975db463997677d392264e55bd73a3c1a36e34991f8bcbb0673980f428589"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/cs/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/cs/thunderbird-78.11.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "47b70bdc716049edae3beffacef19dcab5abafc0b2f674f04980983d07ba6acd"; + sha256 = "90836d8c099594ca0e459d7d07232ab47d811cafc79ca5ad2999186f242fa8c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/cy/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/cy/thunderbird-78.11.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "279b9a9190fc7033ee223b72b361d715f5f3ddc701c51bf18bd325b667450a12"; + sha256 = "2a844b7afe834dc6e0ad291a6d5cb9ca0389d703f9a8ca385aabf5e5f012c4c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/da/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/da/thunderbird-78.11.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "19340a3dcdec6ba26eb08c0a65cb0790bfa4c0ead09126fa8cdd2aa3cbb692dc"; + sha256 = "a37075627a6955abfc15508d2bb4a16ba330a4c64c89f95084635319ad5106e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/de/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/de/thunderbird-78.11.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "09fb186c140013906af953729e7c42047c415e57b6a34562b7638f517ed5a03b"; + sha256 = "6e03c8b0f791cc09b04b3114e8b44950de974beabf0563705af625ac1226dbb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/dsb/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/dsb/thunderbird-78.11.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "12903ffe77c9e678b418ab5cfe76d3babd36aeef286a9976fd85f1051c2a2fd7"; + sha256 = "546f10d4653940798540797deeec54287cd1275b5ebf350661d49cd313228ddb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/el/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/el/thunderbird-78.11.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "74ac5f4175a6cacbcb9643761b022fe52cff03afe9754acb53effc1a5735cb7f"; + sha256 = "b6fa7ae657a03c4f91905e95931af05b9af588a067a03a3a8a0d9faa8d40b59d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/en-CA/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/en-CA/thunderbird-78.11.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "5a1be335a0a4534308bc6b3c8bee8c592475b7b2b65a070412c7cf44de0e183f"; + sha256 = "5507e9b74cea95681a2c7c21cb5127a7369366bbdaa6a24dbafc7a4fbe11b924"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/en-GB/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/en-GB/thunderbird-78.11.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "da6b0e21275e49202cbbab6a85e4601550ba21b8de5535ef0e252df6d693a2c2"; + sha256 = "fcaa2b652b43367fcb720e8386cdc92346318bab67fd720c5958e7ec236c0844"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/en-US/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/en-US/thunderbird-78.11.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "3f35551b1bf9b588c7e16810312fe8274bd06283974913e881ca5e7b6035666d"; + sha256 = "688a2f7274581fa4735a6d2f8166ba262999694889635bf3bc30ac77ad746fb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/es-AR/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/es-AR/thunderbird-78.11.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "22e962bbd6d38f4eec50d31638bb7d895f2a7be1c626b42605bffb071328a468"; + sha256 = "506a63de366968c6a3e66503def57e621cc2458ccf07ccc53ffdad72fdab8914"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/es-ES/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/es-ES/thunderbird-78.11.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "2237c69f5b2bb8e0b975be18ec5413c46aacf6a8910120d90707909acd7b1e26"; + sha256 = "974acf65d509929d6b8175ac99a2886f17d4dbc4a6b8d4ef50e82585e1ea9fe6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/et/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/et/thunderbird-78.11.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "630f76686314f7214cc672a7b2f9d501cf34350dd5da5c8e03564e1debc1ff63"; + sha256 = "504c97962170388d6fe249c24b6f5a62025ebf9bf4b30b65fbfd3baf12756809"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/eu/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/eu/thunderbird-78.11.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "63c62c592f00c35f2489ca7806dd2861fd1179ad367ac14529dfe117b3050bae"; + sha256 = "b4c4bd5b228f2b945dc8f280b12a72dd68dff10562c4f19b5a27fa94a95d9128"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/fa/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/fa/thunderbird-78.11.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b750c02dfff907d6d530d4e7b481fbd9115c02fcd5eb22da6d76f163f2f66cf3"; + sha256 = "4384d9579304ec344f616e00a51bebbf5038e212cc54d07586182fce9558af91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/fi/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/fi/thunderbird-78.11.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "fd385a85a1e28b75730ca8ca73181c5571a3ebbb51ae1c095bea8f174db3f37f"; + sha256 = "89bba8ff928caa79b8b1947be761388e441f01655f200f4a7fb9d9894b3ea4e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/fr/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/fr/thunderbird-78.11.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f0b8be6aa87f221262725785eee2a06b4bb0e191f2ce9350f40c6f62014272c9"; + sha256 = "c2953ff1879ed8f80f6b9f1a26c08ba1f5969e8b47b81a3eb3ab690698142bbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/fy-NL/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/fy-NL/thunderbird-78.11.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "242760433a15d6509bcd617f82a2a3b2a27c34197420fafb02cc8bca17d0163b"; + sha256 = "58057f7bb143512c1171296413050178f0a7a0651513e7c67d153af5874aa382"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/ga-IE/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ga-IE/thunderbird-78.11.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "5b21caf17170642158945dfaa383729226ace99f789b7ed7babb08ea98bdaf8d"; + sha256 = "94c070e79bba7a43f3fcc8b0b1759e424366f3ced72e2e53c5fe75689602a0ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/gd/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/gd/thunderbird-78.11.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "21b2d8d9107bcc4e4d0a453f9eace739e349c31d556672114fcc9ef7bc81e0ea"; + sha256 = "a655074ab7d0f86318199ab32b77c889ccfd366f6a0d9d43b4bbeba54ae2ee1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/gl/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/gl/thunderbird-78.11.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "32329f7d8f0256c0012ffd0d5a88f7abeff22d89adb6d1ffdaca05cb74a6a9e4"; + sha256 = "2835735ebf7f518aaf8d16ca3cedd3e7f7414e0cc1177a185b6e896da7e2c87f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/he/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/he/thunderbird-78.11.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "453f0348607ef24799f190ecae102ee35cf21212c3ee978ac275457177c5d91a"; + sha256 = "804c359b76026631e5a0ecf40258782f24f0be4d34b700b2aa0532607e4c5651"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/hr/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/hr/thunderbird-78.11.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "845dcc473833cc306dea211448a9719ab72daa57bf952e8260e28d5df616cd92"; + sha256 = "d7278bc20c7eb6c071648b639064338ae8cf7535476c0493b642d45c0ae9804d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/hsb/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/hsb/thunderbird-78.11.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "179e106128bda04f3109e76023031e8441e174bacf4fc4f8976c7bce4be291f9"; + sha256 = "fb520d80d1505b50b8d9e2a43c10512e001b120790c823eb41dcc076e68eca51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/hu/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/hu/thunderbird-78.11.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "59901e6396d16776c281c83f3cace029b8b1f9171ce58918d9af86144ffbb576"; + sha256 = "20639f623995f76b2f7d5f8d81e08145767d2a67d97fbd31542599abd4c80a57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/hy-AM/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/hy-AM/thunderbird-78.11.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "5bcde77ed1459713d8a33ccb34a003f3e863f53a6f4fe853d8a5982eca3d0cef"; + sha256 = "bf4c1fcaa9bf928607dade6d8fd16b47fff6c248c07ef86fcb20c0b3a6841ba1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/id/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/id/thunderbird-78.11.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "994e5971a0e269bb392f5b54b79ee58c42f222eb593c72a0515df5a12784a423"; + sha256 = "03665c9cfdd39e8ebb568151a28ecf02e425bae4241de74bdb47a0f9f38e26ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/is/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/is/thunderbird-78.11.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "725b7dc0b9528b868794cd94e1c845c2f9816825b8e3f8f6de466e84ddf02447"; + sha256 = "1efb313ae0fc03d402f306ca0258ea4c784a762a642f947065e154c382e9135b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/it/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/it/thunderbird-78.11.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "036516a7978eb98407e6ce97cbcb5c4269f0fe72ae2955dfab925812912be28d"; + sha256 = "95e1c07248c8ef1ab36b8a57729615a4f2ab9a4cb6148f1b0bca20554901ffca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/ja/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ja/thunderbird-78.11.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "c9c05bb9423e4f72ef782322da54d5d6e2f751e3dea812dced5956cfbfe4f494"; + sha256 = "95c592c41b1199bc280c219a8b4873e2bdb18171c4cccff4809a5a87ccb52d0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/ka/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ka/thunderbird-78.11.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "75f096a651b8538f6565dc67158a9398d5c97799da708f12e7ad781c99aa458a"; + sha256 = "85566d54dd72a9ae9d6e3e5b85ed2ad01fe7d6e08e33b02985bc4e78e55dc5e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/kab/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/kab/thunderbird-78.11.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "edfe5788049f41860e958bc3f04c4b61c5199a1c1c969338d09218813e6dbbbf"; + sha256 = "cf7f8a9975f9ce163bba8438121cd8090a498877d65d91694aac198f4307bc90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/kk/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/kk/thunderbird-78.11.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e838db372ca7e93c69261883b0803baf076109192c0524fd7d159d4111eec76a"; + sha256 = "9ef1e12e02ed3e8a05f58da73e0221ac6545c515eb2e236b4a99b4594afc10af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/ko/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ko/thunderbird-78.11.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "b3245edbcd50e24f81804eef56246bc00112d7d2303633777ab29e4560ef7595"; + sha256 = "6d028659f0b239b81dae7dfe44b96015ef1a217cddb135fee3bd8884e7b442c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/lt/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/lt/thunderbird-78.11.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "60a8d3e6b634277c41bcc89287e2034ba41cf251d354209d2f7bfe01f7042258"; + sha256 = "90f11349d4f5a674457f541b4edadd83b6a8f32f56eaa0a4d49e9b2c26dbbe47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/ms/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ms/thunderbird-78.11.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c39efc74560d6eab6183b4af517d6eb538a4e17b2a943e59b4d1760bf31f8259"; + sha256 = "f235748f67ad749d8b020288df8c7251bcbd9d1bc4bb979554928f54270c1f88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/nb-NO/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/nb-NO/thunderbird-78.11.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "f663e884cad7ded824f03952a8c563e317dd5768962fb13e3e484cfdf2061e42"; + sha256 = "de2bfc3bfc2f285a42cbcc800867395d132a56f3aaed8ff687c9e95706164ad0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/nl/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/nl/thunderbird-78.11.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "e4a48f5b5d3ea2310b0236f030086defb6c3e07c0cc21a1123979c31b5a7020e"; + sha256 = "4b7be1a4717a4b42bdf3b7583b2a1fa6cc9cfcad52ac7fafa4435230dec70048"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/nn-NO/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/nn-NO/thunderbird-78.11.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "5724f509e78558ba4f81b695e8ede6530ed11c355544a717791f21de2e9bd13a"; + sha256 = "0ba39f2e8b6895216d97e13809749fb6a1237c5bfd0c1f8ef9e365218d1422e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/pa-IN/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/pa-IN/thunderbird-78.11.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d0c0b1f7fdf8096f2b68361a2d0d50b96b763f4b06b59ad83299cd3a50fb64f4"; + sha256 = "2bf07cc1f213c20b2f181cd104eb6cdd6b5f885ccff2774817ad95840addf3ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/pl/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/pl/thunderbird-78.11.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a6960122b0a16afb23151039da5b815e3fa49924459a7e2977c5a6ed757456a2"; + sha256 = "9d2607c5d61ef121a383eb71d5bb650ba0ccb6b441666bbac5a9f3b91377f574"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/pt-BR/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/pt-BR/thunderbird-78.11.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "8cda6290381759cf776d0d3d8ce5df1fb5e9eb646fb0d2c6d294e04bc11548ba"; + sha256 = "cab1a3fabb975895b0c57bb4cb3b90f9386d0c33228b24edc13095d7d644d727"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/pt-PT/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/pt-PT/thunderbird-78.11.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ee722a15adc1091789655fbd1acfb73bc607853ccb9eeb19c02aa1a0af7c27fc"; + sha256 = "53b44f8caae2a2ca878435d988dbaec7c188c2fe236efcda8b92b4310aa3119f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/rm/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/rm/thunderbird-78.11.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b9995a75cf4b874060974e8418f26ff2bdc6c5e620d55d36ff856a3b0415a9ae"; + sha256 = "f170779793afc440c273b8826cc456af903a98ac9694b1aae6ee50a5bec2be26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/ro/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ro/thunderbird-78.11.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "078033f2d95dbf736d1f52da07c8b373b8d9f76cb1054495f9c2b9b39da56b4e"; + sha256 = "d0628abef66e2585db898834ddbd3ad9e97edea7269538dbd4b4520f22969b4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/ru/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ru/thunderbird-78.11.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "1c29d7ef67161430f392ed02e3344e136ca16199cef14df75af472c096e94f4a"; + sha256 = "077b682cc7365aab8fb3100d5f487fc873a16a4fcf71dc25e63a2604b57ccc00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/si/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/si/thunderbird-78.11.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "67829f91431cbfb1213fb9c7e70b4dcd25b4c2e0b3b433e466684ae582e583b5"; + sha256 = "7fc582c2f23b197da426ff0150941ea59fe1da26c84df41bff88039ff3fdf4fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/sk/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/sk/thunderbird-78.11.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "73d935c1b4f8e353a3aaffedbbe91a34c3ef09e10de8526fb1aeb857640bfb4f"; + sha256 = "cde3c240b1718085b36e9479eb9717202c1a179d9cd2cd094901074d666fb763"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/sl/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/sl/thunderbird-78.11.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "0686fcf2458572e3be774b1a18400d649bb8618910b3d92ea20a0111a2373dc3"; + sha256 = "54ee18a338c727838db7cdca4c458d4b9248c626a3338ec83c41001d124d2917"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/sq/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/sq/thunderbird-78.11.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b3245baa380a84916021643cba7dedaf8c4b030df87ad358b03f245478cc3a84"; + sha256 = "511209ca3eb810250fef3b0b01f71941bc0436410716974244aa9b5b1193582b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/sr/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/sr/thunderbird-78.11.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "8436ecac0bbac402c24fe75ee94272d8cef563f31dbf52027bb6c429df3d52c9"; + sha256 = "d22da1e4ab790ffb3e8a8c3928adfe8c1b7b65c08a5dbaf2bb63473b08fb5207"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/sv-SE/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/sv-SE/thunderbird-78.11.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "288ccc7ba5040126801af4fc9a19a44e6498a034fbc483ae8bd626b8c11e0fa1"; + sha256 = "c7826bfef5b705fb5d00b6ade07d092bfed25d74b6992308027e8ea99f2ed16b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/th/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/th/thunderbird-78.11.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c59e1b0cddf5b65690acbcbf7a23c08db290bf953eafc0cc7c1a8f6ed6da5312"; + sha256 = "cba4789bcd072a21d5e131f0aed7aed1775f6122776f873b54fd9832bc5b621b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/tr/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/tr/thunderbird-78.11.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a0c894db24906ce1b4386acf404feb212103ae5d1ddab7c2e2b77a0903a133c8"; + sha256 = "8f8345e6722931b495755ccf67b0546443e11d435cfe809edd00f6e3565a17bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/uk/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/uk/thunderbird-78.11.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4ed5efc42866fe755a62a84a74a6f7535e50561fe3ab6d54b9765b0da93229a6"; + sha256 = "cce394a934ab0352cbd980d29a61fc1be4e66636ab5e31d358fa2efc82e17c19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/uz/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/uz/thunderbird-78.11.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "690a6d3b774be3f4cdb8468e191de18fcc1ffce06046c32f25207732d16da1b5"; + sha256 = "4a94d98472bcbb34a19b58c8e4caeb2e29c58d4d7496ba0d4af02a8aa0fe3802"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/vi/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/vi/thunderbird-78.11.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "30971dab3bf4e13665d779d83bff7ee0ca9bc126d57f446f7472c8bd5ba490ee"; + sha256 = "a48de334712d154917d6285a84ab115f48e672fdbcd9a7469013d3b07524562e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/zh-CN/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/zh-CN/thunderbird-78.11.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "00cba2ab030699fe429d138dd572fcad5c4aaf6236f5e6ff8659fe577c27aff3"; + sha256 = "6892a5236ac0abecaa657b98929fd9feeaa0ac9d4d64e000ced26687c4fa96a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-x86_64/zh-TW/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/zh-TW/thunderbird-78.11.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "4eb969ea56666f12804dd7c63f5872be4c0194d10335a52dbbb041c5c18d3e53"; + sha256 = "292ae08c031cd40a493348dcf39adfecbb9372288cd2cc4bb5ada9eaee5a7649"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/af/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/af/thunderbird-78.11.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "8484971834097887f0b2f61286fcb14fa1f60bbd25d4d54f6ef5b390a9eedd64"; + sha256 = "26a1e66facb1839a8a2dcb2fffe3677a5d6f9c68343293625b22faf553ff1244"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/ar/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ar/thunderbird-78.11.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "345546bf8da50e507c8205cdd9e933e1bec524080f9c4c439c26a1e55ba8e22f"; + sha256 = "6625bb6b5374ae174b21d53735c4d51d3d8464556ff42ac9b270908991837989"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/ast/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ast/thunderbird-78.11.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "d11e78aa384af2e11a6ecb41d82f0fbc1d1b4b19d137ff9ac15f8858dfa0a3f9"; + sha256 = "57e8de5bbace8def637356ac7b519155411f8b5b2dd6496ebbdde102fea490fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/be/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/be/thunderbird-78.11.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c99b7cb728432c4d8d5281206e7a72757621066d2403fe9d2305ce9f40635a46"; + sha256 = "c045e2b129cd373ed1b2a6ce4d12d4dd3dbcf92c380a1dd8fa237f001f7c5bda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/bg/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/bg/thunderbird-78.11.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "e8a6e2e53757a27954728c87a23f1631148d9391118d16cde1a8eef31c641317"; + sha256 = "5bd9ded232f60b88be72a5cd301b02c6bc6a6651be48e08ebe5358aaa801dd6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/br/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/br/thunderbird-78.11.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "65c138cc97aa673c8a44f7faadf3f31524ea71a1e5b8ad9d5cad7c0c9fcb39f7"; + sha256 = "1dc7583fe66a26b040e1a46281964898c5a79ead6516e02a0c1ec7a175962621"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/ca/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ca/thunderbird-78.11.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "0eaffda4000d85a5f369c3be6edc9561c54047def9d8790af0195bf3fa7f85da"; + sha256 = "68cc1ba9382be6d5b90e94fdc6fd1403b2b07c67759be80d2623fcd41b16f51f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/cak/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/cak/thunderbird-78.11.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "0765345951e7a3c4604ba633f7e029cbad2af783e72325147c4a1e48a5cb65bf"; + sha256 = "006d1806c7ce336fb51bcc74d4907a6aacb43c0902e0b323b638f9a9d2664ed1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/cs/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/cs/thunderbird-78.11.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "2c254e630288415de40276ef6e4d59bdd677568a4f24629136e36938fd03563c"; + sha256 = "5b342803243a51a9e521705c1082c87cc528ac59475d6b893ca475ecb10ee02c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/cy/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/cy/thunderbird-78.11.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "ce71a9c112876c4ff47c09e5feb39dbb3ed2c002c79abef8383735e9d74c5c9c"; + sha256 = "55bf6bc1aa371ad52097e89dc26af4fd11a2afc73b4ece79ae3c3bf0294fe5fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/da/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/da/thunderbird-78.11.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "644d65f2245f51c0ec992554e87223db813d121973c76141f6b0a121b9a278e2"; + sha256 = "41d21b7065bb4a11b80990daf550a29e5d588965c83cb48a762bba7bcbbec502"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/de/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/de/thunderbird-78.11.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "422274c487c76579600ab0c00b815e079a0225a6e87b2a8c9b2e2e93f252e080"; + sha256 = "190339793ab6b5bcbbea2e81a1c783fa91dc18ac702870bd045ba597d0c826d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/dsb/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/dsb/thunderbird-78.11.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "5c3676f8ce30fe42f0dcfb0ef8d793929527bef0d62e5014e48116ec583670ac"; + sha256 = "068243c6d19d9c5ba9ff4ce9793db643555657593659176fb543eba5cbde7c44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/el/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/el/thunderbird-78.11.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "94a3af4bc068b7bd7d3ef8e649dcd95a5db30aa4906b0702911ffb837b02ba23"; + sha256 = "ab93bb707a7bf50813b067c7d2f5f72e858073080e28094a917a4e5715612053"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/en-CA/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/en-CA/thunderbird-78.11.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8be631960ed39fdfb5d97f550a1be0d0de2bd237ad80162dc580cac17c79d190"; + sha256 = "2bbc9fe5efb8905d069174d939933b64dfeba6716f81487b4aedcea7e00fb48a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/en-GB/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/en-GB/thunderbird-78.11.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "991b14eb38814c70170e3404d5e659c00504c4792ed104d86097a71542ad0f0d"; + sha256 = "6ac3648deccc9b3b01575791fadec6bb9210aeae4d32934f7ae7ddee7d857b93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/en-US/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/en-US/thunderbird-78.11.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ab8487bfd03b26dea36db6da1e59294322392365da9cd6f13e2b454b07f9d77d"; + sha256 = "e423d465824e4b56f3899fb15dbac1b016832446ded5c46b8bde0c279ddd3df2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/es-AR/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/es-AR/thunderbird-78.11.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4e7c1248cdaf72d98a41738dee2e1c95b7e1be68beaee0eb41b0184cda8f75c2"; + sha256 = "925c762d84e4620b96b8feb73a4b5506fe3dc339c0ef316e23ef7ea636ad8da6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/es-ES/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/es-ES/thunderbird-78.11.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "af2c06a28cf1272d692f0a7d652716cc7419f92c069b828c3ceaae0b6e9cbbee"; + sha256 = "d75ea97c5cfa524c93055af618cbbd27a6ef8c2125ebe963467f0e93f9f80ea3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/et/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/et/thunderbird-78.11.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "1e8bb2945185187e5e3a21f66f0ef94f9431945f51f1d13fbd36d1b67a2e6e3b"; + sha256 = "f925832734574c0056ce60edc9630db70d262b993c913da167f01b51f9ec14b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/eu/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/eu/thunderbird-78.11.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "be969ada044ade28a438b35d8b65e4a14995e24341f15a06b08dd6da7b5ef7df"; + sha256 = "60f27f7d725bb90ec93ab247c708442506e9532c050bc7a66b5d23db2dcab91a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/fa/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/fa/thunderbird-78.11.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "8dedd020f9d7d0869c2d394f7f643cb6c95be59ce5e7a63a736493b66108154e"; + sha256 = "505373b341db6e20b90d555815974a232b6ec685b4301e9b81305092806d721e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/fi/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/fi/thunderbird-78.11.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "5d1fba8f83af7f02359b7469c036cc8438dc1284aa1c68676245966faa7aef81"; + sha256 = "6f9c715ae0d7db81db3ee72d822ea1d9395b30d0a4a2f46c50f77e4a156df27f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/fr/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/fr/thunderbird-78.11.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "49b23d9fae7f132908b8d3498fb5f17321c25037bf300188dd2916ac947f0086"; + sha256 = "5600b094c00d9607e91f2c28aa99de75c87999a1d16739f926812a0e9bdcda53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/fy-NL/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/fy-NL/thunderbird-78.11.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "7a4c4e6a7801805685b062b402c36d9c53e69864fad37d7e7da08270528caf74"; + sha256 = "3fd24a4704df03e83bdebdf9a98a085849a72de939aa21c8fb93051ca9ddab85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/ga-IE/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ga-IE/thunderbird-78.11.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ff396a9fd281a954c4f8fb7d244f4d38f525e6b4a2b60e6be349c77dfdc0cc08"; + sha256 = "1f69cea70de04de5458a877b9ac3c2cb9cb04a60f888cdb19118bb04156540e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/gd/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/gd/thunderbird-78.11.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "c7d41e9cfd5fc3b3f2b7500cb0c3825c54ae1b5a0ac43de81e7bd1d89e7d2937"; + sha256 = "d33666cb1812541a81f91b457a7d9d3dba3ede5b90f0e56d31d90dd8359e077b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/gl/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/gl/thunderbird-78.11.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "b029af91843cceeba4b0cb8f65290c7d8ae847b0e297bf16c9f596416fb7d973"; + sha256 = "5694106a7bccd7dacc35d89f4c2dc3080be40f937d5b3a18e6797a2dad1dfdc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/he/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/he/thunderbird-78.11.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "0378df8e3e79fbdc85bee602d2215a088f9f9bffaa65ea66808fe27efd38ef3f"; + sha256 = "77e2e3e1872c67de101d3fca87a3c308b26eb47f06222f0504a95e42f9248d39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/hr/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/hr/thunderbird-78.11.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "1d4c9f9ff3d78d049769404088bc2cc8e7c45480aca2da53974f3388d0f156a0"; + sha256 = "513c4d88387c7ac3463047b4e84c2f049dcb0dcc205bcf0d1b6935f94db16a88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/hsb/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/hsb/thunderbird-78.11.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "8a0bc3d8b5c58b44f299243c7ac9e0166b530c26e6c7c71a2eacb7b6e2b9d9c0"; + sha256 = "f2731aff055f734befefbd17778ccf8962c882266443b9ff5e6e6babcc09c0c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/hu/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/hu/thunderbird-78.11.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "6ea2a35507444301cc1a7dd970a69b21a350254cc5de676406b09c55596e146c"; + sha256 = "c29018382b2d0d45727e23bbaf3a37661ccb7908912a24ed5ff3042766ecdec9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/hy-AM/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/hy-AM/thunderbird-78.11.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "f6f744b1ecdff58e0bf1ef315705f8e0dc17bb3fab3db3d6a54004632eb5e037"; + sha256 = "f9152a462ac758fe21c46e734bc8d8e727479f4cc8c7c26cda43bfc896244596"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/id/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/id/thunderbird-78.11.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "6cc9fec045a8ba154203fa597e4c67335e4461dc2026d27cc7675b9ebef03f8c"; + sha256 = "e336ee15d25b0edca6492a765af7a6b0eed3ef30155c908e4940985e373304b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/is/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/is/thunderbird-78.11.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c2e9b5fba27f077833c49910dc82922d80fa3d34b954aa5440626030e103a6c6"; + sha256 = "6495cec1de969c1f30ef042fe604027014161497ed77eb327451eb4a70f7b1a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/it/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/it/thunderbird-78.11.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "62c7ba5135cd6c4cf3e079dc91699574328146d1b7258b609d8e6374be5a1596"; + sha256 = "7bb395c5b3cda42c41196f06be6ed2f35eff958c3a9325807c42616b971087c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/ja/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ja/thunderbird-78.11.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "3cf3692667897274da887fd7b055f9b3887cdd62d840fef44b83a9b991ae6a77"; + sha256 = "ec313b0754cffa5ed388e983faa394b146cb5227c99e74ee681ab833540b1cf4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/ka/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ka/thunderbird-78.11.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "5f06a74d0b4aa431648424fd0c074f192914da9d28bbd54b8303372aba1201ec"; + sha256 = "13b8d137d2b1da647ed603208a4cd275e5cc11d3395a5709629ed8965c5c355d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/kab/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/kab/thunderbird-78.11.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "42540cb34f2f32eb713dec1609ac708b176110a09e6be5723fad3f1d1175d251"; + sha256 = "a8780a5af7cd112d05a2b13469ff40d09c1909b2a09012a4ac7883b8555c3b71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/kk/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/kk/thunderbird-78.11.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6aad09c45d90c39b2b3b81b26888de00e1e8593fc53304d87fec5b6caeee2459"; + sha256 = "1a1b0ac46b10eda11ffa4a53dcf53c1dce2a2a52355e08e44960d135a8feea91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/ko/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ko/thunderbird-78.11.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "94291ef5626c5d56b7923648ccaf0723bb0588a9898dc8b28f227949c138b325"; + sha256 = "312c211b3079191b5d53cf5052e0225fee2b4e699a848b3d29a8efdf3192185b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/lt/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/lt/thunderbird-78.11.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "10bc645a6577fd310f0bcd85f686d6e43a2c58eaf910e3d084a97fbca3d3c4b3"; + sha256 = "817b079ecff259043a0bf3abece031c15e04a2a615b49314d8377da6ee8feebc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/ms/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ms/thunderbird-78.11.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "f64aac07837b287cfc55b30ef30989b91b1536ee3823087deb4ecd5e5dc35d08"; + sha256 = "737b88b2fd394851143a798508b537b921fde8c0648856e09426102e7962ef7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/nb-NO/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/nb-NO/thunderbird-78.11.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "250be8abfa2e95e89d01cce787f210db2ead934f58f426c8fef6b0807bdc37a7"; + sha256 = "9754dd9cc6ca38970a50b3f26d0d2fe1cb1c3a66a77829489cf6f2098f7f244f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/nl/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/nl/thunderbird-78.11.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "50d4354bef2bffdfc7f51f0d855aa27f1c2c4798d623b50f8517fb29e6055e95"; + sha256 = "b43da367f973e7b2899967c777514262f4503778d550bee27c5b11651555cc17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/nn-NO/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/nn-NO/thunderbird-78.11.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "6eaaf29fece0729b40e05b79d7c3875862eabd8c87fb992a1c36334437501dbb"; + sha256 = "cb0bae6a905c2ffc39f173519ab9dcdd7835c1b9c169f778727b55eeb8c67cfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/pa-IN/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/pa-IN/thunderbird-78.11.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "36a2de0519ab3edbbdff6e6ed00fb29be936c1db8083780e441832647a939ac7"; + sha256 = "d9d7c15ca519636ff93e0f1ec956e131b5bc92bb18a67c7958140ebd75ca84c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/pl/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/pl/thunderbird-78.11.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5f7289ff86b91e62365c0fee423e1823bf8642ac18e0377bb12f0a352df3e675"; + sha256 = "7cbe410b721565b676d6a9c0d09e163a7452b0a9137672f654f8fdeca6212a27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/pt-BR/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/pt-BR/thunderbird-78.11.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "e3107e2fbaaaa2be0bc1f54c837a26052f407d08cc0f6a9225045c295323b339"; + sha256 = "aa4fbe2a656d937559c8556549f0cc2d9f8fa0c75ad1ede55c9e8877a63538cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/pt-PT/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/pt-PT/thunderbird-78.11.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "76a119289c6fd93531945945ea9061b0e243a23b050cc6d4b65e50c84f32d631"; + sha256 = "63a2c44c1ec1486574c8addf920e8561f792d01fb8179239fb268e5277e68782"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/rm/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/rm/thunderbird-78.11.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "db6109fc701fd86068e2bfd28619f7ff3e8984dc2dd527b15069a636caff72de"; + sha256 = "8610c130d68a8d5f38ea179b13bdd17ab349cca8647470b4e2987937676f3c5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/ro/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ro/thunderbird-78.11.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "6ebd451d5dea498c610aa8fcf64033768dc63b1c5b3d911a078b885005387a43"; + sha256 = "d809cc26b134f707579e78e624f654b569d33d2282391943eeabfd494388f4f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/ru/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ru/thunderbird-78.11.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "fcbfbce5906a720982e1a38043afa9ad24af5dee56594846fcafe1d18f8f6788"; + sha256 = "1d73258212131087d878fac0087f758cd11209aeeaff075b0352f8414769d3d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/si/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/si/thunderbird-78.11.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "acd5bf205178b62a8f3c867d1eb9b25e8e5f9227e342375521f06474fae90618"; + sha256 = "342ddb753fc1870321613e7668a741269bfff786f21ff22f4f8f84f5e1df9c2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/sk/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/sk/thunderbird-78.11.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "021f126842a7320463b4eef88134d63b29cc8658351c140a1c25854dc4aec83e"; + sha256 = "241cae2dbe7130a3df8d64e99fce375c0966df0cf4dbd6cbddfb069f736c3450"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/sl/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/sl/thunderbird-78.11.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "cdee34a796c4a4d4c879fd93a08781784afe5d0f7795d3d0c8c26783500a26d3"; + sha256 = "d09d44f1fd9e90e71e67334eed2df3eacdbc2509782e625e25aea3b993b1f28a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/sq/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/sq/thunderbird-78.11.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "17c18f91b9152438ec0b12ee9d99a64d7a90cd4f8db5eed909b11df5b9fdad49"; + sha256 = "afa21cf461d53c2a3e781e45b7802a0b5ffcb0ca4c4452865bdbf2bceeb13776"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/sr/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/sr/thunderbird-78.11.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "7c471edbeda0ecee64bcee08a703e3726f8bd3dd9f2579295abd080d53afcb73"; + sha256 = "15b3faf5cef87e1101629410cdb169f81da94b5e1b0902d02b161ef67df15e8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/sv-SE/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/sv-SE/thunderbird-78.11.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "eef3af1ef0969cffbe960d420bf121293dc90aab7e45a4c3f601f8167a5ec58a"; + sha256 = "b42f3e8aefc4ebfc718ace6eda4d9416752dbec346f1a212fa637edfe08277dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/th/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/th/thunderbird-78.11.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "94ae0ccfbee17713cfd91f18e2c3a1f7d8bc9ecb717ba0707845b2f0c36ab47c"; + sha256 = "0972ee48e0f8f0e6f81831a5c8b3d832c7af05477a3f824afb252c1f32d6843a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/tr/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/tr/thunderbird-78.11.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c699ea9c567eee815530db25183a98db0cc96d244ec3dec151979b8ab1974748"; + sha256 = "5dccdb0c97511aab0926caf679dced22609fb0e702b87078ac9379c94b3aed37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/uk/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/uk/thunderbird-78.11.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "8b4ec008865b5114b2451464a7d9c518a084d0517dc54e58d9ed4fa568a9745d"; + sha256 = "526e1cdadbf15a0aee1b31607f39710f90fdd6ea23623c74fbc87928b0b2056c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/uz/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/uz/thunderbird-78.11.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "3a8864594a11e514a52e50b0188054b56d245a5737ec4465c6ff0f5d5678216f"; + sha256 = "46454f21518cdeee20dcd0ed3f57a45cf8ab3a240d55cf2df36aed253307fb99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/vi/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/vi/thunderbird-78.11.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "51991f70a7876b6dd07861446e9adf0939fd636396ff9588594638f644447530"; + sha256 = "d624ec4f25277ae1b4b463e0c8381371562cf4185aab3ed67b9463b3dadde5dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/zh-CN/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/zh-CN/thunderbird-78.11.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b185bdd74b03343dacffd4564cef1c0434b3a18614f1942325bd1c2230c64db5"; + sha256 = "3699eefc2f941a4b32305a934a02bb94b5213c4584bfeb816859de471e2d2f08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.2/linux-i686/zh-TW/thunderbird-78.10.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/zh-TW/thunderbird-78.11.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e26ac3909969514959e7b6bf60a453ecd2b555eac7ca7b798f3d38376b183207"; + sha256 = "9d6878ab69fcf266f1b226100a5b26d78d8d604f741827ae8f62fca665adf557"; } ]; } From f8455aefe9414323188c55e38f6d75b5ac1972d4 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 4 Jun 2021 09:27:47 +0200 Subject: [PATCH 11/95] phpPackages.composer: 2.1.0 -> 2.1.1 https://github.com/composer/composer/releases/tag/2.1.1 (cherry picked from commit 5ae9ac3e88ee9ecfde695c83ddfd7ca42d8d5f09) --- pkgs/development/php-packages/composer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 65f48fd2785..f81ee3005f7 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.1.0"; + version = "2.1.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0vp1pnf2zykszhyv36gl4j3013z4fqv9yqj9llvbvmmm9ml8z3ig"; + sha256 = "1ki106973q74inwgd4hjmml905rqg82808qq4wiysrkr7mzmfnj4"; }; dontUnpack = true; From 02957ca57b212ff61d79ceb46cf2f3c99c9e2320 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 4 Jun 2021 13:40:35 +0200 Subject: [PATCH 12/95] php80: 8.0.6 -> 8.0.7 https://www.php.net/ChangeLog-8.php#8.0.7 (cherry picked from commit 6b7b002544a8c0f907a37eeb4fd77eecd8c7eb67) --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 7f61169b811..9d357f88afe 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.6"; - sha256 = "0vjji49a8pbhzy1q6l4id95ixar2dqf1bkqbxffh64k0svdaka16"; + version = "8.0.7"; + sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj"; }); in base.withExtensions ({ all, ... }: with all; ([ From e387f0600ca884cefecea18203a57313b6a0c6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Tue, 4 May 2021 09:14:37 +0200 Subject: [PATCH 13/95] lightworks: 14.0.0 -> 2021.2 (cherry picked from commit 2c3d045bc31e7baab833b1d4adb553263e75fe2e) --- pkgs/applications/video/lightworks/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 0312c34bf70..9fcf40ec0a5 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv , gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU -, nvidia_cg_toolkit, zlib, openssl, portaudio +, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev }: let fullPath = lib.makeLibraryPath [ @@ -11,22 +11,25 @@ let libjpeg_original glib pango + libGL libGLU nvidia_cg_toolkit zlib openssl - portaudio + libuuid + alsaLib + udev ]; lightworks = stdenv.mkDerivation rec { - version = "14.0.0"; + version = "2021.2"; pname = "lightworks"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb"; - sha256 = "66eb9f9678d979db76199f1c99a71df0ddc017bb47dfda976b508849ab305033"; + url = "https://cdn.lwks.com/releases/2021.2/lightworks_2021.2_r128258.deb"; + sha256 = "sha256-IRzoysfGh/P+Xr50+cIjjaKuxdSzgCmJDICFtekfE3Y="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d45fa4e5e1..a161dee933f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24758,9 +24758,7 @@ in liferea = callPackage ../applications/networking/newsreaders/liferea { }; - lightworks = callPackage ../applications/video/lightworks { - portaudio = portaudio2014; - }; + lightworks = callPackage ../applications/video/lightworks { }; lingot = callPackage ../applications/audio/lingot { }; From 089308ac910b2cc5539c3953e95c630ef0f4b159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Tue, 4 May 2021 09:14:45 +0200 Subject: [PATCH 14/95] lightworks: add me as a maintainer (cherry picked from commit ccb691c7d156f26857159d324b788c0e3789322a) --- pkgs/applications/video/lightworks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 9fcf40ec0a5..ecc5a6491dd 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -85,7 +85,7 @@ in buildFHSUserEnv { description = "Professional Non-Linear Video Editor"; homepage = "https://www.lwks.com/"; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.antonxy ]; + maintainers = with lib.maintainers; [ antonxy vojta001 ]; platforms = [ "x86_64-linux" ]; }; } From 9f537a52df4d901d7b0081cc58a71e368939b784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Wed, 26 May 2021 11:23:44 +0200 Subject: [PATCH 15/95] lightworks: 2021.2 -> 2021.2.1 (cherry picked from commit a9edf3b544aba334814ea830b8650a38e56b69c3) --- pkgs/applications/video/lightworks/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index ecc5a6491dd..9d940cd29b4 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -22,14 +22,15 @@ let ]; lightworks = stdenv.mkDerivation rec { - version = "2021.2"; + version = "2021.2.1"; + rev = "128456"; pname = "lightworks"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://cdn.lwks.com/releases/2021.2/lightworks_2021.2_r128258.deb"; - sha256 = "sha256-IRzoysfGh/P+Xr50+cIjjaKuxdSzgCmJDICFtekfE3Y="; + url = "https://cdn.lwks.com/releases/${version}/lightworks_${lib.versions.majorMinor version}_r${rev}.deb"; + sha256 = "sha256-GkTg43IUF1NgEm/wT9CZw68Dw/R2BYBU/F4bsCxQowQ="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; From e7c8f2ff739e9787d3dd665561648d6b5fb0cc0e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Jun 2021 05:26:53 +0200 Subject: [PATCH 16/95] python3Packages.aiomultiprocess: disable failing tests These tests fail from time to time and bring the whole test suite to a timeout. https://github.com/omnilib/aiomultiprocess/issues/97 (cherry picked from commit c8261a34f80d67223589a498bc0acd4713ab21b3) --- .../python-modules/aiomultiprocess/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/aiomultiprocess/default.nix b/pkgs/development/python-modules/aiomultiprocess/default.nix index 7b84996a1c9..6403f396eaa 100644 --- a/pkgs/development/python-modules/aiomultiprocess/default.nix +++ b/pkgs/development/python-modules/aiomultiprocess/default.nix @@ -24,6 +24,14 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "aiomultiprocess/tests/*.py" ]; + + disabledTests = [ + # tests are flaky and make the whole test suite time out + "test_pool_worker_exceptions" + "test_pool_worker_max_tasks" + "test_pool_worker_stop" + ]; + pythonImportsCheck = [ "aiomultiprocess" ]; meta = with lib; { From 08866897e37a652cfc18013a8ddc6c2fa5cadcd4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 4 Jun 2021 21:51:55 +0200 Subject: [PATCH 17/95] signal-desktop: 5.3.0 -> 5.4.0 (cherry picked from commit f5be28bcc98e0a091c69df8d4e88a7b52452eb38) --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 0f0e5f062dc..19469783629 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.3.0"; # Please backport all updates to the stable channel. + version = "5.4.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "15lclxw3njih90zlh2n90v8ljg0wnglw5w8jrpa7rbd789yagvq7"; + sha256 = "046xy033ars70ay5ryj39i5053py00xj92ajdg212pamq415z1zb"; }; nativeBuildInputs = [ From e2fccba4efac2291af20658f152ea643de31568e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 4 Jun 2021 09:52:11 +0000 Subject: [PATCH 18/95] wireshark: 3.4.5 -> 3.4.6 https://www.wireshark.org/docs/relnotes/wireshark-3.4.6.html (cherry picked from commit 15974f58b8c216cf268f8c2302b036db701b31cd) --- pkgs/applications/networking/sniffers/wireshark/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 230bb2d4fe4..4888df54bc5 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with lib; let - version = "3.4.5"; + version = "3.4.6"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-3hqv0QCh4SB8hQ0YDpfdkauNoPXra+7FRfclzbFF0zM="; + sha256 = "0a26kcj3n1a2kw1f3fc6s1x3rw3f3bj2cq6rp7k0kc4ciwh7i9hj"; }; cmakeFlags = [ @@ -93,6 +93,7 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "https://www.wireshark.org/"; + changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${version}.html"; description = "Powerful network protocol analyzer"; license = licenses.gpl2Plus; From f0dfe62190d936767844195a48f585e26c7e4ed4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 4 Jun 2021 09:29:58 +0200 Subject: [PATCH 19/95] doc: Fix make in nix-shell MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When running make manually, makeFlags will not be passed. Let’s just use an environment variable. (cherry picked from commit 034a9c0e16aab12978bb4a1c1f0e86c64778b388) --- doc/contributing/contributing-to-documentation.chapter.md | 2 +- doc/default.nix | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md index 642beba74d6..7fd4b93f0d2 100644 --- a/doc/contributing/contributing-to-documentation.chapter.md +++ b/doc/contributing/contributing-to-documentation.chapter.md @@ -7,7 +7,7 @@ You can quickly check your edits with `make`: ```ShellSession $ cd /path/to/nixpkgs/doc $ nix-shell -[nix-shell]$ make $makeFlags +[nix-shell]$ make ``` If you experience problems, run `make debug` to help understand the docbook errors. diff --git a/doc/default.nix b/doc/default.nix index 25389fa2da7..ac382ec8519 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -17,10 +17,6 @@ in pkgs.stdenv.mkDerivation { src = lib.cleanSource ./.; - makeFlags = [ - "PANDOC_LUA_FILTERS_DIR=${pkgs.pandoc-lua-filters}/share/pandoc/filters" - ]; - postPatch = '' ln -s ${doc-support} ./doc-support/result ''; @@ -37,4 +33,7 @@ in pkgs.stdenv.mkDerivation { echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products ''; + + # Environment variables + PANDOC_LUA_FILTERS_DIR = "${pkgs.pandoc-lua-filters}/share/pandoc/filters"; } From 91c7763b9da3a5bf0c3f9b709eac6b03c66d117f Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 3 Jun 2021 22:55:35 +0200 Subject: [PATCH 20/95] pam_u2f: 1.1.0 -> 1.1.1 Fixes CVE-2021-31924 https://www.yubico.com/support/security-advisories/ysa-2021-03/ Changelog: https://github.com/Yubico/pam-u2f/blob/pam_u2f-1.1.1/NEWS (cherry picked from commit b5afbd350dc54553376bfa29e693b680be3c39bd) --- pkgs/os-specific/linux/pam_u2f/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 760af73fecd..30a55f2b9c0 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pam_u2f"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz"; - sha256 = "01fwbrfnjkv93vvqm54jywdcxa1p7d4r32azicwnx75nxfbbzhqd"; + sha256 = "12p3pkrp32vzpg7707cgx8zgvgj8iqwhy39sm761k7plqi027mmp"; }; nativeBuildInputs = [ pkg-config ]; @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--with-pam-dir=$out/lib/security") ''; + # a no-op makefile to prevent building the fuzz targets + postConfigure = '' + cat > fuzz/Makefile < Date: Fri, 4 Jun 2021 22:31:13 +0200 Subject: [PATCH 21/95] rambox: unmaintain & mark as insecure Rambox hasn't had a stable release in a while and an increasing number of issues which is why I don't intend to use this anymore. While taking a closer look at the source I also realized that it uses Electron 7.2.4[1]. This is not only EOLed[2], it also contains a few security vulnerabilities which is why I decided to mark it as insecure. A few (most likely not all) vulnerabilities can be found by looking at the Electron 7 changelog[3]: after 7.2.4 there were a few more releases with security backports - mostly from Chromium. Security issues that were found later on (and are probably exploitable on the dependency chain of rambox) aren't listed here. I only added two issues that seemed applicable to `rambox`, but I haven't researched enough to check the other ones. [1] https://github.com/ramboxapp/community-edition/blob/0.7.7/package.json#L70 [2] https://www.electronjs.org/docs/tutorial/support#currently-supported-versions [3] https://www.electronjs.org/releases/stable?version=7 (cherry picked from commit e2a15cd395f1e137c680d22f83cd195caf3d6c14) --- .../networking/instant-messengers/rambox/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index cbec6babec3..8782a4bc5be 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -21,8 +21,11 @@ in mkRambox rec { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; homepage = "https://rambox.pro"; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; platforms = ["i686-linux" "x86_64-linux"]; hydraPlatforms = []; + knownVulnerabilities = [ + "Electron 7.2.4 is EOL and contains at least the following vulnerabilities: CVE-2020-6458, CVE-2020-6460 and more (https://www.electronjs.org/releases/stable?version=7). Consider using an alternative such as `ferdi'." + ]; }; } From 1eb5ab963a7fda78ba170c8b55268cfd4c82ea27 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 Jun 2021 21:37:35 +0200 Subject: [PATCH 22/95] ferdi: 5.6.0-beta.5 -> 5.6.0-beta.6, improve XWayland support ChangeLog: https://github.com/getferdi/ferdi/blob/1886c8abed32e33f0f547c069c674b79279cf931/CHANGELOG.md#560-beta6-2021-05-31 Even though this isn't explicitly noted in the Changelog, this seems to have fixed the Element integration for me. Additionally, I added a (hacky) `xdg-open` wrapper which removes the `GDK_BACKEND` variable to fix the XWayland integration[1]. The problem is that if a Firefox is running with Wayland (`ferdi` is running under X11) and `GDK_BACKEND=x11` is passed to the `xdg-open` (and thus `firefox`) process, Firefox refuses to start since another instance of it is running under Wayland (but attempts to start in X11 mode because of `GDK_BACKEND=x11`). [1] https://github.com/electron/electron/issues/28436 (cherry picked from commit cd4ad7d2fee90fc3afb9f3f3957a7289f02f89dc) --- .../instant-messengers/ferdi/default.nix | 25 +++++++++++++++---- .../instant-messengers/franz/generic.nix | 5 ++-- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index c57b58eea0d..5d3b251089c 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -1,18 +1,33 @@ -{ lib, mkFranzDerivation, fetchurl }: +{ lib, mkFranzDerivation, fetchurl, xorg, xdg-utils, buildEnv, writeShellScriptBin }: -mkFranzDerivation rec { +let + mkFranzDerivation' = mkFranzDerivation.override { + xdg-utils = buildEnv { + name = "xdg-utils-for-ferdi"; + paths = [ + xdg-utils + (lib.hiPrio (writeShellScriptBin "xdg-open" '' + unset GDK_BACKEND + exec ${xdg-utils}/bin/xdg-open "$@" + '')) + ]; + }; + }; +in +mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.6.0-beta.5"; + version = "5.6.0-beta.6"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-fDUzYir53OQ3O4o9eG70sGD+FJ0/4SDNsTfh97WFRnQ="; + sha256 = "sha256-Q1HSAEVcaxFyOq7oWqa6AJJpsBKRxbsKb9ydyK/gH/A="; }; + extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { description = "Combine your favorite messaging services into one application"; homepage = "https://getferdi.com/"; license = licenses.asl20; - maintainers = [ maintainers.davidtwco ]; + maintainers = with maintainers; [ davidtwco ma27 ]; platforms = [ "x86_64-linux" ]; hydraPlatforms = [ ]; }; diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 08afad8b56f..6fac3657c7c 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -28,7 +28,8 @@ # Helper function for building a derivation for Franz and forks. -{ pname, name, version, src, meta }: +{ pname, name, version, src, meta, extraBuildInputs ? [] }: + stdenv.mkDerivation rec { inherit pname version src meta; @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapGAppsHook dpkg ]; - buildInputs = (with xorg; [ + buildInputs = extraBuildInputs ++ (with xorg; [ libXi libXcursor libXdamage From ce9c83cee0a1926828d7faad22674693f043b9c9 Mon Sep 17 00:00:00 2001 From: Serg Nesterov Date: Sat, 29 May 2021 01:02:47 +0300 Subject: [PATCH 23/95] tmuxinator: 2.0.2 -> 2.0.3 tmuxinator 2.0.3 fixes a compatibility warning with tmux 2.3, which is the version packaged on NixOS 21.05. See https://github.com/tmuxinator/tmuxinator/issues/814 (cherry picked from commit 28ab65b5869c6673e359093662a1dfe3aba9b829) --- pkgs/tools/misc/tmuxinator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 5ed63d79979..c3ceae7a0bd 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "2.0.2"; - source.sha256 = "0wwrgx1syi3zrwn52pblh7qivyxp3cvq0rywp6n0s2bkk0xz903z"; + version = "2.0.3"; + source.sha256 = "0js43hl07is9nx1b17g8x2blh1q7ls8y4dshcb50r5dn7drpardh"; erubis = buildRubyGem rec { inherit ruby; From bc0d018a6ba26b1ca30c271ef74216de5beb9ad8 Mon Sep 17 00:00:00 2001 From: InternetUnexplorer Date: Mon, 31 May 2021 16:09:24 -0700 Subject: [PATCH 24/95] renoise: 3.3.1 -> 3.3.2 (cherry picked from commit 78b11682349ce95de8764de59e603c2cc2208bab) --- pkgs/applications/audio/renoise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index fd9a9f00502..e874b63898a 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { pname = "renoise"; - version = "3.3.1"; + version = "3.3.2"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" ]; - sha256 = "05baicks5dx278z2dx6h5n2vabsn64niwqssgys36xy469l9m1h0"; + sha256 = "0d9pnrvs93d4bwbfqxwyr3lg3k6gnzmp81m95gglzwdzczxkw38k"; } else releasePath From 9a3a0f39f9f234c1ab128cb7f2144eeae037e555 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 2 Jun 2021 22:55:29 +0800 Subject: [PATCH 25/95] vocal: fix build Co-authored-by: Sandro (cherry picked from commit 01ef9faecb7e1be1f40f7aac4ebcefa4885d4652) --- pkgs/applications/audio/vocal/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index b91a8e6d50c..f06f950f13f 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , cmake , ninja @@ -61,13 +63,22 @@ stdenv.mkDerivation rec { glib-networking ]; + patches = [ + # granite 6.0.0 removed about dialogs + # see: https://github.com/needle-and-thread/vocal/issues/483 + (fetchpatch { + name = "remove-about.patch"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/03543ffdb6cd52ce1a8293f3303225b3afac2431/trunk/remove-about.patch"; + sha256 = "sha256-yGD7BYOTmqs4h+Odh/mB3fI1HM7GDO6F+QaHpRUD5p4="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = pname; }; }; - meta = with lib; { description = "The podcast client for the modern free desktop"; longDescription = '' From 4a6b10208894be9279652a793b0433c6991bc3df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Tue, 1 Jun 2021 21:08:20 +0200 Subject: [PATCH 26/95] teams: enable appindicator tray icon support (cherry picked from commit de7986d7afd9f140ebc43e8a95bdb7f1f7ed08af) --- .../networking/instant-messengers/teams/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 498bee8aafc..cd7efb7ad89 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -6,6 +6,7 @@ , dpkg , atomEnv , libuuid +, libappindicator-gtk3 , pulseaudio , at-spi2-atk , coreutils @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ (lib.getLib systemd) pulseaudio + libappindicator-gtk3 ]; preFixup = '' From 3e1e2b277f27443b2d1f9337fa9a8051678c2fcc Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 22 May 2021 13:24:38 +0300 Subject: [PATCH 27/95] gpxlab: fix localization (cherry picked from commit b931540229865e96ed515f0a041960c45a3069c2) --- pkgs/applications/misc/gpxlab/default.nix | 15 ++++++++++----- .../misc/gpxlab/fix-qttranslations-path.patch | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix index 3b432ff66b1..86063d4b85c 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/applications/misc/gpxlab/default.nix @@ -1,4 +1,6 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, qmake, qttools, qttranslations }: +{ stdenv, mkDerivation, lib, fetchFromGitHub, substituteAll +, qmake, qttools, qttranslations +}: mkDerivation rec { pname = "gpxlab"; @@ -11,8 +13,13 @@ mkDerivation rec { sha256 = "080vnwcciqblfrbfyz9gjhl2lqw1hkdpbgr5qfrlyglkd4ynjd84"; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qttools qttranslations ]; + patches = (substituteAll { + # See https://github.com/NixOS/nixpkgs/issues/86054 + src = ./fix-qttranslations-path.patch; + inherit qttranslations; + }); + + nativeBuildInputs = [ qmake qttools ]; preConfigure = '' lrelease GPXLab/locale/*.ts @@ -24,8 +31,6 @@ mkDerivation rec { wrapQtApp $out/Applications/GPXLab.app/Contents/MacOS/GPXLab ''; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://github.com/BourgeoisLab/GPXLab"; description = "Program to show and manipulate GPS tracks"; diff --git a/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch b/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch new file mode 100644 index 00000000000..8dcba75d764 --- /dev/null +++ b/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch @@ -0,0 +1,17 @@ +diff --git i/GPXLab/main.cpp w/GPXLab/main.cpp +index b12d2dd..58d37c5 100644 +--- i/GPXLab/main.cpp ++++ w/GPXLab/main.cpp +@@ -19,10 +19,10 @@ int main(int argc, char *argv[]) + app.installTranslator(&gpxlab); + + QTranslator qt; +-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) ++#if defined(Q_OS_WIN32) + qt.load(QLocale::system(), "qt", "_", TRANSLATIONS_DIR); + #else +- qt.load(QLocale::system(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath)); ++ qt.load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")); + #endif + app.installTranslator(&qt); + From 49acb91cbff3a2a3665b178f5f266f66fb3ecdaa Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 23 May 2021 21:02:19 +0000 Subject: [PATCH 28/95] gpxlab: update license (cherry picked from commit 87c98dcdfc1778f8988e3d430cfe847b56a26f5c) --- pkgs/applications/misc/gpxlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix index 86063d4b85c..c8d6eb3b84c 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/applications/misc/gpxlab/default.nix @@ -38,8 +38,8 @@ mkDerivation rec { GPXLab is an application to display and manage GPS tracks previously recorded with a GPS tracker. ''; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; }; } From b7833a07242a7952a69bb3727f78e9d10488b568 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 31 May 2021 15:09:22 +0300 Subject: [PATCH 29/95] jitsi-meet-electron: 2.8.5 -> 2.8.6 (cherry picked from commit 29c70d515a827c043fcef37ddbb675cd620f9301) --- .../instant-messengers/jitsi-meet-electron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 363d123dbe1..27bc38cf6c2 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.8.5"; + version = "2.8.6"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "0r3jj3qjx38l1g733vhrwcm2yg7ppp23ciz84x2kqq51mlzr84c6"; + sha256 = "sha256-kLX8SZERlyNVSvszkV/fkQh/Z/Z20PAPJ9eug2oKlqI="; name = "${pname}-${version}.AppImage"; }; From 373aeac41f1e186946b10fe20feeed33026f4117 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 1 Jun 2021 14:00:26 -0400 Subject: [PATCH 30/95] zabbix.agent2: create a symlink which is compatible with the zabbixAgent module (cherry picked from commit 99e37419573318a1882ec5930c1dd6aec4512940) --- pkgs/servers/monitoring/zabbix/agent2.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index 1deada43637..98fafa4265d 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -46,8 +46,13 @@ import ./versions.nix ({ version, sha256 }: ''; installPhase = '' + mkdir -p $out/sbin + install -Dm0644 src/go/conf/zabbix_agent2.conf $out/etc/zabbix_agent2.conf install -Dm0755 src/go/bin/zabbix_agent2 $out/bin/zabbix_agent2 + + # create a symlink which is compatible with the zabbixAgent module + ln -s $out/bin/zabbix_agent2 $out/sbin/zabbix_agentd ''; meta = with lib; { From 07dd7d248d91236ceda8880c86f457bda18c2049 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 19 May 2021 11:55:35 +0200 Subject: [PATCH 31/95] linux: 5.10.37 -> 5.10.38 (cherry picked from commit 9a0a33f6b1ca2ae2c70e0c01722e3c359d667578) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index f150ab1cb0a..cce8d1d9264 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.37"; + version = "5.10.38"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0xz01g017s9kcc9awlg6p9wrm8pzxyk4fizrf3mq9i5gklqf7md8"; + sha256 = "0bzipgnfvd5w70rv1x6g81iwknn2qskw92p2bpyiks7r52qmmwij"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 64809ba1072756a645d011095e7f5ed7ad3703f4 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 19 May 2021 11:55:40 +0200 Subject: [PATCH 32/95] linux: 5.11.21 -> 5.11.22 (cherry picked from commit 701282a87a96bc14d1996b43c057394b4dc70510) --- pkgs/os-specific/linux/kernel/linux-5.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix index 2988984e34c..e6a8aef650b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.21"; + version = "5.11.22"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0zw7mpq6lfbw2ycv4lvkya93h1h18gvc8c66m82bca5y02xsasrn"; + sha256 = "003nlphkqish6l4xblhi369v4qv2zck7529prkdnx4gb2ihpq0hi"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ]; From 1e4ff1a71eea4eedf4916eceb9df01544a99cab9 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 19 May 2021 11:55:45 +0200 Subject: [PATCH 33/95] linux: 5.12.4 -> 5.12.5 (cherry picked from commit a76a720665423d32db1edaf44915287c5860d536) --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 39366147ae5..8efecb53ea1 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.4"; + version = "5.12.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0wv89gwf5v8m7wi2f3bv9mdr8n9raq998sy4m1m2lwwjhkpgwq2s"; + sha256 = "1x39sdswww4j8zr54wpjzy9dia52kihs11xwljxcnz8pck0vwja0"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From 73710f88035a8567b7522b718c381d1425df8219 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 19 May 2021 11:55:50 +0200 Subject: [PATCH 34/95] linux: 5.4.119 -> 5.4.120 (cherry picked from commit ce48d2c5932b307c22b418a7cced203ffc438b15) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 8d6a063e643..fd3cd525c20 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.119"; + version = "5.4.120"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "185jxk0cfnk8c6rfc78id2qwd9k2597xyc4dv2pahjc13v7xxrvi"; + sha256 = "0q08q6q2l9k04p8a0vvbnhwfp4yiags8s6wc9dnac0fhd4y3gl1q"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 747ca0c87f8ff54a352b53e58d819f7a31f1238a Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:35 +0200 Subject: [PATCH 35/95] linux: 4.14.232 -> 4.14.233 (cherry picked from commit c5545b7e423869aaabc1232e9f339a5cb18398db) --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 431180c34bb..5108eaaf696 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.232"; + version = "4.14.233"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0sa3sz7bznlhijd0iwv37nyrrnw34iq6dq1bqr6cj2wpyrhr7h8x"; + sha256 = "0sqikz8cvrjfs46mcqx9gbdfkpdims0m5xxxzwr5vcfph5rdvj26"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From 5e4829822ce3b240ed18f98627be328099f44234 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:40 +0200 Subject: [PATCH 36/95] linux: 4.19.190 -> 4.19.191 (cherry picked from commit be7fc1bdee8bc3907f1089f37570ece1938532ba) --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 5357251720b..d5e998ac194 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.190"; + version = "4.19.191"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0pf8py0id0r8wzr5050bik1sbhl8gsznnr5bvcmrs4jkhpp2m73g"; + sha256 = "1jd97rzv900mnyzps4xmf6k166zrg391vcrbmr5zvcway5qbn9mm"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From 853bb573e97bf133b1a2f35a5f6b600baee7f0e7 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:44 +0200 Subject: [PATCH 37/95] linux: 4.4.268 -> 4.4.269 (cherry picked from commit 7d15d507177349feee82e225a2ddbb09a9830d47) --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 36b54e8191d..05fb7a88d4a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.268"; + version = "4.4.269"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1srk08kaxq5jjlqx804cgjffhcsrdkv3idh8ipagl6v2w4kas5v8"; + sha256 = "0qx5zwi2ijwv9jwhs4cz91z7yxy6nd0g8ryzrlg1ar2xyk8w4yh4"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 537d97790b32a7bf1e6892fe7507f121ef5c6fab Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:48 +0200 Subject: [PATCH 38/95] linux: 4.9.268 -> 4.9.269 (cherry picked from commit e51c114dfeab0f7f7655edb3bb045c775982c5c6) --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d1cd267dd22..5e1318675bd 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.268"; + version = "4.9.269"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0aknrlf5q0dsqib8c9klmf5c60dy7hg2zksb020qvyrp077gcrjv"; + sha256 = "1pnggwc9i6hka21vvl4yd9pd38hpnym9z56m4mhl970ijl4zywbr"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From a8f69347beb9a5df45ec02434f0d0b190713f692 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:53 +0200 Subject: [PATCH 39/95] linux: 5.10.38 -> 5.10.39 (cherry picked from commit 43730b18ea08d7bf93aee23f47c2683f7a93e945) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index cce8d1d9264..afd8f21382b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.38"; + version = "5.10.39"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0bzipgnfvd5w70rv1x6g81iwknn2qskw92p2bpyiks7r52qmmwij"; + sha256 = "057nnfkbm69ji80rx9lqgmvqsv74x9lcaq3kfs0k91cpr8asaf2p"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 17c7ef67eaaf7886d0aa0cbdbb1750c3f1bf9029 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:06 +0200 Subject: [PATCH 40/95] linux: 5.12.5 -> 5.12.6 (cherry picked from commit 6485d14e6de1ce89d39367d3d8b7eac5fdae684c) --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 8efecb53ea1..4e7142b4a31 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.5"; + version = "5.12.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1x39sdswww4j8zr54wpjzy9dia52kihs11xwljxcnz8pck0vwja0"; + sha256 = "1cdxda5mgdi5dky6hvrq2727rrlw9lnzf30kf3lbiikjybvlqw2b"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From ff2eb0479ef9076004a185ae484108e814ec9ed9 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:12 +0200 Subject: [PATCH 41/95] linux: 5.4.120 -> 5.4.121 (cherry picked from commit 44ed8b845d762581ca84ab4dd6baab89a0674d79) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index fd3cd525c20..a5eb04751f9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.120"; + version = "5.4.121"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0q08q6q2l9k04p8a0vvbnhwfp4yiags8s6wc9dnac0fhd4y3gl1q"; + sha256 = "0prparsdyi8n3cfq3vbhn5var2xcw5dglscxqny19qcplgy2g4wx"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 8d3861572fcd0e5b8035ca679885d5e35c2f7935 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:29 +0200 Subject: [PATCH 42/95] linux_latest-libre: 18063 -> 18096 (cherry picked from commit be8af32578742a2940eb0aa0f3437bfdb43a515d) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index ea04414804c..6d1c7339720 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18063"; - sha256 = "1mmijqra6sq2pcc8yhh8m4k6x0dvhnq4xxzm1qs7kdznj2zwr8is"; + rev = "18096"; + sha256 = "08m7afj0h9bcgg8rx8ksp85hmaqjl4k4p4q4zy6x51788xn4mycg"; } , ... }: From 641eac3f623b227fe861ad8eb179cca5b01d1bc6 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:44 +0200 Subject: [PATCH 43/95] linux/hardened/patches/4.14: 4.14.232-hardened1 -> 4.14.233-hardened1 (cherry picked from commit 96806043e7e73bb98d2362b5c14f3eb6dee2b514) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a7505c95f10..acd24be11ef 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.232-hardened1.patch", - "sha256": "141bjr8z5gg5c9bwbq2krhpwzhs225g5465izgz38sls57dllll4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.232-hardened1/linux-hardened-4.14.232-hardened1.patch" + "name": "linux-hardened-4.14.233-hardened1.patch", + "sha256": "10rc16a6adqsmn94f9zp68f4l2y1pd6v9a4vkr5bbpymi9fhmdcd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.233-hardened1/linux-hardened-4.14.233-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 1537b18b66dc4f94d84f8f14c27995b37ba629f4 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:46 +0200 Subject: [PATCH 44/95] linux/hardened/patches/4.19: 4.19.190-hardened1 -> 4.19.191-hardened1 (cherry picked from commit 38a17bf83560749fab96d595c3ac10b2d4b922ad) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index acd24be11ef..0ef02965068 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.190-hardened1.patch", - "sha256": "111pxnnmajd1c7p51v99qc28dq7hrhji6ja0i5m46d2r8am1z4cz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.190-hardened1/linux-hardened-4.19.190-hardened1.patch" + "name": "linux-hardened-4.19.191-hardened1.patch", + "sha256": "1w6gwfaahpnz6r8by276k7w5jynka8crcgq1dxrz0c9mgwrapa1b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.191-hardened1/linux-hardened-4.19.191-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 3270f6e74f86dea062bb47e56cbc0e0530c47810 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:48 +0200 Subject: [PATCH 45/95] linux/hardened/patches/5.10: 5.10.37-hardened1 -> 5.10.39-hardened1 (cherry picked from commit f8df946b8b6b37a6d05d9cac7728709593c774ae) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0ef02965068..4da8c0ba1e6 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.37-hardened1.patch", - "sha256": "16bmvb6w55bdcd3nfz1ixwp081gcyx0hq885i0ixjnjz7n5q80wq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.37-hardened1/linux-hardened-5.10.37-hardened1.patch" + "name": "linux-hardened-5.10.39-hardened1.patch", + "sha256": "1i58jdmahb43zxhag0m8fb51i4j0s3c6vicnypyxlcky5mawv8bl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.39-hardened1/linux-hardened-5.10.39-hardened1.patch" }, "5.11": { "extra": "-hardened1", From 8c3ed02c5b9be1ae5747f59f514a206e656c9a31 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:49 +0200 Subject: [PATCH 46/95] linux/hardened/patches/5.11: 5.11.21-hardened1 -> 5.11.22-hardened1 (cherry picked from commit ac7c67ea0c13e60d1a39d658b2418ce616e4ccc6) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 4da8c0ba1e6..abfdc43f18c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.11": { "extra": "-hardened1", - "name": "linux-hardened-5.11.21-hardened1.patch", - "sha256": "087zg8mphpbzcac9xi9qqfzl7ccd3qb93jif2gqjvsm3q2pk2m3g", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.21-hardened1/linux-hardened-5.11.21-hardened1.patch" + "name": "linux-hardened-5.11.22-hardened1.patch", + "sha256": "1lwf56pxyzqzjqw4k1qd93vi44abmbz6hqbalamz6ancxkb800hh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.22-hardened1/linux-hardened-5.11.22-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 9b91d0c98aa77563940ef65c638ad7c68c5a89f6 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:50 +0200 Subject: [PATCH 47/95] linux/hardened/patches/5.4: 5.4.119-hardened1 -> 5.4.121-hardened1 (cherry picked from commit 63f5c51430ba45904bd3ffa915c045cb746a4d20) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index abfdc43f18c..5822b154364 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.119-hardened1.patch", - "sha256": "1qbw8287jv96fqar5wi52yh1g6v9nnr53y2vpr3777sadcr19mm9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.119-hardened1/linux-hardened-5.4.119-hardened1.patch" + "name": "linux-hardened-5.4.121-hardened1.patch", + "sha256": "0f7zx7vm8vfhpkjgrz3jqqns8pibjz1lk7nf0hayl23jy0qqymrs", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.121-hardened1/linux-hardened-5.4.121-hardened1.patch" } } From a3611019450422278ecd6444b9073aee78c28f06 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 26 May 2021 08:07:00 +0200 Subject: [PATCH 48/95] linux/hardened/patches/5.12: init at 5.12.6-hardened1 (cherry picked from commit 6c6f9a5abfdc601d1d5ade71e8b667ed9cdc5fcd) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 5822b154364..ed9dc68e885 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -23,6 +23,12 @@ "sha256": "1lwf56pxyzqzjqw4k1qd93vi44abmbz6hqbalamz6ancxkb800hh", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.22-hardened1/linux-hardened-5.11.22-hardened1.patch" }, + "5.12": { + "extra": "-hardened1", + "name": "linux-hardened-5.12.6-hardened1.patch", + "sha256": "0wy1r1awxw92rxfr8il1rri23lsizp4cilzvzw84d5w50jfix9dn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.6-hardened1/linux-hardened-5.12.6-hardened1.patch" + }, "5.4": { "extra": "-hardened1", "name": "linux-hardened-5.4.121-hardened1.patch", From cd8ea3fcd01dfc2a6f59a1742f14c4a00825286d Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:27:45 +0200 Subject: [PATCH 49/95] linux: 4.14.233 -> 4.14.234 (cherry picked from commit 91233c46e36ef775e0ef92b4be0b810598d9b800) --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5108eaaf696..58804158761 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.233"; + version = "4.14.234"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0sqikz8cvrjfs46mcqx9gbdfkpdims0m5xxxzwr5vcfph5rdvj26"; + sha256 = "1mwqb9sq6qd9angl3xysdsrfpgppf46g3kiwg1svqgpgrx7cqn1b"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From 876f1db8eb1d78cea1b4846894ffd1d2df67eb93 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:27:51 +0200 Subject: [PATCH 50/95] linux: 4.19.191 -> 4.19.192 (cherry picked from commit bd12ba96439e67cf75ec94773b7b2b5fc5f6079b) --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index d5e998ac194..23d651e21da 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.191"; + version = "4.19.192"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jd97rzv900mnyzps4xmf6k166zrg391vcrbmr5zvcway5qbn9mm"; + sha256 = "1680dz4wjg721a8lqwh6ijd90zcr2f3wzcvhwgn3shbwgjkwsk87"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From e8c17e37ea73cb296e948bf87aca1d9f8ce2da68 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:06 +0200 Subject: [PATCH 51/95] linux: 4.4.269 -> 4.4.270 (cherry picked from commit 819f6a5d8cf82857e9cc4f17879a68c944747bdf) --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 05fb7a88d4a..8320c2fb9ce 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.269"; + version = "4.4.270"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0qx5zwi2ijwv9jwhs4cz91z7yxy6nd0g8ryzrlg1ar2xyk8w4yh4"; + sha256 = "1lz48gv1v3wvw9xvd3y9q4py7ii1g9fj4dwyvvjdzbipyw7s21pq"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 55be7efd2e1421f82adc3910515e1beac3219f34 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:11 +0200 Subject: [PATCH 52/95] linux: 4.9.269 -> 4.9.270 (cherry picked from commit 7d57471efa5d1b36f44084709e77c087ee8629f7) --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 5e1318675bd..7dda6f5356d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.269"; + version = "4.9.270"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pnggwc9i6hka21vvl4yd9pd38hpnym9z56m4mhl970ijl4zywbr"; + sha256 = "0ck5abzpla291gcxrxjindj5szgcvmb2fwfilvdnzc6pnqk00ay3"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From a5c46f13884d575cc3a67a42bf853bfe550240ba Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:17 +0200 Subject: [PATCH 53/95] linux: 5.10.39 -> 5.10.40 (cherry picked from commit bed18f50193d35c43408682837c7f96f30717c22) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index afd8f21382b..ae8f5095307 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.39"; + version = "5.10.40"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "057nnfkbm69ji80rx9lqgmvqsv74x9lcaq3kfs0k91cpr8asaf2p"; + sha256 = "091g9g29m4vh66bxihiylyprb3cxr8cy4m494klb2lkirlx8103l"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From d0d7b4af7e8161bb1df7a3d831e05efd7ac56263 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:22 +0200 Subject: [PATCH 54/95] linux: 5.12.6 -> 5.12.7 (cherry picked from commit 01cc705d4a07ef89a8aa7806fdf2366360237c3e) --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 4e7142b4a31..80a25ad2396 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.6"; + version = "5.12.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1cdxda5mgdi5dky6hvrq2727rrlw9lnzf30kf3lbiikjybvlqw2b"; + sha256 = "0ircrclggrbmm80vz7irhg73qvhjddsmf7zclw5cqnnmm3qfj8jk"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From 79115d6a824349f4feba05a8437c4ab404e78ce0 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:27 +0200 Subject: [PATCH 55/95] linux: 5.4.121 -> 5.4.122 (cherry picked from commit c16011b1d9f92d6bf68064fc0e12b66b4c6ad48f) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a5eb04751f9..a245ee7c44e 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.121"; + version = "5.4.122"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0prparsdyi8n3cfq3vbhn5var2xcw5dglscxqny19qcplgy2g4wx"; + sha256 = "00g6s3ymriwddshy5sd458b1wfvw2ynxv6dr63ziykwfq50jlr9p"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From f5fa39d4a14227392b2bb86d89ed974d154a810f Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:54 +0200 Subject: [PATCH 56/95] linux/hardened/patches/4.14: 4.14.233-hardened1 -> 4.14.234-hardened1 (cherry picked from commit 52e8c2d1650de8760c2cd93f67f45f559e00cdfe) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ed9dc68e885..2538bb22d51 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.233-hardened1.patch", - "sha256": "10rc16a6adqsmn94f9zp68f4l2y1pd6v9a4vkr5bbpymi9fhmdcd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.233-hardened1/linux-hardened-4.14.233-hardened1.patch" + "name": "linux-hardened-4.14.234-hardened1.patch", + "sha256": "1vdr3j62whc2xdy1l4imkp6axpwh7r3cjp0sgsld7l5331x19qh7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.234-hardened1/linux-hardened-4.14.234-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 10afabfad5afb71a0fafc2034e7db94a9b336adb Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:56 +0200 Subject: [PATCH 57/95] linux/hardened/patches/4.19: 4.19.191-hardened1 -> 4.19.192-hardened1 (cherry picked from commit 938ea32339ada0492d545542123e68e8833986c7) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 2538bb22d51..3ba8e4e71c6 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.191-hardened1.patch", - "sha256": "1w6gwfaahpnz6r8by276k7w5jynka8crcgq1dxrz0c9mgwrapa1b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.191-hardened1/linux-hardened-4.19.191-hardened1.patch" + "name": "linux-hardened-4.19.192-hardened1.patch", + "sha256": "0gy4h73ygiqr6c9zbmfz4as18ldcnnzgc4qd2nss08m2x1cb1n76", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.192-hardened1/linux-hardened-4.19.192-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 45c9ea8fdb7fee7d8fb526d38d5b0bdf47dc8190 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:57 +0200 Subject: [PATCH 58/95] linux/hardened/patches/5.10: 5.10.39-hardened1 -> 5.10.40-hardened1 (cherry picked from commit 46ca914a5e4b8aa4cd184cd5a514200f224a5d06) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 3ba8e4e71c6..44be0d6a460 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.39-hardened1.patch", - "sha256": "1i58jdmahb43zxhag0m8fb51i4j0s3c6vicnypyxlcky5mawv8bl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.39-hardened1/linux-hardened-5.10.39-hardened1.patch" + "name": "linux-hardened-5.10.40-hardened1.patch", + "sha256": "15nprqyw9whqghpnr39wpn54snxz49wdr4dq41dbmmqmrrlfyxnr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.40-hardened1/linux-hardened-5.10.40-hardened1.patch" }, "5.11": { "extra": "-hardened1", From 5e4a63c1452715929d6818d4b9fa7c0eb77218e4 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:59 +0200 Subject: [PATCH 59/95] linux/hardened/patches/5.12: 5.12.6-hardened1 -> 5.12.7-hardened1 (cherry picked from commit cdc6a4cc1e858d299e20e4cb90df427ac15411cc) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 44be0d6a460..fed73c80f91 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,9 +25,9 @@ }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.6-hardened1.patch", - "sha256": "0wy1r1awxw92rxfr8il1rri23lsizp4cilzvzw84d5w50jfix9dn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.6-hardened1/linux-hardened-5.12.6-hardened1.patch" + "name": "linux-hardened-5.12.7-hardened1.patch", + "sha256": "1r8bf8hrxpzyxqcy3zf1m86bfi0lr4aijbrq12sqb7n2g1wc1j87", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.7-hardened1/linux-hardened-5.12.7-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 099d0e5cb23a0babda6d91ac9f0e336f7ffc05ba Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:29:00 +0200 Subject: [PATCH 60/95] linux/hardened/patches/5.4: 5.4.121-hardened1 -> 5.4.122-hardened1 (cherry picked from commit 1ce119e9bb3ada25ad7f9fcfb7565194a4faffdb) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index fed73c80f91..6cf635da18b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -31,8 +31,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.121-hardened1.patch", - "sha256": "0f7zx7vm8vfhpkjgrz3jqqns8pibjz1lk7nf0hayl23jy0qqymrs", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.121-hardened1/linux-hardened-5.4.121-hardened1.patch" + "name": "linux-hardened-5.4.122-hardened1.patch", + "sha256": "1wa3h18gwgn4blkidf8mlw3r0nb2asya5rbwylghq3qnaa2hc0k7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.122-hardened1/linux-hardened-5.4.122-hardened1.patch" } } From db819f162674d1e77a4992444600d26adbfd3246 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 5 Jun 2021 13:04:26 +0200 Subject: [PATCH 61/95] openrgb: Fix udev rules with hardcoded /bin/chmod New rules introduced in openrgb 0.6. openrgb: Implement nixpkgs-review suggestions * warning: missing-phase-hooks * warning: unclear-gpl * warning: unnecessary-parallel-building (cherry picked from commit 84dc04c2db2f45237658e1178f22057f49a6b95f) --- pkgs/applications/misc/openrgb/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index df9e149d9a7..92d905bebf8 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config }: +{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils }: mkDerivation rec { pname = "openrgb"; @@ -15,11 +15,18 @@ mkDerivation rec { buildInputs = [ libusb1 hidapi ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp openrgb $out/bin + substituteInPlace 60-openrgb.rules \ + --replace /bin/chmod "${coreutils}/bin/chmod" + mkdir -p $out/etc/udev/rules.d cp 60-openrgb.rules $out/etc/udev/rules.d + + runHook postInstall ''; doInstallCheck = true; @@ -27,13 +34,11 @@ mkDerivation rec { HOME=$TMPDIR $out/bin/openrgb --help > /dev/null ''; - enableParallelBuilding = true; - meta = with lib; { description = "Open source RGB lighting control"; homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB"; maintainers = with maintainers; [ jonringer ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } From e3ede71a0f9fdb08e562181fbe41a3d3b1fc571b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 5 Jun 2021 18:27:16 +0200 Subject: [PATCH 62/95] teams: remove jtojnar on stable --- maintainers/team-list.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 0e2baa9e758..1d8a920efcb 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -74,7 +74,7 @@ with lib.maintainers; { }; freedesktop = { - members = [ jtojnar ]; + members = [ ]; scope = "Maintain Freedesktop.org packages for graphical desktop."; }; @@ -96,7 +96,6 @@ with lib.maintainers; { gnome = { members = [ hedning - jtojnar dasj19 maxeaubrey ]; From a60818cacd51b02430c5632b752d24b021d56bf6 Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 4 Jun 2021 16:08:41 +0200 Subject: [PATCH 63/95] treewide: Fix mysql alias deprecation breakage 62733b37b4a866cabafe1fc8bb7415240126eb0b broke evaluation in all places `pkgs.mysql` was used. Fix this by changing all occurrences to `pkgs.mariadb`. (cherry picked from commit 59e0120aa5c1241d48048afa615e25c65d7e366d) --- nixos/modules/services/backup/mysql-backup.nix | 4 ++-- nixos/modules/services/databases/mysql.nix | 2 +- nixos/modules/services/video/epgstation/default.nix | 4 ++-- nixos/modules/services/web-apps/keycloak.nix | 2 +- nixos/modules/services/web-apps/tt-rss.nix | 2 +- nixos/tests/bitwarden.nix | 2 +- nixos/tests/matomo.nix | 2 +- nixos/tests/mysql/mysql-autobackup.nix | 2 +- nixos/tests/mysql/mysql-backup.nix | 2 +- nixos/tests/mysql/mysql-replication.nix | 6 +++--- nixos/tests/sogo.nix | 2 +- pkgs/development/lua-modules/overrides.nix | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 506ded5e9e8..9fca2100273 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -4,7 +4,7 @@ with lib; let - inherit (pkgs) mysql gzip; + inherit (pkgs) mariadb gzip; cfg = config.services.mysqlBackup; defaultUser = "mysqlbackup"; @@ -20,7 +20,7 @@ let ''; backupDatabaseScript = db: '' dest="${cfg.location}/${db}.gz" - if ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then + if ${mariadb}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then mv $dest.tmp $dest echo "Backed up to $dest" else diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index cf105daeb04..2d8d613ed88 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -34,7 +34,7 @@ in package = mkOption { type = types.package; - example = literalExample "pkgs.mysql"; + example = literalExample "pkgs.mariadb"; description = " Which MySQL derivation to use. MariaDB packages are supported too. "; diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix index 8d6d431fa55..b13393c8983 100644 --- a/nixos/modules/services/video/epgstation/default.nix +++ b/nixos/modules/services/video/epgstation/default.nix @@ -27,7 +27,7 @@ let # NOTE: Use password authentication, since mysqljs does not yet support auth_socket if [ ! -e /var/lib/epgstation/db-created ]; then - ${pkgs.mysql}/bin/mysql -e \ + ${pkgs.mariadb}/bin/mysql -e \ "GRANT ALL ON \`${cfg.database.name}\`.* TO '${username}'@'localhost' IDENTIFIED by '$DB_PASSWORD';" touch /var/lib/epgstation/db-created fi @@ -224,7 +224,7 @@ in services.mysql = { enable = mkDefault true; - package = mkDefault pkgs.mysql; + package = mkDefault pkgs.mariadb; ensureDatabases = [ cfg.database.name ]; # FIXME: enable once mysqljs supports auth_socket # ensureUsers = [ { diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index f0b9e60116d..dc66c296656 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -728,7 +728,7 @@ in services.postgresql.enable = lib.mkDefault createLocalPostgreSQL; services.mysql.enable = lib.mkDefault createLocalMySQL; - services.mysql.package = lib.mkIf createLocalMySQL pkgs.mysql; + services.mysql.package = lib.mkIf createLocalMySQL pkgs.mariadb; }; meta.doc = ./keycloak.xml; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 6a29f10d119..b78487cc928 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -644,7 +644,7 @@ let services.mysql = mkIf mysqlLocal { enable = true; - package = mkDefault pkgs.mysql; + package = mkDefault pkgs.mariadb; ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { diff --git a/nixos/tests/bitwarden.nix b/nixos/tests/bitwarden.nix index 3813a1f70f9..f64cf171f01 100644 --- a/nixos/tests/bitwarden.nix +++ b/nixos/tests/bitwarden.nix @@ -42,7 +42,7 @@ let GRANT ALL ON `bitwarden`.* TO 'bitwardenuser'@'localhost'; FLUSH PRIVILEGES; ''; - package = pkgs.mysql; + package = pkgs.mariadb; }; services.bitwarden_rs.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden"; diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix index 2bea237c8bd..f6b0845749c 100644 --- a/nixos/tests/matomo.nix +++ b/nixos/tests/matomo.nix @@ -18,7 +18,7 @@ let }; services.mysql = { enable = true; - package = pkgs.mysql; + package = pkgs.mariadb; }; services.nginx.enable = true; }; diff --git a/nixos/tests/mysql/mysql-autobackup.nix b/nixos/tests/mysql/mysql-autobackup.nix index 65576e52a53..b0ec7daaf05 100644 --- a/nixos/tests/mysql/mysql-autobackup.nix +++ b/nixos/tests/mysql/mysql-autobackup.nix @@ -8,7 +8,7 @@ import ./../make-test-python.nix ({ pkgs, lib, ... }: { pkgs, ... }: { services.mysql.enable = true; - services.mysql.package = pkgs.mysql; + services.mysql.package = pkgs.mariadb; services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; services.automysqlbackup.enable = true; diff --git a/nixos/tests/mysql/mysql-backup.nix b/nixos/tests/mysql/mysql-backup.nix index d428fb6c16e..269fddc66e1 100644 --- a/nixos/tests/mysql/mysql-backup.nix +++ b/nixos/tests/mysql/mysql-backup.nix @@ -10,7 +10,7 @@ import ./../make-test-python.nix ({ pkgs, ... } : { services.mysql = { enable = true; initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; - package = pkgs.mysql; + package = pkgs.mariadb; }; services.mysqlBackup = { diff --git a/nixos/tests/mysql/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix index ad84c801ea1..a52372ca47c 100644 --- a/nixos/tests/mysql/mysql-replication.nix +++ b/nixos/tests/mysql/mysql-replication.nix @@ -17,7 +17,7 @@ in { services.mysql.enable = true; - services.mysql.package = pkgs.mysql; + services.mysql.package = pkgs.mariadb; services.mysql.replication.role = "master"; services.mysql.replication.slaveHost = "%"; services.mysql.replication.masterUser = replicateUser; @@ -31,7 +31,7 @@ in { services.mysql.enable = true; - services.mysql.package = pkgs.mysql; + services.mysql.package = pkgs.mariadb; services.mysql.replication.role = "slave"; services.mysql.replication.serverId = 2; services.mysql.replication.masterHost = nodes.master.config.networking.hostName; @@ -44,7 +44,7 @@ in { services.mysql.enable = true; - services.mysql.package = pkgs.mysql; + services.mysql.package = pkgs.mariadb; services.mysql.replication.role = "slave"; services.mysql.replication.serverId = 3; services.mysql.replication.masterHost = nodes.master.config.networking.hostName; diff --git a/nixos/tests/sogo.nix b/nixos/tests/sogo.nix index 3f600b4cd55..acdad8d0f47 100644 --- a/nixos/tests/sogo.nix +++ b/nixos/tests/sogo.nix @@ -10,7 +10,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { services.mysql = { enable = true; - package = pkgs.mysql; + package = pkgs.mariadb; ensureDatabases = [ "sogo" ]; ensureUsers = [{ name = "sogo"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index eec969f99ca..288f4fc078b 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -173,7 +173,7 @@ with super; MYSQL_LIBDIR="${pkgs.libmysqlclient}/lib/mysql"; }; buildInputs = [ - pkgs.mysql.client + pkgs.mariadb.client pkgs.libmysqlclient ]; }); From b4a822688bb119a1e2612d58faa6dfbfb82a0bfb Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 3 Jun 2021 19:31:57 +0300 Subject: [PATCH 64/95] earthly: add missing buildFlags and tags (cherry picked from commit a5bf3427fbd1faeb979fca80da54c51bfbb2948c) --- pkgs/development/tools/earthly/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 68a8d1d0352..ed3ffa3eaa3 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -13,6 +13,19 @@ buildGoModule rec { vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g="; + buildFlagsArray = '' + -ldflags= + -s -w + -X main.Version=v${version} + -X main.DefaultBuildkitdImage=earthly/buildkitd:v${version} + -extldflags -static + ''; + + BUILDTAGS = "dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork"; + preBuild = '' + makeFlagsArray+=(BUILD_TAGS="${BUILDTAGS}") + ''; + postInstall = '' mv $out/bin/debugger $out/bin/earthly-debugger mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater From 4ce72a0473be4596da9459fce1b93a31292c1f18 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 5 Jun 2021 20:59:07 +0200 Subject: [PATCH 65/95] evcxr: 0.9.0 -> 0.10.0 ChangeLog: https://github.com/google/evcxr/blob/v0.10.0/RELEASE_NOTES.md#version-0100 (cherry picked from commit 2d2c58970ad4b04011c23b02be42380e111e4d2e) --- pkgs/development/interpreters/evcxr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index a6e995c9bcc..7dabff3d2e5 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-89+RZrG/QUo3JY9N5eTiMigUnlUP+wZWRW8PSnCcsrY="; + sha256 = "sha256-EPxWLPw+V5eIm+eL8m8Xw14adgshthJSDRyWohsJH88="; }; - cargoSha256 = "sha256-gZLSTWS5cLfJvk4/tv8FG2I2vH3PKljWbJDOflNDmTQ="; + cargoSha256 = "sha256-5jGrv0YRVMo2X9p/WPgjYV3z193hl2+NiFTZr3v0Iik="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; From f604d15d1546b86da0d5bf1c93583b562701d3f7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 5 Jun 2021 12:30:41 +0200 Subject: [PATCH 66/95] python3Packages.subliminal: readd again (cherry picked from commit c78fe7aa78e7f562f6bd4a3f213236640f97448c) --- pkgs/development/python-modules/subliminal/default.nix | 5 ++--- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 77ddb125a94..cedbb7bcf78 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -1,7 +1,6 @@ { lib , fetchPypi , buildPythonPackage -, isPy3k , guessit , babelfish , enzyme @@ -16,7 +15,6 @@ , appdirs , rarfile , pytz -, futures , sympy , vcrpy , pytest @@ -38,7 +36,7 @@ buildPythonPackage rec { guessit babelfish enzyme beautifulsoup4 requests click dogpile_cache stevedore chardet pysrt six appdirs rarfile pytz - ] ++ lib.optional (!isPy3k) futures; + ]; checkInputs = [ sympy vcrpy pytest pytest-flakes @@ -47,6 +45,7 @@ buildPythonPackage rec { # https://github.com/Diaoul/subliminal/pull/963 doCheck = false; + pythonImportsCheck = [ "subliminal" ]; meta = with lib; { homepage = "https://github.com/Diaoul/subliminal"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20a970ec6b4..181837dc996 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8006,6 +8006,8 @@ in { subdownloader = callPackage ../development/python-modules/subdownloader { }; + subliminal = callPackage ../development/python-modules/subliminal { }; + subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit cppunit check; }; From 6178c4009c3b7e8d88e1d4b0225c3ec434ae9bd2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 5 Jun 2021 20:51:07 +0200 Subject: [PATCH 67/95] gitAndTools.tig: 2.5.3 -> 2.5.4 ChangeLog: https://github.com/jonas/tig/releases/tag/tig-2.5.4 (cherry picked from commit cd7a26eb8c415e63f8333897db19d3b8697c6373) --- .../version-management/git-and-tools/tig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 753a3443c31..fd57eb22186 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-BXs7aKUYiU5L2OjhhmJ+dkHvNcrnw5qREwOTB6npLnw="; + sha256 = "sha256-dZqqUydZ4q/mDEjtojpMGfzAmW3yCNDvT9oCEmhq1hg="; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; From d5b481dd69f1b53d649d49b379d34a85be2f5b3b Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 2 Jun 2021 03:56:40 +0300 Subject: [PATCH 68/95] viber: use webarchive for a stable source (cherry picked from commit 24ba97a40beb3bc913ab724c8e66b97a06d52db1) --- .../networking/instant-messengers/viber/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 0224edc652f..7496063c58e 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { version = "13.3.1.22"; src = fetchurl { - url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb + url = "http://web.archive.org/web/20210602004133/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; sha256 = "0rs26x0lycavybn6k1hbb5kzms0zzcmxlrmi4g8k7vyafj6s8dqh"; }; From 8912beda2d49a0af270a696e0527980b04234a20 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 2 Jun 2021 22:32:14 +0200 Subject: [PATCH 69/95] replace: fix URL and hash The old URL wasn't available anymore. There is a minor version change but it's only an unimportant change to the Makefile and some changes to the documentation. (cherry picked from commit 908569cf06beed517f5f0f3038ab044aae2e5d76) --- pkgs/tools/text/replace/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 117fb737aa0..a0873d1c8d2 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "replace-2.24"; +stdenv.mkDerivation rec { + pname = "replace"; + version = "2.24"; src = fetchurl { - url = "ftp://hpux.connect.org.uk/hpux/Users/replace-2.24/replace-2.24-src-11.11.tar.gz"; - sha256 = "1c2nkxx83vmlh1v3ib6r2xqh121gdb1rharwsimcb2h0xwc558dm"; + url = "http://hpux.connect.org.uk/ftp/hpux/Users/replace-${version}/replace-${version}-src-11.31.tar.gz"; + sha256 = "18hkwhaz25s6209n5mpx9hmkyznlzygqj488p2l7nvp9zrlxb9sf"; }; outputs = [ "out" "man" ]; From c7d7f1881ec9330aa7c9b9903dad3f417b8554f6 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 2 Jun 2021 03:16:08 +0200 Subject: [PATCH 70/95] sundials: fix download URL and hash The old URL doesn't seem to be available anymore (fails with 403 Forbidden error). The tarball in the new URL contains a few changes from the old one, so the hash has changed. Specifically, only the following files have changed: sundials-5.7.0/doc/arkode/ark_examples.pdf sundials-5.7.0/doc/arkode/ark_guide.pdf sundials-5.7.0/doc/cvode/cv_examples.pdf sundials-5.7.0/doc/cvode/cv_guide.pdf sundials-5.7.0/doc/cvodes/cvs_examples.pdf sundials-5.7.0/doc/cvodes/cvs_guide.pdf sundials-5.7.0/doc/ida/ida_examples.pdf sundials-5.7.0/doc/ida/ida_guide.pdf sundials-5.7.0/doc/idas/idas_examples.pdf sundials-5.7.0/doc/idas/idas_guide.pdf sundials-5.7.0/doc/kinsol/kin_examples.pdf sundials-5.7.0/doc/kinsol/kin_guide.pdf (cherry picked from commit 4ab604c4c436505c98eb11e4a5c0323a1a835279) --- pkgs/development/libraries/sundials/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 3536ebd586e..daba200d08b 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "examples" ]; src = fetchurl { - url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "jW3QlP7Mu41uzEE0DsFqZfq6yC7UQVAj9tfBwjkOovM="; + url = "https://github.com/LLNL/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-SNp7qoFS3bIq7RsC2C0du0+/6iKs9nY0ARqgMDoQCkM="; }; nativeBuildInputs = [ cmake ]; From a0940c6ee4546c6a6dd8f6ba6919fa5697cad7ac Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 6 Jun 2021 01:28:35 +0200 Subject: [PATCH 71/95] Update pkgs/development/libraries/sundials/default.nix (cherry picked from commit 248748e0408d1d9a8d43e4df0dc18bfe297c4887) --- pkgs/development/libraries/sundials/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index daba200d08b..f04b22abe8c 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "examples" ]; src = fetchurl { - url = "https://github.com/LLNL/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; hash = "sha256-SNp7qoFS3bIq7RsC2C0du0+/6iKs9nY0ARqgMDoQCkM="; }; From 186f49f5ebcf127b6f37663b7d7cd3a41e964944 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 2 Jun 2021 02:32:24 +0200 Subject: [PATCH 72/95] box2d: fix hash The upstream tarball changed. Specifically, files now extract onto a box2d-2.3.1/ directory rather than Box2D-2.3.1/. The files themselves (and their contents) seem to remain the same. (cherry picked from commit a8b85f6d68d4fc96a0f8473aa38a3e773b82c4f0) --- pkgs/development/libraries/box2d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 47a1c0917f0..17830b053ac 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/erincatto/Box2D/archive/v${version}.tar.gz"; - sha256 = "0llpcifl8zbjbpxdwz87drd01m3lwnv82xb4av6kca1xn4w2gmkm"; + sha256 = "0p03ngsmyz0r5kbpiaq10ns4fxwkjvvawi8k6pfall46b93wizsq"; }; - sourceRoot = "Box2D-${version}/Box2D"; + sourceRoot = "box2d-${version}/Box2D"; nativeBuildInputs = [ cmake unzip pkg-config ]; buildInputs = [ libGLU libGL freeglut libX11 xorgproto libXi ]; From 8d05832f269d740586fab6a2332191d058d2a6a4 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 6 Jun 2021 01:26:24 +0200 Subject: [PATCH 73/95] Update pkgs/development/libraries/box2d/default.nix (cherry picked from commit 8fc57b0632120aad0ca9bbd3165616f9db2d06bd) --- pkgs/development/libraries/box2d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 17830b053ac..1b6ede9b310 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "2.3.1"; src = fetchurl { - url = "https://github.com/erincatto/Box2D/archive/v${version}.tar.gz"; + url = "https://github.com/erincatto/box2d/archive/v${version}.tar.gz"; sha256 = "0p03ngsmyz0r5kbpiaq10ns4fxwkjvvawi8k6pfall46b93wizsq"; }; From 9e1f63c0d27081eeefec3d00a68ab4b443f1ed4b Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 4 Jun 2021 21:23:34 +0300 Subject: [PATCH 74/95] discord-canary: 0.0.123 -> 0.0.124 (cherry picked from commit f3dac01a71b08ae6f9f533b5096f742db54f56f4) --- .../networking/instant-messengers/discord/base.nix | 3 ++- .../networking/instant-messengers/discord/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index a61ab254348..110d3ffb00e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -3,7 +3,7 @@ , alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext -, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb +, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence , mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu }: @@ -23,6 +23,7 @@ in stdenv.mkDerivation rec { libXScrnSaver libXtst libxcb + libxshmfence mesa nss wrapGAppsHook diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 0d75b374792..e486cd9de62 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.123"; + version = "0.0.124"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0bijwfsd9s4awqkgxd9c2cxh7y5r06vix98qjp0dkv63r6jig8ch"; + sha256 = "060ypr9rn5yl8iwh4v3ax1v6501yaq72sx50q47sm0wyxn7gpv91"; }; }; }.${branch} From 829e8217685cad6e9381727acd83487e878874ec Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 6 Jun 2021 08:18:54 +1000 Subject: [PATCH 75/95] youtube-dl: 2021.05.16 -> 2021.06.06 https://github.com/ytdl-org/youtube-dl/releases/tag/2021.06.06 (cherry picked from commit df82caf8df911674f65cf63f388b7820d410c334) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index e5b8d79eeb6..7bf0c440a37 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.05.16"; + version = "2021.06.06"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1z8sdzvkxhscnzy7cnjag308glif0k8jylr11biqwzypm1f2l0fl"; + sha256 = "1hqan9h55x9gfdakw554vic68w9gpvhblchwxlw265zxp56hxjrw"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 662f2d19b3ae49657b8c332981628f3e6f3237f3 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 1 Jun 2021 23:19:40 +0200 Subject: [PATCH 76/95] nixos/wireless: make wireless.interfaces mandatory This is the only way to solve issue #101963, for now. (cherry picked from commit 030a521adc9510207dd9f06b8d8b552ff7d999f9) --- nixos/doc/manual/release-notes/rl-2105.xml | 9 +++++++ .../services/networking/wpa_supplicant.nix | 27 +++++++------------ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 124ede12726..c6b1ce212de 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -181,6 +181,15 @@ GNOME desktop environment was upgraded to 40, see the release notes for 40.0 and 3.38. The gnome3 attribute set has been renamed to gnome and so have been the NixOS options. + + + Enabling wireless networking now requires specifying at least one network + interface using . + This is to avoid a race condition with the card initialisation (see + issue + #101963 for more information). + + If you are using to assign diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 8a0685c3d96..d9308b37064 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -40,8 +40,7 @@ in { default = []; example = [ "wlan0" "wlan1" ]; description = '' - The interfaces wpa_supplicant will use. If empty, it will - automatically use all wireless interfaces. + The interfaces wpa_supplicant will use. ''; }; @@ -220,7 +219,14 @@ in { }; config = mkIf cfg.enable { - assertions = flip mapAttrsToList cfg.networks (name: cfg: { + assertions = [ + { assertion = cfg.interfaces != []; + message = '' + No network interfaces for wpa_supplicant have been configured. + Please, specify at least one using networking.wireless.interfaces. + ''; + } + ] ++ flip mapAttrsToList cfg.networks (name: cfg: { assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1; message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive''; }); @@ -255,20 +261,7 @@ in { then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." fi iface_args="-s -u -D${cfg.driver} ${configStr}" - ${if ifaces == [] then '' - for i in $(cd /sys/class/net && echo *); do - DEVTYPE= - UEVENT_PATH=/sys/class/net/$i/uevent - if [ -e "$UEVENT_PATH" ]; then - source "$UEVENT_PATH" - if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then - args+="''${args:+ -N} -i$i $iface_args" - fi - fi - done - '' else '' - args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" - ''} + args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" exec wpa_supplicant $args ''; }; From 439fb88380e0d0af9fbb0f9613963eb41a80cb71 Mon Sep 17 00:00:00 2001 From: Carlos Hernandez Date: Mon, 31 May 2021 09:20:22 -0600 Subject: [PATCH 77/95] tree-sitter: explicitly incl CXX headers on Darwin clang needs to find headers + libraries for compiling with libc++. On Darwin we will include CXX headers when compiling C. This closes #124396 (cherry picked from commit 99b351b4bde2d9697b4e9abaa54458dcff1288d1) --- pkgs/development/tools/parsing/tree-sitter/grammar.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix index 5ca381e6d2f..93e1cb3804f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix @@ -1,5 +1,7 @@ { stdenv , tree-sitter +, libcxx +, lib }: # Build a parser grammar and put the resulting shared object in `$out/parser` @@ -27,6 +29,7 @@ stdenv.mkDerivation { "${source}/${location}" ; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; buildInputs = [ tree-sitter ]; dontUnpack = true; From 5da4cd9607e6497363f3f6471b0b8b16b3139572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Sat, 5 Jun 2021 10:32:59 +0200 Subject: [PATCH 78/95] lightworks: fix audio playback (cherry picked from commit 201cc75bcb41cde2581a994c3162014d85cead82) --- pkgs/applications/video/lightworks/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 9d940cd29b4..81b5be75f3b 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv , gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU -, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev +, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev, libjack2 }: let fullPath = lib.makeLibraryPath [ @@ -18,6 +18,7 @@ let openssl libuuid alsaLib + libjack2 udev ]; From 5e61b8b53710972a4b2a84755c28566c206bd861 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 25 May 2021 09:00:09 +0200 Subject: [PATCH 79/95] =?UTF-8?q?ocamlPackages.uri:=204.0.0=20=E2=86=92=20?= =?UTF-8?q?4.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit b69138f54157d0532988d074f12f7c4f2721dc9a) --- pkgs/development/ocaml-modules/uri/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index 7933b3bd8d4..f669a98c4de 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; pname = "uri"; - version = "4.0.0"; + version = "4.2.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "13r9nkgym9z3dqxkyf0yyaqlrk5r3pjdw0kfzvrc90bmhwl9j380"; + sha256 = "0szifda6yism5vn5jdizkha3ad0xk6zw4xgfl8g77dnv83ci7h65"; }; checkInputs = [ ounit ]; From 77e8ea81e3ce0332804338fde2e6d52854a8bca8 Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Sun, 6 Jun 2021 12:34:46 -0400 Subject: [PATCH 80/95] ec2-amis: add release 21.05 (cherry picked from commit b7d74194b49c3b3f85d52e85054283211bce6c11) --- nixos/modules/virtualisation/ec2-amis.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 892af513b03..d38f41ab39d 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -348,5 +348,24 @@ let self = { "20.09".ap-east-1.hvm-ebs = "ami-0c42f97e5b1fda92f"; "20.09".sa-east-1.hvm-ebs = "ami-021637976b094959d"; - latest = self."20.09"; + # 21.05.740.aa576357673 + "21.05".eu-west-1.hvm-ebs = "ami-048dbc738074a3083"; + "21.05".eu-west-2.hvm-ebs = "ami-0234cf81fec68315d"; + "21.05".eu-west-3.hvm-ebs = "ami-020e459baf709107d"; + "21.05".eu-central-1.hvm-ebs = "ami-0857d5d1309ab8b77"; + "21.05".eu-north-1.hvm-ebs = "ami-05403e3ae53d3716f"; + "21.05".us-east-1.hvm-ebs = "ami-0d3002ba40b5b9897"; + "21.05".us-east-2.hvm-ebs = "ami-069a0ca1bde6dea52"; + "21.05".us-west-1.hvm-ebs = "ami-0b415460a84bcf9bc"; + "21.05".us-west-2.hvm-ebs = "ami-093cba49754abd7f8"; + "21.05".ca-central-1.hvm-ebs = "ami-065c13e1d52d60b33"; + "21.05".ap-southeast-1.hvm-ebs = "ami-04f570c70ff9b665e"; + "21.05".ap-southeast-2.hvm-ebs = "ami-02a3d1df595df5ef6"; + "21.05".ap-northeast-1.hvm-ebs = "ami-027836fddb5c56012"; + "21.05".ap-northeast-2.hvm-ebs = "ami-0edacd41dc7700c39"; + "21.05".ap-south-1.hvm-ebs = "ami-0b279b5bb55288059"; + "21.05".ap-east-1.hvm-ebs = "ami-06dc98082bc55c1fc"; + "21.05".sa-east-1.hvm-ebs = "ami-04737dd49b98936c6"; + + latest = self."21.05"; }; in self From debf52168f6f839d386067805e940276a5c361d5 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sun, 6 Jun 2021 11:10:16 +0200 Subject: [PATCH 81/95] tor-browser-bundle-bin: 10.0.16 -> 10.0.17 (cherry picked from commit 0fc1a3d0d89ce06992714c690449c45713af75a6) --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 72b17400df3..09128301d6c 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -88,19 +88,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.16"; + version = "10.0.17"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "07h2gd6cwwq17lrwjpfah1xvr8ny8700qvi971qacrr7ssicw2pw"; + sha256 = "13x38n1cvqmxjz0jf2fda8lx2k25szzmg7gvv08z3q5na7109m2m"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "145kniiby5nnd0ll3v2gggzxz52bqbrdp72hvh96i8qnzi0fq25a"; + sha256 = "0f0ndwmzh732svwbcf1lbxlvdxw4i4d56w9xdl5fxd4n7ivqml1q"; }; }; in From fe6ece008baab21f10287a47d0b33feb35c8b32b Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 6 Jun 2021 12:59:18 +0800 Subject: [PATCH 82/95] linuxPackages_4_4.v4l2loopback: fix build for 4.4 kernels (cherry picked from commit 943d26cf3b3aa407c651395141b0a5bbf7043175) --- pkgs/os-specific/linux/v4l2loopback/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 73b2f589511..53f37e805fa 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, kmod }: stdenv.mkDerivation rec { - name = "v4l2loopback-${version}-${kernel.version}"; - version = "0.12.5"; + pname = "v4l2loopback"; + version = "unstable-2020-04-22-${kernel.version}"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; - rev = "v${version}"; - sha256 = "1qi4l6yam8nrlmc3zwkrz9vph0xsj1cgmkqci4652mbpbzigg7vn"; + rev = "d26e624b4ead762d34152f9f825b3a51fb92fb9c"; + sha256 = "sha256-OA45vmuVieoL7J83D3TD5qi3SBsiqi0kiQn4i1K6dVE="; }; hardeningDisable = [ "format" "pic" ]; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = kernel.moduleBuildDependencies; + buildInputs = [ kmod ]; makeFlags = [ @@ -30,8 +31,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A kernel module to create V4L2 loopback devices"; homepage = "https://github.com/umlaeute/v4l2loopback"; - license = licenses.gpl2; - maintainers = [ ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fortuneteller2k ]; platforms = platforms.linux; }; } From 7f537766b35adc88f77f3979a033bdd48fde9c70 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Mon, 7 Jun 2021 23:24:10 +0900 Subject: [PATCH 83/95] isync: 1.4.1 -> 1.4.2 Fixes CVE-2021-3578: possible remote code execution https://sourceforge.net/p/isync/mailman/message/37297759/ (cherry picked from commit 254a89e7d54c51c6e8f82f449714b2cbadb54e75) --- pkgs/tools/networking/isync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index f6263f187bf..666e19ca81a 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "isync"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "0l01880fcyqn6xq9n8236ha5n2a3wl5g8rmv22z8nv5hgfsxndhd"; + sha256 = "0hskfpj4r4q3959k3npyqli353daj3r5d9mfia9bbmig87nyfd8r"; }; nativeBuildInputs = [ pkg-config perl ]; From a5ea989814cf371a86621acc85b42a5abe964be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Mon, 7 Jun 2021 21:34:35 +0200 Subject: [PATCH 84/95] dino: 0.2.0 -> 0.2.1 Fixes https://nvd.nist.gov/vuln/detail/CVE-2021-33896. The current 9acb54df9254609f2fe4de83c9047d408412de28 patch landed in dino as 4592b72dfa324d8a4b9f8c25b359110889b2206c. Removing it from the patch list. (cherry picked from commit 70173c1519118a5ec79b8e7969b2f91c78e8c297) --- .../networking/instant-messengers/dino/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index d07b7d2912a..d4332c0265c 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -18,24 +18,15 @@ stdenv.mkDerivation rec { pname = "dino"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "0wy1hb3kz3k4gqqwx308n37cqag2d017jwfz0b5s30nkx2pbwspw"; + sha256 = "11m38syqzb1z92wmdaf45gryl6gjxwbcnk32j4p984ipqj2vdzd8"; }; - patches = [ - # Fixes https://github.com/dino/dino/issues/1010 (double' is not a supported generic type argument) - (fetchpatch { - name = "dino-vala-boxing.patch"; - url = "https://github.com/dino/dino/commit/9acb54df9254609f2fe4de83c9047d408412de28.patch"; - sha256 = "1jz4r7d8b1ljwgq846wihp864b6gjdkgh6fnmxh13b2i10x52xsm"; - }) - ]; - nativeBuildInputs = [ vala cmake From f1880322f3b36963dd222a99e68e126f1f2509a1 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 7 Jun 2021 17:33:26 +0000 Subject: [PATCH 85/95] element: 1.7.29 -> 1.7.30 https://github.com/vector-im/element-web/blob/v1.7.30/CHANGELOG.md https://github.com/vector-im/element-desktop/blob/v1.7.30/CHANGELOG.md (cherry picked from commit 445e3ce0e8c25017a058a1faa39fdd6648493731) --- .../element/element-desktop-package.json | 9 +- .../element/element-desktop-yarndeps.nix | 920 +++--------------- .../element/element-desktop.nix | 4 +- .../element/element-web.nix | 4 +- 4 files changed, 133 insertions(+), 804 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 901e056025b..5293c55f127 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.29", + "version": "1.7.30", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -47,8 +47,9 @@ "electron-builder-squirrel-windows": "22.10.5", "electron-devtools-installer": "^3.1.1", "electron-notarize": "^1.0.0", - "eslint": "7.3.1", - "eslint-config-matrix-org": "^0.1.2", + "eslint": "7.18.0", + "eslint-config-google": "^0.14.0", + "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#main", "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", @@ -67,7 +68,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "12.0.2", + "electronVersion": "12.0.9", "files": [ "package.json", { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 7d26fbbbff7..258f5cb2dad 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -25,14 +25,6 @@ sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d"; }; } - { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; - path = fetchurl { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; - sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; - }; - } { name = "_babel_code_frame___code_frame_7.12.13.tgz"; path = fetchurl { @@ -41,14 +33,6 @@ sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; }; } - { - name = "_babel_generator___generator_7.10.5.tgz"; - path = fetchurl { - name = "_babel_generator___generator_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.5.tgz"; - sha1 = "1b903554bc8c583ee8d25f1e8969732e6b829a69"; - }; - } { name = "_babel_generator___generator_7.13.16.tgz"; path = fetchurl { @@ -57,14 +41,6 @@ sha1 = "0befc287031a201d84cdfc173b46b320ae472d14"; }; } - { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; - sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; - }; - } { name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; path = fetchurl { @@ -73,14 +49,6 @@ sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"; }; } - { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; - sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; - }; - } { name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; path = fetchurl { @@ -89,14 +57,6 @@ sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; }; } - { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz"; - sha1 = "2c70576eaa3b5609b24cb99db2888cc3fc4251d1"; - }; - } { name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; path = fetchurl { @@ -105,14 +65,6 @@ sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; }; } - { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; - sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; - }; - } { name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; path = fetchurl { @@ -129,14 +81,6 @@ sha1 = "56d11312bd9248fa619591d02472be6e8cb32540"; }; } - { - name = "_babel_highlight___highlight_7.10.4.tgz"; - path = fetchurl { - name = "_babel_highlight___highlight_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; - sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; - }; - } { name = "_babel_highlight___highlight_7.13.10.tgz"; path = fetchurl { @@ -145,14 +89,6 @@ sha1 = "a8b2a66148f5b27d666b15d81774347a731d52d1"; }; } - { - name = "_babel_parser___parser_7.10.5.tgz"; - path = fetchurl { - name = "_babel_parser___parser_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz"; - sha1 = "e7c6bf5a7deff957cec9f04b551e2762909d826b"; - }; - } { name = "_babel_parser___parser_7.13.16.tgz"; path = fetchurl { @@ -169,14 +105,6 @@ sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736"; }; } - { - name = "_babel_template___template_7.10.4.tgz"; - path = fetchurl { - name = "_babel_template___template_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz"; - sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; - }; - } { name = "_babel_template___template_7.12.13.tgz"; path = fetchurl { @@ -193,22 +121,6 @@ sha1 = "c85415e0c7d50ac053d758baec98b28b2ecfeea3"; }; } - { - name = "_babel_traverse___traverse_7.10.5.tgz"; - path = fetchurl { - name = "_babel_traverse___traverse_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.5.tgz"; - sha1 = "77ce464f5b258be265af618d8fddf0536f20b564"; - }; - } - { - name = "_babel_types___types_7.10.5.tgz"; - path = fetchurl { - name = "_babel_types___types_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz"; - sha1 = "d88ae7e2fde86bfbfe851d4d81afa70a997b5d15"; - }; - } { name = "_babel_types___types_7.13.17.tgz"; path = fetchurl { @@ -233,6 +145,14 @@ sha1 = "231ac246c39d45b80e159bd21c3f9027dcaa10f5"; }; } + { + name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; + sha1 = "d736d6963d7003b6514e6324bec9c602ac340318"; + }; + } { name = "_iarna_cli___cli_1.2.0.tgz"; path = fetchurl { @@ -529,14 +449,6 @@ sha1 = "b14efa8852b7768d898906613c23f688713e02cd"; }; } - { - name = "_types_eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; - path = fetchurl { - name = "_types_eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; - sha1 = "1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"; - }; - } { name = "_types_fs_extra___fs_extra_9.0.9.tgz"; path = fetchurl { @@ -553,22 +465,6 @@ sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; }; } - { - name = "_types_json_schema___json_schema_7.0.5.tgz"; - path = fetchurl { - name = "_types_json_schema___json_schema_7.0.5.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz"; - sha1 = "dcce4430e64b443ba8945f0290fb564ad5bac6dd"; - }; - } - { - name = "_types_json5___json5_0.0.29.tgz"; - path = fetchurl { - name = "_types_json5___json5_0.0.29.tgz"; - url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; - sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; - }; - } { name = "_types_minimatch___minimatch_3.0.4.tgz"; path = fetchurl { @@ -625,54 +521,6 @@ sha1 = "34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"; }; } - { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.0.tgz"; - sha1 = "0f91aa3c83d019591719e597fbdb73a59595a263"; - }; - } - { - name = "_typescript_eslint_experimental_utils___experimental_utils_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.0.tgz"; - sha1 = "0ee21f6c48b2b30c63211da23827725078d5169a"; - }; - } - { - name = "_typescript_eslint_parser___parser_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_parser___parser_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.7.0.tgz"; - sha1 = "3e9cd9df9ea644536feb6e5acdb8279ecff96ce9"; - }; - } - { - name = "_typescript_eslint_types___types_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_types___types_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.7.0.tgz"; - sha1 = "09897fab0cb95479c01166b10b2c03c224821077"; - }; - } - { - name = "_typescript_eslint_typescript_estree___typescript_estree_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.0.tgz"; - sha1 = "66872e6da120caa4b64e6b4ca5c8702afc74738d"; - }; - } - { - name = "_typescript_eslint_visitor_keys___visitor_keys_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.0.tgz"; - sha1 = "ac0417d382a136e4571a0b0dcfe52088cb628177"; - }; - } { name = "JSONStream___JSONStream_1.3.5.tgz"; path = fetchurl { @@ -690,19 +538,19 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; - sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; }; } { - name = "acorn___acorn_7.3.1.tgz"; + name = "acorn___acorn_7.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz"; - sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"; + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; }; } { @@ -745,14 +593,6 @@ sha1 = "18c5af38a111ddeb4f2697bd78d68abc1cabd706"; }; } - { - name = "ajv___ajv_6.10.2.tgz"; - path = fetchurl { - name = "ajv___ajv_6.10.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; - sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; - }; - } { name = "ajv___ajv_6.12.2.tgz"; path = fetchurl { @@ -777,6 +617,22 @@ sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da"; }; } + { + name = "ajv___ajv_6.10.2.tgz"; + path = fetchurl { + name = "ajv___ajv_6.10.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; + sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; + }; + } + { + name = "ajv___ajv_8.5.0.tgz"; + path = fetchurl { + name = "ajv___ajv_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz"; + sha1 = "695528274bcb5afc865446aa275484049a18ae4b"; + }; + } { name = "ansi_align___ansi_align_2.0.0.tgz"; path = fetchurl { @@ -801,14 +657,6 @@ sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; }; } - { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; - }; - } { name = "ansi_regex___ansi_regex_2.1.1.tgz"; path = fetchurl { @@ -969,30 +817,6 @@ sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; }; } - { - name = "array_includes___array_includes_3.1.1.tgz"; - path = fetchurl { - name = "array_includes___array_includes_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; - sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; - }; - } - { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; - path = fetchurl { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; - sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; - }; - } - { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; - path = fetchurl { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz"; - sha1 = "1c13f84a178566042dd63de4414440db9222e443"; - }; - } { name = "asap___asap_2.0.6.tgz"; path = fetchurl { @@ -1034,11 +858,11 @@ }; } { - name = "astral_regex___astral_regex_1.0.0.tgz"; + name = "astral_regex___astral_regex_2.0.0.tgz"; path = fetchurl { - name = "astral_regex___astral_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; - sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; }; } { @@ -1113,14 +937,6 @@ sha1 = "24390e6ad61386b0a747265754d2a17219de862c"; }; } - { - name = "babel_eslint___babel_eslint_10.1.0.tgz"; - path = fetchurl { - name = "babel_eslint___babel_eslint_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; - sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; - }; - } { name = "balanced_match___balanced_match_1.0.0.tgz"; path = fetchurl { @@ -1409,14 +1225,6 @@ sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; }; } - { - name = "chardet___chardet_0.7.0.tgz"; - path = fetchurl { - name = "chardet___chardet_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz"; - sha1 = "90094849f0937f2eedc2425d0d28a9e5f0cbad9e"; - }; - } { name = "chownr___chownr_1.1.4.tgz"; path = fetchurl { @@ -1489,14 +1297,6 @@ sha1 = "6732d972979efc2ae444a1f08e08fa139c96a18e"; }; } - { - name = "cli_cursor___cli_cursor_3.1.0.tgz"; - path = fetchurl { - name = "cli_cursor___cli_cursor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; - }; - } { name = "cli_table3___cli_table3_0.5.1.tgz"; path = fetchurl { @@ -1513,14 +1313,6 @@ sha1 = "2b2dfd83c53cfd3572b87fc4d430a808afb04086"; }; } - { - name = "cli_width___cli_width_3.0.0.tgz"; - path = fetchurl { - name = "cli_width___cli_width_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz"; - sha1 = "a2f48437a2caa9a22436e794bf071ec9e61cedf6"; - }; - } { name = "cliui___cliui_3.2.0.tgz"; path = fetchurl { @@ -1729,14 +1521,6 @@ sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; } - { - name = "contains_path___contains_path_0.1.0.tgz"; - path = fetchurl { - name = "contains_path___contains_path_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz"; - sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; - }; - } { name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; path = fetchurl { @@ -1801,14 +1585,6 @@ sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; }; } - { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; - }; - } { name = "cross_spawn___cross_spawn_7.0.3.tgz"; path = fetchurl { @@ -1881,14 +1657,6 @@ sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; }; } - { - name = "debug___debug_2.6.9.tgz"; - path = fetchurl { - name = "debug___debug_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; - }; - } { name = "debug___debug_3.2.6.tgz"; path = fetchurl { @@ -2065,22 +1833,6 @@ sha1 = "d52e234815f1a07a59706e5f2a2fea71991cf784"; }; } - { - name = "doctrine___doctrine_1.5.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz"; - sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; - }; - } - { - name = "doctrine___doctrine_2.1.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; - sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; - }; - } { name = "doctrine___doctrine_3.0.0.tgz"; path = fetchurl { @@ -2321,14 +2073,6 @@ sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; }; } - { - name = "es_abstract___es_abstract_1.17.6.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.17.6.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz"; - sha1 = "9142071707857b2cacc7b89ecb670316c3e2d52a"; - }; - } { name = "es_abstract___es_abstract_1.16.3.tgz"; path = fetchurl { @@ -2385,14 +2129,6 @@ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; } - { - name = "eslint_config_esnext___eslint_config_esnext_4.1.0.tgz"; - path = fetchurl { - name = "eslint_config_esnext___eslint_config_esnext_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-esnext/-/eslint-config-esnext-4.1.0.tgz"; - sha1 = "8695b858fcf40d28c1aedca181f700528c7b60c6"; - }; - } { name = "eslint_config_google___eslint_config_google_0.14.0.tgz"; path = fetchurl { @@ -2402,115 +2138,19 @@ }; } { - name = "eslint_config_matrix_org___eslint_config_matrix_org_0.1.2.tgz"; + name = "53000626a9256811f6b355de4eafeb5575bda7fc"; path = fetchurl { - name = "eslint_config_matrix_org___eslint_config_matrix_org_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-matrix-org/-/eslint-config-matrix-org-0.1.2.tgz"; - sha1 = "b5d7e193e4f3fc5041905967b53c5ddd6924c793"; + name = "53000626a9256811f6b355de4eafeb5575bda7fc"; + url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/53000626a9256811f6b355de4eafeb5575bda7fc"; + sha1 = "12617a8105ab0ea2e7df2567928260a41ebffd58"; }; } { - name = "eslint_config_node___eslint_config_node_4.1.0.tgz"; + name = "eslint_scope___eslint_scope_5.1.1.tgz"; path = fetchurl { - name = "eslint_config_node___eslint_config_node_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-node/-/eslint-config-node-4.1.0.tgz"; - sha1 = "fc1f13946d83766d6b83b0e67699e2071a56f417"; - }; - } - { - name = "eslint_config_react_native___eslint_config_react_native_4.1.0.tgz"; - path = fetchurl { - name = "eslint_config_react_native___eslint_config_react_native_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-react-native/-/eslint-config-react-native-4.1.0.tgz"; - sha1 = "63e9401c7fac146804785f609e7df8f15b3e04eb"; - }; - } - { - name = "eslint_config_recommended___eslint_config_recommended_4.1.0.tgz"; - path = fetchurl { - name = "eslint_config_recommended___eslint_config_recommended_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-recommended/-/eslint-config-recommended-4.1.0.tgz"; - sha1 = "1adff90e0716d439be471d192977f233de171a46"; - }; - } - { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; - path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; - sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; - }; - } - { - name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; - path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; - sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; - }; - } - { - name = "eslint_plugin_babel___eslint_plugin_babel_5.3.1.tgz"; - path = fetchurl { - name = "eslint_plugin_babel___eslint_plugin_babel_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.1.tgz"; - sha1 = "75a2413ffbf17e7be57458301c60291f2cfbf560"; - }; - } - { - name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; - path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz"; - sha1 = "92f7736fe1fde3e2de77623c838dd992ff5ffb7e"; - }; - } - { - name = "eslint_plugin_react_native_globals___eslint_plugin_react_native_globals_0.1.2.tgz"; - path = fetchurl { - name = "eslint_plugin_react_native_globals___eslint_plugin_react_native_globals_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz"; - sha1 = "ee1348bc2ceb912303ce6bdbd22e2f045ea86ea2"; - }; - } - { - name = "eslint_plugin_react_native___eslint_plugin_react_native_3.8.1.tgz"; - path = fetchurl { - name = "eslint_plugin_react_native___eslint_plugin_react_native_3.8.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.8.1.tgz"; - sha1 = "92811e37191ecb0d29c0f0a0c9e5c943ee573821"; - }; - } - { - name = "eslint_plugin_react___eslint_plugin_react_7.20.3.tgz"; - path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.20.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.3.tgz"; - sha1 = "0590525e7eb83890ce71f73c2cf836284ad8c2f1"; - }; - } - { - name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz"; - path = fetchurl { - name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz"; - sha1 = "79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"; - }; - } - { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz"; - sha1 = "d0f971dfe59c69e0cada684b23d49dbf82600ce5"; - }; - } - { - name = "eslint_utils___eslint_utils_1.4.3.tgz"; - path = fetchurl { - name = "eslint_utils___eslint_utils_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; - sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; }; } { @@ -2538,35 +2178,27 @@ }; } { - name = "eslint___eslint_7.3.1.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.3.1.tgz"; - sha1 = "76392bd7e44468d046149ba128d1566c59acbe19"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; }; } { - name = "eslint___eslint_6.8.0.tgz"; + name = "eslint___eslint_7.18.0.tgz"; path = fetchurl { - name = "eslint___eslint_6.8.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz"; - sha1 = "62262d6729739f9275723824302fb227c8c93ffb"; + name = "eslint___eslint_7.18.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz"; + sha1 = "7fdcd2f3715a41fe6295a16234bd69aed2c75e67"; }; } { - name = "espree___espree_6.2.1.tgz"; + name = "espree___espree_7.3.1.tgz"; path = fetchurl { - name = "espree___espree_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; - sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; - }; - } - { - name = "espree___espree_7.2.0.tgz"; - path = fetchurl { - name = "espree___espree_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz"; - sha1 = "1c263d5b513dbad0ac30c4991b93ac354e948d69"; + name = "espree___espree_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; + sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; }; } { @@ -2577,14 +2209,6 @@ sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; }; } - { - name = "esquery___esquery_1.0.1.tgz"; - path = fetchurl { - name = "esquery___esquery_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz"; - sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708"; - }; - } { name = "esquery___esquery_1.3.1.tgz"; path = fetchurl { @@ -2594,11 +2218,11 @@ }; } { - name = "esrecurse___esrecurse_4.2.1.tgz"; + name = "esrecurse___esrecurse_4.3.0.tgz"; path = fetchurl { - name = "esrecurse___esrecurse_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz"; - sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"; + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; }; } { @@ -2617,6 +2241,14 @@ sha1 = "374309d39fd935ae500e7b92e8a6b4c720e59642"; }; } + { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } { name = "esutils___esutils_2.0.3.tgz"; path = fetchurl { @@ -2665,14 +2297,6 @@ sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; }; } - { - name = "external_editor___external_editor_3.1.0.tgz"; - path = fetchurl { - name = "external_editor___external_editor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"; - sha1 = "cb03f740befae03ea4d283caed2741a83f335495"; - }; - } { name = "extsprintf___extsprintf_1.3.0.tgz"; path = fetchurl { @@ -2730,19 +2354,11 @@ }; } { - name = "figures___figures_3.2.0.tgz"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; path = fetchurl { - name = "figures___figures_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; - sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af"; - }; - } - { - name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; - path = fetchurl { - name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; - sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; }; } { @@ -2786,19 +2402,19 @@ }; } { - name = "flat_cache___flat_cache_2.0.1.tgz"; + name = "flat_cache___flat_cache_3.0.4.tgz"; path = fetchurl { - name = "flat_cache___flat_cache_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; - sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; + name = "flat_cache___flat_cache_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; + sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; }; } { - name = "flatted___flatted_2.0.1.tgz"; + name = "flatted___flatted_3.1.1.tgz"; path = fetchurl { - name = "flatted___flatted_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz"; - sha1 = "69e57caa8f0eacbc281d2e2cb458d46fdb449e08"; + name = "flatted___flatted_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; + sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; }; } { @@ -3369,6 +2985,14 @@ sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; }; } + { + name = "import_fresh___import_fresh_3.3.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; + }; + } { name = "import_lazy___import_lazy_2.1.0.tgz"; path = fetchurl { @@ -3441,22 +3065,6 @@ sha1 = "45ffe2f610a8ca134f2bd1db5637b235070f6cbe"; }; } - { - name = "inquirer___inquirer_7.3.2.tgz"; - path = fetchurl { - name = "inquirer___inquirer_7.3.2.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.2.tgz"; - sha1 = "25245d2e32dc9f33dbe26eeaada231daa66e9c7c"; - }; - } - { - name = "internal_slot___internal_slot_1.0.2.tgz"; - path = fetchurl { - name = "internal_slot___internal_slot_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; - sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; - }; - } { name = "invert_kv___invert_kv_1.0.0.tgz"; path = fetchurl { @@ -3497,14 +3105,6 @@ sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; }; } - { - name = "is_callable___is_callable_1.2.0.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz"; - sha1 = "83336560b54a38e35e3a2df7afd0454d691468bb"; - }; - } { name = "is_ci___is_ci_1.2.1.tgz"; path = fetchurl { @@ -3673,14 +3273,6 @@ sha1 = "5517489b547091b0930e095654ced25ee97e9491"; }; } - { - name = "is_regex___is_regex_1.1.0.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz"; - sha1 = "ece38e389e490df0dc21caea2bd596f987f767ff"; - }; - } { name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; path = fetchurl { @@ -3697,14 +3289,6 @@ sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; } - { - name = "is_string___is_string_1.0.5.tgz"; - path = fetchurl { - name = "is_string___is_string_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; - sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; - }; - } { name = "is_symbol___is_symbol_1.0.3.tgz"; path = fetchurl { @@ -3857,6 +3441,14 @@ sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; }; } + { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + }; + } { name = "json_schema_typed___json_schema_typed_7.0.3.tgz"; path = fetchurl { @@ -3889,14 +3481,6 @@ sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; } - { - name = "json5___json5_1.0.1.tgz"; - path = fetchurl { - name = "json5___json5_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; - sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; - }; - } { name = "json5___json5_2.1.3.tgz"; path = fetchurl { @@ -3937,14 +3521,6 @@ sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; } - { - name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; - path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz"; - sha1 = "1114a4c1209481db06c690c2b4f488cc665f657e"; - }; - } { name = "jszip___jszip_3.5.0.tgz"; path = fetchurl { @@ -4009,14 +3585,6 @@ sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; }; } - { - name = "levn___levn_0.3.0.tgz"; - path = fetchurl { - name = "levn___levn_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; - }; - } { name = "levn___levn_0.4.1.tgz"; path = fetchurl { @@ -4225,6 +3793,14 @@ sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; }; } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + } { name = "lodash.union___lodash.union_4.6.0.tgz"; path = fetchurl { @@ -4250,27 +3826,11 @@ }; } { - name = "lodash___lodash_4.17.15.tgz"; + name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.15.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; - sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; - }; - } - { - name = "lodash___lodash_4.17.19.tgz"; - path = fetchurl { - name = "lodash___lodash_4.17.19.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz"; - sha1 = "e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"; - }; - } - { - name = "loose_envify___loose_envify_1.4.0.tgz"; - path = fetchurl { - name = "loose_envify___loose_envify_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; - sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; }; } { @@ -4593,14 +4153,6 @@ sha1 = "e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0"; }; } - { - name = "nice_try___nice_try_1.0.5.tgz"; - path = fetchurl { - name = "nice_try___nice_try_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; - sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; - }; - } { name = "node_addon_api___node_addon_api_1.7.2.tgz"; path = fetchurl { @@ -4881,30 +4433,6 @@ sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; }; } - { - name = "object.assign___object.assign_4.1.0.tgz"; - path = fetchurl { - name = "object.assign___object.assign_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; - sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; - }; - } - { - name = "object.entries___object.entries_1.1.2.tgz"; - path = fetchurl { - name = "object.entries___object.entries_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz"; - sha1 = "bc73f00acb6b6bb16c203434b10f9a7e797d3add"; - }; - } - { - name = "object.fromentries___object.fromentries_2.0.2.tgz"; - path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; - sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; - }; - } { name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; path = fetchurl { @@ -4913,14 +4441,6 @@ sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; }; } - { - name = "object.values___object.values_1.1.1.tgz"; - path = fetchurl { - name = "object.values___object.values_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; - sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; - }; - } { name = "omggif___omggif_1.0.10.tgz"; path = fetchurl { @@ -4953,14 +4473,6 @@ sha1 = "5d37e1f35077b9dcac4301372271afdeb2a13598"; }; } - { - name = "optionator___optionator_0.8.3.tgz"; - path = fetchurl { - name = "optionator___optionator_0.8.3.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; - }; - } { name = "optionator___optionator_0.9.1.tgz"; path = fetchurl { @@ -5249,14 +4761,6 @@ sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854"; }; } - { - name = "pkg_dir___pkg_dir_2.0.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz"; - sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; - }; - } { name = "pkg_up___pkg_up_3.1.0.tgz"; path = fetchurl { @@ -5305,14 +4809,6 @@ sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; }; } - { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - path = fetchurl { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; - }; - } { name = "prepend_http___prepend_http_1.0.4.tgz"; path = fetchurl { @@ -5385,14 +4881,6 @@ sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; }; } - { - name = "prop_types___prop_types_15.7.2.tgz"; - path = fetchurl { - name = "prop_types___prop_types_15.7.2.tgz"; - url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; - sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; - }; - } { name = "proto_list___proto_list_1.2.4.tgz"; path = fetchurl { @@ -5529,14 +5017,6 @@ sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; }; } - { - name = "react_is___react_is_16.13.1.tgz"; - path = fetchurl { - name = "react_is___react_is_16.13.1.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; - sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; - }; - } { name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; path = fetchurl { @@ -5649,22 +5129,6 @@ sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; }; } - { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; - sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; - }; - } - { - name = "regexpp___regexpp_2.0.1.tgz"; - path = fetchurl { - name = "regexpp___regexpp_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz"; - sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f"; - }; - } { name = "regexpp___regexpp_3.1.0.tgz"; path = fetchurl { @@ -5729,6 +5193,14 @@ sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; } + { + name = "require_from_string___require_from_string_2.0.2.tgz"; + path = fetchurl { + name = "require_from_string___require_from_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; + sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; + }; + } { name = "require_main_filename___require_main_filename_1.0.1.tgz"; path = fetchurl { @@ -5761,14 +5233,6 @@ sha1 = "be0aa4c06acd53083505abb35f4d66932ab35d16"; }; } - { - name = "resolve___resolve_1.17.0.tgz"; - path = fetchurl { - name = "resolve___resolve_1.17.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; - sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; - }; - } { name = "resolve___resolve_1.20.0.tgz"; path = fetchurl { @@ -5785,14 +5249,6 @@ sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; }; } - { - name = "restore_cursor___restore_cursor_3.1.0.tgz"; - path = fetchurl { - name = "restore_cursor___restore_cursor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; - }; - } { name = "retry___retry_0.10.1.tgz"; path = fetchurl { @@ -5809,14 +5265,6 @@ sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; }; } - { - name = "rimraf___rimraf_2.6.3.tgz"; - path = fetchurl { - name = "rimraf___rimraf_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; - sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; - }; - } { name = "rimraf___rimraf_2.7.1.tgz"; path = fetchurl { @@ -5833,14 +5281,6 @@ sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; }; } - { - name = "run_async___run_async_2.4.1.tgz"; - path = fetchurl { - name = "run_async___run_async_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; - sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; - }; - } { name = "run_queue___run_queue_1.0.3.tgz"; path = fetchurl { @@ -5849,14 +5289,6 @@ sha1 = "e848396f057d223f24386924618e25694161ec47"; }; } - { - name = "rxjs___rxjs_6.6.0.tgz"; - path = fetchurl { - name = "rxjs___rxjs_6.6.0.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz"; - sha1 = "af2901eedf02e3a83ffa7f886240ff9018bbec84"; - }; - } { name = "safe_buffer___safe_buffer_5.2.0.tgz"; path = fetchurl { @@ -6009,14 +5441,6 @@ sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; }; } - { - name = "side_channel___side_channel_1.0.2.tgz"; - path = fetchurl { - name = "side_channel___side_channel_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; - sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; - }; - } { name = "signal_exit___signal_exit_3.0.2.tgz"; path = fetchurl { @@ -6034,11 +5458,11 @@ }; } { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; + name = "slice_ansi___slice_ansi_4.0.0.tgz"; path = fetchurl { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; - sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; }; } { @@ -6257,22 +5681,6 @@ sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; }; } - { - name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; - path = fetchurl { - name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; - sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; - }; - } - { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; - path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha1 = "85812a6b847ac002270f5808146064c995fb6913"; - }; - } { name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; path = fetchurl { @@ -6289,14 +5697,6 @@ sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58"; }; } - { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; - path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; - }; - } { name = "string_decoder___string_decoder_1.3.0.tgz"; path = fetchurl { @@ -6410,11 +5810,11 @@ }; } { - name = "table___table_5.4.6.tgz"; + name = "table___table_6.7.1.tgz"; path = fetchurl { - name = "table___table_5.4.6.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; - sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e"; + name = "table___table_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; + sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2"; }; } { @@ -6537,14 +5937,6 @@ sha1 = "ee434a4e22543082e294ba6201dcc6eafefa2877"; }; } - { - name = "tmp___tmp_0.0.33.tgz"; - path = fetchurl { - name = "tmp___tmp_0.0.33.tgz"; - url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; - sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9"; - }; - } { name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; path = fetchurl { @@ -6585,38 +5977,6 @@ sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; }; } - { - name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; - path = fetchurl { - name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; - url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; - sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; - }; - } - { - name = "tslib___tslib_1.13.0.tgz"; - path = fetchurl { - name = "tslib___tslib_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; - sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; - }; - } - { - name = "tslib___tslib_1.10.0.tgz"; - path = fetchurl { - name = "tslib___tslib_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz"; - sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; - }; - } - { - name = "tsutils___tsutils_3.17.1.tgz"; - path = fetchurl { - name = "tsutils___tsutils_3.17.1.tgz"; - url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz"; - sha1 = "ed719917f11ca0dee586272b2ac49e015a2dd759"; - }; - } { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { @@ -6641,22 +6001,6 @@ sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; }; } - { - name = "type_check___type_check_0.3.2.tgz"; - path = fetchurl { - name = "type_check___type_check_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; - }; - } - { - name = "type_fest___type_fest_0.11.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; - sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; - }; - } { name = "type_fest___type_fest_0.16.0.tgz"; path = fetchurl { @@ -6697,14 +6041,6 @@ sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; } - { - name = "typescript___typescript_3.9.7.tgz"; - path = fetchurl { - name = "typescript___typescript_3.9.7.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz"; - sha1 = "98d600a5ebdc38f40cb277522f12dc800e9e25fa"; - }; - } { name = "uid_number___uid_number_0.0.6.tgz"; path = fetchurl { @@ -7097,14 +6433,6 @@ sha1 = "558328352e673b5bb192cf86500d60b230667d4b"; }; } - { - name = "write___write_1.0.3.tgz"; - path = fetchurl { - name = "write___write_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; - sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; - }; - } { name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; path = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 6642d4ca024..6424972cbf7 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.29"; + version = "1.7.30"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-nCtgVVOdjZ/OK8gMInBbNeuJadchDYUO2UQxEmcOm4s="; + sha256 = "09k1xxmzqvw8c1x9ndsdvwj4598rdx9zqraz3rmr3i58s51vycxp"; }; in mkYarnPackage rec { name = "element-desktop-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 92f9fa0ab19..5baed75ba52 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.29"; + version = "1.7.30"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-wFC0B9v0V3JK9sLKH7GviVO/JEjePOJ06PwRq/MVqDE="; + sha256 = "1pnmgdyacxfk8hdf930rqqvqrcvckc3m4pb5mkznlirsmw06nfay"; }; installPhase = '' From a29ce4a574d3bf2e8a97ab09d12c218cee5c8023 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 8 Jun 2021 03:47:26 +0300 Subject: [PATCH 86/95] steamPackages.steam-runtime: 0.20210317.0 -> 0.20210527.0 (cherry picked from commit 2033f37fb284bd55159ea1650aa93a635caaffb3) --- pkgs/games/steam/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index b501df598ef..ab2c19249aa 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/ - version = "0.20210317.0"; + version = "0.20210527.0"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "061z2r33n2017prmhdxm82cly3qp3bma2q70pqs57adl65yvg7vw"; + sha256 = "1880d1byn265w0vy5p98d8w8virnbywj707ydybj7rixhid2gzdc"; name = "scout-runtime-${version}.tar.gz"; }; From 60f31b66928fd71b891686af1cc5051e474f36d2 Mon Sep 17 00:00:00 2001 From: Luke Worth Date: Tue, 8 Jun 2021 10:40:10 +1000 Subject: [PATCH 87/95] nix-direnv: make flakes support optional `nix-direnv` depends on `nixUnstable` for flakes support, but that causes it to print a warning unless your user is trusted or the `experimental-features` setting is enabled. Neither of these are desirable (note that setting `experimental-features` in nix.conf causes warnings on `nixStable`). Since flakes are experimental, this commit makes `nixStable` the default and optionally allows `nixUnstable` with a new flag `enableFlakes`, prioritising a good experience for users not using experimental features. (cherry picked from commit 03310df843a344215b45b2e8aef11ae9402a40e2) --- pkgs/tools/misc/nix-direnv/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 94ce54a2a9a..526efc65f6a 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, gnugrep, nixUnstable }: +{ lib +, stdenv +, fetchFromGitHub +, gnugrep +, nixStable +, nixUnstable +, enableFlakes ? false +}: +let + nix = if enableFlakes then nixUnstable else nixStable; +in stdenv.mkDerivation rec { pname = "nix-direnv"; version = "1.2.6"; @@ -14,7 +24,7 @@ stdenv.mkDerivation rec { # Substitute instead of wrapping because the resulting file is # getting sourced, not executed: postPatch = '' - sed -i "1a NIX_BIN_PREFIX=${nixUnstable}/bin/" direnvrc + sed -i "1a NIX_BIN_PREFIX=${nix}/bin/" direnvrc substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep" ''; From 42a89304807ae1455df5b38e7c33a0764496ecad Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 8 Jun 2021 08:48:51 +0200 Subject: [PATCH 88/95] phpPackages.composer: 2.1.1 -> 2.1.2 https://github.com/composer/composer/releases/tag/2.1.2 (cherry picked from commit b30d8c49e83aab896aa7468aa9585f50f4877c63) --- pkgs/development/php-packages/composer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index f81ee3005f7..23efc987a38 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.1.1"; + version = "2.1.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1ki106973q74inwgd4hjmml905rqg82808qq4wiysrkr7mzmfnj4"; + sha256 = "0gd4hxkxdds3nxpbcd38chrkijha31p6nygdq3f73mbb984h3v1d"; }; dontUnpack = true; From c525d5cf31cf7578022794e1a0720d4fa2d4527b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 8 Jun 2021 13:47:44 +0200 Subject: [PATCH 89/95] 389-base: Add CVE-2021-3514 (cherry picked from commit fb7a3e1086debb3c47f0881724caccaa1a82642c) --- pkgs/servers/ldap/389/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index db9041574fc..4387542e5af 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -65,5 +65,8 @@ stdenv.mkDerivation rec { description = "Enterprise-class Open Source LDAP server for Linux"; license = licenses.gpl3Plus; platforms = platforms.linux; + knownVulnerabilities = [ + "CVE-2021-3514" # https://nvd.nist.gov/vuln/detail/CVE-2021-3514 + ]; }; } From 52147880d7a574c4f95c900058e3fee4c1ed657e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 May 2021 02:24:31 +0000 Subject: [PATCH 90/95] marvin: 21.3.0 -> 21.9.0 (cherry picked from commit cb70ce62ab26553c9174244bdc37a847cfa28151) --- pkgs/applications/science/chemistry/marvin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index b4f0d955d6b..c806db74ff3 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "21.3.0"; + version = "21.9.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-PM4Exi4YD6WibxqtewLzE4dDRgSVHiTT36p68uoQP4g="; + sha256 = "sha256-T94SoHAZmBfbGaFiuYAKhuKgHaXcDZix//YTTq1oFIk="; }; nativeBuildInputs = [ dpkg makeWrapper ]; From 3ee44228493325ae1606852cf3571a7eb0d3a0f7 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 24 May 2021 19:09:06 +0200 Subject: [PATCH 91/95] rPackages.lwgeom: fix build (cherry picked from commit 8bf4f7e2f3ac9232e7e198296f4904c634848216) --- pkgs/development/r-modules/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 067db74663e..f16a6d0bb4a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -276,6 +276,7 @@ let jqr = [ pkgs.jq.dev ]; KFKSDS = [ pkgs.gsl_1 ]; kza = [ pkgs.fftw.dev ]; + lwgeom = [ pkgs.gdal pkgs.geos pkgs.proj ]; magick = [ pkgs.imagemagick.dev ]; ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; mvabund = [ pkgs.gsl_1 ]; @@ -406,6 +407,7 @@ let gdtools = [ pkgs.pkg-config ]; jqr = [ pkgs.jq.lib ]; kza = [ pkgs.pkg-config ]; + lwgeom = [ pkgs.pkg-config pkgs.proj.dev pkgs.sqlite.dev ]; magick = [ pkgs.pkg-config ]; mwaved = [ pkgs.pkg-config ]; odbc = [ pkgs.pkg-config ]; From f2046813e243450a606acf385d7c3a099198a717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 23 May 2021 11:38:12 -0300 Subject: [PATCH 92/95] numix-solarized-gtk-theme: 20200910 -> 20210522 (cherry picked from commit 9b743d9bbb9483f044b6947c456d26e3e1e4baad) --- pkgs/data/themes/numix-solarized/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/data/themes/numix-solarized/default.nix index 0d965e8030a..532275e5f74 100644 --- a/pkgs/data/themes/numix-solarized/default.nix +++ b/pkgs/data/themes/numix-solarized/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3, sassc, glib, gdk-pixbuf, inkscape, gtk-engine-murrine }: stdenv.mkDerivation rec { - version = "20200910"; pname = "numix-solarized-gtk-theme"; + version = "20210522"; src = fetchFromGitHub { owner = "Ferdi265"; - repo = "numix-solarized-gtk-theme"; + repo = pname; rev = version; - sha256 = "05h1563sy6sfz76jadxsf730mav6bbjsk9xnadv49r16b8n8p9a9"; + sha256 = "0hin73fmfir4w1z0j87k5hahhf2blhcq4r7gf89gz4slnl18cvjh"; }; nativeBuildInputs = [ python3 sassc glib gdk-pixbuf inkscape ]; @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - HOME="$NIX_BUILD_ROOT" # shut up inkscape's warnings + runHook preInstall for theme in *.colors; do make THEME="''${theme/.colors/}" install done + runHook postInstall ''; meta = with lib; { @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/Ferdi265/numix-solarized-gtk-theme"; downloadPage = "https://github.com/Ferdi265/numix-solarized-gtk-theme/releases"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.offline ]; }; From df9df54d637da87dc577026cd973b80704ee27c1 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 7 Jun 2021 15:55:58 +0200 Subject: [PATCH 93/95] Revert "nixos/wireless: make wireless.interfaces mandatory" This reverts commit 030a521adc9510207dd9f06b8d8b552ff7d999f9. (cherry picked from commit eba5f5c1e5a61ef65a970c699b9f93aff87448bf) --- nixos/doc/manual/release-notes/rl-2105.xml | 9 ------- .../services/networking/wpa_supplicant.nix | 27 ++++++++++++------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index c6b1ce212de..124ede12726 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -181,15 +181,6 @@ GNOME desktop environment was upgraded to 40, see the release notes for 40.0 and 3.38. The gnome3 attribute set has been renamed to gnome and so have been the NixOS options. - - - Enabling wireless networking now requires specifying at least one network - interface using . - This is to avoid a race condition with the card initialisation (see - issue - #101963 for more information). - - If you are using to assign diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index d9308b37064..8a0685c3d96 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -40,7 +40,8 @@ in { default = []; example = [ "wlan0" "wlan1" ]; description = '' - The interfaces wpa_supplicant will use. + The interfaces wpa_supplicant will use. If empty, it will + automatically use all wireless interfaces. ''; }; @@ -219,14 +220,7 @@ in { }; config = mkIf cfg.enable { - assertions = [ - { assertion = cfg.interfaces != []; - message = '' - No network interfaces for wpa_supplicant have been configured. - Please, specify at least one using networking.wireless.interfaces. - ''; - } - ] ++ flip mapAttrsToList cfg.networks (name: cfg: { + assertions = flip mapAttrsToList cfg.networks (name: cfg: { assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1; message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive''; }); @@ -261,7 +255,20 @@ in { then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." fi iface_args="-s -u -D${cfg.driver} ${configStr}" - args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" + ${if ifaces == [] then '' + for i in $(cd /sys/class/net && echo *); do + DEVTYPE= + UEVENT_PATH=/sys/class/net/$i/uevent + if [ -e "$UEVENT_PATH" ]; then + source "$UEVENT_PATH" + if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then + args+="''${args:+ -N} -i$i $iface_args" + fi + fi + done + '' else '' + args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" + ''} exec wpa_supplicant $args ''; }; From f2c9d568c8a1e2d85362932b22eeb6d73e003f9f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 7 Jun 2021 16:01:52 +0200 Subject: [PATCH 94/95] nixos/wireless: only warn for no interfaces A hard failure breaks the NixOS installer, which can't possibly know the interface names in advance. (cherry picked from commit be01320a6c39867eac0a20b4dfe04680d3b1ce26) --- .../modules/services/networking/wpa_supplicant.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 8a0685c3d96..c0a4ce40760 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -42,6 +42,11 @@ in { description = '' The interfaces wpa_supplicant will use. If empty, it will automatically use all wireless interfaces. + + The automatic discovery of interfaces does not work reliably on boot: + it may fail and leave the system without network. When possible, specify + a known interface name. + ''; }; @@ -225,6 +230,14 @@ in { message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive''; }); + warnings = + optional (cfg.interfaces == [] && config.systemd.services.wpa_supplicant.wantedBy != []) + '' + No network interfaces for wpa_supplicant have been configured: the service + may randomly fail to start at boot. You should specify at least one using the option + networking.wireless.interfaces. + ''; + environment.systemPackages = [ package ]; services.dbus.packages = [ package ]; From a76d51dc52ed08f16f9747c4685ec78c1b9a5c4c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Jun 2021 19:17:46 -0700 Subject: [PATCH 95/95] steam/fhsenv: add pipewire as hard requirement (cherry picked from commit 1817df0beb89a26050c5e1a7f9a12e4256cab427) --- pkgs/games/steam/fhsenv.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 44bee8ff11a..fe3dde7167b 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -98,6 +98,7 @@ in buildFHSUserEnv rec { xorg.libXfixes libGL libva + pipewire.lib # Not formally in runtime but needed by some games at-spi2-atk