From 8bc10fbc56db2aaf1f234349e4d0c7607b8ead4f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 12 Jun 2021 11:21:35 -0500 Subject: [PATCH 01/59] Add gcc for emacs wrapper so native-comp works MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On macos, we don’t have a gcc executable by default, which is required for some reason when compiling site-start. --- .../editors/emacs/elisp-packages/elpa-packages.nix | 3 ++- pkgs/build-support/emacs/elpa.nix | 4 ++-- pkgs/build-support/emacs/generic.nix | 4 +++- pkgs/build-support/emacs/melpa.nix | 4 ++-- pkgs/build-support/emacs/wrapper.nix | 7 +++++-- pkgs/top-level/emacs-packages.nix | 4 ++-- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 02a9a6e65622..cefed111f4fd 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -21,7 +21,7 @@ formats commits for you. */ -{ lib, stdenv, texinfo, writeText }: +{ lib, stdenv, texinfo, writeText, gcc }: self: let @@ -34,6 +34,7 @@ self: let elpaBuild = import ../../../../build-support/emacs/elpa.nix { inherit lib stdenv texinfo writeText; inherit (self) emacs; + inherit gcc; }; generateElpa = lib.makeOverridable ({ diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 41a0670d0c84..965b8d8189a2 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -1,6 +1,6 @@ # builder for Emacs packages built for packages.el -{ lib, stdenv, emacs, texinfo, writeText }: +{ lib, stdenv, emacs, texinfo, writeText, gcc }: with lib; @@ -19,7 +19,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ phases = "installPhase fixupPhase distPhase"; diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index 1456d9e423d8..ef154982ad06 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -1,6 +1,6 @@ # generic builder for Emacs packages -{ lib, stdenv, emacs, texinfo, writeText, ... }: +{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }: with lib; @@ -72,6 +72,8 @@ stdenv.mkDerivation ({ LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; + nativeBuildInputs = [ gcc ]; + addEmacsNativeLoadPath = true; postInstall = '' diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 824611b20c8a..5c41a66970e4 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -1,7 +1,7 @@ # builder for Emacs packages built for packages.el # using MELPA package-build.el -{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText }: +{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText, gcc }: with lib; @@ -28,7 +28,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ ename = if ename == null diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 571d0eb687ce..6b53f3fdd954 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -32,7 +32,7 @@ in customEmacsPackages.emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit */ -{ lib, lndir, makeWrapper, runCommand }: self: +{ lib, lndir, makeWrapper, runCommand, gcc }: self: with lib; @@ -65,7 +65,10 @@ runCommand # Store all paths we want to add to emacs here, so that we only need to add # one path to the load lists deps = runCommand "emacs-packages-deps" - { inherit explicitRequires lndir emacs; } + { + inherit explicitRequires lndir emacs; + nativeBuildInputs = lib.optional nativeComp gcc; + } '' findInputsOld() { local pkg="$1"; shift diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d168d34e3738..34f995616017 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -26,7 +26,7 @@ let mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix { - inherit (pkgs) stdenv texinfo writeText; + inherit (pkgs) stdenv texinfo writeText gcc; inherit lib; }; @@ -44,7 +44,7 @@ let }; emacsWithPackages = { pkgs, lib }: import ../build-support/emacs/wrapper.nix { - inherit (pkgs) makeWrapper runCommand; + inherit (pkgs) makeWrapper runCommand gcc; inherit (pkgs.xorg) lndir; inherit lib; }; From 82003f428c6c4a6912781545067d5da4bff4881a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 24 Jun 2021 12:33:40 -0500 Subject: [PATCH 02/59] Update pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix Co-authored-by: Sandro --- .../editors/emacs/elisp-packages/elpa-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index cefed111f4fd..69db13fec19e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -32,9 +32,8 @@ self: let }; elpaBuild = import ../../../../build-support/emacs/elpa.nix { - inherit lib stdenv texinfo writeText; + inherit lib stdenv texinfo writeText gcc; inherit (self) emacs; - inherit gcc; }; generateElpa = lib.makeOverridable ({ From 2df085d5c01e4df6c9436a689e975220c5d3a10f Mon Sep 17 00:00:00 2001 From: Mykola Orliuk Date: Sun, 11 Jul 2021 19:51:25 +0200 Subject: [PATCH 03/59] pidgin: 2.13.0 -> 2.14.6 --- .../networking/instant-messengers/pidgin/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index dc5a87397609..4a0ef5ad771d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -3,7 +3,7 @@ , gst_all_1, startupnotification, gettext , perlPackages, libxml2, nss, nspr, farstream , libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn -, lib, python, libICE, libXext, libSM +, lib, python3, libICE, libXext, libSM , cyrus_sasl ? null , openssl ? null , gnutls ? null @@ -16,11 +16,11 @@ let unwrapped = stdenv.mkDerivation rec { pname = "pidgin"; majorVersion = "2"; - version = "${majorVersion}.13.0"; + version = "${majorVersion}.14.6"; src = fetchurl { url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.bz2"; - sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7"; + sha256 = "bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336"; }; inherit nss ncurses; @@ -30,7 +30,7 @@ let unwrapped = stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; buildInputs = let - python-with-dbus = python.withPackages (pp: with pp; [ dbus-python ]); + python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]); in [ aspell startupnotification gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -62,6 +62,7 @@ let unwrapped = stdenv.mkDerivation rec { "--disable-meanwhile" "--disable-nm" "--disable-tcl" + "--disable-gevolution" ] ++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ]) ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]) From 089c534c215fe8301d53efc33f80eb058eb28c5c Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 12 Jul 2021 21:12:47 +0900 Subject: [PATCH 04/59] firefox-bin: 89.0.1 -> 90.0 --- .../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 3410ab5a25c8..12c76c8e4dde 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 = "89.0.2"; + version = "90.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ach/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ach/firefox-90.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "7de9c1dc38a4508aeca588a6ad49ededef067fe7589b099f1e4bdda2dfc99d60"; + sha256 = "b21effb602d202574d3498a2a1d4d381f1581eb794691123fa00eb25adb21b5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/af/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/af/firefox-90.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "bdff1c8983f94e4f9237cfbbeed6a9e10dabd029e3f4efaf9f8ed0d4cd04db6d"; + sha256 = "2ee727fe495f586ca0f825e1bbadd4d737b1c6e4050ad1e77f3cb84cd9d50e3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/an/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/an/firefox-90.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "f2e1157d325a91d41600db763dedbf2344dbcb07c1af04ba02079a3c134a76b5"; + sha256 = "f33700fc2178d6ea0bc6bd47cf16744a7551e3987abe9cd9bb891cd48a019000"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ar/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ar/firefox-90.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "dc65f87a192c5940053e1d696f0b82dd9c4dfd4e1b9ffa70e7e608bd81622e53"; + sha256 = "5633334afb6a338a861b665c78209ba13558c0b6dfab44f80cd690533633575d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ast/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ast/firefox-90.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "96305dcf9c86fa8357fc691ace8496916effc32896416e3507263e740256fe00"; + sha256 = "98fff4f8216441b7b404dc00ca4bbd3b8161514dde85bfe56c23ea15a20c1ba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/az/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/az/firefox-90.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "8f5a0a0050bbd221700d3dc65b749393d855ac0b93288d498ed6911aa727f577"; + sha256 = "02a48160df4f22842f09bbf54190ed91f83f0b0af9b15134ce6f83a163de8891"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/be/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/be/firefox-90.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "cad622598b126c17049fd2c18cb8c5cfc0b08a41559b872d2cd474eedd8cc64c"; + sha256 = "1848205609b3bb57a84fb2ddd002e57868dce7f2046a4603e2058fb4bf6b4046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/bg/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bg/firefox-90.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "60dcc88ee1532178b601fca3fa1711b83ef40a58f38ecdbd2abf504a74650f51"; + sha256 = "27a40aba90c5b8ef51d2077770ee0803e0d8327db36d1f95a463c54ca74a7536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/bn/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bn/firefox-90.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "d8d48d57861c369631762141ff3230ea6877d1cfa25ab445ff8482c3505336ef"; + sha256 = "490da4669e9711bbdb309abba2251b88407ec843065b5c81e61cae5be59d8e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/br/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/br/firefox-90.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "93753f265ddab79e1632b17a39ff009d4b0831a57b522fbd042b85ac1b0e4526"; + sha256 = "be50bcfb6bfc9144cf690165801abc294dfa9b67597d727f7707025b8a61be97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/bs/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bs/firefox-90.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "e0f253a239e7bbd89d051377ad3250160154568f92ae7ca7e813b202fb3ab2af"; + sha256 = "90fcf0f8a7fa13ca4157ec710e06053485df7e47264ba46bebe4551154244b89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ca-valencia/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ca-valencia/firefox-90.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "7aee988a5af50bc98cd9d8ec7beb2c4dcb7183a736be1fc47b5535280a20f7dc"; + sha256 = "bb32faff40658d974d9f1909ee574043c3501d7d5149629a8abce919aeb37232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ca/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ca/firefox-90.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "ce9617a904bb05391525af0eb6119f333a04d01ae6eecc60096d1bb159296933"; + sha256 = "bd5b977e54ee504dce9aafcb093419b23da0c85ca1f84c6c0060014d3ec3b32a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/cak/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cak/firefox-90.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a20708a942536373236c784a93d67a53623dd389c42167d09ddfd2577456d5b4"; + sha256 = "aa2e5b116ebfc296cfb6522b2b35bf006cd2d4154b04d20ac4c6a720fad90008"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/cs/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cs/firefox-90.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4d40e2d2f8bb1d3a3c2f7319dec6106b1781d717d430bd6e75db3cd8b12af31f"; + sha256 = "ec9b5c46617f9ef8f29374793c8a5f272d370b9e974d004ec0db85a65b5a76d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/cy/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cy/firefox-90.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0b7dc949e79d29534651b450c29b9e7458817e4286cdbf7a8602855b5c0057a4"; + sha256 = "17ef10b7e321db0374c87595d13e4bad57707902dd02a4a20e7f375ff328b905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/da/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/da/firefox-90.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "ab37e800cb1f5ced51c3fb18534200a5d68586a31f649d6c7d5e475ea2bc28a9"; + sha256 = "46d83a4256eb11f5db42039184e0ed138280f21ecdbafb1e7533399cfd58f88d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/de/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/de/firefox-90.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6233b625e67bbbc5432daf596e4e654dbecb02e7f8a5511f07f6ab015a07ecdb"; + sha256 = "b4417505454008a2722c691c9006450d90ec80c7461eaf0ecb9b4f9cc0883ed0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/dsb/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/dsb/firefox-90.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2468c1b03785a381525e4fe58ec106337ae8414a3d46894b7a00fc81c1859ba3"; + sha256 = "8eec9d5753aaa92c31fd52556595c9fb5889f36904cb05722bb2d727fa618941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/el/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/el/firefox-90.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "1a77f00567ef8a255a012a33c8ca2d66e0b1ee379c555b110cc660846262e482"; + sha256 = "ca3e4958df9aedc5e6e1f5a9a8778248cc8b3f8b988b143aa2da94a8fbc6b3af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/en-CA/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-CA/firefox-90.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f94fe35737d04152809893a775e411d8d92503addda508414c0d8ddc3d40e513"; + sha256 = "341f133b3787746993df3e9176601b485bb7a0a16c7a294e7de64f8af39c2ac7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/en-GB/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-GB/firefox-90.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "bf610dacccf834f4f62c96215e8a9620493d08ef2b2445b675ddef36c1eba036"; + sha256 = "13343f3cb63be5c02ee7c8d6883ff473681bff8f55377f74095768c87109f620"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/en-US/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-US/firefox-90.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "964b6b515151bb9a0f4e90e9902afd09ff64bfaafa231480b9829264d36fd76f"; + sha256 = "29fd51b6316d1e589220c2f47e5ff7cdd996cddd450f64ce1dd28ed0e8e4e8fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/eo/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/eo/firefox-90.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "e2e4da131a01355c4cc6710ef04b61963609026455d4e8bb51c2675ac44d4a94"; + sha256 = "41c9ed4d9da13fa798e6d75e67b854b84fa0bb76a0771d387a1cf3261838408d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/es-AR/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-AR/firefox-90.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "7d5ef9dc2667570752b65cadc3851dda050afad82b9af8de35565d7c56b9dfe2"; + sha256 = "8b5c954f4942834a93424b2af17e01f1bcea3d07e1ac404cb205b7b53094088c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/es-CL/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-CL/firefox-90.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "018f07814bf6ddf7891a1c6104ddf6f10dd0bb9595772a367fc0f66b0f1586a2"; + sha256 = "cdd4eefae21d33263feb67f020e727e4f9d569a49a0311483f24837a19a88c49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/es-ES/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-ES/firefox-90.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "9076d5dfd5422a298b7f35b15d57a7793fc4a84c5acfca02157ae37234a7c526"; + sha256 = "7cc98380be959aa6375b05b7861e0bd29ab0c2f87824fe0a7a4d0655fb2daf6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/es-MX/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-MX/firefox-90.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "dfddfbff84b42948ddff2527a819d0e3ffd4272c705a5a9d503b5034e4355ecb"; + sha256 = "52ab52d3c2d92cb7919b1505f1a72a2a066629f1adb45600c08b5f1a7df7b714"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/et/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/et/firefox-90.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "3f05022e625074b79e7902b1b43ba141c0b39af65b247eb63d80aa38e7d7df56"; + sha256 = "aacc5ae2e7750d917e117349183afe8f166f4f51ff7c442f205e119c60faec7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/eu/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/eu/firefox-90.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9996e2133fdb56856bb744b439cba4f2570e7e2f6c46373c75d967412b8fefc3"; + sha256 = "c6c9276e9e4ac8f34005f6cc6c6fc8d1ec06a25665d9564e864fd77faf0cf777"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/fa/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fa/firefox-90.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "2a8d3de485d4ab1f2689f50fa06c40653690b7039617c5286b89a5e1483537ed"; + sha256 = "a1253cf75cbb09b9aed574464285360c6f4bae185ca2ec0e4ee28ecbe2582c19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ff/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ff/firefox-90.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "f4efb3e0bc68ae3a905b0e846e6884b3209a3557cef9de9bf43b52987d4b01c3"; + sha256 = "e7a13e96f1f231053de8599d1a1b75ffe0d10a2303938ffb74b5bf0ad954da41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/fi/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fi/firefox-90.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5d1a787f6d9798d0cbc58b0dbf3fc20892d7dbc0ee1ffaa5a26879578fe8a030"; + sha256 = "0e7651b6c88fe0308490d716193a16ed6fcfead4f490f299047604c49662a56b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/fr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fr/firefox-90.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c07643b687f699f92c4a3725ad3589f9dbd8ed7ed859e49cc8d8f39242cb6b56"; + sha256 = "72b35bd4c84d3ea42c40873500177c0cbde37e5ebcbc49c2dc2c5f436d261a15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/fy-NL/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fy-NL/firefox-90.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3cbf0aa2f6fd2842c11b2d774348dc7656f92e78c1dc15e351b30e772a7e3e6f"; + sha256 = "62aa9cb69604233483bd7d510980f4b6a1c96874e98effa9d4179b150f4118a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ga-IE/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ga-IE/firefox-90.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "e0a307dff5bee1049446b9657036e336a2d7ab5b8fe9782b3ca83aef595be307"; + sha256 = "159dabccaab426c9aade1379be14874b04ee099752d38bbf0bca5db6b82dc4b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/gd/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gd/firefox-90.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2ac2e6e617d93df8ca5c3166da944d897940dff279ba842d20b197ed15744971"; + sha256 = "26b2deeeabf6fb49cd87c138a7c5a1142358db743f2a55468374ad63ff7f60f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/gl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gl/firefox-90.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "359870aa13c2dab4d79bda23c13a43cd899d0fd732089cbd75d44ee2a23ec0c9"; + sha256 = "31cd8e5029cbad931492ab3dcc0abf9b194e08292f4ab7876ebf662ab707bea7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/gn/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gn/firefox-90.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "a39e9ccb2d9b6b7f0e9303134a1c8e7081e5d56c1039d734fd390810efc7729f"; + sha256 = "ccdd7ad239105e642a721a44737165bb075f1e6db74733fc2f5b30c863b8222e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/gu-IN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gu-IN/firefox-90.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "e621ffee06c2858633505693c3f7da980a3b69d053d641cf796d85d53dd68af6"; + sha256 = "a25562ca23e69f03f2d6d106afefcf11c5770820aed885a8efbcef001c256fe0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/he/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/he/firefox-90.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8258e2b3e70a1c7ad5ca5c49d482b0dca13f61f0ee7c91f1cb4df704e950db5e"; + sha256 = "e28b51837f7a9c8b8ac4a62bc5b7ac6c834696c8c41c7609b77c9d2807bb05b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hi-IN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hi-IN/firefox-90.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "1a01c93c3cd83b756dee3a7984187821bf1cfc30460e8ff84cf934f549b0d2ba"; + sha256 = "8e6a5104be7e05a58e01acae446294d7459289871213e62e26d59076619f674a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hr/firefox-90.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7b896ceaebbe84e015fa69a02c484dce61358ecc08be81915e944e11fbbb3361"; + sha256 = "e2d7f357b9574e0892d3cb8672b43ac9532e59c32f9eba0e36bac32d65fb0c25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hsb/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hsb/firefox-90.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "c25fd4d7941e03190bf2472297beb9622825759752e24cde982e1ba5ace2d1dc"; + sha256 = "9039cd192bb39e3b4a828fdea48630f8e113f54db87644ecf2b3c84eb8201990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hu/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hu/firefox-90.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d8588d5540b85daf24148671781ea9ff814d550bb2bc4f5b42c58480ec73edb2"; + sha256 = "98550b7e259df01476dad15cfe8bb3ec055e1ff57041ae73d09156671dcfdf6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hy-AM/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hy-AM/firefox-90.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e965b9d0c419d930b5d32e5fca9feaf5498c79b862d86890775625bfcf6d4c61"; + sha256 = "74d34585f9ff86fbd5bf68620964bdad82d7f5b5e0cf7087b12cba3fcc795271"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ia/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ia/firefox-90.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "ca72f852352f39332a8483cd8a237bd341fc5a59dd9691a611e3b376339e9214"; + sha256 = "fa705d3b2c9dde9e0cd190e183219f879d72a57f7a1209a293a1bf74cc0a86d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/id/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/id/firefox-90.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "cbce57ce7feebde4bfaf1cc9fb32dbbac93ccbfca3a8bc0f78654825becece21"; + sha256 = "23bda2ac0b1026bd3443f89e78157cbe47807ae2e0316d68804fd734ed6e196c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/is/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/is/firefox-90.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "469b8167124a958e8d63ac1b1e71936a586e887c747753be484f5761f41c3ac2"; + sha256 = "257dbec349ed5368a10463a1cf1e21d03c1eac1ed3b093a54b1f28e274ec575c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/it/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/it/firefox-90.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ebaab65016d9c3a5e04d48589b1ed98d3ce8dfd0fcf1a47c301b35859602ad71"; + sha256 = "ff19dbc318739dd11cab9424b5058a6ca8396d6988723a4a3d8b72ef7095713d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ja/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ja/firefox-90.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ca67a104f71c48d61dbf6edc927c4081129aa66f48dfd504edb1ece7a9e2277a"; + sha256 = "3c3003bf0366ccfe5b6e964720411e06d5622fb5e76ab7f0b2f1d06bb92c8e44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ka/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ka/firefox-90.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "5b5c42725b471cc505a9b87786fd3197903703235495ca81d87c19d96627da45"; + sha256 = "70b53851ec2b8e512fbafee0d87b0dd32123019c1ed798f4b03b08fed790af68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/kab/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kab/firefox-90.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0fe867e946add17cfa0d7b55c8141ba2d01d1f369df8ad4afa40c6ac723d13fc"; + sha256 = "175f112e07f75bda7e42291779655a18601f50c81c84d529874baf3aa1c5bd35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/kk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kk/firefox-90.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "0f2cbf77404aefedae1ef092da3b55ce3f5f781af8a9e7017a458fb535b23ce4"; + sha256 = "7aa1edddf9f1d55aa307f8954b0a4043fa8f27243331d97ffb21ccbab4439a3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/km/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/km/firefox-90.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "1bc3a6e917ad851cac0148788da0c74fd3879732aeae5c188d964d2cad4b3c15"; + sha256 = "45d013eb6a15558722b9633bbcfbe38c74f20964db716797b4c5358a31596b55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/kn/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kn/firefox-90.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "77fc84153e242e6f07cce2ed4456e7bb9556ddc1048469ae6dbdec99cc8e96c4"; + sha256 = "19f7cf799760e51d852981d1217f3303f347631bdc484d44293a85fbe16a2752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ko/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ko/firefox-90.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "5eda0b318f39eedf6982aaf7965a086372e0750a3acd711d4b7474325216b2da"; + sha256 = "c2a1aca33c678e225cc66f1f363f666313d41de5629575bccc3244b2246a517a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/lij/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lij/firefox-90.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "393223aa925d239bb690b910144a702b46be7e8e256ab52b246e1372e7f89275"; + sha256 = "6645b96ea75cf11afa03d7830fcaeb3cf40ae62a34cd780d703632b04c1c70db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/lt/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lt/firefox-90.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8cac447febbe03018759b56f2e96ce07f78c464aa0da3ebf17fc731da0602b46"; + sha256 = "c4c9b1c346a2e18d813302094c5048b758db64effd0276fb453d77f76a3795c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/lv/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lv/firefox-90.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "5c000888c60575410a8a851bc2ecddbc981c512683411a1d0792e43e07da0c71"; + sha256 = "3cd2b96471ce03fcc7ce0217ae68534d0f891cbb21c7c325ff37f02e8a96f310"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/mk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/mk/firefox-90.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "5bf30fa470ad03c9447ea3e53fde900e8a2f51a607066ab50c713a93cd6e9b06"; + sha256 = "95de1a0db3f284e23741f39c9de13acdb2cc8aa3046387f2c923b2fb41ea9e85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/mr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/mr/firefox-90.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "f842218097dc96dfed8726d971a1383dc60e9054f7f974879e88dbcc615daaf1"; + sha256 = "6336fa56e8eaefc5f30934cb1232bc9b4c5a4a1070612026fd4eaaf79a763af2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ms/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ms/firefox-90.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "dcff05df156a85049712eaf31a5f7676a047c94562529a9cfcad7320f3fcc4c9"; + sha256 = "1efd8100aa12bc3b2c304837b16638bd23fcc1bebbd1b7cdaf8f07bb642eba09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/my/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/my/firefox-90.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "f6b159ae83c05440c0d3e2fb4af26b63df4a776702a5afbef837f0846faf41e1"; + sha256 = "4b9dcf5f8d476ff931a497acfb42747b3b788a031d156b1444126fcece789d68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/nb-NO/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nb-NO/firefox-90.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9a3520ab261ba3c5e599ee04e2a6d494ec6471b8ef1dec266d45ecd530bb1a85"; + sha256 = "81c5973aa829b52c2ebb3ebe35a355bd65c5e803dd5b02fbfcdb58cad56d768a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ne-NP/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ne-NP/firefox-90.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d73479851c04957855f3ffa90a14d40ee249ad61013ac101491d1d60bd9ee310"; + sha256 = "ca1823de015e593f89a78a578fbf136748ae9e56eeb819773c32fc4d21169398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/nl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nl/firefox-90.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "91fa566bc4fb42633e8e0a1ce8cb4c5ae9a3f730d3b4541ec128ba83319320c8"; + sha256 = "253e19bbca6cdae42673b2f102bf930531a72a6d67ef3c0a93e2c415fefa18e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/nn-NO/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nn-NO/firefox-90.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "9e46ca01cbe183474b1fb3e5d59e75629bb272472c0aa3a781fe7e47723a90f7"; + sha256 = "248d44236b2111f0aa8b49ac97e17353740f983448dc0b5085efca9ca1401ed8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/oc/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/oc/firefox-90.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d5a208d52747413ef2adbbfcbfd7264351337ee57e53aa3817857c0a996e37ac"; + sha256 = "85414645c073035536a940f2e2daff958d25213aae01dd5a8617019f5315b9e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/pa-IN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pa-IN/firefox-90.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d79022a314255210a3eb97f82b9653a20612dc871d6c418afa1a7e0fe63d274d"; + sha256 = "9ce28522a04464bec876d301380f991e3543e2eb9fabe294066e23ee1a1ffa87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/pl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pl/firefox-90.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "accad8da9a17749f43c676a69391b5b33a9d024624783228eef7ce48af56cb45"; + sha256 = "6a05196e0b881ca19ed405cd42d3dd377a22e0cc7788971ca3fb3ddb6da5c73d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/pt-BR/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pt-BR/firefox-90.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6f9202ef11e2d4368ccd0d6d98daa62ddabeab51087b84fe340bd935fb754f36"; + sha256 = "e15e7fee01afbd4b585aa74b5de4efbbd2e30cc4e9e87911c4707760c6a8d198"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/pt-PT/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pt-PT/firefox-90.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "8020109a785542a33f3139fde8b0cea5920ac1618ffceb96bcaa81627c5da772"; + sha256 = "f76da7fb580424c0d1326f2daf40ba4f27083447bd7051fc77e6162caadd5292"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/rm/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/rm/firefox-90.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "0e97d8aa72831ca0ec8d33f6877fa904bcc2f7ca3795bee85121ce5589388e97"; + sha256 = "55b0aa8f6dc462190a01f3385ff36cc813fcbd071d0e024c388efd3f247b22f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ro/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ro/firefox-90.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6cb71deb1f0b9d42b20d9400d6789b7b9b88a057f505a68491ab493eca0f4313"; + sha256 = "4d245e0e633e741bf0438603fd0ac76030878bccf69cc28509c018514fbc55be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ru/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ru/firefox-90.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "a492308ff61a2b4673d178caf47e480376bb6b96ff8965a360f6f49321ee51e2"; + sha256 = "5687877a5e8dd4c5eb9dcfbde681f1d6fd9997b562d44592956ecc86024c8806"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/si/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/si/firefox-90.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "6858b2100d235dd7770ec003a4e9c2374354ad9f3a682aa9afd2c95ec2b81ff7"; + sha256 = "4843700d73e84099cbbca968d2d251fbfd012d3230735c22f8dd8e39edb57ed6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sk/firefox-90.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "bf74268fb305ff461e118641cee1b26ba687d9dda294284b2a5d4c7f6e5bb39a"; + sha256 = "26bf6c61cf9388f3c0f83362a3f6e744cde8aef12bf48de4e5da0debdd232a4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sl/firefox-90.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "fb2ea5d4b1fa4c7eb88806efed2b3a0c724c5d81f716b54c015d7d976c457f5f"; + sha256 = "65578af61cfde136408690f38867b141d48205514398af1b7f2771f6c219c513"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/son/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/son/firefox-90.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "75e6a69bf9ca85c1d214202de55f0b5c831b41c22d375448db6eab3f7161779f"; + sha256 = "69d59e4ef8dbaabdf86acd7fe413b0fc3532b13cffd67cb0d122c08e72f234b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sq/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sq/firefox-90.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "bbe1935033db10b0004c7746b089040decafc0cb04825a5df5004905dd470320"; + sha256 = "d8bc0fab11d1d3641159dcbe0248d1987e6d5a25cb45acde769c3c4632f6364f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sr/firefox-90.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "cd97fca2ee3d57c418e0bbdad529c1ec424d18a0aa5976a4cff13fdb7bcb3f39"; + sha256 = "7ea2ff12e6df802e98cef89aede582e3c6ee800e51c4d5cd6a9ba6a7aba0e4a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sv-SE/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sv-SE/firefox-90.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a3eeca622d63db7fd94fcd691a2d910380e211bb0d78d131587a448df6ebc635"; + sha256 = "e4924167458d6b1251956de695c610bf311047a2b3cce4cffc3b09bb026c07c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/szl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/szl/firefox-90.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "72c868394c285d890fbdc560813803aa26ae5342f36a6864588a829cf4639c09"; + sha256 = "4904579fff0628ba012f269c9be0123f06fe8d414066fa3f52fd28832d6f004e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ta/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ta/firefox-90.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "c87f9e8d7f5935c30f9a916fb76990d0678e9032287fffad48230d5f66aed24d"; + sha256 = "9611d0624ea57ead7eb9b889faac6a166a1581c64e0fcf8d89e1ff3c6f43c963"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/te/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/te/firefox-90.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "2d415574a612f011c22b782e439025d1a50ef12217bd3b538ff36010747f1eea"; + sha256 = "d06b945ee1646a37f347f438dcc5cfc2ca34e520fda7e5119d076a35a1636537"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/th/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/th/firefox-90.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "7c73cff2af72421231b9a03d3196186db98ce6b09a0ccf4954219506b50c27cd"; + sha256 = "4e0f715b9df45ed6e5c469d31e886184ab3712d65ed9b5f09f930de55bac7cae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/tl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/tl/firefox-90.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "6a37fae3a5c0156827f6b69aaa068aca6982cab7e6dd242f74846e743c00f96b"; + sha256 = "ffb9acf1bdc1470c5d077707a38b8b754b638297bdcae51ecd985faed50d0c51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/tr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/tr/firefox-90.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "42cd3896f2b726cff21ce0cadd4135ae1f325dc3102efa17cd3a3c5c6948c6f6"; + sha256 = "58a4e1b95887aef20744113cc712961cd331afe7b32c9fce9ae95cd10036a075"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/trs/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/trs/firefox-90.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "1ccf3ce127603a42fc5addcbaa238b36e9bd798615a2e6bfc95de7db5d12402e"; + sha256 = "f517e93f9819e008f224078af54c6b080e5022cdfb84ae13e16a65368cf3c971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/uk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/uk/firefox-90.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "2ad2a6306019dd5960e4e25ec59c7fb2eec0c233f07c04930049d5d75f3b84f5"; + sha256 = "e6f29d8f6e7c92b5c911444c869173a8991bbab60e13c2279c1bb8139bf7d3ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ur/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ur/firefox-90.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "e63605011a8cef5e239a39a21edce7b1e2bbf342827888e1ab36c22bdc6ac5c3"; + sha256 = "bcc00d70f7ab06bd024053d5f66d6363f8aaaea65be089bcad99fb0dad2d978c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/uz/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/uz/firefox-90.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "8f5d446ce0dac4bfb0640a492de57d087336578c157c238a8e3e9f186408e337"; + sha256 = "62d8ff68b7c144610c05300fcc8072b832c5ca3ea3b0da3f197f04c1c352114b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/vi/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/vi/firefox-90.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "5f62f1e64035a158883e7e774cb87cf15b336bdd2171ffd65e13ea8cc81c5542"; + sha256 = "152b2c3e4b66d5056cf02d6a0d88968da0d2d0d7983ba4a90b17937c752dbc68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xh/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xh/firefox-90.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "ff111b178134fd2dfc6f7597b6c33b4a8ed4aa6ef64c6687bcedfcef26982d5c"; + sha256 = "bbd12d232fd53c2ca879b55f19abce804ad14da4c47ee11c2723f37f166d69fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/zh-CN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/zh-CN/firefox-90.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "90af3045eae839ca67a42e8ff810156ebe6115c3749e0547e907ca910eef3ef1"; + sha256 = "44f71d53e7055b19617b66985f583b44b3d8aa6b63621a8ce34cb2f33e2c35fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/zh-TW/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/zh-TW/firefox-90.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5285b29bd463013c80cf23db6947cc720c5327a71a9dc35e678444e7ca2f3a42"; + sha256 = "23a5054f37211f0b4637baa7b17c0b41cbf16f8c30cbb7c00d486698a98150e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ach/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ach/firefox-90.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "0de413f3533dcd0fb5d2fdcf63673d814afb611324cb32fe9431f59b735ab152"; + sha256 = "985bb9b46a2767f00704f7dbf43ffdf650fa70da1b5c82b66bae9b3ed8e53ec9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/af/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/af/firefox-90.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "98069b18e97b3fb887d191321bed74935def28a4288abe8765c27acb62812ba9"; + sha256 = "2b9ac10fca0815b755c89eeaaec3db597bd7eb56294452c715615bcd9edb685b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/an/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/an/firefox-90.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "d84d8c1ec45d53207b48043b8f468bceb211b199a3a5e76337700ec8b5f40f04"; + sha256 = "cd6aa9c8b5e384c36f35c4620954fc29facc9e82600f1fe759bcf239bacd5cb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ar/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ar/firefox-90.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "22dea08d8f9d100881d9a3e5b56d2618502d6d498ea56ad7cc6afa8e862bc7e1"; + sha256 = "c6a75b71f6c24f05a92608401b70ce4b3e91f83f7511eeed0b7dfb91ce52ab22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ast/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ast/firefox-90.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e92ea890c51def74523dadae1f40f1fdac4816db50025e12a6575d798febc1eb"; + sha256 = "ffc9f0b54fb7df8398e5ccedd75902d4872b2b735d79189e2e00bc519b7914be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/az/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/az/firefox-90.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "abb1a31a0374b95fa3ad36fea893c39dd8056f8a06e4d94dbfced3d80bd8197c"; + sha256 = "3843e554e11c687e9d0676ed9ed06c11cc6eb571287430cbe8ab26b4c2553e63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/be/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/be/firefox-90.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c5a8895155b3e4cae1c3541e66b3e551b3c14460d2e522ba72d83b5d702a8889"; + sha256 = "412e6a776fbf1cd698092bcaafe30a652a8ab35b72e3edf4cffd0b7438c091c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/bg/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bg/firefox-90.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "b6b811ed0e53795623f6c928d0411600aa2ccdfc9fa890e846018e085bbcc6ad"; + sha256 = "142d1db515272948aa7788403be55080471773d835476a532fd0e44f08a223c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/bn/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bn/firefox-90.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "4597c3c41daa76c3bdb30d3fcb4cfbc51a7571bab98abc8b35f6b7ae2df1ae5c"; + sha256 = "75531cdc30d0c9173ab8d8113ceb9897373f7808e1019834545f0130ebbb8ee9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/br/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/br/firefox-90.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "5346306c5cdfce1b3d7ece50ea1fe3dbe9ae69ccb83f70a0a2c451972ef40afc"; + sha256 = "20e76daf7a280c5d50c9a937e409f25aac7f0ee3254f9145605ee00d00316d5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/bs/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bs/firefox-90.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "260e08c62ea7fd0d6d130453e1247588c83f4e0414aa569dc23f100bdd534347"; + sha256 = "1bc0fd2a8ec265d59594bb298cdb51f5506b56e40e5dfc0fc66a37e3d4328e5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ca-valencia/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ca-valencia/firefox-90.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "855660233c59d97b05e56dbc2efcaa1ab538c1433ea14e2159d3efca8531ecef"; + sha256 = "dfffd0c2b98641944d74486de4d9f08c2e76b30506942021a5263d1238ab07db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ca/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ca/firefox-90.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "b71bf5b2137a715fc75c36d9ee9c1e20525f31b8a2f2dfa56af51305a94058c5"; + sha256 = "bcf3b78bcb2bd133ad66d551695d372d099d250e01d790f48bbd69b46c07abd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/cak/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cak/firefox-90.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "fbf2092e4b56716042f993eb4d5bf41a9518da2243245282c9cfbc812c8c5268"; + sha256 = "e27cc065df6bc8ff338a34c97d9f6d4825d711b77bf24e5f1d16ca68dffd6f74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/cs/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cs/firefox-90.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "466a81994a51fc42ff2b936a2e2d20089524bb514031f740f7a6a0865ff57b1d"; + sha256 = "f25b02aecf709edfd75ceb2faa01979e99ea2a88e981c0d3fa5dc118eca77a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/cy/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cy/firefox-90.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "ef3596c10627fdf196a5f52f59240fd85d6eab33035cce708613c7dde041b413"; + sha256 = "d9f09d6c812740f077234dcd5f7caee7be17569526b215d4ebb7d987b8915b47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/da/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/da/firefox-90.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "946b42c16cb861b21a0a1808cfdf554c955998aebcf59299c240a334abb8aa47"; + sha256 = "604342f07532112ca7ad6c8a1d6194dc1487a3f0a05c9785f4d252d6359996c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/de/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/de/firefox-90.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b4d003e8abd272870ed332448aef29bf2bb40de74ac0640912a65031da5012c0"; + sha256 = "c2383d7801ff0fd4a111c49d82d7b41f140f1974d20c8bcbfc745b76a78f24f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/dsb/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/dsb/firefox-90.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "57c7b439616ec7eeddf05c7c5a5fde0947092762c5d5f98e87c3850a3ee768de"; + sha256 = "9972aef81947ebcd09349776a01f7335c41971ac72d2ed806cfd384831b35623"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/el/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/el/firefox-90.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "3c444a23416b6080d2d6b5e8744651b4f4796e3ecb601c8eee3f21cca8eaf224"; + sha256 = "942285c706c4321dc6c4578e665edc76523e46f98aa89521f4276bdb2736f610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/en-CA/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-CA/firefox-90.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "aeb3d01315db024984739999b9fbf1eba0464a7a393451d311fcee786509198f"; + sha256 = "71b236a224823a13ea1b0f144217a735e76c4d25b2725591a5aaea068d1a9808"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/en-GB/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-GB/firefox-90.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "c327ce261f0c843eb6a50c7e6ef9d3163548d03391429f9a55c1adc6b9969759"; + sha256 = "1c9f4c7b35faa87d7c1b046abd629e2d4305ff8769f986a4e1def8e381a0ca94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/en-US/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-US/firefox-90.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "491fd0066a893fdb3a6cc58e3e0b6b02f15096d07563437a79b2727d09256890"; + sha256 = "f983e7537f54131697366c0926b6aad8045c2f1e16c78a0d5edb392d214e535f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/eo/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/eo/firefox-90.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "1c39ec1e448288541cbdcc10f7d66e8c36a66d08b1eadd9f8f90e590f6473908"; + sha256 = "90f713f53326849e1b41c7aad160eb5828e4a06f2e9f11918ba61b9ec4d29fef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/es-AR/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-AR/firefox-90.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "fa8dea8cecce162a25ae9d2640b35ab5f9f2073c136d051ee4795caf8f888aaa"; + sha256 = "e9abf48307351d5461086d34cd765dcd5af38eac50dbaf3833ddcdd5432908c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/es-CL/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-CL/firefox-90.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "e156fd02f2c1c8deaf416f17d78dea0433e0e84967b09233ceee9e33cbe42bbc"; + sha256 = "04797e8c12c08eb25f8048f0a653380582cff4f193d03e8e6d3e0d66cf1e59ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/es-ES/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-ES/firefox-90.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "7359fc86b0f6da2916e8f178295c85ed3c8abebc1732f7735ec7b2f4c2aeb76f"; + sha256 = "1f655463e919d3546a841e86e3aac0bb6b4bc3482153a24d6afaf4eb4f09db0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/es-MX/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-MX/firefox-90.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "57bebe4dfd2812c8b48f597893738b0cf9badbdb11fe1e3cfeae45290dae7f2e"; + sha256 = "3e9b14809de0df3d1f5c0d7bb83f9a769fb5852194511b1cfc33275ca1bbed41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/et/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/et/firefox-90.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "71e3d1a1bf3a8d480cde7cf8ad747c90b8eb217cadb445ae1ed3aa10c1232275"; + sha256 = "918f284c60618404b7f8130b7e14a57d4ca483adeb6007a79422e6fdb7908114"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/eu/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/eu/firefox-90.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1e38c53105664f6dccca1b67928222f161c6de37f9a661c46a8ffafea3600cb3"; + sha256 = "5f682f553356652d92684dff3f8385d1d675539d6cb8b155f12874682c0de235"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/fa/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fa/firefox-90.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "b72165e2561de0d65e6cf991a4f5e4ce72fffabb23d80f3b7408c03e1eb6d0c3"; + sha256 = "5056f42eaef5f5538bfa9af23e123bf9f0a0d370d6fd7848dcdbc50d0cf61d92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ff/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ff/firefox-90.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "9f2d7b11c3a05fbffee4d4e9dd5f3b397fdf3edcdee174a0907b1ebb1625ea62"; + sha256 = "cf58279f578ef725e2b89ed4a89021a811b3e237d46d02c7d98137fef3775318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/fi/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fi/firefox-90.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "29e2279d03732703576c0dd43afabe1f416c14d517979f6dde78ab42cb561d4e"; + sha256 = "28bd2f67ae638fd602adac6327fe51ebf90ff52c8695e8c8ff4161d6bc20be2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/fr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fr/firefox-90.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "93bda1a56ecce4dfd84fb9333f3b333887e2014edfdae4b555b6a4296baf4805"; + sha256 = "53b69cbc6cd3097b67537979637614a6bcc01450426883b7d35a8de5df6647ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/fy-NL/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fy-NL/firefox-90.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1238d1e763457d4e9cabd00505cce7ce3dd9979e41ff1d1b005e35a229d8dce6"; + sha256 = "8ee8e11a845a2e2b0f9d12d95f8dcc6b58be2722a68f1a8707b0c1f3a66f90d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ga-IE/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ga-IE/firefox-90.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "8eca1fbd8f536f62eb645ddb5cfd5e9c573492ef7a86f86a930b3a09829eb9c2"; + sha256 = "39a2bbb6c9a3b3a0ec2c21eeb9f919a54502f891834556ee439704af3705f3fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/gd/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gd/firefox-90.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "dc173ac67ad7353229ee1c606ebde73c4be2ccf64ee97f3746e45a2766031e63"; + sha256 = "b667e68662d81518f03ffa0bab538d4601457b6b1eab1f51dc0be3752855d5ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/gl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gl/firefox-90.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "038bd87c6c72727d6f535b863279b03d6e2c979672d717556222b280327cacf6"; + sha256 = "65e9376490e6ee833312b99aa7d8f730495f8320e14203a8d6cc7a94e83e6adc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/gn/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gn/firefox-90.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "42f4d4fadeacdb003db6104c0003cdec7ee81558d07b11573e7d0fab9351dbc8"; + sha256 = "45f3da559b51c5ec300ac64f8d5f0e7583c55abfca4c22e72994f65682d0717e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/gu-IN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gu-IN/firefox-90.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "6dfa19890282d88605585a5d5c640d200d52d8c0bc61218fc2e8f19d16a9811d"; + sha256 = "db1394cf1c52fc0eeab116d49fff3bbcef07f64870345490a1f46f3045268d94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/he/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/he/firefox-90.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a16c0423c33f6f05f9a1aa607232506e7353e2774d7edc224e3955813d212eb7"; + sha256 = "52b49a0014fa2aad266f2503b6e455310d37af0d93102f22404b303de6afe772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hi-IN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hi-IN/firefox-90.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "fef5a9c06a3befcab35a0532cdcdaa3c6757a5ea5b6bc0d4ecbc684f37443077"; + sha256 = "59484d61d3d4802f9389d668f6125299ba072077a87a16d9b09f9780e975d120"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hr/firefox-90.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "464ebe80e2d55686a56960f6a6789b58127e86efb5bf7dd8ab79220f49790659"; + sha256 = "292ac6975f6319c0b4274fbe64bd9512a8361c254f82c079e8ac75c974839316"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hsb/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hsb/firefox-90.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "92458b19e0a3a8c573a126f120d3da76f185d9822c5f32c3d56f3cc90d999f55"; + sha256 = "81bcc94349b7b83533b5a60d3f8bcef9b3fd0d85628ce0f043013a4c7fe0aacd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hu/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hu/firefox-90.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "9c078d9022a2d83444709fec7a4a122369ceaebc4b27b99bbec9c67be4370ec4"; + sha256 = "1c5867bd108e9232472ccdec0bc24a6558d9a5a6d9147d0c44a4fba2c44ae01a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hy-AM/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hy-AM/firefox-90.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "36b64295d46fde7a85994e374b38a8781bdebb4e15872f81c8e694b4218e2713"; + sha256 = "de35f4653730d253e5bf147e65ec1f8680ef1fda008f785eb3e49831a00d8b4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ia/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ia/firefox-90.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "080f890f868a4c7e7f03db96ab2c25b6f39dcbb1f960052ce75dbdd5983487a0"; + sha256 = "5ea51c02e6f41291da5840d511bf4ad743e475d6d35fbbfa76c4df3e8f45fb50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/id/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/id/firefox-90.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b43ceb1d6f6a003aae01a02af15c0e4aa0fe9e8547703adcd872767c2c797717"; + sha256 = "b9ebc450eb9097902f13c7c30e45a361ade71b99b273d0da898301d3e9bdae36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/is/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/is/firefox-90.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "35edad7f2a31b7b2ffe0d8eee2b0f0ab94f5f91c8b2507b344b7d28ac13fbbbf"; + sha256 = "64f7480703eb13e9ba4f12615bd84dead1322d139af1115813b7ab8e6819190d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/it/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/it/firefox-90.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "47f17fe75d1ddd17a4c044dce4dc223a69da7f7de478b87d58e8f99d488ccf79"; + sha256 = "3f314ed7442d57345d6d1b368dd55bb9e2dd966e269e56d5ea2abfd9140aca67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ja/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ja/firefox-90.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "86850b09c992a6383a406e99bc8698b8471f8240cef752126714e6f070e2b220"; + sha256 = "7cbd06ee69dec66522d35163427f8034bd3ee928aa6bd3c5203f3c9a5e526018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ka/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ka/firefox-90.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "42297e2f4c1d72bc46dde66ddca934962b2aee9a918e24b90870fc5774284bd9"; + sha256 = "81575f637a65d1d31503967b380b3337a8af532d5ebd3bc7d35026c37831d50e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/kab/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kab/firefox-90.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "7f00172ed2f2285ef5b8ed3774781f5036c1cde57f1a321f9b91c54679ef68ce"; + sha256 = "bb84536e819cd77b4d45786982384821b7d08dda48fc8fa3f0e12e90e75a688e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/kk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kk/firefox-90.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f7046b78d72074fcf0f62c7d4b660cb8a63095dcd8c24fcdfc61c574ddfb42ae"; + sha256 = "ced99ad16e7b84fd1c344ff2ad96715e0654ed6cfa0cf6379179bdabf5cb0443"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/km/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/km/firefox-90.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "4157455134722e29c8a039cc11cac68cff7ff9311405a2c71e30f982f12888c2"; + sha256 = "f2641008a2bfd95467b274419d4305014b8b3e5c75622d30a46c5eb9ad761990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/kn/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kn/firefox-90.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "ea5812c8eb194be0e8335f48ebde884a4375df2513c9275ac551aa0b18580dc0"; + sha256 = "5bcda92360ae86a1ed015736847e7d43eac239a6bd995fc932259f169a7f3821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ko/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ko/firefox-90.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b25b99297a64c9a700d9dd285db01d6f859402f09b38b2ada3bfaf914c72ec7f"; + sha256 = "5be9eaa06a7e35b1d401643601ac7e212489609c52961303cb8fe054bf698190"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/lij/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lij/firefox-90.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "2c875ea5c87840527e2dff471fcfe774e8ee4d01c764bf1d73da99d9e875f4ac"; + sha256 = "01baf23ab6d89adb3eed47b9f216a0b17b8bc8850b10d09c2bef10792fb1d76a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/lt/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lt/firefox-90.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "27dc824ad230ea5f3cfaafa4024733de85e67cc1b6678aae64686b6a54042855"; + sha256 = "a5f8a4fa438fe054d1e8d09ced0079673bc25431aa9cbc6b36ca2e5a1dc58d72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/lv/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lv/firefox-90.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "ad865a647d9fa2b20c68ea2d597595aa9b03bbf40987e763d1225fffc91176cf"; + sha256 = "8ed19c630ad2cabdd374d2499ddda0ab8993a79c50e7e6728081a6842d1f68d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/mk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/mk/firefox-90.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "85c556608247de5e02808f264c721e16f909c5299f6ff423ff0e594da87fccb7"; + sha256 = "cb497f4b8f1766afdeed4e351a597bd1da4376c78cdb4172d4815c055583ef4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/mr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/mr/firefox-90.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "1970b70f983bc985778537728b044f27325bfa89cfbea7e000e91e5e66fcea1c"; + sha256 = "0e03049ef7efb5c78963b4f718a61469cb6b1931313ffb50d3e4484b6cf14837"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ms/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ms/firefox-90.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ca86002d548f94414fae96a266818ef4038c06f7307be854a997c5ff4b3529c3"; + sha256 = "1a92300fdd218d1fff96388794cea650371c0b1da72b20b22d6deaef7a794c24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/my/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/my/firefox-90.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "6e6af248e80428fc0314be80a66f5ab054437e119e17c84eca6e8ca9d34db948"; + sha256 = "066061e09aace32d8a7a67499a75aeb143ef1e474e8ce37131e6c37472704169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/nb-NO/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nb-NO/firefox-90.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "1310663a3617f78245e46dee283a3932354b9774a39555849c342a0620fe48bb"; + sha256 = "12771de667402fc8d8d782ad1b799cc20974f2ee6dba8db87b39f319e6752dc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ne-NP/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ne-NP/firefox-90.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ffc16051f275d04978c1414f919cf9dcde219f998148c9ec2e4f63a7620243f8"; + sha256 = "d2d8610eb11fe1aeb948a2ad2b580a396450c92458a9b4cf6cc2b3b051e6b7c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/nl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nl/firefox-90.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "e2a654e66edf777397c31ab1a6862a051071abae376f5d2ceb939ee7c86d90e5"; + sha256 = "99c76cd723c19c6a2192de4f588557060284185047e4597c067e35ba623f01f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/nn-NO/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nn-NO/firefox-90.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "8b2ee4cdd6346b918a5de6c1191d48f5606f40414ab3332129b10614495e1f4a"; + sha256 = "5e25d25ae36bbe8346aab027ad684fee3766a1b79c9bf86a370b91e36ab417b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/oc/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/oc/firefox-90.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "cd7bb8a640662df12a56cd15569ff8eb611db31a4df676427c1da94579a5a37f"; + sha256 = "462c07c7a8864711c0309fa0847bbb993eee518508dbb5614571f994f2241099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/pa-IN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pa-IN/firefox-90.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "18ff5174c3ce73a2733c2f1ad579e9d87c249af5aa1f708c0437d11c720e7669"; + sha256 = "d1b1f53ed3aa7bd139541e249f29e6672c30d5f88eb980be793b6c6622338eb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/pl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pl/firefox-90.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "d187fdac08aa62958cf2238f6e2749de5b8701634b99757e043cba0218451a26"; + sha256 = "b63144adb425b8477f3b8c9026ea3a1168fb3af513d25d5594b810a0aa4be831"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/pt-BR/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pt-BR/firefox-90.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "63c81069183b3862e2b379a5d6a816aa02338ac0c324e33c0e020f579d9e2ebe"; + sha256 = "218108b556c88c9d4ce6f0cc37b3b45dd5b03e7beb591ba0c52aa257d17c54db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/pt-PT/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pt-PT/firefox-90.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "5d24712703b54d2e4aeb82a2ce95b9d937e58886574b80252450b7ede7120d23"; + sha256 = "96600b7012300cfea1ede41e2c3ac9756cac3981691908e8b2e7c2624eca2d9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/rm/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/rm/firefox-90.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "cb6bacee900a12c51960d2175caeeba96c57908d860bb0b64ee2529ffde284ed"; + sha256 = "93bf70fc04f53f779335db31a264a0298188459aa3687d15c7b890199dfd76fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ro/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ro/firefox-90.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "29d344efd66aae4645208746a1c8083ceed01ffe8b8c372e8e97885e385e3e19"; + sha256 = "bd38c728d06513f3b8fc0ebcfadce3e3029a5779f0c745085d52d823075f0266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ru/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ru/firefox-90.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "17b9ba80d6dc056fe774e1836533ebf44be27edf6123c3bb430a00b1f2a21d65"; + sha256 = "abc35efade33dc03e6a4ce093d5995e79daea3383c8a4a4b63d83f8336ecfad1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/si/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/si/firefox-90.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "781b6ccc99d8f886e6bdf103327332ada06529ab6b728ff4ec6bffb5d176abf9"; + sha256 = "201dd56f43db3862243b41fc5b41eefba737d91a05826d50e922f206bd6f6906"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sk/firefox-90.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "1895f1c5ac0dd749a3e37576c6a90f9b7c5f3f7e9eec24af2cb9a87dcb730127"; + sha256 = "fa5b0d2d00c146ffc0fafb760e870db3133d9b387d383f34099e7e5446986169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sl/firefox-90.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b3f27a10c094a7d9e308ab0b2ccb3fecb94a8f596b45ace8f66f0dea628e68da"; + sha256 = "84900580af3f7b7b10481f6acd42bcf30b98ffa5af3b80cc020f4217a150252a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/son/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/son/firefox-90.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "376bab9502491c3946538e3b26b7a106895bd41de918cb268337af4ce58cd4ac"; + sha256 = "122f4a2f50a5bf38e59fd7ea1fc5eaefa8f4dd55a603220a272a32252d6b7c80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sq/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sq/firefox-90.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "572251b4b621551e7a2d889489c223fd4dc08b9b19242a2524ffd3cdec53dd01"; + sha256 = "b829a9b18ca57b53b029841812ce6bd4400f3df60d71980258b9a8e7f5b4c33b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sr/firefox-90.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "50e594b3857c7ed71bfdda5f6ad7a2460508d029055e5ba17b8eca3269659ae8"; + sha256 = "523bc6ed11bd320067361f8be81b0c0793618e376be9a8ef1a7a513b544a279a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sv-SE/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sv-SE/firefox-90.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "b9dcabfa670c6a8f3de85558bf2ea83ff6741754e2eb9ea90ccab81b2f3abce5"; + sha256 = "8c8a7f21fedf76d294a1521f4c786c944498e98567c969c9e1455f6b2a535022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/szl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/szl/firefox-90.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "ffeb74d2b09595aa6b4d45b5e8587d5fb566188e8cce484bf6887eea1fb83f18"; + sha256 = "a1530e1ad9eef4cad401d0374db80593a3960feca67715d352aac51c66dc0415"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ta/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ta/firefox-90.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "410bbc5abf26f49a6e54c762d62ff91068cf95cbb12725a3bb3ce21911abf029"; + sha256 = "0d4da9f60ffaa360424e73120a782d0480d52227e8b110a1eafdaeb0e6f47092"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/te/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/te/firefox-90.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "fd8aec949b92d15e8b52b9d4ad069598e6ed732cfa90747b29539b9c36103f64"; + sha256 = "fe7cfd5db5b98a9245fa30a8970a729497e563ddf5511609d7930537b5586f2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/th/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/th/firefox-90.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "f10cdd31b1a0ca18f2fe945549b5c98997a3cf821974760363d3977f378449ae"; + sha256 = "1c1a643ea94193bbb063e35921db54bcb6b6333fa06b2de6b91c88ecb888e868"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/tl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/tl/firefox-90.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "5d0655ec55e4857884eb6e87a6bff8a1efc53e961bc525f6537a0caca6caef9d"; + sha256 = "89ec5b3f116c6e86bc8e003548c9be2772b7d46c86233b87e96b579d5d7d8851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/tr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/tr/firefox-90.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c4fc2bf69b8df0bdbf0976541a3ff53090cf9cb6d44cb6c5f883cb805fb9931f"; + sha256 = "03a367c5f7b52a8e8e863ea108485dafc0232e5dea5da538a3a632e8ae5de454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/trs/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/trs/firefox-90.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "54fcae7123f16cc2956af67b13e3a0c43358e82c3ce4498f87f4cefed1333bf7"; + sha256 = "85d3ba651e9f39a76f2ef1d92d6ce34ed792f6477848b7e75a806c699c72c3c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/uk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/uk/firefox-90.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "9eefa4110e1feb6bb4ac92470c89a3c29709486bebeff3b3f41479f59593b807"; + sha256 = "90649b7b2cad702b53b7b63fea7e72e666bad605841887bb42d69d487a561678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ur/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ur/firefox-90.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "81baf8cbd6c47468471729eb59529af660a3940c4d4795892922532304ff1a11"; + sha256 = "9b9c80716edc99a3e0b7bec2da38a7391798d401734fce4d1bee60f0c71a18ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/uz/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/uz/firefox-90.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "29d49de5f1ff8c351b19936350a6448480b9dac6c206589dd681fc26f43e3f91"; + sha256 = "5b154b4f8c036ed7c62bf123e0802f2318cfede67bfafe9aa86cda7b2650a2b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/vi/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/vi/firefox-90.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "78dccd68c82b5e54a1bea87b47cf6fea80c82c8b07b92f82ed4a7c5216657053"; + sha256 = "8c3b943e33a1f33086fcce734e183dcf96cd29be0daedc1b4a1f4cd068aaca8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/xh/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/xh/firefox-90.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ce11b8aa7529f43ca7c2aeebba17aaf3b6a5b22dd543302122c71dd0ee9f6eb6"; + sha256 = "c43f991777a8fbf8372f1928a465de170b25b07ede53dfb0adc83af18fd11e02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/zh-CN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/zh-CN/firefox-90.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "407a7e16d28fee88428ce021b7a7c63f1027e7c991652227aaa11223356c5af7"; + sha256 = "1b8f9f96ee1d59b92b974f9f18639c7e38cd3124c5fb2f9ba7fd44ceb5c532a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/zh-TW/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/zh-TW/firefox-90.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "1f500d830d6e465a2ed71baa1b0245fbf5eef9ab9098e9559553e2a9916cc733"; + sha256 = "7a6b520e84e7f5cbf372f1482e4b138a7bf785215776f193e49b30c3860e3625"; } ]; } From 61ab7e84de28ec85dc026a88301f7aa63d2aa1d7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 11 Jul 2021 22:11:21 -0700 Subject: [PATCH 05/59] linuxManualConfig: patch all shebangs in scripts/ There are many scripts in `scripts/` which may be called by the build, depending on how the user chooses to configure the kernel. For example, `scripts/jobserver-exec` is called whenever the kernel is being built with LLVM tooling, and without this patch that build will fail due to the broken shebang. This patch makes us fix _all_ scripts, as well as add a dependency on python3Minimal, since a lot of the aforementioned scripts are written in Python3 instead of shell. --- pkgs/os-specific/linux/kernel/manual-config.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index fda2881a8d2a..d40a36936a26 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, zstd, gawk +, libelf, cpio, elfutils, zstd, gawk, python3Minimal , writeTextFile }: @@ -121,7 +121,7 @@ let # See also https://kernelnewbies.org/BuildId sed -i Makefile -e 's|--build-id=[^ ]*|--build-id=none|' - patchShebangs scripts/ld-version.sh + patchShebangs scripts ''; postPatch = '' @@ -307,7 +307,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd ] + nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd python3Minimal ] ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. From 89deec56234511babe7478a44f684afcec83b394 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 11 Jul 2021 21:55:40 -0700 Subject: [PATCH 06/59] buildLinux: apply hostPlatform.linux-kernel.makeFlags to generate-config.pl This enforces that the configuration generated will obey any/all flags set in the platform/stdenv configuration. This is crucial, for example, if you'd like to build a kernel using clang. Without this patch, anything you set in `stdenv.hostPlatform.linux-kernel.makeFlags` is wholly ignored during config generation, causing (for example) any changes in the desired toolchain (e.g. `LLVM`, `LLVM_IAS`) to not be reflected in the generated config, and for the subsequent build to fail. --- pkgs/os-specific/linux/kernel/generate-config.pl | 3 ++- pkgs/os-specific/linux/kernel/generic.nix | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 82e1cb66e2be..df807188f14f 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -19,6 +19,7 @@ my $autoModules = $ENV{'AUTO_MODULES'}; my $preferBuiltin = $ENV{'PREFER_BUILTIN'}; my $ignoreConfigErrors = $ENV{'ignoreConfigErrors'}; my $buildRoot = $ENV{'BUILD_ROOT'}; +my $makeFlags = $ENV{'MAKE_FLAGS'}; $SIG{PIPE} = 'IGNORE'; # Read the answers. @@ -40,7 +41,7 @@ close ANSWERS; sub runConfig { # Run `make config'. - my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$buildRoot config SHELL=bash ARCH=$ENV{ARCH} CC=$ENV{CC} HOSTCC=$ENV{HOSTCC} HOSTCXX=$ENV{HOSTCXX}"); + my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$buildRoot config SHELL=bash ARCH=$ENV{ARCH} CC=$ENV{CC} HOSTCC=$ENV{HOSTCC} HOSTCXX=$ENV{HOSTCXX} $makeFlags"); # Parse the output, look for questions and then send an # appropriate answer. diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index b35c84513e69..f208da7f30ec 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -116,6 +116,8 @@ let # e.g. "bzImage" kernelTarget = stdenv.hostPlatform.linux-kernel.target; + makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags; + prePatch = kernel.prePatch + '' # Patch kconfig to print "###" after every question so that # generate-config.pl from the generic builder can answer them. @@ -137,13 +139,15 @@ let make -C . O="$buildRoot" $kernelBaseConfig \ ARCH=$kernelArch \ HOSTCC=$HOSTCC HOSTCXX=$HOSTCXX HOSTAR=$HOSTAR HOSTLD=$HOSTLD \ - CC=$CC OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP READELF=$READELF + CC=$CC OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP READELF=$READELF \ + $makeFlags # Create the config file. echo "generating kernel configuration..." ln -s "$kernelConfigPath" "$buildRoot/kernel-config" DEBUG=1 ARCH=$kernelArch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \ - PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. perl -w $generateConfig + PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. MAKE_FLAGS="$makeFlags" \ + perl -w $generateConfig ''; installPhase = "mv $buildRoot/.config $out"; From ea167e8ccbcae6a3378e622255d9705d26f33058 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 11 Jul 2021 21:58:16 -0700 Subject: [PATCH 07/59] buildLinux: take and propagate extraMakeFlags This is just for practicity, as it allows users of buildLinux to pass along extra flags they need in the kernel's make invocation. This makes, for example, supporting LLVM _much_ easier, and could enable us in the future to provide clang-built kernels. --- pkgs/os-specific/linux/kernel/generic.nix | 13 +++++++++---- pkgs/os-specific/linux/kernel/manual-config.nix | 8 ++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index f208da7f30ec..29557b8d9e2e 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -21,6 +21,9 @@ , # Legacy overrides to the intermediate kernel config, as string extraConfig ? "" + # Additional make flags passed to kbuild +, extraMakeFlags ? [] + , # kernel intermediate config overrides, as a set structuredExtraConfig ? {} @@ -97,7 +100,7 @@ let in lib.concatStringsSep "\n" ([baseConfigStr] ++ configFromPatches); configfile = stdenv.mkDerivation { - inherit ignoreConfigErrors autoModules preferBuiltin kernelArch; + inherit ignoreConfigErrors autoModules preferBuiltin kernelArch extraMakeFlags; pname = "linux-config"; inherit version; @@ -116,7 +119,8 @@ let # e.g. "bzImage" kernelTarget = stdenv.hostPlatform.linux-kernel.target; - makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags; + makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags + ++ extraMakeFlags; prePatch = kernel.prePatch + '' # Patch kconfig to print "###" after every question so that @@ -136,7 +140,8 @@ let export HOSTLD=$LD_FOR_BUILD # Get a basic config file for later refinement with $generateConfig. - make -C . O="$buildRoot" $kernelBaseConfig \ + make $makeFlags \ + -C . O="$buildRoot" $kernelBaseConfig \ ARCH=$kernelArch \ HOSTCC=$HOSTCC HOSTCXX=$HOSTCXX HOSTAR=$HOSTAR HOSTLD=$HOSTLD \ CC=$CC OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP READELF=$READELF \ @@ -176,7 +181,7 @@ let }; # end of configfile derivation kernel = (callPackage ./manual-config.nix {}) { - inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMeta configfile; + inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; }; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d40a36936a26..77add0aef539 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -19,6 +19,8 @@ in { stdenv, # The kernel version version, + # Additional kernel make flags + extraMakeFlags ? [], # The version of the kernel module directory modDirVersion ? version, # The kernel source (tarball, git checkout, etc.) @@ -173,7 +175,9 @@ let "KBUILD_BUILD_VERSION=1-NixOS" kernelConf.target "vmlinux" # for "perf" and things like that - ] ++ optional isModular "modules"; + ] + ++ optional isModular "modules" + ++ extraMakeFlags; installFlags = [ "INSTALLKERNEL=${installkernel}" @@ -325,7 +329,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat "ARCH=${stdenv.hostPlatform.linuxArch}" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - ]; + ] ++ extraMakeFlags; karch = stdenv.hostPlatform.linuxArch; }) From 8cef5c9fea74b5f1aae79fff154126af5925c912 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 12 Jul 2021 21:13:20 +0900 Subject: [PATCH 08/59] firefox-esr: 78.11.0esr -> 78.12.0esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 01611fd41dda..07da76c7e541 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -32,10 +32,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.11.0esr"; + ffversion = "78.12.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "d02fc2eda587155b1c54ca12a6c5cde220a29f41f154f1c9b71ae8f966d8cc9439201a5b241e03fc0795b74e2479f7aa5d6b69f70b7639432e5382f321f7a6f4"; + sha512 = "646eb803e0d0e541773e3111708c7eaa85e784e4bae6e4a77dcecdc617ee29e2e349c9ef16ae7e663311734dd7491aebd904359124dda62672dbc18bfb608f0a"; }; meta = { From 698bf970e11e11ff2b2dc087c87e1c9ce17f9d5e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 13 Jul 2021 19:34:19 +0200 Subject: [PATCH 09/59] hyperv-daemons: use python3 for kernels that support it Support for python3 was added in https://github.com/torvalds/linux/commit/8a99c920092f444cf9f1d737ae76527102886d8e it is therefore supported in every kernel including and after 4.19 --- pkgs/os-specific/linux/hyperv-daemons/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix index 2b6bf6fc63ad..a659908a7a09 100644 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python, kernel, makeWrapper, writeText +{ stdenv, lib, python2, python3, kernel, makeWrapper, writeText , gawk, iproute2 }: let @@ -9,6 +9,7 @@ let inherit (kernel) src version; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ (if lib.versionOlder version "4.19" then python2 else python3) ]; # as of 4.9 compilation will fail due to -Werror=format-security hardeningDisable = [ "format" ]; @@ -33,10 +34,6 @@ let install -Dm755 hv_get_dhcp_info.sh $out/${libexec}/hv_get_dhcp_info install -Dm755 hv_get_dns_info.sh $out/${libexec}/hv_get_dns_info - # I don't know why this isn't being handled automatically by fixupPhase - substituteInPlace $out/bin/lsvmbus \ - --replace '/usr/bin/env python' ${python.interpreter} - runHook postInstall ''; @@ -86,7 +83,7 @@ in stdenv.mkDerivation { Wants=hv-fcopy.service hv-kvp.service hv-vss.service EOF - for f in $lib/lib/systemd/system/* ; do + for f in $lib/lib/systemd/system/*.service ; do substituteInPlace $f --replace @out@ ${daemons}/bin done From e21183a95d81e0cd5b7d15d73373ac2e9195114f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 13 Jul 2021 02:18:32 -0700 Subject: [PATCH 10/59] buildLinux: preserve structuredExtraConfig and extraMakeFlags in passthru This allows users to override custom kernel packages (e.g. linux_xanmod) that set their own structuredExtraConfig with ease. --- pkgs/os-specific/linux/kernel/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 29557b8d9e2e..aa0f19858b84 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -160,7 +160,6 @@ let enableParallelBuilding = true; passthru = rec { - module = import ../../../../nixos/modules/system/boot/kernel_config.nix; # used also in apache # { modules = [ { options = res.options; config = svc.config or svc; } ]; @@ -188,7 +187,7 @@ let passthru = { features = kernelFeatures; - inherit commonStructuredConfig isZen isHardened isLibre modDirVersion; + inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre modDirVersion; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; kernelOlder = lib.versionOlder version; kernelAtLeast = lib.versionAtLeast version; From 8b0b6e43c6162e80eef5d5874d1a4c48402cc1c9 Mon Sep 17 00:00:00 2001 From: Mykola Orliuk Date: Sun, 11 Jul 2021 22:21:38 +0200 Subject: [PATCH 11/59] maintainers: add ony --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ef102e3a7a3d..23dbe8e5cd2a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7882,6 +7882,12 @@ githubId = 757752; name = "Jonas Heinrich"; }; + ony = { + name = "Mykola Orliuk"; + email = "virkony@gmail.com"; + github = "ony"; + githubId = 11265; + }; OPNA2608 = { email = "christoph.neidahl@gmail.com"; github = "OPNA2608"; From d90172f50de0bcc2f732881a90369dba109a2d39 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 14 Jul 2021 09:42:06 -0300 Subject: [PATCH 12/59] linode-cli: 5.4.3 -> 5.5.1 --- pkgs/tools/virtualization/linode-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index b30c4b88651c..f05c4a43b9c8 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,17 +11,17 @@ }: let - specVersion = "4.96.0"; # Version taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. + specVersion = "4.98.0"; # Version taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; - sha256 = "sha256-4+j5BBTOFLLiA+n0YEUH/ICK4Iuxr6nNB7ZRrYACW2I="; + sha256 = "sha256-3SweDMfgq2+QQIdeb6EjL7A2Grd/7KQzsbMNZKPtXts="; }; in buildPythonApplication rec { pname = "linode-cli"; - version = "5.4.3"; + version = "5.5.1"; src = fetchFromGitHub { owner = "linode"; From 65394f22e2e1dac3f80bb7042185faaded5aa05c Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 14 Jul 2021 23:10:58 +0200 Subject: [PATCH 13/59] wmctrl: support cross-compilation Add dependencies on correct place for cross-compiling. Fix issue where 'glib.h' cannot be found when cross-compiling. --- pkgs/tools/X11/wmctrl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 0a01a3dad5a4..19a464aff72a 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; }; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ glib.dev ]; buildInputs = [ libX11 libXmu glib ]; patches = [ ./64-bit-data.patch ]; From 8bd9288cc596f60feecde7f2857915dc51982d6e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 15 Jul 2021 04:20:00 +0000 Subject: [PATCH 14/59] svgbob: 0.4.2 -> 0.5.3 --- pkgs/tools/graphics/svgbob/default.nix | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index b9784a85b2da..1f72243293e8 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -1,25 +1,16 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.4.2"; + version = "0.5.3"; - src = fetchFromGitHub { - owner = "ivanceras"; - repo = pname; - rev = "0febc4377134a2ea3b3cd43ebdf5ea688a0e7432"; - sha256 = "1n0w5b3fjgbczy1iw52172x1p3y1bvw1qpz77fkaxkhrkgfd7vwr"; + src = fetchCrate { + inherit version; + crateName = "svgbob_cli"; + sha256 = "1gi8h4wzpi477y1gwi4708pn2kr65934a4dmphbhwppxbw447qiw"; }; - sourceRoot = "source/svgbob_cli"; - postPatch = '' - substituteInPlace ../svgbob/src/lib.rs \ - --replace '#![deny(warnings)]' "" - ''; - cargoSha256 = "1jyycr95gjginx6bzmay9b5dbpnbwdqbv13w1qy58znicsmh3v8a"; - - # Test tries to build outdated examples - doCheck = false; + cargoSha256 = "1x8phpllwm12igaachghwq6wgxl7nl8bhh7xybfrmn447viwxhq2"; meta = with lib; { description = "Convert your ascii diagram scribbles into happy little SVG"; From 9ad40cc7a3dda553bfda59f37897cb6ebdcf2026 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Thu, 15 Jul 2021 11:20:08 +0200 Subject: [PATCH 15/59] libconfig: fix static build the examples are linked dynamically which (obviously) fails if the lib has been built statically --- pkgs/development/libraries/libconfig/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 10d688d89b6c..eeec5d0bc8f8 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { doCheck = true; - configureFlags = lib.optional stdenv.targetPlatform.isWindows "--disable-examples"; + configureFlags = lib.optional + (stdenv.targetPlatform.isWindows || stdenv.hostPlatform.isStatic) + "--disable-examples"; meta = with lib; { homepage = "http://www.hyperrealm.com/libconfig"; From 953d5f5cfaae2a19e19e958c796803199ce19102 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 15 Jul 2021 23:51:27 +0200 Subject: [PATCH 16/59] Update pkgs/development/libraries/libconfig/default.nix --- pkgs/development/libraries/libconfig/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index eeec5d0bc8f8..d94a0e1d78bd 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; - configureFlags = lib.optional - (stdenv.targetPlatform.isWindows || stdenv.hostPlatform.isStatic) - "--disable-examples"; + configureFlags = lib.optional (stdenv.targetPlatform.isWindows || stdenv.hostPlatform.isStatic) "--disable-examples"; meta = with lib; { homepage = "http://www.hyperrealm.com/libconfig"; From ccac09f2ebbc5f8b102e0a5f8e0d5cd02a181028 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 15 Jul 2021 23:57:01 +0200 Subject: [PATCH 17/59] consul: 1.10.0 -> 1.10.1 --- pkgs/servers/consul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index c259f962b04c..da0e7364e95a 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.10.0"; + version = "1.10.1"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256:0gc5shz1nbya7jdkggw2izbw1p4lwkbqgbc5ihlvnwrfdgksfqqd"; + sha256 = "sha256-oap0pXqtIbT9wMfD/RuJ2tTRynSvfzsgL8TyY4nj3sM="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256:0sxnnzzsp58ma42ylysdgxibqf65f4f9vbf8c20r44426vg75as7"; + vendorSha256 = "sha256-DloQGxeooVhYWA5/ICkL2UEQvNPilb2F5pst78UzWPI="; doCheck = false; From 51dbc48b3baed382797a5009dc6a510a56028887 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 11 Jul 2021 03:37:59 +0300 Subject: [PATCH 18/59] swayr: init at 0.6.1 --- pkgs/tools/wayland/swayr/default.nix | 30 +++++++++++++++++++++++ pkgs/tools/wayland/swayr/icon-paths.patch | 17 +++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 49 insertions(+) create mode 100644 pkgs/tools/wayland/swayr/default.nix create mode 100644 pkgs/tools/wayland/swayr/icon-paths.patch diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix new file mode 100644 index 000000000000..24a830a7277c --- /dev/null +++ b/pkgs/tools/wayland/swayr/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromSourcehut, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "swayr"; + version = "0.6.1"; + + src = fetchFromSourcehut { + owner = "~tsdh"; + repo = "swayr"; + rev = "v${version}"; + sha256 = "1865064q8jb75nfb0hbx4swbbijpibm0n7m4cid8qgylzp4bxvs2"; + }; + + cargoSha256 = "0w6zjnywifdlaw01xz2824lwm4b6r1b7r99wi3p12vgbrmks4jcr"; + + patches = [ + ./icon-paths.patch + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "A window switcher (and more) for sway"; + homepage = "https://git.sr.ht/~tsdh/swayr"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/tools/wayland/swayr/icon-paths.patch b/pkgs/tools/wayland/swayr/icon-paths.patch new file mode 100644 index 000000000000..8fafc4c4153c --- /dev/null +++ b/pkgs/tools/wayland/swayr/icon-paths.patch @@ -0,0 +1,17 @@ +diff --git a/src/config.rs b/src/config.rs +index de7d04b..291114b 100644 +--- a/src/config.rs ++++ b/src/config.rs +@@ -197,6 +197,12 @@ impl Default for Format { + ), + urgency_end: Some("".to_string()), + icon_dirs: Some(vec![ ++ "/run/current-system/sw/share/icons/hicolor/scalable/apps".to_string(), ++ "/run/current-system/sw/share/icons/hicolor/48x48/apps".to_string(), ++ "/run/current-system/sw/share/pixmaps".to_string(), ++ "~/.nix-profile/share/icons/hicolor/scalable/apps".to_string(), ++ "~/.nix-profile/share/icons/hicolor/48x48/apps".to_string(), ++ "~/.nix-profile/share/pixmaps".to_string(), + "/usr/share/icons/hicolor/scalable/apps".to_string(), + "/usr/share/icons/hicolor/48x48/apps".to_string(), + "/usr/share/pixmaps".to_string(), diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d6b95e8f4a3..f3dede5b7e5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2301,6 +2301,8 @@ in swaycwd = callPackage ../tools/wayland/swaycwd { }; + swayr = callPackage ../tools/wayland/swayr { }; + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; From 3a3324a626b942c05c6333f794b5a932355aaa71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Jul 2021 00:59:43 +0200 Subject: [PATCH 19/59] mdcat: 0.23.0 -> 0.23.1 --- pkgs/tools/text/mdcat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index e298a56c58c2..beedabe34ae8 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - hash = "sha256-bGXuYGQyrXa9gUEQfB7BF9K04z88r1UoM8R5gpL2nRM="; + sha256 = "sha256-aJ7rL+EKa5zWmCmekVuRmdeOwTmVo0IQ+GJ8Ga4iTI0="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-hmv4LNk7NEYjT/5XXUpMd+xGS19KHOW+HIgsiFEWeig="; + cargoSha256 = "sha256-r0dJ/lDOfRzEdwySR/eEvsrO8qn4g7ZIfpekiirUp3Q="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. From d3ebf3bfa10b4e18385f3792c69f76f5be7e1b04 Mon Sep 17 00:00:00 2001 From: Artturi Date: Fri, 16 Jul 2021 04:06:00 +0300 Subject: [PATCH 20/59] oath-toolkit: fix darwin build by disabling pam (#130301) --- pkgs/tools/security/oath-toolkit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index a925d07cb7c8..e542a2ae7140 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pam, xmlsec }: let + # TODO: Switch to OpenPAM once https://gitlab.com/oath-toolkit/oath-toolkit/-/issues/26 is addressed upstream securityDependency = if stdenv.isDarwin then xmlsec else pam; @@ -16,6 +17,8 @@ in stdenv.mkDerivation rec { buildInputs = [ securityDependency ]; + configureFlags = lib.optionals stdenv.isDarwin [ "--disable-pam" ]; + passthru.updateScript = ./update.sh; meta = with lib; { From 37d73021ee8324e868dbd8c67d1b8ced969fc161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 15 Jul 2021 17:26:30 -0500 Subject: [PATCH 21/59] idris2: fix packagePaths issue packagePaths changed between idris2 `v0.3.0` and `v0.4.0` and now includes a version number in the path. Fixes nixos/nixpkgs#130310 Co-authored-by: zseri Co-authored-by: Mario Rodas --- pkgs/development/compilers/idris2/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index ac0f3312414e..c399772a9f32 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -48,7 +48,8 @@ stdenv.mkDerivation rec { postInstall = let includedLibs = [ "base" "contrib" "network" "prelude" ]; name = "${pname}-${version}"; - packagePaths = builtins.map (l: "$out/${name}/" + l) includedLibs; + packagePaths = + builtins.map (l: "$out/${name}/${l}-${version}") includedLibs; additionalIdris2Paths = builtins.concatStringsSep ":" packagePaths; in '' # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH From f11b21f79cfad9887cf07622069974ec05793784 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 16 Jul 2021 11:37:54 +0800 Subject: [PATCH 22/59] pantheon.elementary-feedback: 1.0 -> 6.0.0 --- .../pantheon/apps/elementary-feedback/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 21aeb38530fd..2e20314d480a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -11,15 +11,17 @@ , glib , granite , libgee +, libhandy , elementary-icon-theme , elementary-gtk-theme , gettext , wrapGAppsHook +, appstream }: stdenv.mkDerivation rec { pname = "elementary-feedback"; - version = "1.0"; + version = "6.0.0"; repoName = "feedback"; @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-GkVnowqGXwnEgplT34Po/BKzC2F/IQE2kIw0SLSLhGU="; + sha256 = "1fh9a0nfvbrxamki9avm9by760csj2nqy4ya7wzbnqbrrvjwd3fv"; }; passthru = { @@ -47,11 +49,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + appstream elementary-icon-theme granite gtk3 elementary-gtk-theme libgee + libhandy glib ]; From d0e07c3891a4212ff815681d7528f66a62141969 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 16 Jul 2021 13:58:03 +0800 Subject: [PATCH 23/59] pantheon.elementary-music: 5.0.5 -> 5.1.0 --- .../pantheon/apps/elementary-music/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 5a5c314b3e9b..fe6c3f187fe3 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , pkg-config @@ -16,6 +15,7 @@ , json-glib , libgda , libgpod +, libhandy , libnotify , libpeas , libsoup @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { pname = "elementary-music"; - version = "5.0.5"; + version = "5.1.0"; repoName = "music"; @@ -39,17 +39,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-3GZoBCu9rF+BnNk9APBzKWO1JYg1XYWwrEvwcjWvYDE="; + sha256 = "13v7rii9ardyd661s6d4hvvs4ig44v7s3qd1bx7imaigr72gg58b"; }; - patches = [ - # Fix build with latest Vala. - (fetchpatch { - url = "https://github.com/elementary/music/commit/9ed3bbb3a0d68e289a772b4603f58e52a4973316.patch"; - sha256 = "fFO97SQzTc2fYFJFGfFPSUCdkCgZxfX1fjDQ7GH4BUs="; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -82,6 +74,7 @@ stdenv.mkDerivation rec { libgda libgee libgpod + libhandy libnotify libpeas libsignon-glib From 7997c258db3f904c368890b0a40119cf7699a990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 1 Nov 2020 11:42:34 +0100 Subject: [PATCH 24/59] pidgin: bring back text-mode UI It disappeared in the parent commit. --- .../instant-messengers/pidgin/default.nix | 8 ++-- pkgs/development/libraries/libgnt/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/libgnt/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 4a0ef5ad771d..b5bdef03db73 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -2,8 +2,9 @@ , gtkspell2, aspell , gst_all_1, startupnotification, gettext , perlPackages, libxml2, nss, nspr, farstream -, libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn +, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn , lib, python3, libICE, libXext, libSM +, libgnt, ncurses , cyrus_sasl ? null , openssl ? null , gnutls ? null @@ -23,8 +24,6 @@ let unwrapped = stdenv.mkDerivation rec { sha256 = "bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336"; }; - inherit nss ncurses; - nativeBuildInputs = [ makeWrapper ]; NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; @@ -35,9 +34,10 @@ let unwrapped = stdenv.mkDerivation rec { aspell startupnotification gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good libxml2 nss nspr - libXScrnSaver ncurses python-with-dbus + libXScrnSaver python-with-dbus avahi dbus dbus-glib intltool libidn libICE libXext libSM cyrus_sasl + libgnt ncurses # optional: build finch - the console UI ] ++ (lib.optional (openssl != null) openssl) ++ (lib.optional (gnutls != null) gnutls) diff --git a/pkgs/development/libraries/libgnt/default.nix b/pkgs/development/libraries/libgnt/default.nix new file mode 100644 index 000000000000..33ce7fbaa113 --- /dev/null +++ b/pkgs/development/libraries/libgnt/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchurl, meson, ninja, pkg-config +, gtk-doc, docbook-xsl-nons +, glib, ncurses, libxml2 +, buildDocs ? true +}: +stdenv.mkDerivation rec { + pname = "libgnt"; + version = "2.14.1"; + + outputs = [ "out" "dev" ] ++ lib.optional buildDocs "devdoc"; + + src = fetchurl { + url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.xz"; + sha256 = "1n2bxg0ignn53c08cp69pj4sdg53kwlqn23rincyjmpr327fdhsy"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ] + ++ lib.optionals buildDocs [ gtk-doc docbook-xsl-nons ]; + + buildInputs = [ glib ncurses libxml2 ]; + + postPatch = '' + substituteInPlace meson.build --replace \ + "ncurses_sys_prefix = '/usr'" \ + "ncurses_sys_prefix = '${lib.getDev ncurses}'" + '' + lib.optionalString (!buildDocs) '' + sed "/^subdir('doc')$/d" -i meson.build + ''; + + meta = with lib; { + description = "An ncurses toolkit for creating text-mode graphical user interfaces"; + homepage = "https://keep.imfreedom.org/libgnt/libgnt/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with lib.maintainers; [ ony ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ca6d840318f..855d6e57fc73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16474,6 +16474,8 @@ in libgksu = callPackage ../development/libraries/libgksu { }; + libgnt = callPackage ../development/libraries/libgnt { }; + libgpgerror = callPackage ../development/libraries/libgpg-error { }; # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118 From bca3740562f3215f886aabf31bff11823b0eadcc Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 16 Jul 2021 14:27:27 +0800 Subject: [PATCH 25/59] pantheon.elementary-photos: 2.7.0 -> 2.7.1 --- .../pantheon/apps/elementary-photos/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 7280051361a9..bced420dbc0a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , meson @@ -12,6 +11,7 @@ , libaccounts-glib , libexif , libgee +, libhandy , geocode-glib , gexiv2 , libgphoto2 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.7.0"; + version = "2.7.1"; repoName = "photos"; @@ -43,17 +43,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-bTk4shryAWWMrKX3mza6xQ05qpBPf80Ey7fmYgKLUiY="; + sha256 = "1dql14k43rv3in451amiwv4z71hz3ailx67hd8gw1ka3yw12128p"; }; - patches = [ - # Fix build with latest Vala. - (fetchpatch { - url = "https://github.com/elementary/photos/commit/27e529fc96da828982563e2e19a6f0cef883a29e.patch"; - sha256 = "w39wh45VHggCs62TN6wpUEyz/hJ1y7qL1Ox+sp0Pt2s="; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -88,6 +80,7 @@ stdenv.mkDerivation rec { libgee libgphoto2 libgudev + libhandy libraw librest libsoup From 77b1d5ef0e2b047b15a55737e91b75b7cdd63cba Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Thu, 15 Jul 2021 16:06:42 +0200 Subject: [PATCH 26/59] ocamlPackages.secp256k1-internal: init at 0.2.0 --- .../secp256k1-internal/default.nix | 48 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/ocaml-modules/secp256k1-internal/default.nix diff --git a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix new file mode 100644 index 000000000000..f7d3c1e41c56 --- /dev/null +++ b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitLab +, buildDunePackage +, gmp +, dune-configurator +, cstruct +, bigstring +, alcotest +, hex +}: + +buildDunePackage rec { + pname = "secp256k1-internal"; + version = "0.2"; + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = "ocaml-secp256k1-internal"; + rev = "v${version}"; + sha256 = "1g9fyi78nmmm19l2cggwj14m4n80rz7gmnh1gq376zids71s6qxv"; + }; + + useDune2 = true; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + gmp + cstruct + bigstring + ]; + + buildInputs = [ + dune-configurator + ]; + + checkInputs = [ + alcotest + hex + ]; + + doCheck = true; + + meta = { + description = "Bindings to secp256k1 internal functions (generic operations on the curve)"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e5a792caf0f1..ebe7465fae57 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1031,6 +1031,8 @@ let inherit (pkgs) secp256k1; }; + secp256k1-internal = callPackage ../development/ocaml-modules/secp256k1-internal { }; + seq = callPackage ../development/ocaml-modules/seq { }; sosa = callPackage ../development/ocaml-modules/sosa { }; From 694f513cd1711bc0feedf81acf423cf10c736fda Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Thu, 15 Jul 2021 23:36:29 +1000 Subject: [PATCH 27/59] python3Packages.opensimplex: init at 0.3 --- .../python-modules/opensimplex/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/opensimplex/default.nix diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix new file mode 100644 index 000000000000..d95aa846965d --- /dev/null +++ b/pkgs/development/python-modules/opensimplex/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, autopep8 +, nose +, pycodestyle +, twine +}: + +buildPythonPackage rec { + pname = "opensimplex"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "lmas"; + repo = pname; + rev = "v${version}"; + sha256 = "idF5JQGnAye6z3c3YU9rsHaebB3rlHJfA8vSpjDnFeM="; + }; + + checkInputs = [ autopep8 nose pycodestyle twine ]; + checkPhase = '' + nosetests tests/ + ''; + + meta = with lib; { + description = "OpenSimplex Noise functions for 2D, 3D and 4D"; + longDescription = '' + OpenSimplex noise is an n-dimensional gradient noise function that was + developed in order to overcome the patent-related issues surrounding + Simplex noise, while continuing to also avoid the visually-significant + directional artifacts characteristic of Perlin noise. + ''; + homepage = "https://github.com/lmas/opensimplex"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ angustrau ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abf8dc2ee804..0ea1e6a456b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4989,6 +4989,8 @@ in { openshift = callPackage ../development/python-modules/openshift { }; + opensimplex = callPackage ../development/python-modules/opensimplex { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; opentracing = callPackage ../development/python-modules/opentracing { }; From d4eca42de4ce49c3af02e790a72239506087b210 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Braun Date: Mon, 6 Apr 2020 09:25:07 +0200 Subject: [PATCH 28/59] nixos/wordpress: nginx support --- .../from_md/release-notes/rl-2111.section.xml | 16 +++ .../manual/release-notes/rl-2111.section.md | 4 + nixos/modules/services/web-apps/wordpress.nix | 126 +++++++++++++++--- nixos/tests/wordpress.nix | 70 ++++++---- 4 files changed, 175 insertions(+), 41 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index b9967ffb9827..fcaac9e8bec4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -546,6 +546,22 @@ claws-mail-gtk2 package. + + + The wordpress module provides a new interface which allows to + use different webservers with the new option + services.wordpress.webserver. + Currently httpd and + nginx are supported. The definitions of + wordpress sites should now be set in + services.wordpress.sites. + + + Sites definitions that use the old interface are automatically + migrated in the new option. This backward compatibility will + be removed in 22.05. + + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 377dbf598d91..030f1d21818a 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -135,3 +135,7 @@ In addition to numerous new and upgraded packages, this release has the followin - Sway: The terminal emulator `rxvt-unicode` is no longer installed by default via `programs.sway.extraPackages`. The current default configuration uses `alacritty` (and soon `foot`) so this is only an issue when using a customized configuration and not installing `rxvt-unicode` explicitly. - The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package. + +- The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites). + + Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05. diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index 775ecb3acaf0..6f1ef815bc46 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -3,13 +3,18 @@ let inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types; inherit (lib) any attrValues concatMapStringsSep flatten literalExample; - inherit (lib) mapAttrs mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString; + inherit (lib) filterAttrs mapAttrs mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString; - eachSite = config.services.wordpress; + cfg = migrateOldAttrs config.services.wordpress; + eachSite = cfg.sites; user = "wordpress"; - group = config.services.httpd.group; + webserver = config.services.${cfg.webserver}; stateDir = hostName: "/var/lib/wordpress/${hostName}"; + # Migrate config.services.wordpress. to config.services.wordpress.sites. + oldSites = filterAttrs (o: _: o != "sites" && o != "webserver"); + migrateOldAttrs = cfg: cfg // { sites = cfg.sites // oldSites cfg; }; + pkg = hostName: cfg: pkgs.stdenv.mkDerivation rec { pname = "wordpress-${hostName}"; version = src.version; @@ -261,21 +266,48 @@ in # interface options = { services.wordpress = mkOption { - type = types.attrsOf (types.submodule siteOpts); + type = types.submodule { + # Used to support old interface + freeformType = types.attrsOf (types.submodule siteOpts); + + # New interface + options.sites = mkOption { + type = types.attrsOf (types.submodule siteOpts); + default = {}; + description = "Specification of one or more WordPress sites to serve"; + }; + + options.webserver = mkOption { + type = types.enum [ "httpd" "nginx" ]; + default = "httpd"; + description = '' + Whether to use apache2 or nginx for virtual host management. + + Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. + See for further information. + + Further apache2 configuration can be done by adapting services.httpd.virtualHosts.<name>. + See for further information. + ''; + }; + }; default = {}; - description = "Specification of one or more WordPress sites to serve via Apache."; + description = "Wordpress configuration"; }; + }; # implementation - config = mkIf (eachSite != {}) { + config = mkIf (eachSite != {}) (mkMerge [{ assertions = mapAttrsToList (hostName: cfg: { assertion = cfg.database.createLocally -> cfg.database.user == user; - message = "services.wordpress.${hostName}.database.user must be ${user} if the database is to be automatically provisioned"; + message = ''services.wordpress.sites."${hostName}".database.user must be ${user} if the database is to be automatically provisioned''; } ) eachSite; + warnings = mapAttrsToList (hostName: _: ''services.wordpress."${hostName}" is deprecated use services.wordpress.sites."${hostName}"'') (oldSites cfg); + services.mysql = mkIf (any (v: v.database.createLocally) (attrValues eachSite)) { enable = true; package = mkDefault pkgs.mariadb; @@ -289,14 +321,18 @@ in services.phpfpm.pools = mapAttrs' (hostName: cfg: ( nameValuePair "wordpress-${hostName}" { - inherit user group; + inherit user; + group = webserver.group; settings = { - "listen.owner" = config.services.httpd.user; - "listen.group" = config.services.httpd.group; + "listen.owner" = webserver.user; + "listen.group" = webserver.group; } // cfg.poolConfig; } )) eachSite; + } + + (mkIf (cfg.webserver == "httpd") { services.httpd = { enable = true; extraModules = [ "proxy_fcgi" ]; @@ -332,11 +368,13 @@ in ''; } ]) eachSite; }; + }) + { systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [ - "d '${stateDir hostName}' 0750 ${user} ${group} - -" - "d '${cfg.uploadsDir}' 0750 ${user} ${group} - -" - "Z '${cfg.uploadsDir}' 0750 ${user} ${group} - -" + "d '${stateDir hostName}' 0750 ${user} ${webserver.group} - -" + "d '${cfg.uploadsDir}' 0750 ${user} ${webserver.group} - -" + "Z '${cfg.uploadsDir}' 0750 ${user} ${webserver.group} - -" ]) eachSite); systemd.services = mkMerge [ @@ -350,7 +388,7 @@ in serviceConfig = { Type = "oneshot"; User = user; - Group = group; + Group = webserver.group; }; })) eachSite) @@ -360,9 +398,65 @@ in ]; users.users.${user} = { - group = group; + group = webserver.group; isSystemUser = true; }; + } - }; + (mkIf (cfg.webserver == "nginx") { + services.nginx = { + enable = true; + virtualHosts = mapAttrs (hostName: cfg: { + serverName = mkDefault hostName; + root = "${pkg hostName cfg}/share/wordpress"; + extraConfig = '' + index index.php; + ''; + locations = { + "/" = { + priority = 200; + extraConfig = '' + try_files $uri $uri/ /index.php$is_args$args; + ''; + }; + "~ \\.php$" = { + priority = 500; + extraConfig = '' + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools."wordpress-${hostName}".socket}; + fastcgi_index index.php; + include "${config.services.nginx.package}/conf/fastcgi.conf"; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; + # Mitigate https://httpoxy.org/ vulnerabilities + fastcgi_param HTTP_PROXY ""; + fastcgi_intercept_errors off; + fastcgi_buffer_size 16k; + fastcgi_buffers 4 16k; + fastcgi_connect_timeout 300; + fastcgi_send_timeout 300; + fastcgi_read_timeout 300; + ''; + }; + "~ /\\." = { + priority = 800; + extraConfig = "deny all;"; + }; + "~* /(?:uploads|files)/.*\\.php$" = { + priority = 900; + extraConfig = "deny all;"; + }; + "~* \\.(js|css|png|jpg|jpeg|gif|ico)$" = { + priority = 1000; + extraConfig = '' + expires max; + log_not_found off; + ''; + }; + }; + }) eachSite; + }; + }) + + ]); } diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index a5c10c2de741..45c58b5b65c8 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -10,48 +10,68 @@ import ./make-test-python.nix ({ pkgs, ... }: ]; }; - machine = - { ... }: - { services.httpd.adminAddr = "webmaster@site.local"; + nodes = { + wp_httpd = { ... }: { + services.httpd.adminAddr = "webmaster@site.local"; services.httpd.logPerVirtualHost = true; - services.wordpress."site1.local" = { - database.tablePrefix = "site1_"; - }; - - services.wordpress."site2.local" = { - database.tablePrefix = "site2_"; + services.wordpress = { + # Test support for old interface + "site1.local" = { + database.tablePrefix = "site1_"; + }; + sites = { + "site2.local" = { + database.tablePrefix = "site2_"; + }; + }; }; + networking.firewall.allowedTCPPorts = [ 80 ]; networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; + wp_nginx = { ... }: { + services.wordpress.webserver = "nginx"; + services.wordpress.sites = { + "site1.local" = { + database.tablePrefix = "site1_"; + }; + "site2.local" = { + database.tablePrefix = "site2_"; + }; + }; + + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; + }; + }; + testScript = '' import re start_all() - machine.wait_for_unit("httpd") - - machine.wait_for_unit("phpfpm-wordpress-site1.local") - machine.wait_for_unit("phpfpm-wordpress-site2.local") + wp_httpd.wait_for_unit("httpd") + wp_nginx.wait_for_unit("nginx") site_names = ["site1.local", "site2.local"] - with subtest("website returns welcome screen"): + for machine in (wp_httpd, wp_nginx): for site_name in site_names: - assert "Welcome to the famous" in machine.succeed(f"curl -fL {site_name}") + machine.wait_for_unit(f"phpfpm-wordpress-{site_name}") - with subtest("wordpress-init went through"): - for site_name in site_names: - info = machine.get_unit_info(f"wordpress-init-{site_name}") - assert info["Result"] == "success" + with subtest("website returns welcome screen"): + assert "Welcome to the famous" in machine.succeed(f"curl -L {site_name}") - with subtest("secret keys are set"): - pattern = re.compile(r"^define.*NONCE_SALT.{64,};$", re.MULTILINE) - for site_name in site_names: - assert pattern.search( - machine.succeed(f"cat /var/lib/wordpress/{site_name}/secret-keys.php") - ) + with subtest("wordpress-init went through"): + info = machine.get_unit_info(f"wordpress-init-{site_name}") + assert info["Result"] == "success" + + with subtest("secret keys are set"): + pattern = re.compile(r"^define.*NONCE_SALT.{64,};$", re.MULTILINE) + assert pattern.search( + machine.succeed(f"cat /var/lib/wordpress/{site_name}/secret-keys.php") + ) ''; }) From 6af9e5db9e7b59883dcd9c1a7f0e21dc526054e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Jul 2021 08:55:27 +0200 Subject: [PATCH 29/59] metasploit: 6.0.52 -> 6.0.53 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 24 ++++++----- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 48 +++++++++++++-------- 4 files changed, 45 insertions(+), 33 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4a30b94f42e5..8b90f7dd5f99 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.52" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.53" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 1d324982a47f..53b1170b210f 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: f376002331f03483d56ade1c19134dbf02ef2cff - ref: refs/tags/6.0.52 + revision: b7cef30d11f0509b7e27334030dae6b8cb34e7f2 + ref: refs/tags/6.0.53 specs: - metasploit-framework (6.0.52) + metasploit-framework (6.0.53) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -85,6 +85,7 @@ GIT thin tzinfo tzinfo-data + unix-crypt warden windows_error xdr @@ -126,13 +127,13 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.475.0) - aws-sdk-core (3.116.0) + aws-partitions (1.478.0) + aws-sdk-core (3.117.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.248.0) + aws-sdk-ec2 (1.249.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.56.0) @@ -173,7 +174,7 @@ GEM eventmachine (1.2.7) faker (2.18.0) i18n (>= 1.6, < 2) - faraday (1.5.0) + faraday (1.5.1) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -188,7 +189,7 @@ GEM faraday-excon (1.1.0) faraday-httpclient (1.0.1) faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) + faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faye-websocket (0.11.1) eventmachine (>= 0.12.0) @@ -312,7 +313,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.16) + rex-core (0.1.17) rex-encoder (0.1.5) metasm rex-arch @@ -331,7 +332,7 @@ GEM rex-arch rex-ole (0.1.7) rex-text - rex-powershell (0.1.90) + rex-powershell (0.1.91) rex-random_identifier rex-text ruby-rc4 @@ -356,7 +357,7 @@ GEM rkelly-remix (0.0.7) ruby-macho (2.5.1) ruby-rc4 (0.1.5) - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.5) ruby_smb (2.0.10) bindata openssl-ccm @@ -393,6 +394,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.7) + unix-crypt (1.3.0) warden (1.2.9) rack (>= 2.0.9) webrick (1.7.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index e2e1f6371f7c..5217322fd6bb 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.52"; + version = "6.0.53"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-JN+ulGd47xZFSR7AdxfvviR5mwCHdfBmFkaAJPdaLJ8="; + sha256 = "sha256-0tg2FSRtwo1LRxA5jNQ1Pxx54TPs3ZwErXim8uj24VI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 23eb207484a0..ab8a1a21ca98 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,30 +114,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x9d0awfm8s9y025iwn7d5an476f6xq9v99lnynj2vvj1kgya79s"; + sha256 = "0vsxqayzh04gxxan5i8vvfxh0n238dc9305bc89xs2mx2x1pw167"; type = "gem"; }; - version = "1.475.0"; + version = "1.478.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vjr1lzddm1pcs5vkpxns1gmrv0l0wb53kcxhh1xdznb7hm8h5km"; + sha256 = "1mcagbyzy7l39lxm9g85frvjwlv3yfd9x8jddd1pfc0xsy9y0rax"; type = "gem"; }; - version = "3.116.0"; + version = "3.117.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s0r1vk39sjxkc5km2ldvcm1l5ac2c4w5z9bvz18jgqis98j6zd5"; + sha256 = "1n6yl7qbzmjlxp3rzm3a62vinzdg9a8rqspq7xdaa9sxrf4zsamf"; type = "gem"; }; - version = "1.248.0"; + version = "1.249.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -354,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah"; + sha256 = "1xpq9w46alagszx2mx82mqxxmsmyni2bpxd08gygzpl03zwbpr63"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; faraday-em_http = { groups = ["default"]; @@ -414,10 +414,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka"; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; faraday-patron = { groups = ["default"]; @@ -594,12 +594,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "f376002331f03483d56ade1c19134dbf02ef2cff"; - sha256 = "17rcbbvj90262rkg0xc702dpj95yxwbpgh0y952idvvqcyaaxpr4"; + rev = "b7cef30d11f0509b7e27334030dae6b8cb34e7f2"; + sha256 = "0lp1yvlg59kqml29rpgc6ghpj71z6pa8qf8h8x5qvhkd4hakdn6j"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.52"; + version = "6.0.53"; }; metasploit-model = { groups = ["default"]; @@ -1036,10 +1036,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08krnf05mbq6x2d92fv34bl8xdz1d3yq2m0mp8bfbq5kd6a13l2w"; + sha256 = "0b0f9s18d2ax2k1xmwrvr97gxh8gfm79kfibv55fqmv846vgkkvk"; type = "gem"; }; - version = "0.1.16"; + version = "0.1.17"; }; rex-encoder = { groups = ["default"]; @@ -1106,10 +1106,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08a9s82y4bv2bis0szasrrqvz6imwx94ckg259f7w39ng1fbc7b1"; + sha256 = "0zrc0pr1pla0amw6hagllj82hyq8pyy6wb38xry2cxg7q70ghfq7"; type = "gem"; }; - version = "0.1.90"; + version = "0.1.91"; }; rex-random_identifier = { groups = ["default"]; @@ -1236,10 +1236,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.5"; }; ruby_smb = { groups = ["default"]; @@ -1421,6 +1421,16 @@ }; version = "0.0.7.7"; }; + unix-crypt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wflipsmmicmgvqilp9pml4x19b337kh6p6jgrzqrzpkq2z52gdq"; + type = "gem"; + }; + version = "1.3.0"; + }; warden = { groups = ["default"]; platforms = []; From 942f992362b159c3dd8fd235a1f9527319652334 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Jul 2021 08:59:00 +0200 Subject: [PATCH 30/59] python3Packages.adafruit-platformdetect: 3.14.2 -> 3.15.1 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 114130595339..c3a9224410db 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.14.2"; + version = "3.15.1"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-SFqSTNKZMETRf9RxSD6skzAVpxepmW+JG/gqZgFX06A="; + sha256 = "sha256-aUYerhg5iqKsZ5SW3dI6EpFnaB7dRGjXpIDVsjwS7vY="; }; nativeBuildInputs = [ setuptools-scm ]; From 461412bd3b83438605efd881451e806cf68db3c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Jul 2021 09:10:03 +0200 Subject: [PATCH 31/59] python3Packages.pytenable: 1.3.1 -> 1.3.2 --- pkgs/development/python-modules/pytenable/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 5b0dfb29be2b..b547d030cedd 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -1,4 +1,5 @@ { lib +, appdirs , buildPythonPackage , defusedxml , fetchFromGitHub @@ -17,13 +18,13 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "tenable"; repo = "pyTenable"; rev = version; - sha256 = "sha256-9qkNQ3+yDplPHIXDwlghpJP1f+UoDYObWpPhl6UVtHU="; + sha256 = "sha256-S39rl8bJsxYAmTcaZk9+s9G45lOvREjlGVBk1m30tJo="; }; propagatedBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; buildInputs = [ + appdirs defusedxml marshmallow python-box From 032bd9e92db705ec95f233732dcdba712c17ee02 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Jul 2021 09:34:35 +0200 Subject: [PATCH 32/59] python3Packages.slack-sdk: 3.7.0 -> 3.8.0 --- .../python-modules/slack-sdk/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 862789ce569b..a52d3144aadf 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -11,9 +11,7 @@ , isPy3k , psutil , pytest-asyncio -, pytest-cov , pytestCheckHook -, pytestrunner , sqlalchemy , websocket-client , websockets @@ -21,14 +19,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.7.0"; + version = "3.8.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "0bc52v5n8r3b2fy1c90w253r1abl752kaqdk6bgzkwsvbhgcxf2s"; + sha256 = "sha256-r3GgcU4K2jj+4aIytpY2HiVqHzChynn2BCn1VNTL2t0="; }; propagatedBuildInputs = [ @@ -47,20 +45,23 @@ buildPythonPackage rec { flask-sockets psutil pytest-asyncio - pytest-cov pytestCheckHook - pytestrunner ]; preCheck = '' export HOME=$(mktemp -d) ''; - # Exclude tests that requires network features - pytestFlagsArray = [ "--ignore=integration_tests" ]; + disabledTestPaths = [ + # Exclude tests that requires network features + "integration_tests" + ]; + disabledTests = [ + # Requires network features "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" "test_org_installation" + "test_interactions" ]; pythonImportsCheck = [ "slack_sdk" ]; From 26713e22410c3ddbb500288ec384db6d7982c0b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Jul 2021 09:35:40 +0200 Subject: [PATCH 33/59] treewide: remove gdk_pixbuf alias --- pkgs/applications/office/timedoctor/default.nix | 2 +- pkgs/desktops/gnome/default.nix | 2 +- pkgs/development/tools/unityhub/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/timedoctor/default.nix b/pkgs/applications/office/timedoctor/default.nix index e6d3186578a4..326f924b2ab6 100644 --- a/pkgs/applications/office/timedoctor/default.nix +++ b/pkgs/applications/office/timedoctor/default.nix @@ -36,7 +36,7 @@ appimageTools.wrapType2 { git glib glibc - gnome.gdk_pixbuf + gnome.gdk-pixbuf gnome.gtk gnome.gtk.dev gnome.zenity diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index ae2255acb911..979ddafc10f0 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -312,7 +312,7 @@ lib.makeScope pkgs.newScope (self: with self; { # added 2019-02-08 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 - libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 + libgtop libgudev libhttpseverywhere librsvg libsecret gdk-pixbuf gtksourceview gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl; inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 19cd15e7be41..27453ed5988a 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -5,7 +5,7 @@ let in appimageTools.wrapType2 rec { name = "unityhub"; - extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr + extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk-pixbuf glib libGL libGLU nss nspr alsa-lib cups gnome2.GConf libcap fontconfig freetype pango cairo dbus dbus-glib libdbusmenu libdbusmenu-gtk2 expat zlib libpng12 udev tbb libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5 From 1553200aac534a45a22df24d9f96b3b22898796d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 16 Jul 2021 15:44:23 +0800 Subject: [PATCH 34/59] pantheon.elementary-icon-theme: 5.3.1 -> 6.0.0 --- .../pantheon/artwork/elementary-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 55935b2ee0e0..bd4845172c52 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "elementary-icon-theme"; - version = "5.3.1"; + version = "6.0.0"; repoName = "icons"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-6XFzjpuHpGIZ+azkPuFcSF7p66sDonwLwjvlNBZDRmc="; + sha256 = "0k94zi8fzi0nf5q471fmrlz8jjkv8m6vav1spzv7ynkg2hik8d9b"; }; passthru = { From d874ac6bef46b60e6b560573d0ac049c7e4965ff Mon Sep 17 00:00:00 2001 From: Ilan Joselevich <56614642+Kranzes@users.noreply.github.com> Date: Fri, 16 Jul 2021 10:45:37 +0300 Subject: [PATCH 35/59] ookla-speedtest: init at 1.0.0 (#130300) Co-authored-by: Sandro --- .../networking/ookla-speedtest/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/networking/ookla-speedtest/default.nix diff --git a/pkgs/tools/networking/ookla-speedtest/default.nix b/pkgs/tools/networking/ookla-speedtest/default.nix new file mode 100644 index 000000000000..200b488cf714 --- /dev/null +++ b/pkgs/tools/networking/ookla-speedtest/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchurl }: + +let + pname = "ookla-speedtest"; + version = "1.0.0"; + + srcs = { + x86_64-linux = fetchurl { + url = "https://install.speedtest.net/app/cli/${pname}-${version}-x86_64-linux.tgz"; + sha256 = "sha256-X+ICjw1EJ+T0Ix2fnPcOZpG7iQpwY211Iy/k2XBjMWg="; + }; + aarch64-linux = fetchurl { + url = "https://install.speedtest.net/app/cli/${pname}-${version}-aarch64-linux.tgz"; + sha256 = "sha256-BzaE3DSQUIygGwTFhV4Ez9eX/tM/bqam7cJt+8b2qp4="; + }; + }; +in + +stdenv.mkDerivation rec { + inherit pname version; + + src = srcs.${stdenv.hostPlatform.system}; + + setSourceRoot = '' + sourceRoot=$PWD + ''; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + install -D speedtest $out/bin/speedtest + install -D speedtest.5 $out/share/man/man5/speedtest.5 + ''; + + meta = with lib; { + description = "Command line internet speedtest tool by Ookla"; + homepage = "https://www.speedtest.net/apps/cli"; + license = licenses.unfree; + maintainers = with maintainers; [ kranzes ]; + platforms = lib.attrNames srcs; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 134d26935606..24c563cf7760 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17682,6 +17682,8 @@ in oobicpl = callPackage ../development/libraries/science/biology/oobicpl { }; + ookla-speedtest = callPackage ../tools/networking/ookla-speedtest { }; + openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; From 3a1ed5fb8dc8a496492cc50d044bfc00fb515778 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 16 Jul 2021 09:27:18 +0200 Subject: [PATCH 36/59] python3Packages.python-lsp-server: add missing setuptools dependency --- pkgs/development/python-modules/python-lsp-server/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 6a2c396ecf89..90ab506d651f 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -19,6 +19,7 @@ , python-lsp-jsonrpc , pythonOlder , rope +, setuptools , ujson , yapf }: @@ -47,6 +48,7 @@ buildPythonPackage rec { pylint python-lsp-jsonrpc rope + setuptools ujson yapf ]; From fb3efcc712e862defdce40a0ce7d720b02d83b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Jul 2021 10:31:46 +0200 Subject: [PATCH 37/59] timedoctor: remove used aliases --- pkgs/applications/office/timedoctor/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/office/timedoctor/default.nix b/pkgs/applications/office/timedoctor/default.nix index 326f924b2ab6..4b97f7b3dcd9 100644 --- a/pkgs/applications/office/timedoctor/default.nix +++ b/pkgs/applications/office/timedoctor/default.nix @@ -36,9 +36,9 @@ appimageTools.wrapType2 { git glib glibc - gnome.gdk-pixbuf - gnome.gtk - gnome.gtk.dev + gdk-pixbuf + gtk3 + gtk3.dev gnome.zenity gnome2.GConf gnumake @@ -48,7 +48,7 @@ appimageTools.wrapType2 { gtk3.dev gtk3-x11 gtk3-x11.dev - kdialog + plasma5Packages.kdialog libappindicator-gtk2.out libexif (libjpeg.override { enableJpeg8 = true; }).out @@ -70,12 +70,12 @@ appimageTools.wrapType2 { sqlite.dev udev unzip - utillinux + util-linux watch wget which wrapGAppsHook - xdg_utils + xdg-utils xorg.libX11 xorg.libXau xorg.libXaw From 0592d2e3f32745ffd3cc6f3666a559533c6b1eee Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 16 Jul 2021 17:01:20 +0800 Subject: [PATCH 38/59] pantheon.granite: 6.0.0 -> 6.1.0 --- pkgs/desktops/pantheon/granite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 3d4dc6bd84ab..2397dd8ffcf5 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "6.0.0"; + version = "6.1.0"; outputs = [ "out" "dev" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-RGukXeFmtnyCfK8pKdvTHL0t8yhEYwAiiPelTy1Xcf0="; + sha256 = "02hn4abnsn6fm2m33pjmlnkj8dljsm292z62vn8ccvy7l8f9my6l"; }; passthru = { From a2179251caa22acca9f359849f21e34a5ccc7a4a Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 16 Jul 2021 11:44:20 +0200 Subject: [PATCH 39/59] bitcoin: move util-linux from buildInputs to nativeBuildInputs --- pkgs/applications/blockchains/bitcoin.nix | 34 ++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 162a5ddee1a3..00727d294df2 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -1,21 +1,22 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, pkg-config , autoreconfHook +, pkg-config +, util-linux +, hexdump +, wrapQtAppsHook ? null +, boost +, libevent +, miniupnpc +, zeromq +, zlib , db48 , sqlite -, boost -, zeromq -, hexdump -, zlib -, miniupnpc +, qrencode , qtbase ? null , qttools ? null -, wrapQtAppsHook ? null -, util-linux , python3 -, qrencode -, libevent , nixosTests , withGui , withWallet ? true @@ -43,13 +44,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ pkg-config autoreconfHook ] - ++ optional stdenv.isDarwin hexdump - ++ optional withGui wrapQtAppsHook; - buildInputs = [ boost zlib zeromq miniupnpc libevent ] + [ autoreconfHook pkg-config ] ++ optionals stdenv.isLinux [ util-linux ] + ++ optionals stdenv.isDarwin [ hexdump ] + ++ optionals withGui [ wrapQtAppsHook ]; + + buildInputs = [ boost libevent miniupnpc zeromq zlib ] ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qtbase qttools qrencode ]; + ++ optionals withGui [ qrencode qtbase qttools ]; postInstall = optional withGui '' install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop From 27523cad1edbfc0afd1a562e3408b2fa913f9483 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 16 Jul 2021 11:56:51 +0200 Subject: [PATCH 40/59] chromium: 91.0.4472.114 -> 91.0.4472.164 https://chromereleases.googleblog.com/2021/07/stable-channel-update-for-desktop.html This update includes 8 security fixes. Google is aware of reports that an exploit for CVE-2021-30563 exists in the wild. CVEs: CVE-2021-30559 CVE-2021-30541 CVE-2021-30560 CVE-2021-30561 CVE-2021-30562 CVE-2021-30563 CVE-2021-30564 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 3270024d7641..6860612b888d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "91.0.4472.114", - "sha256": "0wbyiwbdazgjjgj9vs56x26q3g9r80a57gfl0f2rfl1j7xwgxiy1", - "sha256bin64": "00ac1dyqxpxy1j11jvc5j35bgc629n2f2pll3912gzih4ir0vrys", + "version": "91.0.4472.164", + "sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4", + "sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr", "deps": { "gn": { "version": "2021-04-06", From 4b060bc61f27275c2c6583f6db1c1638944bffc5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 16 Jul 2021 11:07:46 +0200 Subject: [PATCH 41/59] gitea: 1.14.4 -> 1.14.5 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.14.5 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 258e81acedfc..bd61d984c620 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.14.4"; + version = "1.14.5"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-sl/Vml8QmwZEAd2PIYWQcP7s6NYeomGJQGKhRiddtoo="; + sha256 = "sha256-8nwLVpe/5IjXJqO179lN80B/3WGUL3LKM8OWdh/bYOE="; }; unpackPhase = '' From 7642d0b427398efad58490cd1e7d29b7f7ce1678 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 15 Jul 2021 22:12:20 -0700 Subject: [PATCH 42/59] tailscale: 1.10.1 -> 1.10.2 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index ff2c8f9af375..e09def926e18 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "1s4qpz4jwar3lcqyzkgyvgm4bghzass974lq1pw4fziqlsblh0vm"; + sha256 = "sha256-bAWQTdpqDF7ERQzNY1k0NtxdA9M9bIyfHtvX0nKfIQY="; }; nativeBuildInputs = [ makeWrapper ]; From 3e93811d93b2bc88f047e9a989b456ab3ae3291c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 16 Jul 2021 12:14:45 +0200 Subject: [PATCH 43/59] chromium: get-commit-message.py: Improve the parsing The current stable release announcement [0] uses more HTML tags which broke the detection of "fixes" and "zero_days". Proper HTML parsing could be done using html.parser [1] but for our purposes the naive regex trick works well enough. [0]: https://chromereleases.googleblog.com/2021/07/stable-channel-update-for-desktop.html [1]: https://docs.python.org/3/library/html.parser.html --- .../networking/browsers/chromium/get-commit-message.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 2768e31bd032..7a91b74c83d5 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -19,14 +19,14 @@ for entry in feed.entries: continue url = requests.get(entry.link).url.split('?')[0] content = entry.content[0].value + content = html_tags.sub('', content) # Remove any HTML tags if re.search(r'Linux', content) is None: continue #print(url) # For debugging purposes version = re.search(r'\d+(\.\d+){3}', content).group(0) print('chromium: TODO -> ' + version) print('\n' + url) - if fixes := re.search(r'This update includes .+ security fixes\.', content): - fixes = html_tags.sub('', fixes.group(0)) + if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0): zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content) if zero_days: fixes += " " + zero_days.group(0) From 6582dd7e12c7ad0da7822c238852d071f947894b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 16 Jul 2021 12:40:07 +0200 Subject: [PATCH 44/59] knot-dns: 3.0.7 -> 3.0.8 https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.8 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index d052ddb7b79f..e5192b7b3c1e 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "2bad8be0be95c8f54a26d1e16299e65f31ae1b34bd6ad3819aa50e7b40521484"; + sha256 = "df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0"; }; outputs = [ "bin" "out" "dev" ]; From 6276e4cebb18e348c6b99d98e54033e669a73646 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 16 Jul 2021 20:12:51 +0800 Subject: [PATCH 45/59] pantheon.elementary-videos: 2.7.2 -> 2.7.3 --- pkgs/desktops/pantheon/apps/elementary-videos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index e5506093719d..95df9a613a82 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.7.2"; + version = "2.7.3"; repoName = "videos"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-MSyhCXsziQ0MD4lGp9X/9odidjT/L+2Aihwd1qCGvB0="; + sha256 = "04nl9kn33dysvsg0n5qx1z8qgrifkgfwsm7gh1l308v3n8c69lh7"; }; passthru = { From 58c7f3149db499692a67acc26fa47390269b3bec Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 16 Jul 2021 11:32:48 +0200 Subject: [PATCH 46/59] elements: init at 0.18.1.12 --- pkgs/applications/blockchains/elements.nix | 86 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 2 files changed, 89 insertions(+) create mode 100644 pkgs/applications/blockchains/elements.nix diff --git a/pkgs/applications/blockchains/elements.nix b/pkgs/applications/blockchains/elements.nix new file mode 100644 index 000000000000..c44f2078dae3 --- /dev/null +++ b/pkgs/applications/blockchains/elements.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchurl +, autoreconfHook +, pkg-config +, util-linux +, hexdump +, wrapQtAppsHook ? null +, boost +, libevent +, miniupnpc +, zeromq +, zlib +, db48 +, sqlite +, qrencode +, qtbase ? null +, qttools ? null +, python3 +, openssl +, withGui +, withWallet ? true +}: + +with lib; +stdenv.mkDerivation rec { + pname = if withGui then "elements" else "elementsd"; + version = "0.18.1.12"; + + src = fetchurl { + url = "https://github.com/ElementsProject/elements/archive/elements-${version}.tar.gz"; + sha256 = "84a51013596b09c62913649ac90373622185f779446ee7e65b4b258a2876609f"; + }; + + nativeBuildInputs = + [ autoreconfHook pkg-config ] + ++ optionals stdenv.isLinux [ util-linux ] + ++ optionals stdenv.isDarwin [ hexdump ] + ++ optionals withGui [ wrapQtAppsHook ]; + + buildInputs = [ boost libevent miniupnpc zeromq zlib openssl ] + ++ optionals withWallet [ db48 sqlite ] + ++ optionals withGui [ qrencode qtbase qttools ]; + + configureFlags = [ + "--with-boost-libdir=${boost.out}/lib" + "--disable-bench" + ] ++ optionals (!doCheck) [ + "--disable-tests" + "--disable-gui-tests" + ] ++ optionals (!withWallet) [ + "--disable-wallet" + ] ++ optionals withGui [ + "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + ]; + + checkInputs = [ python3 ]; + + doCheck = true; + + checkFlags = + [ "LC_ALL=C.UTF-8" ] + # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. + # See also https://github.com/NixOS/nixpkgs/issues/24256 + ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + + enableParallelBuilding = true; + + meta = { + description = "Open Source implementation of advanced blockchain features extending the Bitcoin protocol"; + longDescription= '' + The Elements blockchain platform is a collection of feature experiments and extensions to the + Bitcoin protocol. This platform enables anyone to build their own businesses or networks + pegged to Bitcoin as a sidechain or run as a standalone blockchain with arbitrary asset + tokens. + ''; + homepage = "https://www.github.com/ElementsProject/elements"; + maintainers = with maintainers; [ prusnak ]; + license = licenses.mit; + platforms = platforms.unix; + # Qt GUI is currently broken in upstream + # No rule to make target 'qt/res/rendered_icons/about.png', needed by 'qt/qrc_bitcoin.cpp'. + broken = withGui; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00d2c8f115e4..01284f66ba49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28510,6 +28510,9 @@ in electrs = callPackage ../applications/blockchains/electrs.nix { }; + elements = libsForQt5.callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = true; }; + elementsd = callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = false; }; + ergo = callPackage ../applications/blockchains/ergo { }; exodus = callPackage ../applications/blockchains/exodus { }; From 48676d0ad60b7fd279605c397f2c58b41decc836 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 16 Jul 2021 09:38:58 -0300 Subject: [PATCH 47/59] arcan: fix wrapper The wrapper should read the user's HOME directory, but it reads the 'homeless-shelter'. --- pkgs/desktops/arcan/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/arcan/wrapper.nix b/pkgs/desktops/arcan/wrapper.nix index a8b93ca1deac..4368b0ad3a59 100644 --- a/pkgs/desktops/arcan/wrapper.nix +++ b/pkgs/desktops/arcan/wrapper.nix @@ -21,7 +21,7 @@ symlinkJoin rec { --set ARCAN_LIBPATH "${placeholder "out"}/lib/" \ --set ARCAN_RESOURCEPATH "${placeholder "out"}/share/arcan/resources/" \ --set ARCAN_SCRIPTPATH "${placeholder "out"}/share/arcan/scripts/" \ - --set ARCAN_STATEBASEPATH "$HOME/.arcan/resources/savestates/" + --set ARCAN_STATEBASEPATH "\$HOME/.arcan/resources/savestates/" done ''; } From 6c539fa80782e483c12ebf6b46c89e091f3462a4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 16 Jul 2021 09:40:39 -0300 Subject: [PATCH 48/59] arcan: remove prio from everyone-wrapped inputs Prio works well, but it is not actively developed by upstream. --- pkgs/desktops/arcan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix index dba284f0100d..874035c4801e 100644 --- a/pkgs/desktops/arcan/default.nix +++ b/pkgs/desktops/arcan/default.nix @@ -37,6 +37,6 @@ rec { everyone-wrapped = callPackage ./wrapper.nix { name = "everyone-wrapped"; - appls = [ durden pipeworld prio ]; + appls = [ durden pipeworld ]; }; } From cca4ad5b524984977c4da3216ee62e0999b0d7cc Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 16 Jul 2021 10:20:08 -0300 Subject: [PATCH 49/59] arcan.arcan: 0.6.1pre1+unstable=2021-07-07 -> 0.6.1pre1+unstable=2021-07-10 --- pkgs/desktops/arcan/arcan.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/arcan/arcan.nix b/pkgs/desktops/arcan/arcan.nix index 8a30da9e81f2..c6a57ecc3bda 100644 --- a/pkgs/desktops/arcan/arcan.nix +++ b/pkgs/desktops/arcan/arcan.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "arcan"; - version = "0.6.1pre1+unstable=2021-07-07"; + version = "0.6.1pre1+unstable=2021-07-10"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; - rev = "f3341ab94b32d02f3d15c3b91a512b2614e950a5"; - hash = "sha256-YBtRA5uCk4tjX3Bsu5vMkaNaCLRlM6HVQ53sna3gDsY="; + rev = "25da999e6e03688c71c7df3852314c01ed610e0d"; + hash = "sha256-+ZF6mD/Z0N/5QCjXe80z4L6JOE33+Yv4ZlwKvlG/c44="; }; postUnpack = '' From a6ae85a346431e966e266467bd195cc16649f13f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 16 Jul 2021 10:21:18 -0300 Subject: [PATCH 50/59] arcan.durden: 0.6.1+unstable=2021-06-25 -> 0.6.1+unstable=2021-07-11 --- pkgs/desktops/arcan/durden.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/arcan/durden.nix b/pkgs/desktops/arcan/durden.nix index cfe41cb6ec22..f6837f96fb6b 100644 --- a/pkgs/desktops/arcan/durden.nix +++ b/pkgs/desktops/arcan/durden.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "durden"; - version = "0.6.1+unstable=2021-06-25"; + version = "0.6.1+unstable=2021-07-11"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "fb618fccc57a68b6ce933b4df5822acd1965d591"; - hash = "sha256-PovI837Xca4wV0g0s4tYUMFGVUDf+f8HcdvM1+0aDxk="; + rev = "8e0a5c07cade9ad9f606781615c9ebae7b28b6d5"; + hash = "sha256-4cGuCAeYmmr4ACWt2akVQu2cPqqyE6p+XFaKWcFf3t0="; }; installPhase = '' From 8e99c94af35ada92876f2fb4da6cc964d7c3e654 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Jul 2021 19:21:25 +0200 Subject: [PATCH 51/59] tfsec: 0.48.2 -> 0.48.7 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 7b028e28ed5b..af47f65d298d 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.48.2"; + version = "0.48.7"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZJHm+shCbyM2cyLW5ZgrqLMwnnvp7IOHI5+Ta2gdaNQ="; + sha256 = "sha256-8OOi2YWxn50iXdH5rqxZ2/qIlS6JX/7P3HMaPpnBH6I="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From f299d8b494dc60eb3e810a4aab057b3c28c45018 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Fri, 16 Jul 2021 17:49:35 +0200 Subject: [PATCH 52/59] rq: drop obsolete inputs Current releases of rq no longer use v8 --- pkgs/development/tools/rq/default.nix | 10 +--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index 7d222e03bc97..68669e88516b 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, libiconv, llvmPackages, v8 }: +{ stdenv, lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "rq"; @@ -13,9 +13,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0071q08f75qrxdkbx1b9phqpbj15r79jbh391y32acifi7hr35hj"; - buildInputs = [ llvmPackages.libclang v8 ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; - postPatch = '' # Remove #[deny(warnings)] which is equivalent to -Werror in C. # Prevents build failures when upgrading rustc, which may give more warnings. @@ -23,11 +20,6 @@ rustPlatform.buildRustPackage rec { --replace "#![deny(warnings)]" "" ''; - configurePhase = '' - export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" - export V8_SOURCE="${v8}" - ''; - meta = with lib; { description = "A tool for doing record analysis and transformation"; homepage = "https://github.com/dflemstr/rq"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01284f66ba49..3a37d176d407 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8489,9 +8489,7 @@ in routino = callPackage ../tools/misc/routino { }; - rq = callPackage ../development/tools/rq { - inherit (darwin) libiconv; - }; + rq = callPackage ../development/tools/rq { }; rs-git-fsmonitor = callPackage ../applications/version-management/git-and-tools/rs-git-fsmonitor { }; From f3c271e797426a018d463cc487f48a9ca20f40e0 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Thu, 15 Jul 2021 22:01:32 +0200 Subject: [PATCH 53/59] dmenu-wayland: support cross-compilation --- pkgs/applications/misc/dmenu/wayland.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix index 8d77588ce8f1..6b8f92ddb1c2 100644 --- a/pkgs/applications/misc/dmenu/wayland.nix +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, cairo, pango, pkg-config, wayland-protocols -, glib, wayland, libxkbcommon, makeWrapper +, glib, wayland, libxkbcommon, makeWrapper, wayland-scanner +, fetchpatch }: stdenv.mkDerivation rec { @@ -15,9 +16,19 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config makeWrapper wayland-scanner ]; buildInputs = [ cairo pango wayland-protocols glib wayland libxkbcommon ]; + # Patch to support cross-compilation, see https://github.com/nyyManni/dmenu-wayland/pull/23/ + patches = [ + # can be removed when https://github.com/nyyManni/dmenu-wayland/pull/23 is included + (fetchpatch { + url = "https://github.com/nyyManni/dmenu-wayland/commit/3434410de5dcb007539495395f7dc5421923dd3a.patch"; + sha256 = "sha256-im16kU8RWrCY0btYOYjDp8XtfGEivemIPlhwPX0C77o="; + }) + ]; + postInstall = '' wrapProgram $out/bin/dmenu-wl_run \ --prefix PATH : $out/bin From 250247714d1e7380b0cb0964a14ecf4d15c18263 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Fri, 16 Jul 2021 21:48:57 +0200 Subject: [PATCH 54/59] charge-lnd: 0.2.1 -> 0.2.2 --- pkgs/applications/blockchains/charge-lnd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/applications/blockchains/charge-lnd/default.nix index cc0f801efd68..b2d28ed8942b 100644 --- a/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/pkgs/applications/blockchains/charge-lnd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "accumulator"; repo = pname; rev = "v${version}"; - sha256 = "0l4h3fdvln03ycbg3xngh8vkhgrz4ad864yyn4gmdjp0ypi69qa1"; + sha256 = "087y60hpld17bg2ya5nlh4m4sam4s6mx8vrqhm48idj1rmlcpfws"; }; propagatedBuildInputs = with python3Packages; [ From eb7b4bafc5ccbdfae02d733afcabafc874179d90 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 16 Jul 2021 17:13:08 +0200 Subject: [PATCH 55/59] runc: 1.0.0 -> 1.0.1 --- pkgs/applications/virtualization/runc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 8f7a88a21827..2e024c20f41c 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "runc"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "sha256-slNVSlyJLaqIFF4uJP/7u4M0AkJLQjqkHO5TeKFYgSA="; + sha256 = "sha256-xd46HlZenTNCzmnCGN3x7Ah8pPLwbG9LSMGmiPIPyv0="; }; vendorSha256 = null; From 6bc106b60447af44217ea6e112d3736cac00636f Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 16 Jul 2021 21:56:22 +0000 Subject: [PATCH 56/59] trezor-suite: 21.6.1 -> 21.7.1 https://github.com/trezor/trezor-suite/releases/tag/v21.6.2 https://github.com/trezor/trezor-suite/releases/tag/v21.7.1 --- pkgs/applications/blockchains/trezor-suite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 4bb5f1f7a6b4..8d2da4c36650 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.6.1"; + version = "21.7.1"; name = "${pname}-${version}"; suffix = { @@ -20,8 +20,8 @@ let url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; # sha512 hashes are obtained from latest-linux-arm64.yml and latest-linux.yml sha512 = { - aarch64-linux = "sha512-IxWiOJEk2PHdKf4QPHH9Y5rdyhKF3aQCHJe1crS4sYrE+4BLj3rFwRPIIGhJLqzqPyW24Hw/A4lnRnDd/UpsNA=="; - x86_64-linux = "sha512-pSJ+4y9v1ltXun3F4UyQoSTJdaFSelIHx49DBbd180MSbpETecVa7OFadKjlSUKD1sknNXG9MDb2hv7SRNdDYw=="; + aarch64-linux = "sha512-GEu1Zx3IQws8wsVsZUaIKvC0kTe8l/BBPSdu5q44tDpszmPugz8G/8FDAO/Ra50dzyiHhRheybZPuf2BBGGb7A=="; + x86_64-linux = "sha512-ghPbQa/MstzfUOWve1KNwB1t9dxK0+eYunBSoShWKpb85hgK69+ncTmhY8HejT28OkjFnGk6h4PWbrnQetj8MA=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 79a4590495310379f5e55f89296bf213da441427 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 10 Jul 2021 02:19:27 +0000 Subject: [PATCH 57/59] steamPackages.steam-fhsenv: fix Proton LLVM must match version required by Mesa. Fixes https://github.com/NixOS/nixpkgs/issues/127068 --- pkgs/development/libraries/mesa/default.nix | 1 + pkgs/games/steam/fhsenv.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index aaa78de47f75..725451da9435 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -220,6 +220,7 @@ self = stdenv.mkDerivation { passthru = { inherit libdrm; inherit (libglvnd) driverLink; + inherit llvmPackages; tests.devDoesNotDependOnLLVM = stdenv.mkDerivation { name = "mesa-dev-does-not-depend-on-llvm"; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index a0557eed9b12..b2c303caa54f 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -150,6 +150,7 @@ in buildFHSUserEnv rec { # dependencies for mesa drivers, needed inside pressure-vessel mesa.drivers + mesa.llvmPackages.llvm.lib vulkan-loader expat wayland @@ -157,7 +158,6 @@ in buildFHSUserEnv rec { xorg.libXdamage xorg.libxshmfence xorg.libXxf86vm - llvm_11.lib libelf ] ++ (if (!nativeOnly) then [ (steamPackages.steam-runtime-wrapped.override { From 79225c623d2f07f095251d3e509cc6a4cee6119e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Fri, 16 Jul 2021 22:31:43 +0200 Subject: [PATCH 58/59] vimPlugin.nterm-nvim: init at 2021-07-16 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index dfc5f19de1d2..9eb3b04dd7fd 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3406,6 +3406,18 @@ final: prev: meta.homepage = "https://github.com/chrisbra/NrrwRgn/"; }; + nterm-nvim = buildVimPluginFrom2Nix { + pname = "nterm-nvim"; + version = "2021-07-16"; + src = fetchFromGitHub { + owner = "jlesquembre"; + repo = "nterm.nvim"; + rev = "8076f2960512d50a93ffd3d9b04499f9d4fbe793"; + sha256 = "0z2d9jvw7yf415mpvqlx5vc8k9n02vc28v4p1fimvz7axcv67361"; + }; + meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; + }; + numb-nvim = buildVimPluginFrom2Nix { pname = "numb-nvim"; version = "2021-07-12"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3ed642d76e8d..022809367402 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -251,6 +251,7 @@ jiangmiao/auto-pairs jistr/vim-nerdtree-tabs jjo/vim-cue jlanzarotta/bufexplorer +jlesquembre/nterm.nvim jnurmine/zenburn jonbri/vim-colorstepper jonsmithers/vim-html-template-literals From bc5ce659230f89de933ea2dfb478440460728de0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Jul 2021 21:33:46 +0200 Subject: [PATCH 59/59] wolfssl: 4.7.0 -> 4.8.0 --- pkgs/development/libraries/wolfssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 4635a80152de..4c21eb274222 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "1aa51j0xnhi49izc8djya68l70jkjv25559pgybfb9sa4fa4gz97"; + sha256 = "1w9gs9cq2yhj5s3diz3x1l15pgrc1pbm00jccizvcjyibmwyyf2h"; }; # almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed