From 75e4aacfc553a76cf71bebcfbd414c0065c489ca Mon Sep 17 00:00:00 2001 From: oxalica Date: Fri, 19 Nov 2021 17:04:01 +0800 Subject: [PATCH 001/185] thunderbird: reintroduce buildconfig patch to reduce closure size This (partially) reverts commit 9ea377439ed377d61f9aad1df7e93ee3164beccd. (cherry picked from commit 7e899fd18e39b82ec29db402773bd595a7477b1e) --- .../mailreaders/thunderbird/no-buildconfig.patch | 13 +++++++++++++ .../networking/mailreaders/thunderbird/packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch new file mode 100644 index 000000000000..c4e29f6355cf --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch @@ -0,0 +1,13 @@ +Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. +--- a/comm/mail/base/jar.mn ++++ b/comm/mail/base/jar.mn +@@ -119,9 +119,6 @@ messenger.jar: + % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js + % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml + +-* content/messenger/buildconfig.html (content/buildconfig.html) +-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html +- + # L10n resources and overrides. + % override chrome://mozapps/locale/profile/profileDowngrade.dtd chrome://messenger/locale/profileDowngrade.dtd + % override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 30770390e6cd..09ce02a5bd65 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -18,6 +18,8 @@ rec { sha512 = "4938f676ddeeba37da1f2086d76a2ef2c870738169f7e10b35b83e4ed772df634825ee25c28232df1ac1e3a18a9466e97dc7ee318abbf43f1f4ce6479a13975b"; }; patches = [ + # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. + ./no-buildconfig.patch ]; meta = with lib; { From 6543d38122204029d54cf4020ef19789733b9362 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Sun, 21 Nov 2021 21:02:04 -0800 Subject: [PATCH 002/185] shaderc: include darwin libtool Signed-off-by: Ana Hobden (cherry picked from commit e86fa71ba6785a563ae3c8b7ce4c8cf72f6ce3c0) --- pkgs/development/compilers/shaderc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 40c216d79c34..54238348f06d 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3 }: +{ lib, stdenv, fetchFromGitHub, cmake, darwin, python3 }: # Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use # the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from # https://github.com/google/shaderc/blob/known-good/known_good.json @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers ''; - nativeBuildInputs = [ cmake python3 ]; + nativeBuildInputs = [ cmake darwin.cctools python3 ]; postInstall = '' moveToOutput "lib/*.a" $static From f16cbd579b4ede3f4b6d82af66cbfc383c595f3a Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Mon, 22 Nov 2021 09:42:23 -0800 Subject: [PATCH 003/185] libtool: add meta.platforms and make cctools Darwin only Signed-off-by: Ana Hobden (cherry picked from commit bcb0427773687c04ee2c1c59e30d86ca31ef8942) --- pkgs/development/compilers/shaderc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 54238348f06d..ae9d0f8810e6 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers ''; - nativeBuildInputs = [ cmake darwin.cctools python3 ]; + nativeBuildInputs = [ cmake python3 ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; postInstall = '' moveToOutput "lib/*.a" $static @@ -53,6 +53,7 @@ in stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; description = "A collection of tools, libraries and tests for shader compilation"; + platforms = platforms.all; license = [ licenses.asl20 ]; }; } From e3febdefff0a1e3ec7351c79c2ce31fb8765f3b9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:41:16 +0000 Subject: [PATCH 004/185] =?UTF-8?q?gnome.cheese:=2041.0=20=E2=86=92=2041.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/cheese/41/cheese-41.1.news (cherry picked from commit 763535823582f5072aafa1b1a73a212b6a10fe6f) --- pkgs/desktops/gnome/apps/cheese/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix index 38754a556938..a6d70d162c08 100644 --- a/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/pkgs/desktops/gnome/apps/cheese/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "cheese"; - version = "41.0"; + version = "41.1"; outputs = [ "out" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "EG8d9n4c9Bwqp5yZveZ2rskA2wNstSX6EIObBhh9Ivk="; + sha256 = "UilgyihzD/ZkOQcLBEGMngpLtVVg11v+CLIY2ixn5Uc="; }; nativeBuildInputs = [ From 1f4ebe2fb50e109ed83a7337aaf800179119ff26 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:42:40 +0000 Subject: [PATCH 005/185] =?UTF-8?q?evince:=2041.2=20=E2=86=92=2041.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/evince/41/evince-41.3.news (cherry picked from commit e102c85c09b6658f5574e403d0d9c1a3c24f7bfe) --- pkgs/desktops/gnome/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 45812dbc901a..eb85c97f9f21 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -46,13 +46,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "41.2"; + version = "41.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lautDW/urJVg2zq4C6fF6rsf3xyg47PJMzmvBUU6JNg="; + sha256 = "M0awH5vcjy1f/qkvEQoJDGSjYklCtbVDqtRZKp3jO7A="; }; patches = lib.optionals withPantheon [ From ec59583f67a6ee5b461e13a9ecca3484bc982457 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:43:33 +0000 Subject: [PATCH 006/185] =?UTF-8?q?gnome.gnome-flashback:=203.40.0=20?= =?UTF-8?q?=E2=86=92=203.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gnome-flashback/3.42/gnome-flashback-3.42.0.news (cherry picked from commit 1ad7180e2132dcbb5c11611eb2e84e7dd06c91b9) --- pkgs/desktops/gnome/misc/gnome-flashback/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 3df9d7450cd7..bd4bbbae13a4 100644 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -30,7 +30,7 @@ }: let pname = "gnome-flashback"; - version = "3.40.0"; + version = "3.42.0"; # From data/sessions/Makefile.am requiredComponentsCommon = enableGnomePanel: @@ -61,7 +61,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0fxv13m2q9z1q3i9jbggl35cb7jlckbdrfsr5sf030hr1w836gz0"; + sha256 = "1CcdwHrHOyceS07cgfMfZPVzGqbUSOehXX2TOXbc3Us="; }; # make .desktop Execs absolute From e08a3c268b012b82362eb8c66097645dc1bb7607 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:43:49 +0000 Subject: [PATCH 007/185] =?UTF-8?q?gnome.gnome-screenshot:=2040.0=20?= =?UTF-8?q?=E2=86=92=2041.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gnome-screenshot/41/gnome-screenshot-41.0.news (cherry picked from commit e9f6e6c49f279a405debe8c081ad5f887011fe21) --- pkgs/desktops/gnome/core/gnome-screenshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome/core/gnome-screenshot/default.nix index 5b02fda3e32f..ba6d05b3cbf8 100644 --- a/pkgs/desktops/gnome/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome/core/gnome-screenshot/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-screenshot"; - version = "40.0"; + version = "41.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${name}.tar.xz"; - sha256 = "1qm544ymwibk31s30k47vnn79xg30m18r7l4di0c57g375dak31n"; + sha256 = "Stt97JJkKPdCY9V5ZnPPFC5HILbnaPVGio0JM/mMlZc="; }; doCheck = true; From e096cdb68fa5a13d13f03fe36c8643916d3803c5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:44:10 +0000 Subject: [PATCH 008/185] =?UTF-8?q?gtk-vnc:=201.2.0=20=E2=86=92=201.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gtk-vnc/1.3/gtk-vnc-1.3.0.news (cherry picked from commit de1413c3966a74f01c8078519345727e59944b93) --- pkgs/tools/admin/gtk-vnc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 5e00e487e23e..060c95a8f767 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -15,6 +15,7 @@ , vala , gettext , perl +, python3 , gnome , gdk-pixbuf , zlib @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtk-vnc"; - version = "1.2.0"; + version = "1.3.0"; outputs = [ "out" "bin" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jmr6igyzcj2wmx5v5ywaazvdz3hx6a6rys26yb4l4s71l281bvs"; + sha256 = "X6qlgjuMvowLC6HkVsTnDEsa5mhcn+gaQoLZjPAKIR0="; }; nativeBuildInputs = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { vala gettext perl # for pod2man + python3 ]; buildInputs = [ From 24f8034f6c0a2aacaf5d6674f91cbc6b7116de6b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:45:01 +0000 Subject: [PATCH 009/185] =?UTF-8?q?gnome-builder:=2041.1=20=E2=86=92=2041.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gnome-builder/41/gnome-builder-41.2.news (cherry picked from commit 74a4876377281cb83b2e226e71f98069a4c9baf3) --- pkgs/applications/editors/gnome-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 38f38ae3a51b..1619ff1e6174 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "41.1"; + version = "41.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XVXkqqKkdYpGJj0cf9AJyz20RV4O1/nkTDoWNIYfo4o="; + sha256 = "VjF7Vn94Yd2gNzKVsk6U7fSRnMlV+0XtYqyllGIY4BI="; }; nativeBuildInputs = [ From 58e334144578578187fd942c4abed024ec19c3b8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:45:24 +0000 Subject: [PATCH 010/185] =?UTF-8?q?gupnp-tools:=200.10.1=20=E2=86=92=200.1?= =?UTF-8?q?0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gupnp-tools/0.10/gupnp-tools-0.10.2.news (cherry picked from commit c87458e0023129164af036bd5e6e97417f91884e) --- pkgs/tools/networking/gupnp-tools/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index cc547cfb7df9..c29d2c501df8 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , gupnp @@ -18,26 +17,13 @@ stdenv.mkDerivation rec { pname = "gupnp-tools"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "TqltFnRis6VI78T8TqCJ/lGNfSm+NJ0czomCuf+1O0o="; + sha256 = "beSe9LN1uKFk90t2YWixGE4NKBlrawek9TQfCN/YXWw="; }; - patches = [ - # Fix compilation with -Werror=format-security. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp-tools/commit/d738baae3bffaf6a8dfc12f5fe1ea13168fe2e48.patch"; - sha256 = "wrORH4y9Yb0YGAsjzoeN2MM07y9o+91kx078RH0G76w="; - }) - # Fix missing variable reference caused by the previous patch. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp-tools/commit/9b852d91175bc7607ad845459ba29d07a16fcbce.patch"; - sha256 = "WjEBN/+snJSIg4SUP5iChdj2auIyzePI0TH3Ilks7fk="; - }) - ]; - nativeBuildInputs = [ meson ninja From 128d5c0d1822f7824467bbf8b5c1f0f8f2006f06 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:45:32 +0000 Subject: [PATCH 011/185] =?UTF-8?q?libhandy:=201.4.0=20=E2=86=92=201.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/libhandy/1.5/libhandy-1.5.0.news Adds style manager but unlike with libadwaita, it is opt-in so existing apps should not be affected: https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/782#note_1257929 (cherry picked from commit e2b522ca015ce1e76232f690c37a3bc5fc717f1f) --- .../libraries/libhandy/default.nix | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index bb4b03515eda..0744ae30f344 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -9,10 +9,11 @@ , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 +, glib +, gsettings-desktop-schemas , gtk3 , enableGlade ? false , glade -, dbus , xvfb-run , libxml2 , gdk-pixbuf @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.4.0"; + version = "1.5.0"; outputs = [ "out" @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-JnbVH6H6QP3udJfT52P++hiwM4v/zS7jLn9+YzyIVEY="; + sha256 = "sha256-RmueAmwfnrO2WWb1MNl3A6ghLar5EXSMFF6cuEPb1v4="; }; nativeBuildInputs = [ @@ -64,7 +65,6 @@ stdenv.mkDerivation rec { ]; checkInputs = [ - dbus xvfb-run at-spi2-atk at-spi2-core @@ -84,12 +84,26 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; checkPhase = '' - NO_AT_BRIDGE=1 \ - XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \ - GDK_PIXBUF_MODULE_FILE="${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + runHook preCheck + + testEnvironment=( + # Disable portal since we cannot run it in tests. + HDY_DISABLE_PORTAL=1 + + "XDG_DATA_DIRS=${lib.concatStringsSep ":" [ + # HdySettings needs to be initialized from “org.gnome.desktop.interface” GSettings schema when portal is not used for color scheme. + # It will not actually be used since the “color-scheme” key will only have been introduced in GNOME 42, falling back to detecting theme name. + # See hdy_settings_constructed function in https://gitlab.gnome.org/GNOME/libhandy/-/commit/bb68249b005c445947bfb2bee66c91d0fe9c41a4 + "${glib.getSchemaPath gsettings-desktop-schemas}/../.." + + # Some tests require icons + "${hicolor-icon-theme}/share" + ]}" + ) + env "''${testEnvironment[@]}" xvfb-run \ meson test --print-errorlogs + + runHook postCheck ''; passthru = { From 4304d1e8524d8752028e14582c3d127a5f3f1e64 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 19:50:12 +0100 Subject: [PATCH 012/185] gtk4.updateScript: correct policy 4.5.0 is unstable (cherry picked from commit ad4ff3050df5292d8ab39e159dbe0f999a641d5a) --- pkgs/development/libraries/gtk/4.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 5a61b78d85a8..d763c99882e0 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -216,6 +216,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gtk"; + versionPolicy = "odd-unstable"; attrPath = "gtk4"; }; }; From f6e3df971faf33fe3ae8ffe84e9fc6ca8197047b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 16:29:53 +0100 Subject: [PATCH 013/185] =?UTF-8?q?debugedit:=20unstable-2021-07-05=20?= =?UTF-8?q?=E2=86=92=205.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://sourceware.org/git/?p=debugedit.git;a=shortlog;h=refs/tags/debugedit-5.0 (cherry picked from commit 0bbd6b822e1898a605c4d31683f7bcdcc4a41410) --- pkgs/development/tools/misc/debugedit/default.nix | 10 +++++----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/debugedit/default.nix b/pkgs/development/tools/misc/debugedit/default.nix index 0328d1f597b2..afac7168c5b3 100644 --- a/pkgs/development/tools/misc/debugedit/default.nix +++ b/pkgs/development/tools/misc/debugedit/default.nix @@ -1,8 +1,8 @@ #TODO@deliciouslytyped The tool seems to unnecessarily force mutable access for the debugedit `-l` feature {fetchgit, lib, stdenv, autoreconfHook, pkg-config, elfutils, help2man, util-linux}: -stdenv.mkDerivation { - name = "debugedit"; - version = "unstable-2021-07-05"; +stdenv.mkDerivation rec { + pname = "debugedit"; + version = "5.0"; nativeBuildInputs = [ autoreconfHook pkg-config help2man ]; buildInputs = [ elfutils ]; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchgit { url = "git://sourceware.org/git/debugedit.git"; - rev = "e04296ddf34cbc43303d7af32ab3a73ac20af51a"; - sha256 = "19cjkpzhdn2z6fl7xw8556m6kyrb7nxwbz2rmiv2rynyp74yg44z"; + rev = "debugedit-${version}"; + sha256 = "VTZ7ybQT3DfKIfK0lH+JiehCJyJ+qpQ0bAn1/f+Pscs="; }; preBuild = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9767edf86b51..5eed4b2023c6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -186,6 +186,7 @@ mapAliases ({ deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 deadpixi-sam = deadpixi-sam-unstable; debian_devscripts = debian-devscripts; # added 2016-03-23 + debugedit-unstable = debugedit; # added 2021-11-22 deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 deltachat-electron = deltachat-desktop; # added 2021-07-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98696a445cca..69429dcace5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4436,7 +4436,7 @@ with pkgs; debootstrap = callPackage ../tools/misc/debootstrap { }; - debugedit-unstable = callPackage ../development/tools/misc/debugedit { }; + debugedit = callPackage ../development/tools/misc/debugedit { }; deer = callPackage ../shells/zsh/zsh-deer { }; From 7233f09994c6e56c4a1ff388a9b020fff9766ea4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 16:27:40 +0100 Subject: [PATCH 014/185] =?UTF-8?q?flatpak-builder:=201.0.14=20=E2=86=92?= =?UTF-8?q?=201.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - https://github.com/flatpak/flatpak-builder/releases/tag/1.1.1 - https://github.com/flatpak/flatpak-builder/releases/tag/1.1.2 - https://github.com/flatpak/flatpak-builder/releases/tag/1.2.0 Move patches just after src Add debugedit dependency (cherry picked from commit bd9179343af415cf45656671d65f18c0e50ee2f5) --- .../tools/flatpak-builder/default.nix | 69 ++++++++++--------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index cc1a46c834b5..ce3420fd911b 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -21,6 +21,7 @@ , coreutils , cpio , curl +, debugedit , elfutils , flatpak , gitMinimal @@ -46,44 +47,15 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; in stdenv.mkDerivation rec { pname = "flatpak-builder"; - version = "1.0.14"; + version = "1.2.0"; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-abZa9PY4BBJ1GMVFGE+d/JqTWM3tqr7yseUGI64rjYs="; + sha256 = "sha256-38tqPKONYeB3W3CkaatQUoXhKTYUYt8JAE5tQlHCRqg="; }; - nativeBuildInputs = [ - autoreconfHook - docbook_xml_dtd_412 - docbook_xml_dtd_42 - docbook_xml_dtd_43 - docbook_xsl - gettext - libxml2 - libxslt - pkg-config - xmlto - ]; - - buildInputs = [ - acl - bzip2 - curl - elfutils - flatpak - glib - json-glib - libcap - libdwarf - libsoup - libxml2 - libyaml - ostree - ]; - patches = [ # patch taken from gtk_doc ./respect-xml-catalog-files-var.patch @@ -113,8 +85,41 @@ in stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ + autoreconfHook + # TODO: Remove older versions. + # https://github.com/flatpak/flatpak-builder/pull/437 + docbook_xml_dtd_412 + docbook_xml_dtd_42 + docbook_xml_dtd_43 + docbook_xsl + gettext + libxml2 + libxslt + pkg-config + xmlto + ]; + + buildInputs = [ + acl + bzip2 + curl + debugedit + elfutils + flatpak + glib + json-glib + libcap + libdwarf + libsoup + libxml2 + libyaml + ostree + ]; + configureFlags = [ "--enable-installed-tests" + "--with-system-debugedit" ]; makeFlags = [ @@ -125,6 +130,8 @@ in stdenv.mkDerivation rec { # Some scripts used by tests need to use shebangs that are available in Flatpak runtimes. dontPatchShebangs = true; + enableParallelBuilding = true; + # Installed tests postFixup = '' for file in ${installed_testdir}/{test-builder.sh,test-builder-python.sh}; do From c92cac02f47106f6ab375fa28e08a913c31ed71b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 21 Nov 2021 13:37:41 +0000 Subject: [PATCH 015/185] linux: 5.10.80 -> 5.10.81 (cherry picked from commit 06629bb117ff9cd4b5c79e5be6aa42f21fe981a3) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index ab9f11a57cce..d17bb34d2122 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.80"; + version = "5.10.81"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0ffvgxaq2ipylzavvgnnqk56pw2a6gy5zhhgdhsf8qs2cbvyhz27"; + sha256 = "1nssv94zivx08vrxxflq4dxk5fxl3azsqlnzvw58qnf469hniqd2"; }; } // (args.argsOverride or {})) From 6b174464a06a9f287bb417c15d83918c36929596 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 21 Nov 2021 13:37:50 +0000 Subject: [PATCH 016/185] linux: 5.14.20 -> 5.14.21 (cherry picked from commit df8b7f5d062bcd2bca30a7acf4661c7b69f73338) --- pkgs/os-specific/linux/kernel/linux-5.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix index 52ee895eb501..be5ca19bf359 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.20"; + version = "5.14.21"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0icb14xmwijcamqbnj3v16cl1awmjzhg9cniw5gwwk6la1d7aiwj"; + sha256 = "1cr381c179nfdrq95l4j56c4ygw09sxv493553ix4b80naf2a6pl"; }; } // (args.argsOverride or { })) From ee5389aa3c0b96e95ac3b0ce54a32c80e829361d Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 21 Nov 2021 13:37:56 +0000 Subject: [PATCH 017/185] linux: 5.15.3 -> 5.15.4 (cherry picked from commit d789aebb56279078206b021aed1e4b06427bf41a) --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 79df9a0fcdde..772c47916ac6 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.3"; + version = "5.15.4"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1rh5zkany0gxwha74l8ivb2psykp236h8q56plas7dc7hghxmwx9"; + sha256 = "1jnbk7mb3s5xc0a23qd07n28dls9y94cdv2bdy71bxk5bsvhz7al"; }; } // (args.argsOverride or { })) From 167cd2af042e27cc0b629666bb7adfa25dac02c8 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 21 Nov 2021 13:38:04 +0000 Subject: [PATCH 018/185] linux: 5.4.160 -> 5.4.161 (cherry picked from commit 392ccc54319d5330e43348e721c10a988e527be5) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 39f896b80351..a9063da41b82 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.160"; + version = "5.4.161"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0n04nlg44l7p855lxkdz80x2avwm1pmrx1761cjmqv4w1qlq1c6l"; + sha256 = "19rrz7fzka506bpgy229v1sbaxc2s609ldmxc2522y9h5aswcj9i"; }; } // (args.argsOverride or {})) From d2adbf2c4428c22286528699b6b93102cbfc9283 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 21 Nov 2021 13:38:16 +0000 Subject: [PATCH 019/185] linux_latest-libre: 18473 -> 18484 (cherry picked from commit 541a3a73327ae9a9169e67b586880198ce14faef) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 364a810f5ee7..f3f56f67d01b 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18473"; - sha256 = "0v30l950b35q4h6qb9p5x216ij4gd3cadf3fqb066wa34d4vx7yk"; + rev = "18484"; + sha256 = "0wyxpfzkpjwxsp4pqfjrpdr9vqgszsa31g1a5f9r7d1rkkw94f3s"; } , ... }: From be370c57199aa62a4ea9344543d5a280338e3768 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 21 Nov 2021 13:39:59 +0000 Subject: [PATCH 020/185] linux_zen: 5.15.2-zen1 -> 5.15.3-zen1 (cherry picked from commit ef17d66328a06fc0720f824feec382c8f0070b6b) --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index e259ec04f28a..a822f5d10805 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.15.2-zen1"; + modDirVersion = "5.15.3-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-6cYKlRAd8kbphIThmTdWieH322Rj1KSmCJCmYRt8o2w="; + sha256 = "sha256-GleOhTKLhnhepAlR+TkiCYcgEe5KfVvDKTPWP7/D8wQ="; }; structuredExtraConfig = with lib.kernel; { From ab7e5092b86613d9cb574bdb204048154f3ed9b2 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 19 Nov 2021 15:12:25 +0900 Subject: [PATCH 021/185] thunderbird-bin: 91.3.0 -> 91.3.2 (cherry picked from commit 5ba86837095dda9ff8d4cf494990eea1a33ae1c5) --- .../thunderbird-bin/release_sources.nix | 522 +++++++++--------- 1 file changed, 261 insertions(+), 261 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index d53bcda2a69d..95a5dda5ac3f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.3.0"; + version = "91.3.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/af/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/af/thunderbird-91.3.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "067592da3bdc40cb8a7d8f64e3c5d116575604f1305b8eac4b5b1cc7f79dccf0"; + sha256 = "a70d31f96a38b8a6b00378dad36a932da42e5cf42eb06bd607a164e288abae05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ar/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/ar/thunderbird-91.3.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "3a52d7c0e48496cd2259494196b0514412e922535877ddd322ceb82d02a47a39"; + sha256 = "7dd139bece8893dc9579286b3c1e7e16ab50b5fcc84779f99698b40bd39c3cb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ast/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/ast/thunderbird-91.3.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e07001f03b642887ae4a4e2415ce6bb50542d5af7cd8a9f0531081bb084e56eb"; + sha256 = "0bede384e4dfccc76975fd3e3dbc689f8567fd45e04fea8f1d8d07ac1e08cd6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/be/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/be/thunderbird-91.3.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "ae12e02ef735813f2f807a32b101ea8ac621bff3f01f4e4b3c5e0fa6c178b812"; + sha256 = "a3af4449763b93eb77cca28b0df8893960f673c57bfd8a1afa847b80d8c5e391"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/bg/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/bg/thunderbird-91.3.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "3892a660dcc417cbb951bd8362b8fdf06ef35606e98f121ea6f549646a0a8b89"; + sha256 = "c27164ddb394b0fff8e80a808696a9c2a1d01260a13985d75961071ebab6d3f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/br/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/br/thunderbird-91.3.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2fd0c6eca16a1435d0abd5d8fa66d68c8024f992ee57b741178c2d253f9bb7d7"; + sha256 = "774f03ee82577773a73e84fdd0cc9e3b44dd3379cefa24d98c2c55b5801cddaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ca/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/ca/thunderbird-91.3.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "45fa1b1e80b646af457b189e07fa13c8bee61df1d80066b0b3d65414a682e105"; + sha256 = "b4ad2a2158f21473877b59272d45410a759b626ad78e23d59ab027044fbca6dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/cak/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/cak/thunderbird-91.3.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "3211236401fbf52b6085c1fe7e82e081c2d7d4f13514b11ced5a483986dabecf"; + sha256 = "3bd57a316f11afe0ef6e8aca914b3366c989d88af043a4210ccdabb96dad9d7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/cs/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/cs/thunderbird-91.3.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "259bf43995f7990bd1ef78e030db88966688323f363f15af2065c7c551a9e6ae"; + sha256 = "d52ad37a9afd3a8fd382b1793739b92248cad9518d6d6e6a8da7615da44e8128"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/cy/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/cy/thunderbird-91.3.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "2e1719dc5b7c3687c390c7ac07ab0392a3e8f32624ebd40d2cf8208796da054e"; + sha256 = "b76c69828c516e1082d55c91be982df12ec8e5119b24d8b3d3d54199ed032f11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/da/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/da/thunderbird-91.3.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "49d8e99d05928d4678408a3b38da2f5c4915a802966c7328f4d410d5d0f7d82e"; + sha256 = "c21c50a458e482251b95d087215c500eb50160affc3c15248921eb783c102cb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/de/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/de/thunderbird-91.3.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "0059061919afe9a38a3647896693e4773c3656887657b761356ff698b839cef5"; + sha256 = "5c3c684eaceefbc6d12969d629a3b7bf71d1a1a028f4faba167cde98190bdd6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/dsb/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/dsb/thunderbird-91.3.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7ac2f44c66860967cabd64e94f0b104b2807f4b6297dd2ad828525962d8d5976"; + sha256 = "798af909549b6d21ac7cec66c52ca137b4e1fc132b7212aaefb6f2ffd56f83f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/el/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/el/thunderbird-91.3.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "3fcde9b4cac6c46a6be2fe15f200cde1f96b59732f1e87b5645538568969817f"; + sha256 = "f7ab1f1c5bb0ad942296f52c683f146fb656b9baff5b1457e552b9d8b817fcdb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/en-CA/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/en-CA/thunderbird-91.3.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "13e33af2f7c29f8bcc479a09b3f8ab82362c01984700c5371eb8c050ef0524b2"; + sha256 = "420067b22babc35fca02d3843dedf0b22a5ff637b696efc2fc4a4eeda2e9fd85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/en-GB/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/en-GB/thunderbird-91.3.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "94e8bf04d513caa7cd74c4e93851a59911352e666b7bf86c8a795d63177f2e0a"; + sha256 = "c4b52a08b7feea6c30b950e5b1cd9b2a73c5533b03d15596061e220568a9799b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/en-US/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/en-US/thunderbird-91.3.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a5cf280ad34305f7a83d331f554488c08e8c62acf2eb895ba7a6bcbc4aad3180"; + sha256 = "28a2a9f63a17f6343f884b8960019aa43c25e5b03f5f5d2e430aa2354a851730"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/es-AR/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/es-AR/thunderbird-91.3.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ae253fa8d23ee19105566a76be6ad4584ba2c5cb1eef6a3135d488109f25dea7"; + sha256 = "7b57ea2efcb26819c6634b8d5c1746d53422a6ccf2fc5c9c16f3366373d07f3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/es-ES/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/es-ES/thunderbird-91.3.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "1ede7664984d3ba3ba74163f58f02d5a982aa586c000a9d2b51efdb4b0b39210"; + sha256 = "754e6750a98ab5f28e33d494d00deae29a21d532a29e47742b22a407186a1e2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/et/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/et/thunderbird-91.3.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "93e29146782ccaa5ba9cc0b30f4f6273d8c57f39c678bc2dc825af5f46415ff1"; + sha256 = "e8f709c3e640191527f3e86b78550cf37688a06352650b3f358d18d0b4760cd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/eu/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/eu/thunderbird-91.3.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "ef431ab48190366acad917c5d8710e2df89ee31cf88ccfea206bfb49fbd2083c"; + sha256 = "64f66589f960cc3574e8d7fe0e73198d89d22a1d9cc927ca51469ad1314749a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/fi/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/fi/thunderbird-91.3.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e4fba7cbb9cdb515eb29757bbda8b3f1fd091a5c1a35d345b34c547002c44ab7"; + sha256 = "8bb8b200e9e1785d4e0545ba79f350eb49a744d8754eda2d802edb6ab6b77f54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/fr/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/fr/thunderbird-91.3.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "127de8d089c8ad535f2ca0dd60856a8822e8adffb3e5f3af868881c36e78da97"; + sha256 = "14c25e9bb2c9b33e82fb30138577494da5493aba56022509085441652d6269c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/fy-NL/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/fy-NL/thunderbird-91.3.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "28b4e3490105558c6fc47b9189451e0359f0ecfdaf9b40af173483cbef618981"; + sha256 = "572f68545c5ea7fa6760aef7bd474f434ec3e1bff5fd4d2d95d4e6fb33442464"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ga-IE/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/ga-IE/thunderbird-91.3.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "2b16e222cf5f9468bae76f1f3b7b0af8c7b6f8a7a9f263e9d1b1e9320e244fad"; + sha256 = "1b53bf57aba6885b84c19b3371833050966828ef389622ceaff6b42d1ee2dc19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/gd/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/gd/thunderbird-91.3.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "9368396e0ca3784201f3e2d2bf6c1c87d0d0dade72f96c450119929a4ae34ae5"; + sha256 = "a483426e49b78522b3c8894e5519747b6e016ff0f3418ae811c9604e7294b74e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/gl/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/gl/thunderbird-91.3.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "7c90a96061ae3d237636baaa4fe439ae47542d0880b81687bc3a5a9e40edded9"; + sha256 = "1dd9702ae44be14921671c16b5329e7e2dc7d6eaf428844441129dc2a0d53648"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/he/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/he/thunderbird-91.3.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "12e42b78aa9757b8274df1395667b89214d393a2dd5969b374a0bf5816f04f31"; + sha256 = "650abb7073b80adb79ab70462b8447fbbf57e1a683799ed1ed94ea964cdbe221"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hr/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/hr/thunderbird-91.3.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "f27542cf34fffd6aa71c479278b843ce435f4a8272130f7d8cde6f155e82b813"; + sha256 = "82c296083a2959375e17df6342528f2266b4e8ac6f93730f74cfb7e4e3982c55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hsb/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/hsb/thunderbird-91.3.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "f21bbe1720441392a276f3a2f6025da48f74efcfb7bfbe783f134be013874cf6"; + sha256 = "ebb8c7735502f7e2f476cc166341c39d51525fa32b9012d393e28bc1a093f1c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hu/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/hu/thunderbird-91.3.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "64b16f848c5a361d9709c2075fdf3ca4f7eb885f3f1cd9ec5acffc260b31982a"; + sha256 = "86975f13f69c499240ad12fbdc7bd36edc8f160b1632b29b1287498b8b96221d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hy-AM/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/hy-AM/thunderbird-91.3.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "da650d001f9b10227c5a5f5225725ef9085aa71f95dca0ffc4452fc2d6b48d90"; + sha256 = "80f70343153c66183cc549b93f90345fe53452c61f676c01f3651fc92d7263af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/id/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/id/thunderbird-91.3.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "12fcb1295b43b8bfd9607b819a78dd931c5efb092d6a5ddc70199c3625c4c033"; + sha256 = "a210ff5e680c60eb4777b50ea4f326e3534710b6f269f8469803821ba23ee4fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/is/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/is/thunderbird-91.3.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "48250a36caa8727b6e5bf1369199b4e202c7692ef62ffd97999b71a59c8182b8"; + sha256 = "fdd6a126ac887155670f817b432ef1ca143af379a1b33e49de7a857421a8c164"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/it/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/it/thunderbird-91.3.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "aebf9b22dd1af357fdd1709448d3d753319a2f817bc30ed15ba364c75fe5ec40"; + sha256 = "f0c0aa278eded34a9f42ee4cd5c8e6404448e7255cc08cb237448b9cdd4bf434"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ja/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/ja/thunderbird-91.3.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "3a1580283928525b20a163f13c4cb9554484823ddc28699a8d8879860ccf3a73"; + sha256 = "638de4c6608ba8a11ae5b382577d69fca1734758a3ff1531dd46425c53d331c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ka/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/ka/thunderbird-91.3.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "a2d2b5e2b884fa1b9547c76b9fce154431ef0db80af45379079f1c2d5c6d14b0"; + sha256 = "6d2d54d83c8ac86ee597cf50f7d361a81c91aed52ee0765f97dfcd2cf46c30c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/kab/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/kab/thunderbird-91.3.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0b909906f58125048fd4683946e62653b5c9064085b3f129b20d865c8463198b"; + sha256 = "b676d9d005c86be8fac271425583193f123e459dbe01d4f94ba61014c86ebffa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/kk/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/kk/thunderbird-91.3.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "5256b328a8920f01b5e93617c3e98a54e27094a383047df9a98f5ac50772e0fb"; + sha256 = "1da38b82624c6f0ce4912b19f89721f94198f4d687f773e980ab89ad657facbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ko/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/ko/thunderbird-91.3.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "445644ffbdff8af1910f664a9ed81512af95c9882f5b1ce1add02dac715ab0e9"; + sha256 = "736d2034353357067b8db31c20d7e828d78c1a164871bbdc2fe981cfa972b025"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/lt/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/lt/thunderbird-91.3.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "0b3dbd1b6e71036b64c98920ef755f418cf6c11feba93ba8d873d438a032bf87"; + sha256 = "e44ca65a140dc9d2bc9015ee21d03b95fba74d350de81e7864dbc391bd008151"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/lv/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/lv/thunderbird-91.3.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "2bc934ce28dd4775984ae2f4db79db54806b34fdb415ec4420ae3b8927fe10a5"; + sha256 = "befc625cf52baea4644c2b6db5d648a5970217539330bc9fb10600d8a1329aec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ms/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/ms/thunderbird-91.3.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e13dad427c8d0cb9aa79c48f4f8124ea996cabb34efdbd4ed8e90e233d00b6e2"; + sha256 = "6dcead2d35ef9b2ce6fe7729db4773f8ec6c91d1488af039f434da317e1fc618"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/nb-NO/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/nb-NO/thunderbird-91.3.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e984fe009aa98be81153b1285370fae6187705bfbfe652b3c45e83f5bb0070ca"; + sha256 = "570ef4140e196f30c2a61d8a9cf1e5dc5ed0826d4323c0186ca5571f92026eaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/nl/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/nl/thunderbird-91.3.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "55744aaba9ae0c282d7eeba0beae71101cdfbf689bbad8a6312af3f2abc41778"; + sha256 = "6a0bc25308550e9135439669a86d038443433c769298a5f011a730341eab7ba8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/nn-NO/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/nn-NO/thunderbird-91.3.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b404dfee5b164a0401da149c33535e51030b21da29fc97d1822bc82cec2b6808"; + sha256 = "8bf93992f564be4fc73be844482f5f00ec3441f9ad68f0b71b916c696dcfe385"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pa-IN/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/pa-IN/thunderbird-91.3.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "cb0bb35c9cbb31443658847bc49d29730b192b6a25875acceac3fa4fd7436edd"; + sha256 = "f3958c9a00594b5f3291787d2456be13662c3081ce295bd98dec506ea0d59d76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pl/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/pl/thunderbird-91.3.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "3a0ea72ba75230b4809901138350e0f13f981daaf590455aa75787cb107a0c24"; + sha256 = "3f7b1478bac86e988f7625f0d8e15359b5b6dbab26964c1718e15dfbf7737a2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pt-BR/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/pt-BR/thunderbird-91.3.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "8e9deefa5bb510e244d8c6416371e24a2f6c97548eda5a25bf03a7aa5d500b7e"; + sha256 = "6c6a8ece61dfc1b9d4209d6a0322395dbf6a30e0a57d248c1adc11705d7cc087"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pt-PT/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/pt-PT/thunderbird-91.3.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "753235eb471c7bb62f766baff612bd1df5926ff248ee174604496edb7c75546b"; + sha256 = "c05dd90a3fd612d5b36901b055bfd7dd001d2058bf4f48844bd79e7012129106"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/rm/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/rm/thunderbird-91.3.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a298343b057a4d25b89386cde253ddd897550250e81b8abd6a68ff240d41c600"; + sha256 = "26965f20e1c866d36ad321775076ba1d3d0171cf6e17a4b51b3a0122551f120f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ro/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/ro/thunderbird-91.3.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "df52bc68926b9239d3b26fbbfea3ec7aa98837296243325dfe153e9afea6a0fa"; + sha256 = "2d35b21e8d346781aabb8420ce5aab92e5860c43dc79ec93c508fb2a1e6daa2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ru/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/ru/thunderbird-91.3.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "001b1145aca605e8e5d72a1fda411546de1d2cb82f7be5626d5766018e1a692a"; + sha256 = "c58cfdace7e7d68a9f9e3f2f157effdf119de25788d2410dc2608f3eb7f2b44b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sk/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/sk/thunderbird-91.3.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "822e852ec3d2d5a50f042bd2e5b2ec6929441b8116a2cadf2369c769602b85b8"; + sha256 = "3db373c9d2a25e6b37351ad680c4a68576c00254f5a11f3d4b952bca0ce5817f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sl/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/sl/thunderbird-91.3.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "752538090cd3d72cb5d04cc9abf0b089e437a7726cf8eee27b5ebe2d63162b8c"; + sha256 = "fefcf1ed769fb6c49d0a0faa5f909a208351a9c033b7d318b600dcb3dad90c6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sq/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/sq/thunderbird-91.3.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a8548722e8c67da69c8f2e15855dd076b1435c5a1c6c34100dfae8de0eab7543"; + sha256 = "99be3d86aa1cf4c923d23df4d0be1524446c39769ab05fc2d08d7e247bb6c9af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sr/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/sr/thunderbird-91.3.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d6c86caa9b272b3281b9a3eea8ded13546f4d09518081feb3fd16b995955d6e7"; + sha256 = "8312687765087091e83e161f608514f44a119f25ba102abc58da940bd5fb6e28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sv-SE/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/sv-SE/thunderbird-91.3.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a5af37b0803881489bc775e25592901ca77de996b07c4df658f17a9b66c94fc2"; + sha256 = "a11af66be088c801c0921668132629487bbb8594d516ba44b47f0c1f03d50217"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/th/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/th/thunderbird-91.3.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "a0292086c9e9d0462118ca5945627bb04f8943e3afcdcf3da054ff52ccd45442"; + sha256 = "5c029101c30f62557013bb8d86d7d8264b630f9bcfa4f46eb0a6f03e864cdabf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/tr/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/tr/thunderbird-91.3.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "f02b7dde392fd77cde01a9ae860a46acf11554ec32d1b606c2a0145562bea1d5"; + sha256 = "c35c4375100e12595c3d5c6810f5f6c102f6d7f90894f101f9ee40c704d9faf1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/uk/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/uk/thunderbird-91.3.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "1cb2935c1517b10adb370ceea6866912656c668dd8e82abcfb0f59435a85a854"; + sha256 = "78e56e473be676e044a5e6022dc6ef218a89b9f222bd18af8f7e0ccd92361e43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/uz/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/uz/thunderbird-91.3.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "4ad88f7f036ec199bd69ab7628d2bdf2f162603e8290cc19e4ccd586bef691fb"; + sha256 = "6bdf37da688fd49460dae136b33c89ea87f2558a55ebffc778065a2f425ba941"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/vi/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/vi/thunderbird-91.3.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "538a9996a604d9464a6c1315c683d6bd80b585d3bcf59fa93272444c22fec59e"; + sha256 = "d0cfd6419636573ec2a3493c5776e08a19d943b3af985c4ecbf77b086cc7259e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/zh-CN/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/zh-CN/thunderbird-91.3.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "470123b053cab95930e8594684e65a656da032ea4e46aae4c325f119fbed4a46"; + sha256 = "567123c2337a5c38ae32cdff319dd4d8dd1a3dba5c1d3b7552a6a3229412f65b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/zh-TW/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-x86_64/zh-TW/thunderbird-91.3.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "cead4d02b5dd39dd146d1f2b28b61e5f30804018cd226d36e56bd39e010d82c5"; + sha256 = "264f159e077656e5b1eaca8e1680482b255f95e4951a3d4c3d4e5d9b965d7e72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/af/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/af/thunderbird-91.3.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "4ac3b8ea2e7371710b03beca630d409a7f3e101e267e15b2ef49004da728e021"; + sha256 = "5c8a4883d5cc671647d63b4c86af3eae5e5e7b3a2a13a83da23932d0d3470cb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ar/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/ar/thunderbird-91.3.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "545423946de595760829c2263b90f1ca2aef3ec576a28c96c37ec6bfc3269fd9"; + sha256 = "4ec73fd474418a391a7e89aad2cd200842b9c7057c57d5be6cb746d7d82973b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ast/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/ast/thunderbird-91.3.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1ff0fc8052bcb5c26396114be2ebce66e939cfe962c17807183ccb538dc29df1"; + sha256 = "c87b3d0da98ab808c897a53b30d169f283ce062b6209dcb52e496fde51db7e94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/be/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/be/thunderbird-91.3.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "079a3e51861d0396d89978b46bcbcc5d786b3b4d728064c7709aefb2ba95ba40"; + sha256 = "1ce44b1068706a536e6387b035717676b67002429163536aa34000206d29a5d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/bg/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/bg/thunderbird-91.3.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "04b095d3b52972e06324630b938cf703143158996036f1d338740e9058c666c5"; + sha256 = "07db4b60aab6db39fafaf79e7cca867bacf7b6d487990e5591022dc31a5049d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/br/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/br/thunderbird-91.3.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "82ad96bb61b2c170a0c750328b110772bff263493628c8a0c00396051a30ae4e"; + sha256 = "13653159296fe74943d450b8d17723604928dd50c0018ecc2493a2d029acf084"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ca/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/ca/thunderbird-91.3.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e5c4a5c5edbfc95e2dbbf331e8a794fdbef77e111da3b467d050571b6447ff70"; + sha256 = "e69c6635aa4cdcb69baa674c96501eae1c1cc74597dcc784e8d6a17c841e5cb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/cak/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/cak/thunderbird-91.3.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "4c99da8214856553fd01e4bea4c01945abe799280bf4e6da94e57b8c85e5e047"; + sha256 = "1f1906c1d4d0dfc5d931e1c0fa5340ec0ddd8a76421894a360331f3bf489a1ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/cs/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/cs/thunderbird-91.3.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "f7a9037ed7889f5de489f875611cf6a5d644b93f26b0dbddcb6e49b5f11ee2be"; + sha256 = "1a7047f1e0e0b00d083eae157f193bab3a131cd3aa4eca987734d23591c8e3d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/cy/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/cy/thunderbird-91.3.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "bba109d3b1ec5b5deeb7c8bd036260490252961c52855c4d879ddb73858a1110"; + sha256 = "7fb7cf862e04211ffdfe8a5c420e14aadff9126d9b3e295fdd2002fa0ad63bd2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/da/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/da/thunderbird-91.3.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "182600e06827d9abf7b8428e3dc883036119d23431923eb019b6a6dc197f7e28"; + sha256 = "6de68876808dad8158c4c200b393f2dbb4f2f84646c8f853a6582d3fb3bde964"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/de/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/de/thunderbird-91.3.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "24f69ecdf96f2823e709fe4ca6f48c2eca8b8574e8ff10e7ac48a78b8a847d76"; + sha256 = "1e49f4525c4ea9c17d820945699ef19859480a2bc9a25a1c35ef9dabe0387655"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/dsb/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/dsb/thunderbird-91.3.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9c7ea981a4d8ca2917fc160dbe5598b7bf8c63a9af4b3010cfa870632f4b8e7e"; + sha256 = "b9eea0acdcda32188e8f34bf8d3991afa08b83f0fd16bdd93dbf678186b2de10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/el/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/el/thunderbird-91.3.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e55668dac59dea1f5faddf0d2d63b223932a086dc79a577f2e811dba4b3e16d3"; + sha256 = "e21637237bb9965f7b7ffcb4e1cef0d187bdc704d2cc1761995717dbe6ccd425"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/en-CA/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/en-CA/thunderbird-91.3.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "b60e6106c054e8d1a107b5601fc96555024b3894334cc4f825a953bf4198e2b1"; + sha256 = "af24c26e60ff775294a07284685d5fea79c6211fd799d233bb53b4a9873140aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/en-GB/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/en-GB/thunderbird-91.3.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "c63b78c881f9c98523214d70053fbe25c84209ea17b634f51fabe47f7a68e700"; + sha256 = "398762b8970c7c6a45181a337028f40c0bda4cbc8bf4dd45c2974df281258938"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/en-US/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/en-US/thunderbird-91.3.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "2f43f460a7b31c128c8cdae2829bbfd82a5381854d722901e8c07843d73f5030"; + sha256 = "7d3d52a2d41e59661eaead112387df2bff0c0fef3df108cdeb79a8d0fdbf1064"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/es-AR/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/es-AR/thunderbird-91.3.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5bfdc77b75b5acfff4a013884298d68ba76946f6ded7b39d973c4a4a20f0c09a"; + sha256 = "56f2925f7b09bd5e5199e6703263f777cc23a8d6c44df719b5b7319d81784ff7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/es-ES/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/es-ES/thunderbird-91.3.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "5c793c8ba89d886a67ced4e6cd2271cbd9a516efc1bbf981e4b302ee4223dc37"; + sha256 = "13920c98c6fd346536ca6c207f424759cae980893eae499727ffa184fdb12254"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/et/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/et/thunderbird-91.3.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "548e4ff7682d36034dac4b82bee239ff5241b8605982d4ea3e21d59f43710888"; + sha256 = "5a2fbdf65990779043df86baa7575fa167381c188fd6c356ca644746c27f4abd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/eu/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/eu/thunderbird-91.3.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1c24768b70b1cd8310ed5bd9bc08aab036952c692ddb5cdda7e0605b61746713"; + sha256 = "775a7494e5fa5c322e0cb312ed1e04aafc1152858e77f20f0e24991c6368014f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/fi/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/fi/thunderbird-91.3.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "fdd4a914633aa6b1aeb4c737c63e7b0a39c60ab15b320ae37221c5a7eb273620"; + sha256 = "957c918a564aed43b3f2c519800a2bdbf6b3f23bcbaeed93fe811c351d3cd034"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/fr/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/fr/thunderbird-91.3.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "b582ff509cea4bfcdafa4b260db4831565ea60b7ac64e3163c9a43814790277b"; + sha256 = "90d4e4781e34006d6eaec876c020c4adf9b1f5c2b19ccc76abbbfbd66c3a2394"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/fy-NL/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/fy-NL/thunderbird-91.3.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "61fa2a02f179e50d9d4bf43cf037a6b545982ee479f7c8f040ca57fc2586ed2f"; + sha256 = "64887092d6a6dadf68b49d722b30d16305f950d77275caca7491bf1b9ab79fce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ga-IE/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/ga-IE/thunderbird-91.3.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "c0651a533f2690ad17b336e4de840932c4711e10fec64b80f2fec18d0449f1dc"; + sha256 = "a48d4c0efaf448c0a69e499bf38b2fb42ca463d32d3daa3601a24be8f27eace7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/gd/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/gd/thunderbird-91.3.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "49f7b349a5d55ccbcdeb2ca464aac2ff6c0712b6ea1e8f124ca7562913e8c633"; + sha256 = "e854d7767974f988cf070024c2f6f488b3e41f11270db7b6954e1d53bf8f1d4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/gl/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/gl/thunderbird-91.3.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "04eca02158c56920f08368bb78ce7affaaa3d6793e6a3361b41e3c8856804130"; + sha256 = "efed9640f721943b2a20c6163cb4516e511b2eff83e5e6384b89fc0c868c834e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/he/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/he/thunderbird-91.3.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "150ea785d46bb8debe554533edd53abc2a5711ddf64268f4479dc0eda2e85be9"; + sha256 = "8a4ea334d62e68d0bec90b370bd66212832a9ed0f411844cb7e69b9a4d08282d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hr/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/hr/thunderbird-91.3.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "d837a407f1a117299a7540fd718f4f7cffdf056871ba5f1adf09da5ecd84eb23"; + sha256 = "3169c8140ec0196ccf157a8c43ce60755fd7c8cf9fdd74856e5419d6020ff972"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hsb/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/hsb/thunderbird-91.3.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d7e3e2287a2218f80f055c450b67ece63ae97320eef1dca77cd153a2106d4bc9"; + sha256 = "3a614222620f18a5def28a4526b896fef0c2e23b4f3e72eb47739102492c6213"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hu/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/hu/thunderbird-91.3.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "157a156e393b5a69a326aa0e9be02bd2ae3bd48433382a803ccb9c5c354ed498"; + sha256 = "5fcd243813e91b58991f1329944c1f06e4801d6a081760580127f4bef92a7113"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hy-AM/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/hy-AM/thunderbird-91.3.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "bbb783688762040579258fd8650124770f2a1b6ab8dd050df5c8e0bb057510ff"; + sha256 = "8693c2571c07569716c7faf8dbd5ee21eb71905cc57910d71fb9eb5fe1d43740"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/id/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/id/thunderbird-91.3.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f14f33e5c8de0e59839654fd472ca20f592669bd739097831e011b3ad6ca3e3d"; + sha256 = "c46e09013fb7c9213efbe61c97261a29d38777ede62236ad98d9e25997248806"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/is/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/is/thunderbird-91.3.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "5a6be55557ef79101cf61c4fa684a52be1afa1a972a69e02998a35cbfd3212a3"; + sha256 = "90001ba6e09cd00f252adf9dfebd58576b47fb0b383150168c61a47f57526bd6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/it/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/it/thunderbird-91.3.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "565299abc53960d3bb7c2a4abac86c2f5864a089aa4b908aceab20651b6d4c25"; + sha256 = "71797daf54b46050500115144424a132d0c711a54e1bb32199f2e25965920c77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ja/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/ja/thunderbird-91.3.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "03244c4102177b81ad105ca31790000314c35813e6fa2efa2020b99b4ac45391"; + sha256 = "ff58765bb7b6e0fdf3fa3a7d7e097449389b8dfbcb38e0cfcca7b13026dab734"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ka/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/ka/thunderbird-91.3.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "2640b2cab838dea0f2252898302fe0008c2b3807da4c8c45224047a7975b9461"; + sha256 = "562c18c4425a5a96b0d33db351ef9a52fc3ef62620ef69214495379968a23ebc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/kab/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/kab/thunderbird-91.3.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "083cd62d42936adeb069b620b19c7a66f761c40c82b56205626b9e1a6364b64d"; + sha256 = "2cb41161e854c99f8c0acebfc5d5e139ebc13810d811e1f891e33d62c9965cd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/kk/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/kk/thunderbird-91.3.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "8a973b47dfbe996d8e7dc894bb0cc0b473743eec0caf05f11646b3552c287516"; + sha256 = "787c790f370f73c6f9ac9f7967c564ffbffa2da1a6d8fbc40d8d99cc347b9e78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ko/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/ko/thunderbird-91.3.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6f7a992d226028a6398932c8bcaf9d522ff72cfbb60336875b83e74d22564967"; + sha256 = "d473666c5c611979edcbc8a6422e2f0bef71bee3365909f4473665b95e243fc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/lt/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/lt/thunderbird-91.3.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "76cda4386e76388de5d0b660541f1ae5c40ef31609c329226e07573265b34c05"; + sha256 = "dfb95387dba85efee4a0d145dfecdf0832cb8933fb58a3e6fe9ed97acf5fe31f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/lv/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/lv/thunderbird-91.3.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9bc2b1358965e4bdaf875625296d2e40bc6f21709237b38011f82169937cf022"; + sha256 = "c250c5f4ffdcbe40787997abe8b73d40daf2bd5e1478bf91dd75d1522a2ca9a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ms/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/ms/thunderbird-91.3.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "5860567197e95c1fbca7585796b34adaf453923be9e726ea33e54e390a7e800f"; + sha256 = "50c335ce7f2d6dba9b8535ad438ded937c6840fe9269488bfc71bbedf60c6211"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/nb-NO/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/nb-NO/thunderbird-91.3.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "5b50ebc02d93303547704312f11e10a5470bcc116da55573f6d256ec90e5d5cc"; + sha256 = "0ac72610d7575ac04d863c5b5f06c333bc0c2b3756f12cc7bded800e6f3b2643"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/nl/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/nl/thunderbird-91.3.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "99756c19427ab548d6cd64a5805549ed51af95e41eaa97eff821bfea2b3691ee"; + sha256 = "bec70ac869333d45d71804f93607a211c3678a4038e8898d1da013b38872a306"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/nn-NO/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/nn-NO/thunderbird-91.3.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "2888793a3490fbebd2148128662a63a7a482c7d770e8e4c4be3e725af5eb5c1c"; + sha256 = "ef1909585360519b82df7042e399eb12a7a406186d8b0314e6cc08b1f424182e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pa-IN/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/pa-IN/thunderbird-91.3.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "a4d6ffa089fc309e208508986f91283a6c839f8cee109e073d3d6a0d25397292"; + sha256 = "e5799748d783d2931ccd8923c870aa0f866a807425aa62b8dfeef817b73b1f02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pl/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/pl/thunderbird-91.3.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "7a9f677c39700e7b1212047327f1b080004c42c3094eb4bf7a487b39a65458df"; + sha256 = "164569c0cc0331d009c5066082e7ece6b189ef1c4d2577a2d569d07df47a52ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pt-BR/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/pt-BR/thunderbird-91.3.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0967d12e7cd9d2fd4d55dc75bfb02fb07ca61c60d2f0ccb295b8c264cb565957"; + sha256 = "5c908e43e9eb83f199e831858eef687b7cb5e10867f7b00dd0c640d9e7f00031"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pt-PT/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/pt-PT/thunderbird-91.3.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "1be6b84a42c215928de2dbb36bd9e0f01303eb1ba4224126c12a98205316746c"; + sha256 = "52f0d5ae52f55be14379fde304d3552d10811a8cb4a76123f724c789e122f5d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/rm/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/rm/thunderbird-91.3.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "54b4f955412f9c53d37188f42be5a7cc8ee1357458171d6134299145acde76d5"; + sha256 = "a5dda05e61c785330e039d950969a507962af9e5665dd6bfa0ee203754be5da3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ro/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/ro/thunderbird-91.3.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4f31a0eeafbe516c93b00b5ac5e7b06a35db471a19965955b8f25713984b7b9a"; + sha256 = "96819f82155eb1c64a113b988ad1975e67552c5bc7fe9a7a4ac100f08c6bf114"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ru/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/ru/thunderbird-91.3.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "247c78a1dc8d6013744de242efc6ddac6f2f3d10d86e1348769e90124f5eb6df"; + sha256 = "a8de715e4f66b0198c8b65c845354100e34040248edd07ba1cfc863163ff6588"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sk/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/sk/thunderbird-91.3.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "73b69b08de497cc2c5e50e7226b7c6de61546b1198a6757b8a63c6399fd2a9e9"; + sha256 = "3d28e2b10458f74d33d08ac1a0a806d897224bab9beff91ba805c4949b8ea3e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sl/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/sl/thunderbird-91.3.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "3d822e2c79d38e26353cb8810b8468580d2157b62aadcfca1d96874bb7ee0681"; + sha256 = "fb32dba75c5e486daf28cbe25b63315aed05e621851fc2ace0a08c38e69780ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sq/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/sq/thunderbird-91.3.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "c8e185af246c6059e85554968fa91c1ff0477e824fdf05d1860dc36ff7dd8a47"; + sha256 = "c71dc09fc91441f1a7f79aa7766ce0629736cbf5d23fd415700ee54e7e13c7b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sr/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/sr/thunderbird-91.3.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "61da012cc5aa8dab7855deef3f26c20efdbca12c788caede60a4825289850b72"; + sha256 = "24bac0610ed6429ffac5ee1ace6f329892fd98f93636d8f7b520b5884ec4c8ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sv-SE/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/sv-SE/thunderbird-91.3.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "064e2ca29bd5c1d63bae872d4419b537d5a75bec75a602847a115da15a0dcfae"; + sha256 = "eed59aefedee4c5d4c32d7d24d515cbda60b5878dd0f2c8f93afe2e0f229b9e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/th/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/th/thunderbird-91.3.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "791adf04802aca3323c4a7659a83ca3affa9b93c1ae9a011447d6ad638f256df"; + sha256 = "14bf5e07c1007333bc2e4253a6b544923c16c1fe9fe6747ed23bc011b0491221"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/tr/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/tr/thunderbird-91.3.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "494fa955b325df483902df74c99e0a5a24c50670bcac7f62d5da5989b4c3555f"; + sha256 = "dbb53e36119930de82a4c930c14441acdfb55870921c71b7c7239d87ad27d9bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/uk/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/uk/thunderbird-91.3.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "aaf7fd5dd2c2ad95cf0ea5333a59e6f953e36ad2b19b0a24cd42075ff6a96e44"; + sha256 = "002ec936c48930459152d936e8a17a5e86926b576e5266eda2471cfe73a6002a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/uz/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/uz/thunderbird-91.3.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "5ae7dee3ae3c33a0278c5b10401be741ed91d2cef3d00c9e6686d065830e0f32"; + sha256 = "6f8b933a9a496fd272599525ac9cf398bee9371eb255fed0799f2ce1782ca553"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/vi/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/vi/thunderbird-91.3.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "455183213bfc0936a71c3f8fd35d4b753cfafb5c72df514232df97b2af75f10f"; + sha256 = "c08059d319ed8b3ef54125da8e6f9cf54595c3ff2ce67ab6fe2e5ff47358f777"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/zh-CN/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/zh-CN/thunderbird-91.3.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "13b600caa35aae9e6d82b7969afeb6951f2d2824a4c5af33eecf7b004e421ebd"; + sha256 = "6a0901e0a0e120bbb9c2982f528f2ad169c564b843281877b03af9efe40ff78e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/zh-TW/thunderbird-91.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.2/linux-i686/zh-TW/thunderbird-91.3.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "4f01236b849f03599df14efc1f4cf7519077b72697758f41c69ce84a084ac37e"; + sha256 = "aeb8baa985dae521b4a0b77e3e6730c6d614da51f2d77ae2531ab1c89d346ef7"; } ]; } From 797f561ef06563bb7321fa68732d1232a9989b05 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 19 Nov 2021 15:12:44 +0900 Subject: [PATCH 022/185] thunderbird: 91.3.1 -> 91.3.2 (cherry picked from commit bdae026114bd0fd2e691e61bfdb1f99dd42b8224) --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 30770390e6cd..0d0fc3c8f49e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.3.1"; + version = "91.3.2"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "4938f676ddeeba37da1f2086d76a2ef2c870738169f7e10b35b83e4ed772df634825ee25c28232df1ac1e3a18a9466e97dc7ee318abbf43f1f4ce6479a13975b"; + sha512 = "954be27795935e494d27d57da99b49ff61db8a2b26fa8e159a30d6c272033b015790735b40129d7de94f861af23cf748f88a7a45df3861f753d6e15d28fb366c"; }; patches = [ ]; From 3d82502f2f1b67f202bcef998f3e35fed3d22ec2 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 22 Nov 2021 23:24:50 +0000 Subject: [PATCH 023/185] python3Packages.cwcwidth: fix tests on darwin use the same locale settings used by upstream's CI: https://github.com/sebastinas/cwcwidth/blob/2bc4360474b524148ffde3c8b837cbb0a4f172f5/.github/workflows/build.yaml#L33 this has the effect of skipping some otherwise-failing tests on darwin. seems slightly counterproductive but who am i to judge? (cherry picked from commit 62b8957343e50cf50893ae58aaec623aeec9c39a) --- pkgs/development/python-modules/cwcwidth/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix index 940d41129e57..ede96fc3b41d 100644 --- a/pkgs/development/python-modules/cwcwidth/default.nix +++ b/pkgs/development/python-modules/cwcwidth/default.nix @@ -13,12 +13,17 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; checkInputs = [ pytestCheckHook ]; - # Hack needed to make pytest + cython work - # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 preCheck = '' + # Hack needed to make pytest + cython work + # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 export HOME=$(mktemp -d) cp -r $TMP/$sourceRoot/tests $HOME pushd $HOME + + # locale settings used by upstream, has the effect of skipping + # otherwise-failing tests on darwin + export LC_ALL='C.UTF-8' + export LANG='C.UTF-8' ''; postCheck = "popd"; From 26981cc3458b618b4f6c1d7f5bf7bc2217cc9dfa Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 23 Nov 2021 19:07:51 +0300 Subject: [PATCH 024/185] nnn: 4.3 -> 4.4 (cherry picked from commit da3825a61fb437aaeeb631278f6749c9e3300f57) --- pkgs/applications/misc/nnn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 8999c3b8f95e..8ea024320c3e 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; - version = "4.3"; + version = "4.4"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kiLmdEyOnD1wPS2GuFF5nTK9tgUOI6PVCzCRZXdObEo="; + sha256 = "sha256-g9GaCc/IWKtih0/A2AZEPImjj7ymJIdYwC5I/6GUh5c="; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); From 958c7f0e501684b9e5c0bda2c8c5826e025a92e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Tue, 23 Nov 2021 14:09:22 -0300 Subject: [PATCH 025/185] python3Packages.detect-secrets: fix disabled tests and build on Darwin - Clone the sources and leave the .git directory, and add Git to checkInputs to fix several failing tests (they use Git commands and expect to be inside a Git repository). - Exclude a test failing on darwin. (cherry picked from commit 29185d80e9865db0f522bd5f10c998299dbbae66) --- .../python-modules/detect-secrets/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix index 2e07f98d78dd..ef19b9a913b0 100644 --- a/pkgs/development/python-modules/detect-secrets/default.nix +++ b/pkgs/development/python-modules/detect-secrets/default.nix @@ -4,6 +4,7 @@ , gibberish-detector , isPy27 , mock +, pkgs , pyahocorasick , pytestCheckHook , pyyaml @@ -21,7 +22,8 @@ buildPythonPackage rec { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dj0lqm9s8OKhM4OmNrmGVRc32/ZV0I9+5WcW2hvLwu0="; + sha256 = "sha256-dG2YaWXAMINxBGKNMlVfGTR9QHdnepiZmN+G88X4Wak="; + leaveDotGit = true; }; propagatedBuildInputs = [ @@ -36,6 +38,7 @@ buildPythonPackage rec { pytestCheckHook responses unidiff + pkgs.gitMinimal ]; preCheck = '' @@ -44,24 +47,15 @@ buildPythonPackage rec { disabledTests = [ # Tests are failing for various reasons. Needs to be adjusted with the next update - "test_baseline_filters_out_known_secrets" "test_basic" - "test_does_not_modify_slim_baseline" "test_handles_each_path_separately" "test_handles_multiple_directories" "test_load_and_output" "test_make_decisions" - "test_modifies_baseline" - "test_no_files_in_git_repo" - "test_outputs_baseline_if_none_supplied" + "test_restores_line_numbers" "test_saves_to_baseline" "test_scan_all_files" - "test_should_scan_all_files_in_directory_if_flag_is_provided" - "test_should_scan_specific_non_tracked_file" - "test_should_scan_tracked_files_in_directory" "test_start_halfway" - "test_works_from_different_directory" - "TestModifiesBaselineFromVersionChange" ]; pythonImportsCheck = [ "detect_secrets" ]; From 47c620a4de5173b8557391739d50646ce351c0bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Nov 2021 16:20:58 +0000 Subject: [PATCH 026/185] pipenv: 2021.11.9 -> 2021.11.23 (cherry picked from commit 66c2813707e7af894effec56f506b9100fa215b4) --- pkgs/development/tools/pipenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 67f6b3a76f3b..1c09bb502a23 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -18,11 +18,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2021.11.9"; + version = "2021.11.23"; src = fetchPypi { inherit pname version; - sha256 = "7662399162bc887ee86e96d0baa6984236228af9c1fd6594be0b18910225579d"; + sha256 = "1bde859e8bbd1d21d503fd995bc0170048d6da7686ab885f074592c99a16e8f3"; }; LC_ALL = "en_US.UTF-8"; From 2e717b5f1ea876d9594839ab874eba8259cf3a55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Nov 2021 16:41:57 +0000 Subject: [PATCH 027/185] actionlint: 1.6.6 -> 1.6.8 (cherry picked from commit c9012aa712bcbfdaeb24a3730d7057df8a38a7f7) --- pkgs/development/tools/analysis/actionlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 137c966349ca..7b525b412054 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.6"; + version = "1.6.8"; subPackages = [ "cmd/actionlint" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "17c6952cjdpbl70lnn34pl3njrvpqmdbgnrm1q69kx94bni1slnz"; + sha256 = "sha256-wjLY40bxpoMk6YIG/4KbjxSWUDVNn3cX5OcsgfEPjzk="; }; - vendorSha256 = "1i7442n621jmc974b73pfz1gyqw74ilpg1zz16yxqpfh5c958m7n"; + vendorSha256 = "sha256-J/DlugisnCvbYpqMQuyISyiKHB0hepHrQKsnzSes2zs="; nativeBuildInputs = [ ronn installShellFiles ]; From 2d123c144f49fe4b66518989fe9739775d046654 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Tue, 23 Nov 2021 11:40:45 -0300 Subject: [PATCH 028/185] xmrig-mo: 6.15.0-mo1 -> 6.15.3-mo1 (cherry picked from commit 41cb4807ae0d23a1ec34d63a9f17b17518fc228c) --- pkgs/applications/misc/xmrig/moneroocean.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 431aac070f24..8e6f1d9b6fc7 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.15.0-mo1"; + version = "6.15.3-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-2JT315JbjiU8gAwROZL820MYC/v3MPtJVsN+vsf4KDQ="; + sha256 = "sha256-oR9zn73tAgn98tZKvP+2kU1imUKvLz0oNYF+fwFvIA0="; }; meta = with lib; { From d105db9b883a448ed0e31fc29454230a971ca475 Mon Sep 17 00:00:00 2001 From: leo60228 Date: Tue, 23 Nov 2021 11:16:00 -0500 Subject: [PATCH 029/185] dolphin-emu-beta: add update script (cherry picked from commit 8de1b1bd48a6ac9d7c23cdff34bbe2b962339c26) --- pkgs/misc/emulators/dolphin-emu/master.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index d5133c8618d7..4ce9b2934319 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -2,7 +2,7 @@ , wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsa-lib -, miniupnpc, enet, mbedtls, soundtouch, sfml +, miniupnpc, enet, mbedtls, soundtouch, sfml, writeScript , vulkan-loader ? null, libpulseaudio ? null # - Inputs used for Darwin @@ -64,6 +64,17 @@ stdenv.mkDerivation rec { install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules ''; + + passthru.updateScript = writeScript "dolphin-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + set -eou pipefail + json="$(curl -s https://dolphin-emu.org/update/latest/beta)" + version="$(jq -r '.shortrev' <<< "$json")" + rev="$(jq -r '.hash' <<< "$json")" + update-source-version dolphin-emu-beta "$version" --rev="$rev" + ''; + meta = with lib; { homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; From 24080a4660aba0f6d984dd12b5eab294b44d6607 Mon Sep 17 00:00:00 2001 From: leo60228 Date: Tue, 23 Nov 2021 11:17:59 -0500 Subject: [PATCH 030/185] dolphin-emu-beta: 5.0-15260 -> 5.0-15445 (cherry picked from commit c21b630d01e631676bb3c9416d8d31b6a542161d) --- pkgs/misc/emulators/dolphin-emu/master.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 4ce9b2934319..1afa97611719 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-15260"; + version = "5.0-15445"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "207c931a04c8e2629a735bc2b3f36b5c89365ca7"; - sha256 = "15r9syk7f62h16klcznw7css6sng8nqkkz4d1qr8d988rdfaiypx"; + rev = "db02b50d2ecdfbbc21e19aadc57253c353069f77"; + sha256 = "l2vbTZOcjfyZjKOI3n5ig2f7cDYR22GcqKS479LMtP8="; fetchSubmodules = true; }; From 036895751d4e15da2e864705bebf6b1c5639a394 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 02:56:02 +0200 Subject: [PATCH 031/185] [Backport release-21.11] Revert msize related commits (#147212) Co-authored-by: Artturin --- nixos/modules/virtualisation/qemu-vm.nix | 2 +- nixos/tests/hibernate.nix | 1 - nixos/tests/installer.nix | 6 +++--- pkgs/build-support/vm/default.nix | 11 ++--------- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 493c407222f7..91356ac1d984 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -306,7 +306,7 @@ in virtualisation.msize = mkOption { type = types.ints.positive; - default = pkgs.vmTools.default9PMsizeBytes; + default = 16384; description = '' The msize (maximum packet size) option passed to 9p file systems, in diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index fc6857e2fd02..4f05b99a5a11 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -51,7 +51,6 @@ in makeTest { connect-timeout = 1 ''; - virtualisation.memorySize = 2048; virtualisation.diskSize = 8 * 1024; virtualisation.emptyDiskImages = [ # Small root disk for installer diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 0748a74ee176..513d2506e941 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -76,8 +76,8 @@ let def assemble_qemu_flags(): flags = "-cpu max" ${if (system == "x86_64-linux" || system == "i686-linux") - then ''flags += " -m 1500"'' - else ''flags += " -m 1000 -enable-kvm -machine virt,gic-version=host"'' + then ''flags += " -m 1024"'' + else ''flags += " -m 768 -enable-kvm -machine virt,gic-version=host"'' } return flags @@ -288,7 +288,7 @@ let # builds stuff in the VM, needs more juice virtualisation.diskSize = 8 * 1024; virtualisation.cores = 8; - virtualisation.memorySize = 3096; + virtualisation.memorySize = 1536; # Use a small /dev/vdb as the root disk for the # installer. This ensures the target disk (/dev/vda) is diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 3f176db36c2b..7b517333d9e3 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -110,7 +110,7 @@ rec { echo "mounting Nix store..." mkdir -p /fs${storeDir} - mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose,msize=${toString default9PMsizeBytes} + mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose mkdir -p /fs/tmp /fs/run /fs/var mount -t tmpfs -o "mode=1777" none /fs/tmp @@ -119,7 +119,7 @@ rec { echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg - mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=${toString default9PMsizeBytes} + mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L mkdir -p /fs/proc mount -t proc none /fs/proc @@ -1174,11 +1174,4 @@ rec { `debDistros' sets. */ diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns; - # The default 9P msize value is 8 KiB, which according to QEMU is - # insufficient and would degrade performance. - # See: https://wiki.qemu.org/Documentation/9psetup#msize - # Use 128KiB which is the default in linux 5.15+ - # https://github.com/torvalds/linux/commit/9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe - # TODO: actually set it to 128KiB, it was causing failures in many tests due to memory usage - default9PMsizeBytes = 16 * 1024; } From 7eefdd54ad5b58e27581c06cdfc8f68d0505f9dc Mon Sep 17 00:00:00 2001 From: Vika Shleina Date: Wed, 24 Nov 2021 02:07:30 +0300 Subject: [PATCH 032/185] mariadb: fix build on non-x86_64 linux pmdk is only available on x86_64-linux, yet included in other platforms. Things tested: - build on x86_64-linux is the same (substituted from binary cache) - build on aarch64-linux doesn't crash now with an "unsupported system" (cherry picked from commit ccb2baa61514310f5b6948d125a2596a35f51f69) --- pkgs/servers/sql/mariadb/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 41b7bc383b60..82fdc2a3a38b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -164,7 +164,8 @@ server = stdenv.mkDerivation (common // { bzip2 lz4 lzo snappy xz zstd cracklib judy libevent libxml2 ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl - ++ optionals stdenv.hostPlatform.isLinux [ linux-pam pmdk.dev ] + ++ optionals stdenv.hostPlatform.isLinux [ linux-pam ] + ++ optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv ++ optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]; From 88c4b8a26fb5c3450cad99a9f62df45bb0bd8c87 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 23 Nov 2021 22:12:05 +0000 Subject: [PATCH 033/185] python3Packages.datatable: fix for non-x86 (cherry picked from commit 764aa245e17da3451abfa6b0e0c15f8fcfe95d14) --- pkgs/development/python-modules/datatable/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 0cc7d43d5049..9008270fc79e 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -20,13 +20,16 @@ buildPythonPackage rec { # authors seem to have created their own build system format = "other"; - # tarball doesn't appear to have been shipped totally ready-to-build postPatch = '' + # tarball doesn't appear to have been shipped totally ready-to-build substituteInPlace ci/ext.py \ --replace \ 'shell_cmd(["git"' \ '"0000000000000000000000000000000000000000" or shell_cmd(["git"' echo '${version}' > VERSION.txt + + # don't make assumptions about architecture + sed -i '/-m64/d' ci/ext.py ''; DT_RELEASE = "1"; From b0ad37110045447f74207e45a970d7a27f9d1657 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 03:08:00 -0500 Subject: [PATCH 034/185] pytho3Packages.m3u8: use upstream patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow up to 2b84c77b3e4 (python3Packages.m3u8: fix build on Hydra (x86_64-darwin), 2021-11-19), now with upstream patch. (cherry picked from commit 40c3bc3b0876f82b7ebf6816ab32a3c0c6e91133) Co-authored-by: Sebastián Mancilla --- pkgs/development/python-modules/m3u8/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index bc2233cf0d29..e69bf61657fa 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests, iso8601, bottle, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, requests, iso8601, bottle, pytestCheckHook }: buildPythonPackage rec { pname = "m3u8"; @@ -11,6 +11,14 @@ buildPythonPackage rec { sha256 = "sha256-EfHhmV2otEgEy2OVohS+DF7dk97GFdWZ4cFCERZBmlA="; }; + patches = [ + # Fix hardcoded /tmp dir (fix build on Hydra) + (fetchpatch { + url = "https://github.com/globocom/m3u8/commit/cf7ae5fda4681efcea796cd7c51c02f152c36009.patch"; + sha256 = "sha256-SEETpIJQddid8D//6DVrSGs/BqDeMOzufE0bBrm+/xY="; + }) + ]; + propagatedBuildInputs = [ requests iso8601 ]; checkInputs = [ bottle pytestCheckHook ]; @@ -21,11 +29,6 @@ buildPythonPackage rec { "tests/test_variant_m3u8.py" ]; - preCheck = '' - # Fix test on Hydra - substituteInPlace tests/test_model.py --replace "/tmp/d.m3u8" "$TMPDIR/d.m3u8" - ''; - meta = with lib; { homepage = "https://github.com/globocom/m3u8"; description = "Python m3u8 parser"; From 08fa2c16dd015ff22aa9712c6e8ddf04ee352d40 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 23 Nov 2021 19:15:24 +0100 Subject: [PATCH 035/185] libreoffice: replace `openjdk` runtime-input with minimal JRE Previously, `pkgs.libreoffice` had a total closure-size of 2.4GB where `pkgs.openjdk` was a significant part: $ nix path-info ./result -Sh /nix/store/7xyfklmiz2azcnrfa8n9cz12dyyqc85r-libreoffice-7.1.7.2 2.4G $ nix path-info ./result -shr | grep openjdk /nix/store/qcn7ihaak9g8ayyj4995ila2z0pkm37i-openjdk-17.0.1+12 643.6M However we need exactly two components: * a `javac` from `pkgs.openjdk` * a minimal runtime (i.e. a JRE) for `libofficebean.so` where `libjawt.so` is also available. I moved `jdk` to the `nativeBuildInputs` to ensure that `javac` is still available in the build-environment and created a minimal JRE that seems sufficient. Now, the total closure-size is reduced by ~29.1% (basically the 600M from `pkgs.openjdk`): $ nix path-info ./result -Sh /nix/store/zv34xijv64k7sz7rv50g3v6y59qg7p8k-libreoffice-7.1.7.2 1.7G (cherry picked from commit 2f9426ad8312101f4e84bcc4e28860695d28005f) --- pkgs/applications/office/libreoffice/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 2ed4750b30d8..8572ff15c1db 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -2,7 +2,7 @@ , IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, cups, xorg, fontforge +, icu, boost, jdk, ant, cups, xorg, fontforge, jre_minimal , openssl, gperf, cppunit, poppler, util-linux , librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr @@ -24,6 +24,10 @@ assert builtins.elem variant [ "fresh" "still" ]; let + jre' = jre_minimal.override { + modules = [ "java.base" "java.desktop" ]; + }; + importVariant = f: import (./. + "/src-${variant}/${f}"); primary-src = importVariant "primary.nix" { inherit fetchurl; }; @@ -318,7 +322,6 @@ in (mkDrv rec { "--enable-dbus" "--enable-release-build" "--enable-epm" - "--with-jdk-home=${jdk.home}" "--with-ant-home=${ant}/lib/ant" "--with-system-cairo" "--with-system-libs" @@ -379,7 +382,7 @@ in (mkDrv rec { ''; nativeBuildInputs = [ - gdb fontforge autoconf automake bison pkg-config libtool + gdb fontforge autoconf automake bison pkg-config libtool jdk ] ++ lib.optional (!kdeIntegration) wrapGAppsHook ++ lib.optional kdeIntegration wrapQtAppsHook; @@ -387,7 +390,7 @@ in (mkDrv rec { [ ant ArchiveZip boost box2d cairo clucene_core IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig freetype getopt gperf gtk3 - hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg + hunspell icu jre' lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs libGLU libGL mythes @@ -407,7 +410,8 @@ in (mkDrv rec { ++ lib.optional kdeIntegration [ qtbase qtx11extras kcoreaddons kio ]; passthru = { - inherit srcs jdk; + inherit srcs; + jdk = jre'; }; requiredSystemFeatures = [ "big-parallel" ]; From 9d5df1907124c5102b6613ac6aa9ccc856be2a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 24 Nov 2021 09:10:11 +0100 Subject: [PATCH 036/185] xorg.xorgserver: apply upstream patch This fixes xorg.xf86videovmware build (channel blocker). (cherry picked from commit 0649fcdf26b0b6b5a7029fa2f2553fe9a24882a2) --- pkgs/servers/x11/xorg/overrides.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 87a42c4b8526..24db9d720398 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -648,6 +648,14 @@ self: super: # # We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail ./dont-create-logdir-during-build.patch + + # Fix e.g. xorg.xf86videovmware with libdrm 2.4.108 + # TODO: remove with xorgserver >= 1.21 + (fetchpatch { + name = "stdbool.patch"; + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/454b3a826edb5fc6d0fea3a9cfd1a5e8fc568747.diff"; + sha256 = "1l9qg905jvlw3r0kx4xfw5m12pbs0782v2g3267d1m6q4m6fj1zy"; + }) ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ From 9103a7fbe7bbafeee238c7ee079497e67cbc25a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 24 Nov 2021 09:48:25 +0100 Subject: [PATCH 037/185] xorg.xf86videoqxl: patch build after `bool` rename (cherry picked from commit a7f2cd867ac5a903c01d2f9a41542cac18b3853f) --- pkgs/servers/x11/xorg/overrides.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 24db9d720398..8a415c57a61f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -452,6 +452,16 @@ self: super: }); xf86videoqxl = super.xf86videoqxl.overrideAttrs (attrs: { + # https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl/-/issues/12 + postPatch = '' + patch -p1 < Date: Sat, 20 Nov 2021 02:28:54 -0300 Subject: [PATCH 038/185] htop-vim: init at unstable-2021-10-11 --- pkgs/tools/system/htop/htop-vim.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/system/htop/htop-vim.nix diff --git a/pkgs/tools/system/htop/htop-vim.nix b/pkgs/tools/system/htop/htop-vim.nix new file mode 100644 index 000000000000..cd29bfa6e8ac --- /dev/null +++ b/pkgs/tools/system/htop/htop-vim.nix @@ -0,0 +1,21 @@ +{ lib, htop, fetchFromGitHub }: + +htop.overrideAttrs (oldAttrs: rec { + pname = "htop-vim"; + version = "unstable-2021-10-11"; + + src = fetchFromGitHub { + owner = "KoffeinFlummi"; + repo = pname; + rev = "ba6fd3891e9af60b41bd092524cc05f2469fec4b"; + sha256 = "sha256-G83+5GgEz41begDkdK8zNx48UleufFCJ9pOQ9nbtFNs="; + }; + + meta = with lib; { + description = "An interactive process viewer for Linux, with vim-style keybindings"; + homepage = "https://github.com/KoffeinFlummi/htop-vim"; + license = licenses.gpl2Only; + platforms = platforms.all; + maintainers = with maintainers; [ thiagokokada ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fcf5076cb54..61d06a67dcc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21997,6 +21997,8 @@ with pkgs; inherit (darwin) IOKit; }; + htop-vim = callPackage ../tools/system/htop/htop-vim.nix { }; + btop = callPackage ../tools/system/btop { stdenv = gcc11Stdenv; }; From d7c5b5221e8b55674a710fdfcf3b4287e5180807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Wed, 24 Nov 2021 14:21:02 +0100 Subject: [PATCH 039/185] htop-vim: add meta.mainProgram (cherry picked from commit 63a61947b9bb1fef05ebeead5f43c2c1d2a7cc83) --- pkgs/tools/system/htop/htop-vim.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/system/htop/htop-vim.nix b/pkgs/tools/system/htop/htop-vim.nix index cd29bfa6e8ac..05af41ae0ce4 100644 --- a/pkgs/tools/system/htop/htop-vim.nix +++ b/pkgs/tools/system/htop/htop-vim.nix @@ -17,5 +17,6 @@ htop.overrideAttrs (oldAttrs: rec { license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ thiagokokada ]; + mainProgram = "htop"; }; }) From 23b52cf64e1d3100da9b57120696e8bd356ce02d Mon Sep 17 00:00:00 2001 From: GOKOP Date: Tue, 16 Nov 2021 23:52:11 +0100 Subject: [PATCH 040/185] translate-shell: added missing dependency on hexdump (cherry picked from commit 9e2669e4cdafaa28d444793cfb9031188b2ead59) --- pkgs/applications/misc/translate-shell/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 319ba3643da4..957ab3de0b80 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses, hexdump }: stdenv.mkDerivation rec { pname = "translate-shell"; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { rlwrap groff fribidi + hexdump ]} ''; From 23ed0ced91589d980ff9f39be095c015a4f79492 Mon Sep 17 00:00:00 2001 From: GOKOP Date: Wed, 17 Nov 2021 00:07:58 +0100 Subject: [PATCH 041/185] translate-shell: fixed indentation in default.nix (cherry picked from commit 907ac61491a228a85d7669b9e6b518af9b370fdd) --- pkgs/applications/misc/translate-shell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 957ab3de0b80..be2ee1e7a851 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { rlwrap groff fribidi - hexdump + hexdump ]} ''; From 7ece17dade03332107beb5a94b4f6ae29c8a1fb2 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 23 Nov 2021 19:24:09 +0100 Subject: [PATCH 042/185] varnish70: 7.0.0 -> 7.0.1 (cherry picked from commit d1d48675c4e42fb03294188ec3ee25b6c5ef0773) --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index e74b033568b5..3e61e318aca9 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -51,8 +51,8 @@ in sha256 = "1zk83hfxgjq1d0n4zx86q3f05y9f2zc6a1miz1zcvfa052q4bljx"; }; varnish70 = (common { - version = "7.0.0"; - sha256 = "11z0pa618lh925ih67wmp1gqk7i46l486j4spjy71g1n3w5mqylc"; + version = "7.0.1"; + sha256 = "0q265fzarz5530g8lasvfpgks8z1kq1yh7rn88bn2qfly3pmpry4"; }).overrideAttrs (oA: { patches = [ (fetchpatch { From 60d9aa27d02bfed90b726db951605586559c9d6b Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 7 Nov 2021 00:28:12 +0100 Subject: [PATCH 043/185] firefox-beta-bin: 94.0b2 -> 95.0b3 (cherry picked from commit 4b92778d544abfd49c5876932ed185612b1cf2cd) --- .../browsers/firefox-bin/beta_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 213efa8d9983..fab45c2375c4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "94.0b2"; + version = "95.0b3"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ach/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ach/firefox-95.0b3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "edbac6e1811e97cf9c8f9b4b65ad0709722330adeaa521314144bd34fdd4a182"; + sha256 = "474c94f46fb3985e2f640ad7beaf66c0fa456ad6e3c6943f00dd0b3bc1daa3a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/af/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/af/firefox-95.0b3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "437bb41be38350ba7c3962475d0fad1e3186379b93f751755978187960d27704"; + sha256 = "84603f7b1ae9dc78b7fb184fb8130954241a1135d44b90de41f27650e96353b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/an/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/an/firefox-95.0b3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "bd264763fd5cf9272736595e1b96509c6558561f49664960e14f4c87364f871f"; + sha256 = "b672065d9b426d2814908d676329deb72b20f403a583228c584a4e95b8d86040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ar/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ar/firefox-95.0b3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "af3bd5415b279f90b625716217bdf25c3f8b51cbd0969c944755043150b7f069"; + sha256 = "9a62d19d64db198b838c2642d26d70de84205647c7aaed51415495b1c9966b8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ast/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ast/firefox-95.0b3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b83760c915d1508188cbc1d02ce210ab6ae4847b42f4e03f37b75134808a9576"; + sha256 = "53b73ad75376e2a2c2b6879d30d4039b327ba0f2bf7fe533e8a29f41a4e3b076"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/az/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/az/firefox-95.0b3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "7e28431db70a3a7c8bbedadd2e1abb32f3b69c8f571eb1f2e0cdc7d2c4097f9f"; + sha256 = "d9ddba7695435bf5915e1f17681fb6a55b4a3e9d4e4d2972c32e9ccd4d67163a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/be/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/be/firefox-95.0b3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "07b286100cd63f4b700c7f7ba88692010cc27b281a31ba411f65d4cb8071b7ce"; + sha256 = "23e9cfe4005bd235ba112f30be729495fafd7d607b9e67dc9b72b9f2fafa2846"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/bg/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/bg/firefox-95.0b3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "8d1e1bdccd06eca90a233660c20a7e2127c0a352ef897f582924f377d5d1c4e6"; + sha256 = "601d6830ddc35f8738a288105741e6c9fc4b2b50e3844287ff8d7f4ff871ded3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/bn/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/bn/firefox-95.0b3.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "d2b113a70009d5a5c9699882e8df8a707bb7faa3a2d37c3f84b63157c3d30cf6"; + sha256 = "bd41e8b261fa553ca1842cb7291539dd04db2d3668a1da317ac32a3ff7d0c322"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/br/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/br/firefox-95.0b3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0535bfe128414d7fd30eac04590c5932387d035fbf35d2d29048894b5267af90"; + sha256 = "00f69f471ea3385b89ab0fc54c3816271852f6c99cef9b156f0d124a71abe4c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/bs/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/bs/firefox-95.0b3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "9dcfc9a016456ef20177a0ab5296b661a06c7738329e5d4c18637d42c6399e89"; + sha256 = "288403e57a49651eb31714ff284173a8b3fda3a6d5e67047f97e14f8398fe5a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ca-valencia/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ca-valencia/firefox-95.0b3.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "bec81b4ea39288303c6a62383b24589defea2ed35e71b355e67bf852c432cb57"; + sha256 = "266dd8fdcb00ee48c1ed03ccf3d3a478a75123a07490afb4b67cce3bc53ba9e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ca/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ca/firefox-95.0b3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1f3b8416e7683c6d81cf6f0c90a7dd74a6d0dc251e6c14d5eeed2b7de1530cea"; + sha256 = "5f7388056ad409c7acb16061b0d945df95ab41cc767ec4fe777df8726421612a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/cak/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/cak/firefox-95.0b3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "162a8ffdc7b3840528f632278a1acb7f9ff23899f88ca898cde8ae0574ca37ea"; + sha256 = "2c315209fe2d966e3abf3eb4b35207fd2479809babbcc210a8e668aaaf6207d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/cs/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/cs/firefox-95.0b3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "160234bbd7a68ab3376f37487385af9ee8d692298bf62cf2e4577636ccc34a60"; + sha256 = "f5eef4d4141257dc80362a917cef098cefa65deee791decf4d79137ee2f947a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/cy/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/cy/firefox-95.0b3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "f876e1ce0b9db06f1de275b3cdf9b8ac9481860a70689846191dd7c68dc6ae8a"; + sha256 = "a3126e3c83de85459b565aa949ba5d34fd622b8fb7d93c080abada013e59d165"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/da/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/da/firefox-95.0b3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "980651fba5ead97dcdb05ea2f0b1dccc2947c985e2ab65aed8c239d1c85518eb"; + sha256 = "066b881606335352011d2001b0766f42af012a8ac7474f24866bfeeb1e181ef0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/de/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/de/firefox-95.0b3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "430c4a2cad2d9cf170332bb8abd6e66d084e7e1221b63dcb7993d04d9c713aeb"; + sha256 = "48c557034a1370ece846d0d08e31d068c872e7f6a1d9c83d69e5554561f95b5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/dsb/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/dsb/firefox-95.0b3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "92e9665c4c6f01112374b4ff1b2778c020459a970a1dceafbe1257d9ad519f4e"; + sha256 = "98faa66e3bab14bf28779b36a54657ae3ba69d2c762efe17bd849341d886a2de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/el/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/el/firefox-95.0b3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "2db0291b5a827f86c2fa8c33770d1bc8ad88873e2d451b57df40c0546d776d5b"; + sha256 = "3591b9ed200707f137dd1c65d159b1f2b412a5f5c2cf17e7d7dcadb691ab047f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/en-CA/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/en-CA/firefox-95.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "84330d6f6e648f996b8eb54f999a54f8c552f55a4cd17cb8aa2065d296692a0d"; + sha256 = "9a018a3abadb9266f647a4fd67a4dcaeab611f1ead3d5ce0b9d83a12e1a58eed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/en-GB/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/en-GB/firefox-95.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "3f46d8f80747adb4f619806b8450569d6bbaa259792b9ebe9e4d7a3df54522d0"; + sha256 = "40e6e0b8e9955e5dc8c89db57484eb8eddf06fa8b38f8b2a3d23c1d724a1e137"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/en-US/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/en-US/firefox-95.0b3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "90a836f289c72d09b26968516df7fdfba4d1f19e035b102dcabf5c69e4c6306b"; + sha256 = "0ccae3528c97ce6ccd43c21776a85b6e0d485e286814744ae22461cee1a7d79a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/eo/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/eo/firefox-95.0b3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "a01c2871905b78d8e2f6f53bcce50a1446cbf4595e38f21a8e9c74ffc0305b8f"; + sha256 = "dabe2c119f889c25c97e15bc588027d3220f96bde47db6f55f66e6df6c043133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/es-AR/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/es-AR/firefox-95.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "5e6dbece8a54d5f384bab627e92f3481e3a3823a259d93a152f5e71f92f6d524"; + sha256 = "57e787708d8c3947ca5ab5d5636def8411d2b8884825ac4f2a8253734e6a18e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/es-CL/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/es-CL/firefox-95.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "8ca362a3be8bb77fe390e96b23d04bc0902c49c9adbdde37c310703d9dda78b9"; + sha256 = "509749b15d990b1dabd2a01ce3ea25753e57f40f829ca2f391c1135ebab2ad48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/es-ES/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/es-ES/firefox-95.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "1705fd9cef5991a0f88cc7c62412a2a6573a2aeac0514ffccbaa4dc663f94314"; + sha256 = "d4cc96679b07d33da8cb891d7a0086dc5b00b269a55e8e0c57fbb576642c556b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/es-MX/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/es-MX/firefox-95.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "8da27496f7674cea873dfe963e9e87871e9648c33cc4fa6eff0cc0717263bbb8"; + sha256 = "07abf9362e1e111f42087367b33df46bbfcb33419785cff32c5a612d7daae1f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/et/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/et/firefox-95.0b3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "56ce06fec63fd6bcb9c71ac5cb5375864b2e8f9967e1a3d03dad37454dc9fa01"; + sha256 = "7866ed658f2a8a19636484f8dc4bacd3919324c171628f83d2194761ed738d71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/eu/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/eu/firefox-95.0b3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "03b0f33d0d960c044fe80990404e1f9480843cac11100769bc52f6cc32ffd5ff"; + sha256 = "d5a0dc4d72cd499e62a01b749969158769b42854d03a63802ac2d3fe473cfd15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/fa/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/fa/firefox-95.0b3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "ea75b853ec5807b6e292c2fb0cb44f7529d9f9047892f03a674c24e0455b146c"; + sha256 = "52b51ec4f60f428f8bec21485ceace318949a660aca2031879f9d5b2793ef525"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ff/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ff/firefox-95.0b3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "99f3232c806671f4d1099c2b3e72d5511a3377dbd601e9880c36f4c6db9d25fe"; + sha256 = "84efcb94c8bceeef18f621d2b6c457012a4cae82b85530401f8d3d4a68ee2a0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/fi/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/fi/firefox-95.0b3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c99f94936820657990d9aec946e664b7f607412df03d9ee9a87b5bfaaed4d66a"; + sha256 = "a30ce074678d5468bfbb675761e6a267d64e05a53691dfde7c2ba63917091723"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/fr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/fr/firefox-95.0b3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f053084b00a5c22e1e0e257226c46716fed3425293ce8e57cc58f6a0e7c6bf76"; + sha256 = "005180447c764df009b726696220e84e7e18fe2a90fb35674c613f90ac9806ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/fy-NL/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/fy-NL/firefox-95.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "587dfd7904bf5d077a8f61417bd635547e71e2926980730b9ee93fa83109e7a5"; + sha256 = "8306484bc7a3095412c5ef9abe0f129a3e12f9cd7a9642da06c5b5cefa939b75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ga-IE/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ga-IE/firefox-95.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4a549683496ad19adb87c87c01eb296cea59d309c494f55f7512d9ac3fa23f7b"; + sha256 = "7dbeaddaa6e56a97802fd521b21c0e91911313a178b4e3b52b94c9e6192e82ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/gd/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/gd/firefox-95.0b3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "bc8a38559c327121f2c8d89a8f511446db83ff2fb9c554661020b8624ff5790d"; + sha256 = "a8002495345e1339d1f482a622e8d496b2f44d6f0943bbad5502446c72cde9b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/gl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/gl/firefox-95.0b3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "9412b3f98618a40e4e66542db3892f4d276d25d3ce86c336fe3297edcd9c64e1"; + sha256 = "8b7c7ca56394582f1af0e3c53943d96994901f2083d43cccfceeb03d6e40a5fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/gn/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/gn/firefox-95.0b3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "1664f221bc7a6faad6eb1cbb2fcbf083626f80883703506a8a79eb9562e02a0e"; + sha256 = "4b35f17e74ce56757dff9cef391cc19348ff4e1d248f19e74156504c3d2ed394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/gu-IN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/gu-IN/firefox-95.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "556e8f38a0743a421a4fabf658eaccada707e8f3164c9eab7dbfdf8b301fea3c"; + sha256 = "fc1233731682071936aadbfbe8db7d4284f2cf47398421cfb2a8c7a8dfb79752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/he/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/he/firefox-95.0b3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "aedd0af01b30b582d601bbd6c52234218c702eff7eb17d0af6c6c6aff838f984"; + sha256 = "47b4dcfacd5d4c8e579757f89d895495321b08115f6b64d025d6129562d66453"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/hi-IN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/hi-IN/firefox-95.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "879bb929c4f871536eba1c479148ebeda4d6651dfcb9832fd981673e3eeec850"; + sha256 = "a6b47c3149701ce4c98cd0df5629b141bba20d143305d036b488a502c0de7bb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/hr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/hr/firefox-95.0b3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ec26e00627ee66b2d4113871e13995b4e60dc91088db30d318ace4f9bea4e903"; + sha256 = "6e992a34955550b0024f626da789f339e68b6b1701f7d20e1cee39de8c693245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/hsb/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/hsb/firefox-95.0b3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "7950d84ad252c9ff6e01d7ae3506a1dd69b9d9a118f2df2e5234a5a987651f0e"; + sha256 = "6e7927e7f83a64b97ab2371e798443d27d67fcd7b8051f1f7e87bc78407d8ccf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/hu/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/hu/firefox-95.0b3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "9700bd647b0a074ffbeb2c1b71b422d0a15a7da1055c92c29897abbb7f54c4ee"; + sha256 = "b05cfb354ee26a1c841d4101b5c4fae11e6724bbf50d3c7685d5c67459a4c84f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/hy-AM/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/hy-AM/firefox-95.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "5c8e6dd327ca3b07e64c9e2e33d31fcdfffdff8c716577a0a89ba680635c8c61"; + sha256 = "246ff4c709da7aebae4afb7625b77bae8ee60e53ce5d04a2c42c0257e8da0e25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ia/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ia/firefox-95.0b3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "465094fd3b6f035df4f603ca55acfa8c75665d5b92e3527973dbc26697913105"; + sha256 = "27495fb4fa2cf5308a04a26b26bcc4da5b6153398479a231fbd17162909c9610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/id/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/id/firefox-95.0b3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ea3dea0c2a091707341f19f64995bf6a41980be8ad915eb547876f34bd8b5e8d"; + sha256 = "d6ce3a5961a40e82e48a9468163403b0a83de89305977ee38edf5dd3a56e222a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/is/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/is/firefox-95.0b3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "dbb1a792245c9e0fe6fad749da27679d45d0d892044e9779b25143d2d34d247e"; + sha256 = "3644ff5170301af31eb05cb9b6d788e9c3f0eac65a45155f03b1cf8d88d465b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/it/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/it/firefox-95.0b3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "dda28b54be15f43ecacbf490099270cc1cd279b6801a2bbe84cb8c0ba092ff27"; + sha256 = "01c6356d1ce2229a6ec5865687a0ed67c61167889f4a679c5c87f8cb8843322e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ja/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ja/firefox-95.0b3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "e023f941584bd89e9465076aa1912774d64d8430ad7bc75d8bd5f4cdd1b6efbd"; + sha256 = "37773526605c3f1aeebc6cf0b5cf85f9dc163150a71631b7153c7eac04ac40d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ka/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ka/firefox-95.0b3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "24ee80944e4101353f5126d2cdbb2d9f1023656ac638f3975558efb24b13378d"; + sha256 = "69d7a476b28b6eb08b2dc797e3bdcd75df52e6e356e7efff961a6093b75f53e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/kab/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/kab/firefox-95.0b3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d5bc4455950dd952a936247b0f3ef5a4fd2047bba599c229bf2b7c04e716d7da"; + sha256 = "e912381c7b2d1ed39564cba940bd5b2f80837ecaa9b251844b8ff9ba94d2a839"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/kk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/kk/firefox-95.0b3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "85ec8a29e24aa5362fe4b3b397571c2bd479348ce63c2adf63e8006b7555aca3"; + sha256 = "31227990f305bab67fb3e0dd1043b55470d188841f981f665d4a8a2493c990f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/km/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/km/firefox-95.0b3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "a9fdb04131c7b761426b68748b491dcbf1ddee41e063dc222045ee84fb2eab2c"; + sha256 = "d4fe8d5720d38750b1d7fffc6aec1e33733bda34783a2f3e190f0c2d8c7e3b11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/kn/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/kn/firefox-95.0b3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "3de931130e6136287fcd0983e975188c3110611f14f28838f439149ad00b0a74"; + sha256 = "7ed2af125efd6da29752350a6f717dc159ef4ec2779615d1ef6a00469e09be92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ko/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ko/firefox-95.0b3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "17012e23c8dcc5c136377ebdd6e0c4035eff9e4a605bd61df21ea5b2ed9f0189"; + sha256 = "b0a5c394250c62e90831fb890da297708ad7bf7fd1552641a2efbbb807b2dc4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/lij/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/lij/firefox-95.0b3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "96ccf4a71bc2feff202374a63330c4e064ea0d50c6687bc5fd2c372116e1dfcd"; + sha256 = "75b98e03016f31a16b24efb8333c2b9262efa805dacb942e9421372811d166a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/lt/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/lt/firefox-95.0b3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2eb4c4b355888e9b540d1290d7aea0f0a0dfe3eb0d03e278b1fa20eae43cbeff"; + sha256 = "6d5a36fd2fe4e9054b8bd58134ea8b9d70fb3205d84c60a6793033f0e4acb38e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/lv/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/lv/firefox-95.0b3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "27cf7a6f9cb6ff304ed6169fe97e519e19049e9608f7cf08313c36d7b1640e08"; + sha256 = "f605fa3ae318f437849623819702d5cfe6e4f09c8780044ef94601879c31d207"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/mk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/mk/firefox-95.0b3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "1cb76b49d0323c194f47bd64a8df186c9724de25449b3f6cde123425436a4d6d"; + sha256 = "dffdaf569892188c729407d9afda0a6f81c3e550ed7abc0ee8d3da75aa2a0746"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/mr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/mr/firefox-95.0b3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7a60b912f369d9f344b0fee98c4108ccf87cb643712bd7033bbb139634e1471d"; + sha256 = "e46c0a6320a7660f9e7787aff628ca6a4a7fbdf93454fe58f2caaf1ebd53095e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ms/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ms/firefox-95.0b3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "788a127d2f75462cbdfd4f5915777d81095e2a8bb591bfc256d1b604987a17e3"; + sha256 = "c3d7a6c84f5ef041b9914757893af431285946821a288e654a4b7f0c52644613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/my/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/my/firefox-95.0b3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "946911b98f0d7cc6765ec7e88db9d19ce4b908f0e53fd6f79ff27e1d45eb2b88"; + sha256 = "a15fc143278e2c2909ba04d14dda8a9bee23b43e4f121f38f06284d7f718b906"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/nb-NO/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/nb-NO/firefox-95.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d1703b56d9796af0053605cc1ed7eaee69bd7f30d470cf8fc18b074e8ecbb529"; + sha256 = "ca44d0aef673a2fea953841e94504ccf355fce39ab571eac782a750cab794301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ne-NP/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ne-NP/firefox-95.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "3cc448f48a8aac7b61ceab0cc8e46402795c61dd1bad66dee72b93dbbdeeff02"; + sha256 = "656f830a25800190e310d2367ac7ea07f3226c4c7b1cfd0f937dd3056804f540"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/nl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/nl/firefox-95.0b3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "aa4857320b95c78b6434475ada060ce78d3a36d71148d8b24b5868cf3311b916"; + sha256 = "5e493e4cc81a976bb06bed108d25070ce5add12643de21cd96fd6075cea7cd26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/nn-NO/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/nn-NO/firefox-95.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "227414b8fdbcf31ddcafac4c3ddb25ac34154a46db3e1e93f8cf26477720c8bb"; + sha256 = "ed1e854675b0f2422d240e45ca78d101a5ce787bd9f5ce4905fe7edbd24b776a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/oc/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/oc/firefox-95.0b3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "22924d95c07426b40b201bb6c659421f43d8f3c36c50348f053c8f8654430706"; + sha256 = "12df296c5340caf9264401b33f9c7ff56b366ff1026da5c97769db14cde12d0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/pa-IN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/pa-IN/firefox-95.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "418853a0c95d16cf9277b8b5210ba707a427d68d2390f3bfb9917bafbfe2b947"; + sha256 = "d785d9d2f85dfe309757abe0ef0096a968cf01d9c2b148a2aecd1c098a5e1f90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/pl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/pl/firefox-95.0b3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "ede88f034e7541851a21aae7329bb5f60c767cbc163fa6a58a67cdd760382899"; + sha256 = "92835e4961dabc99e0b803e06338a9a21799764e2713a36c1e4f681d87bd8996"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/pt-BR/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/pt-BR/firefox-95.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "679efad4343b9fd6c9869a35f5c1e74daf902014263ca06f957740f911cfe56c"; + sha256 = "aaa9f81cdb0ca1b74f6d2f7818d12a952e7ee33d60e047df86ab97508356338f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/pt-PT/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/pt-PT/firefox-95.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "45bdfc0cd916eec6628618fdcdb042df9207193a6fef74e539bdce548c985520"; + sha256 = "ed69921f7c65c31d811a7d54003f5ceef2a01c9405d9bf84b31861b9091dcd7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/rm/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/rm/firefox-95.0b3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7bbea6a1d8fa099d7882758aae43136dd413724d3dd17fae103a32b7f960e879"; + sha256 = "405a19aff4a45ffde0f09b94ac6f6c9f2dc97398f4b90b77031ce957a31f8b72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ro/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ro/firefox-95.0b3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9540f4015850aad6561d9c03b39ef36f1b2c6497d240b7ad5b43e02a73cd003a"; + sha256 = "aa058e6912b410db1e43aefc3205930a6dff0559b729b0ac80424140020c0053"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ru/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ru/firefox-95.0b3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7837ebd163d03693e504d50c70c6798f228b89bdb9ffcb6a892a350a211cece9"; + sha256 = "7cb7ff67c839f41a4a1739075bfd7847d23bbdc62379215db2d822f2367ff84c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/sco/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/sco/firefox-95.0b3.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "43be1c890d3aaefdf1e7671c3ad1d177fd2ecb34df23369cac5d9cdad6404eba"; + sha256 = "e5832ddcd89f443ee9d7e5c211d902c4f96319d53e4647dc1b522c73f3f7e862"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/si/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/si/firefox-95.0b3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "08f5c9fcd42937bb7c56fcbb82d39570a08dd88fa82afd6defb12468dc8116f6"; + sha256 = "8fe0d2dab49385b643f5aa1e75fe92f6f6e22c731954c9805d96ed6d5f648763"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/sk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/sk/firefox-95.0b3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ba0008b1ce61baaa4026cde2df5e643fde36d8442e5d7a4eb60bf366d913d75a"; + sha256 = "326ae6e05089d85f978581ccdb295a7110ca8bd3355386fa167a816c6c64aa46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/sl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/sl/firefox-95.0b3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "7192260868cf36a31b8f0e655a623a06c9ea6a9f070b62517803a4f5f922c650"; + sha256 = "f79d40eb29a56120658625e73a1e787999392e5f4f9d7b1138c863d4f416e45c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/son/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/son/firefox-95.0b3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "ef1b7444683e8232ab043f539a8822e18f0de181a99c205d3d1258f4f3d4fba5"; + sha256 = "55dcfbc7dc1798f664dd35e249846edea3dab0b9f803816d7ac7f127f88d430e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/sq/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/sq/firefox-95.0b3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "3eee3b72f4deeefa66f4214347d5800421827e2d402c1a1b594c8c57fde35fec"; + sha256 = "a8a324f847552c79c17d217ee8b1e620784608899b5d3bf358c1be036c89c761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/sr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/sr/firefox-95.0b3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "63cb0b927a324afac3e7ecbdb899f970ce24008ce95d2179afae3eb06543d713"; + sha256 = "f073d9cfd51f99a6ce113b7659b4e4807459c2708ccbd6b4e94caf86d9575c43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/sv-SE/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/sv-SE/firefox-95.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "be7023d2f9d23adc466fdf79206694dbd2e17ebeadb6293c85a82dbf6e966884"; + sha256 = "1e2ce62d0a940d28e92c7252d059c33606b1659cb837c51dce5deac8d7998c62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/szl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/szl/firefox-95.0b3.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "95714546832f86662101ba73c560d38aa9850fa90333feef7d9ff8267f295296"; + sha256 = "d9e0f2f4f3852920a1f539db556fb8cbb7eb563d329befb3619e8892efd442dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ta/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ta/firefox-95.0b3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "6bf28669ddf04df959d24b960d9f67ac9fd1bee97743d28cc21bac1d8fcc16a0"; + sha256 = "ee8b169ac2e368bfeabb18ad609e99966f192ba50d0cb8c71cf4671e9ba5a8bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/te/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/te/firefox-95.0b3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "8c59a61fb25662936ca2ad8e19a84058aa22d85103d75c76493eb30b2762eda1"; + sha256 = "26b6372b6e235ff3976246b0985c68d0fc4d742961b0fdfc39084fa625412117"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/th/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/th/firefox-95.0b3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "984d1a346179dd819de86e970f3cacb0a89ea026c86ca56edabd7855b7bc7afa"; + sha256 = "64cd2e44ccabca972a9ea1837d8aa79bb21dd675c7e205cf9b7978418707762a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/tl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/tl/firefox-95.0b3.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "19617e8f8f2aeaaedcbbe33d8bb2421cd8b1eba399ea860d6c7d1e209d5dbc66"; + sha256 = "b76c0b12ce6ef4a1b25185290d8f35c834220d1106aa4298f0b0026f29874f5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/tr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/tr/firefox-95.0b3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d953044a4b63b5e5eee29c782c12e8e55350dd638c199ce1390361b3ea509f34"; + sha256 = "f1029745fe9fc26b3e3d1672c736785bf7d1bc182b5942ad0542d72a87a4b772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/trs/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/trs/firefox-95.0b3.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "738504b47da44370d49c0a7aae03317c3f83992d1be913189194f0e0ce1a3dd9"; + sha256 = "cd5115bb83023c0d3a7623b4aa88a093e2ba6f65e4f0275d4af66bffa0ad3bd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/uk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/uk/firefox-95.0b3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "88243361771fbee5cc666bf8bded017a68b4ce1d608e4e13f29b1e58250de2a1"; + sha256 = "dcdea5127200c78331f4fa687a4b1a0a7600345e1493a1653296c0399dc9190e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/ur/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/ur/firefox-95.0b3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "a10538386e72d3051de739cfed8422b4c48eb1ddf5389589b49cd6079a5136e6"; + sha256 = "88f83c38f0a1a1590e0198ccbd0a48e8d8542bd2f697b3556541ccb49da7aa98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/uz/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/uz/firefox-95.0b3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "f07e249bd9e106b7513a65e0b0bf8915adc7d6c0cf65cba983c8763fd3da9aab"; + sha256 = "bd7e5a47455e79ae84111a85f368528f41c406e154d0453ff197207e75cfdc64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/vi/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/vi/firefox-95.0b3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "29d7bc28680f4694eb66ec898be74089c34ac73536b6bffc26a74ca8a424c537"; + sha256 = "6cda47f9940c2d8a0f9407f087c26732579bdb852a20b385593e2874cc5fdfc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/xh/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/xh/firefox-95.0b3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "771c98ac9bd5420bff5ab955882114249d274cd1dc82f8fad24885efca302069"; + sha256 = "19a79670ffe4ecbdb577cf87ddf894a60bd447d906cd7f97161cc985fe8b5f80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/zh-CN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/zh-CN/firefox-95.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "670a2a1b9e6805aed79909474c01b771d7fd8215fb2bc0e7bb79e890cffc70eb"; + sha256 = "7930a72c8c667b8e2d7e6ee9df6cfec692e854c6d8fc0f2f096a7a3158da3f9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-x86_64/zh-TW/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-x86_64/zh-TW/firefox-95.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7265b78daf40004d7767d17b500a50d06f0d6bd0ea3a72d341732b6eea3d85a7"; + sha256 = "bbc0687aab65d526e71e4050b0df5e7e28c59a046d82720b27d03dfa4efe8409"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ach/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ach/firefox-95.0b3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "2aac8adf1d0059b9d6ac6cb8558cc87738a60600260ba3c6267d5ca0091dcb35"; + sha256 = "3304a4622ba40355058e39efc61be03e7ed804c3f7c10070db639e1382621d47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/af/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/af/firefox-95.0b3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5b53daa874efe434aaf3e9ab913a7eb5c41de3dc5bb45218375761a4a9251064"; + sha256 = "4659c04c84ddccd3ac85237fc53b63536bcaaf8a1adc984c0468797f926b6557"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/an/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/an/firefox-95.0b3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "44eb267e3e38957fdf328bc7c72f35286c0f4de98ea16b419d22650c464b398b"; + sha256 = "e132e70c080fa4059dcf2b0a5c7d70067d7db51e56137df279f57f18ec0cebd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ar/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ar/firefox-95.0b3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "cf12aca145ee165cebd17b0e206ce3bb874f0b06a910f34bee4ebd7bd20675b2"; + sha256 = "822a3be31a33ff6e2819db3474e9b9fd326a5effe5d7106803528ec234e5cdc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ast/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ast/firefox-95.0b3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5742c9397cf56356f8377516bfd16098df3ec690282ea1b01c2121e80855aafb"; + sha256 = "23b44191bc18c5412b60958a9dff985f9be1b5ebcdb12444008ea81b61e64e27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/az/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/az/firefox-95.0b3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "28c52a7dca6db549577e072bbf055701706e4bbac9a65fc11f8f2bfd62c6760a"; + sha256 = "5def55e33abd17ab26f5e96b325b1d32bf16e32c6083e6437dacbdf52231b6d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/be/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/be/firefox-95.0b3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d50cf3da85aeba9f967d23cb1d661f6ac3bddc032ab14ad8790237a7eebc2dad"; + sha256 = "23fa43713fc1e831bbc87bae66ea3fcd3597c60babe96b50bc58caaca2698f86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/bg/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/bg/firefox-95.0b3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "44e8f8477b5bf60546e712ea054fb0f736c593ccfa76d744c5f7ff092f8756e8"; + sha256 = "7ef88eb25bf6b37d89b6b90b76b812eacf70e3ed8d6ef2dbb22a469ad4da78a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/bn/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/bn/firefox-95.0b3.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "6a70df8153b96afa2b3489e40781b3ec56cd40515ecce9e682f2236a395c1224"; + sha256 = "7d9a99a8e4955f746c27b0f54c4d44b30951fe9fbcf106ae7cf43f996e937671"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/br/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/br/firefox-95.0b3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "e999ec80dec5e33143e911a3f0492e68a8dac43088a9adf9a9a644fd87905b6b"; + sha256 = "94368ed9dc4801dccfca01e97dc07b4db309ccce60aa12846c2eeac68e51e6fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/bs/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/bs/firefox-95.0b3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "d500cc9f6e898626efb8e987649f4786988c0977342a46c2ed02c5c5ef540043"; + sha256 = "1afee889a4d450f373a42416c13305abb2bc2388da8bb3a303a89a418823e01f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ca-valencia/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ca-valencia/firefox-95.0b3.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "0f524bb723d1c62380f5bb1e6223ee6c2469a08ddc643dfc36e21c0c82153803"; + sha256 = "0569eb326a77638e004243dcc62108e4f0997f3496b464644526aa7c01042677"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ca/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ca/firefox-95.0b3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e41924c1d4a6161da982a50ab6556a0dd680db8bba3a0399b0fa2a950667bf2e"; + sha256 = "c1987149fdc39a601e15d5f64e8d9ecfef1955debe723f10b49ca65d097480af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/cak/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/cak/firefox-95.0b3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a598adefaae52af1da8649965a1b8ba96316d0c6fa13fb5d3c482e7aa63a00c3"; + sha256 = "72e5ae12cde0a72ae31d393ba637663666edbafaea53740ef806a7fef3d4c140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/cs/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/cs/firefox-95.0b3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a4833932ee61dd26c552c01b9b6c7d91efe25d7a2d9a63fc0ab2f7700bb2d508"; + sha256 = "478eb08e62251dc39f92d4a800c11e9724f3600e8f997dae616ac82e85ca1b3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/cy/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/cy/firefox-95.0b3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "865c431769651a68946d7496a293194eeaa50886d2d14496b2d06ecae97d0f02"; + sha256 = "086fa2054f1185c40ff297c747abfc8d9324a08b2e12418632cdcc61fc668b02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/da/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/da/firefox-95.0b3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "90761a3f5ce8340678eb1bde13dfb646922cd1c42edd17dc8eeef99ddf5a94a4"; + sha256 = "b657c66cd373e7644c56e5ae522531ca714fa0f7c529555289c5df45d0bfbd56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/de/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/de/firefox-95.0b3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "cb0e6ee6fcaa7e112f5c8a1c32f1423ff718b1413f5ba8c1c8807d8513d7798b"; + sha256 = "dddf834e5674b47d8e59bf921ba007067c9aef3d2efbd85634cc2ea72510bdb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/dsb/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/dsb/firefox-95.0b3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "028fc876c1156b48d670b97c750a25ec442b2ba6a68a28a7cd1b81c3a1db410f"; + sha256 = "a407dd3b2bd3d986d7d59668fa20b6b2f4f71d3b54332a99142c08f7829aac9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/el/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/el/firefox-95.0b3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "b5055d99965a01312dbe339113ce2495c23dbd38cf93a994ff5622f9b61835fb"; + sha256 = "8042da6d7c66aa7c45dda5830bfb67877e06a66ae2ead7343c74d51becf56ad5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/en-CA/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/en-CA/firefox-95.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a83a7457ad8f4ba12feb3c7824a8d9d211dd88e9f862a9f5127bfb7bf4896075"; + sha256 = "9d9bd958a6e0854918333f65d6fd8a3ea461d127e5e160500da186a4a907d3e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/en-GB/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/en-GB/firefox-95.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "ad3ffa6449f1fe0f65cee89a64f9b392131c0a765704f95ec94cdc9f7d4baa9f"; + sha256 = "7fa0b938156a578297d1fc937673142be25f8b3cbbd97480b4be654fe2784b50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/en-US/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/en-US/firefox-95.0b3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "baa1bea27fddd11c6781a48ea677724bce4c4246125be876d17122998d9a7f4d"; + sha256 = "33d62cbaf991fc592da3f913cfb802f0707b0b1f72dc7416fb1cc22c381b7ae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/eo/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/eo/firefox-95.0b3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "568e14988abf65cfbc9d6c73adfcd5716f909b8a6fca3fb120a6cfdeb9e69e2d"; + sha256 = "d374f116d4e769147be1a56c2c6410f1fdaa8d86ed58475562f906b061c0c3b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/es-AR/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/es-AR/firefox-95.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c90e3f18ecf370d223365c1d0f91b785476d0abc680fda2f86247e25387004c9"; + sha256 = "700457bcb26d5ff2169b9e8c23e6140cffe48742865eee51fbf5d9932c59adeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/es-CL/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/es-CL/firefox-95.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "c0f03f3762ca094a7562f312a4d8de177da3603f3e10ecdebb8d53a0573be44f"; + sha256 = "563af53b075039919e6e15690c089109ea2b846852161e7fafbbc8fe2b20a441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/es-ES/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/es-ES/firefox-95.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a105f2f4a70c891e4e29e73871919e0eee5882080bc5f5fde408b3ef5b68d5e9"; + sha256 = "0c20971406b742f2b18097909f68224f4cab619ba469aeb8da19bb8cc2ca18e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/es-MX/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/es-MX/firefox-95.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "a1f3a1bbd0c63f96627fed01fea147520e0df328aa0fadfe3dd1a7f6bcadf0c0"; + sha256 = "6ba00dca7e382da326fbe35eaf25312d1b4a85d5baeb64514470d20774a4efae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/et/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/et/firefox-95.0b3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "de90af4dc817d9df6273dda7ee1c7a9eb360c758220b501b37470cd7d8704a7e"; + sha256 = "cbd3353c4c236ce9b9b65ae322c6d43dbd74a27db638d2a01c4734e34b285e3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/eu/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/eu/firefox-95.0b3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "32eaea585ba8b2d4cf2974b7b78e57657ed8aa3fc7e005453197c3aa1c96abd6"; + sha256 = "3eafe56e7675aa503cc036d7adb64981ad7a06bf934c7d6c0ecbc4af8a895441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/fa/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/fa/firefox-95.0b3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "07810ba943fe1f8a129d7d5795a6bc96852b216d9988ba96776647c7f33a8f62"; + sha256 = "0dbb9c473b58ce34d3924dc5f8a41065206f06a0993246f111c0da0561352624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ff/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ff/firefox-95.0b3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "6a9bdce53ea3b5546b938b2ee9a1b47be4bd1084cb0461740518b4efbb6138af"; + sha256 = "723bc7955202c4c3425e32045d21177a3d312f41fa4005c3561cd6d959151c10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/fi/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/fi/firefox-95.0b3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "b9145e2b96cf240f4309b8c240269ace21edb90925f140cedf7fca6c74692015"; + sha256 = "085f28f412ed53662519fabff853e6515b26427044e935dcf6106716f419c748"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/fr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/fr/firefox-95.0b3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e3b6b6a62a48a154d28f132a597d265c51b31fc25edbdc2548020e8ca25953a4"; + sha256 = "84e90806913574e980a6538cc6519d201bbe939fb857f34feb05897fa8c69409"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/fy-NL/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/fy-NL/firefox-95.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "be2ef81fc49fb6ce874d5efb62b1bc1752ff125fa4ba2205a1dbdb5064c7d072"; + sha256 = "8cbcae8c008c679c234c51f56097691e9a9159ba58937c74e38acdb616ae6ba0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ga-IE/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ga-IE/firefox-95.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "5fc3a6df099ba9e0230717c7fabc6026583818bb0b4a27f465dd27b020a0c475"; + sha256 = "d40a5549c9f8982a8099ef54d0e459bf6d860b30df38b677ac01c16a0a57e330"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/gd/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/gd/firefox-95.0b3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "d6c799bb7c0f13ea956d878462e625425dbc4ece9547514cb12dd9102553c44f"; + sha256 = "d5eb63613d83d2ffb5e11cdd21629dba7058ba955f5efbb002a010fbbc677406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/gl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/gl/firefox-95.0b3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6268596e62294f38ab05c85373ed99fc18f69bcb4add19d6dd201b92d066b454"; + sha256 = "21fd943016e8f8262f1e1873c3761d7bccf75f62c0274b09e441327f35987fa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/gn/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/gn/firefox-95.0b3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "de044826177ce892bc5ce3ef1bdf46882759bb8e49e2b6b36df47cdf34b2615b"; + sha256 = "3ce4b7cd3cca655ae114e3b2a8b37e10ce4ef8d7a67f9102ec2c0212cfb069df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/gu-IN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/gu-IN/firefox-95.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "586e731cdc1336ac6d1894ff4f79d67e098bf203384c2944f33a8185a7b6d183"; + sha256 = "3312ff91d51e10efa1318403796c0f4029723578784a5d51158ae7c316afc4f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/he/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/he/firefox-95.0b3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "42fbadfd03343c5e878abf913bb45283dda50fb3c9b52395be47d939881a8420"; + sha256 = "f9b24ae14c635b8fae22cd0fce522e0b59f1f98590d697c4cbc82af682751bae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/hi-IN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/hi-IN/firefox-95.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "3fa42bca8f7816b8ab2c87c783f326c55cfae8a04f578f4b7ad71477e9b4cf85"; + sha256 = "09629e8ae42901795c05957c179020daf446201237d39c055d611806d0b86b78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/hr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/hr/firefox-95.0b3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "69d0b032973f80c05ea79d79e98b2f9f4084199cffe9ce486c2a1f7a57fc2569"; + sha256 = "6bcfd3b48a09e222046ff349ec824e4b60cc7babcf63172482115ccab078cad5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/hsb/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/hsb/firefox-95.0b3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "6e78186771e988d87d4cc1eb341ce7fa37b53cb1a34d221dadcf694457a71912"; + sha256 = "7e3d6c90d330752792000aabae8250d23fb7ff12f24adc9c47279db194cc6e54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/hu/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/hu/firefox-95.0b3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5fab0ba23aebd9f717f799ca5783150796ec14c9c45d1c709448e16bd37c9f01"; + sha256 = "2fb95d958888fa4247478833ca047ee7ac76e4032b48163ad61ca5597dba1d35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/hy-AM/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/hy-AM/firefox-95.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "fa0de5ec5044eccccec5d8a2b113f7ea1aef59d3a33197bc21774643aa85198d"; + sha256 = "d6d056f2841b6f359dc4ae9e22b9a5e8698a26df574b09cb3c79fa44d1d86790"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ia/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ia/firefox-95.0b3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "87608b529985a8949e29394a9bfeedcd5ffeb67949923358fd82c27c6b351871"; + sha256 = "a6360b38bc8d7a7265e3f66ad669bf40bc25770fba8cee29df420c8d396d271c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/id/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/id/firefox-95.0b3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c6d5bcf7db0582063cf42b3b9d8793b4941bd13604ee7cab68fc919dbf160907"; + sha256 = "ef34e9290dbe1e8f362311b43798a78c7455db5e214397e2d7285a38f5599ae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/is/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/is/firefox-95.0b3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "0de58066c6904a9870fc79e144e50cebddf61bab26f346dff8d3d8b4339eb650"; + sha256 = "bf2d2cc1b6735466c70fbd6dd463b240fe17164b6c6a9bea3b6e2839f846699a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/it/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/it/firefox-95.0b3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "aff66e83da3a968e003caf4df9278a85e9bb15e0cda0173b3e73339c1c85e481"; + sha256 = "628ef481ebc9996eefc8cd689d6e7ae6a41c4d11be5cfe1e3a08ef05d2bca8fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ja/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ja/firefox-95.0b3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "3205dbb1ccec432962d90c2cb533244f1baf47d01b0c77801a827a85f89de328"; + sha256 = "6cd76540da568857deb06c5b1c6c73003548f9399bfadb25b425a35a30e5eeb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ka/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ka/firefox-95.0b3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "d14ee6a00e34495e76af31a20a49b206a744ca0eda7eff60e739e504774ec042"; + sha256 = "811b0f7b73ac2726f6ef5a07d923c29a2821a6f7cacc18e79ead5efb7c4deecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/kab/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/kab/firefox-95.0b3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "fe3fe6170a6b5ce661d54d24c0a1d09f7772f11faa4a325d0553cb12ecdc8c7f"; + sha256 = "d384e7975ad2110e48cc2c17fb14dc8bcfe14fdae481a538c6b66eef627f70d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/kk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/kk/firefox-95.0b3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "14e27fff2da0ee16a47372f6d1426c9f337aa3d2c781020539f787ffd6535765"; + sha256 = "315d84a82ab42fcd471758191f012e52565cf907409546346a35a46b33af87ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/km/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/km/firefox-95.0b3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "0de1b97e2bb964b161e15092607f7ed98483a421216249e9988050e213795744"; + sha256 = "3b0620bcb47b92b7a2e46f52ae6fc306615dd94b85c37e445158eb3161e73ee5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/kn/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/kn/firefox-95.0b3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "8f0160c8797f48024b19139ce23fa2b13540b09e4ac100508fe8fb6c68596f9f"; + sha256 = "3e4e906b80f438ec81de41464d898f8a2d23385907d8398afe12e8c6473921a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ko/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ko/firefox-95.0b3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "7729469059efd35363ae18d58ab8c84785534d2d94624b863c13ba0e5e98fd3e"; + sha256 = "d7bedd07d0cae948c4c995930b5fd84f90e84843f7024e93f37af2bec9e5bf2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/lij/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/lij/firefox-95.0b3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "6712ecde2c548608fa95af783a7576d765e8bf09e157060a3619cbaf0bec4196"; + sha256 = "86b64f383a0f139b7ea280dbc8216a98a2bcfa5b89b59cea9a593830eed2400c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/lt/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/lt/firefox-95.0b3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "938e3e220f39d91014b5fb0824d1543027d971f260eaa633c286f6815ebe3a6c"; + sha256 = "0d9abd3f952d2a8c5e44bad8e459053d796ab9aa78aef2bed4bc5c9079e9b91c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/lv/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/lv/firefox-95.0b3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "b563a544e75431ee878c8c982076c4f320331f8930f539ab15502df6a57e1e49"; + sha256 = "de4682948f45b82942a5f544177927d950401ef734d956527528edc098321051"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/mk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/mk/firefox-95.0b3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "e349e36c833709f737cbdbe6effc7874d07b06bf92aa762a91a25fe218862a3c"; + sha256 = "45d25d6f46bb9807cf0b05dd8148049860e7a86c04bc814498e33c68a8958a12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/mr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/mr/firefox-95.0b3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "ab19ad0215db1d4a3dede497bc4ff13bed3f584b1238157b5ad13a1faf62cb15"; + sha256 = "f29ac0279437c0392dc77ee3176cff58f0d6c5bf2836e0e51877722fffa83cc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ms/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ms/firefox-95.0b3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "9971db2e0b409c58a6931e7e8b8b1ae3fb109c51ca6d8ca763a3819a20c4e818"; + sha256 = "1d6f1af7b50d0aab0385fee820c3aab54471b19d47ff6384f5198aa6ce01cc16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/my/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/my/firefox-95.0b3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "67f4e4b4f21f6b0af8973602300a5a511966b341e8abc6a4156d9c5f6278b523"; + sha256 = "33460df1b8f1db24347b97bb953b8ffa29895c2b048fb1ea3067bb6059122ef1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/nb-NO/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/nb-NO/firefox-95.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "3a0519e469b7e215f8a3fda16a3445f0dfa466ddcbef105926d00a792e5ec29b"; + sha256 = "6c3f0adbf54636e6d9e073d4e3265d54b4fd2f63f716562b7b1c0979f2dd792c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ne-NP/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ne-NP/firefox-95.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8fb2ef6a3a96c772202dcfc31e507d75baced0df75882135864fcfd376187948"; + sha256 = "b0c5ffde1b4e61e67e7eca8dcd91fab8cddb582a8574ac0c9cd68af2ea16ce9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/nl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/nl/firefox-95.0b3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "fd81e646da95800ef65d4f7d260be6f40d0c6b3f5fd927258c1b587212a26a3b"; + sha256 = "6beed6c4fa2915425f14c510ad979830cfad2fd72166b24df13000b2f8ec111f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/nn-NO/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/nn-NO/firefox-95.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "f7630d4b5ae51b163cf7aea5d8c1d2580b6e11a101fd74672df4b38e629c92b0"; + sha256 = "db6056951f6d1728b63834ce33f004d582d14b16d3b376c22518c4f1c7cc3cd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/oc/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/oc/firefox-95.0b3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c938d337a49dadeecf83ea0436ec1b2e1fcfad93a9a573eee1f8481df303af5d"; + sha256 = "faaa3ac02d5a7baee92e6ed61354df09152ea21d45ca4ed75cf8b8f8efbad154"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/pa-IN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/pa-IN/firefox-95.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c4ed4426a29a456c4232d4d681b5d7cf24ee26b80b0d03aa32e860038d011871"; + sha256 = "5d4d904aa5dd2485ba3e86313604225b077ad962d845f61e6bc6b8eabb6e7f35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/pl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/pl/firefox-95.0b3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "e5064dd88b7a2fc3a99a0d702aa50f9fa425442e6b10ae6b2f69daa7dcff3961"; + sha256 = "e5d83fb5fd509bc184fcb5f3adb8fb81fb463f1c2574e4e72955d33a01272920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/pt-BR/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/pt-BR/firefox-95.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a749befb91525c428a2861524b51742cf6a04f9d2c5e9b65b313422a29a54f21"; + sha256 = "aad23fc465192b61be02b5fc5f01740d20aa996d57791876aa19b7720dd40cd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/pt-PT/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/pt-PT/firefox-95.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "cc8af104daff4f7023d1bad24d88d8eae063d7810c76edeb3548426eb70056b7"; + sha256 = "30b5caf7c87eac3710d111def0de7e54fe526936615749e52c81064a8866e768"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/rm/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/rm/firefox-95.0b3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d548cfd5b4d4a7e4f1d2fcadde5686868ad6d08549ca17d876747d7ae51f0476"; + sha256 = "90a0e636e2cf1c09509d7fd3b0066b3fd0fd416278e343785d481b7317e1418c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ro/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ro/firefox-95.0b3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "02339108ac6c793ecd2907366ddf68864fc834c57358c2b8895684cffc8b92fe"; + sha256 = "5435af6e4e1925bb6acc900c317f1f125913c8bddb1e0f0e6683a9e197d9feab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ru/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ru/firefox-95.0b3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "35113139ff21db5ea21b14856927d08fdf4b9486cead60ffc842f5d0d525bc3c"; + sha256 = "97b81dbd06f70809aca62ca6286b9b16146c756b98ceedf637dc7ff63307bde3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/sco/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/sco/firefox-95.0b3.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "5ad751c892c034a839ebef7a5033af04555d7e9873bd0080ece3323c277dae26"; + sha256 = "bcc11d20f0a2e3ded5403a5e61b7eae5358c7b96c5aecbf4c67a00bacf2ec781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/si/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/si/firefox-95.0b3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b06f9b5301f89f3ee5a54f564302ab820ddc3c3e75ff2bb775c506a28afe46dc"; + sha256 = "b703797f67966452446b7e7201701c660518d61f20a0f68c927352a434b88ebe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/sk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/sk/firefox-95.0b3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "dddcc75cbd4bb4d88d04348d71043e6983e6c149bc509de92f0b89e4a8b728f4"; + sha256 = "55587531dc284fae18b03ea65ccded3c8b0e36c5f6a2302b46954c11f3bbda79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/sl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/sl/firefox-95.0b3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "f77d13ae4d55533427e6f61643688fbc7f5018c64058657e3af0b840e5a57ff4"; + sha256 = "f0397fc96c9c46c0962de1c1a009fcbabbb1da6a15aba5568cfc1deee1d127b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/son/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/son/firefox-95.0b3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "984590c9cb5216738e6f438bf976b1d7f948ae2a74eb721d32d34cd10185b0ba"; + sha256 = "f43039295499f068ef3e2ed9138c25cc6343bcbd68e845b58bf3a40cdbb12db6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/sq/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/sq/firefox-95.0b3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "1534c2664809eee6f08d63f6e90f9b68cc451753a7be05ec6271eae0102d9297"; + sha256 = "7c1ef14292fe2bc8bef11c2730d6604c8b82bf102c024c9560e9fa747961e374"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/sr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/sr/firefox-95.0b3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b007555569112e3603d0f82b70b88232a08790de47715becf1eafc263cc5b766"; + sha256 = "e5f72a3073be18d5a5493f15126895c5d8182489be19fc8704dc1cd92997d17a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/sv-SE/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/sv-SE/firefox-95.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3ebe9a9ab0f98d9e72111334fa14fe2756d14b7c55ca0961661a4b614b29e730"; + sha256 = "27b9c49f5334b06017cd2e953eea41c6a211010b316bbff9dfdf15a7276f293a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/szl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/szl/firefox-95.0b3.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "c0b10b4c6a40acf11625fde74091060550a127e50374d112357a7644e85fc7c4"; + sha256 = "b94dcd8e3442ab29763216ceba888f205ae2a27bb1eb8cd9d5d7473f6fec1f9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ta/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ta/firefox-95.0b3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "02ccf92925d17e23aaba13cfc30691cc7ccca4058ef3b5f687c2ec6d86be9131"; + sha256 = "fb6150c6231844130fa488ab0dc91fabf4e06d2dd7e9b8a6605689e84f59b027"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/te/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/te/firefox-95.0b3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "0a915418ae01e65f77814765719a8d92a8476e0e6b92b7e4f3345c741f9b9d4c"; + sha256 = "07737bb07b4bbea1474084aae0e1733d63f7bb630ee1c51bf006127e1491203e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/th/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/th/firefox-95.0b3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "0e528aea8b5ba9ad6cc432c73677702233fe40681e0b2b8a35069c97d6727c20"; + sha256 = "c11be11dc71a2ab9dd30cf2f11c858d7b4d0d28009e0d1ddb210fe2c83c72d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/tl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/tl/firefox-95.0b3.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "08643d52f23bf7bd945e85575675331213d1b7aaee907dee007913107cf06df8"; + sha256 = "70b6ebd47c72276a4002c4fc390204f8d741e1c04d85e24a53547120b432fc34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/tr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/tr/firefox-95.0b3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "fea788ada1b3260ff7effac66eae99cabe7f7d56c3c27a9f6ecc31fdb077feed"; + sha256 = "1d8b06c8141fe52e6417262b9a863d40061d3a02bb76b3084144adba86468093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/trs/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/trs/firefox-95.0b3.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "74709f4feef8ce28eda0b6b1c82dc26991b8099f0cb3f09eb2bd1ced924d4922"; + sha256 = "68cd9ec55a3dd9e02fb4cdc5efa1ef5811128aa344bbae7d249be5c5e3a8f661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/uk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/uk/firefox-95.0b3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7181038f9069573e8a043dd855efd0bdfb9434be0abe91e79f632778f26d3de3"; + sha256 = "b596c8dd7c495f13980c9f8f8ed8f2dd622f13c9add9a82009b053edc865b34c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/ur/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/ur/firefox-95.0b3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "82a8a5fb6f45d64ac1250465c469572ee8aea4af578158f7b6c697abd81bb949"; + sha256 = "ecf825d26894269e22c325116fd22630f6377d8f75931ac078ebb717a0112df0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/uz/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/uz/firefox-95.0b3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b2f7b1f0b296912a6dea8f4003ecc1511ed22d7546e576b5f9ef4c877311c01b"; + sha256 = "775015befdf60a0b7afd26a8a5c3fe50e72e34ade98915c8f8035c24d9f1a96d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/vi/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/vi/firefox-95.0b3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "8bf4701b32ae12d16d8d207a2344c2f6b208065c96166bfb724309cd223205de"; + sha256 = "285a179a4739adfd2a1aab9e83363b79ae61b5765119992175aaabb49c109e5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/xh/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/xh/firefox-95.0b3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "d546e726258f3b2e72373892bf11bdada96dca0f21e97acb4cc60af872f991f7"; + sha256 = "45824831250c36ecc54cbd01dd54451e11f8243b17da30604121f478cb44b634"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/zh-CN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/zh-CN/firefox-95.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "1e064ce673c92fe9ab0874a71583a9bac311a61850787b419e64b12819cd2dbe"; + sha256 = "3faa40d7423eb4b3c7a83326dd510efb7446eab17ca792e9006e6e1108d47112"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/94.0b2/linux-i686/zh-TW/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/95.0b3/linux-i686/zh-TW/firefox-95.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e3dc9f29ccc01f149f1a071dacdda21fbdca6906f4007ab1cd352b3ff6b498c3"; + sha256 = "d29c7d36ac4367ad8e0c758ff041602d873c95d962edffbafd132f9ea494e8d9"; } ]; } From aef01a7e7f9d36c3791bc6b4d1ee9d7a836548ee Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 7 Nov 2021 00:30:10 +0100 Subject: [PATCH 044/185] firefox-devedition-bin: 94.0b2 -> 95.0b3 (cherry picked from commit 422e19f7fe72a9d6473e6abf55e2983031733ed5) --- .../firefox-bin/devedition_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 8c3988389fa0..58976e8ee31c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "94.0b2"; + version = "95.0b3"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ach/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ach/firefox-95.0b3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "bd42904859dbd5891779c6e74035596669a498c4140abe36091746a74ca0eea4"; + sha256 = "3fd3329cb4813ed6c241067b6c8ee43ab248cb8557ade63d6019a7b77919517f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/af/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/af/firefox-95.0b3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "37fab70d161246bcc70e4685dc680a2941c8d92db5bd66edb18fa6e72f1ba279"; + sha256 = "2681fd38676829807eaca78013535db672a8ccf9cac12ea4b906898b148d680d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/an/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/an/firefox-95.0b3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "0960095aba64ca73ad838935a5bd78fc4773347b02f2bf8a08964cf15d0cd866"; + sha256 = "a07a3708c17587dcadab18e10205938311b4a74a668d820fbaf68d6029c86a75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ar/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ar/firefox-95.0b3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "40c097f94a2c106434fe95f35c68b8dafca84fbb887d416aba427637f83d7e11"; + sha256 = "02c6f9c848b62b9ef77a9530040c35645cfddbfecad6d479e6845ae93dcfd7a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ast/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ast/firefox-95.0b3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "41f7b6e15760548be4bb883bbf196175c912484891298a717fd256f091c72f5c"; + sha256 = "8dcc6a6f746a9f4d766a71608fbd67e737fddcaa50cbf53738780913c5762a32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/az/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/az/firefox-95.0b3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "1485eb4eee5f3858797871c710a83d7a79217f69002dc8915202080ce182358e"; + sha256 = "4ada53459d9f5040635b2873d21bb59da37f6fcbe3d389bdd42c3484841a3410"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/be/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/be/firefox-95.0b3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1ed4be4238bb0f427dd2a8b8542da9a989c88c417da48ac333dc0afa11ca5a66"; + sha256 = "81285777b5e76044d3e1bb66ac458cd1ec40d4c6b7cba8ecbb991869b628e33f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/bg/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/bg/firefox-95.0b3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "8b29bc7a4ab22512343e836998150c8786496354697574b8318f6c47da499949"; + sha256 = "f6b2d858c9a7dce01648b04d653d5835f2d23b660fe199b5e5816d5099c5b2a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/bn/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/bn/firefox-95.0b3.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "f3b279fed3f5542ed7d9222eb4e7bf7d36ebd633defc920fc1f2d50de71cb0b7"; + sha256 = "0dd4e9ad279a3a70d5aa4df2cbbfc59ce244543d0db5d95d8cdef19851a35c3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/br/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/br/firefox-95.0b3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f9e07894a168c6ecb36a0f10d5aff3335e6553d3516440bb3b2e0a99e34afde8"; + sha256 = "4f2efcb73678541f3e30f7b7777060787d8f21c7a9a93f401f67d29716686763"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/bs/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/bs/firefox-95.0b3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "4ef75403c6db94821419ab687c362c355bdd7864caa1248383aa33ea330bbe86"; + sha256 = "01be296b46d77a34a2c0548bc1e671a5ac22825a1bd34a280a69b12592800418"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ca-valencia/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ca-valencia/firefox-95.0b3.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "7f0488fe5efc807560dec19bf5ab8b9ab63fbea074e5da0c1ba10677fc37580a"; + sha256 = "76872161dd216803b8446a69c953c44d6e58aa6efd9ac829d3f07f52f6cb1270"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ca/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ca/firefox-95.0b3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "cefcdb247f82543e356e0aa3144a8594b40d5ebb6d612dbe4624ee23ce4e1ffa"; + sha256 = "b92b2b0c22515639aa14ed6526cc01e328e9a66f646113cc2dd3ab573ee8e5e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/cak/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/cak/firefox-95.0b3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "761d75f0764b94bc24a2ef480841639975698308f9a957b68c4cbe4487f0920e"; + sha256 = "8e9db7fced10d04d1de472fefdc67b56d1c272d3a5a656d3992f9d2f0aa4cf85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/cs/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/cs/firefox-95.0b3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ba098e4498e3b5e7d5832e922db7a75022cc2eb0ee75a90c587b8a605b9341d7"; + sha256 = "64f70a9be5f426f6ca3c7c3defbb70ef77f7bdd4e0047a171119af3a700342e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/cy/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/cy/firefox-95.0b3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "1ab3378924c5ec5677a0380307a34f3c0d5dc5278f14fae8cbc6638f95d887df"; + sha256 = "64f99c6cd821a36e398be38fad603f804511799cfdf5ee42983f31b616ad9f58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/da/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/da/firefox-95.0b3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "dd10f8ca235755fa0384c8e9856ff68da9d35f08f4207253f026393b4ca6913c"; + sha256 = "355b1cabe8ec16f3d71718f88fbb28675c3a6af222674d6e4da70e6cc4d14094"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/de/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/de/firefox-95.0b3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c82331eddd13d69a947555842d4398ae3c89f6bf11d4f57d7e99543aec3d720c"; + sha256 = "60dbc682145d8c3ef5c3526768bbfb495e95d6f2724051acca692e23c4f934ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/dsb/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/dsb/firefox-95.0b3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "4770d9fa07f4be586ed036e2c9b5655f8aa1939bf9b7148ea282f0926822e88f"; + sha256 = "865e6173162f5120168f449ed56eff83615594e4149d4b7ceb3b42cbfa4cee9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/el/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/el/firefox-95.0b3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "4e5beae917f4cc06283cd02eac07758383d9efb26976100bf8c0728e0cffc752"; + sha256 = "a38442cf1402a6e36606bb1fb8ba65a67028cfe57a787a38ed1495aae1adcb95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/en-CA/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/en-CA/firefox-95.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "38bc8dc87a3f381b17d2f38a15d6d75238a16fd968a6463773af773617ffa74f"; + sha256 = "f4a717ef12401062a8cf4eb2b220ea18d7999f02052b67b82cefc714b18a8c22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/en-GB/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/en-GB/firefox-95.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "52592454a7f3a3bab8b1613584da691641b6e25a391b430694e3a4a0a4b96398"; + sha256 = "27c1b9bb1fa53ef22a6f0c31b91a449c81804734da66b30dce4491f8531acfe0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/en-US/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/en-US/firefox-95.0b3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "ec2b8c578b1aed605987b29c89ad168589f736a656d05de555378a5b5adf2f16"; + sha256 = "43bf184b95b9ff25c415ae9fe533649c0108fe72aee24c56521893d05e2a009a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/eo/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/eo/firefox-95.0b3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "769c9355c29af59994e1c16671c73304d4f51ef8642331c5940b208388c5247d"; + sha256 = "5946960568857d35a1fadb3c3bb2bc9a42dc92e64d6652ceec64acc7e20553f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/es-AR/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/es-AR/firefox-95.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "8cef957fd4f6dae23193a51f6fe1bcd473245cb0e559cef09121b012bf56b433"; + sha256 = "7380846a63a5b8e8a3471d2af3c26b50719084e0c72253c356280f3e4ca3f508"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/es-CL/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/es-CL/firefox-95.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "551e4cbb9e2208189da351886127c71bc2b8251aabcfbf3868199f8fc2d75e4b"; + sha256 = "6d41074e2c44d1d0ba63c1648697ae2bb1a5254c41da00a1b1f33df1228a0443"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/es-ES/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/es-ES/firefox-95.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a54f96c6354616f3b55a67da80f347a402197712fe751971517130d35fe1ec90"; + sha256 = "021c5c9c71ac4556de6c7da4cf6b36e1693fcf0746ac57174effbaa61c0f5025"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/es-MX/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/es-MX/firefox-95.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "a47ed73f1c3323b1b8fe005c903e63773f2e1d2ac0956ec0159c3b335bc28918"; + sha256 = "c2df6f4a405f8b0194d1aefaa3862156b66ff9f488bbb3b720abc20a3fb473cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/et/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/et/firefox-95.0b3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "8acdbed6a1027dd9ab042875b8c0d2a612c6a8a86d8a099836dec7fcb7bc26c9"; + sha256 = "62bef0b8102b3809c46b792e96c130ecd8c2b5a2c53418d4e9cc72dff78b9b99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/eu/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/eu/firefox-95.0b3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "5809ce9075b2b4ec919e443b849f10185ae7d636009654c5692a9a480d680404"; + sha256 = "b4932b60aa4e36150dec1d8b7b5ce0a244bb628d37312b7c8a6f0867966e1773"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/fa/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/fa/firefox-95.0b3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "79ab5b7258434720299141ef6df0c70c8ac617e0c92fb7ad394c8bb5adf5515e"; + sha256 = "ee9418278f0e14c7e97258b8b17d100974457f1c59b9cc9957b9426a9846ddcf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ff/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ff/firefox-95.0b3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "3faecda595fe0dd9685786fc70a81aa2df19e019e724f3f52d06397cb853c5a7"; + sha256 = "b7c5d0ac455ed9ba1c5258b61e75b742ebf505a97e703d19f6813e1a013bf146"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/fi/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/fi/firefox-95.0b3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "bb9109efeab5b45a9fedce6dcbbab7e71f06f2e91204fed3dbe160e3d1b757d7"; + sha256 = "ed78862c15000473d37861f592cf878298cddb35fb721f6fd0309a16dc936768"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/fr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/fr/firefox-95.0b3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6b2d0b74c8eacd8dad7f946ca0f1279d3a22a0176595712859e4de72810c4fe4"; + sha256 = "f0ed0ffdca130d03b96948c304150aaffd311486040bc8d925b99e34d4039f8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/fy-NL/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/fy-NL/firefox-95.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "21f847af86e0806f16a28f6174178e0cfe1cb9bef8728e6d7e4cbd0e38683fd4"; + sha256 = "219a1c17ebb2d41b025eb484a9f2df23068b61e56bd34d6ebfb8227d3ae5e5bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ga-IE/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ga-IE/firefox-95.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "c75d79b0e12406e69c00a1975b59003e9cc2ac4467bf565eb17e5af9302ff467"; + sha256 = "793af4d583b68aa0c2102c81f3c677a547af0e335f00713c36580c93396f373e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/gd/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/gd/firefox-95.0b3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "1863a424cde413315e7b7b4cc0e39070c1ed18cc470b32c6a951952b95ab2675"; + sha256 = "97adc63c32a0cade64307695305f325e27cd97d3990bf6bc947da01b83872a62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/gl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/gl/firefox-95.0b3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "9eb9d0f8f8ba600a50a7005b7c8c165050ff8fb7c58586e2581a1d45781f8ff0"; + sha256 = "c05af2043451d2f33d01d75addcb8bb6304e4f30322efc8663aab2373186afab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/gn/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/gn/firefox-95.0b3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "8587fc264b5dae1acd2f6286d6e918ececfd4c25e2f79557faa2b9b268a33264"; + sha256 = "715b877ab23020886f7732e17df318d1e482aa7e63952f65fb6459748d53dabb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/gu-IN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/gu-IN/firefox-95.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f592615d49abf4cfe6e0fdbba0534199fc3a60c7a330fef45dd254eeae44d6bd"; + sha256 = "8134da66866cb14b2322d7ca346dc00a0ce402cb2931cf33e409ac3f811b0023"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/he/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/he/firefox-95.0b3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "fd19095f03f488c2d4303498ce5f11055104b76cc31073f4ac7d146255653a89"; + sha256 = "2bc4ba91f25dd7fc0171f7e8c9ff394aec894a4ab537feb13b0f47810fc35965"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/hi-IN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/hi-IN/firefox-95.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "39f6e825ff611a87ab3a86fe83f36c1036a81e78fb6cf96f619d165ba1066db9"; + sha256 = "7d20310861e6da853531130c814d22d6df4ef8c5d4eb8e0519e29f0b3b034ece"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/hr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/hr/firefox-95.0b3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "cf92d55b8e812c9d6ab4d4c26e1d7c1e6c17d211bba601f7eb9dcae9e0c735ad"; + sha256 = "8ebc8898ab223c6f975effe14e8507326bc545990cb55b5e8c0efe186fc3c4cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/hsb/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/hsb/firefox-95.0b3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3a3fe83158be2ac5839065b31d988ffe170e3945556d91959fbd47c50cffe6e8"; + sha256 = "f149923e2048412b7e9a4df14479536a2824923e7283b91e14dbb1cd1005816a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/hu/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/hu/firefox-95.0b3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "67baa75346bec877fd5f780a02e6edcf7f26f3568de4c175b8abd5a21c5dba61"; + sha256 = "d27522e4f7695d1189b59e5a4a926bddaf9e1aa6f9e8fddcf78be203d9645807"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/hy-AM/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/hy-AM/firefox-95.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "66a6143eb2d7e9de36e3c4320f3fdcd6975ffac37fbe33c32519470fcb072025"; + sha256 = "4e6b2e9edf9024b1021dc397d60630929e97a6bd1ac3a6851b44ac8ba37f4d01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ia/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ia/firefox-95.0b3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "c9ff2c7cee071e6e6a08aeffa0e2f733d13337f8088312f927e8b61c24feb096"; + sha256 = "429e1d0cc03abd17effa278a4f64abd4344e1dab0b5475539d406d5283a91dc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/id/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/id/firefox-95.0b3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "80b403898b67fb720e63dc4eb23f9dec28d526144c287a3a74478db7a083f088"; + sha256 = "5e1455b5cceebc1b1d7ee587640a928331f3db6d32228e37d8029376245f7ed1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/is/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/is/firefox-95.0b3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "6c3a8e686a74a10b6e360420affd461bb51e840a1b4c6a47fa057bd2e928ea4c"; + sha256 = "1e09c27534bc853fd82c1ea0c9eb3a86107f0f29724abf107be2e86c7d10408f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/it/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/it/firefox-95.0b3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "86d7c1a8401f706fcd8c54da28609355f04c3017f14cc32f656090cbe5641a72"; + sha256 = "f8d517efd3c88a110beee9e225b6311f2d986e05f91f524623f856b795290cf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ja/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ja/firefox-95.0b3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "15abffc6fde55d2212283001cc74bb250f8c5f088268409352950356fe2bb59e"; + sha256 = "73c91c7eced0dc7f2761adbb4c324583d6623b575ff9e6f2af6689308857aa24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ka/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ka/firefox-95.0b3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "ef5149154a366f71bbac944ca3a9c05f64695ad6ce0b0f93c8c24262aa287761"; + sha256 = "287a53af89cc9e7678d86e9c7341868e98493211ba93597767bb5883be1d5e44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/kab/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/kab/firefox-95.0b3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "1c5ce596f41132a7a085ced18dd7a2377544a360b19f3553de8ec1b652ae1c80"; + sha256 = "214d5e113e90ab0a18235aad810e7546704a805a8761b5c53332b28167376708"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/kk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/kk/firefox-95.0b3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f13adef30dd6b0b05faff543c1e405e9dd9e29da718dd49831837dd323732c22"; + sha256 = "257047f79489b815883e6890e6e4620f2710cf937668d9a1c2b11cd6fcb35264"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/km/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/km/firefox-95.0b3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "e32051813912b819150b7509dec726dcfe206a0a8210f8f7b19db1532f683cdc"; + sha256 = "14fca948f72eedbe8a4aa7081d539957c66fc336cd9c64d0ba85a003156b93ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/kn/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/kn/firefox-95.0b3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "4b94e161b64db88cedfd119962647118d7124853d20c03f64d3540dfafffd9b9"; + sha256 = "c78c4d9790a8f71b85fc53f5856e9b611c4e252207dcce0093c6b2feee23c17b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ko/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ko/firefox-95.0b3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "ef05cb08b2bebccd2defb0cbda7c4bbb529e45f0a4d3de23a98c81b201f7e5ed"; + sha256 = "7f9cd61bce4f20ee219503db674250d3d09b8d4e96d80da8d7c90374a73d8c6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/lij/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/lij/firefox-95.0b3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "223f9f000297769f259c1536b51598212524ed202e58d225b0e6387afe073a3d"; + sha256 = "0b34dea142d2906fad1bf28a86845c170789914b2207a7b77ace49859ec68c03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/lt/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/lt/firefox-95.0b3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "42769ee6bf135861247c5d60482ddcdcf7f5e3f63864e21b50e93398452e573d"; + sha256 = "c7f254ffbdfac024c186d00a71eae7a4e0620a4e0263f50b9f8f8f95a33242f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/lv/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/lv/firefox-95.0b3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "d3f2cda8f808a32e1fbd28054232a177a46f3db232806281c3ae1a31a4522b57"; + sha256 = "f8e7acb4373f82e8d62e62726442ff007c8b463ce07678e0da4bca8387319dd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/mk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/mk/firefox-95.0b3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "89acc976c5cae171aba6dd2fb7e3c2f99594533bbbad0c27eb2b14ac4a1ae691"; + sha256 = "36d245092a6f3739893dcb2763474c762905eb7233768f2739e9381976c7748a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/mr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/mr/firefox-95.0b3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "efa3e483041e64c481d6ef10227fe8ae2b3221285b3a631ff47bf0a156cd2bc9"; + sha256 = "f2d0d084482d2b65d4966475e8edac1b1c94c8c2d04cf1bfae58e6dfe5698e8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ms/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ms/firefox-95.0b3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "30891b9eb724b0dfa216c31298e9498145693f12a47b368de7bbca87f25a608e"; + sha256 = "9e1e964a2f64a6a01fe600091f8d3a45334e7710c936cbd3f78e17c593d3db54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/my/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/my/firefox-95.0b3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "34cd51cd386cfba4566e758615f65d3a74a072b57479fee738fe67796d09e7d2"; + sha256 = "d35e42e21e4be92f4921fb886eeb06582b01e142034814624956a07b73c92aa0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/nb-NO/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/nb-NO/firefox-95.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "44a38252170ff2fca7722e4cbf30ca42fb268c70eb293299f8350729389d67c1"; + sha256 = "89ae0d9daeae3fe3965084068d23f3769f8f40ae90bc483135c48b48b8f27926"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ne-NP/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ne-NP/firefox-95.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "86042545a3c9caaa29f200d4e179a364548d42905b6a12d1dd0a3cf82c1cef14"; + sha256 = "39087dc455abdc14bb43694865320888326c1c478ed05de9117157edd241b15d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/nl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/nl/firefox-95.0b3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "9c2021434b4f52e2ddd1af5953359e7fd6c783e9216790d09909434e35dadec9"; + sha256 = "988d58514ec177c031d8df463de1f9251c6ba932123d96c4ab3adc5ecd0c224d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/nn-NO/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/nn-NO/firefox-95.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "12cd5d82ed9d74f44e5eb6371c45f65152a74342add2828bf6927c384471da4d"; + sha256 = "161ba60c1648e66f89f0af272eb848d2654a8af9e1ef7f06d678ad232b09a24b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/oc/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/oc/firefox-95.0b3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "f9d56085b622cc36a1559171ad6bafde322630d638e9a2934dbe6ff933c41a04"; + sha256 = "22321b31f4a20a43c838ebff4c9179e1cb73f4333acf458705c15db5f26f772d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/pa-IN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/pa-IN/firefox-95.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9f1557c39b960da9c13d7bb25caeb03d8cc35ff1e2983682c56dce61ef02bc97"; + sha256 = "e1fd6a78938021707cbdd966f08de7fee0cd0f96a7030acc7169072e9735e3f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/pl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/pl/firefox-95.0b3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "c7a0989eaec77ccec91464fce8c443bde4069eeb91c069e7919f2fc09715d3b7"; + sha256 = "0684e74c1ef60f6e9db51dbbf0fb7f456636665173406d634fcb474430f16af6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/pt-BR/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/pt-BR/firefox-95.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "4d36295b3998c0b512d6757899c8a88f6e960d81fd7ac1eec4585f4f90dc10cd"; + sha256 = "27cb20a8511ead70644dac22d552cf8a33716ee55ca4a8e31f145c41fd1f5109"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/pt-PT/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/pt-PT/firefox-95.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "a0d88e57288dfaf4aaa5f133e5790c6de78bfaeb66b1bef5984c522e05e58626"; + sha256 = "857a616824dd7c1776c181628b732f20111c6de8192f8d772711cbe12bb659b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/rm/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/rm/firefox-95.0b3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "5157ae9afa5b8ee193901c1d07dd993261b997be7af0fbde407ec938bb2460b0"; + sha256 = "aebcf988963324d57099078474777f8fff23d78bdda0bb8e8a07b78510dc822d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ro/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ro/firefox-95.0b3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "73baed0ba08e472f57ab2897cbba7a4edc4c63a80ea5bf374a65c3fd8d9b68d0"; + sha256 = "5dad61bf11c5efff6068c2745078474774a859859f373782dacc128892f89556"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ru/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ru/firefox-95.0b3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "8b56328580c42eb44669765e1fa912ce4e4cf5c8f61f3bf32f011661b59b31ad"; + sha256 = "c99f75d57e2d39cacc7df8a1031b6f25b0e190371e78205da43d39ebf31e5456"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/sco/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/sco/firefox-95.0b3.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "6b8d7cdbcc0254e5d48190032325af651a068f5b53f04b258b2c04ee44300fee"; + sha256 = "d653190f119bd11cfb04fc61ead507cd0f1e2a5e1d95eec3f44c3aa15a593dc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/si/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/si/firefox-95.0b3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "d31d5b07b273d9cd69ce5422298ba4a2afe874c4bb7e86215ad9abaa5a867786"; + sha256 = "d3ed08ab23f62e4430bac90a840c47bcacc88cdb0dc22a3ec6541e93ca4ffdd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/sk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/sk/firefox-95.0b3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a9cb13bfd2d8b38a144c82a8b7718eacbc26f241a75cc9b42c044130e4acbe56"; + sha256 = "48864af2fb4238bddc71cb079c5b8c2d3bac0fd71a086c7cdc6370c686177c58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/sl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/sl/firefox-95.0b3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "bbe947610a3eeee8d93d2f42504d9fabff9574519c67568305c3786df121a0fa"; + sha256 = "8b4f326420234eb8972eed66780929db4d37ccd8265ed3dae87e7754f49b6563"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/son/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/son/firefox-95.0b3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "67a26046e446d455c1acc161736e0ce0077a7486bf645e03eb2cda98b5b08e8a"; + sha256 = "0c62ae0a67d83badddfffb599c7347371cd95e98d25c39d7619ab708a45b48cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/sq/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/sq/firefox-95.0b3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "c97fa4c925a8f78fc86e5df390cefd75dd881c27e328730bba7fe142673bb2e0"; + sha256 = "eb0ed5f8673f04c209c946adf3492d187cdd6e275c6b62aa0e9e2007953da2d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/sr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/sr/firefox-95.0b3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "acb8f82e49472d39a771bf54b0f7999fde4551b165db334c53a2bf91b84ae83b"; + sha256 = "ff835d9cb24936714707df0f3424fc0f311f1de25914ec0ae079626e44125c2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/sv-SE/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/sv-SE/firefox-95.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "4e2b4a35ba5b3a68ddc43cc268975d1d717a836c6e83b28b5857cfb63c1306e3"; + sha256 = "8dab744e092bab2d0ec6ee9517d639ac4cd3190a617402602d2124f6077743d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/szl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/szl/firefox-95.0b3.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "eb2680babe9f84a0ceef228303cdbe6576acd8fb6753026af5dfbe7779ef98c7"; + sha256 = "d204778205b703e15200acbce9d82bd4e76dc40206328d915fd17915f5a716a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ta/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ta/firefox-95.0b3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "0ca07506b739e405f1ac3fad1842cb3f7993c580c1c9d65a0cd805dd531d0f2e"; + sha256 = "f23bdc488e2a53871a2f664ea4dac52607476b35b6abff09fc7203c3b806f829"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/te/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/te/firefox-95.0b3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "c8660dbf2ca596dfb0ab28178701a8718f6ba7e556f657a19e1c50f69d80edbf"; + sha256 = "3ea085d2b02aefcdded47157203ffc8e7addb6828ffb241a03e4ec955b646129"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/th/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/th/firefox-95.0b3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "14a935d95568d0c8f723031291c647e6548880f66abb082319303832a3b8c212"; + sha256 = "04760547a1e18dec91b2bda9501aae9cd3eac6ff17fd1dd0c31b8dd0491b03c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/tl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/tl/firefox-95.0b3.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "c6b1745e717ba35fead6cb9c3c735084e2b019aaa4b20a0fc9af480b9703ae3b"; + sha256 = "64f7c59b2c5e84e30329ddaac5206f14189b22d35d6214b1cbc13a61db804131"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/tr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/tr/firefox-95.0b3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "0abfb41a070c5bd2941d29b3c84ab3d9eed74e653bb6177a59803301a27b5465"; + sha256 = "bf06ea01a54208dc724931d16b96d091c107198ea6e5ca6d979f111b9a1fda4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/trs/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/trs/firefox-95.0b3.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a405fa57208ad50ab282f87725fa47789f3afc742c6bf65b872ff2e1320dd83c"; + sha256 = "789a98876b52043bd924b71d68858ccabf25061ad8ea25151cdc08d773ed88f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/uk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/uk/firefox-95.0b3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a463362bda810d83d86ad8e516cd784ff037f8571a2530ea409c8c6539d5af82"; + sha256 = "9cf8beab66162b0140cc7ede761331b82effd663c05b36031ff563bd08d951ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/ur/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/ur/firefox-95.0b3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "bbe19675765e179d7277dcb97fa46cdcced95ab1fc52f88bf282d280c29fd376"; + sha256 = "5b6a8de8051e8083ade61a728dba23e7c2b5484d990a9f7022f0356f0dea992a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/uz/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/uz/firefox-95.0b3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "4cdeb5836d53de3234e42d2af3db899891500ce9d6ee1ab5ef8ccf6e13312e6e"; + sha256 = "0b1887c1a2f0d4692b39bb1fe2e4454d586476d9f3972903ec9b2fd009557cb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/vi/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/vi/firefox-95.0b3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "db8690e204c87d956665191fe767212d4c5a12797143cf48552d24cf62de81bb"; + sha256 = "df016a17c78cb29ef6f8b6b5f4314e358ba3407beb97997d0e97ae51acc7962d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/xh/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/xh/firefox-95.0b3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "6563e14b33dfe307967f75b06bb18f5a2f6ef5de4efcb7f59b0efd0727f95af6"; + sha256 = "a86a366761b6af5e70fbbbd10e791db65e17d5b27dac27f5783c79421f6dc639"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/zh-CN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/zh-CN/firefox-95.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "a3e6b37681f053b771e10a745b0eadce52424d69cac40896112fe317f424701b"; + sha256 = "66d0221e172b22569c6b3f5bb32d1cffddc9ec70987a464e43392b082bba62ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-x86_64/zh-TW/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-x86_64/zh-TW/firefox-95.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "cd4e160499499bc09e3dc813376711d5d084dff4a2728df4ebc611617a6df56c"; + sha256 = "419161b9f96062de4b2b17c5052030202ed4be2e707f4028b73b656168423921"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ach/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ach/firefox-95.0b3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "4049dea6bb18ee343452b59bae0072d68b1e8b7c75a22ac03122a56f0804dd55"; + sha256 = "a2c16ba8478d501abb48ca6129507942a017f322c4d29cace1f662f8d50b351a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/af/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/af/firefox-95.0b3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "7acdcd0346fef075473a3585de300b90bd00b2ddc9bd7ae2ce094163b361fbd6"; + sha256 = "1f34c7409880d2e3f4eaefd62e47751859a5fed0a7f1615f69631edda1494973"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/an/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/an/firefox-95.0b3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "1e8da8a7e6e5b55ace65c4d7040ce20a2829f222f6636b3638f849af8d8d180b"; + sha256 = "5c7e0997b409029bc3ba64574d3b6f79820cb9cbd21f0d311485150aefdc4ba0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ar/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ar/firefox-95.0b3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "3c6502b58e6ffe364ee1aa2dcb2b69448e45885211a99684b5ec725a8945a648"; + sha256 = "81ff44fe65466070288bd6fcd4b2d4c9969321597ef9e1773702d098d74f33da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ast/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ast/firefox-95.0b3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "ebf2d99fc7a64876a9541e27a77cbb7c0a2c69deaa0defeecd1e2ddca2b11807"; + sha256 = "34d2b7eb300e0ffa2d5fbcbe061d536a565867853f88eb3388ea1d32684b32ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/az/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/az/firefox-95.0b3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3630b509a69a5511fddc9347b89b8afda1c60ca54d42cdaa30409593a7eb8f39"; + sha256 = "b79807a1500211349630ff2ae997462e382011b731ccfcd9b0ed787520d7b075"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/be/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/be/firefox-95.0b3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d112fb18d55b5381470103be2cb2a068f3712a1ed16912813f59f0972d8cd5b7"; + sha256 = "8029777ac9cd721befa5da4a4fb2af9f4e2d7bd22f30c8506ddc739d8fbf31f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/bg/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/bg/firefox-95.0b3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "b0c8a0ee33d50fbb2a6d9b0770a7b5fe85c7f8a00eb15cbbc57abc682b7f7cd0"; + sha256 = "907f5b83e413227e83bfa9ce7caff0248969690a822de170924538a2d4480616"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/bn/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/bn/firefox-95.0b3.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "63bca544f093ec07b5813b2b692edcf6ed1d46068f1a736a49d55255a7a7a23d"; + sha256 = "e0e553ebad27775fd625babe053c9adc5452a8cdf1d495632a9961ac825549f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/br/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/br/firefox-95.0b3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8b419f06da716bd14f6d6c0534f2ebb622c25a8c52f9f7e03b4bf596657e8612"; + sha256 = "a3eaea3797b81f305a0a2162a0491f2f7a22d64308e076ec44ab4866e7100778"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/bs/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/bs/firefox-95.0b3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "edab469f4b69d843a15a925a667c8fd33fd16cbbfcaf4ad16c8974bef172cbbb"; + sha256 = "371c7960a78de9fc652ed7d3ff56cbfa7015085e2d430b7cb4d30ecf908fc027"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ca-valencia/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ca-valencia/firefox-95.0b3.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "3be5d8044cd4f8a474fafe864f8264776ba5a478bed7510c6530ee7966d25d3c"; + sha256 = "2c15a7bcd86c3db9f0fb796eebeb0a984ed9f2689654b8aa22abaaee70e25b40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ca/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ca/firefox-95.0b3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "b330165f8326818276b06bf4592984a4061c6236c962dc54d060318aa2131481"; + sha256 = "d1c667da851018502fb884f9fb4ea16e989155cd179da2771fa94cb70d23b325"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/cak/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/cak/firefox-95.0b3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "d705ca432b15db9b0f2ed0b2067ee0d236fe788434dc066b428c19d7420e34bf"; + sha256 = "69f13dcd0cd9a7014e4555f47559a4e5b515d70083abc5331803a6ac58f28b9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/cs/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/cs/firefox-95.0b3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "3116ba93d2926b38d6cc372d3a7e8c746b0c1da14237ea8c18ac51ba7f3aa8e2"; + sha256 = "0151d00465cb9d23fa9c43847e09d77d7d4bd1892efdade7811bf1f83391d1b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/cy/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/cy/firefox-95.0b3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c598db707229b9d19723943e018b52b45e3a6c129c3541cadd64798127c403ef"; + sha256 = "960b42a14ba87d99549ab66677dab4bce88551fcf44dc3240f29ead31fbff435"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/da/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/da/firefox-95.0b3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "31a2ed6b5d9749319e754e259c9963a195edcc93349429856eb71eecf5b4395d"; + sha256 = "f866c0217a77b9dd77234cb2b83e63858bb227e7b011dee69afcb21c0dbe0d66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/de/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/de/firefox-95.0b3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "dc3734616f5d1d997dd0af6a16df090ed28b1945d4f621cb306030cd3ddee06a"; + sha256 = "28caa97e671f9165c5b6889a678751c41a83b13ca1d7a9b1b6ee434ba8c10319"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/dsb/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/dsb/firefox-95.0b3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "4d11e58b9885cab5f81bbe55b7976d63079d019bc659c23eb537d09a7d527f92"; + sha256 = "519cd1d26de63628de5edc4800c10981bf516ba81484d2c14d15488daf541988"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/el/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/el/firefox-95.0b3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "24c23df7db690d2f998f424cd90e951986378a861ef4c722e6517465397c69f4"; + sha256 = "7dd982bb79a8693f935c5f98b4aa015aed8034ff2915e8766928a06f6be7a2b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/en-CA/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/en-CA/firefox-95.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "71a3e42722b84fec6b286d1b009270d40022d43b929b8226961c589059262da0"; + sha256 = "0ac683ad5725c5e793c646d7f9723f44de8a7a4b099d60683df59d0143e26e70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/en-GB/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/en-GB/firefox-95.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "9e29763788ae6df281ef367def18a19385605afc211a888c24bb0971cdb2a073"; + sha256 = "37aa0a3fbbb99970c3b6ffc8e84707ced9af815cc32c12f07f51ab22e1f00b85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/en-US/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/en-US/firefox-95.0b3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "df7b71e338f62f841bd5154aa454324416043bb0485c6ccac8fa068240a5ff81"; + sha256 = "e33957b8729f4c28665039232ea8ba670dd6c8ccc92cbc18453e123f578f80ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/eo/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/eo/firefox-95.0b3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "370e0b201f706dfbf157cc49d02adb36c64e660d95dca4a10d4020c77e4d3e59"; + sha256 = "42aed0847ab7de209cd561a43de5dc0f598646c179738ec905ef814e567edc99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/es-AR/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/es-AR/firefox-95.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4c70649db14fdbbc04a5d9cf464cb538f8e652c26e79edc5f388c1f0bda4377d"; + sha256 = "3101bfd23d31cff57f40e7e2f517ff592bba974aa45f893cc76a2589deecdf16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/es-CL/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/es-CL/firefox-95.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "151f18e59c2f1a986ae07f0dd8184bc5d6f3f8d1e9f02923d433740620fa47f2"; + sha256 = "05a8f3c9f12208b396ef3a38ba001bd688f98b730d52ce5b2887c47f7a2fddbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/es-ES/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/es-ES/firefox-95.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "2298f5411f24fdfb1e1e0488643cfaf71caf1c1e33823f4b7f4b705f0bd663f9"; + sha256 = "d6a33146ed8ba2dcde668e56b0d6baf76402e6c55c39fcd18cb6927d4120adf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/es-MX/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/es-MX/firefox-95.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "1ee921da00504251d898ffad33a524c0fe306aba8b555d973e058c7f5950e680"; + sha256 = "34407e3d05a5fb50dd94559af7381348471fca04b03fd8c3f3aea11c2b7543a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/et/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/et/firefox-95.0b3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "dcbe2aa046fe5123a53d6f29ea7961c214a6a2aabeb1d8b0ea586b6cb769a656"; + sha256 = "376e9030777f32785517a4fff01b9c125a92100965fc560627cbd61ef8e9882a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/eu/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/eu/firefox-95.0b3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d5b2cc74d0073a47c6ca32ce9fdfec34360e09e00459823a04e8780eb24e427c"; + sha256 = "1b718ceaa8f0c807c2cd8f0fa23c29b5907f5f35d024cb409af537f379a38d38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/fa/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/fa/firefox-95.0b3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1584f4daebfd7dea873f05c86af3625193f5ac376281229076f4e5d3a9c9c0db"; + sha256 = "d8568027e9bd8ff2366a6289c22cb8f2043ab7aa8ce13f6bf92f5a36ec842a7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ff/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ff/firefox-95.0b3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "263e74577c0559fbe65f157ebbd199e4c31a092227c79378cac6a52a263aec26"; + sha256 = "6143d1382bf317876b632db2e1c153dbabd9f977952aa5de90f1dbae4ae90d53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/fi/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/fi/firefox-95.0b3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "c9dfd9166aea3a5ac1d124285b19e65914908a96614a5f02f089d05b8a8b67e4"; + sha256 = "dcc0a0c16a26c86bb09a88b150f897806958dc8479f074b28dd057452923b8e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/fr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/fr/firefox-95.0b3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "9392bc742f0b99eee0b44b7f936794a5098eda0ee67ce8720d7263dde1ea459a"; + sha256 = "7ae2cd7e392c1c6e47ff0cf0b47797b4a0a7ea7b6554a93462449997ae91272d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/fy-NL/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/fy-NL/firefox-95.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "7be3b93ec071fd2e8759a29a0eea0486c0eb7f2aa091e26ce3f2d3e0e47d0e23"; + sha256 = "ffb5531ead8406c5312e6a16b90d3ebcc27495dd37b167cba6186d838a007c78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ga-IE/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ga-IE/firefox-95.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0ac9df6ec6d46588028af9c462a3ac9a6e97418e2d3cd4786f1f284069c60b80"; + sha256 = "12012e40100c80606e076548ad1738f74bcb4cb62b44afa2e89dcce556756a46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/gd/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/gd/firefox-95.0b3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "430016776249d100bfc5a214949acf41fa9065a679f99f05abb4931ee8770768"; + sha256 = "f0164a64438bc280a726255ed2887baa9df6021e057558deb6873d76c4157d52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/gl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/gl/firefox-95.0b3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a2c4e3cbfe150218b1d9aa158fdf22b195dc85832066dc7cf34ff1caa6e241d7"; + sha256 = "0118909f19a14f855b747d6f9c0257b61ebb26eec6a50337b96a8ad36ecf3801"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/gn/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/gn/firefox-95.0b3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "a5946fd82663f7127f9ab867eb8c1b09aee2d00e287ca78809cd76ebd009894d"; + sha256 = "49b80164481a3b9786bf8a2feb4f05205eec94759781ef6db34664144a2fa13d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/gu-IN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/gu-IN/firefox-95.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "9474d901bf617bb76ea3052225086689dd59b9d17a0b0b86f36ea501829cffad"; + sha256 = "c82736afb3a9394764c10e77df765822c4a63703c4ac10a12a50dfdaa99aceb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/he/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/he/firefox-95.0b3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a91230f5c6a47273e134252333d8146c3ac7a37a5fbe1e52e5cfc68dd5a813bc"; + sha256 = "2d96c2d26df3d8c748ca5964f0d64cbe3a19f0c2ce19c20aeed75c4cb8ccf75d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/hi-IN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/hi-IN/firefox-95.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "52b5c938ac1920321612adf241fc6618c878abfb31103e72e0634a1dc1416da6"; + sha256 = "e2416cd7591675eed8228f8c7537d351ee98f8e569d21b7c15e1de958d0686eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/hr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/hr/firefox-95.0b3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "32046eca67d812d36508fcb918292fb7c50c7a663a439a1cdef1779dbe470982"; + sha256 = "c1ed97934c29e95aad7b57ace5eecd5fc25359eda349d08456384135cc5eb1f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/hsb/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/hsb/firefox-95.0b3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "858047b2ca9c33a1177625b00b2a46feae836c3b1985b5dc699120194b7592d7"; + sha256 = "510137ee420ecd1157f6fa91a6433313625bd64c4ebf6b6bdfe20ace8bd8881b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/hu/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/hu/firefox-95.0b3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "293c677e1b7dd29832f94cef92af1b646fbafdff6597db8cc384bbde73c3dda4"; + sha256 = "65fb0b64ffae3627028377507138bfabb9ad74e8c5a828f0cc786ad04ac81046"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/hy-AM/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/hy-AM/firefox-95.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "0cf4541c98712014394dc6438536a98fdfeb70993aab1c323a30d3f5f46511f8"; + sha256 = "1acd294876af4206160785bc8c9f55faced43a0415ce039b04faa413736fa325"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ia/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ia/firefox-95.0b3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "b1367ef6cc208b39eb022d9767adc0b36169b201ba5a30cdf9db6e08afb2b0ce"; + sha256 = "097e1b19c26437a24b4ee6d5cb0265617eeddd4b9a8171385d16e8303513759e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/id/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/id/firefox-95.0b3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d7f7e0afbd30dff3611b5785e0570b31aa536f67e3d3542cad14beb88f26bbe6"; + sha256 = "a0759b8827d7e891f32bfd15f3c6db173a6ae1a11f19bc6640643598bd165e20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/is/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/is/firefox-95.0b3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "75b5aaf6aafa26d3b4e51f65cf545ca8c673d71e9a6e8e047814a681d6a7faf3"; + sha256 = "48abe4f0ea000ea344c83e4e8791cfe00cc21a958dc27dafbca1ccfafd761671"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/it/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/it/firefox-95.0b3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5b105dab4223fa1b0415e995c4f5e71139427ed9024db5a6e11cd93e3bf370c0"; + sha256 = "fb582c7179b5d912188d07fa8e7b5e2adf97122465d31645ec4ff31e6579a441"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ja/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ja/firefox-95.0b3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d1fb1d2a0d26bb5cf297183639078e7b631840280313f08c80c5ec78e4cbdf8f"; + sha256 = "83092e4f2a61c9655b67247f3d34669abefa2803adda427658a3b4d5b5f3f1ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ka/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ka/firefox-95.0b3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "cfd785976f05874dd811c12678a73a0c2804caefe2a01a55839a81f4cb56e580"; + sha256 = "c4d8648f7eaec2268fc94f1a08e3a59f04ae891e0b43dd73ca9a873ef9e87920"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/kab/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/kab/firefox-95.0b3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "e57ffdeb5b3251bf79a3a2308e5b61322db608c0756a61fe28593c7fbfc3da7e"; + sha256 = "213115ee45ec7639ff8b9e9d8a7f3638e1434339a564c2514d6a804afa18c32f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/kk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/kk/firefox-95.0b3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "eec7d365e1567a4b5ae818b2b42354d9f0109c211bd38af9cdede58c687497eb"; + sha256 = "c2a77e482e8c60abeeb12e06e0c0c4277d8d26ad1414a86d3c6e3df2a58bcd35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/km/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/km/firefox-95.0b3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "42f1ed4bdc2cb8098d87b4a313263a5af352a0c3f4cd0cdb7bd07fb7db54bf99"; + sha256 = "1da5133c8c0eb9ef97092b7c3e2a38dbdbd8026173fcc80e74da20a0c2208ec3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/kn/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/kn/firefox-95.0b3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "0bd163bd0de53e70fb53bd95aa560203d3af91233e6e75b2417fa7a7dbcb0969"; + sha256 = "ed1d785de41ff78d2a3891349c44ff61aa0d8ddc2efb491ca0c2bf2c94b5d8b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ko/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ko/firefox-95.0b3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "304b6218cf1f93735589be998b09f9b7ab8dff300ba8b8d2ac28b4a59925b526"; + sha256 = "5559ede0cbcba00f9d4dda5a3a5809d83d1484518a7f92c296ac6cb7b6a2e5c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/lij/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/lij/firefox-95.0b3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "e983f5c04ff113f532e2125c4cbcc474569975eb0b48810e5b64348bd100c51e"; + sha256 = "47658288c6b55b4d64628cd119236f0a3bd6b6673bd1127efa7247e9a86f6ef4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/lt/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/lt/firefox-95.0b3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5e77dc75af6951262e7f427ac18f9ace83bb28171a9b3cfb9c702093542bb2c2"; + sha256 = "964cc674d2afd867203965210dd77594ac1303d5b1d1b2de3cf7590f44bf9d3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/lv/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/lv/firefox-95.0b3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "99924cc0493a8309a947cd190758b7a0656c34be18b0f3cb02a6b09719cee78d"; + sha256 = "f22df962e2b2c857f6068ea2611260d7a8dff86fc20877e4ce5b2457e7c1f1e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/mk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/mk/firefox-95.0b3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "23c0d0defcf9bd212bf53a7ff4b6ead8787b0c45a0421f27e403be8067bf0b69"; + sha256 = "9bccdf824261c2241e2c925bad37298eb6311949e568de4c525ce72723e9472a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/mr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/mr/firefox-95.0b3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "91bc941df086f34ecd6ca3ed6116fb8d90bdb5148e4c206f6cb377c720dcf90d"; + sha256 = "91ceb3394fe9d33a81955ccba054163c1012c5219b00a532d3c7e007c0d5aba4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ms/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ms/firefox-95.0b3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "83cee1afe5711c1735e9f7242760f5a06c912d1f488a2550e6c377e56c80e837"; + sha256 = "17c4dfc95a0413c3d2b599335efdca8685553da02c66347ecf2b6d64ebcc9a36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/my/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/my/firefox-95.0b3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "d8111a8274c916dcc7d19442cdab770b3c1895debf8e6e073402e14fa647a2d7"; + sha256 = "b920b16f5d6d480e2ba82cbe266844e4b4d760ed768edd955d8cfe69c194eea5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/nb-NO/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/nb-NO/firefox-95.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "bd45064a98e01c6048c2f1497d17d8e9fc695304076f7e8e3bf91d2c6ae0aa1b"; + sha256 = "97c26af5588cb00b063d145ac9cade31d46c86fef2320f6b7cdc6cb5dcf7dcbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ne-NP/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ne-NP/firefox-95.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "258a79a425ac0de620e1e05a9710a2f1c6972955bdd075f39ef3d45a8caf1ac0"; + sha256 = "7256e3dcce679ba4422f167def4733e63aad07f49fb2f7d98478f9c04d1eda4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/nl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/nl/firefox-95.0b3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "6a7d5d49b97b08463280935e9e2cf22cbac4e00416a113ba320bbc6379604b11"; + sha256 = "073255f663230e17878431ce22bcf6cb79c3782599c8f49027c776dd824c27bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/nn-NO/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/nn-NO/firefox-95.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e85e22c122266db32f28c2701682be59a0ebd5991eae47dc83f1b21ace3a486f"; + sha256 = "01b4f98e2114533f6a80fa458c13f993a470029b797a5e0fcac63ba58063f8cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/oc/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/oc/firefox-95.0b3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "f21eb275072e63bdd5508d10ab07f2fa3633560fafe45c522f29c90fd7ba511b"; + sha256 = "041259974f4aed0698c30d66aab34b5e7feb6d1d4b5c466038d6773b8d4f6151"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/pa-IN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/pa-IN/firefox-95.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "26c77efd91b134b19a5054be1ea1782ce9026894be5b1fa3d563cad853b2aa79"; + sha256 = "a275bd1efe636e16573737c18feb830055556783703b1c712149cef2da416129"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/pl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/pl/firefox-95.0b3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c003cafaf65b18bd89c10d7f225dac95e254c7792499379f962795da67bf9920"; + sha256 = "e713eac0580014540d4c522337909fe61da547ab764d47e8b8ec2e22fc2b3d19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/pt-BR/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/pt-BR/firefox-95.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ec8fdd1b154a0cc44c7eb573ee46a52e191115ad6ce26b1e5e5e6d58c5feb790"; + sha256 = "d1071491df87c5fb15e91764353f6aad183fe7c5f038114ced8f1f77f1f1ebca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/pt-PT/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/pt-PT/firefox-95.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b699ab3c9034a54111c91aec2292803181466f482fc36a4d56ad2ab1642776e6"; + sha256 = "d86e8c91eae6ef5821b378a7924d46f522f50d972f35642683f1407cbdbd608e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/rm/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/rm/firefox-95.0b3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "92d2ff95f2b4a4933df5b94e314d9b4ab3957cb4abf852b93c5f547e3c5cfeca"; + sha256 = "ef71fa9d42c0869d566f47d80992987026926afeb6d37b5e79e7fc1d349ccc18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ro/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ro/firefox-95.0b3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "7ef53acc59832375854cf6795bdd5ef02dfd94bb50ed258b981364332d4f1b98"; + sha256 = "a5c5b6343be01f7ab99ce21ef2138128d77fca2e3ea86836c6ea95bf461a972a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ru/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ru/firefox-95.0b3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "65c0596d5d6d889b8dd7bca44c302b46fac0e584fc8d7b0e31db28943886e3ff"; + sha256 = "62d94da86719653a2143291b9dd201cd1c7ab54379aa64a688dc9264c100ba3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/sco/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/sco/firefox-95.0b3.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "5f07b16697dcda7129127c2b0d69f05f6ae4d52b1c6a158c979ea96f77124b52"; + sha256 = "99e15a1dc3f5480ace4e78620162363e32f40e307bd73cd9a186a91344cc06c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/si/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/si/firefox-95.0b3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "3a1203cc2974f91ca023b5ebb99945708dea0dd995a7f2ab7dcd0efdd05963a0"; + sha256 = "d8c30f6dc9d44ef986f99fbe0fd4ddbd98685455298e04b91e3001c7bd0eefff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/sk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/sk/firefox-95.0b3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "1622f6101810fec383598d0d586023137b391cf3657d14ac223a19874887ae6f"; + sha256 = "b07cd41d70df6d338ff35f1ed1d398ab43243803a010d50f5ad206ff408374c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/sl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/sl/firefox-95.0b3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b64163b6769fbdca125b5f593c99b368e6750db33b0289f093b6622e4c084bea"; + sha256 = "18653e5212d6b99cb3539d419763af33377b422c0aa239b61f132a0a7d8e3875"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/son/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/son/firefox-95.0b3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "dc7fa036e51002568832b39d929fe519d3f485dafb40e2804c687b00e24151a2"; + sha256 = "e44583fbd4dad99459cb3bc4cb6c9820d6346bc087a892c41eece5a63fc7a717"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/sq/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/sq/firefox-95.0b3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "8e0a44122cee3ce32783022e6adfc34368939089585e2cc59bc8cff2d77526ce"; + sha256 = "118eea3d5ca74a46e9aaedeb05c40e895cbeae902ec6b4e31cd61a6167726610"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/sr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/sr/firefox-95.0b3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "63162923573e087dfd13c3e3fc65a4b5c20ccc7427fb0a5809639d1edead0b53"; + sha256 = "6154157e166aa7f9466119a34bc62d829c9743f84410443c5c7dd9a9fa57fbb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/sv-SE/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/sv-SE/firefox-95.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d29eeca6fa60fbfc225610f3d90b3e394296ecd3edf8acd0a9417df22d8f41eb"; + sha256 = "8b3868825c2aada061ce4d99b41971a5d626e9df5cf34ddf6cf9493f700f5f3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/szl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/szl/firefox-95.0b3.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "a2d122d98a66cb67820111cf6914321e094f112c38ba8b10b7b413631258bea3"; + sha256 = "2610600c408da7cc743144ea628057bdc826035472804e3f9d59134ac235c14a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ta/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ta/firefox-95.0b3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "829f0888af39a91bfc7d1813d37f3c8fd0379eb80b8445550e0d00af9ca89167"; + sha256 = "856e537f4bc72e2e0ec8b329db45a69ede9d91b86b70c9413f5bdd6e0e3cd997"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/te/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/te/firefox-95.0b3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "9e5862a75d161b3a7a5afe0b04625a4e195c08c6d76f9b359b5c18470cd2f7c9"; + sha256 = "383b6ac9a74295865064d2da74ef2df72f69f0197d935dee942cba9502e183c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/th/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/th/firefox-95.0b3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8562d938f7afb33d2c393a047cd48b4a5791c9fb9d20dafd5c60402b08505edb"; + sha256 = "9939510e49b9f9a0831a87b364a13c34afe9ac77e51c5e99ca46db39d0d398ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/tl/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/tl/firefox-95.0b3.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "541cad5bfe1cb36595e6ffff13af66f23595fa94d0a2b3591920519da06f5bb7"; + sha256 = "5fffc0f168072b0da9ff7f74742bb6ae0fb7d5f02ec3258eeafcb5971b215366"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/tr/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/tr/firefox-95.0b3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "fc59be56ae01db30b9349cdd912f40fb16851d4ba45d85cb2741c00bcaf1eceb"; + sha256 = "61fec1fcc042f9d50d3fa4e4c178493a45ecf42b91df9fe19131e555995c1747"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/trs/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/trs/firefox-95.0b3.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "6b07660d7ebc94792483ee248d87de5b28c720fc24cec2acbd3feb5275250e2b"; + sha256 = "7058996e6f42de987bfbfd7d8f43ae51693ef985f71cc265d850552b8f61bc52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/uk/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/uk/firefox-95.0b3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "1936549b7414a8f8712bc642b1d95123b92c1330a523822c6cd35146bc723ead"; + sha256 = "f9e4a138049e31321198bf0d01a4a090ce3b0d6542341d6c7260a276a33a9871"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/ur/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/ur/firefox-95.0b3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "38c599db47a31edbc86fc57106f9dd4e95fc5f35bb92828c6f8f1aab4cb4ec66"; + sha256 = "222fb81fc237b70ea79d0defc66dea43fd004c0558db284f7cf450cbbb43afcc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/uz/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/uz/firefox-95.0b3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "6be5066a14c96acba04a49d76c9f08f1f5aec41b492c4473ed8744f7fdd6fe14"; + sha256 = "1cb5f7ee568b85b8151e5119ab163c91f0ba6633551d0683f6cd476b3bc37486"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/vi/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/vi/firefox-95.0b3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "0e07833741e12e53d6bbc41eacce27ad3f65d6e3dbfda5aff701ac3c915654a1"; + sha256 = "2e851524f4ea2ec410f9da393e034af1b021fedbe9e8b8103299662329867ca0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/xh/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/xh/firefox-95.0b3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "d34b9f5ce9b3f3bf94d0412d21283909a8170e78aafc0db5cdb006c1a48a5bc2"; + sha256 = "4f9ee5271308191bbd89b0410a6141ed21eeb590de3a5586e1736419f456caa3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/zh-CN/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/zh-CN/firefox-95.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a865cf695ddfb17c218c19ebd7373b396ca008ff4e848af80725881a4398d7b9"; + sha256 = "dedf2b2df257161288dd6fc4385ba56fdb285e532bd16f53294162e4c83b0a98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/94.0b2/linux-i686/zh-TW/firefox-94.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/95.0b3/linux-i686/zh-TW/firefox-95.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f5c1ab464a2c66945116dac0c7fc5da7b21dd5e219b0f19cc7bb210b0d649b71"; + sha256 = "342f39908d268a871133b6e51c4e5d92026f92e7b9fd8602b31a6c75c1566ad4"; } ]; } From 06bd2e37d68d2f6afa884ac414974de116767ca2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 19 Nov 2021 17:56:21 -0800 Subject: [PATCH 045/185] python3Packages.azure-core: 1.17.0 -> 1.20.1 (cherry picked from commit d8247404ef1b317e2c0f515f48c8502ced9274b2) --- pkgs/development/python-modules/azure-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 773696c03958..b4dc461ea88c 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { - version = "1.17.0"; + version = "1.20.1"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "25407390dde142d3e41ecf78bb18cedda9b7f7a0af558d082dec711c4a334f46"; + sha256 = "21d06311c9c373e394ed9f9db035306773334a0181932e265889eca34d778d17"; }; propagatedBuildInputs = [ From ff2082119ba675eb9bd98dbed41df33e918cb543 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 19 Nov 2021 17:56:44 -0800 Subject: [PATCH 046/185] python3Packages.azure-eventgrid: 4.5.0 -> 4.7.1 (cherry picked from commit f6169d64945b282ad5d5731338e4d84516b81dd2) --- pkgs/development/python-modules/azure-eventgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index e2736b88e4f5..a5e06a4f54f2 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.5.0"; + version = "4.7.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "41ce94305fd3c4e2534f7663fb1be79819fc7d59f2b20544593ea6c914839351"; + sha256 = "b96afc0317c764c2c428512485305ec5748698081cb6bc70dcaa903b0ac04754"; }; propagatedBuildInputs = [ From 5f2cee2316658fd56ac8b0d75ac134fdc20cbfde Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 19 Nov 2021 17:56:44 -0800 Subject: [PATCH 047/185] python3Packages.azure-mgmt-cognitiveservices: 12.0.0 -> 13.0.0 (cherry picked from commit 5426ad1979908a8f0285dad20bc4a90a0f28d0be) --- .../python-modules/azure-mgmt-cognitiveservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index cb782c6e58e3..08b810f752d1 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "12.0.0"; + version = "13.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676"; + sha256 = "dc6116e8394d45312c7ad5a9098ce0dd2370bd92d43afd33d8b3bfab724fa498"; }; propagatedBuildInputs = [ From e5bf410e99e1f8ec43fa6f9f9f1b2bc03cc87207 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 19 Nov 2021 17:56:44 -0800 Subject: [PATCH 048/185] python3Packages.azure-mgmt-keyvault: 9.2.0 -> 9.3.0 (cherry picked from commit 70c7ebb5d7f3c13d6ef283bf0ffc74ddec1ebecf) --- .../python-modules/azure-mgmt-keyvault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 9de9ffd52743..e145ab520a45 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "9.2.0"; + version = "9.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "37ecd44c49ceca7d7c9431e59148febd15d7fec261651ed72ddd58755e7450b0"; + sha256 = "54156422e618b686d52232a7989594b240bd18afd0fa381e12e4772ed4ab5ea8"; }; propagatedBuildInputs = [ From 2e30172861601196ce0d38436b9ad8a3181f0ee1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 19 Nov 2021 17:56:44 -0800 Subject: [PATCH 049/185] python3Packages.azure-mgmt-loganalytics: 11.0.0 -> 12.0.0 (cherry picked from commit 3b946af08e865df4b97f1d89455de787299d34fb) --- .../python-modules/azure-mgmt-loganalytics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index 790e7cf86c1a..947bb4a28ba9 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "11.0.0"; + version = "12.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "41671fc6e95180fb6147cb40567410c34b85fb69bb0a9b3e09feae1ff370ee9d"; + sha256 = "da128a7e0291be7fa2063848df92a9180cf5c16d42adc09d2bc2efd711536bfb"; }; propagatedBuildInputs = [ From 1d18baf55d3974f600366344b0deeff0a242563e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 19 Nov 2021 17:56:45 -0800 Subject: [PATCH 050/185] python3Packages.azure-storage-blob: 12.8.1 -> 12.9.0 (cherry picked from commit cccca83e45f789081f733b29c7c437aa6758d3ca) --- .../development/python-modules/azure-storage-blob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index fe36536dfe21..8d3bb5aca3e8 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.8.1"; + version = "12.9.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "eb37b50ddfb6e558b29f6c8c03b0666514e55d6170bf4624e7261a3af93c6401"; + sha256 = "cff66a115c73c90e496c8c8b3026898a3ce64100840276e9245434e28a864225"; }; propagatedBuildInputs = [ From ed88476bb3e233f9d80507ada8e7d8acf6f13717 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 19 Nov 2021 17:56:45 -0800 Subject: [PATCH 051/185] python3Packages.azure-synapse-artifacts: 0.9.0 -> 0.10.0 (cherry picked from commit 8f9b6ec8147d53853d75602fb3d064fc88115f8b) --- .../python-modules/azure-synapse-artifacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index f500e9068adb..4be6c43ba9ab 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5e1d8f03939eafe29c301659c7b819053513be6f224861388b0048ca62e7a75d"; + sha256 = "3f782c9b590b8ae43678c6e003df8ca8cca675832039d270b0b7437ff01557fd"; }; propagatedBuildInputs = [ From de936ccab3bcac2dcac18c2db44e73f0c6c893cf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Nov 2021 15:12:42 -0800 Subject: [PATCH 052/185] python3Packages.azure-mgmt-servicelinker: init at 1.0.0b1 (cherry picked from commit f60fbca1aff7541f71d7a7bd1852fd929b1bf468) --- .../azure-mgmt-servicelinker/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix new file mode 100644 index 000000000000..58d32853194b --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-common +, azure-mgmt-core +, msrest +}: + +buildPythonPackage rec { + pname = "azure-mgmt-servicelinker"; + version = "1.0.0b1"; + + src = fetchPypi { + inherit pname version; + sha256 = "4f70d3bcd98ba539bfef870e3c497ebdc5efed3200c2627a61718baa9ab21a61"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + ]; + + pythonImportsCheck = [ "azure.mgmt.servicelinker" ]; + + # no tests with sdist + doCheck = false; + + meta = with lib; { + description = "Microsoft Azure Servicelinker Management Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 40b820b3a0cc..2d4a2a1ded01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -967,6 +967,8 @@ in { azure-mgmt-servicefabricmanagedclusters = callPackage ../development/python-modules/azure-mgmt-servicefabricmanagedclusters { }; + azure-mgmt-servicelinker = callPackage ../development/python-modules/azure-mgmt-servicelinker { }; + azure-mgmt-signalr = callPackage ../development/python-modules/azure-mgmt-signalr { }; azure-mgmt-sql = callPackage ../development/python-modules/azure-mgmt-sql { }; From 45a476b3adbd852813fcfe2a8355591aa710208f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Nov 2021 15:16:12 -0800 Subject: [PATCH 053/185] azure-cli: 2.29.1 -> 2.30.0 (cherry picked from commit 005e8ca904d1b40df926df2112ca8ab47c6e49f7) --- pkgs/tools/admin/azure-cli/default.nix | 5 +- .../tools/admin/azure-cli/python-packages.nix | 66 +++++++++++-------- 2 files changed, 42 insertions(+), 29 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 71d546961fc2..4034ac315642 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.29.1"; + version = "2.30.0"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-9H38dZZz2rGSuWS1T398p+9T+G+Rt5gi3Ip2xIauEWo="; + sha256 = "sha256-b4hNacraNomhiFGEiHcMweqbEq3vTHus+xbFPv5X5HQ="; }; # put packages that needs to be overriden in the py package scope @@ -117,6 +117,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-servicebus azure-mgmt-servicefabric azure-mgmt-servicefabricmanagedclusters + azure-mgmt-servicelinker azure-mgmt-signalr azure-mgmt-sql azure-mgmt-sqlvirtualmachine diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 8b93e0825f86..46e0f3726ad8 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -96,7 +96,8 @@ let checkPhase = '' rm azure/{,cli/}__init__.py python -c 'import azure.common; print(azure.common)' - PYTHONPATH=$PWD:$PYTHONPATH HOME=$TMPDIR pytest \ + PYTHONPATH=$PWD:${src}/src/azure-cli-testsdk:$PYTHONPATH HOME=$TMPDIR pytest \ + azure/cli/core/tests \ --ignore=azure/cli/core/tests/test_profile.py \ --ignore=azure/cli/core/tests/test_generic_update.py \ -k 'not metadata_url and not test_send_raw_requests and not test_format_styled_text_legacy_powershell' @@ -157,14 +158,14 @@ let azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "1.0.0" "zip" "75103fb4541aeae30bb687dee1fedd9ca65530e6b97b2d9ea87f74816905202a"; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "9.1.0b1" "zip" - "sha256-O/6dE6lUnowYTWwQLWt3u1dwV4jBof+Jok0PUhFEEs0="; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.0.0" "zip" + "bdc479b3bbcac423943d63e746a81dd5fc80b46a4dbb4393e760016e3fa4f74a"; azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.0.0" "zip" "sha256-p9MTfVxGD1CsLUQGHWCnC08nedTKhEt3QZtXJeZeCb4="; - azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.15.0" "zip" - "sha256-y5akbJdqXZsRi+mecq1opR1Ye9yTxNblGp/zjiXEqFY="; + azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "3.0.0" "zip" + "sha256-y5akbJdqXZsRi+mecq1opR1Ye9yTxNblGp/zjiXEqaY="; azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "19.0.0" "zip" "bbb60bb9419633c2339569d4e097908638c7944e782b5aef0f5d9535085a9100"; @@ -175,20 +176,20 @@ let azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "12.0.0" "zip" "73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "23.0.0" "zip" - "sha256-HrJrllukBJ3c8Q1PJYGHJfwDxJHDvnZTfQ10zrEUawQ="; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "23.1.0" "zip" + "sha256-N+zUTEnOyn18lDHlkUj+vRXX/sJhZR7XLd1YdV50ULA="; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; - azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "9.0.0" "zip" - "041431c5a768ac652aac318a17f2a53b90db968494c79abbafec441d0be387ff"; + azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "9.1.0" "zip" + "sha256-N+zUTEnOyn18lDHlkUj+vRXX/sJhZR7XLd1YdV50ULA="; azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "16.1.0" "zip" "sha256-NlTIrOK4ho0OqcTHjHT1HobiMzDH2KY20TIlN0fm8/Q="; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.4.0" "zip" - "fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b"; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "7.0.0b2" "zip" + "sha256-hVvYW9gkfTVMwis3IdD0JXYDxdKcyyzIFx3hNk7VMLI="; azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "1.0.0" "zip" "04090062bc1e8f00c2f45315a3bceb0fb3b3479ec1474d71b88342e13499b087"; @@ -217,8 +218,8 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "4.0.0" "zip" - "7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a42"; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "5.1.0" "zip" + "7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a4a"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; @@ -226,8 +227,8 @@ let azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "11.0.0" "zip" "41671fc6e95180fb6147cb40567410c34b85fb69bb0a9b3e09feae1ff370ee9d"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.0.0" "zip" - "5e39a26ae81fa58c13c02029700f8c7b22c3fd832a294c543e3156a91b9459e8"; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.1.0" "zip" + "sha256-Yu9/6LqY5WQStDTJw13HVbPF5GnywBu+0s4NEpc6BEs="; azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip" "384e17f76a68b700a4f988478945c3a9721711c0400725afdfcb63cf84e85f0e"; @@ -277,11 +278,11 @@ let azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b1" "zip" "sha256-SrFTvU+67U3CpMLPZMawXuRdSIbTsfav2jFZIsZWPmw="; - azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.0.0" "zip" - "bec6bdfaeb55b4fdd159f2055e8875bf50a720bb0fce80a816e92a2359b898c8"; + azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b2" "zip" + "sha256-/BAxKDttp/tS/X45y8X4KBm5qxtNuVXhrc5qB3A+wRE="; - azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "9.0.0" "zip" - "sha256-cDc9vrNad2ikc0G7O1cMVZGXvBujb8j4vxUTnkyLrXA="; + azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "10.0.0" "zip" + "5cee70f97fe3a093c3cb70c2a190c2df936b772e94a09ef7e3deb1ed177c9f32"; azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" "1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr"; @@ -289,14 +290,14 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "9.1.0" "zip" "0ba9f10e1e8d03247a316e777d6f27fabf268d596dda2af56ac079fcdf5e7afe"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.1.0" "zip" - "sha256-zTXoHEo8+BKt5L3PH3zPS1t4qAHvlnNAASpqyf5h3tI="; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.2.0" "zip" + "sha256-N+zUTEnOyn18lDHlkUj+vRXX/sJhZR7XLd1YdV50ULA="; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "11.0.0" "zip" "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.1.0" "zip" - "62efbb03275d920894d79879ad0ed59605163abd32177dcf24e90c1862ebccbd"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.2.0" "zip" + "f2bcdbcf0b9fdc2df0df9eccb77cb489091d3c670ed53cba77e5ffd734e9539b"; azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip" "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82"; @@ -319,11 +320,11 @@ let azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip" "de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913"; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "8.0.0" "zip" - "2c43f1a62e5b83304392b0ad7cfdaeef2ef2f47cb3fdfa2577b703b6ea126000"; + azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0" "zip" + "41ebdc69c0d1f81d25dd30438c14fff4331f66639f55805b918b9649eaffe78a"; - azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.2" "tar.gz" - "74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc"; + azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.7.0" "tar.gz" + "cd4f184be8c9ca8aca969f93ed50dc7fe556d28ca11520440fc182cf876abdf9"; azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; @@ -420,6 +421,17 @@ let }; }); + azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs(oldAttrs: rec { + version = "4.5.0b4"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + extension = "zip"; + sha256 = "sha256-f43ZTMFc0IVIaa69gEZFOLALREcx3RRCFoYDY2FYLrY="; + }; + }); + + # part of azure.mgmt.datalake namespace azure-mgmt-datalake-analytics = super.azure-mgmt-datalake-analytics.overrideAttrs(oldAttrs: rec { version = "0.2.1"; From ecf2a783b7481fa82506af75493387ceef46071d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Nov 2021 15:23:17 -0800 Subject: [PATCH 054/185] azure-cli: remove PEP420 patching to azure packages (cherry picked from commit b731f025e0fc40717ecac8d9d426fae9695bfd41) --- .../tools/admin/azure-cli/python-packages.nix | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 46e0f3726ad8..2b820aa95699 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -1,24 +1,7 @@ { stdenv, python, lib, src, version }: let - buildAzureCliPackage = with py.pkgs; attrs: buildPythonPackage (attrs // { - # Remove overly restrictive version contraints and obsolete namespace setup - prePatch = (attrs.prePatch or "") + '' - rm -f azure_bdist_wheel.py tox.ini - substituteInPlace setup.py \ - --replace "cryptography>=3.2,<3.4" "cryptography" - sed -i "/azure-namespace-package/c\ " setup.cfg - ''; - - # Prevent these __init__'s from violating PEP420, only needed for python2 - pythonNamespaces = [ "azure.cli" ]; - - checkInputs = [ mock pytest ] ++ (attrs.checkInputs or []); - checkPhase = attrs.checkPhase or '' - cd azure - HOME=$TMPDIR pytest - ''; - }); + buildAzureCliPackage = with py.pkgs; attrs: buildPythonPackage attrs; overrideAzureMgmtPackage = package: version: extension: sha256: # check to make sure overriding is even necessary @@ -91,6 +74,7 @@ let --replace "cryptography>=3.2,<3.4" "cryptography" ''; + checkInputs = with self; [ pytest ]; doCheck = stdenv.isLinux; # ignore tests that does network call, or assume powershell checkPhase = '' @@ -127,6 +111,7 @@ let --replace "portalocker~=1.6" "portalocker" ''; + checkInputs = [ py.pkgs.pytest ]; # ignore flaky test checkPhase = '' cd azure From b16d2ce858797a4b07f4159f1e9d794832c2e3c5 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Mon, 22 Nov 2021 18:58:32 -0800 Subject: [PATCH 055/185] bazel_4: Fix Bazel-built protoc segfault on macOS Monterey This was fixed by enabling the user_link_flags_feature for macosx cc_toolchain_config. References: - https://github.com/bazelbuild/bazel/issues/14216 - https://github.com/bazelbuild/bazel/pull/14275 (cherry picked from commit dc8d4f31132eece959b481e30949ba5e3308e5ea) --- .../tools/build-managers/bazel/bazel_4/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 0e021d05ac37..3dd40ad1f8a4 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles +{ stdenv, callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, installShellFiles , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self @@ -214,6 +214,14 @@ stdenv.mkDerivation rec { src = ../bazel_rc.patch; bazelSystemBazelRCPath = bazelRC; }) + + # On macOS Monterey, protoc segfaults. + # Issue: https://github.com/bazelbuild/bazel/issues/14216 + # Fix: https://github.com/bazelbuild/bazel/pull/14275 + (fetchpatch { + url = "https://github.com/bazelbuild/bazel/commit/ae0a6c98d4f94abedbedb2d51c27de5febd7df67.patch"; + sha256 = "sha256-YcdxqjTMGI86k1wgFqxJqghv0kknAjlFQFpt4VccCTE="; + }) ] ++ lib.optional enableNixHacks ../nix-hacks.patch; From 9a41b4088beddddf4805d6e13700c0788013435f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 24 Nov 2021 20:51:46 +0100 Subject: [PATCH 056/185] gnome.sushi: Fix runtime (cherry picked from commit fda27cf38e94511f8b8ee091e7189375493dec74) --- pkgs/desktops/gnome/core/sushi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index 49aa1a021cf8..82ef5edb776d 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -8,7 +8,8 @@ , gnome , gtksourceview4 , gjs -, webkitgtk_4_1 +, libsoup +, webkitgtk , icu , wrapGAppsHook , gst_all_1 @@ -48,7 +49,8 @@ stdenv.mkDerivation rec { gtksourceview4 gdk-pixbuf librsvg - webkitgtk_4_1 + libsoup + webkitgtk libepoxy gst_all_1.gstreamer gst_all_1.gst-plugins-base From 1eef408bf20853bf345e52345142c94a2224d3c8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 24 Nov 2021 20:52:37 +0100 Subject: [PATCH 057/185] gnome.sushi: Enable more codecs (cherry picked from commit f9212df975949c4a42fd53a4c691faf6eb8b09db) --- pkgs/desktops/gnome/core/sushi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index 82ef5edb776d..00ac8e40aad0 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly ]; # See https://github.com/NixOS/nixpkgs/issues/31168 From bc1944e4e51080fb01273583e02894e88f3102f8 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 23 Nov 2021 21:47:22 +0000 Subject: [PATCH 058/185] python3Packages.pyeclib: fix for darwin (cherry picked from commit 01296d775d65f90688ada5df535ece01ab958596) --- pkgs/development/python-modules/pyeclib/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix index 2c4169ea73ca..d55fb416a79e 100644 --- a/pkgs/development/python-modules/pyeclib/default.nix +++ b/pkgs/development/python-modules/pyeclib/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, liberasurecode, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, liberasurecode, six }: buildPythonPackage rec { pname = "pyeclib"; @@ -13,11 +13,16 @@ buildPythonPackage rec { # patch dlopen call substituteInPlace src/c/pyeclib_c/pyeclib_c.c \ --replace "liberasurecode.so" "${liberasurecode}/lib/liberasurecode.so" + # python's platform.platform() doesn't return "Darwin" (anymore?) + substituteInPlace setup.py \ + --replace '"Darwin"' '"macOS"' ''; - preBuild = '' - # required for the custom find_library function in setup.py - export LD_LIBRARY_PATH="${lib.makeLibraryPath [ liberasurecode ]}" + preBuild = let + ldLibraryPathEnvName = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in '' + # required for the custom _find_library function in setup.py + export ${ldLibraryPathEnvName}="${lib.makeLibraryPath [ liberasurecode ]}" ''; buildInputs = [ liberasurecode ]; From 8d36793dde4dc18dc3baa0455760c24f29897155 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 8 Nov 2021 00:52:35 +0000 Subject: [PATCH 059/185] rustcSrc: Reduce duplication (cherry picked from commit 2c7f62379f7c65d573892ba89eefb5631d721ba8) --- pkgs/development/compilers/rust/rust-src.nix | 21 +++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/rust/rust-src.nix b/pkgs/development/compilers/rust/rust-src.nix index 489795ecec47..4239e92b0363 100644 --- a/pkgs/development/compilers/rust/rust-src.nix +++ b/pkgs/development/compilers/rust/rust-src.nix @@ -1,4 +1,4 @@ -{ stdenv, rustc, minimalContent ? true }: +{ lib, stdenv, rustc, minimalContent ? true }: stdenv.mkDerivation { name = "rust-src"; @@ -6,9 +6,20 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; installPhase = '' mv src $out - rm -rf $out/{${if minimalContent - then "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,tools,vendor,stdarch" - else "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,vendor" - }} + rm -rf $out/{${lib.concatStringsSep "," ([ + "ci" + "doc" + "etc" + "grammar" + "llvm-project" + "llvm-emscripten" + "rtstartup" + "rustllvm" + "test" + "vendor" + ] ++ lib.optionals minimalContent [ + "tools" + "stdarch" + ])}} ''; } From 7bdb2873298b544c5408e18db7b6c36dca6adf71 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 7 Oct 2021 22:20:10 +0000 Subject: [PATCH 060/185] build-support/rust: Split out sysroot src derivation Hoping to make it usable for `buildRustCrate` too. (cherry picked from commit cbd00bab803b03cacbea27d442c60e719a804992) --- .../build-rust-package/sysroot/default.nix | 13 ++---------- .../sysroot/Cargo.lock | 0 .../{build-rust-package => }/sysroot/cargo.py | 0 pkgs/build-support/rust/sysroot/src.nix | 21 +++++++++++++++++++ .../sysroot/update-lockfile.sh | 0 5 files changed, 23 insertions(+), 11 deletions(-) rename pkgs/build-support/rust/{build-rust-package => }/sysroot/Cargo.lock (100%) rename pkgs/build-support/rust/{build-rust-package => }/sysroot/cargo.py (100%) create mode 100644 pkgs/build-support/rust/sysroot/src.nix rename pkgs/build-support/rust/{build-rust-package => }/sysroot/update-lockfile.sh (100%) diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix index 4db7cf0dc392..1e0b901105cd 100644 --- a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix +++ b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix @@ -3,17 +3,8 @@ { shortTarget, originalCargoToml, target, RUSTFLAGS }: let - cargoSrc = stdenv.mkDerivation { - name = "cargo-src"; - preferLocalBuild = true; - phases = [ "installPhase" ]; - installPhase = '' - RUSTC_SRC=${rustPlatform.rustcSrc.override { minimalContent = false; }} ORIG_CARGO=${originalCargoToml} \ - ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} - mkdir -p $out - cp Cargo.toml $out/Cargo.toml - cp ${./Cargo.lock} $out/Cargo.lock - ''; + cargoSrc = import ../../sysroot/src.nix { + inherit stdenv rustPlatform buildPackages originalCargoToml; }; in rustPlatform.buildRustPackage { inherit target RUSTFLAGS; diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/Cargo.lock b/pkgs/build-support/rust/sysroot/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/build-rust-package/sysroot/Cargo.lock rename to pkgs/build-support/rust/sysroot/Cargo.lock diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/cargo.py b/pkgs/build-support/rust/sysroot/cargo.py similarity index 100% rename from pkgs/build-support/rust/build-rust-package/sysroot/cargo.py rename to pkgs/build-support/rust/sysroot/cargo.py diff --git a/pkgs/build-support/rust/sysroot/src.nix b/pkgs/build-support/rust/sysroot/src.nix new file mode 100644 index 000000000000..065f98286149 --- /dev/null +++ b/pkgs/build-support/rust/sysroot/src.nix @@ -0,0 +1,21 @@ +{ lib, stdenv, rustPlatform, buildPackages +, originalCargoToml ? null +}: + +stdenv.mkDerivation { + name = "cargo-src"; + preferLocalBuild = true; + phases = [ "installPhase" ]; + installPhase = '' + export RUSTC_SRC=${rustPlatform.rustcSrc.override { minimalContent = false; }} + '' + + lib.optionalString (originalCargoToml != null) '' + export ORIG_CARGO=${originalCargoToml} + '' + + '' + ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} + mkdir -p $out + cp Cargo.toml $out/Cargo.toml + cp ${./Cargo.lock} $out/Cargo.lock + ''; +} diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/update-lockfile.sh b/pkgs/build-support/rust/sysroot/update-lockfile.sh similarity index 100% rename from pkgs/build-support/rust/build-rust-package/sysroot/update-lockfile.sh rename to pkgs/build-support/rust/sysroot/update-lockfile.sh From b43bd0f0b58a009c3727aa5ea4b9a1969f79530e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 8 Nov 2021 02:05:25 +0000 Subject: [PATCH 061/185] Update script as rust-src layout has changed Use stub lib so `core` and `alloc` are handled symmetrically. (cherry picked from commit c9c3de0131c565bf5a7f0e2249cd26f6e7acb172) --- pkgs/build-support/rust/sysroot/Cargo.lock | 17 ++++++++++++-- pkgs/build-support/rust/sysroot/cargo.py | 16 ++++++++------ pkgs/build-support/rust/sysroot/src.nix | 5 +++-- .../rust/sysroot/update-lockfile.sh | 22 ++++++++++++------- 4 files changed, 41 insertions(+), 19 deletions(-) diff --git a/pkgs/build-support/rust/sysroot/Cargo.lock b/pkgs/build-support/rust/sysroot/Cargo.lock index 61fcef61744e..6ec6da6ae6e2 100644 --- a/pkgs/build-support/rust/sysroot/Cargo.lock +++ b/pkgs/build-support/rust/sysroot/Cargo.lock @@ -10,9 +10,9 @@ dependencies = [ [[package]] name = "compiler_builtins" -version = "0.1.36" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd0782e0a7da7598164153173e5a5d4d9b1da094473c98dce0ff91406112369" +checksum = "b6591c2442ee984e2b264638a8b5e7ae44fd47b32d28e3a08e2e9c3cdb0c2fb0" dependencies = [ "rustc-std-workspace-core", ] @@ -21,9 +21,22 @@ dependencies = [ name = "core" version = "0.0.0" +[[package]] +name = "nixpkgs-sysroot-stub-crate" +version = "0.0.0" +dependencies = [ + "alloc", + "compiler_builtins", + "core", +] + [[package]] name = "rustc-std-workspace-core" version = "1.99.0" dependencies = [ "core", ] + +[[patch.unused]] +name = "rustc-std-workspace-alloc" +version = "1.99.0" diff --git a/pkgs/build-support/rust/sysroot/cargo.py b/pkgs/build-support/rust/sysroot/cargo.py index 09f6fba6d1c8..9d970eff79e8 100644 --- a/pkgs/build-support/rust/sysroot/cargo.py +++ b/pkgs/build-support/rust/sysroot/cargo.py @@ -6,7 +6,7 @@ orig_cargo = os.environ['ORIG_CARGO'] if 'ORIG_CARGO' in os.environ else None base = { 'package': { - 'name': 'alloc', + 'name': 'nixpkgs-sysroot-stub-crate', 'version': '0.0.0', 'authors': ['The Rust Project Developers'], 'edition': '2018', @@ -17,17 +17,19 @@ base = { 'features': ['rustc-dep-of-std', 'mem'], }, 'core': { - 'path': os.path.join(rust_src, 'libcore'), + 'path': os.path.join(rust_src, 'core'), + }, + 'alloc': { + 'path': os.path.join(rust_src, 'alloc'), }, - }, - 'lib': { - 'name': 'alloc', - 'path': os.path.join(rust_src, 'liballoc/lib.rs'), }, 'patch': { 'crates-io': { 'rustc-std-workspace-core': { - 'path': os.path.join(rust_src, 'tools/rustc-std-workspace-core'), + 'path': os.path.join(rust_src, 'rustc-std-workspace-core'), + }, + 'rustc-std-workspace-alloc': { + 'path': os.path.join(rust_src, 'rustc-std-workspace-alloc'), }, }, }, diff --git a/pkgs/build-support/rust/sysroot/src.nix b/pkgs/build-support/rust/sysroot/src.nix index 065f98286149..e741326bd0d4 100644 --- a/pkgs/build-support/rust/sysroot/src.nix +++ b/pkgs/build-support/rust/sysroot/src.nix @@ -7,14 +7,15 @@ stdenv.mkDerivation { preferLocalBuild = true; phases = [ "installPhase" ]; installPhase = '' - export RUSTC_SRC=${rustPlatform.rustcSrc.override { minimalContent = false; }} + export RUSTC_SRC=${rustPlatform.rustLibSrc.override { }} '' + lib.optionalString (originalCargoToml != null) '' export ORIG_CARGO=${originalCargoToml} '' + '' ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} - mkdir -p $out + mkdir -p $out/src + touch $out/src/lib.rs cp Cargo.toml $out/Cargo.toml cp ${./Cargo.lock} $out/Cargo.lock ''; diff --git a/pkgs/build-support/rust/sysroot/update-lockfile.sh b/pkgs/build-support/rust/sysroot/update-lockfile.sh index 83d29832384f..d0596d1e5a62 100755 --- a/pkgs/build-support/rust/sysroot/update-lockfile.sh +++ b/pkgs/build-support/rust/sysroot/update-lockfile.sh @@ -1,21 +1,27 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p python3 python3.pkgs.toml cargo -set -e +set -eu pipefile -HERE=$(dirname "${BASH_SOURCE[0]}") +HERE=$(readlink -e $(dirname "${BASH_SOURCE[0]}")) NIXPKGS_ROOT="$HERE/../../../.." # https://unix.stackexchange.com/a/84980/390173 tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-lockfile') - cd "$tempdir" -nix-build -E "with import (/. + \"${NIXPKGS_ROOT}\") {}; pkgs.rustPlatform.rustcSrc.override { minimalContent = false; }" -RUSTC_SRC="$(pwd)/result" python3 "$HERE/cargo.py" -RUSTC_BOOTSTRAP=1 cargo build || echo "Build failure is expected. All that's needed is the lockfile." +mkdir -p src +touch src/lib.rs + +RUSTC_SRC=$(nix-build "${NIXPKGS_ROOT}" -A pkgs.rustPlatform.rustLibSrc --no-out-link) + +ln -s $RUSTC_SRC/{core,alloc} ./ + +export RUSTC_SRC +python3 "$HERE/cargo.py" + +export RUSTC_BOOTSTRAP=1 +cargo generate-lockfile cp Cargo.lock "$HERE" rm -rf "$tempdir" - - From 5a709fd1f1b9b02039a5f1b9b7f9a2ca204de7fe Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 8 Nov 2021 21:38:58 +0000 Subject: [PATCH 062/185] build-support/rust/sysroot/src: Use `dont*` instead of phase list Making this separate commit because the original was moved out just the way it was done before. (cherry picked from commit 05efb8ed913d5b0eee3736652fb91befc5e04233) --- pkgs/build-support/rust/sysroot/src.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/sysroot/src.nix b/pkgs/build-support/rust/sysroot/src.nix index e741326bd0d4..3d11b62dd315 100644 --- a/pkgs/build-support/rust/sysroot/src.nix +++ b/pkgs/build-support/rust/sysroot/src.nix @@ -5,7 +5,11 @@ stdenv.mkDerivation { name = "cargo-src"; preferLocalBuild = true; - phases = [ "installPhase" ]; + + unpackPhase = "true"; + dontConfigure = true; + dontBuild = true; + installPhase = '' export RUSTC_SRC=${rustPlatform.rustLibSrc.override { }} '' From 6d58566abd4b8aac24746725870b7683cbbfd986 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 24 Nov 2021 17:19:05 -0500 Subject: [PATCH 063/185] yoda: 1.9.2 -> 1.9.3 (cherry picked from commit d9e78207b6f1588e210006cd4c94c8633aa57e06) --- .../libraries/physics/yoda/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index e23f7aaadd99..fc8a07aa2b80 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,22 +2,13 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - hash = "sha256-zb7j7fBMv2brJ+gUMMDTKFEJDC2embENe3wXdx0VTOA="; + hash = "sha256-XRUYL7gAoNX/ykdD+CwpXsYu5yzz5GJbZNAIP/+gR98="; }; - patches = [ - # Prevent ROOT from initializing X11 or Cocoa (helps with sandboxing) - (fetchpatch { - url = "https://gitlab.com/hepcedar/yoda/-/commit/36c035f4f0385dec58702f09564ca66a14ca2c3e.diff"; - sha256 = "sha256-afB+y33TVNJtxY5As18EcutJEGDE4g0UzMxzA+YgICk="; - excludes = [ "ChangeLog" ]; - }) - ]; - nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; buildInputs = [ python ] ++ (with python.pkgs; [ numpy matplotlib ]) @@ -41,11 +32,10 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckTarget = "check"; - enableParallelChecking = false; # testreader consumes output of testwriter meta = { description = "Provides small set of data analysis (specifically histogramming) classes"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; homepage = "https://yoda.hepforge.org"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; From f684632908e36bd3a1dbd824cde360b8aae0bf1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 24 Nov 2021 17:17:23 +0100 Subject: [PATCH 064/185] radeontop: 1.3 -> 1.4 It installs itself to $out/bin/ instead of $out/sbin/ now. (cherry picked from commit 162546972b659f74de08cd4a73c75040c0b2f8f8) --- pkgs/os-specific/linux/radeontop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index b172fad6adcb..2cb82dc3c02a 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "radeontop"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { - sha256 = "sha256-tnIxM0+RfOIt714fEUWRP/4rEPHaOuCZFit9/RPdxis="; + sha256 = "0kwqddidr45s1blp0h8r8h1dd1p50l516yb6mb4s6zsc827xzgg3"; rev = "v${version}"; repo = "radeontop"; owner = "clbr"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; postInstall = '' - wrapProgram $out/sbin/radeontop \ + wrapProgram $out/bin/radeontop \ --prefix LD_LIBRARY_PATH : $out/lib ''; From f5b9183859267c632f0f1d2a593734d88e6528c7 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Wed, 24 Nov 2021 20:16:41 -0600 Subject: [PATCH 065/185] ArchiSteamFarm: fix build (cherry picked from commit 1eeffcbc01300669c87d5e648af14fbe7eb633f1) --- pkgs/applications/misc/ArchiSteamFarm/deps.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 6da123004397..3e6fa1761484 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -55,10 +55,15 @@ (fetchNuGet { name = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) (fetchNuGet { name = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.10"; sha256 = "1dmcccml0lwxkiplfisxc70877h3s6p589nml19pi07iypvyxxjh"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.12"; sha256 = "1cv7s0gh54jfrdgwa2cyarh1f6m59fpbfmqsszi27cdik0llh24s"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.10"; sha256 = "1r9rf1j5v3hfn299zk71bjbbzslnypyqy1pz2xc4mirghwg18pqw"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.12"; sha256 = "1hmr4l20fs8qqjvcfnlyb6ik6dh37mg0xa2wrvkn229pmiwp1rm9"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1asph5v7kgmscfgsyv9gg7cwvg52gnm6m0ldm2m4pfkpsxqyp2mi"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "0ir75jh4qas1v70y63hvd0rbyprcf97l47b2pgljhxk138z96s4y"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "02kv8xh6xvpav7vqj281321ly1imghxcc18cdgadiq8dwgm87xwp"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0qhyrprvbhcn980ycqvkchd4qy5shydi7pl0lbcl9cljivn60if3"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "062zb8gqbzxq2xrmr8lbl215pnhw1fdidq43m975vsfgzmqrga8f"; }) (fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; version = "5.0.0"; sha256 = "192mn6r73xjw8fvlss6vrv34iiavq7k8pg0w7advgj6khklw4dzx"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "5.0.0"; sha256 = "1q3z35pxgvpf6l6ywh5wb6gfly055rk99a80rjqisyrbmza1msd1"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) @@ -73,14 +78,23 @@ (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.10"; sha256 = "12zz674g6289z44rynnbsarqdh6md0qdl4srkzkqz9dvm1f2k4yn"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.12"; sha256 = "0v3df0hdv02xr7gmc9fmnwfrxf8xbqp9bci31a55xwj16jia692x"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.10"; sha256 = "0v90w0cr8zjayj0w0rb5ds1kjg77n7za1nr9rr1pnszw2xs00fmq"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.12"; sha256 = "0jvfxnc743qcg1qwlvclh6ww612mnsk5pk459awz5rivp3mdkfsb"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.10"; sha256 = "1z8l02ypzbhbh0jp89ibc4dx61dvaa4l7cdn4s2zs0l492nz2ni8"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.12"; sha256 = "0950m6x86jp5dybzakfsp74qzrk4pk8wkazc178v36j14sqmj2zq"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.10"; sha256 = "07yr09al8cci38zmwqghpsf8jsg51a8qv6p156ph8b5714iq5jjq"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.12"; sha256 = "173zymcac00rjb0l4yvksglj32b6fnwxzi60kpi0ki3z3a2k8kd3"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.10"; sha256 = "12xw4czsnsy4nara23jbvbsi8id9lms17xfyv0w4wsqhrp5kqbxi"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.12"; sha256 = "197xfhk7rwpn5kgc59slclkd0rp53034mfrrpajn2xbgjnmb07sj"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.10"; sha256 = "0ccsk1baj0bx1k7jqm7pnw77ns3m6h50cl8kxikjcm74jsz0vyx1"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.12"; sha256 = "1bpzbivp0n9cl05vlnirigzbvjs25mq7w56bg9zrnzlzjnhcwry2"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1fdbrjrmjd31y1amp0inlmki9w3fwzv8nz41pqmc943g3cpmyg9f"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "1pphlbhs1swr14g07hnvvwj9p983qqf6vqaq455bhpn6lin3z81f"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "0z8l0gzy9dih0mn5a2rknyph1w73y4m03s250wghym1zp6rz910p"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0cn3nq7vmjwk8b5bh7hb5wzidz1msjmwyng6k1ngqdm49w9f0m2g"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "1s4klc4p5wiqiiqcfqyi56cci9f29b588h52vj7na7gfqry4b51l"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) From 29adfbfdd46e2034e3d39a60be551c5fc679941a Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 23 Nov 2021 20:12:24 +0100 Subject: [PATCH 066/185] Updating F3D URLs for F3D migration (cherry picked from commit a3cff8804fa4d11993d0054598f9cb36764446b8) --- pkgs/applications/graphics/f3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index bcf707bcced6..d2313313dfa3 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast and minimalist 3D viewer using VTK"; - homepage = "https://kitware.github.io/F3D"; + homepage = "https://f3d-app.github.io/f3d"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; platforms = with platforms; unix; From 4cbacf85dc40705b3d35ae41a3e5da306e9863d7 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 25 Nov 2021 18:54:23 +1000 Subject: [PATCH 067/185] audacious: 4.0.5 -> 4.1 (cherry picked from commit ee718148c8d8e115e7143ee0dec94301358e1577) --- pkgs/applications/audio/audacious/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index a6c8221c9f72..7cd22d258315 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -11,15 +11,15 @@ mkDerivation rec { pname = "audacious"; - version = "4.0.5"; + version = "4.1"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "028zjgz0p7ys15lk2a30m5zcv9xrx3ga50wjsh4m4zxilgkakbji"; + sha256 = "0p734psjjvjcmla2hg5h6a9v1prvy63jj9xm2g2ngs49jy7qan0z"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz"; + sha256 = "0k0xnqmxi5lna034i2cnzvfzrykxmv4fbs1nkrc9sd2ma1igrmns"; }; nativeBuildInputs = [ gettext pkg-config ]; @@ -36,8 +36,10 @@ mkDerivation rec { libopenmpt ]; + configureFlags = [ "--disable-gtk" ]; + # Here we build both audacious and audacious-plugins in one - # derivations, since they really expect to be in the same prefix. + # derivation, since they really expect to be in the same prefix. # This is slighly tricky. builder = builtins.toFile "builder.sh" '' # First build audacious. From dcd36cba1384ae26c8f08190a466f34e3743776e Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Wed, 24 Nov 2021 19:12:25 -0800 Subject: [PATCH 068/185] glymur: fix build (cherry picked from commit 6dc23393d9a24abfff423a2ea4bfc574cebd4eca) --- pkgs/development/python-modules/glymur/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index f14245865f59..40748f86954e 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -10,6 +10,7 @@ , mock , importlib-resources , isPy27 +, lxml }: buildPythonPackage rec { @@ -31,6 +32,7 @@ buildPythonPackage rec { scikitimage procps pytestCheckHook + lxml ]; postConfigure = '' From 5653990ff415e6713bc8b2ed39916a39caeddfd9 Mon Sep 17 00:00:00 2001 From: Vladyslav Burzakovskyy Date: Tue, 23 Nov 2021 15:59:35 +0100 Subject: [PATCH 069/185] kratos: 0.7.6-alpha.1 -> 0.8.0-alpha.3 (cherry picked from commit 4deec4ec53da8ba6cfd7b1cd2e0155ae233bb150) --- .../from_md/release-notes/rl-2111.section.xml | 35 +++++++++++++++++++ .../manual/release-notes/rl-2111.section.md | 6 ++++ pkgs/applications/misc/kratos/default.nix | 6 ++-- 3 files changed, 44 insertions(+), 3 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 f1d803136aa0..f0e39471ecee 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 @@ -172,6 +172,41 @@ + + + ORY Kratos was updated to version 0.8.0-alpha.3 + + + + + This release requires you to run SQL migrations. Please, + as always, create a backup of your database first! + + + + + The SDKs are now generated with tag v0alpha2 to reflect + that some signatures have changed in a breaking fashion. + Please update your imports from v0alpha1 to v0alpha2. + + + + + The SMTPS scheme used in courier config URL with + cleartext/StartTLS/TLS SMTP connection types is now only + supporting implicit TLS. For StartTLS and cleartext SMTP, + please use the SMTP scheme instead. + + + + + for more details, see + Release + Notes. + + + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 275ee7142d0e..3bdda82c026f 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -50,6 +50,12 @@ In addition to numerous new and upgraded packages, this release has the followin - This breaks connections to old SSH daemons as ssh-rsa host keys and ssh-rsa public keys that were signed with SHA-1 are disabled by default now - These can be re-enabled, see the [OpenSSH changelog](https://www.openssh.com/txt/release-8.8) for details +- ORY Kratos was updated to version 0.8.0-alpha.3 + - This release requires you to run SQL migrations. Please, as always, create a backup of your database first! + - The SDKs are now generated with tag v0alpha2 to reflect that some signatures have changed in a breaking fashion. Please update your imports from v0alpha1 to v0alpha2. + - The SMTPS scheme used in courier config URL with cleartext/StartTLS/TLS SMTP connection types is now only supporting implicit TLS. For StartTLS and cleartext SMTP, please use the SMTP scheme instead. + - for more details, see [Release Notes](https://github.com/ory/kratos/releases/tag/v0.8.0-alpha.1). + ## New Services {#sec-release-21.11-new-services} - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix index a616378e9892..a0b67042ecac 100644 --- a/pkgs/applications/misc/kratos/default.nix +++ b/pkgs/applications/misc/kratos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kratos"; - version = "0.7.6-alpha.1"; + version = "0.8.0-alpha.3"; src = fetchFromGitHub { owner = "ory"; repo = "kratos"; rev = "v${version}"; - sha256 = "1412jckfsm0d5gn7fhjpj212xbsf43sfpd8hgcz3pxc0q37dzfgh"; + sha256 = "0ihq2kxjackicxg0hrpmx6bsgz056xbaq3j8py37z2w6mwszarcg"; }; - vendorSha256 = "1gcdahs8x26kpwlng3wijqi12yjwj19v413wyyviim4vn1r4c0m7"; + vendorSha256 = "175pckj30cm5xkbvsdvwzarvwapsylyjgj4ss8v5r1sa0fjpj008"; subPackages = [ "." ]; From 0933c9acc757508f599628674ed88644fd0f1c42 Mon Sep 17 00:00:00 2001 From: polykernel <81340136+polykernel@users.noreply.github.com> Date: Sat, 20 Nov 2021 22:31:43 -0500 Subject: [PATCH 070/185] swayr: 0.7.0 -> 0.10.0 (cherry picked from commit 7d310da826fa2cf9d034bf40ee1f73694fa2ef56) --- pkgs/tools/wayland/swayr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix index 195c0b1bf385..1fa7483e36ef 100644 --- a/pkgs/tools/wayland/swayr/default.nix +++ b/pkgs/tools/wayland/swayr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayr"; - version = "0.7.0"; + version = "0.10.0"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "v${version}"; - sha256 = "sha256-B19cHdoiCbxhvRGi3NzKPKneKgOI4+l8+Qg9/YVgUV8="; + sha256 = "sha256-nXJIgzm92OSSGHpN2+09Y8ILpU8Mf51vcVB0kMXBPZc="; }; - cargoSha256 = "sha256-iO64K+d/wEyY/tVztIG8zYSha5X0iTHV7IDVthMJQGA="; + cargoSha256 = "sha256-vExZzJ3Rw+MiU4ikEqzIo51qZW0sxwE/zoVEdUKLXwY="; patches = [ ./icon-paths.patch From 84a66218e9cb02f4d7fc92d79214d6f9f853fc29 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Tue, 23 Nov 2021 10:10:40 +1000 Subject: [PATCH 071/185] protoc-gen-go-vtproto: init at 0.2.0 (cherry picked from commit aefd67192ea8ceff69cb9feedac676f97f905587) --- .../tools/protoc-gen-go-vtproto/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/protoc-gen-go-vtproto/default.nix diff --git a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix b/pkgs/development/tools/protoc-gen-go-vtproto/default.nix new file mode 100644 index 000000000000..4ffc0a24264e --- /dev/null +++ b/pkgs/development/tools/protoc-gen-go-vtproto/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: +buildGoModule rec { + pname = "protoc-gen-go-vtproto"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "planetscale"; + repo = "vtprotobuf"; + rev = "v${version}"; + sha256 = "0kjjpfsiws4vi36ha1gajb97rwcggqw753mv2jqf09kdfszz9p63"; + }; + + vendorSha256 = "01lxwlgh3y3gp22gk5qx7r60c1j63pnpi6jnri8gf2lmiiib8fdc"; + + excludedPackages = [ "conformance" ]; + + meta = with lib; { + description = "A Protocol Buffers compiler that generates optimized marshaling & unmarshaling Go code for ProtoBuf APIv2"; + homepage = "https://github.com/planetscale/vtprotobuf"; + license = licenses.bsd3; + maintainers = [ maintainers.zane ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61d06a67dcc9..5b9f25ab6eec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -337,6 +337,8 @@ with pkgs; protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { }; + protoc-gen-go-vtproto = callPackage ../development/tools/protoc-gen-go-vtproto { }; + protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { }; protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; From 79bd863190f59ce4716a7be69a303d7eb38d2e8b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 21 Nov 2021 23:07:54 -0300 Subject: [PATCH 072/185] libretro: make update.py script accept individual cores to update (cherry picked from commit 33478a118c33e450881fa405362bb58b729cf78c) --- pkgs/misc/emulators/retroarch/update.py | 30 +++++++++++++++++-------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/misc/emulators/retroarch/update.py index db43db13575f..ee669c18a3a4 100755 --- a/pkgs/misc/emulators/retroarch/update.py +++ b/pkgs/misc/emulators/retroarch/update.py @@ -11,7 +11,6 @@ SCRIPT_PATH = Path(__file__).absolute().parent HASHES_PATH = SCRIPT_PATH / "hashes.json" CORES = { "atari800": {"repo": "libretro-atari800"}, - "beetle-snes": {"repo": "beetle-bsnes-libretro"}, "beetle-gba": {"repo": "beetle-gba-libretro"}, "beetle-lynx": {"repo": "beetle-lynx-libretro"}, "beetle-ngp": {"repo": "beetle-ngp-libretro"}, @@ -19,9 +18,10 @@ CORES = { "beetle-pcfx": {"repo": "beetle-pcfx-libretro"}, "beetle-psx": {"repo": "beetle-psx-libretro"}, "beetle-saturn": {"repo": "beetle-saturn-libretro"}, + "beetle-snes": {"repo": "beetle-bsnes-libretro"}, "beetle-supergrafx": {"repo": "beetle-supergrafx-libretro"}, - "beetle-wswan": {"repo": "beetle-wswan-libretro"}, "beetle-vb": {"repo": "beetle-vb-libretro"}, + "beetle-wswan": {"repo": "beetle-wswan-libretro"}, "bluemsx": {"repo": "bluemsx-libretro"}, "bsnes-mercury": {"repo": "bsnes-mercury"}, "citra": {"repo": "citra", "fetch_submodules": True}, @@ -78,8 +78,8 @@ CORES = { "tgbdual": {"repo": "tgbdual-libretro"}, "thepowdertoy": {"repo": "ThePowderToy"}, "tic80": {"repo": "tic-80", "fetch_submodules": True}, - "vba-next": {"repo": "vba-next"}, "vba-m": {"repo": "vbam-libretro"}, + "vba-next": {"repo": "vba-next"}, "vecx": {"repo": "libretro-vecx"}, "virtualjaguar": {"repo": "virtualjaguar-libretro"}, "yabause": {"repo": "yabause"}, @@ -112,21 +112,33 @@ def get_repo_hash(fetcher="fetchFromGitHub", **kwargs): raise ValueError(f"Unsupported fetcher: {fetcher}") -def get_repo_hashes(): - repo_hashes = {} +def get_repo_hashes(cores_to_update=[]): + with open(HASHES_PATH) as f: + repo_hashes = json.loads(f.read()) for core, repo in CORES.items(): - info(f"Getting repo hash for '{core}'...") - repo_hashes[core] = get_repo_hash(**repo) + if core in cores_to_update: + info(f"Getting repo hash for '{core}'...") + repo_hashes[core] = get_repo_hash(**repo) + else: + info(f"Skipping '{core}'...") return repo_hashes def main(): - repo_hashes = get_repo_hashes() + # If you don't want to update all cores, pass the name of the cores you + # want to update on the command line. E.g.: + # $ ./update.py citra snes9x + if len(sys.argv) > 1: + cores_to_update = sys.argv[1:] + else: + cores_to_update = CORES.keys() + + repo_hashes = get_repo_hashes(cores_to_update) info(f"Generating '{HASHES_PATH}'...") with open(HASHES_PATH, "w") as f: - f.write(json.dumps(repo_hashes, indent=4)) + f.write(json.dumps(dict(sorted(repo_hashes.items())), indent=4)) f.write("\n") info("Finished!") From acc46f1409b6f7b0cdf0ec234f765a946a6cfefe Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 21 Nov 2021 23:14:17 -0300 Subject: [PATCH 073/185] libretro.swanstation: init at unstable-2021-11-21 Sadly the original repository (stenzek/duckstation) is missing the necessary files to build a libretro core, so we need to use the fork instead. (cherry picked from commit 994719881acfc2633ea2a66ea2149e89065ed126) --- pkgs/misc/emulators/retroarch/cores.nix | 59 ++++++++++++++--------- pkgs/misc/emulators/retroarch/hashes.json | 49 +++++++++++-------- pkgs/misc/emulators/retroarch/update.py | 1 + 3 files changed, 66 insertions(+), 43 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index ab13e041139c..e4172addcc48 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -50,6 +50,7 @@ let mkLibRetroCore = { core , description + # Check https://github.com/libretro/libretro-super for license information , license , src ? null , broken ? false @@ -116,14 +117,6 @@ in makeFlags = [ "GIT_VERSION=" ]; }; - beetle-snes = mkLibRetroCore { - core = "mednafen-snes"; - src = getCoreSrc "beetle-snes"; - description = "Port of Mednafen's SNES core to libretro"; - license = lib.licenses.gpl2Only; - makefile = "Makefile"; - }; - beetle-gba = mkLibRetroCore { core = "mednafen-gba"; src = getCoreSrc "beetle-gba"; @@ -204,6 +197,14 @@ in meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; }; + beetle-snes = mkLibRetroCore { + core = "mednafen-snes"; + src = getCoreSrc "beetle-snes"; + description = "Port of Mednafen's SNES core to libretro"; + license = lib.licenses.gpl2Only; + makefile = "Makefile"; + }; + beetle-supergrafx = mkLibRetroCore { core = "mednafen-supergrafx"; src = getCoreSrc "beetle-supergrafx"; @@ -212,14 +213,6 @@ in makefile = "Makefile"; }; - beetle-wswan = mkLibRetroCore { - core = "mednafen-wswan"; - src = getCoreSrc "beetle-wswan"; - description = "Port of Mednafen's WonderSwan core to libretro"; - license = lib.licenses.gpl2Only; - makefile = "Makefile"; - }; - beetle-vb = mkLibRetroCore { core = "mednafen-vb"; src = getCoreSrc "beetle-vb"; @@ -228,6 +221,14 @@ in makefile = "Makefile"; }; + beetle-wswan = mkLibRetroCore { + core = "mednafen-wswan"; + src = getCoreSrc "beetle-wswan"; + description = "Port of Mednafen's WonderSwan core to libretro"; + license = lib.licenses.gpl2Only; + makefile = "Makefile"; + }; + bluemsx = mkLibRetroCore { core = "bluemsx"; description = "Port of BlueMSX to libretro"; @@ -724,6 +725,20 @@ in makefile = "Makefile"; }; + swanstation = mkLibRetroCore { + core = "swanstation"; + version = "unstable-2021-11-21"; + description = "Port of SwanStation (a fork of DuckStation) to libretro"; + license = lib.licenses.gpl3Only; + extraNativeBuildInputs = [ cmake ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DBUILD_LIBRETRO_CORE=ON" + ]; + postPatch = "mkdir -p src/duckstation-libretro"; + }; + tgbdual = mkLibRetroCore { core = "tgbdual"; description = "Port of TGBDual to libretro"; @@ -757,12 +772,6 @@ in postBuild = "cd lib"; }; - vba-next = mkLibRetroCore { - core = "vba-next"; - description = "VBA-M libretro port with modifications for speed"; - license = lib.licenses.gpl2Only; - }; - vba-m = mkLibRetroCore { core = "vbam"; src = getCoreSrc "vba-m"; @@ -772,6 +781,12 @@ in preBuild = "cd src/libretro"; }; + vba-next = mkLibRetroCore { + core = "vba-next"; + description = "VBA-M libretro port with modifications for speed"; + license = lib.licenses.gpl2Only; + }; + vecx = mkLibRetroCore { core = "vecx"; description = "Port of Vecx to libretro"; diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/misc/emulators/retroarch/hashes.json index a849a37bfab4..8a2635210438 100644 --- a/pkgs/misc/emulators/retroarch/hashes.json +++ b/pkgs/misc/emulators/retroarch/hashes.json @@ -6,13 +6,6 @@ "sha256": "LJpRegJVR2+sS1UmTTpVest0rMrNDBMXmj/jRFVglWI=", "fetchSubmodules": false }, - "beetle-snes": { - "owner": "libretro", - "repo": "beetle-bsnes-libretro", - "rev": "bc867656d7438aaffc6818b3b92350587bc78a47", - "sha256": "TyUCRGK+uyXowDjXW9/4m+zL8Vh/3GGsX1eznrTCbAg=", - "fetchSubmodules": false - }, "beetle-gba": { "owner": "libretro", "repo": "beetle-gba-libretro", @@ -62,6 +55,13 @@ "sha256": "lKlNNAHK1ynFXY++Ya0m1Ax5YTZkd44eQjzuOLXfWa8=", "fetchSubmodules": false }, + "beetle-snes": { + "owner": "libretro", + "repo": "beetle-bsnes-libretro", + "rev": "bc867656d7438aaffc6818b3b92350587bc78a47", + "sha256": "TyUCRGK+uyXowDjXW9/4m+zL8Vh/3GGsX1eznrTCbAg=", + "fetchSubmodules": false + }, "beetle-supergrafx": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", @@ -69,13 +69,6 @@ "sha256": "kGyl5XJMFUALPAEZf4IynY6bmXWfqy0o65eO8zS0RTE=", "fetchSubmodules": false }, - "beetle-wswan": { - "owner": "libretro", - "repo": "beetle-wswan-libretro", - "rev": "0c7faaf7f70b72ebb68e310530cd46a69e680d40", - "sha256": "UQyICcZe1DVotSFt0QVnGop+JG5NJwTBcGSZaFW0P0U=", - "fetchSubmodules": false - }, "beetle-vb": { "owner": "libretro", "repo": "beetle-vb-libretro", @@ -83,6 +76,13 @@ "sha256": "KguKbRK0uXE+brpF8HdRwi8Gt76AMa4wkh1MFvNCbN4=", "fetchSubmodules": false }, + "beetle-wswan": { + "owner": "libretro", + "repo": "beetle-wswan-libretro", + "rev": "0c7faaf7f70b72ebb68e310530cd46a69e680d40", + "sha256": "UQyICcZe1DVotSFt0QVnGop+JG5NJwTBcGSZaFW0P0U=", + "fetchSubmodules": false + }, "bluemsx": { "owner": "libretro", "repo": "bluemsx-libretro", @@ -454,6 +454,13 @@ "sha256": "s7LQ47sAPTyk4COONk4qnebxCq78zGLIjh3Y2+1fIak=", "fetchSubmodules": false }, + "swanstation": { + "owner": "libretro", + "repo": "swanstation", + "rev": "cc3946b2b3bd10282bc46078c245db09f6e68836", + "sha256": "UzdmjUS6+6z4K6VJtMPxOwGXsCtxoh08RWTNHlvy/h8=", + "fetchSubmodules": false + }, "tgbdual": { "owner": "libretro", "repo": "tgbdual-libretro", @@ -475,13 +482,6 @@ "sha256": "SXJvWX6Q3BrdajNnT4HIf6H2z7dXXvnXTJXf/TYRw4I=", "fetchSubmodules": true }, - "vba-next": { - "owner": "libretro", - "repo": "vba-next", - "rev": "b218f48bb27b5d3885fa4076ff325922b5acd817", - "sha256": "idqGMbMA9mZlIh0QAba3BxpPDi/bFJJkUbnxV3xMOCo=", - "fetchSubmodules": false - }, "vba-m": { "owner": "libretro", "repo": "vbam-libretro", @@ -489,6 +489,13 @@ "sha256": "vJWjdqJ913NLGL4G15sRPqO/wp9xPsuhUMLUuAbDRKk=", "fetchSubmodules": false }, + "vba-next": { + "owner": "libretro", + "repo": "vba-next", + "rev": "b218f48bb27b5d3885fa4076ff325922b5acd817", + "sha256": "idqGMbMA9mZlIh0QAba3BxpPDi/bFJJkUbnxV3xMOCo=", + "fetchSubmodules": false + }, "vecx": { "owner": "libretro", "repo": "libretro-vecx", diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/misc/emulators/retroarch/update.py index ee669c18a3a4..2ff276eb8f47 100755 --- a/pkgs/misc/emulators/retroarch/update.py +++ b/pkgs/misc/emulators/retroarch/update.py @@ -75,6 +75,7 @@ CORES = { "snes9x2010": {"repo": "snes9x2010"}, "stella": {"repo": "stella", "owner": "stella-emu"}, "stella2014": {"repo": "stella2014-libretro"}, + "swanstation": {"repo": "swanstation"}, "tgbdual": {"repo": "tgbdual-libretro"}, "thepowdertoy": {"repo": "ThePowderToy"}, "tic80": {"repo": "tic-80", "fetch_submodules": True}, From 9c36e80c812848627be1951ab3cd9e7a1632851b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 21 Nov 2021 23:23:39 -0300 Subject: [PATCH 074/185] libretro: expose mkLibeRetroCore function This will allow users to package their own core derivations if they want without necessary submitting to nixpkgs. (cherry picked from commit 702c8f29fbca2a492864e00436457ba3b41392e3) --- pkgs/misc/emulators/retroarch/cores.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index e4172addcc48..adcb94c0e64e 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -109,6 +109,8 @@ let ); in { + inherit mkLibRetroCore; + atari800 = mkLibRetroCore { core = "atari800"; description = "Port of Atari800 to libretro"; From 732fe0294a54264434f48cbc7489cf3207f2f8b7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 22 Nov 2021 00:02:04 -0300 Subject: [PATCH 075/185] libretro.bsnes-mercury-{balanced,performance}: init at unstable-2021-11-16 (cherry picked from commit 17c37fe0bd91a36b447560585181924336056c0c) --- pkgs/misc/emulators/retroarch/cores.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index adcb94c0e64e..247874fefeec 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -246,6 +246,24 @@ in makeFlags = [ "PROFILE=accuracy" ]; }; + bsnes-mercury-balanced = mkLibRetroCore { + core = "bsnes-mercury-balanced"; + src = getCoreSrc "bsnes-mercury"; + description = "Fork of bsnes with HLE DSP emulation restored"; + license = lib.licenses.gpl3Only; + makefile = "Makefile"; + makeFlags = [ "PROFILE=balanced" ]; + }; + + bsnes-mercury-performance = mkLibRetroCore { + core = "bsnes-mercury-performance"; + src = getCoreSrc "bsnes-mercury"; + description = "Fork of bsnes with HLE DSP emulation restored"; + license = lib.licenses.gpl3Only; + makefile = "Makefile"; + makeFlags = [ "PROFILE=performance" ]; + }; + citra = mkLibRetroCore { core = "citra"; # `nix-prefetch-github` doesn't support `deepClone`, necessary for citra From 2ee2ba91b9b708dcdb42559292e96c47a09951ed Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 22 Nov 2021 00:19:35 -0300 Subject: [PATCH 076/185] libretro.beetle-saturn-hw: remove This core never worked as intended: https://github.com/libretro/libretro-core-info/issues/8. (cherry picked from commit 716deb5afb75d3641250a8643053838b25f737d0) --- pkgs/misc/emulators/retroarch/cores.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 247874fefeec..f142baf59389 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -184,18 +184,6 @@ in description = "Port of Mednafen's Saturn core to libretro"; license = lib.licenses.gpl2Only; makefile = "Makefile"; - makeFlags = [ "HAVE_HW=0" ]; - meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; - }; - - beetle-saturn-hw = mkLibRetroCore { - core = "mednafen-saturn-hw"; - src = getCoreSrc "beetle-saturn"; - description = "Port of Mednafen's Saturn core to libretro"; - license = lib.licenses.gpl2Only; - extraBuildInputs = [ libGL libGLU ]; - makefile = "Makefile"; - makeFlags = [ "HAVE_OPENGL=1" "HAVE_HW=1" ]; meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; }; From 60258cd14f0243c060a214a91a66fe43e8047db1 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 22 Nov 2021 00:27:10 -0300 Subject: [PATCH 077/185] retroarch: switch from libretro-super to libretro-core-info (cherry picked from commit 0d9f8458a604cb6b94d702e70c941c9bd7c67420) --- pkgs/misc/emulators/retroarch/cores.nix | 2 +- pkgs/misc/emulators/retroarch/default.nix | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index f142baf59389..fb7ec0745343 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -50,7 +50,7 @@ let mkLibRetroCore = { core , description - # Check https://github.com/libretro/libretro-super for license information + # Check https://github.com/libretro/libretro-core-info for license information , license , src ? null , broken ? false diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index b2621ba8cc13..5a294277c80c 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -36,16 +36,18 @@ with lib; let + mainVersion = "1.9.13"; + revision = "2"; libretroSuperSrc = fetchFromGitHub { owner = "libretro"; - repo = "libretro-super"; - sha256 = "sha256-4WB6/1DDec+smhMJKLCxWb4+LQlZN8v2ik69saKixkE="; - rev = "fa70d9843838df719623094965bd447e4db0d1b4"; + repo = "libretro-core-info"; + sha256 = "sha256-jM+iXNSCpJy4wOk1S72G1UjNGBzejyhs5LFFWCFjs2c="; + rev = "v${mainVersion}"; }; in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.9.13.2"; + version = "${lib.concatStringsSep "." [ mainVersion revision ]}"; src = fetchFromGitHub { owner = "libretro"; @@ -98,7 +100,7 @@ stdenv.mkDerivation rec { postInstall = optionalString withVulkan '' mkdir -p $out/share/libretro/info # TODO: ideally each core should have its own core information - cp -r ${libretroSuperSrc}/dist/info/* $out/share/libretro/info + cp -r ${libretroSuperSrc}/* $out/share/libretro/info wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib ''; From 8878e56c561720b9ac2b3bab406d8b44722d4f83 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 22 Nov 2021 13:45:32 -0300 Subject: [PATCH 078/185] libretro.melonds: init at unstable-2021-11-22 (cherry picked from commit 18bc6a9efe31b29306b198122e82e0022a4f90b1) --- pkgs/misc/emulators/retroarch/cores.nix | 9 +++++++++ pkgs/misc/emulators/retroarch/hashes.json | 7 +++++++ pkgs/misc/emulators/retroarch/update.py | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index fb7ec0745343..1eca08be3b82 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -512,6 +512,15 @@ in enableParallelBuilding = false; }; + melonds = mkLibRetroCore { + core = "melonds"; + version = "unstable-2021-11-22"; + description = "Port of MelonDS to libretro"; + license = lib.licenses.gpl3Only; + extraBuildInputs = [ libGL libGLU ]; + makefile = "Makefile"; + }; + mesen = mkLibRetroCore { core = "mesen"; description = "Port of Mesen to libretro"; diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/misc/emulators/retroarch/hashes.json index 8a2635210438..3f264a6959f1 100644 --- a/pkgs/misc/emulators/retroarch/hashes.json +++ b/pkgs/misc/emulators/retroarch/hashes.json @@ -272,6 +272,13 @@ "sha256": "GQ4Sdg/1nZRT4Z1Aqq1zPo96duqIGyt6sjghf9ap2Jg=", "fetchSubmodules": false }, + "melonds": { + "owner": "libretro", + "repo": "melonds", + "rev": "1ad65728476d7b9594c4ff91a1ba60460a0a30e7", + "sha256": "EBV8F2MCmWuxWKMOXipTZKRGHqp8sb/ojK3JpGZe818=", + "fetchSubmodules": false + }, "mesen": { "owner": "SourMesen", "repo": "mesen", diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/misc/emulators/retroarch/update.py index 2ff276eb8f47..05d72a55115d 100755 --- a/pkgs/misc/emulators/retroarch/update.py +++ b/pkgs/misc/emulators/retroarch/update.py @@ -49,6 +49,7 @@ CORES = { "mame2010": {"repo": "mame2010-libretro"}, "mame2015": {"repo": "mame2015-libretro"}, "mame2016": {"repo": "mame2016-libretro"}, + "melonds": {"repo": "melonds"}, "mesen": {"repo": "mesen", "owner": "SourMesen"}, "meteor": {"repo": "meteor-libretro"}, "mgba": {"repo": "mgba"}, From 8a1996baf68bbf459372c5ecfffa28a04dc5e237 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 22 Nov 2021 13:49:42 -0300 Subject: [PATCH 079/185] libretro.mesen: switch to libretro/mesen The original repository was abandoned. (cherry picked from commit d03b66c4a61fde97ef4d6519fca9471fbd79c610) --- pkgs/misc/emulators/retroarch/cores.nix | 1 + pkgs/misc/emulators/retroarch/hashes.json | 6 +++--- pkgs/misc/emulators/retroarch/update.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 1eca08be3b82..84a24e543e68 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -523,6 +523,7 @@ in mesen = mkLibRetroCore { core = "mesen"; + version = "unstable-2021-11-22"; description = "Port of Mesen to libretro"; license = lib.licenses.gpl3Only; makefile = "Makefile"; diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/misc/emulators/retroarch/hashes.json index 3f264a6959f1..6269cbd01aa3 100644 --- a/pkgs/misc/emulators/retroarch/hashes.json +++ b/pkgs/misc/emulators/retroarch/hashes.json @@ -280,10 +280,10 @@ "fetchSubmodules": false }, "mesen": { - "owner": "SourMesen", + "owner": "libretro", "repo": "mesen", - "rev": "86326e832974d984846ae078e568c023a5f76f1f", - "sha256": "At5rhlJ6rAnXaQrmRA1NtCCi+Ff/ytlt5dwsaXZhxXg=", + "rev": "094d82bf724448426acbaad45e83bc38994e32f6", + "sha256": "9+AqZRv8lugNNa+ZZzIPJNO87J1aBUEiOggL8aYno1M=", "fetchSubmodules": false }, "meteor": { diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/misc/emulators/retroarch/update.py index 05d72a55115d..844a8e545955 100755 --- a/pkgs/misc/emulators/retroarch/update.py +++ b/pkgs/misc/emulators/retroarch/update.py @@ -50,7 +50,7 @@ CORES = { "mame2015": {"repo": "mame2015-libretro"}, "mame2016": {"repo": "mame2016-libretro"}, "melonds": {"repo": "melonds"}, - "mesen": {"repo": "mesen", "owner": "SourMesen"}, + "mesen": {"repo": "mesen"}, "meteor": {"repo": "meteor-libretro"}, "mgba": {"repo": "mgba"}, "mupen64plus": {"repo": "mupen64plus-libretro-nx"}, From 83b3c244b425321e2ef46b14bdcce8b64954c352 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 22 Nov 2021 14:02:42 -0300 Subject: [PATCH 080/185] libretro.mesen-s: init at unstable-2021-11-22 (cherry picked from commit d204860bf5e8efd81b6c7f1328a5ee633fb04cf0) --- pkgs/misc/emulators/retroarch/cores.nix | 28 +++++++++++++++++++---- pkgs/misc/emulators/retroarch/hashes.json | 7 ++++++ pkgs/misc/emulators/retroarch/update.py | 1 + 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 84a24e543e68..916ca1687075 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -83,13 +83,18 @@ let }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}" ] ++ (args.makeFlags or [ ]); + coreDir = "${placeholder "out"}/lib/retroarch/cores"; + installPhase = '' - COREDIR="$out/lib/retroarch/cores" + runHook preInstall + mkdir -p $out/bin - mkdir -p $COREDIR - mv ${d2u args.core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $COREDIR + mkdir -p $coreDir + mv ${d2u args.core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $coreDir makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch-${core} \ - --add-flags "-L $COREDIR/${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $@" + --add-flags "-L $coreDir/${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $@" + + runHook postInstall ''; enableParallelBuilding = true; @@ -530,6 +535,21 @@ in preBuild = "cd Libretro"; }; + mesen-s = mkLibRetroCore { + core = "mesens"; + src = getCoreSrc "mesen-s"; + version = "unstable-2021-11-22"; + description = "Port of Mesen-S to libretro"; + license = lib.licenses.gpl3Only; + makefile = "Makefile"; + preBuild = "cd Libretro"; + postInstall = '' + # fix library name to match libretro-core-info + mv $coreDir/mesens_libretro${stdenv.hostPlatform.extensions.sharedLibrary} \ + $coreDir/mesen-s_libretro${stdenv.hostPlatform.extensions.sharedLibrary} + ''; + }; + meteor = mkLibRetroCore { core = "meteor"; description = "Port of Meteor to libretro"; diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/misc/emulators/retroarch/hashes.json index 6269cbd01aa3..57e97c394142 100644 --- a/pkgs/misc/emulators/retroarch/hashes.json +++ b/pkgs/misc/emulators/retroarch/hashes.json @@ -286,6 +286,13 @@ "sha256": "9+AqZRv8lugNNa+ZZzIPJNO87J1aBUEiOggL8aYno1M=", "fetchSubmodules": false }, + "mesen-s": { + "owner": "libretro", + "repo": "mesen-s", + "rev": "42eb0e8ad346608dae86feb8a04833d16ad21541", + "sha256": "q6zeoNiZtFy8ZYls9/E+O7o9BYTcVcmYjbJA48qiraU=", + "fetchSubmodules": false + }, "meteor": { "owner": "libretro", "repo": "meteor-libretro", diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/misc/emulators/retroarch/update.py index 844a8e545955..96f6d9f1f615 100755 --- a/pkgs/misc/emulators/retroarch/update.py +++ b/pkgs/misc/emulators/retroarch/update.py @@ -51,6 +51,7 @@ CORES = { "mame2016": {"repo": "mame2016-libretro"}, "melonds": {"repo": "melonds"}, "mesen": {"repo": "mesen"}, + "mesen-s": {"repo": "mesen-s"}, "meteor": {"repo": "meteor-libretro"}, "mgba": {"repo": "mgba"}, "mupen64plus": {"repo": "mupen64plus-libretro-nx"}, From 163b02910f42f59d2bd3913f02b19ebe87e4004f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 22 Nov 2021 18:14:27 -0300 Subject: [PATCH 081/185] libretro.bsnes: init at unstable-2021-11-22 (cherry picked from commit 2fe3827806ff9e4b9878ee01c891565aea38bf35) --- pkgs/misc/emulators/retroarch/cores.nix | 16 ++++++++++++++++ pkgs/misc/emulators/retroarch/hashes.json | 7 +++++++ pkgs/misc/emulators/retroarch/update.py | 1 + 3 files changed, 24 insertions(+) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 916ca1687075..afebebbf3c06 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -230,6 +230,22 @@ in license = lib.licenses.gpl2Only; }; + bsnes = mkLibRetroCore { + core = "bsnes"; + version = "unstable-2021-11-22"; + description = "Port of bsnes to libretro"; + license = lib.licenses.gpl3Only; + makefile = "Makefile"; + # https://github.com/libretro/bsnes-libretro/issues/10 + patches = [ + (fetchpatch { + name = "added-missing-GB_VERSION-define.patch"; + url = "https://github.com/nE0sIghT/bsnes-libretro/commit/97fd8b486f9a9046277a580b238b6673a98f7f72.patch"; + sha256 = "sha256-gCiy6sqc9sixT6Appr5ZCfHyBE2jYhPb0KvI63nfmEc="; + }) + ]; + }; + bsnes-mercury = mkLibRetroCore { core = "bsnes-mercury-accuracy"; src = getCoreSrc "bsnes-mercury"; diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/misc/emulators/retroarch/hashes.json index 57e97c394142..3c19ffb0603c 100644 --- a/pkgs/misc/emulators/retroarch/hashes.json +++ b/pkgs/misc/emulators/retroarch/hashes.json @@ -90,6 +90,13 @@ "sha256": "ix/AyYNer1R73ZJW1reXyj7geBr3ThrqXf5Ki5yrz9A=", "fetchSubmodules": false }, + "bsnes": { + "owner": "libretro", + "repo": "bsnes-libretro", + "rev": "44d97b17d06a10ae17d97a91a48e5acd10ec6db4", + "sha256": "VNSeTRryrX2/V38GGXTRLuDEQqDUmX2DUOHAKLxJezU=", + "fetchSubmodules": false + }, "bsnes-mercury": { "owner": "libretro", "repo": "bsnes-mercury", diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/misc/emulators/retroarch/update.py index 96f6d9f1f615..062ff44c8008 100755 --- a/pkgs/misc/emulators/retroarch/update.py +++ b/pkgs/misc/emulators/retroarch/update.py @@ -23,6 +23,7 @@ CORES = { "beetle-vb": {"repo": "beetle-vb-libretro"}, "beetle-wswan": {"repo": "beetle-wswan-libretro"}, "bluemsx": {"repo": "bluemsx-libretro"}, + "bsnes": {"repo": "bsnes-libretro"}, "bsnes-mercury": {"repo": "bsnes-mercury"}, "citra": {"repo": "citra", "fetch_submodules": True}, "desmume": {"repo": "desmume"}, From 31a0fd340f37b0d58510e5220767d95109b12abe Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 22 Nov 2021 18:50:00 -0300 Subject: [PATCH 082/185] libretro.bsnes-hd: init at unstable-2021-11-22 (cherry picked from commit 9aee0414e031b7f80165926acdebe22fb4da6b60) --- pkgs/misc/emulators/retroarch/cores.nix | 23 +++++++++++++++++++++++ pkgs/misc/emulators/retroarch/hashes.json | 7 +++++++ pkgs/misc/emulators/retroarch/update.py | 1 + 3 files changed, 31 insertions(+) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index afebebbf3c06..70c3e4f71a9c 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -246,6 +246,29 @@ in ]; }; + bsnes-hd = + let + # linux = bsd + # https://github.com/DerKoun/bsnes-hd/blob/f0b6cf34e9780d53516977ed2de64137a8bcc3c5/bsnes/GNUmakefile#L37 + platform = if stdenv.isDarwin then "macos" else "linux"; + in + mkLibRetroCore { + core = "bsnes-hd-beta"; + src = getCoreSrc "bsnes-hd"; + version = "unstable-2021-11-22"; + description = "Port of bsnes-hd to libretro"; + license = lib.licenses.gpl3Only; + makefile = "GNUmakefile"; + makeFlags = [ + "-C" + "bsnes" + "target=libretro" + "platform=${platform}" + ]; + extraBuildInputs = [ xorg.libX11 xorg.libXext ]; + postBuild = "cd bsnes/out"; + }; + bsnes-mercury = mkLibRetroCore { core = "bsnes-mercury-accuracy"; src = getCoreSrc "bsnes-mercury"; diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/misc/emulators/retroarch/hashes.json index 3c19ffb0603c..50ba46dd0cb1 100644 --- a/pkgs/misc/emulators/retroarch/hashes.json +++ b/pkgs/misc/emulators/retroarch/hashes.json @@ -97,6 +97,13 @@ "sha256": "VNSeTRryrX2/V38GGXTRLuDEQqDUmX2DUOHAKLxJezU=", "fetchSubmodules": false }, + "bsnes-hd": { + "owner": "DerKoun", + "repo": "bsnes-hd", + "rev": "65f24e56c37f46bb752190024bd4058e64ad77d1", + "sha256": "1dk2i71NOLeTTOZjVll8wrkr5dIH5bGSGUeeHqWjZHE=", + "fetchSubmodules": false + }, "bsnes-mercury": { "owner": "libretro", "repo": "bsnes-mercury", diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/misc/emulators/retroarch/update.py index 062ff44c8008..2a623cb5062f 100755 --- a/pkgs/misc/emulators/retroarch/update.py +++ b/pkgs/misc/emulators/retroarch/update.py @@ -24,6 +24,7 @@ CORES = { "beetle-wswan": {"repo": "beetle-wswan-libretro"}, "bluemsx": {"repo": "bluemsx-libretro"}, "bsnes": {"repo": "bsnes-libretro"}, + "bsnes-hd": {"repo": "bsnes-hd", "owner": "DerKoun"}, "bsnes-mercury": {"repo": "bsnes-mercury"}, "citra": {"repo": "citra", "fetch_submodules": True}, "desmume": {"repo": "desmume"}, From 4758598be23680ab99f9b2a88f2faeb559792dbb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 22 Nov 2021 19:22:43 -0300 Subject: [PATCH 083/185] libretro: unstable-2021-11-16 -> unstable-2021-11-22 (cherry picked from commit 82b4887f1eab1563e9e0dd2a28a9ba7a60f317e2) --- pkgs/misc/emulators/retroarch/cores.nix | 8 +- pkgs/misc/emulators/retroarch/hashes.json | 100 +++++++++++----------- 2 files changed, 51 insertions(+), 57 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 70c3e4f71a9c..e0b9c6ff33b9 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -54,7 +54,7 @@ let , license , src ? null , broken ? false - , version ? "unstable-2021-11-16" + , version ? "unstable-2021-11-22" , ... }@args: lib.makeOverridable stdenv.mkDerivation ( @@ -232,7 +232,6 @@ in bsnes = mkLibRetroCore { core = "bsnes"; - version = "unstable-2021-11-22"; description = "Port of bsnes to libretro"; license = lib.licenses.gpl3Only; makefile = "Makefile"; @@ -255,7 +254,6 @@ in mkLibRetroCore { core = "bsnes-hd-beta"; src = getCoreSrc "bsnes-hd"; - version = "unstable-2021-11-22"; description = "Port of bsnes-hd to libretro"; license = lib.licenses.gpl3Only; makefile = "GNUmakefile"; @@ -558,7 +556,6 @@ in melonds = mkLibRetroCore { core = "melonds"; - version = "unstable-2021-11-22"; description = "Port of MelonDS to libretro"; license = lib.licenses.gpl3Only; extraBuildInputs = [ libGL libGLU ]; @@ -567,7 +564,6 @@ in mesen = mkLibRetroCore { core = "mesen"; - version = "unstable-2021-11-22"; description = "Port of Mesen to libretro"; license = lib.licenses.gpl3Only; makefile = "Makefile"; @@ -577,7 +573,6 @@ in mesen-s = mkLibRetroCore { core = "mesens"; src = getCoreSrc "mesen-s"; - version = "unstable-2021-11-22"; description = "Port of Mesen-S to libretro"; license = lib.licenses.gpl3Only; makefile = "Makefile"; @@ -804,7 +799,6 @@ in swanstation = mkLibRetroCore { core = "swanstation"; - version = "unstable-2021-11-21"; description = "Port of SwanStation (a fork of DuckStation) to libretro"; license = lib.licenses.gpl3Only; extraNativeBuildInputs = [ cmake ]; diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/misc/emulators/retroarch/hashes.json index 50ba46dd0cb1..9ca689d469d4 100644 --- a/pkgs/misc/emulators/retroarch/hashes.json +++ b/pkgs/misc/emulators/retroarch/hashes.json @@ -23,36 +23,36 @@ "beetle-ngp": { "owner": "libretro", "repo": "beetle-ngp-libretro", - "rev": "f969af2b52f20642aea7e800e3cfcce728f3aee9", - "sha256": "GIzLZ3iOJeHKdAowhM4S56iouaxX8v2XZgc/ZiCzCPk=", + "rev": "f7c393184e5228c3d3807ee74c951c4c549107d8", + "sha256": "7vki8VkwOzxwMZcUxekg1DFSskV7VNQ1SRaU3M1xHZ0=", "fetchSubmodules": false }, "beetle-pce-fast": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "81d4c9d07a76c89c32ad0e7450b69bde6403836f", - "sha256": "LhQbAEUMhoIF3VfwLbhtD7xxSddzdgwIHHnSabQPAvs=", + "rev": "a7608100d1cdd8eb65aea82fede7da61dcc3c5f1", + "sha256": "3v/TGz4y52IodXRmt/peZlabNS+quQVN9t5xucC2plg=", "fetchSubmodules": false }, "beetle-pcfx": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "a1f1734509dd6acb11269f118d61f480ae8dbacf", - "sha256": "rvRDuYJLxb1TSwNXhp3ATJW0sQgWi8Cj4NR3hep/AJk=", + "rev": "19f2b7ce529e70655db04d3dd4faf32b4de14df2", + "sha256": "K3ZjOd8IGtwlwxExNAmHsOC0N0fz06w/3uua7sAm8Jc=", "fetchSubmodules": false }, "beetle-psx": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "ccca81930a078c0efd77b00327d2ee212698f3b4", - "sha256": "Hy8Zrp0kTR+Mfbq0nVYerSarRCxZI+ykgDOscakDMiU=", + "rev": "bc1b6af8d7b8dd0b4133040fef82725520bbd560", + "sha256": "QgBB05o7941LsNKl2EIKy185xgcAf1vrAZgQiray/x0=", "fetchSubmodules": false }, "beetle-saturn": { "owner": "libretro", "repo": "beetle-saturn-libretro", - "rev": "e1119e91a4e3f4b30971455aeb3c1a6f4cd05e59", - "sha256": "lKlNNAHK1ynFXY++Ya0m1Ax5YTZkd44eQjzuOLXfWa8=", + "rev": "f97fda5447d883220ce2f53a15f2cbe4790a8392", + "sha256": "r4kvrTIw1sOf5nEuPq2xF/QXw+0COQYWyERJ7HX1sFU=", "fetchSubmodules": false }, "beetle-snes": { @@ -65,22 +65,22 @@ "beetle-supergrafx": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "59062662d6e925ad512fcbb9c1a0db97d1592bc1", - "sha256": "kGyl5XJMFUALPAEZf4IynY6bmXWfqy0o65eO8zS0RTE=", + "rev": "083d102389a1ffaeddfa525a186adde0f35e42fc", + "sha256": "4hTOYPnOWdhb7CfWKZFO53NBFGa3lg0745ncBU6ejiQ=", "fetchSubmodules": false }, "beetle-vb": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "1bd0da71c8f6add253ad76e2b6e1357cd09fc304", - "sha256": "KguKbRK0uXE+brpF8HdRwi8Gt76AMa4wkh1MFvNCbN4=", + "rev": "aa77198c6c60b935503b5ea2149b8ff7598344da", + "sha256": "ShsMYc2vjDoiN1yCCoSl91P5ecYJDj/V+VWUYuYVxas=", "fetchSubmodules": false }, "beetle-wswan": { "owner": "libretro", "repo": "beetle-wswan-libretro", - "rev": "0c7faaf7f70b72ebb68e310530cd46a69e680d40", - "sha256": "UQyICcZe1DVotSFt0QVnGop+JG5NJwTBcGSZaFW0P0U=", + "rev": "3fcb582755a509ae33fc52cd0ca4b3edffc734ef", + "sha256": "XHTzXlTt8op0bDLNn833Unt57zclXowlLhG3qvWwjXQ=", "fetchSubmodules": false }, "bluemsx": { @@ -135,8 +135,8 @@ "dolphin": { "owner": "libretro", "repo": "dolphin", - "rev": "82e617439b622af5d1189e9fec67e7f1376be099", - "sha256": "Q3a+0SYocX1hBGLs1K9r932NkiCDFINPhtHeyzUknJE=", + "rev": "d5193c4391addbd257b2aafe943a138ba89e20fb", + "sha256": "uRhYMO+fmAfwEr/KTKAhx//dKq44YdvhXxp7v+Gol0w=", "fetchSubmodules": false }, "dosbox": { @@ -163,29 +163,29 @@ "fbneo": { "owner": "libretro", "repo": "fbneo", - "rev": "4d6387b7f3e3f1a9c25015789d751c6db1a9ae8c", - "sha256": "bIOmvhu9mOfOXoOTbwbjMHIZ3JkGz96yyFZALmqkOmk=", + "rev": "2447dd5385cb193801dc46be7b50a807d13162aa", + "sha256": "x70kPEC9LVm9ZyH5sviI8iW9dCkIi+lx2ns03OId2Oc=", "fetchSubmodules": false }, "fceumm": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "a918869c18c9f30b84e04260b78b675b8a3c7be1", - "sha256": "nDYPrwIsvhWveDQDE0WEK7GO60iRE967p1XxXn+lNj4=", + "rev": "8864f6e246e4ba511b95a48713456b0dd3b3045b", + "sha256": "GrkD54ElseEYczPSb9WGTvI8SaNy/fWV4zve7sG9TTY=", "fetchSubmodules": false }, "flycast": { "owner": "libretro", "repo": "flycast", - "rev": "ae670ea28fdbb9f08149cb598312a71a0970ca67", - "sha256": "jmSOfyak5mX04HgZOtCF9cz8HqAApxDXHJ6IqhqGILE=", + "rev": "254b66a017a087f0833777760b879abfe7f9d5cd", + "sha256": "pkgVjZCGlgq95Cv+xWLl3sjq+jIpgnfuVaXGDYtuGAY=", "fetchSubmodules": false }, "fmsx": { "owner": "libretro", "repo": "fmsx-libretro", - "rev": "20c805409b8f6e1f9d61cb3dff0d5b28d82d1ee3", - "sha256": "uqqVF2+YpfWOKbe8aIreoImFb3/kL8ohslJkl+JivQI=", + "rev": "7b0c70c25fcc7f4bb876e729eacfcc01f494df60", + "sha256": "H3ttVMw3cUxXJ64olbTSO6K7YBpmdgKnaLEpTS9QQEg=", "fetchSubmodules": false }, "freeintv": { @@ -198,22 +198,22 @@ "gambatte": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "4b822bcf561856689e101dd5505d365de5ffcffe", - "sha256": "FsIQLd/UO5xs/aTpggSn8WLPgi83gsxRlwKR+UzH+TY=", + "rev": "c842d49b1daab6e45f3a1802ee7516b100827599", + "sha256": "DUj4vEh3x7MaE8bHDwOoDY7K2yEkTGz8Cf3fx4sgCvY=", "fetchSubmodules": false }, "genesis-plus-gx": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "309a4aacfd582c312dcad61b7abfdffba4a0c66e", - "sha256": "jnbey1USldDZGXGXLLR5TgSJZgD+6ZFpwfIf6c8xvyM=", + "rev": "c1c605e862c4a277e880b510c68ebde630487948", + "sha256": "wDEwG+VMs0hXjL1pBn+wmvtaaN4nax+Dm6Ocy7HCLbQ=", "fetchSubmodules": false }, "gpsp": { "owner": "libretro", "repo": "gpsp", - "rev": "a2aa78733d8daf1d550c9dc76c6ff94e8670b31c", - "sha256": "nKim7YkksUyZO97SvrW1TEYQlA+7Yi7xbLtyDPV4LWc=", + "rev": "bc0a3cf2c182b7f60c80464309a791377bef5af3", + "sha256": "27eOnAp6pzZAK5o1of5+2Fx/hHtUsjbBQlefdsCv0rk=", "fetchSubmodules": false }, "gw": { @@ -254,15 +254,15 @@ "mame2003": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "d0ed1a565803cfada9f4088326eae616f6e5f8a3", - "sha256": "JGEy6Mp5qcZwaehzbj+qpdBfxHzqi6qIR7akxIj/WK8=", + "rev": "e6595b3fa677158a7d834391517ae68e3c5f8f41", + "sha256": "qxynDUQWtUKxJ7H7q9nGFhIjr1Pkrgtp8aJdTtG5/xU=", "fetchSubmodules": false }, "mame2003-plus": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "841e44dff953a346127f15be53cb34778e20ce1c", - "sha256": "aCXyeDcz0uSObe4S2bQWCxIAF5aA3kne5v0HT+oXHuw=", + "rev": "680f4679c7a15fcec007eff8ba9578567b821daa", + "sha256": "nxpmPE79C3hgeFLlwS4fHYteSmC4xuis1UySlqhqvzk=", "fetchSubmodules": false }, "mame2010": { @@ -359,8 +359,8 @@ "opera": { "owner": "libretro", "repo": "opera-libretro", - "rev": "d8aa7cecf96298bd7ee51718086f7b1bc8c57e2a", - "sha256": "1t+zwCVmqiPFFNCNq9XzVfRGbEA1q8v4jzhOb+wV/nA=", + "rev": "aa868e656b518567a95b11b2f14c5db8001b11a0", + "sha256": "YUzfHtgKCzgxZwslFxwmAN0hg+MIGLAYBAI7RUCIW40=", "fetchSubmodules": false }, "parallel-n64": { @@ -380,22 +380,22 @@ "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "9cb99ce36f93871b05c5adc2790b2e33e63b50b6", - "sha256": "hhdEuri1hSNLAkno8Rwd0Yls11Yh6Q7/+t4T2LH+BaE=", + "rev": "3edf1a00f64e0f22331233bb1638170115b2ac2e", + "sha256": "4IWYOJ2wTDkdO4FxsAWCV724VNViHIb42nYc+j4pekU=", "fetchSubmodules": true }, "play": { "owner": "jpd002", "repo": "Play-", - "rev": "b8e16159734c2068db0f2f12b11bc16ef55058ce", - "sha256": "qjp1rEjmDAAB2wXITA3lAS+ERJuZinoneJToYiYRi/w=", + "rev": "6b9cc418004c01a195c78387752cc99245ba54d5", + "sha256": "sha256-7nU5fQ8pQLmKy9Swmshkv2oj+HV0oTcqQ93LfNSq1us=", "fetchSubmodules": true }, "ppsspp": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "b6e7fe1aaf2bbb8f4faa1378bf14f434aea33cc1", - "sha256": "Kif6oF8Bjhgc02xKDivCG9RBxj5wxNFEwxl9nX3AZug=", + "rev": "712b87ae57d4e69ad5ba98d331912dead31b9c01", + "sha256": "sygZYAOkFrrfpaF6nfKMBecJTNeXk48oqlCRncPb340=", "fetchSubmodules": true }, "prboom": { @@ -422,8 +422,8 @@ "sameboy": { "owner": "libretro", "repo": "sameboy", - "rev": "68f67b3db7747ba7aac84c5c253bc71d5a906525", - "sha256": "/4JQ1Tem3UgOUIcsLV0aLU+1R55hMTaT+wWElwj00Q4=", + "rev": "fb3c7dd7d89df1f696e4cde33a868e141c927790", + "sha256": "KFVNl43AJ11thHFFSJ6BO7wxfxhVdDVF+BAm1+GIzIs=", "fetchSubmodules": false }, "scummvm": { @@ -443,8 +443,8 @@ "snes9x": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "edc32fc0bd6aea6d5645a03f0f94b72f3cbfa43e", - "sha256": "Zeojdoykmk+lpG1z5EdZToGWYDQvSSQqaEr7F68iyk0=", + "rev": "cf1a5901fccafdaead225b0a5e55ff74fdcf9678", + "sha256": "p6qTCZnZSV5vgpZglI/HMi/wOfu0hG2TuvOQhQHeo2s=", "fetchSubmodules": false }, "snes9x2002": { @@ -471,8 +471,8 @@ "stella": { "owner": "stella-emu", "repo": "stella", - "rev": "e1035b74fce26932078d00e8625688927efce34c", - "sha256": "+ZvSCnnoKGyToSFqUQOArolFdgUcBBFNjFw8aoVDkYI=", + "rev": "f619b4e5cb01eefe0c01dedc01b452b3f74aab26", + "sha256": "Oe++mDo1InvlvbRLlxcSjNQpioj4+ytt6ihTcvrD8g4=", "fetchSubmodules": false }, "stella2014": { From 66a3f079dd2194689e07ce5c7dc4170ef4de58b8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 22 Nov 2021 21:14:04 -0300 Subject: [PATCH 084/185] libretro.blastem: init at unstable-2021-11-22 (cherry picked from commit 0e8e7c819c7d47b4b3dacda8ecedb81d3df6c8ab) --- pkgs/misc/emulators/retroarch/cores.nix | 6 ++++++ pkgs/misc/emulators/retroarch/hashes.json | 7 +++++++ pkgs/misc/emulators/retroarch/update.py | 1 + 3 files changed, 14 insertions(+) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index e0b9c6ff33b9..c8a1b8983f32 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -224,6 +224,12 @@ in makefile = "Makefile"; }; + blastem = mkLibRetroCore { + core = "blastem"; + description = "Port of BlastEm to libretro"; + license = lib.licenses.gpl3Only; + }; + bluemsx = mkLibRetroCore { core = "bluemsx"; description = "Port of BlueMSX to libretro"; diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/misc/emulators/retroarch/hashes.json index 9ca689d469d4..9eab19b29ad1 100644 --- a/pkgs/misc/emulators/retroarch/hashes.json +++ b/pkgs/misc/emulators/retroarch/hashes.json @@ -83,6 +83,13 @@ "sha256": "XHTzXlTt8op0bDLNn833Unt57zclXowlLhG3qvWwjXQ=", "fetchSubmodules": false }, + "blastem": { + "owner": "libretro", + "repo": "blastem", + "rev": "0786858437ed71996f43b7af0fbe627eb88152fc", + "sha256": "uEP5hSgLAle1cLv/EM7D11TJMAggu7pqWxfrUt3rhEg=", + "fetchSubmodules": false + }, "bluemsx": { "owner": "libretro", "repo": "bluemsx-libretro", diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/misc/emulators/retroarch/update.py index 2a623cb5062f..3c1ea2b755b1 100755 --- a/pkgs/misc/emulators/retroarch/update.py +++ b/pkgs/misc/emulators/retroarch/update.py @@ -22,6 +22,7 @@ CORES = { "beetle-supergrafx": {"repo": "beetle-supergrafx-libretro"}, "beetle-vb": {"repo": "beetle-vb-libretro"}, "beetle-wswan": {"repo": "beetle-wswan-libretro"}, + "blastem": {"repo": "blastem"}, "bluemsx": {"repo": "bluemsx-libretro"}, "bsnes": {"repo": "bsnes-libretro"}, "bsnes-hd": {"repo": "bsnes-hd", "owner": "DerKoun"}, From 157f18a8cfd7c4b07a37b6cee63bb978ca662ffa Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Wed, 24 Nov 2021 19:23:59 -0800 Subject: [PATCH 085/185] yfinance: fix build (cherry picked from commit 7402bc6c2e12081e81ccb68ed32d638c5b62710d) --- pkgs/development/python-modules/yfinance/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 30b17f6897a9..6a99e74433e0 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -5,6 +5,7 @@ , numpy , pandas , requests +, lxml }: buildPythonPackage rec { @@ -22,6 +23,7 @@ buildPythonPackage rec { numpy pandas requests + lxml ]; doCheck = false; # Tests require internet access From bbe83d7fe6e28b8a7e95808204ef6975d3bf2d2f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 24 Nov 2021 00:07:08 +0000 Subject: [PATCH 086/185] qemu: never use bundled Meson It's better to fail to build if our version of Meson isn't compatible with QEMU's, so we'll know something is wrong. Otherwise, we'll get subtle breakages that only manifest at runtime, which I think might be what happened in 9e403b19a14 ("qemu: 5.1.0 -> 5.2.0") to necessitate autoPatchelfHook. (cherry picked from commit aa58876daf11fb082c5b74f143fba80f94b024a3) --- pkgs/applications/virtualization/qemu/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a8a18692b9ee..4919f95b5a66 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -178,6 +178,9 @@ stdenv.mkDerivation rec { "--enable-guest-agent" "--localstatedir=/var" "--sysconfdir=/etc" + # Always use our Meson, not the bundled version, which doesn't + # have our patches and will be subtly broken because of that. + "--meson=meson" ] ++ lib.optional numaSupport "--enable-numa" ++ lib.optional seccompSupport "--enable-seccomp" ++ lib.optional smartcardSupport "--enable-smartcard" From e4b974abd98e376a29f8532361b374641dca3371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 25 Nov 2021 18:55:41 +0100 Subject: [PATCH 087/185] nix-eval-jobs: switch to nix stable This also should make prevent breakages like https://github.com/NixOS/nixpkgs/pull/147376 (cherry picked from commit 856ce74b013135319c376a890ada14308ae1900b) --- pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 0407ad4528de..a9cf1238441c 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , meson , ninja -, nixUnstable +, nix , nlohmann_json , pkg-config , stdenv @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost - nixUnstable + nix nlohmann_json ]; nativeBuildInputs = [ From a1ea9a03542ac3ae764cb4e671901e650226178c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Nov 2021 16:02:35 -0500 Subject: [PATCH 088/185] qemu: only include alsa-lib for alsa support (cherry picked from commit 4b5c3d9376a829f454d195d0c8053a160f6b4fbe) Co-authored-by: Alyssa Ross --- pkgs/applications/virtualization/qemu/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 4919f95b5a66..93a215f1003b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile ] ++ lib.optionals seccompSupport [ libseccomp ] ++ lib.optionals numaSupport [ numactl ] + ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals pulseSupport [ libpulseaudio ] ++ lib.optionals sdlSupport [ SDL2 SDL2_image ] ++ lib.optionals gtkSupport [ gtk3 gettext vte ] @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { ++ lib.optionals smartcardSupport [ libcacard ] ++ lib.optionals spiceSupport [ spice-protocol spice ] ++ lib.optionals usbredirSupport [ usbredir ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libaio libcap_ng libcap attr ] + ++ lib.optionals stdenv.isLinux [ libaio libcap_ng libcap attr ] ++ lib.optionals xenSupport [ xen ] ++ lib.optionals cephSupport [ ceph ] ++ lib.optionals glusterfsSupport [ glusterfs libuuid ] From 5ebcd990a2721c7e9112dc7df6164f014d7ec58f Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 25 Nov 2021 20:09:33 +0100 Subject: [PATCH 089/185] guitone: remove package Guitone isn't used in Nixpkgs anywhere. It hasn't seen a release in 11 years (6a09974e0f53305ab5f411d1388acdfb264d1441) and is unmaintained in Nixpkgs. Also it's the sole remaining user of graphviz_2_32, which should be removed as well. (cherry picked from commit 86b2661837d41d6733bdf42e9e5e1414b17bf624) --- .../version-management/guitone/default.nix | 34 ------------------- .../guitone/parallel-building.patch | 7 ---- pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 45 deletions(-) delete mode 100644 pkgs/applications/version-management/guitone/default.nix delete mode 100644 pkgs/applications/version-management/guitone/parallel-building.patch diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix deleted file mode 100644 index d78023d8468f..000000000000 --- a/pkgs/applications/version-management/guitone/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkg-config, graphviz }: - -let version = "1.0-mtn-head"; in -stdenv.mkDerivation { - pname = "guitone"; - inherit version; - - #src = fetchurl { - # url = "${meta.homepage}/count.php/from=default/${version}/${name}.tgz"; - # sha256 = "08kcyar6p6v5z4dq6q6c1dhyxc2jj49qcd6lj3rdn1rb9hz4n7ms"; - #}; - - src = fetchmtn { - dbs = ["mtn://code.monotone.ca/guitone"]; - selector = "3a728afdbd3943b1d86c2a249b1e2ede7bf64c27"; - sha256 = "01vs8m00phs5pl75mjkpdarynfpkqrg0qf4rsn95czi3q6nxiaq5"; - branch = "net.venge.monotone.guitone"; - }; - - patches = [ ./parallel-building.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ qt4 qmake4Hook graphviz ]; - - qmakeFlags = [ "guitone.pro" ]; - - meta = { - description = "Qt4 based GUI for monotone"; - homepage = "https://guitone.thomaskeller.biz"; - downloadPage = "https://code.monotone.ca/p/guitone/"; - license = lib.licenses.gpl3; - inherit (qt4.meta) platforms; - }; -} diff --git a/pkgs/applications/version-management/guitone/parallel-building.patch b/pkgs/applications/version-management/guitone/parallel-building.patch deleted file mode 100644 index f0e924cbfb81..000000000000 --- a/pkgs/applications/version-management/guitone/parallel-building.patch +++ /dev/null @@ -1,7 +0,0 @@ -Without this `make tmp/AttributesView.o` fails with -src/view/dialogs/AddEditAttribute.h:22:35: fatal error: ui_add_edit_attribute.h: No such file or directory ---- a/guitone.pro -+++ b/guitone.pro -@@ -215 +215,2 @@ help.commands = @echo Available targets: $${QMAKE_EXTRA_TARGETS} - QMAKE_EXTRA_TARGETS += help -+CONFIG += depend_includepath diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b9f25ab6eec..51604d71c71f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25635,10 +25635,6 @@ with pkgs; guardian-agent = callPackage ../tools/networking/guardian-agent { }; - guitone = callPackage ../applications/version-management/guitone { - graphviz = graphviz_2_32; - }; - gv = callPackage ../applications/misc/gv { }; gvisor = callPackage ../applications/virtualization/gvisor { From 63be96f65e77342700ed7c0b64d40da61f92a73f Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 25 Nov 2021 19:28:41 +0100 Subject: [PATCH 090/185] graphviz_2_32: remove It is broken and their is no usage in current nixpkgs. Also the notice about its necessity is from 2014: 08131bd5d5f627f03625cf28ca8afbd7eb83e7fa (cherry picked from commit 1d2c379e3b8a172dfa8688f2065da062c01bb766) --- pkgs/tools/graphics/graphviz/2.32.nix | 5 - pkgs/tools/graphics/graphviz/base.nix | 109 --------------------- pkgs/tools/graphics/graphviz/default.nix | 115 ++++++++++++++++++++++- pkgs/top-level/all-packages.nix | 8 -- 4 files changed, 112 insertions(+), 125 deletions(-) delete mode 100644 pkgs/tools/graphics/graphviz/2.32.nix delete mode 100644 pkgs/tools/graphics/graphviz/base.nix diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix deleted file mode 100644 index 544949f33b71..000000000000 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ /dev/null @@ -1,5 +0,0 @@ -import ./base.nix { - rev = "10c3c34c5198beacfba950764f34960c6884a34f"; - version = "2.32.0"; - sha256 = "18b2wnz6xk8hndy7dlr1vn9vziyryyflh747n9966778gmh8bick"; -} diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix deleted file mode 100644 index 53c231aa49bc..000000000000 --- a/pkgs/tools/graphics/graphviz/base.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ rev, sha256, version }: - -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex -, fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango, bash -, bison, fetchpatch, xorg, ApplicationServices, python3, withXorg ? true -}: - -let - inherit (lib) optional optionals optionalString; - raw_patch = - # https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196 - fetchpatch { - name = "CVE-2018-10196.patch"; - url = "https://gitlab.com/graphviz/graphviz/uploads/30f8f0b00e357c112ac35fb20241604a/p.diff"; - sha256 = "074qx6ch9blrnlilmz7p96fkiz2va84x2fbqdza5k4808rngirc7"; - excludes = [ "tests/*" ]; # we don't run them and they don't apply - }; - # the patch needs a small adaption for older versions - patchToUse = if lib.versionAtLeast version "2.37" then raw_patch else - stdenv.mkDerivation { - inherit (raw_patch) name; - buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out"; - }; - # 2.42 has the patch included - patches = optional (lib.versionOlder version "2.42") patchToUse - ++ optionals (lib.versionOlder version "2.46.0") [ - (fetchpatch { - name = "CVE-2020-18032.patch"; - url = "https://gitlab.com/graphviz/graphviz/-/commit/784411ca3655c80da0f6025ab20634b2a6ff696b.patch"; - sha256 = "1nkw9ism8lkfvxsp5fh95i2l5s5cbjsidbb3g1kjfv10rxkyb41m"; - }) - ] ++ [ - # Fix cross. - # https://gitlab.com/graphviz/graphviz/-/merge_requests/2281 - (fetchpatch { - url = "https://gitlab.com/graphviz/graphviz/-/commit/0cdb89acbb0caf5baf3d04a8821c9d0dfe065ea8.patch"; - sha256 = "130mqlxzhzaz3vp4ccaq7z7fd9q6vjxmimz70g8y818igsbb13rf"; - }) - ]; -in - -stdenv.mkDerivation { - pname = "graphviz"; - inherit version; - - src = fetchFromGitLab { - owner = "graphviz"; - repo = "graphviz"; - inherit sha256 rev; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - python3 - bison - flex - ]; - - buildInputs = [ - libpng libjpeg expat fontconfig gd gts libdevil pango bash - ] ++ optionals withXorg (with xorg; [ libXrender libXaw libXpm ]) - ++ optionals stdenv.isDarwin [ ApplicationServices ]; - - hardeningDisable = [ "fortify" ]; - - CPPFLAGS = lib.optionalString (withXorg && stdenv.isDarwin) - "-I${cairo.dev}/include/cairo"; - - configureFlags = [ - "--with-ltdl-lib=${libtool.lib}/lib" - "--with-ltdl-include=${libtool}/include" - ] ++ lib.optional (xorg == null) "--without-x"; - - inherit patches; - - postPatch = '' - for f in $(find . -name Makefile.in); do - substituteInPlace $f --replace "-lstdc++" "-lc++" - done - ''; - - # '' - # substituteInPlace rtest/rtest.sh \ - # --replace "/bin/ksh" "${mksh}/bin/mksh" - # ''; - - doCheck = false; # fails with "Graphviz test suite requires ksh93" which is not in nixpkgs - - preAutoreconf = "./autogen.sh"; - - postFixup = optionalString withXorg '' - substituteInPlace $out/bin/dotty --replace '`which lefty`' $out/bin/lefty - substituteInPlace $out/bin/vimdot \ - --replace /usr/bin/vi '$(command -v vi)' \ - --replace /usr/bin/vim '$(command -v vim)' \ - --replace /usr/bin/vimdot $out/bin/vimdot \ - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://graphviz.org"; - description = "Graph visualization tools"; - license = licenses.epl10; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor raskin ]; - }; -} diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 6dc9e1861ac8..e2c5f9f63fc5 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,114 @@ -import ./base.nix rec { - rev = "3425dae078262591d04fec107ec71ab010651852"; # use rev as tags have disappeared before +{ lib +, stdenv +, fetchFromGitLab +, autoreconfHook +, pkg-config +, cairo +, expat +, flex +, fontconfig +, gd +, gts +, libdevil +, libjpeg +, libpng +, libtool +, pango +, bash +, bison +, fetchpatch +, xorg +, ApplicationServices +, python3 +, withXorg ? true +}: + +let + inherit (lib) optional optionals optionalString; +in +stdenv.mkDerivation { + pname = "graphviz"; version = "2.49.3"; - sha256 = "1qvyjly7r1ihacdvxq0r59l4csr09sc05palpshzqsiz2wb1izk0"; + + src = fetchFromGitLab { + owner = "graphviz"; + repo = "graphviz"; + # use rev as tags have disappeared before + rev = "3425dae078262591d04fec107ec71ab010651852"; + sha256 = "1qvyjly7r1ihacdvxq0r59l4csr09sc05palpshzqsiz2wb1izk0"; + }; + + patches = [ + # Fix cross. + # https://gitlab.com/graphviz/graphviz/-/merge_requests/2281 + # Remove when version > 2.49.3. + (fetchpatch { + url = "https://gitlab.com/graphviz/graphviz/-/commit/0cdb89acbb0caf5baf3d04a8821c9d0dfe065ea8.patch"; + sha256 = "130mqlxzhzaz3vp4ccaq7z7fd9q6vjxmimz70g8y818igsbb13rf"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + python3 + bison + flex + ]; + + buildInputs = [ + libpng + libjpeg + expat + fontconfig + gd + gts + libdevil + pango + bash + ] ++ optionals withXorg (with xorg; [ libXrender libXaw libXpm ]) + ++ optionals stdenv.isDarwin [ ApplicationServices ]; + + hardeningDisable = [ "fortify" ]; + + configureFlags = [ + "--with-ltdl-lib=${libtool.lib}/lib" + "--with-ltdl-include=${libtool}/include" + ] ++ lib.optional (xorg == null) "--without-x"; + + enableParallelBuilding = true; + + CPPFLAGS = lib.optionalString (withXorg && stdenv.isDarwin) + "-I${cairo.dev}/include/cairo"; + + # '' + # substituteInPlace rtest/rtest.sh \ + # --replace "/bin/ksh" "${mksh}/bin/mksh" + # ''; + + doCheck = false; # fails with "Graphviz test suite requires ksh93" which is not in nixpkgs + + postPatch = '' + for f in $(find . -name Makefile.in); do + substituteInPlace $f --replace "-lstdc++" "-lc++" + done + ''; + + preAutoreconf = "./autogen.sh"; + + postFixup = optionalString withXorg '' + substituteInPlace $out/bin/dotty --replace '`which lefty`' $out/bin/lefty + substituteInPlace $out/bin/vimdot \ + --replace /usr/bin/vi '$(command -v vi)' \ + --replace /usr/bin/vim '$(command -v vim)' \ + --replace /usr/bin/vimdot $out/bin/vimdot \ + ''; + + meta = with lib; { + homepage = "https://graphviz.org"; + description = "Graph visualization tools"; + license = licenses.epl10; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor raskin ]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51604d71c71f..08b2e7894de8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5954,14 +5954,6 @@ with pkgs; libdevil = libdevil-nox; }; - /* Readded by Michael Raskin. There are programs in the wild - * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for - * objections before removal. The feature is libgraph. - */ - graphviz_2_32 = (callPackage ../tools/graphics/graphviz/2.32.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }).overrideAttrs(x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];}); - grin = callPackage ../tools/text/grin { }; ripgrep = callPackage ../tools/text/ripgrep { From 86013417efa26d1d1374c89241bc2b874cb75f1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 25 Nov 2021 23:32:01 +0100 Subject: [PATCH 091/185] python3Packages.pythonegardia: add patch for search path (cherry picked from commit a952e5579bb00bdccdf7d2666fc04f1c5019deda) --- .../python-modules/pythonegardia/default.nix | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pythonegardia/default.nix b/pkgs/development/python-modules/pythonegardia/default.nix index 318059d2466f..7ce66f221fb2 100644 --- a/pkgs/development/python-modules/pythonegardia/default.nix +++ b/pkgs/development/python-modules/pythonegardia/default.nix @@ -1,25 +1,44 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fetchpatch , requests +, pythonOlder }: buildPythonPackage rec { pname = "pythonegardia"; version = "1.0.51"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "b99217e34c59bfae059db400acef99d3d32237d13da6fdce9e0d4decc9a07e61"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "jeroenterheerdt"; + repo = "python-egardia"; + rev = "v${version}"; + sha256 = "7HindS++jcV3GRn/SKoTMpVOchOnLojy/TY0HZjtyD8="; }; propagatedBuildInputs = [ requests ]; + patches = [ + # Adjust search path, https://github.com/jeroenterheerdt/python-egardia/pull/33 + (fetchpatch { + name = "search-path.patch"; + url = "https://github.com/jeroenterheerdt/python-egardia/commit/6b7bf5b7b2211e3557e0f438586b9d03b9bae440.patch"; + sha256 = "wUSfmF0SrKCITQJJsHgkGgPZFouaB/zbVqupK6fARHY="; + }) + ]; + # Project has no tests, only two test file for manual interaction doCheck = false; - pythonImportsCheck = [ "pythonegardia" ]; + + pythonImportsCheck = [ + "pythonegardia" + ]; meta = with lib; { description = "Python interface with Egardia/Woonveilig alarms"; From 1eda1b0121285a68130acbabcdeac785eee5dc9b Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 24 Nov 2021 08:44:49 +0100 Subject: [PATCH 092/185] trilium: 0.48.6 -> 0.48.7 (cherry picked from commit d2f48288716a257fdc122bcef98a1b97e591ee41) --- pkgs/applications/office/trilium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 528b6786290a..0f07dd0efd3e 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.48.6"; + version = "0.48.7"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1n7gm6mwzf5yyk8cpn70029p1iiv26bypyfi42sx14yyjvlny4rm"; + sha256 = "16clrn89mq2n30hb50y45s6qn5l7n1hj4b124wjxrkmmwpdbjwad"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "0z7cbw11mqf2mfv6ixnczg2i4jcdpvryzl0521ai26gq42jyyy0r"; + sha256 = "18zwplcai4s82pdy3l30862jdl22311qh78anrjz29fm6srx1y9l"; }; in { From c2f37f240c022b5ed4fff05301bde4ef6f6a92d0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 26 Nov 2021 06:22:34 -0500 Subject: [PATCH 093/185] =?UTF-8?q?nix-plugins:=206.0.0=20=E2=86=92=208.0.?= =?UTF-8?q?0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Works with Nix 2.4 now. Fixes shlevy/nix-plugins#9 --- pkgs/development/libraries/nix-plugins/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index a4c18e9f0466..c17a0e8c7fe7 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-plugins"; - version = "6.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv"; + hash = "sha256-Zz8cPHK4w0qimYu6III6XfiKVQIzEMMV9P6ER5fveZY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98696a445cca..1dc4a85720b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18780,7 +18780,7 @@ with pkgs; nghttp2 = callPackage ../development/libraries/nghttp2 { }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins { nix = nix_2_3; }; + nix-plugins = callPackage ../development/libraries/nix-plugins { }; nika-fonts = callPackage ../data/fonts/nika-fonts { }; From 1324c7b8a76a952e69d1ec008c56c56180daf07e Mon Sep 17 00:00:00 2001 From: Mark Martinez Date: Tue, 23 Nov 2021 12:05:48 -0600 Subject: [PATCH 094/185] perlPackages.DistZilla: shortenPerlShebang on Darwin (cherry picked from commit b382ed47fde7a896fd65eeb8cfe19469c1b2b09d) --- pkgs/top-level/perl-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 70b7926d30ec..9609c122727a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6887,6 +6887,10 @@ let }; buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner SoftwareLicense TermEncoding TermUI YAMLTiny ]; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/dzil + ''; meta = { homepage = "http://dzil.org/"; description = "Distribution builder; installer not included!"; From da25fe99c98f753b08ff26568521d331be2524bd Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 23 Nov 2021 18:31:40 +0100 Subject: [PATCH 095/185] imagemagick: 7.1.0-15 -> 7.1.0-16 (cherry picked from commit 63ea61bcf0be615562d7d8f982c005d6c52d6118) --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 9ca6fa912fe6..c78f9fb8dddf 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-15"; + version = "7.1.0-16"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-M5BhCb5caknohwk0oncJBCBJs32p0EdNs4dNqRfDRYc="; + sha256 = "sha256-souH5Fop4ss1ysaYylHcykoeB0HvMtqU51xggKoRFDM="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 94ebde0d0ef4b5feac3729e67e5857724c954185 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 15 Nov 2021 09:38:25 -0800 Subject: [PATCH 096/185] nodePackages.teck-programmer: fix build Co-authored-by: Sandro (cherry picked from commit 7be91b05bb9b01115e07c91fe610f3b1874050c3) --- pkgs/development/node-packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 9738d16353d4..7b8583b6db31 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -392,6 +392,7 @@ let }; teck-programmer = super.teck-programmer.override { + nativeBuildInputs = [ self.node-gyp-build ]; buildInputs = [ pkgs.libusb1 ]; }; From 68971fcd94c73a63635aad01ec4431313ddd5577 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 26 Nov 2021 02:16:08 -0500 Subject: [PATCH 097/185] nixos: Provide nix-bash-completions again for stable commands (cherry picked from commit 8e92630aae97864975761be92976ac0801954f3f) --- nixos/modules/services/misc/nix-daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4ea45888e5fc..a3e0f3e0d120 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -546,7 +546,7 @@ in [ nix pkgs.nix-info ] - ++ optional (config.programs.bash.enableCompletion && !versionAtLeast nixVersion "2.4pre") pkgs.nix-bash-completions; + ++ optional (config.programs.bash.enableCompletion) pkgs.nix-bash-completions; environment.etc."nix/nix.conf".source = nixConf; From af945e4f0a923c8fe91b35422878d5b9f8e3fb62 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 26 Nov 2021 02:17:15 -0500 Subject: [PATCH 098/185] nix-bash-completions: Reduce priority for Nix 2.4 Reducing the priority makes the system build prefer the Nix-provided completions, for e.g. the new `nix` commands. (cherry picked from commit 8608d393e87a33d8ebc95f76f4c5fa03467d096e) --- pkgs/shells/bash/nix-bash-completions/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix index 2034eed1f5da..2e8b49385fb4 100644 --- a/pkgs/shells/bash/nix-bash-completions/default.nix +++ b/pkgs/shells/bash/nix-bash-completions/default.nix @@ -32,5 +32,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ hedning ]; + # Set a lower priority such that the newly provided completion from Nix 2.4 are preferred. + priority = 10; }; } From cc47d0d2f92589540eaa18025ff93212dcfae624 Mon Sep 17 00:00:00 2001 From: Poscat Date: Wed, 6 Oct 2021 17:53:04 +0800 Subject: [PATCH 099/185] nixos/acme: add an option for reloading systemd services after renewal (cherry picked from commit 88ad030bba8b90da97ac9638b0eec693fe78fc03) --- nixos/modules/security/acme.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index cfbc8e91903e..88c5774d187c 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -314,6 +314,9 @@ let if [ -e renewed ]; then rm renewed ${data.postRun} + ${optionalString (data.reloadServices != []) + "systemctl --no-block try-reload-or-restart ${escapeShellArgs data.reloadServices}" + } fi ''); }; @@ -474,6 +477,15 @@ let description = "Group running the ACME client."; }; + reloadServices = mkOption { + type = types.listOf types.str; + default = []; + description = '' + The list of systemd services to call systemctl try-reload-or-restart + on. + ''; + }; + postRun = mkOption { type = types.lines; default = ""; From 791531028f3aa80c6eb219ed4c50c7d61868b1c9 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 25 Nov 2021 21:13:12 +0000 Subject: [PATCH 100/185] ocaml: heed hardeningDisable flags set for individual versions specifically this re-fixes ocaml 4.09 on clang by allowing its hardeningDisable flags to take effect (cherry picked from commit dc523cbb801fc4fd3143750e3e34b1ea040715ae) --- pkgs/development/compilers/ocaml/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 1b6a3b56e622..c474a2e85f15 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -66,7 +66,8 @@ stdenv.mkDerivation (args // { dontAddStaticConfigureFlags = lib.versionOlder version "4.08"; configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08") [ "host" "target" ]; # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together - hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"; + hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie" + ++ lib.optionals (args ? hardeningDisable) args.hardeningDisable; buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses From b412d2e769fa24cc3f29580ffe38636cacfe9612 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 23 Nov 2021 11:56:37 -0300 Subject: [PATCH 101/185] buildGraalvmNativeImage: init For now it only takes care of the single Jar <-> single Executable case. This will take care of the majority (all?) use cases we have in nixpkgs currently. (cherry picked from commit 1415e30830e9fae776cbd08a4934a4cdc66e1a02) --- .../build-graalvm-native-image/default.nix | 53 +++++++++++++++++++ .../tools/misc/clojure-lsp/default.nix | 41 ++++---------- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 63 insertions(+), 32 deletions(-) create mode 100644 pkgs/build-support/build-graalvm-native-image/default.nix diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix new file mode 100644 index 000000000000..d6c07f0d69d7 --- /dev/null +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, graalvmCEPackages, glibcLocales }: + +{ name ? "${args.pname}-${args.version}" + # Final executable name +, executable + # JAR used as input for GraalVM derivation, defaults to src +, jar ? args.src +, dontUnpack ? (jar == args.src) + # Extra arguments to be passed to the native-image +, extraNativeImageBuildArgs ? [ ] + # XMX size of GraalVM during build +, graalvmXmx ? "-J-Xmx6g" + # The GraalVM to use +, graalvm ? graalvmCEPackages.graalvm11-ce +, ... +} @ args: + +stdenv.mkDerivation (args // { + inherit dontUnpack; + + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ graalvm glibcLocales ]; + + nativeImageBuildArgs = lib.flatten ([ + "-jar" + jar + "-H:CLibraryPath=${lib.getLib graalvm}/lib" + "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}" + "-H:Name=${executable}" + extraNativeImageBuildArgs + graalvmXmx + ]); + + buildPhase = args.buildPhase or '' + runHook preBuild + + native-image ''${nativeImageBuildArgs[@]} + + runHook postBuild + ''; + + installPhase = args.installPhase or '' + runHook preInstall + + install -Dm755 ${executable} -t $out/bin + + runHook postInstall + ''; + + meta = { + platforms = lib.attrByPath [ "meta" "platforms" ] graalvm.meta.platforms args; + mainProgram = lib.attrByPath [ "meta" "mainProgram" ] executable args; + }; +}) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 9128b3f190e1..66166e469a80 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, graalvm11-ce, babashka, fetchurl, fetchFromGitHub, clojure, writeScript }: +{ lib, stdenv, buildGraalvmNativeImage, graalvm11-ce, babashka, fetchurl, fetchFromGitHub, clojure, writeScript }: -stdenv.mkDerivation rec { +buildGraalvmNativeImage rec { pname = "clojure-lsp"; version = "2021.11.02-15.24.47"; @@ -16,39 +16,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-k0mzibcLAspklCPE6f2qsUm9bwSvcJRgWecMBq7mpF0="; }; - GRAALVM_HOME = graalvm11-ce; - CLOJURE_LSP_JAR = jar; - CLOJURE_LSP_XMX = "-J-Xmx6g"; - - buildInputs = [ graalvm11-ce clojure ]; - - buildPhase = with lib; '' - runHook preBuild + extraNativeImageBuildArgs = [ + "-H:CLibraryPath=$DTLV_LIB_EXTRACT_DIR" + "--verbose" + "--no-fallback" + "--native-image-info" + ]; + preBuild = '' # https://github.com/clojure-lsp/clojure-lsp/blob/2021.11.02-15.24.47/graalvm/native-unix-compile.sh#L18-L27 DTLV_LIB_EXTRACT_DIR=$(mktemp -d) export DTLV_LIB_EXTRACT_DIR=$DTLV_LIB_EXTRACT_DIR - - args=("-jar" "$CLOJURE_LSP_JAR" - "-H:+ReportExceptionStackTraces" - "-H:CLibraryPath=${graalvm11-ce.lib}/lib" - "-H:CLibraryPath=$DTLV_LIB_EXTRACT_DIR" - "--verbose" - "--no-fallback" - "--native-image-info" - "$CLOJURE_LSP_XMX") - - native-image ''${args[@]} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm755 ./clojure-lsp $out/bin/clojure-lsp - - runHook postInstall ''; doCheck = true; @@ -88,7 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/clojure-lsp/clojure-lsp"; license = licenses.mit; maintainers = with maintainers; [ ericdallo babariviere ]; - platforms = graalvm11-ce.meta.platforms; # Depends on datalevin that is x86_64 only # https://github.com/juji-io/datalevin/blob/bb7d9328f4739cddea5d272b5cd6d6dcb5345da6/native/src/java/datalevin/ni/Lib.java#L86-L102 broken = !stdenv.isx86_64; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ff9459127f5..f46ffa4edb0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12322,6 +12322,7 @@ with pkgs; }); graalvm11-ce = graalvmCEPackages.graalvm11-ce; graalvm17-ce = graalvmCEPackages.graalvm17-ce; + buildGraalvmNativeImage = callPackage ../build-support/build-graalvm-native-image { }; inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { }) graalvm8-ee From d31aaf3c3a86a36897aa9718f7c874d1763962ed Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 23 Nov 2021 11:58:32 -0300 Subject: [PATCH 102/185] babashka: use buildGraalvmNativeImage (cherry picked from commit 052fb6a228ea1c573aec957b95a804ba70e41527) --- .../interpreters/clojure/babashka.nix | 53 ++++--------------- 1 file changed, 9 insertions(+), 44 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 85daec0d2ac9..acd7eccaadfd 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, graalvm11-ce, glibcLocales, writeScript }: +{ lib, buildGraalvmNativeImage, fetchurl, writeScript }: -stdenv.mkDerivation rec { +buildGraalvmNativeImage rec { pname = "babashka"; version = "0.6.5"; @@ -9,48 +9,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-72D/HzDIxkGD4zTPE9gHf/uFtboLbNnT7CTslSlAqjc="; }; - dontUnpack = true; + executable = "bb"; - nativeBuildInputs = [ graalvm11-ce glibcLocales ]; - - LC_ALL = "en_US.UTF-8"; - BABASHKA_JAR = src; - BABASHKA_BINARY = "bb"; - BABASHKA_XMX = "-J-Xmx4500m"; - - buildPhase = '' - runHook preBuild - - # https://github.com/babashka/babashka/blob/v0.6.2/script/compile#L41-L52 - args=("-jar" "$BABASHKA_JAR" - "-H:CLibraryPath=${graalvm11-ce.lib}/lib" - # Required to build babashka on darwin. Do not remove. - "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}" - "-H:Name=$BABASHKA_BINARY" - "-H:+ReportExceptionStackTraces" - # "-H:+PrintAnalysisCallTree" - # "-H:+DashboardAll" - # "-H:DashboardDump=reports/dump" - # "-H:+DashboardPretty" - # "-H:+DashboardJson" - "--verbose" - "--no-fallback" - "--native-image-info" - "$BABASHKA_XMX") - - native-image ''${args[@]} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp bb $out/bin/bb - - runHook postInstall - ''; + extraNativeImageBuildArgs = [ + "-H:+ReportExceptionStackTraces" + "--verbose" + "--no-fallback" + "--native-image-info" + ]; installCheckPhase = '' $out/bin/bb --version | grep '${version}' @@ -102,7 +68,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/babashka/babashka"; changelog = "https://github.com/babashka/babashka/blob/v${version}/CHANGELOG.md"; license = licenses.epl10; - platforms = graalvm11-ce.meta.platforms; maintainers = with maintainers; [ bandresen bhougland From 70d023db49382aac768d992b5d432f274a2de2c5 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 23 Nov 2021 12:26:19 -0300 Subject: [PATCH 103/185] clojure-lsp: use buildGraalvmNativeImage (cherry picked from commit 7c632551c1f5e6430779f03e45ce0d0296e54442) --- .../tools/misc/clojure-lsp/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 66166e469a80..c36f1695702d 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGraalvmNativeImage, graalvm11-ce, babashka, fetchurl, fetchFromGitHub, clojure, writeScript }: +{ lib, stdenv, buildGraalvmNativeImage, babashka, fetchurl, fetchFromGitHub, clojure, writeScript }: buildGraalvmNativeImage rec { pname = "clojure-lsp"; @@ -16,26 +16,25 @@ buildGraalvmNativeImage rec { sha256 = "sha256-k0mzibcLAspklCPE6f2qsUm9bwSvcJRgWecMBq7mpF0="; }; + executable = "clojure-lsp"; + + # https://github.com/clojure-lsp/clojure-lsp/blob/2021.11.02-15.24.47/graalvm/native-unix-compile.sh#L18-L27 + DTLV_LIB_EXTRACT_DIR = "/tmp"; + extraNativeImageBuildArgs = [ - "-H:CLibraryPath=$DTLV_LIB_EXTRACT_DIR" + "-H:CLibraryPath=${DTLV_LIB_EXTRACT_DIR}" "--verbose" "--no-fallback" "--native-image-info" ]; - preBuild = '' - # https://github.com/clojure-lsp/clojure-lsp/blob/2021.11.02-15.24.47/graalvm/native-unix-compile.sh#L18-L27 - DTLV_LIB_EXTRACT_DIR=$(mktemp -d) - export DTLV_LIB_EXTRACT_DIR=$DTLV_LIB_EXTRACT_DIR - ''; - doCheck = true; checkPhase = '' runHook preCheck export HOME="$(mktemp -d)" - ./clojure-lsp --version | fgrep -q '${version}' - ${babashka}/bin/bb integration-test ./clojure-lsp + ./${executable} --version | fgrep -q '${version}' + ${babashka}/bin/bb integration-test ./${executable} runHook postCheck ''; From e9c5e523dac1778164bf4ddd30c742ed0bb34444 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 23 Nov 2021 12:31:56 -0300 Subject: [PATCH 104/185] clj-kondo: use buildGraalvmNativeImage (cherry picked from commit a277e9d457925d917f1288d3cef16665d423320e) --- pkgs/development/tools/clj-kondo/default.nix | 36 +++++--------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 97f41b0c8a7e..efb97513a300 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, graalvm11-ce, fetchurl }: +{ lib, buildGraalvmNativeImage, fetchurl }: -stdenv.mkDerivation rec { +buildGraalvmNativeImage rec { pname = "clj-kondo"; version = "2021.10.19"; @@ -9,38 +9,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-i0OeQPZfQPUeXC/Bs84I91IahBKK6W1mFix97s8/lVA="; }; - dontUnpack = true; + executable = "clj-kondo"; - buildInputs = [ graalvm11-ce ]; - - buildPhase = '' - runHook preBuild - - # https://github.com/clj-kondo/clj-kondo/blob/v2021.10.19/script/compile#L17-L21 - args=("-jar" "$src" - "-H:CLibraryPath=${graalvm11-ce.lib}/lib" - # Required to build babashka on darwin. Do not remove. - "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}" - "-H:+ReportExceptionStackTraces" - "--verbose" - "--no-fallback" - "-J-Xmx3g") - - native-image ''${args[@]} - - runHook postBuild - ''; - - installPhase = '' - mkdir -p $out/bin - cp clj-kondo $out/bin/clj-kondo - ''; + extraNativeImageBuildArgs = [ + "-H:+ReportExceptionStackTraces" + "--verbose" + "--no-fallback" + ]; meta = with lib; { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/clj-kondo/clj-kondo"; license = licenses.epl10; - platforms = graalvm11-ce.meta.platforms; maintainers = with maintainers; [ jlesquembre bandresen thiagokokada ]; }; } From 3341799b984d03e60aebbb5474b78b030ed92fbc Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 23 Nov 2021 12:34:30 -0300 Subject: [PATCH 105/185] jet: use buildGraalvmNativeImage (cherry picked from commit 3100248dbb4b47c5b4f9fbc836feab46bed87e37) --- pkgs/development/tools/jet/default.nix | 51 ++++++++------------------ 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix index 9ba85cb8fc4f..07855f8eabe5 100644 --- a/pkgs/development/tools/jet/default.nix +++ b/pkgs/development/tools/jet/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, graalvm11-ce, fetchurl }: +{ lib, buildGraalvmNativeImage, fetchurl }: -stdenv.mkDerivation rec { +buildGraalvmNativeImage rec { pname = "jet"; version = "0.1.0"; @@ -14,46 +14,25 @@ stdenv.mkDerivation rec { sha256 = "sha256-mOUiKEM5tYhtpBpm7KtslyPYFsJ+Wr+4ul6Zi4aS09Q="; }; - dontUnpack = true; + executable = "jet"; - buildInputs = [ graalvm11-ce ]; - - buildPhase = '' - runHook preBuild - - # https://github.com/borkdude/jet/blob/v0.1.0/script/compile#L16-L29 - args=("-jar" "$src" - "-H:CLibraryPath=${graalvm11-ce.lib}/lib" - # Required to build jet on darwin. Do not remove. - "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}" - "-H:Name=jet" - "-H:+ReportExceptionStackTraces" - "-J-Dclojure.spec.skip-macros=true" - "-J-Dclojure.compiler.direct-linking=true" - "-H:IncludeResources=JET_VERSION" - "-H:ReflectionConfigurationFiles=${reflectionJson}" - "--initialize-at-build-time" - "-H:Log=registerResource:" - "--verbose" - "--no-fallback" - "--no-server" - "-J-Xmx3g") - - native-image ''${args[@]} - - runHook postBuild - ''; - - installPhase = '' - mkdir -p $out/bin - cp jet $out/bin/jet - ''; + extraNativeImageBuildArgs = [ + "-H:+ReportExceptionStackTraces" + "-J-Dclojure.spec.skip-macros=true" + "-J-Dclojure.compiler.direct-linking=true" + "-H:IncludeResources=JET_VERSION" + "-H:ReflectionConfigurationFiles=${reflectionJson}" + "--initialize-at-build-time" + "-H:Log=registerResource:" + "--verbose" + "--no-fallback" + "--no-server" + ]; meta = with lib; { description = "CLI to transform between JSON, EDN and Transit, powered with a minimal query language"; homepage = "https://github.com/borkdude/jet"; license = licenses.epl10; - platforms = graalvm11-ce.meta.platforms; maintainers = with maintainers; [ ericdallo ]; }; } From a997c18accb0e81abfa5a20860f26b090386528b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 23 Nov 2021 12:35:55 -0300 Subject: [PATCH 106/185] buildGraalvmNativeImage: default executable to pname (cherry picked from commit d352856ea2148e4ec1de2b5769dfcf79c1356d99) --- pkgs/build-support/build-graalvm-native-image/default.nix | 2 +- pkgs/development/tools/clj-kondo/default.nix | 2 -- pkgs/development/tools/jet/default.nix | 2 -- pkgs/development/tools/misc/clojure-lsp/default.nix | 6 ++---- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index d6c07f0d69d7..082787498e49 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -2,7 +2,7 @@ { name ? "${args.pname}-${args.version}" # Final executable name -, executable +, executable ? args.pname # JAR used as input for GraalVM derivation, defaults to src , jar ? args.src , dontUnpack ? (jar == args.src) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index efb97513a300..22a4582c5bb7 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -9,8 +9,6 @@ buildGraalvmNativeImage rec { sha256 = "sha256-i0OeQPZfQPUeXC/Bs84I91IahBKK6W1mFix97s8/lVA="; }; - executable = "clj-kondo"; - extraNativeImageBuildArgs = [ "-H:+ReportExceptionStackTraces" "--verbose" diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix index 07855f8eabe5..9713a736cd3c 100644 --- a/pkgs/development/tools/jet/default.nix +++ b/pkgs/development/tools/jet/default.nix @@ -14,8 +14,6 @@ buildGraalvmNativeImage rec { sha256 = "sha256-mOUiKEM5tYhtpBpm7KtslyPYFsJ+Wr+4ul6Zi4aS09Q="; }; - executable = "jet"; - extraNativeImageBuildArgs = [ "-H:+ReportExceptionStackTraces" "-J-Dclojure.spec.skip-macros=true" diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index c36f1695702d..5dd0f4a9e290 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -16,8 +16,6 @@ buildGraalvmNativeImage rec { sha256 = "sha256-k0mzibcLAspklCPE6f2qsUm9bwSvcJRgWecMBq7mpF0="; }; - executable = "clojure-lsp"; - # https://github.com/clojure-lsp/clojure-lsp/blob/2021.11.02-15.24.47/graalvm/native-unix-compile.sh#L18-L27 DTLV_LIB_EXTRACT_DIR = "/tmp"; @@ -33,8 +31,8 @@ buildGraalvmNativeImage rec { runHook preCheck export HOME="$(mktemp -d)" - ./${executable} --version | fgrep -q '${version}' - ${babashka}/bin/bb integration-test ./${executable} + ./${pname} --version | fgrep -q '${version}' + ${babashka}/bin/bb integration-test ./${pname} runHook postCheck ''; From 2abebee8b224295684bc67f4d804b190374e0182 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 23 Nov 2021 12:45:57 -0300 Subject: [PATCH 107/185] zprint: use buildGraalvmNativeImage (cherry picked from commit e9766a85bdf15c525bdcb5b16040608ff7b9233f) --- pkgs/development/tools/zprint/default.nix | 41 ++++++----------------- 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/pkgs/development/tools/zprint/default.nix b/pkgs/development/tools/zprint/default.nix index f00d9c29a482..f69c2b223a92 100644 --- a/pkgs/development/tools/zprint/default.nix +++ b/pkgs/development/tools/zprint/default.nix @@ -1,40 +1,22 @@ -{ stdenv, lib, fetchurl, graalvm11-ce, glibcLocales }: +{ lib, buildGraalvmNativeImage, fetchurl }: -stdenv.mkDerivation rec { +buildGraalvmNativeImage rec { pname = "zprint"; version = "1.1.2"; src = fetchurl { - url = - "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}"; + url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}"; sha256 = "1wh8jyj7alfa6h0cycfwffki83wqb5d5x0p7kvgdkhl7jx7isrwj"; }; - dontUnpack = true; - - LC_ALL = "en_US.UTF-8"; - nativeBuildInputs = [ graalvm11-ce glibcLocales ]; - - buildPhase = '' - native-image \ - --no-server \ - -J-Xmx7G \ - -J-Xms4G \ - -jar ${src} \ - -H:Name=${pname} \ - -H:EnableURLProtocols=https,http \ - -H:+ReportExceptionStackTraces \ - -H:CLibraryPath=${graalvm11-ce.lib}/lib \ - ${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \ - --report-unsupported-elements-at-runtime \ - --initialize-at-build-time \ - --no-fallback - ''; - - installPhase = '' - mkdir -p $out/bin - install ${pname} $out/bin - ''; + extraNativeImageBuildArgs = [ + "--no-server" + "-H:EnableURLProtocols=https,http" + "-H:+ReportExceptionStackTraces" + "--report-unsupported-elements-at-runtime" + "--initialize-at-build-time" + "--no-fallback" + ]; meta = with lib; { description = "Clojure/EDN source code formatter and pretty printer"; @@ -45,7 +27,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/kkinnear/zprint"; license = licenses.mit; - platforms = graalvm11-ce.meta.platforms; maintainers = with maintainers; [ stelcodes ]; }; } From 1ef566898e643ea0af070c2b71d286ae86c75818 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 23 Nov 2021 13:32:17 -0300 Subject: [PATCH 108/185] buildGraalvmNativeImage: fix meta, add --verbose flag (cherry picked from commit f1c16183c8c7c78a3f372251e9af0f465d0bb355) --- pkgs/build-support/build-graalvm-native-image/default.nix | 7 +++---- pkgs/development/interpreters/clojure/babashka.nix | 1 - pkgs/development/tools/clj-kondo/default.nix | 1 - pkgs/development/tools/jet/default.nix | 1 - pkgs/development/tools/misc/clojure-lsp/default.nix | 1 - 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index 082787498e49..d85a5c457744 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation (args // { "-H:CLibraryPath=${lib.getLib graalvm}/lib" "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}" "-H:Name=${executable}" + "--verbose" extraNativeImageBuildArgs graalvmXmx ]); @@ -46,8 +47,6 @@ stdenv.mkDerivation (args // { runHook postInstall ''; - meta = { - platforms = lib.attrByPath [ "meta" "platforms" ] graalvm.meta.platforms args; - mainProgram = lib.attrByPath [ "meta" "mainProgram" ] executable args; - }; + meta.platforms = lib.attrByPath [ "meta" "platforms" ] graalvm.meta.platforms args; + meta.mainProgram = lib.attrByPath [ "meta" "mainProgram" ] executable args; }) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index acd7eccaadfd..5e7731b69039 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -13,7 +13,6 @@ buildGraalvmNativeImage rec { extraNativeImageBuildArgs = [ "-H:+ReportExceptionStackTraces" - "--verbose" "--no-fallback" "--native-image-info" ]; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 22a4582c5bb7..df6a5e0f90ef 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -11,7 +11,6 @@ buildGraalvmNativeImage rec { extraNativeImageBuildArgs = [ "-H:+ReportExceptionStackTraces" - "--verbose" "--no-fallback" ]; diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix index 9713a736cd3c..6e140620adc9 100644 --- a/pkgs/development/tools/jet/default.nix +++ b/pkgs/development/tools/jet/default.nix @@ -22,7 +22,6 @@ buildGraalvmNativeImage rec { "-H:ReflectionConfigurationFiles=${reflectionJson}" "--initialize-at-build-time" "-H:Log=registerResource:" - "--verbose" "--no-fallback" "--no-server" ]; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 5dd0f4a9e290..5e3c750852df 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -21,7 +21,6 @@ buildGraalvmNativeImage rec { extraNativeImageBuildArgs = [ "-H:CLibraryPath=${DTLV_LIB_EXTRACT_DIR}" - "--verbose" "--no-fallback" "--native-image-info" ]; From 529c0edf72ea1f047bcabca7d858ddf90205dcb2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 23 Nov 2021 17:36:57 -0300 Subject: [PATCH 109/185] buildGraalvmNativeImage: allow nativeImageBuildArgs to be overwritten (cherry picked from commit a5c0f59bf732419674e15bed4188a6c0e881116e) --- .../build-graalvm-native-image/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index d85a5c457744..0ed8ea0486b6 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -6,6 +6,15 @@ # JAR used as input for GraalVM derivation, defaults to src , jar ? args.src , dontUnpack ? (jar == args.src) + # Default native-image arguments. You probably don't want to set this, + # except in special cases. In most cases, use extraNativeBuildArgs instead +, nativeImageBuildArgs ? [ + "-jar" jar + "-H:CLibraryPath=${lib.getLib graalvm}/lib" + (lib.optionalString stdenv.isDarwin "-H:-CheckToolchain") + "-H:Name=${executable}" + "--verbose" + ] # Extra arguments to be passed to the native-image , extraNativeImageBuildArgs ? [ ] # XMX size of GraalVM during build @@ -20,16 +29,7 @@ stdenv.mkDerivation (args // { nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ graalvm glibcLocales ]; - nativeImageBuildArgs = lib.flatten ([ - "-jar" - jar - "-H:CLibraryPath=${lib.getLib graalvm}/lib" - "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}" - "-H:Name=${executable}" - "--verbose" - extraNativeImageBuildArgs - graalvmXmx - ]); + nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ]; buildPhase = args.buildPhase or '' runHook preBuild From e26792d9049f9cc2ad5c6c1f26fe45fd8a2786ab Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 25 Nov 2021 18:02:17 +0100 Subject: [PATCH 110/185] varnish60: 6.0.8 -> 6.0.9 (cherry picked from commit 31fdf8b75e8fb9b5593644405d650d0ad8341a6f) --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 3e61e318aca9..5988c3a211e6 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -47,8 +47,8 @@ let in { varnish60 = common { - version = "6.0.8"; - sha256 = "1zk83hfxgjq1d0n4zx86q3f05y9f2zc6a1miz1zcvfa052q4bljx"; + version = "6.0.9"; + sha256 = "1g0pwyckc0xh6ag6wj082x9wn4q6p6krjgc16fkw1arl71c18wsh"; }; varnish70 = (common { version = "7.0.1"; From b294ab366a5897f8dabbd192355572a79827fa0e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Nov 2021 21:44:10 +0100 Subject: [PATCH 111/185] openmpi: 4.1.1 -> 4.1.2 (cherry picked from commit 7287bf05aa441bba567cb2a98dc1987f2b8e79e0) --- pkgs/development/libraries/openmpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index d3323b1fa9e0..aac11dc83bda 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -27,11 +27,11 @@ let }; in stdenv.mkDerivation rec { pname = "openmpi"; - version = "4.1.1"; + version = "4.1.2"; src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1nkwq123vvmggcay48snm9qqmrh0bdzpln0l1jnp26niidvplkz2"; + sha256 = "09xmlr4mfs02kwcf5cmdgkcdjj81fjwjmpa3rz2k28f3gz7wfy4v"; }; postPatch = '' From ba2f392d552876a7feb211edd96d5a7dd86703ed Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 26 Nov 2021 12:53:37 +0100 Subject: [PATCH 112/185] modules/nix-daemon: Add missing mk(Rename|Removed)OptionModule Commit 3a92a1a replaced the nix.daemonNiceLevel and nix.daemonIONiceLevel options. This commit adds appropriate mk(Rename|Removed)OptionModule. (cherry picked from commit 257e92258e0da135e560d1c36f366e9ceb932378) --- nixos/modules/services/misc/nix-daemon.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index a3e0f3e0d120..fb643e7a66e1 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -74,6 +74,8 @@ in imports = [ (mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ]) (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ]) + (mkRenamedOptionModule [ "nix" "daemonIONiceLevel" ] [ "nix" "daemonIOSchedPriority" ]) + (mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.") ]; ###### interface From 3295941fd13daf67b162385074e2d041dfc9a710 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Thu, 25 Nov 2021 14:01:32 -0800 Subject: [PATCH 113/185] gnuradio3_8packages.ais: fix build (cherry picked from commit 22b72c17bb0c48d6eabb2d6988040341cdce70d1) --- pkgs/development/gnuradio-modules/ais/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix index 638210f8412f..98b8229bc1ae 100644 --- a/pkgs/development/gnuradio-modules/ais/default.nix +++ b/pkgs/development/gnuradio-modules/ais/default.nix @@ -12,6 +12,8 @@ , mpir , fftwFloat , icu +, gnuradio +, thrift }: mkDerivation rec { @@ -31,6 +33,10 @@ mkDerivation rec { python ]; + cmakeFlags = [ + "-DCMAKE_EXE_LINKER_FLAGS=-pthread" + ]; + buildInputs = [ cppunit osmosdr @@ -40,6 +46,8 @@ mkDerivation rec { mpir fftwFloat icu + thrift + gnuradio.python.pkgs.thrift ]; meta = with lib; { From 03e38006d3a1d7819cbea2228c111589f4e419db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Nov 2021 22:41:30 +0100 Subject: [PATCH 114/185] tsung: use Python 3 (cherry picked from commit bf730c8e2f53e3dcd40e6a19f105cd16594832e5) --- .../applications/networking/tsung/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/applications/networking/tsung/default.nix index 346fd1752578..a811d7c73eda 100644 --- a/pkgs/applications/networking/tsung/default.nix +++ b/pkgs/applications/networking/tsung/default.nix @@ -1,25 +1,34 @@ -{ fetchurl, stdenv, lib, makeWrapper, - erlang, - python2, python2Packages, - perlPackages, - gnuplot }: +{ lib +, stdenv +, fetchurl +, makeWrapper +, erlang +, python3 +, python3Packages +, perlPackages +, gnuplot +}: stdenv.mkDerivation rec { pname = "tsung"; version = "1.7.0"; + src = fetchurl { url = "http://tsung.erlang-projects.org/dist/tsung-${version}.tar.gz"; sha256 = "6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; + propagatedBuildInputs = [ erlang gnuplot perlPackages.perl perlPackages.TemplateToolkit - python2 - python2Packages.matplotlib + python3 + python3Packages.matplotlib ]; @@ -43,8 +52,8 @@ stdenv.mkDerivation rec { can currently be used to stress HTTP, WebDAV, SOAP, PostgreSQL, MySQL, AMQP, MQTT, LDAP and Jabber/XMPP servers. ''; - license = licenses.gpl2; - maintainers = [ maintainers.uskudnik ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ uskudnik ]; platforms = platforms.unix; }; } From 1995a8eb7a766457d2a222df969a10e4d189c78a Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Mon, 22 Nov 2021 12:14:18 -0800 Subject: [PATCH 115/185] ocaml: Fix aarch64-darwin build (cherry picked from commit 528716bb8e61dfc443566c9f3345df4b25d72483) --- pkgs/development/compilers/ocaml/generic.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index c474a2e85f15..ec52e56c1faa 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -64,7 +64,12 @@ stdenv.mkDerivation (args // { "-target ${stdenv.targetPlatform.config}" ]; dontAddStaticConfigureFlags = lib.versionOlder version "4.08"; - configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08") [ "host" "target" ]; + + # on aarch64-darwin using --host and --target causes the build to invoke + # `aarch64-apple-darwin-clang` while using assembler. However, such binary + # does not exist. So, disable these configure flags on `aarch64-darwin`. + # See #144785 for details. + configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.isDarwin && stdenv.isAarch64)) [ "host" "target" ]; # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie" ++ lib.optionals (args ? hardeningDisable) args.hardeningDisable; From b2719a4013e10fe9a93e5729c9c7f28493646884 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 26 Nov 2021 23:37:07 +0000 Subject: [PATCH 116/185] electron_16: 16.0.1 -> 16.0.2 https://github.com/electron/electron/releases/tag/v16.0.2 (cherry picked from commit ee74e6547d318cea196eefe497cf78fb6339ca8e) --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 96c45104bd20..9283cee17740 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -145,13 +145,13 @@ rec { headers = "0r1qxgkpcn03fd28zbz86ilhsqg0gzp9clbghr5w6gy5ak8y68hz"; }; - electron_16 = mkElectron "16.0.1" { - armv7l-linux = "9fe58dcc8838fc641e9fc6f2723ece6f12c29169340da3ab754e1afc57634314"; - aarch64-linux = "991369b7dee6cf9c146c48566153baf898b5ed73efaada2688d1699d69ba366c"; - x86_64-linux = "4063b6d05c9320fc53535a7d932e03f94ad0aae95432437bbf2f2f222b67c5a5"; - i686-linux = "68a817a999dcc996497c53e54f06199af0c2de278ff910c28845405d1b1828f0"; - x86_64-darwin = "7e28327d3efb013f19295e2491208491c66b117a167e9e56d141d0516d6d5587"; - aarch64-darwin = "f05684ca31d3d98746bca9ec05d425998d60af640958eeb55f464747ceb97bdf"; - headers = "0sk6h0jqfw2q9h05xdzivwfa6040r4racf82s8i5xkw5s13vsl6d"; + electron_16 = mkElectron "16.0.2" { + armv7l-linux = "bba43eb1e2718f04f6d91096cf22d4c49cbab0915f48b3b22b8f94f205eda2f0"; + aarch64-linux = "3a2ad9c508bfb8e1b2635a3af0a7495e1121bc7aea64a9b771322a60bb82e265"; + x86_64-linux = "2f96a5b773b790d968a6b2c1142f8d231587b775be113e7ee90d9a89bec8cd70"; + i686-linux = "4fd01951b3f57b69731f85d6eae6962257c3a70c37d74751a098bc00ea43085a"; + x86_64-darwin = "a3b9fd83dea4cfa959ddd72be4cbcb8d0503f4ab2741705561b62de8b5218895"; + aarch64-darwin = "3894d141b060d37f1248556525e96a9fc1d4afc237b740f5093bdcd5731972d1"; + headers = "0h1gzrd6rdd217q0im0g1hr3b037dmi4v6wk30kzb12597ww59n1"; }; } From 334a4e3dfb86fd518adec983b144b484e89ab6de Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 26 Nov 2021 18:37:03 -0300 Subject: [PATCH 117/185] zydis: 3.2.0 -> 3.2.1 (cherry picked from commit 51ab665ad7d29ace29dd1b3702fa2a44d48e4e56) --- pkgs/development/libraries/zydis/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/zydis/default.nix b/pkgs/development/libraries/zydis/default.nix index 20f403eb8666..ee16acfc0ad2 100644 --- a/pkgs/development/libraries/zydis/default.nix +++ b/pkgs/development/libraries/zydis/default.nix @@ -1,23 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: stdenv.mkDerivation rec { pname = "zydis"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "zyantific"; repo = "zydis"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-1XGELwMuFlIt6Z3+kfD6VAgDZOwhhCSG42dkYh7WLf8="; + sha256 = "sha256-FB7hGQ9vI3ZE376iROEpdtZm91IiccBhtAFa94JgnUY="; }; nativeBuildInputs = [ cmake ]; meta = with lib; { + homepage = "https://zydis.re/"; description = "Fast and lightweight x86/x86-64 disassembler library"; license = licenses.mit; - maintainers = [ maintainers.jbcrail ]; + maintainers = with maintainers; [ jbcrail ]; platforms = platforms.all; }; } From c43b2a294b640424fb9f33b29a7d1f5e6f45ec06 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 27 Nov 2021 09:57:13 -0300 Subject: [PATCH 118/185] zydis: add myself as maintainer (cherry picked from commit 73b3f81d96f266d4acab6bf96a77e5f68558d1cf) --- pkgs/development/libraries/zydis/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zydis/default.nix b/pkgs/development/libraries/zydis/default.nix index ee16acfc0ad2..7009123a4528 100644 --- a/pkgs/development/libraries/zydis/default.nix +++ b/pkgs/development/libraries/zydis/default.nix @@ -16,13 +16,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-FB7hGQ9vI3ZE376iROEpdtZm91IiccBhtAFa94JgnUY="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; meta = with lib; { homepage = "https://zydis.re/"; description = "Fast and lightweight x86/x86-64 disassembler library"; license = licenses.mit; - maintainers = with maintainers; [ jbcrail ]; + maintainers = with maintainers; [ jbcrail AndersonTorres ]; platforms = platforms.all; }; } From d8b2b0209b0de42f102762846174fc7d0ce3f54f Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Fri, 26 Nov 2021 22:21:55 -0800 Subject: [PATCH 119/185] invidious/lsquic: fix build (cherry picked from commit ed3cfc8abe467110ded21593f8695ebb3e392087) --- pkgs/servers/invidious/lsquic.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/invidious/lsquic.nix b/pkgs/servers/invidious/lsquic.nix index 35b93e4249f2..acc9b97ae5df 100644 --- a/pkgs/servers/invidious/lsquic.nix +++ b/pkgs/servers/invidious/lsquic.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { buildInputs = [ boringssl' libevent zlib ]; cmakeFlags = [ - "-DBORINGSSL_DIR=${boringssl'}" - "-DBORINGSSL_LIB_crypto=${boringssl'}/lib/libcrypto.a" - "-DBORINGSSL_LIB_ssl=${boringssl'}/lib/libssl.a" + "-DBORINGSSL_DIR=${lib.getDev boringssl'}" + "-DBORINGSSL_LIB_crypto=${lib.getLib boringssl'}/lib/libcrypto.a" + "-DBORINGSSL_LIB_ssl=${lib.getLib boringssl'}/lib/libssl.a" "-DZLIB_LIB=${zlib}/lib/libz.so" ]; @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { mkdir combinedlib cd combinedlib - ar -x ${boringssl'}/lib/libssl.a - ar -x ${boringssl'}/lib/libcrypto.a + ar -x ${lib.getLib boringssl'}/lib/libssl.a + ar -x ${lib.getLib boringssl'}/lib/libcrypto.a ar -x ../src/liblsquic/liblsquic.a ar rc liblsquic.a *.o ranlib liblsquic.a From 7abd52203daad8d9f59158a9611b98692792d700 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 27 Nov 2021 17:14:55 +0100 Subject: [PATCH 120/185] Revert "Merge pull request #141192 from helsinki-systems/feat/improved-socket-handling2" This reverts commit 57961d2b838cc31fa4ce89641b6a8db544a8471a, reversing changes made to b04f913afce4419f6b777fd64ac52315dbef3aaf. (I.e. this reverts PR #141192.) While well-intended, this change does unfortunately introduce very serious regressions that are especially disruptive/noticeable on desktop systems (e.g. users of Sway will loose their graphical session when running "nixos-rebuild switch"). Therefore, this change has to be reverted ASAP instead of trying to fix it in "production". Note: An updated version should be extensively discussed, reviewed, and tested before re-landing this change as an earlier version also had to be reverted for the exact same issues [0]. Fix: #146727 [0]: https://github.com/NixOS/nixpkgs/pull/73871#issuecomment-559783752 (cherry picked from commit 1cfecb636b14a88174d914cd0522b78ff3bf9f82) --- .../from_md/release-notes/rl-2111.section.xml | 9 - .../manual/release-notes/rl-2111.section.md | 2 - .../activation/switch-to-configuration.pl | 274 ++++--------- nixos/modules/system/activation/top-level.nix | 7 - nixos/tests/switch-test.nix | 386 +----------------- 5 files changed, 87 insertions(+), 591 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 f0e39471ecee..eb620a3e3edc 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 @@ -1860,15 +1860,6 @@ Superuser created successfully. encapsulation. - - - Changing systemd .socket units now restarts - them and stops the service that is activated by them. - Additionally, services with - stopOnChange = false don’t break anymore - when they are socket-activated. - - The virtualisation.libvirtd module has been diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 3bdda82c026f..c01514799038 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -520,8 +520,6 @@ In addition to numerous new and upgraded packages, this release has the followin - `networking.sits` now supports Foo-over-UDP encapsulation. -- Changing systemd `.socket` units now restarts them and stops the service that is activated by them. Additionally, services with `stopOnChange = false` don't break anymore when they are socket-activated. - - The `virtualisation.libvirtd` module has been refactored and updated with new options: - `virtualisation.libvirtd.qemu*` options (e.g.: `virtualisation.libvirtd.qemuRunAsRoot`) were moved to [`virtualisation.libvirtd.qemu`](options.html#opt-virtualisation.libvirtd.qemu) submodule, - software TPM1/TPM2 support (e.g.: Windows 11 guests) ([`virtualisation.libvirtd.qemu.swtpm`](options.html#opt-virtualisation.libvirtd.qemu.swtpm)), diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index e105502cf3a4..053496441d81 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -11,6 +11,7 @@ use Cwd 'abs_path'; my $out = "@out@"; +# FIXME: maybe we should use /proc/1/exe to get the current systemd. my $curSystemd = abs_path("/run/current-system/sw/bin"); # To be robust against interruption, record what units need to be started etc. @@ -18,16 +19,13 @@ my $startListFile = "/run/nixos/start-list"; my $restartListFile = "/run/nixos/restart-list"; my $reloadListFile = "/run/nixos/reload-list"; -# Parse restart/reload requests by the activation script. -# Activation scripts may write newline-separated units to this -# file and switch-to-configuration will handle them. While -# `stopIfChanged = true` is ignored, switch-to-configuration will -# handle `restartIfChanged = false` and `reloadIfChanged = true`. -# This also works for socket-activated units. +# Parse restart/reload requests by the activation script my $restartByActivationFile = "/run/nixos/activation-restart-list"; +my $reloadByActivationFile = "/run/nixos/activation-reload-list"; my $dryRestartByActivationFile = "/run/nixos/dry-activation-restart-list"; +my $dryReloadByActivationFile = "/run/nixos/dry-activation-reload-list"; -make_path("/run/nixos", { mode => oct(755) }); +make_path("/run/nixos", { mode => 0755 }); my $action = shift @ARGV; @@ -149,92 +147,6 @@ sub fingerprintUnit { return abs_path($s) . (-f "${s}.d/overrides.conf" ? " " . abs_path "${s}.d/overrides.conf" : ""); } -sub handleModifiedUnit { - my ($unit, $baseName, $newUnitFile, $activePrev, $unitsToStop, $unitsToStart, $unitsToReload, $unitsToRestart, $unitsToSkip) = @_; - - if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target" || $unit =~ /\.slice$/ || $unit =~ /\.path$/) { - # Do nothing. These cannot be restarted directly. - # Slices and Paths don't have to be restarted since - # properties (resource limits and inotify watches) - # seem to get applied on daemon-reload. - } elsif ($unit =~ /\.mount$/) { - # Reload the changed mount unit to force a remount. - $unitsToReload->{$unit} = 1; - recordUnit($reloadListFile, $unit); - } else { - my $unitInfo = parseUnit($newUnitFile); - if (boolIsTrue($unitInfo->{'X-ReloadIfChanged'} // "no")) { - $unitsToReload->{$unit} = 1; - recordUnit($reloadListFile, $unit); - } - elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { - $unitsToSkip->{$unit} = 1; - } else { - # If this unit is socket-activated, then stop it instead - # of restarting it to make sure the new version of it is - # socket-activated. - my $socketActivated = 0; - if ($unit =~ /\.service$/) { - my @sockets = split / /, ($unitInfo->{Sockets} // ""); - if (scalar @sockets == 0) { - @sockets = ("$baseName.socket"); - } - foreach my $socket (@sockets) { - if (-e "$out/etc/systemd/system/$socket") { - $socketActivated = 1; - $unitsToStop->{$unit} = 1; - # If the socket was not running previously, - # start it now. - if (not defined $activePrev->{$socket}) { - $unitsToStart->{$socket} = 1; - } - } - } - } - - # Don't do the rest of this for socket-activated units - # because we handled these above where we stop the unit. - # Since only services can be socket-activated, the - # following condition always evaluates to `true` for - # non-service units. - if ($socketActivated) { - return; - } - - # If we are restarting a socket, also stop the corresponding - # service. This is required because restarting a socket - # when the service is already activated fails. - if ($unit =~ /\.socket$/) { - my $service = $unitInfo->{Service} // ""; - if ($service eq "") { - $service = "$baseName.service"; - } - if (defined $activePrev->{$service}) { - $unitsToStop->{$service} = 1; - } - $unitsToRestart->{$unit} = 1; - recordUnit($restartListFile, $unit); - } else { - # Always restart non-services instead of stopping and starting them - # because it doesn't make sense to stop them with a config from - # the old evaluation. - if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "yes") || $unit !~ /\.service$/) { - # This unit should be restarted instead of - # stopped and started. - $unitsToRestart->{$unit} = 1; - recordUnit($restartListFile, $unit); - } else { - # We write to a file to ensure that the - # service gets restarted if we're interrupted. - $unitsToStart->{$unit} = 1; - recordUnit($startListFile, $unit); - $unitsToStop->{$unit} = 1; - } - } - } - } -} - # Figure out what units need to be stopped, started, restarted or reloaded. my (%unitsToStop, %unitsToSkip, %unitsToStart, %unitsToRestart, %unitsToReload); @@ -307,7 +219,65 @@ while (my ($unit, $state) = each %{$activePrev}) { } elsif (fingerprintUnit($prevUnitFile) ne fingerprintUnit($newUnitFile)) { - handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, %unitsToSkip); + if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target") { + # Do nothing. These cannot be restarted directly. + } elsif ($unit =~ /\.mount$/) { + # Reload the changed mount unit to force a remount. + $unitsToReload{$unit} = 1; + recordUnit($reloadListFile, $unit); + } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) { + # FIXME: do something? + } else { + my $unitInfo = parseUnit($newUnitFile); + if (boolIsTrue($unitInfo->{'X-ReloadIfChanged'} // "no")) { + $unitsToReload{$unit} = 1; + recordUnit($reloadListFile, $unit); + } + elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { + $unitsToSkip{$unit} = 1; + } else { + if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "yes")) { + # This unit should be restarted instead of + # stopped and started. + $unitsToRestart{$unit} = 1; + recordUnit($restartListFile, $unit); + } else { + # If this unit is socket-activated, then stop the + # socket unit(s) as well, and restart the + # socket(s) instead of the service. + my $socketActivated = 0; + if ($unit =~ /\.service$/) { + my @sockets = split / /, ($unitInfo->{Sockets} // ""); + if (scalar @sockets == 0) { + @sockets = ("$baseName.socket"); + } + foreach my $socket (@sockets) { + if (defined $activePrev->{$socket}) { + $unitsToStop{$socket} = 1; + # Only restart sockets that actually + # exist in new configuration: + if (-e "$out/etc/systemd/system/$socket") { + $unitsToStart{$socket} = 1; + recordUnit($startListFile, $socket); + $socketActivated = 1; + } + } + } + } + + # If the unit is not socket-activated, record + # that this unit needs to be started below. + # We write this to a file to ensure that the + # service gets restarted if we're interrupted. + if (!$socketActivated) { + $unitsToStart{$unit} = 1; + recordUnit($startListFile, $unit); + } + + $unitsToStop{$unit} = 1; + } + } + } } } } @@ -392,6 +362,8 @@ sub filterUnits { } my @unitsToStopFiltered = filterUnits(\%unitsToStop); +my @unitsToStartFiltered = filterUnits(\%unitsToStart); + # Show dry-run actions. if ($action eq "dry-activate") { @@ -403,44 +375,21 @@ if ($action eq "dry-activate") { print STDERR "would activate the configuration...\n"; system("$out/dry-activate", "$out"); - # Handle the activation script requesting the restart or reload of a unit. - my %unitsToAlsoStop; - my %unitsToAlsoSkip; - foreach (split('\n', read_file($dryRestartByActivationFile, err_mode => 'quiet') // "")) { - my $unit = $_; - my $baseUnit = $unit; - my $newUnitFile = "$out/etc/systemd/system/$baseUnit"; + $unitsToRestart{$_} = 1 foreach + split('\n', read_file($dryRestartByActivationFile, err_mode => 'quiet') // ""); - # Detect template instances. - if (!-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) { - $baseUnit = "$1\@.$2"; - $newUnitFile = "$out/etc/systemd/system/$baseUnit"; - } - - my $baseName = $baseUnit; - $baseName =~ s/\.[a-z]*$//; - - handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToAlsoStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, %unitsToAlsoSkip); - } - unlink($dryRestartByActivationFile); - - my @unitsToAlsoStopFiltered = filterUnits(\%unitsToAlsoStop); - if (scalar(keys %unitsToAlsoStop) > 0) { - print STDERR "would stop the following units as well: ", join(", ", @unitsToAlsoStopFiltered), "\n" - if scalar @unitsToAlsoStopFiltered; - } - - print STDERR "would NOT restart the following changed units as well: ", join(", ", sort(keys %unitsToAlsoSkip)), "\n" - if scalar(keys %unitsToAlsoSkip) > 0; + $unitsToReload{$_} = 1 foreach + split('\n', read_file($dryReloadByActivationFile, err_mode => 'quiet') // ""); print STDERR "would restart systemd\n" if $restartSystemd; - print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n" - if scalar(keys %unitsToReload) > 0; print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n" if scalar(keys %unitsToRestart) > 0; - my @unitsToStartFiltered = filterUnits(\%unitsToStart); print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n" if scalar @unitsToStartFiltered; + print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n" + if scalar(keys %unitsToReload) > 0; + unlink($dryRestartByActivationFile); + unlink($dryReloadByActivationFile); exit 0; } @@ -451,7 +400,7 @@ if (scalar (keys %unitsToStop) > 0) { print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n" if scalar @unitsToStopFiltered; # Use current version of systemctl binary before daemon is reexeced. - system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); + system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? } print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" @@ -465,38 +414,12 @@ system("$out/activate", "$out") == 0 or $res = 2; # Handle the activation script requesting the restart or reload of a unit. # We can only restart and reload (not stop/start) because the units to be -# stopped are already stopped before the activation script is run. We do however -# make an exception for services that are socket-activated and that have to be stopped -# instead of being restarted. -my %unitsToAlsoStop; -my %unitsToAlsoSkip; -foreach (split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // "")) { - my $unit = $_; - my $baseUnit = $unit; - my $newUnitFile = "$out/etc/systemd/system/$baseUnit"; +# stopped are already stopped before the activation script is run. +$unitsToRestart{$_} = 1 foreach + split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // ""); - # Detect template instances. - if (!-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) { - $baseUnit = "$1\@.$2"; - $newUnitFile = "$out/etc/systemd/system/$baseUnit"; - } - - my $baseName = $baseUnit; - $baseName =~ s/\.[a-z]*$//; - - handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToAlsoStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, %unitsToAlsoSkip); -} -unlink($restartByActivationFile); - -my @unitsToAlsoStopFiltered = filterUnits(\%unitsToAlsoStop); -if (scalar(keys %unitsToAlsoStop) > 0) { - print STDERR "stopping the following units as well: ", join(", ", @unitsToAlsoStopFiltered), "\n" - if scalar @unitsToAlsoStopFiltered; - system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToAlsoStop)); -} - -print STDERR "NOT restarting the following changed units as well: ", join(", ", sort(keys %unitsToAlsoSkip)), "\n" - if scalar(keys %unitsToAlsoSkip) > 0; +$unitsToReload{$_} = 1 foreach + split('\n', read_file($reloadByActivationFile, err_mode => 'quiet') // ""); # Restart systemd if necessary. Note that this is done using the # current version of systemd, just in case the new one has trouble @@ -537,40 +460,14 @@ if (scalar(keys %unitsToReload) > 0) { print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n"; system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4; unlink($reloadListFile); + unlink($reloadByActivationFile); } # Restart changed services (those that have to be restarted rather # than stopped and started). if (scalar(keys %unitsToRestart) > 0) { print STDERR "restarting the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"; - - # We split the units to be restarted into sockets and non-sockets. - # This is because restarting sockets may fail which is not bad by - # itself but which will prevent changes on the sockets. We usually - # restart the socket and stop the service before that. Restarting - # the socket will fail however when the service was re-activated - # in the meantime. There is no proper way to prevent that from happening. - my @unitsWithErrorHandling = grep { $_ !~ /\.socket$/ } sort(keys %unitsToRestart); - my @unitsWithoutErrorHandling = grep { $_ =~ /\.socket$/ } sort(keys %unitsToRestart); - - if (scalar(@unitsWithErrorHandling) > 0) { - system("@systemd@/bin/systemctl", "restart", "--", @unitsWithErrorHandling) == 0 or $res = 4; - } - if (scalar(@unitsWithoutErrorHandling) > 0) { - # Don't print warnings from systemctl - no warnings 'once'; - open(OLDERR, ">&", \*STDERR); - close(STDERR); - - my $ret = system("@systemd@/bin/systemctl", "restart", "--", @unitsWithoutErrorHandling); - - # Print stderr again - open(STDERR, ">&OLDERR"); - - if ($ret ne 0) { - print STDERR "warning: some sockets failed to restart. Please check your journal (journalctl -eb) and act accordingly.\n"; - } - } + system("@systemd@/bin/systemctl", "restart", "--", sort(keys %unitsToRestart)) == 0 or $res = 4; unlink($restartListFile); unlink($restartByActivationFile); } @@ -581,7 +478,6 @@ if (scalar(keys %unitsToRestart) > 0) { # that are symlinks to other units. We shouldn't start both at the # same time because we'll get a "Failed to add path to set" error from # systemd. -my @unitsToStartFiltered = filterUnits(\%unitsToStart); print STDERR "starting the following units: ", join(", ", @unitsToStartFiltered), "\n" if scalar @unitsToStartFiltered; system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4; @@ -589,7 +485,7 @@ unlink($startListFile); # Print failed and new units. -my (@failed, @new); +my (@failed, @new, @restarting); my $activeNew = getActiveUnits; while (my ($unit, $state) = each %{$activeNew}) { if ($state->{state} eq "failed") { @@ -605,9 +501,7 @@ while (my ($unit, $state) = each %{$activeNew}) { push @failed, $unit; } } - # Ignore scopes since they are not managed by this script but rather - # created and managed by third-party services via the systemd dbus API. - elsif ($state->{state} ne "failed" && !defined $activePrev->{$unit} && $unit !~ /\.scope$/) { + elsif ($state->{state} ne "failed" && !defined $activePrev->{$unit}) { push @new, $unit; } } diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 68da910d29cc..026fd1791d33 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -84,13 +84,6 @@ let export localeArchive="${config.i18n.glibcLocales}/lib/locale/locale-archive" substituteAll ${./switch-to-configuration.pl} $out/bin/switch-to-configuration chmod +x $out/bin/switch-to-configuration - ${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' - if ! output=$($perl/bin/perl -c $out/bin/switch-to-configuration 2>&1); then - echo "switch-to-configuration syntax is not valid:" - echo "$output" - exit 1 - fi - ''} echo -n "${toString config.system.extraDependencies}" > $out/extra-dependencies diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 7ea07a390b80..78adf7ffa7da 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -7,224 +7,15 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; nodes = { - machine = { config, pkgs, lib, ... }: { - environment.systemPackages = [ pkgs.socat ]; # for the socket activation stuff + machine = { ... }: { users.mutableUsers = false; - - specialisation = { - # A system with a simple socket-activated unit - simple-socket.configuration = { - systemd.services.socket-activated.serviceConfig = { - ExecStart = pkgs.writeScript "socket-test.py" /* python */ '' - #!${pkgs.python3}/bin/python3 - - from socketserver import TCPServer, StreamRequestHandler - import socket - - class Handler(StreamRequestHandler): - def handle(self): - self.wfile.write("hello".encode("utf-8")) - - class Server(TCPServer): - def __init__(self, server_address, handler_cls): - # Invoke base but omit bind/listen steps (performed by systemd activation!) - TCPServer.__init__( - self, server_address, handler_cls, bind_and_activate=False) - # Override socket - self.socket = socket.fromfd(3, self.address_family, self.socket_type) - - if __name__ == "__main__": - server = Server(("localhost", 1234), Handler) - server.serve_forever() - ''; - }; - systemd.sockets.socket-activated = { - wantedBy = [ "sockets.target" ]; - listenStreams = [ "/run/test.sock" ]; - socketConfig.SocketMode = lib.mkDefault "0777"; - }; - }; - - # The same system but the socket is modified - modified-socket.configuration = { - imports = [ config.specialisation.simple-socket.configuration ]; - systemd.sockets.socket-activated.socketConfig.SocketMode = "0666"; - }; - - # The same system but the service is modified - modified-service.configuration = { - imports = [ config.specialisation.simple-socket.configuration ]; - systemd.services.socket-activated.serviceConfig.X-Test = "test"; - }; - - # The same system but both service and socket are modified - modified-service-and-socket.configuration = { - imports = [ config.specialisation.simple-socket.configuration ]; - systemd.services.socket-activated.serviceConfig.X-Test = "some_value"; - systemd.sockets.socket-activated.socketConfig.SocketMode = "0444"; - }; - - # A system with a socket-activated service and some simple services - service-and-socket.configuration = { - imports = [ config.specialisation.simple-socket.configuration ]; - systemd.services.simple-service = { - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${pkgs.coreutils}/bin/true"; - }; - }; - - systemd.services.simple-restart-service = { - stopIfChanged = false; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${pkgs.coreutils}/bin/true"; - }; - }; - - systemd.services.simple-reload-service = { - reloadIfChanged = true; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${pkgs.coreutils}/bin/true"; - ExecReload = "${pkgs.coreutils}/bin/true"; - }; - }; - - systemd.services.no-restart-service = { - restartIfChanged = false; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${pkgs.coreutils}/bin/true"; - }; - }; - }; - - # The same system but with an activation script that restarts all services - restart-and-reload-by-activation-script.configuration = { - imports = [ config.specialisation.service-and-socket.configuration ]; - system.activationScripts.restart-and-reload-test = { - supportsDryActivation = true; - deps = []; - text = '' - if [ "$NIXOS_ACTION" = dry-activate ]; then - f=/run/nixos/dry-activation-restart-list - else - f=/run/nixos/activation-restart-list - fi - cat <> "$f" - simple-service.service - simple-restart-service.service - simple-reload-service.service - no-restart-service.service - socket-activated.service - EOF - ''; - }; - }; - - # A system with a timer - with-timer.configuration = { - systemd.timers.test-timer = { - wantedBy = [ "timers.target" ]; - timerConfig.OnCalendar = "@1395716396"; # chosen by fair dice roll - }; - systemd.services.test-timer = { - serviceConfig = { - Type = "oneshot"; - ExecStart = "${pkgs.coreutils}/bin/true"; - }; - }; - }; - - # The same system but with another time - with-timer-modified.configuration = { - imports = [ config.specialisation.with-timer.configuration ]; - systemd.timers.test-timer.timerConfig.OnCalendar = lib.mkForce "Fri 2012-11-23 16:00:00"; - }; - - # A system with a systemd mount - with-mount.configuration = { - systemd.mounts = [ - { - description = "Testmount"; - what = "tmpfs"; - type = "tmpfs"; - where = "/testmount"; - options = "size=1M"; - wantedBy = [ "local-fs.target" ]; - } - ]; - }; - - # The same system but with another time - with-mount-modified.configuration = { - systemd.mounts = [ - { - description = "Testmount"; - what = "tmpfs"; - type = "tmpfs"; - where = "/testmount"; - options = "size=10M"; - wantedBy = [ "local-fs.target" ]; - } - ]; - }; - - # A system with a path unit - with-path.configuration = { - systemd.paths.test-watch = { - wantedBy = [ "paths.target" ]; - pathConfig.PathExists = "/testpath"; - }; - systemd.services.test-watch = { - serviceConfig = { - Type = "oneshot"; - ExecStart = "${pkgs.coreutils}/bin/touch /testpath-modified"; - }; - }; - }; - - # The same system but watching another file - with-path-modified.configuration = { - imports = [ config.specialisation.with-path.configuration ]; - systemd.paths.test-watch.pathConfig.PathExists = lib.mkForce "/testpath2"; - }; - - # A system with a slice - with-slice.configuration = { - systemd.slices.testslice.sliceConfig.MemoryMax = "1"; # don't allow memory allocation - systemd.services.testservice = { - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${pkgs.coreutils}/bin/true"; - Slice = "testslice.slice"; - }; - }; - }; - - # The same system but the slice allows to allocate memory - with-slice-non-crashing.configuration = { - imports = [ config.specialisation.with-slice.configuration ]; - systemd.slices.testslice.sliceConfig.MemoryMax = lib.mkForce null; - }; - }; }; other = { ... }: { users.mutableUsers = true; }; }; - testScript = { nodes, ... }: let + testScript = {nodes, ...}: let originalSystem = nodes.machine.config.system.build.toplevel; otherSystem = nodes.other.config.system.build.toplevel; @@ -236,183 +27,12 @@ import ./make-test-python.nix ({ pkgs, ...} : { set -o pipefail exec env -i "$@" | tee /dev/stderr ''; - in /* python */ '' - def switch_to_specialisation(name, action="test"): - out = machine.succeed(f"${originalSystem}/specialisation/{name}/bin/switch-to-configuration {action} 2>&1") - assert_lacks(out, "switch-to-configuration line") # Perl warnings - return out - - def assert_contains(haystack, needle): - if needle not in haystack: - print("The haystack that will cause the following exception is:") - print("---") - print(haystack) - print("---") - raise Exception(f"Expected string '{needle}' was not found") - - def assert_lacks(haystack, needle): - if needle in haystack: - print("The haystack that will cause the following exception is:") - print("---") - print(haystack, end="") - print("---") - raise Exception(f"Unexpected string '{needle}' was found") - - + in '' machine.succeed( "${stderrRunner} ${originalSystem}/bin/switch-to-configuration test" ) machine.succeed( "${stderrRunner} ${otherSystem}/bin/switch-to-configuration test" ) - - with subtest("systemd sockets"): - machine.succeed("${originalSystem}/bin/switch-to-configuration test") - - # Simple socket is created - out = switch_to_specialisation("simple-socket") - assert_lacks(out, "stopping the following units:") - # not checking for reload because dbus gets reloaded - assert_lacks(out, "restarting the following units:") - assert_lacks(out, "\nstarting the following units:") - assert_contains(out, "the following new units were started: socket-activated.socket\n") - assert_lacks(out, "as well:") - machine.succeed("[ $(stat -c%a /run/test.sock) = 777 ]") - - # Changing the socket restarts it - out = switch_to_specialisation("modified-socket") - assert_lacks(out, "stopping the following units:") - #assert_lacks(out, "reloading the following units:") - assert_contains(out, "restarting the following units: socket-activated.socket\n") - assert_lacks(out, "\nstarting the following units:") - assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") - machine.succeed("[ $(stat -c%a /run/test.sock) = 666 ]") # change was applied - - # The unit is properly activated when the socket is accessed - if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": - raise Exception("Socket was not properly activated") - - # Changing the socket restarts it and ignores the active service - out = switch_to_specialisation("simple-socket") - assert_contains(out, "stopping the following units: socket-activated.service\n") - assert_lacks(out, "reloading the following units:") - assert_contains(out, "restarting the following units: socket-activated.socket\n") - assert_lacks(out, "\nstarting the following units:") - assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") - machine.succeed("[ $(stat -c%a /run/test.sock) = 777 ]") # change was applied - - # Changing the service does nothing when the service is not active - out = switch_to_specialisation("modified-service") - assert_lacks(out, "stopping the following units:") - assert_lacks(out, "reloading the following units:") - assert_lacks(out, "restarting the following units:") - assert_lacks(out, "\nstarting the following units:") - assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") - - # Activating the service and modifying it stops it but leaves the socket untouched - machine.succeed("socat - UNIX-CONNECT:/run/test.sock") - out = switch_to_specialisation("simple-socket") - assert_contains(out, "stopping the following units: socket-activated.service\n") - assert_lacks(out, "reloading the following units:") - assert_lacks(out, "restarting the following units:") - assert_lacks(out, "\nstarting the following units:") - assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") - - # Activating the service and both the service and the socket stops the service and restarts the socket - machine.succeed("socat - UNIX-CONNECT:/run/test.sock") - out = switch_to_specialisation("modified-service-and-socket") - assert_contains(out, "stopping the following units: socket-activated.service\n") - assert_lacks(out, "reloading the following units:") - assert_contains(out, "restarting the following units: socket-activated.socket\n") - assert_lacks(out, "\nstarting the following units:") - assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") - - with subtest("restart and reload by activation file"): - out = switch_to_specialisation("service-and-socket") - # Switch to a system where the example services get restarted - # by the activation script - out = switch_to_specialisation("restart-and-reload-by-activation-script") - assert_lacks(out, "stopping the following units:") - assert_contains(out, "stopping the following units as well: simple-service.service, socket-activated.service\n") - assert_contains(out, "reloading the following units: simple-reload-service.service\n") - assert_contains(out, "restarting the following units: simple-restart-service.service\n") - assert_contains(out, "\nstarting the following units: simple-service.service") - - # The same, but in dry mode - switch_to_specialisation("service-and-socket") - out = switch_to_specialisation("restart-and-reload-by-activation-script", action="dry-activate") - assert_lacks(out, "would stop the following units:") - assert_contains(out, "would stop the following units as well: simple-service.service, socket-activated.service\n") - assert_contains(out, "would reload the following units: simple-reload-service.service\n") - assert_contains(out, "would restart the following units: simple-restart-service.service\n") - assert_contains(out, "\nwould start the following units: simple-service.service") - - with subtest("mounts"): - switch_to_specialisation("with-mount") - out = machine.succeed("mount | grep 'on /testmount'") - assert_contains(out, "size=1024k") - - out = switch_to_specialisation("with-mount-modified") - assert_lacks(out, "stopping the following units:") - assert_contains(out, "reloading the following units: testmount.mount\n") - assert_lacks(out, "restarting the following units:") - assert_lacks(out, "\nstarting the following units:") - assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") - # It changed - out = machine.succeed("mount | grep 'on /testmount'") - assert_contains(out, "size=10240k") - - with subtest("timers"): - switch_to_specialisation("with-timer") - out = machine.succeed("systemctl show test-timer.timer") - assert_contains(out, "OnCalendar=2014-03-25 02:59:56 UTC") - - out = switch_to_specialisation("with-timer-modified") - assert_lacks(out, "stopping the following units:") - assert_lacks(out, "reloading the following units:") - assert_contains(out, "restarting the following units: test-timer.timer\n") - assert_lacks(out, "\nstarting the following units:") - assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") - # It changed - out = machine.succeed("systemctl show test-timer.timer") - assert_contains(out, "OnCalendar=Fri 2012-11-23 16:00:00") - - with subtest("paths"): - switch_to_specialisation("with-path") - machine.fail("test -f /testpath-modified") - - # touch the file, unit should be triggered - machine.succeed("touch /testpath") - machine.wait_until_succeeds("test -f /testpath-modified") - - machine.succeed("rm /testpath") - machine.succeed("rm /testpath-modified") - switch_to_specialisation("with-path-modified") - - machine.succeed("touch /testpath") - machine.fail("test -f /testpath-modified") - machine.succeed("touch /testpath2") - machine.wait_until_succeeds("test -f /testpath-modified") - - # This test ensures that changes to slice configuration get applied. - # We test this by having a slice that allows no memory allocation at - # all and starting a service within it. If the service crashes, the slice - # is applied and if we modify the slice to allow memory allocation, the - # service should successfully start. - with subtest("slices"): - machine.succeed("echo 0 > /proc/sys/vm/panic_on_oom") # allow OOMing - out = switch_to_specialisation("with-slice") - machine.fail("systemctl start testservice.service") - out = switch_to_specialisation("with-slice-non-crashing") - machine.succeed("systemctl start testservice.service") - machine.succeed("echo 1 > /proc/sys/vm/panic_on_oom") # disallow OOMing - ''; }) From e3b7448f2301459365d3e6833b9321a6dbf1ae73 Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Fri, 26 Nov 2021 11:48:29 -0500 Subject: [PATCH 121/185] nixStable: 2.4 -> 2.3.16 Revert due to regressions. This is meant to be only for the 21.11 release. See https://discourse.nixos.org/t/nix-2-4-and-what-s-next/16257 for additional information. --- .../from_md/release-notes/rl-2111.section.xml | 16 ++++++++++++---- .../doc/manual/release-notes/rl-2111.section.md | 2 +- pkgs/tools/package-management/nix/default.nix | 2 +- pkgs/top-level/aliases.nix | 2 +- 4 files changed, 15 insertions(+), 7 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 eb620a3e3edc..d9ae0ac94818 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 @@ -17,11 +17,19 @@ - Nix has been updated to version 2.4, reference its + The default Nix version remains at 2.3.16. Nix has not been + updated to version 2.4 due to regressions in non-experimental + behavior. To upgrade to 2.4, use the + nixos-unstable branch or set the + nix.package option to either of + nixFlakes or nix_2_4 + packages. The nixUnstable attribute is a + pre-release of Nix 2.5. Read the release - notes for more information on what has changed. The - previous version of Nix, 2.3.16, remains available for the - time being in the nix_2_3 package. + notes for more information on upcoming changes. Please + help us improve Nix by providing any + breakage + reports. diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index c01514799038..ceac3c60e8d9 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -6,7 +6,7 @@ In addition to numerous new and upgraded packages, this release has the followin ## Highlights {#sec-release-21.11-highlights} -- Nix has been updated to version 2.4, reference its [release notes](https://discourse.nixos.org/t/nix-2-4-released/15822) for more information on what has changed. The previous version of Nix, 2.3.16, remains available for the time being in the `nix_2_3` package. +- The default Nix version remains at 2.3.16. Nix has not been updated to version 2.4 due to regressions in non-experimental behavior. To upgrade to 2.4, use the `nixos-unstable` branch or set the `nix.package` option to either of `nixFlakes` or `nix_2_4` packages. The `nixUnstable` attribute is a pre-release of Nix 2.5. Read the [release notes](https://discourse.nixos.org/t/nix-2-4-released/15822) for more information on upcoming changes. Please help us improve Nix by providing any [breakage reports](https://github.com/NixOS/nix/issues). - `iptables` now uses `nf_tables` backend. diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f365348607aa..463ebe49f3dc 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -220,7 +220,7 @@ in rec { nix = nixStable; - nixStable = nix_2_4; + nixStable = nix_2_3; nix_2_3 = callPackage common (rec { pname = "nix"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5eed4b2023c6..1df00dbf2fa5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -600,7 +600,7 @@ mapAliases ({ nilfs_utils = nilfs-utils; # added 2018-04-25 nix-direnv-flakes = nix-direnv; nix-review = nixpkgs-review; # added 2019-12-22 - nixFlakes = nixStable; # added 2021-05-21 + nixFlakes = nix_2_4; # added 2021-05-21 nmap_graphical = nmap-graphical; # added 2017-01-19 nmap-unfree = nmap; # added 2021-04-06 nologin = shadow; # added 2018-04-25 From 89d47cf2a0696a827daef3ae42c5f7facf0b2101 Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Fri, 26 Nov 2021 23:16:30 -0500 Subject: [PATCH 122/185] Revert "lib/tests/modules.sh: update to Nix 2.4 syntax" This reverts commit fd4390146e2ccb043bbb0a07c1cd89fe01ee1315. --- lib/tests/modules.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 2f36d6107ca4..1814f565f37c 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -62,17 +62,17 @@ checkConfigError() { # Check boolean option. checkConfigOutput "false" config.enable ./declare-enable.nix -checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix +checkConfigError 'The option .* does not exist. Definition values:\n- In .*: true' config.enable ./define-enable.nix # Check integer types. # unsigned checkConfigOutput "42" config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix -checkConfigError 'A definition for option .* is not of type.*unsigned integer.*. Definition values:\n\s*- In .*: -23' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix +checkConfigError 'A definition for option .* is not of type.*unsigned integer.*. Definition values:\n- In .*: -23' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix # positive -checkConfigError 'A definition for option .* is not of type.*positive integer.*. Definition values:\n\s*- In .*: 0' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix +checkConfigError 'A definition for option .* is not of type.*positive integer.*. Definition values:\n- In .*: 0' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix # between checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix -checkConfigError 'A definition for option .* is not of type.*between.*-21 and 43.*inclusive.*. Definition values:\n\s*- In .*: -23' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix +checkConfigError 'A definition for option .* is not of type.*between.*-21 and 43.*inclusive.*. Definition values:\n- In .*: -23' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix # Check either types # types.either @@ -125,7 +125,7 @@ checkConfigOutput 'true' "$@" ./define-enable.nix ./define-attrsOfSub-foo-enable set -- config.enable ./define-enable.nix ./declare-enable.nix checkConfigOutput "true" "$@" checkConfigOutput "false" "$@" ./disable-define-enable.nix -checkConfigError "The option .*enable.* does not exist. Definition values:\n\s*- In .*: true" "$@" ./disable-declare-enable.nix +checkConfigError "The option .*enable.* does not exist. Definition values:\n- In .*: true" "$@" ./disable-declare-enable.nix checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix @@ -142,18 +142,18 @@ checkConfigError 'infinite recursion encountered' "$@" # Check _module.check. set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-attrsOfSub-foo.nix -checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*' "$@" +checkConfigError 'The option .* does not exist. Definition values:\n- In .*' "$@" checkConfigOutput "true" "$@" ./define-module-check.nix # Check coerced value. checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix -checkConfigError 'A definition for option .* is not.*string or signed integer convertible to it.*. Definition values:\n\s*- In .*: \[ \]' config.value ./declare-coerced-value.nix ./define-value-list.nix +checkConfigError 'A definition for option .* is not.*string or signed integer convertible to it.*. Definition values:\n- In .*: \[ \]' config.value ./declare-coerced-value.nix ./define-value-list.nix # Check coerced value with unsound coercion checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix -checkConfigError 'A definition for option .* is not of type .*. Definition values:\n\s*- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix -checkConfigError 'json.exception.parse_error' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix +checkConfigError 'A definition for option .* is not of type .*. Definition values:\n- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix +checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix # Check mkAliasOptionModule. checkConfigOutput "true" config.enable ./alias-with-priority.nix @@ -169,7 +169,7 @@ checkConfigOutput "foo" config.submodule.foo ./declare-submoduleWith-special.nix ## shorthandOnlyDefines config behaves as expected checkConfigOutput "true" config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix checkConfigError 'is not of type `boolean' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-noshorthand.nix -checkConfigError "You're trying to declare a value of type \`bool'\n\s*rather than an attribute-set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix +checkConfigError "You're trying to declare a value of type \`bool'\nrather than an attribute-set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix checkConfigOutput "true" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-noshorthand.nix ## submoduleWith should merge all modules in one swoop @@ -193,7 +193,7 @@ checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.ni checkConfigOutput "true" config.enable ./disable-recursive/main.nix checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-foo.nix} checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-bar.nix} -checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix} +checkConfigError 'The option .* does not exist. Definition values:\n- In .*: true' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix} # Check that imports can depend on derivations checkConfigOutput "true" config.enable ./import-from-store.nix @@ -277,7 +277,7 @@ checkConfigOutput baz config.value.nested.bar.baz ./types-anything/mk-mods.nix ## types.functionTo checkConfigOutput "input is input" config.result ./functionTo/trivial.nix checkConfigOutput "a b" config.result ./functionTo/merging-list.nix -checkConfigError 'A definition for option .fun.\[function body\]. is not of type .string.. Definition values:\n\s*- In .*wrong-type.nix' config.result ./functionTo/wrong-type.nix +checkConfigError 'A definition for option .fun.\[function body\]. is not of type .string.. Definition values:\n- In .*wrong-type.nix' config.result ./functionTo/wrong-type.nix checkConfigOutput "b a" config.result ./functionTo/list-order.nix checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix From 0365b9ad37cec315d758e6cc4eda61d8f18f853a Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Fri, 26 Nov 2021 23:16:37 -0500 Subject: [PATCH 123/185] Revert "lib/tests/sources: update to Nix 2.4 cli syntax" This reverts commit 90c1cdd93f4f1e68a70a9bc8ad0185fc97be5923. --- lib/tests/release.nix | 4 ---- lib/tests/sources.sh | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 815841e0a8f3..77e0e1af7555 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -23,10 +23,6 @@ pkgs.runCommand "nixpkgs-lib-tests" { export NIX_STORE_DIR=$TEST_ROOT/store export PAGER=cat cacheDir=$TEST_ROOT/binary-cache - - mkdir -p $NIX_CONF_DIR - echo "experimental-features = nix-command" >> $NIX_CONF_DIR/nix.conf - nix-store --init cp -r ${../.} lib diff --git a/lib/tests/sources.sh b/lib/tests/sources.sh index 1f63cac5005a..71fee719cb21 100755 --- a/lib/tests/sources.sh +++ b/lib/tests/sources.sh @@ -26,7 +26,7 @@ touch {README.md,module.o,foo.bar} # nix-instantiate doesn't write out the source, only computing the hash, so # this uses the experimental nix command instead. -dir="$(nix eval --impure --raw --expr '(with import ; "${ +dir="$(nix eval --raw '(with import ; "${ cleanSource ./. }")')" (cd $dir; find) | sort -f | diff -U10 - <(cat < Date: Fri, 26 Nov 2021 23:16:47 -0500 Subject: [PATCH 124/185] Revert "nix-fallback-paths.nix: Update to 2.4" This reverts commit 58a9cca8cdc8072634e42895c360bb0a49da79ca. --- nixos/modules/installer/tools/nix-fallback-paths.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 065cea470fbb..cb509b7340bd 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/hapw7q1fkjxvprnkcgw9ppczavg4daj2-nix-2.4"; - i686-linux = "/nix/store/8qlvh8pp5j8wgrzj3is2jlbhgrwgsiy9-nix-2.4"; - aarch64-linux = "/nix/store/h48lkygcqj4hdibbdnpl67q7ks6vkrd6-nix-2.4"; - x86_64-darwin = "/nix/store/c3mvzszvyzakvcp9spnjvsb8m2bpjk7m-nix-2.4"; - aarch64-darwin = "/nix/store/hbfqs62r0hga2yr4zi5kc7fzhf71bq9n-nix-2.4"; + x86_64-linux = "/nix/store/nzp4m3cmm7wawk031byh8jg4cdzjq212-nix-2.3.16"; + i686-linux = "/nix/store/zsaza9pwim617ak15fsc31lv65b9w3in-nix-2.3.16"; + aarch64-linux = "/nix/store/7f6z40gyd405yd50qkyzwilnqw106bx8-nix-2.3.16"; + x86_64-darwin = "/nix/store/c43kyri67ia8mibs0id5ara7gqwlkybf-nix-2.3.16"; + aarch64-darwin = "/nix/store/6jwhak3cvsgnbqs540n27g8pxnk427fr-nix-2.3.16"; } From 7d5450fa3fb1339e96979369c02aa0b613a85666 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Fri, 26 Nov 2021 21:56:05 -0800 Subject: [PATCH 125/185] janus-gateway: fix build (cherry picked from commit 84730c9f5de7a14ff0a951541e4ec84233df393b) --- pkgs/servers/janus-gateway/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index 6c6d6759f329..0842b72f67f1 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ - "--enable-boringssl=${boringssl}" + "--enable-boringssl=${lib.getDev boringssl}" "--enable-libsrtp2" "--enable-turn-rest-api" "--enable-json-logger" @@ -42,6 +42,10 @@ stdenv.mkDerivation rec { "--enable-post-processing" ]; + makeFlagsArray = [ + "BORINGSSL_LIBS=-L${lib.getLib boringssl}/lib" + ]; + outputs = [ "out" "dev" "doc" "man" ]; postInstall = '' From 14b02837dfeb91410abb4935f1d7e59a21945831 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Nov 2021 18:58:49 +0100 Subject: [PATCH 126/185] btop: 1.1.0 -> 1.1.2 (cherry picked from commit 609ab2cdc478bf1147cf90ba49b2c20108342139) --- pkgs/tools/system/btop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 131b5a8af106..4e093bdc2d85 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VA5n2gIFRUUsp4jBG1j5dqH5/tP5VAChm5kqexdD24k="; + sha256 = "sha256-+z6bWX2mgvH6nW7SamDzAexeCn/i3+RaPF8RfoikR2k="; }; installFlags = [ "PREFIX=$(out)" ]; From 751cc308279512f6e1528fc71985ffc9b0d4b211 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 28 Nov 2021 00:04:47 +0100 Subject: [PATCH 127/185] octopus: 11.2 -> 11.3 (cherry picked from commit 8fb36866b8be4ebad0c160845774008a1d3f851d) --- pkgs/applications/science/chemistry/octopus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 0434bfe120c8..86addd5bd696 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -11,13 +11,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; - version = "11.2"; + version = "11.3"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "sha256-leEcUSjpiP13l65K9WKN2GXTtTa8vvK/MFxR2zH6Xno="; + sha256 = "0n04yvnc0rg3lvnkkdpbwkfl6zg544260p3s65vwkc5dflrhk34r"; }; nativeBuildInputs = [ From c9fa27e6f26b39036f8fc29be85ecc073cdef206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 24 Nov 2021 23:45:17 +0100 Subject: [PATCH 128/185] delta: 0.9.2 -> 0.10.0 (cherry picked from commit 122b0e0602357370b6d15fcbc7c487a3116d1be5) --- .../version-management/git-and-tools/delta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index acf647901e99..ec7f45c546c7 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-DJG8C7oSTf4YKeSVytN4pVF4qVImg1bsTYbnfkR+U94="; + sha256 = "sha256-PkVZag/h1KzOWsE6+61HIixs+DldrGk9khlZy7DEbC8="; }; - cargoSha256 = "sha256-mweH+ZIcNGGmoGUhnmZzaB5y14eO/XkHqrL8Nz/b3Jg="; + cargoSha256 = "sha256-o1HyPJ81g9fLA7CKQNKg1EctoIh3W0uGzKF2YNE+Ado="; nativeBuildInputs = [ installShellFiles ]; From 3cb164e0f04966ac567ca793242be8496d9d6fe5 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 25 Nov 2021 00:28:48 +0100 Subject: [PATCH 129/185] delta: add SuperSandro2000 as maintainer (cherry picked from commit 31b46dd7f9af9c4360c5796a885c8ec7e8594e51) --- .../version-management/git-and-tools/delta/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index ec7f45c546c7..77e0d2068fa7 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec { description = "A syntax-highlighting pager for git"; changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam zowoq ]; + maintainers = with maintainers; [ marsam zowoq SuperSandro2000 ]; }; } From 6c2b7d85356477bd30a234ed54b9694302b6d4fd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 26 Nov 2021 09:20:56 +1000 Subject: [PATCH 130/185] delta: 0.10.0 -> 0.10.1 https://github.com/dandavison/delta/releases/tag/0.10.1 (cherry picked from commit 4ea35c4c20eb905b775baae4590b8132ee19f2f2) --- .../version-management/git-and-tools/delta/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 77e0d2068fa7..ca02b6385844 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -3,26 +3,28 @@ , fetchFromGitHub , rustPlatform , installShellFiles +, DiskArbitration +, Foundation , libiconv , Security }: rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-PkVZag/h1KzOWsE6+61HIixs+DldrGk9khlZy7DEbC8="; + sha256 = "sha256-aiWVaqwJGjLyv/ZJU4g1KuBC9zbnBEc/vdNADGPKgxo="; }; - cargoSha256 = "sha256-o1HyPJ81g9fLA7CKQNKg1EctoIh3W0uGzKF2YNE+Ado="; + cargoSha256 = "sha256-lp9XzZQZJpjhsanZMky3RwkjM7ICq7dSb4PHdstwMxQ="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation libiconv Security ]; postInstall = '' installShellCompletion --bash --name delta.bash etc/completion/completion.bash diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f46ffa4edb0c..bcfacdda181e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4443,7 +4443,7 @@ with pkgs; deer = callPackage ../shells/zsh/zsh-deer { }; delta = callPackage ../applications/version-management/git-and-tools/delta { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security; }; deno = callPackage ../development/web/deno { From 87a122f68153bb0a0abdec2ba85fa81154796c07 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 28 Nov 2021 08:08:14 +1000 Subject: [PATCH 131/185] delta: 0.10.1 -> 0.10.2 https://github.com/dandavison/delta/releases/tag/0.10.2 (cherry picked from commit 909df3fa25f094fbf81b4780e018e7bf86f201e0) --- .../version-management/git-and-tools/delta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index ca02b6385844..980f0e519416 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-aiWVaqwJGjLyv/ZJU4g1KuBC9zbnBEc/vdNADGPKgxo="; + sha256 = "sha256-rQsicAUKlQYxA/DH8691jp6Pk97rer2X2CXUfXKHLDE="; }; - cargoSha256 = "sha256-lp9XzZQZJpjhsanZMky3RwkjM7ICq7dSb4PHdstwMxQ="; + cargoSha256 = "sha256-NjyiGr7mwsHlggMQEKcCvOCfGabRJDBdrYW8ohU02mk="; nativeBuildInputs = [ installShellFiles ]; From 4781b4aeb3c55a00e167db181d6211d5f7ae10b0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 25 Nov 2021 04:29:18 +0200 Subject: [PATCH 132/185] nixos/vmware-guest: add display-manager to after and add ConditionVirtualization and remove unneeded before and wants which are not in the upstream package, the wantedBy should be enough (cherry picked from commit 21585dc6836ce68fe181a90f9eff5d77fb79fc3f) --- nixos/modules/virtualisation/vmware-guest.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index 09b26eeb33a9..481dedf84054 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -34,6 +34,8 @@ in systemd.services.vmware = { description = "VMWare Guest Service"; wantedBy = [ "multi-user.target" ]; + after = [ "display-manager.service" ]; + unitConfig.ConditionVirtualization = "vmware"; serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd"; }; @@ -42,8 +44,7 @@ in { description = "VMware vmblock fuse mount"; documentation = [ "https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/vmblock-fuse/design.txt" ]; - before = [ "vmware.service" ]; - wants = [ "vmware.service" ]; + unitConfig.ConditionVirtualization = "vmware"; what = "${open-vm-tools}/bin/vmware-vmblock-fuse"; where = "/run/vmblock-fuse"; type = "fuse"; From 5da69c12d86cdcae22d95e9dae4ccfab8a223c0e Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 28 Nov 2021 01:11:09 +0100 Subject: [PATCH 133/185] pdns-recursor: 4.5.6 -> 4.5.7 (cherry picked from commit ade2d34d4f965abd6acfa54dc10ee00a057a703b) --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 881fef7f32f1..a26d6a6131cf 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.5.6"; + version = "4.5.7"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "004jwyg64ww6sfwlfpyfvh6vymildygwkjhkin2fsrq4h79wv2dv"; + sha256 = "1avvs1wpck0rahx80xnnaw94hdrfbhi1jdvgg1zpac26mzab4kdd"; }; nativeBuildInputs = [ pkg-config ]; From 96890e83595edd82f9291fdc4f73714680c8afb1 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Fri, 26 Nov 2021 20:30:55 -0800 Subject: [PATCH 134/185] docbookrx: fix build (cherry picked from commit b35726542e8cf68512e87fbd23eb22778f977f22) --- pkgs/tools/typesetting/docbookrx/Gemfile | 2 +- pkgs/tools/typesetting/docbookrx/Gemfile.lock | 33 ++++++- pkgs/tools/typesetting/docbookrx/default.nix | 11 +-- pkgs/tools/typesetting/docbookrx/gemset.nix | 98 +++++++++++++++++-- 4 files changed, 123 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/typesetting/docbookrx/Gemfile b/pkgs/tools/typesetting/docbookrx/Gemfile index 73fee2920d5e..d5290dcb0093 100644 --- a/pkgs/tools/typesetting/docbookrx/Gemfile +++ b/pkgs/tools/typesetting/docbookrx/Gemfile @@ -1,2 +1,2 @@ source 'https://rubygems.org' -gem 'nokogiri', '~> 1.8.0' +gem 'nokogiri', '~> 1.11.7' diff --git a/pkgs/tools/typesetting/docbookrx/Gemfile.lock b/pkgs/tools/typesetting/docbookrx/Gemfile.lock index 423fac6c30a9..07b58b649f4c 100644 --- a/pkgs/tools/typesetting/docbookrx/Gemfile.lock +++ b/pkgs/tools/typesetting/docbookrx/Gemfile.lock @@ -1,15 +1,38 @@ +PATH + remote: . + specs: + docbookrx (1.0.0.dev) + nokogiri (~> 1.11.7) + GEM remote: https://rubygems.org/ specs: - mini_portile2 (2.3.0) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + diff-lcs (1.4.4) + nokogiri (1.11.7-x86_64-linux) + racc (~> 1.4) + racc (1.6.0) + rake (13.0.6) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.3) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.4) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.4) PLATFORMS ruby DEPENDENCIES - nokogiri (~> 1.8.0) + docbookrx! + rake (~> 13.0.0) + rspec (~> 3.9.0) BUNDLED WITH - 2.1.4 + 2.2.24 diff --git a/pkgs/tools/typesetting/docbookrx/default.nix b/pkgs/tools/typesetting/docbookrx/default.nix index a41276ea4328..059233d09b08 100644 --- a/pkgs/tools/typesetting/docbookrx/default.nix +++ b/pkgs/tools/typesetting/docbookrx/default.nix @@ -3,7 +3,6 @@ , stdenv , ruby , bundlerEnv -# , libxml2 }: let @@ -13,10 +12,6 @@ let inherit ruby; - # buildInputs = [ - # libxml2 - # ]; - gemfile = ./Gemfile; lockfile = ./Gemfile.lock; gemset = ./gemset.nix; @@ -25,15 +20,15 @@ let in stdenv.mkDerivation { pname = "docbookrx"; - version = "unstable-2018-05-02"; + version = "unstable-2018-05-18"; buildInputs = [ env.wrappedRuby ]; src = fetchFromGitHub { owner = "asciidoctor"; repo = "docbookrx"; - rev = "682d8c2f7a9e1e6f546c5f7d0067353621c68a7a"; - sha256 = "07jilh17gj8xx4ps4ln787izmhv8xwwwv6fkqqg3pwjni5qikx7w"; + rev = "83d1d1235e3bb44506123eda337780a912581cd0"; + sha256 = "sha256-OdPRh7ZIhgM7hs5qPiuxLEUuMEtaXcgZ83M6i6CV6AY="; }; # TODO: I don't know ruby packaging but this does the trick for now diff --git a/pkgs/tools/typesetting/docbookrx/gemset.nix b/pkgs/tools/typesetting/docbookrx/gemset.nix index bd756b996bbc..fde67f2d4ee9 100644 --- a/pkgs/tools/typesetting/docbookrx/gemset.nix +++ b/pkgs/tools/typesetting/docbookrx/gemset.nix @@ -1,23 +1,107 @@ { - mini_portile2 = { - groups = ["default"]; + diff-lcs = { + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; type = "gem"; }; - version = "2.3.0"; + version = "1.4.4"; + }; + docbookrx = { + dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + path = ./.; + type = "path"; + }; + version = "1.0.0.dev"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "4976a9c9e796527d51dc6c311b9bd93a0233f6a7962a0f569aa5c782461836ef"; type = "gem"; }; - version = "1.8.5"; + version = "1.11.7"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + type = "gem"; + }; + version = "1.6.0"; + }; + rake = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; + type = "gem"; + }; + version = "3.9.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b8891149l4rdlaz58k1dprc09rhpvq98bblk4qpd3dvcvqklkvh"; + type = "gem"; + }; + version = "3.9.3"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gjqa3h4r8jna8dh22al4f6ks4x6l4knshx2b8jygkd1gk68n92q"; + type = "gem"; + }; + version = "3.9.4"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + type = "gem"; + }; + version = "3.9.1"; + }; + rspec-support = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ig6wk1ln6wy0d6fjlbfwxibps1nidc6111fcnm0jfa1z5nkqczl"; + type = "gem"; + }; + version = "3.9.4"; }; } From 0da1c32e6fafab7abb88bba52ad5739bf2ae446b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 28 Nov 2021 12:43:57 +0100 Subject: [PATCH 135/185] gromacs: fix double precission build on aarch64 (cherry picked from commit 5cfe3c4e82118dd732ffb23c469b128ed8ee3283) --- .../applications/science/molecular-dynamics/gromacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index bbe8f6f9f536..f30e94f03d88 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -14,7 +14,7 @@ let if stdenv.hostPlatform.system == "i686-linux" then "SSE2" else if stdenv.hostPlatform.system == "x86_64-linux" then "SSE4.1" else if stdenv.hostPlatform.system == "x86_64-darwin" then "SSE4.1" else - if stdenv.hostPlatform.system == "aarch64-linux" then "ARM_NEON" else + if stdenv.hostPlatform.system == "aarch64-linux" then "ARM_NEON_ASIMD" else "None"; in stdenv.mkDerivation rec { From 9be5459139db15ef2937cf9aca7102021ffa1e9f Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Sat, 27 Nov 2021 21:25:34 -0800 Subject: [PATCH 136/185] dero: remove package Package is not maintained since 2018 and officially retired https://github.com/deroproject/dero/blob/master/README.md (cherry picked from commit ef646cac0031e379b384d1e3ad734366e9bc7392) --- .../applications/blockchains/dero/default.nix | 25 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/applications/blockchains/dero/default.nix diff --git a/pkgs/applications/blockchains/dero/default.nix b/pkgs/applications/blockchains/dero/default.nix deleted file mode 100644 index 6b15cbd0a168..000000000000 --- a/pkgs/applications/blockchains/dero/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost -, lmdb, miniupnpc, readline }: - -stdenv.mkDerivation rec { - pname = "dero"; - version = "0.11.7"; - - src = fetchFromGitHub { - owner = "deroproject"; - repo = "dero"; - rev = "v${version}"; - sha256 = "1v8b9wbmqbpyf4jpc0v276qzk3hc5fpddcmwvv5k5yfi30nmbh5c"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; - - meta = with lib; { - description = "Secure, private blockchain with smart contracts based on Monero"; - homepage = "https://dero.io/"; - license = licenses.bsd3; - maintainers = with maintainers; [ fpletz ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcfacdda181e..e0502670eea3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29640,8 +29640,6 @@ with pkgs; dcrd = callPackage ../applications/blockchains/dcrd { }; dcrwallet = callPackage ../applications/blockchains/dcrwallet { }; - dero = callPackage ../applications/blockchains/dero { boost = boost165; }; - digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte { withGui = true; }; digibyted = callPackage ../applications/blockchains/digibyte { withGui = false; }; From b2ae150f86709537ea2e78c6e322b5b083243834 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 21 Nov 2021 19:31:42 +0100 Subject: [PATCH 137/185] pulseaudio-dlna: unstable-2017-11-01 -> unstable-2021-11-09 This moves pulseaudio-dlna to a more recent fork, which works with Python 3. (cherry picked from commit 467aead38e5092f9550a0c84dde43af4e792043b) --- ...etup.py-remove-dbus-python-from-list.patch | 25 +++++++ .../audio/pulseaudio-dlna/default.nix | 74 ++++++++++++------- 2 files changed, 73 insertions(+), 26 deletions(-) create mode 100644 pkgs/applications/audio/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch diff --git a/pkgs/applications/audio/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch b/pkgs/applications/audio/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch new file mode 100644 index 000000000000..2f38386f96c0 --- /dev/null +++ b/pkgs/applications/audio/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch @@ -0,0 +1,25 @@ +From a4bf7df795146c843696daee8c02826ba0034298 Mon Sep 17 00:00:00 2001 +From: Florian Klink +Date: Sun, 21 Nov 2021 12:04:48 +0100 +Subject: [PATCH] setup.py: remove dbus-python from list + +I wasn't able to convince setuptools to find this. +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 61d6831..013fff3 100644 +--- a/setup.py ++++ b/setup.py +@@ -42,7 +42,6 @@ setuptools.setup( + install_requires=[ + 'docopt', + 'chardet', +- 'dbus-python', + 'docopt', + 'requests', + 'setproctitle', +-- +2.33.1 + diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index 83de192c6b31..11c1fd081fd4 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -1,10 +1,18 @@ -{ fetchFromGitHub, lib, pythonPackages -, mp3Support ? true, lame ? null -, opusSupport ? true, opusTools ? null -, faacSupport ? false, faac ? null -, flacSupport ? true, flac ? null -, soxSupport ? true, sox ? null -, vorbisSupport ? true, vorbis-tools ? null +{ fetchFromGitHub +, lib +, python3Packages +, mp3Support ? true +, lame ? null +, opusSupport ? true +, opusTools ? null +, faacSupport ? false +, faac ? null +, flacSupport ? true +, flac ? null +, soxSupport ? true +, sox ? null +, vorbisSupport ? true +, vorbis-tools ? null }: assert mp3Support -> lame != null; @@ -14,30 +22,44 @@ assert flacSupport -> flac != null; assert soxSupport -> sox != null; assert vorbisSupport -> vorbis-tools != null; -let - zeroconf = pythonPackages.callPackage ./zeroconf.nix { }; -in -pythonPackages.buildPythonApplication { +python3Packages.buildPythonApplication { pname = "pulseaudio-dlna"; - version = "unstable-2017-11-01"; + version = "unstable-2021-11-09"; src = fetchFromGitHub { - owner = "masmu"; + owner = "Cygn"; repo = "pulseaudio-dlna"; - rev = "4472928dd23f274193f14289f59daec411023ab0"; - sha256 = "1dfn7036vrq49kxv4an7rayypnm5dlawsf02pfsldw877hzdamqk"; + rev = "637a2e7bba2277137c5f12fb58e63100dab7cbe6"; + sha256 = "sha256-Oda+zQQJE2D3fiNWTzxYvI8cZVHG5JAoV2Wf5Z6IU3M="; }; - propagatedBuildInputs = with pythonPackages; [ - dbus-python docopt requests setproctitle protobuf psutil futures - chardet notify2 netifaces pyroute2 pygobject2 lxml setuptools ] - ++ [ zeroconf ] - ++ lib.optional mp3Support lame - ++ lib.optional opusSupport opusTools - ++ lib.optional faacSupport faac - ++ lib.optional flacSupport flac - ++ lib.optional soxSupport sox - ++ lib.optional vorbisSupport vorbis-tools; + patches = [ + ./0001-setup.py-remove-dbus-python-from-list.patch + ]; + + propagatedBuildInputs = with python3Packages; [ + dbus-python + docopt + requests + setproctitle + protobuf + psutil + chardet + netifaces + notify2 + pyroute2 + pygobject3 + PyChromecast + lxml + setuptools + zeroconf + ] + ++ lib.optional mp3Support lame + ++ lib.optional opusSupport opusTools + ++ lib.optional faacSupport faac + ++ lib.optional flacSupport flac + ++ lib.optional soxSupport sox + ++ lib.optional vorbisSupport vorbis-tools; # upstream has no tests checkPhase = '' @@ -46,7 +68,7 @@ pythonPackages.buildPythonApplication { meta = with lib; { description = "A lightweight streaming server which brings DLNA / UPNP and Chromecast support to PulseAudio and Linux"; - homepage = "https://github.com/masmu/pulseaudio-dlna"; + homepage = "https://github.com/Cygn/pulseaudio-dlna"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mog ]; platforms = platforms.linux; From 487c762d0b664284961acf8ddc56495c55928a7b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 26 Nov 2021 13:22:20 +0100 Subject: [PATCH 138/185] pulseaudio-dlna: minor cleanups (cherry picked from commit b1204359faf82a68465ba285f8d40dffd671241e) --- .../audio/pulseaudio-dlna/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index 11c1fd081fd4..98803b32ec9f 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -2,26 +2,19 @@ , lib , python3Packages , mp3Support ? true -, lame ? null +, lame , opusSupport ? true -, opusTools ? null +, opusTools , faacSupport ? false -, faac ? null +, faac , flacSupport ? true -, flac ? null +, flac , soxSupport ? true -, sox ? null +, sox , vorbisSupport ? true -, vorbis-tools ? null +, vorbis-tools }: -assert mp3Support -> lame != null; -assert opusSupport -> opusTools != null; -assert faacSupport -> faac != null; -assert flacSupport -> flac != null; -assert soxSupport -> sox != null; -assert vorbisSupport -> vorbis-tools != null; - python3Packages.buildPythonApplication { pname = "pulseaudio-dlna"; version = "unstable-2021-11-09"; From 10491080407f94024bda1922406047276c40d278 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 26 Nov 2021 13:32:29 +0100 Subject: [PATCH 139/185] pulseaudio-dlna: ensure pactl is available pulseaudio-dlna shells out to pactl to configure sinks and sources. As pactl might not be in $PATH, add --suffix it (so pactl configured by the user get priority) (cherry picked from commit f567ff4440b5cfe085348620c2784d71cc5c7792) --- pkgs/applications/audio/pulseaudio-dlna/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index 98803b32ec9f..384718f1db54 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -13,6 +13,7 @@ , sox , vorbisSupport ? true , vorbis-tools +, pulseaudio }: python3Packages.buildPythonApplication { @@ -54,6 +55,11 @@ python3Packages.buildPythonApplication { ++ lib.optional soxSupport sox ++ lib.optional vorbisSupport vorbis-tools; + # pulseaudio-dlna shells out to pactl to configure sinks and sources. + # As pactl might not be in $PATH, add --suffix it (so pactl configured by the + # user get priority) + makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ pulseaudio ]}" ]; + # upstream has no tests checkPhase = '' $out/bin/pulseaudio-dlna --help > /dev/null From 83036951ea6a88904e13dfc523751dae49d605ca Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Sat, 27 Nov 2021 22:25:50 -0800 Subject: [PATCH 140/185] slicer: fix build (cherry picked from commit 182c8be43317221676de695fa76dd680e4bc7ee9) --- pkgs/development/python-modules/slicer/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/slicer/default.nix b/pkgs/development/python-modules/slicer/default.nix index f8329dbab479..89fb4e5dc728 100644 --- a/pkgs/development/python-modules/slicer/default.nix +++ b/pkgs/development/python-modules/slicer/default.nix @@ -5,6 +5,7 @@ , pytestCheckHook , pandas , pytorch +, scipy }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { sha256 = "f5d5f7b45f98d155b9c0ba6554fa9770c6b26d5793a3e77a1030fb56910ebeec"; }; - checkInputs = [ pytestCheckHook pandas pytorch ]; + checkInputs = [ pytestCheckHook pandas pytorch scipy ]; meta = with lib; { description = "Wraps tensor-like objects and provides a uniform slicing interface via __getitem__"; From 8cbf091c3af286fc1f0e31c8cbf38783e9e63de7 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 28 Nov 2021 12:17:23 +0100 Subject: [PATCH 141/185] storm: 2.2.0 -> 2.3.0 Fixes CVE-2021-38294 and CVE-2021-40865. https://storm.apache.org/2021/09/27/storm230-released.html (cherry picked from commit 840af81e55f4936be6cc3b58c7010ca1cd164745) --- pkgs/servers/computing/storm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 07c636b6e5ba..514f01e3116e 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "apache-storm"; - version = "2.2.0"; + version = "2.3.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://apache/storm/${name}/${name}.tar.gz"; - sha256 = "0xc6lfilfkkjyds59b6c770gj21v9srzpln31c9qb3ls6hzic8gn"; + sha256 = "sha256-ScIlWyZjPG/ZY5nFIDOeRZ/NopoOfm0Mh3XO/P9sNjY="; }; nativeBuildInputs = [ zip unzip ]; From 7021d298d0a7c4e435570cf42b589a243d27ca6d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 18 Nov 2021 15:32:19 +0100 Subject: [PATCH 142/185] php74: 7.4.25 -> 7.4.26 Fixes CVE-2021-21707 (cherry picked from commit 183cc6ea800548e6b62bd1f972caee25813b3904) --- pkgs/development/interpreters/php/7.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 93ce56e875cd..1cc63d7b58a4 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "7.4.25"; - sha256 = "sha256-J5klcMrz4uUyOrezeFPETBUpsdMeqU2Xdu+pHVp4ExM="; + version = "7.4.26"; + sha256 = "0k803j5wf4jv72px0zqz2z2hxyk2w3jr6xyczy568dx4z2l8i2yn"; }); in From 8d41fc092e366b7af15e70eda4812ed862bec2b7 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 19 Nov 2021 12:42:37 +0100 Subject: [PATCH 143/185] php80: 8.0.12 -> 8.0.13 Fixes CVE-2021-21707 (cherry picked from commit 6dfffc7d4918560eb3015a6e90e8e1b7959f16bf) --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 5c393d8ed961..8cf7d4ebc8df 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.12"; - sha256 = "sha256-tIhtsd8yLcj7Eo2LNK5+lPb8aC7LKf9PWlkdTen+rb8="; + version = "8.0.13"; + sha256 = "0djqh650clz4fy1zifazf0jq383znksydx23f1s48prrlixrshf2"; }); in From 36be1049b3feb00e3b222c79d23ff0678b5b5d75 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 25 Nov 2021 18:18:21 +0100 Subject: [PATCH 144/185] php80Extensions.xmlreader: fix build (cherry picked from commit cede244af9bbda364b2f27892984d78923d5a6ed) --- pkgs/top-level/php-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index afcee93c3b21..10ec911e33c9 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -563,6 +563,7 @@ lib.makeScope pkgs.newScope (self: with self; { buildInputs = [ libxml2 ]; internalDeps = [ php.extensions.dom ]; NIX_CFLAGS_COMPILE = [ "-I../.." "-DHAVE_DOM" ]; + doCheck = false; configureFlags = [ "--enable-xmlreader" ] # Required to build on darwin. ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; From 8c2e9701aa5983c68f79606bd48a5c677533440d Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 28 Nov 2021 04:08:57 +0100 Subject: [PATCH 145/185] nixos/doc: Add note about big updates regarding hydrus to release notes (cherry picked from commit 40fb87f5ca84fb7d5299041a9aa632410108f6e7) --- .../manual/from_md/release-notes/rl-2111.section.xml | 10 ++++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ 2 files changed, 12 insertions(+) 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 d9ae0ac94818..42829cdaf06d 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 @@ -2021,6 +2021,16 @@ Superuser created successfully. file. + + + hydrus has been upgraded from version 438 + to 462. Since upgrading between releases + this old is advised against, be sure to have a backup of your + data before upgrading. For details, see + the + hydrus manual. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index ceac3c60e8d9..875cd6fae879 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -547,3 +547,5 @@ In addition to numerous new and upgraded packages, this release has the followin - `julia` now refers to `julia-stable` instead of `julia-lts`. In practice this means it has been upgraded from `1.0.4` to `1.5.4`. - RetroArch has been upgraded from version `1.8.5` to `1.9.13.2`. Since the previous release was quite old, if you're having issues after the upgrade, please delete your `$XDG_CONFIG_HOME/retroarch/retroarch.cfg` file. + +- hydrus has been upgraded from version `438` to `462`. Since upgrading between releases this old is advised against, be sure to have a backup of your data before upgrading. For details, see [the hydrus manual](https://hydrusnetwork.github.io/hydrus/help/getting_started_installing.html#big_updates). From 8de64b808a2d71eed065d127b8e9e68cefcbdd6a Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 28 Nov 2021 04:10:57 +0100 Subject: [PATCH 146/185] hydrus: 462 -> 463 (cherry picked from commit 0fff6b89eac2a9bcf743dfaca7f0ee956a683be5) --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 2 +- nixos/doc/manual/release-notes/rl-2111.section.md | 2 +- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 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 42829cdaf06d..387b821bcad8 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 @@ -2024,7 +2024,7 @@ Superuser created successfully. hydrus has been upgraded from version 438 - to 462. Since upgrading between releases + to 463. Since upgrading between releases this old is advised against, be sure to have a backup of your data before upgrading. For details, see the diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 875cd6fae879..6283eaecdb1d 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -548,4 +548,4 @@ In addition to numerous new and upgraded packages, this release has the followin - RetroArch has been upgraded from version `1.8.5` to `1.9.13.2`. Since the previous release was quite old, if you're having issues after the upgrade, please delete your `$XDG_CONFIG_HOME/retroarch/retroarch.cfg` file. -- hydrus has been upgraded from version `438` to `462`. Since upgrading between releases this old is advised against, be sure to have a backup of your data before upgrading. For details, see [the hydrus manual](https://hydrusnetwork.github.io/hydrus/help/getting_started_installing.html#big_updates). +- hydrus has been upgraded from version `438` to `463`. Since upgrading between releases this old is advised against, be sure to have a backup of your data before upgrading. For details, see [the hydrus manual](https://hydrusnetwork.github.io/hydrus/help/getting_started_installing.html#big_updates). diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 3fce492a9932..787aace163b8 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "462"; + version = "463"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-eHUztpnDs1kxaBlTO7BRbO3eH+On9m7aJtbNw2b9Ado="; + sha256 = "sha256-GT5aIMskOVn4eAd4612YYA8uAQC8tuJzpEHNhc7pMuc="; }; nativeBuildInputs = [ From 6038e2a8dfbcfddab076479529039727d085b074 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 9 Nov 2021 18:04:04 +0100 Subject: [PATCH 147/185] libcint: 4.4.0 -> 4.4.6 libcint: formatting and features libcint: platforms (cherry picked from commit dd7f587346aa6f57e25628643149982041e02655) --- pkgs/development/libraries/libcint/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index a6f2e05d7361..1ff5eb338a9e 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.4.0"; + version = "4.4.6"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - hash = "sha256-nsIyosn8dBf217UmjXSKLTM2RhIQHCSvPlrvlqo5KLc="; + sha256 = "sha256-eWUuORMZs6Bl/zFGYZkpgNAgJPIei+k0cQoWl+v+zxo="; }; nativeBuildInputs = [ cmake ]; @@ -24,6 +24,9 @@ stdenv.mkDerivation rec { "-DENABLE_TEST=1" "-DQUICK_TEST=1" "-DCMAKE_INSTALL_PREFIX=" # ends up double-adding /nix/store/... prefix, this avoids issue + "-DWITH_RANGE_COULOMB:STRING=1" + "-DWITH_FORTRAN:STRING=1" + "-DMIN_EXPCUTOFF:STRING=20" ]; strictDeps = true; From 7c94fd01e0ce0e8f904714db67afc8a6eef284a5 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Wed, 10 Nov 2021 12:29:53 +0100 Subject: [PATCH 148/185] libxc: force 3rd and 4th derivatives compilation libxc: formatting libxc: platforms (cherry picked from commit 2a9baed9062f60d06849aabd41bae916f714f508) --- pkgs/development/libraries/libxc/default.nix | 12 ++++++++++-- .../libraries/science/chemistry/xcfun/default.nix | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 653f43764682..046d630888c4 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -17,7 +17,15 @@ stdenv.mkDerivation rec { patchShebangs ./ ''; - cmakeFlags = [ "-DENABLE_FORTRAN=ON" "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DENABLE_FORTRAN=ON" + "-DBUILD_SHARED_LIBS=ON" + # Force compilation of higher derivatives + "-DDISABLE_VXC=0" + "-DDISABLE_FXC=0" + "-DDISABLE_KXC=0" + "-DDISABLE_LXC=0" + ]; preCheck = '' export LD_LIBRARY_PATH=$(pwd) @@ -29,7 +37,7 @@ stdenv.mkDerivation rec { description = "Library of exchange-correlation functionals for density-functional theory"; homepage = "https://www.tddft.org/programs/Libxc/"; license = licenses.mpl20; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ markuskowa ]; }; } diff --git a/pkgs/development/libraries/science/chemistry/xcfun/default.nix b/pkgs/development/libraries/science/chemistry/xcfun/default.nix index 7f8ef3dc47d7..0856168092cb 100644 --- a/pkgs/development/libraries/science/chemistry/xcfun/default.nix +++ b/pkgs/development/libraries/science/chemistry/xcfun/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "dftlibs"; repo = pname; rev = "v${version}"; - sha256= "1bj70cnhbh6ziy02x988wwl7cbwaq17ld7qwhswqkgnnx8rpgxid"; + sha256 = "1bj70cnhbh6ziy02x988wwl7cbwaq17ld7qwhswqkgnnx8rpgxid"; }; nativeBuildInputs = [ From 3d739203c832475a3ad3bf33700edac5568e0fba Mon Sep 17 00:00:00 2001 From: sheepforce Date: Mon, 22 Nov 2021 12:25:31 +0100 Subject: [PATCH 149/185] python3.pkgs.fields: init at 5.0.0 fields: expose package fields: formatting fields: platforms fields: platforms fields: remove redundant platform (cherry picked from commit dbd7ba5f5f0865f2b2e9ec5c303ee4979a4679a5) --- .../python-modules/fields/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/fields/default.nix diff --git a/pkgs/development/python-modules/fields/default.nix b/pkgs/development/python-modules/fields/default.nix new file mode 100644 index 000000000000..35bf686b4353 --- /dev/null +++ b/pkgs/development/python-modules/fields/default.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage, lib, fetchPypi }: + +buildPythonPackage rec { + pname = "fields"; + version = "5.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-MdSqA9jUTjXfE8Qx3jUTaZfwR6kkpZfYT3vCCeG+Vyc="; + }; + + pythonImportsCheck = [ "fields" ]; + + meta = with lib; { + description = "Container class boilerplate killer"; + homepage = "https://github.com/ionelmc/python-fields"; + license = licenses.bsd2; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d4a2a1ded01..e3e9d2215b32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2697,6 +2697,8 @@ in { fido2 = callPackage ../development/python-modules/fido2 { }; + fields = callPackage ../development/python-modules/fields { }; + filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { }; filebytes = callPackage ../development/python-modules/filebytes { }; From a6c31fc2f929ac4fa1ea7b7a8485c28ac22ae185 Mon Sep 17 00:00:00 2001 From: sheepforce Date: Mon, 22 Nov 2021 12:24:38 +0100 Subject: [PATCH 150/185] python3.pkgs.polarizationsolver: init at 00424ac4 polarizationsolver: expose polyrizationsolver: formatting polarizationsolver: platforms polarizationsolver: platforms polarizationsolver: license polarizationsolver: remove redundant platform (cherry picked from commit a6a5114653c90cf8a4bc779b219a0bb03a647061) --- .../polarizationsolver/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/polarizationsolver/default.nix diff --git a/pkgs/development/python-modules/polarizationsolver/default.nix b/pkgs/development/python-modules/polarizationsolver/default.nix new file mode 100644 index 000000000000..c4710f6901ed --- /dev/null +++ b/pkgs/development/python-modules/polarizationsolver/default.nix @@ -0,0 +1,38 @@ +{ buildPythonPackage +, lib +, fetchFromGitLab +, python +, numpy +, scipy +, periodictable +, fields +}: + +buildPythonPackage rec { + pname = "polarizationsolver"; + version = "unstable-2021-11-02"; + + src = fetchFromGitLab { + owner = "reinholdt"; + repo = pname; + rev = "00424ac4d1862257a55e4b16543f63ace3fe8c22"; + sha256 = "sha256-LACf8Xw+o/uJ3+PD/DE/o7nwKY7fv3NyYbpjCrTTnBU="; + }; + + propagatedBuildInputs = [ + numpy + periodictable + scipy + ]; + + checkInputs = [ fields ]; + + pythonImportsCheck = [ "polarizationsolver" ]; + + meta = with lib; { + description = "Multipole moment solver for quantum chemistry and polarisable embedding"; + homepage = "https://gitlab.com/reinholdt/polarizationsolver"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3e9d2215b32..0053f3a1879d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5931,6 +5931,8 @@ in { poezio = callPackage ../applications/networking/instant-messengers/poezio { }; + polarizationsolver = callPackage ../development/python-modules/polarizationsolver { }; + polib = callPackage ../development/python-modules/polib { }; policy-sentry = callPackage ../development/python-modules/policy-sentry { }; From 17f6ccd914ecbbbbf642d23ad79a9bb1c30ef524 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Wed, 10 Nov 2021 12:30:09 +0100 Subject: [PATCH 151/185] cppe: init at 0.3.1 cppe: move pytestCheckHook to checkInputs cppe: hash cppe: license and hash cppe: formatting python3.pkgs.cppe: more tests cppe: formatting cppe: formatting cppe: platforms cppe: platforms (cherry picked from commit 938a9e00c5b253bfb4e3d51c0b63cfc7a8253d24) --- .../science/chemistry/cppe/default.nix | 25 ++++++++++ .../python-modules/cppe/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 4 ++ 4 files changed, 78 insertions(+) create mode 100644 pkgs/development/libraries/science/chemistry/cppe/default.nix create mode 100644 pkgs/development/python-modules/cppe/default.nix diff --git a/pkgs/development/libraries/science/chemistry/cppe/default.nix b/pkgs/development/libraries/science/chemistry/cppe/default.nix new file mode 100644 index 000000000000..51083e5a2ae9 --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/cppe/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "cppe"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "maxscheurer"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-guM7+ZWDJLcAUJtPkKLvC4LYSA2eBvER7cgwPZ7FxHw="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + + meta = with lib; { + description = "C++ and Python library for Polarizable Embedding"; + homepage = "https://github.com/maxscheurer/cppe"; + license = licenses.lgpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/python-modules/cppe/default.nix b/pkgs/development/python-modules/cppe/default.nix new file mode 100644 index 000000000000..df00bd8dd120 --- /dev/null +++ b/pkgs/development/python-modules/cppe/default.nix @@ -0,0 +1,47 @@ +{ buildPythonPackage +, lib +, cmake +, cppe +, eigen +, python +, pybind11 +, numpy +, h5py +, numba +, scipy +, pandas +, polarizationsolver +, pytest +}: + +buildPythonPackage rec { + inherit (cppe) pname version src meta; + + # The python interface requires eigen3, but builds from a checkout in tree. + # Using the nixpkgs version instead. + postPatch = '' + substituteInPlace setup.py \ + --replace "external/eigen3" "${eigen}/include/eigen3" + ''; + + nativeBuildInputs = [ + cmake + eigen + ]; + + dontUseCmakeConfigure = true; + + buildInputs = [ pybind11 ]; + + checkInputs = [ + pytest + h5py + numba + numpy + pandas + polarizationsolver + scipy + ]; + + pythonImportsCheck = [ "cppe" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0502670eea3..628d18f70595 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15926,6 +15926,8 @@ with pkgs; ctpl = callPackage ../development/libraries/ctpl { }; + cppe = callPackage ../development/libraries/science/chemistry/cppe { }; + cppdb = callPackage ../development/libraries/cppdb { }; cpp-utilities = callPackage ../development/libraries/cpp-utilities { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0053f3a1879d..304a31e77c88 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1765,6 +1765,10 @@ in { cozy = callPackage ../development/python-modules/cozy { }; + cppe = callPackage ../development/python-modules/cppe { + cppe = pkgs.cppe; + }; + cppheaderparser = callPackage ../development/python-modules/cppheaderparser { }; cppy = callPackage ../development/python-modules/cppy { }; From 018d77058c1e8cbaa01d92fc8bce7ccbd87586de Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Thu, 11 Nov 2021 22:31:47 +0100 Subject: [PATCH 152/185] pyscf: 1.7.6.post1 -> 2.0.1 pyscf: hash pyscf: limit test suite to single core pyscf: adapting test suite pyscf: fix pythonpath for tests pyscf: formatting pyscf: platforms remove log pyscf: enable uadc module pyscf: platforms pyscf: formatting pyscf: disable instable N3 CI test pyscf: formating pyscf: increase ulimit pyscf: ulimit files pyscf: remove ulimit -n (cherry picked from commit 21ca2dec9ffcfb3bf8c1435eea443b999c7e5193) --- .../python-modules/pyscf/default.nix | 90 ++++++++++++++++--- .../python-modules/pyscf/h5py.patch | 13 --- 2 files changed, 77 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/python-modules/pyscf/h5py.patch diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 0be40b5dfe7c..cf6f91e74f7d 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -1,45 +1,109 @@ -{ buildPythonPackage, lib, fetchFromGitHub, libcint, libxc, xcfun, blas -, numpy, scipy, h5py +{ buildPythonPackage +, python3 +, lib +, fetchFromGitHub +, cmake +, blas +, libcint +, libxc +, xcfun +, cppe +, h5py +, numpy +, scipy +, nose +, nose-exclude }: buildPythonPackage rec { pname = "pyscf"; - version = "1.7.6.post1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "pyscf"; repo = pname; - rev = "f6c9c6654dd9609c5e467a1edd5c2c076f793acc"; - sha256 = "0xbwkjxxysfpqz72qn6n4a0zr2h6sprbcal8j7kzymh7swjy117w"; + rev = "v${version}"; + sha256 = "sha256-nwnhaqSn/9WHBjUPaEabK4x23fJ83WwEYvz6aCcvsDw="; }; - # Backport from the 2.0.0 alpha releases of PySCF. - # H5Py > 3.3 deprecates the file modes, that PySCF sets. - patches = [ ./h5py.patch ]; + # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake. + nativeBuildInputs = [ cmake ]; + dontUseCmakeConfigure = true; + preConfigure = '' + export CMAKE_CONFIGURE_ARGS="-DBUILD_LIBCINT=0 -DBUILD_LIBXC=0 -DBUILD_XCFUN=0" + PYSCF_INC_DIR="${libcint}:${libxc}:${xcfun}"; + ''; buildInputs = [ + blas libcint libxc xcfun - blas ]; propagatedBuildInputs = [ + cppe + h5py numpy scipy - h5py ]; - PYSCF_INC_DIR="${libcint}:${libxc}:${xcfun}"; + checkInputs = [ nose nose-exclude ]; - doCheck = false; pythonImportsCheck = [ "pyscf" ]; + preCheck = '' + # Set config used by tests to ensure reproducibility + echo 'pbc_tools_pbc_fft_engine = "NUMPY"' > pyscf/pyscf_config.py + export OMP_NUM_THREADS=1 + ulimit -s 20000 + export PYSCF_CONFIG_FILE=$(pwd)/pyscf/pyscf_config.py + ''; + # As defined for the PySCF CI at https://github.com/pyscf/pyscf/blob/master/.github/workflows/run_tests.sh + # minus some additionally numerically instable tests, that are sensitive to BLAS, FFTW, etc. + checkPhase = '' + runHook preCheck + + nosetests pyscf/ -v \ + --exclude-dir=examples --exclude-dir=pyscf/pbc/grad \ + --exclude-dir=pyscf/x2c \ + --exclude-dir=pyscf/pbc/tdscf \ + -e test_bz \ + -e h2o_vdz \ + -e test_mc2step_4o4e \ + -e test_ks_noimport \ + -e test_jk_hermi0 \ + -e test_j_kpts \ + -e test_k_kpts \ + -e high_cost \ + -e skip \ + -e call_in_background \ + -e libxc_cam_beta_bug \ + -e test_finite_diff_rks_eph \ + -e test_finite_diff_uks_eph \ + -e test_pipek \ + -e test_n3_cis_ewald \ + -I test_kuccsd_supercell_vs_kpts\.py \ + -I test_kccsd_ghf\.py \ + -I test_h_.*\.py \ + --exclude-test=pyscf/pbc/gw/test/test_kgw_slow_supercell.DiamondTestSupercell3 \ + --exclude-test=pyscf/pbc/gw/test/test_kgw_slow_supercell.DiamondKSTestSupercell3 \ + --exclude-test=pyscf/pbc/gw/test/test_kgw_slow.DiamondTestSupercell3 \ + --exclude-test=pyscf/pbc/gw/test/test_kgw_slow.DiamondKSTestSupercell3 \ + --exclude-test=pyscf/pbc/tdscf/test/test_krhf_slow_supercell.DiamondTestSupercell3 \ + --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_hf.DiamondTestSupercell3 \ + --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_ks.DiamondTestSupercell3 \ + --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_supercell_hf.DiamondTestSupercell3 \ + --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_supercell_ks.DiamondTestSupercell3 \ + -I .*_slow.*py -I .*_kproxy_.*py -I test_proxy.py tdscf/*_slow.py gw/*_slow.py + + runHook postCheck + ''; meta = with lib; { description = "Python-based simulations of chemistry framework"; homepage = "https://github.com/pyscf/pyscf"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.sheepforce ]; }; } diff --git a/pkgs/development/python-modules/pyscf/h5py.patch b/pkgs/development/python-modules/pyscf/h5py.patch deleted file mode 100644 index 160128633208..000000000000 --- a/pkgs/development/python-modules/pyscf/h5py.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pyscf/lib/misc.py b/pyscf/lib/misc.py -index ed43689ff..a8a0d0e20 100644 ---- a/pyscf/lib/misc.py -+++ b/pyscf/lib/misc.py -@@ -42,8 +42,6 @@ if h5py.version.version[:4] == '2.2.': - sys.stderr.write('h5py-%s is found in your environment. ' - 'h5py-%s has bug in threading mode.\n' - 'Async-IO is disabled.\n' % ((h5py.version.version,)*2)) --if h5py.version.version[:2] == '3.': -- h5py.get_config().default_file_mode = 'a' - - c_double_p = ctypes.POINTER(ctypes.c_double) - c_int_p = ctypes.POINTER(ctypes.c_int) From 86cfb75f1f97afb950ec4b229e22f0a9b6a92f61 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 17 Nov 2021 16:28:24 +0100 Subject: [PATCH 153/185] Fix eval with `nix-env -qas` At least on NixOS, it fails to evaluate as follows: $ nix-env -qaPs -f . error: attribute '__propagatedImpureHostDeps' missing (cherry picked from commit b8c07facaa578c05af95fb4b2479bdfd9a433e31) --- pkgs/os-specific/darwin/apple-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 56b77fbf2148..0cf95cbe9c56 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -271,7 +271,7 @@ in rec { overrides = super: { AppKit = lib.overrideDerivation super.AppKit (drv: { - __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [ + __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps or [] ++ [ "/System/Library/PrivateFrameworks/" ]; }); @@ -285,13 +285,13 @@ in rec { }); CoreMedia = lib.overrideDerivation super.CoreMedia (drv: { - __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [ + __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps or [] ++ [ "/System/Library/Frameworks/CoreImage.framework" ]; }); CoreMIDI = lib.overrideDerivation super.CoreMIDI (drv: { - __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [ + __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps or [] ++ [ "/System/Library/PrivateFrameworks/" ]; setupHook = ./private-frameworks-setup-hook.sh; From 3c2e73c2eaf81a7e32df8fc61d13e17c7780a1e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 28 Nov 2021 15:01:35 +0100 Subject: [PATCH 154/185] nixosTests.keymap.qwertz: reduce platforms in `tested` In particular, aarch64-linux variant doesn't work on Hydra, so at least avoid this blocking the 21.11 channel. --- nixos/release-combined.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index ee3f3d19174e..d2967702f684 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -92,7 +92,7 @@ in rec { (onFullSupported "nixos.tests.keymap.dvorak") (onFullSupported "nixos.tests.keymap.dvorak-programmer") (onFullSupported "nixos.tests.keymap.neo") - (onFullSupported "nixos.tests.keymap.qwertz") + (onSystems ["x86_64-linux"] "nixos.tests.keymap.qwertz") (onFullSupported "nixos.tests.latestKernel.login") (onFullSupported "nixos.tests.lightdm") (onFullSupported "nixos.tests.login") From 331baaca9cff94f34b4f1d149c09c695cf0d51ed Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 27 Nov 2021 16:05:34 -0300 Subject: [PATCH 155/185] libretro.pcsx2: init at unstable-2021-11-27 Thanks for @jnetod help. (cherry picked from commit 6f05bc3791cd7d27cdc376548df4ce05d9a4ce6d) --- pkgs/misc/emulators/retroarch/cores.nix | 36 +++++++++++++++++++++++ pkgs/misc/emulators/retroarch/hashes.json | 7 +++++ pkgs/misc/emulators/retroarch/update.py | 1 + 3 files changed, 44 insertions(+) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index c8a1b8983f32..44c43f0f3284 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -14,6 +14,7 @@ , hexdump , hidapi , icu +, libaio , libGL , libGLU , libevdev @@ -21,6 +22,7 @@ , libpcap , libpng , libvorbis +, libxml2 , libzip , makeWrapper , nasm @@ -36,6 +38,8 @@ , udev , which , xorg +, xxd +, xz , zlib }: @@ -669,6 +673,38 @@ in ''; }; + pcsx2 = mkLibRetroCore { + core = "pcsx2"; + version = "unstable-2021-11-27"; + description = "Port of PCSX2 to libretro"; + license = lib.licenses.gpl3Plus; + extraNativeBuildInputs = [ + cmake + gettext + pkg-config + ]; + extraBuildInputs = [ + libaio + libGL + libGLU + libpcap + libpng + libxml2 + xz + xxd + ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DLIBRETRO=ON" + ]; + postPatch = '' + # remove ccache + substituteInPlace CMakeLists.txt --replace "ccache" "" + ''; + postBuild = "cd /build/source/build/pcsx2"; + }; + pcsx_rearmed = mkLibRetroCore { core = "pcsx_rearmed"; description = "Port of PCSX ReARMed with GNU lightning to libretro"; diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/misc/emulators/retroarch/hashes.json index 9eab19b29ad1..3caf4ed9f7b8 100644 --- a/pkgs/misc/emulators/retroarch/hashes.json +++ b/pkgs/misc/emulators/retroarch/hashes.json @@ -377,6 +377,13 @@ "sha256": "rms+T8JOp/TJ/T5a5uLj8lu1LLz/GAsJZ7UbK42C9yU=", "fetchSubmodules": false }, + "pcsx2": { + "owner": "libretro", + "repo": "pcsx2", + "rev": "18e0685ed4f191796c8e923caf4f5e96a930057e", + "sha256": "V2eS741us2p+JC+ghmHjAtFeptB0UcBlwZuisZ8Co7M=", + "fetchSubmodules": false + }, "pcsx_rearmed": { "owner": "libretro", "repo": "pcsx_rearmed", diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/misc/emulators/retroarch/update.py index 3c1ea2b755b1..831709d89e7c 100755 --- a/pkgs/misc/emulators/retroarch/update.py +++ b/pkgs/misc/emulators/retroarch/update.py @@ -64,6 +64,7 @@ CORES = { "o2em": {"repo": "libretro-o2em"}, "opera": {"repo": "opera-libretro"}, "parallel-n64": {"repo": "parallel-n64"}, + "pcsx2": {"repo": "pcsx2"}, "pcsx_rearmed": {"repo": "pcsx_rearmed"}, "picodrive": {"repo": "picodrive", "fetch_submodules": True}, "play": {"repo": "Play-", "owner": "jpd002", "fetch_submodules": True}, From 8562c5aaa16f3bb9c60ed831d8f81f670f031027 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 28 Nov 2021 14:18:22 -0300 Subject: [PATCH 156/185] libretro: remove "-DCMAKE_BUILD_TYPE=Release" (cherry picked from commit 7ff536edd6a8fff222889229dce7d2673f0ab463) --- pkgs/misc/emulators/retroarch/cores.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 44c43f0f3284..dd7f723d3c73 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -367,7 +367,6 @@ in ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]); makefile = "Makefile"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DLIBRETRO=ON" "-DLIBRETRO_STATIC=1" "-DENABLE_QT=OFF" @@ -695,7 +694,6 @@ in ]; makefile = "Makefile"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DLIBRETRO=ON" ]; postPatch = '' @@ -846,7 +844,6 @@ in extraNativeBuildInputs = [ cmake ]; makefile = "Makefile"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_LIBRETRO_CORE=ON" ]; postPatch = "mkdir -p src/duckstation-libretro"; From f2afa0270c11ee95e4658bb5d15e10e7a8161aa7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 28 Nov 2021 14:50:21 -0300 Subject: [PATCH 157/185] libretro: fix core platforms (cherry picked from commit 5c589d83edadc493b0c99a663f1433cf9c8f2b80) --- pkgs/misc/emulators/retroarch/cores.nix | 9 +++++---- pkgs/misc/emulators/retroarch/default.nix | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index dd7f723d3c73..b09af281166b 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -59,6 +59,7 @@ let , src ? null , broken ? false , version ? "unstable-2021-11-22" + , platforms ? retroarch.meta.platforms , ... }@args: lib.makeOverridable stdenv.mkDerivation ( @@ -109,10 +110,9 @@ let }; meta = with lib; { - inherit broken description license; + inherit broken description license platforms; homepage = "https://www.libretro.com/"; maintainers = with maintainers; [ edwtjo hrdinka MP2E thiagokokada ]; - platforms = platforms.unix; }; }) // builtins.removeAttrs args [ "core" "src" "description" "license" "makeFlags" ] ); @@ -193,7 +193,7 @@ in description = "Port of Mednafen's Saturn core to libretro"; license = lib.licenses.gpl2Only; makefile = "Makefile"; - meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; beetle-snes = mkLibRetroCore { @@ -423,7 +423,7 @@ in extraBuildInputs = [ libGL libGLU ]; makefile = "Makefile"; makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; - meta.platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }; fmsx = mkLibRetroCore { @@ -701,6 +701,7 @@ in substituteInPlace CMakeLists.txt --replace "ccache" "" ''; postBuild = "cd /build/source/build/pcsx2"; + platforms = lib.platforms.x86; }; pcsx_rearmed = mkLibRetroCore { diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 5a294277c80c..6bf5f219cd78 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { homepage = "https://libretro.com"; description = "Multi-platform emulator frontend for libretro cores"; license = licenses.gpl3Plus; - platforms = platforms.all; + platforms = platforms.unix; maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch thiagokokada ]; # FIXME: exits with error on macOS: # No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting From f08347400091cf293bef499bffbbe453be454c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 28 Nov 2021 16:33:26 +0100 Subject: [PATCH 158/185] Revert "nixos/tests/misc: fix nix 2.4 support" This reverts commit 546d60c5e6748b0479aceba50acd58e741daecf3. Fixes nixosTests.misc after reverting nix version in PR #147511. --- nixos/tests/misc.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 0587912c9a22..fb19b7060562 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -50,18 +50,17 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { def get_path_info(path): - result = machine.succeed(f"nix --option experimental-features nix-command path-info --json {path}") + result = machine.succeed(f"nix path-info --json {path}") parsed = json.loads(result) return parsed with subtest("nix-db"): info = get_path_info("${foo}") - print(info) if ( info[0]["narHash"] - != "sha256-BdMdnb/0eWy3EddjE83rdgzWWpQjfWPAj3zDIFMD3Ck=" + != "sha256:0afw0d9j1hvwiz066z93jiddc33nxg6i6qyp26vnqyglpyfivlq5" ): raise Exception("narHash not set") From 101fdf5e232cc297881b3a53ba4ad6654fd89b00 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Sun, 28 Nov 2021 11:17:24 -0800 Subject: [PATCH 159/185] neard: fix build (cherry picked from commit 32067bb1597fdbf762a4b55c81e7788a5c2149cd) --- pkgs/servers/neard/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index 77c6f8839f71..9e9ccb9700ee 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, python2Packages }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, python3Packages }: stdenv.mkDerivation rec { pname = "neard"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil"; }; - nativeBuildInputs = [ autoreconfHook pkg-config python2Packages.wrapPython ]; - buildInputs = [ systemd glib dbus libnl ] ++ (with python2Packages; [ python ]); - pythonPath = with python2Packages; [ pygobject2 dbus-python pygtk ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3Packages.wrapPython ]; + buildInputs = [ systemd glib dbus libnl ] ++ (with python3Packages; [ python ]); + pythonPath = with python3Packages; [ pygobject3 dbus-python ]; strictDeps = true; From e1b57b1e1ed74e87f35bdbc8906bf43f46baaf28 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 20 Nov 2021 19:11:09 -0500 Subject: [PATCH 160/185] arrow-cpp: 6.0.0 -> 6.0.1 (cherry picked from commit 92c45083e54fa06c1c54de593e4df83100e80e01) --- pkgs/development/libraries/arrow-cpp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 36e98bde7030..7182a5f76786 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -53,8 +53,8 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "a60b715263d9bbf7e744527fb0c084b693f58043"; - hash = "sha256-Dz1dCV0m5Y24qzXdVaqrZ7hK3MRSb4GF0PXrjMAsjZU="; + rev = "1d8525e109a12a8c67c489eba48715a199609153"; + hash = "sha256-tesDW/1yRyhZtpLbPvCVEsocs6KtstYofxB5GiSMEFM="; }; parquet-testing = fetchFromGitHub { @@ -67,12 +67,12 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-adJo+egtPr71la0b3IPUywKyDBgZRqaGMfZkXXwfepA="; + hash = "sha256-N4az0t+VTQeLPmj5jS5a7Lqj+irM8HXXo6E8GHucUpQ="; }; sourceRoot = "apache-arrow-${version}/cpp"; From d00785c2a694d6b17b2fd1fa6199d4c6ad338ff6 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 21 Nov 2021 15:07:37 -0500 Subject: [PATCH 161/185] arrow-cpp: fix sandboxed build on darwin (cherry picked from commit c5a0962ddd85dd6ed1794c64f79ba2ba92b1bab0) --- pkgs/development/libraries/arrow-cpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 7182a5f76786..bcf4aeb2ddc0 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs build-support/ substituteInPlace "src/arrow/vendored/datetime/tz.cpp" \ - --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + --replace 'discover_tz_dir();' '"${tzdata}/share/zoneinfo";' ''; cmakeFlags = [ From 4441ec3523ff75abc67408ae1fae7afaa019a580 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 21 Nov 2021 15:47:16 -0500 Subject: [PATCH 162/185] python3Packages.pyarrow: fix sandboxed build on darwin (cherry picked from commit 9fff252dcf573a265bcdac81cfa482fa0b862a7b) --- pkgs/development/python-modules/pyarrow/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index e9510d9552ce..7360cab01f37 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }: +{ lib, stdenv, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }: let _arrow-cpp = arrow-cpp.override { python3 = python; }; @@ -44,6 +44,9 @@ buildPythonPackage rec { # Deselect a parquet dataset test because it erroneously fails to find the # pyarrow._dataset module. "--deselect=pyarrow/tests/parquet/test_dataset.py::test_parquet_dataset_deprecated_properties" + ] ++ lib.optionals stdenv.isDarwin [ + # Requires loopback networking + "--deselect=pyarrow/tests/test_ipc.py::test_socket_" ]; dontUseSetuptoolsCheck = true; From 81d5b0d404200d970f43aca15ac49bec15264918 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 21 Nov 2021 20:54:50 -0500 Subject: [PATCH 163/185] arrow-cpp: build without jemalloc on aarch64-darwin to fix build (cherry picked from commit e3e77ee8a4c116d781273d0b189eaf24046ea4f0) --- pkgs/development/libraries/arrow-cpp/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index bcf4aeb2ddc0..574ba3b12501 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -38,6 +38,7 @@ , zstd , enableShared ? !stdenv.hostPlatform.isStatic , enableFlight ? !stdenv.isDarwin # libnsl is not supported on darwin +, enableJemalloc ? !(stdenv.isAarch64 && stdenv.isDarwin) # boost/process is broken in 1.69 on darwin, but fixed in 1.70 and # non-existent in older versions # see https://github.com/boostorg/process/issues/55 @@ -76,7 +77,7 @@ stdenv.mkDerivation rec { }; sourceRoot = "apache-arrow-${version}/cpp"; - ARROW_JEMALLOC_URL = jemalloc.src; + ${if enableJemalloc then "ARROW_JEMALLOC_URL" else null} = jemalloc.src; ARROW_MIMALLOC_URL = fetchFromGitHub { # From @@ -155,6 +156,7 @@ stdenv.mkDerivation rec { "-DARROW_COMPUTE=ON" "-DARROW_CSV=ON" "-DARROW_DATASET=ON" + "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}" "-DARROW_JSON=ON" "-DARROW_PLASMA=ON" # Disable Python for static mode because openblas is currently broken there. From 67f8d1befb8fee18aca4f0ed0de301208c845e9e Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 22 Nov 2021 06:01:53 -0500 Subject: [PATCH 164/185] parquet-tools: fix tests for arrow-cpp 6.0.1 (cherry picked from commit ebe33362a84dcbec201500088c1ccfccb65e89cb) --- pkgs/tools/misc/parquet-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix index 0ba909e1f602..46155dcb3323 100644 --- a/pkgs/tools/misc/parquet-tools/default.nix +++ b/pkgs/tools/misc/parquet-tools/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { --replace 'thrift = "^0.13.0"' 'thrift = "*"' \ --replace 'halo = "^0.0.29"' 'halo = "*"' substituteInPlace tests/test_inspect.py \ - --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version 6.0.0" \ + --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \ --replace "serialized_size: 2222" "serialized_size: 2221" ''; From 56710e1546ae5f1f226dda88dc38bcebd1065a51 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 28 Nov 2021 17:40:08 +0000 Subject: [PATCH 165/185] python3Packages.pywal: use $TMPDIR in tests darwin hydra can fail to access /tmp (cherry picked from commit 1e3b8e3fd835832864d8038d9d6bb906372a764e) --- .../python-modules/pywal/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix index ccc862f8aa47..2e09573d848c 100644 --- a/pkgs/development/python-modules/pywal/default.nix +++ b/pkgs/development/python-modules/pywal/default.nix @@ -9,24 +9,29 @@ buildPythonPackage rec { sha256 = "1drha9kshidw908k7h3gd9ws2bl64ms7bjcsa83pwb3hqa9bkspg"; }; - preCheck = '' - mkdir tmp - HOME=$PWD/tmp - ''; - patches = [ ./convert.patch ./feh.patch ]; - # Invalid syntax - disabled = !isPy3k; - postPatch = '' substituteInPlace pywal/backends/wal.py --subst-var-by convert "${imagemagick}/bin/convert" substituteInPlace pywal/wallpaper.py --subst-var-by feh "${feh}/bin/feh" ''; + # Invalid syntax + disabled = !isPy3k; + + preCheck = '' + mkdir tmp + HOME=$PWD/tmp + + for f in tests/test_export.py tests/test_util.py ; do + substituteInPlace "$f" \ + --replace '/tmp/' "$TMPDIR/" + done + ''; + meta = with lib; { description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3"; homepage = "https://github.com/dylanaraps/pywal"; From 95293a782b917ebd909df0ad68becb853f10a386 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Sun, 28 Nov 2021 11:04:05 -0800 Subject: [PATCH 166/185] netatalk: fix build (cherry picked from commit 0a9dd29c98c6dd720bfb9e5e6d8a3b551fc71d94) --- pkgs/tools/filesystems/netatalk/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 258b25c3693c..e5e873b9ac56 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python +{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python3 , db, libgcrypt, avahi, libiconv, pam, openssl, acl -, ed, libtirpc, libevent +, ed, libtirpc, libevent, fetchpatch }: stdenv.mkDerivation rec { @@ -15,9 +15,14 @@ stdenv.mkDerivation rec { patches = [ ./no-suid.patch ./omitLocalstatedirCreation.patch + (fetchpatch { + name = "make-afpstats-python3-compatible.patch"; + url = "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch"; + sha256 = "sha256-DAABpYjQPJLsQBhmtP30gA357w0Qn+AsnFgAeyDC/Rg="; + }) ]; - nativeBuildInputs = [ autoreconfHook pkg-config perl python python.pkgs.wrapPython ]; + nativeBuildInputs = [ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ]; buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ]; @@ -46,7 +51,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - buildPythonPath ${python.pkgs.dbus-python} + buildPythonPath ${python3.pkgs.dbus-python} patchPythonScript $out/bin/afpstats ''; From 23df138727c7bdb0a863a2f36d10581090183006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 28 Nov 2021 11:15:22 -0600 Subject: [PATCH 167/185] =?UTF-8?q?pijul:=201.0.0-alpha.55=20=E2=86=92=201?= =?UTF-8?q?.0.0-alpha.56?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit b9f6ee2e2f1cde415b610619e154d6b452583460) --- pkgs/applications/version-management/pijul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index f558eab6b61f..03659e0ba40f 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.55"; + version = "1.0.0-alpha.56"; src = fetchCrate { inherit version pname; - sha256 = "sha256-1nnn0cdDe+WOetGtRe7dMEyuCcbfRHdJWFxQ4bTXebQ="; + sha256 = "zV4F4dbjJ58yGiupUwj5Z0HrKR78Mzch8Zs98YfxSTQ="; }; - cargoSha256 = "sha256-j9xf97qPdhtakIwhAql0/Go5fPxlyWKAVLk5CMBfAbs="; + cargoSha256 = "JQGBTCNu9U2Kq6tc7VT07LEbzLW+jdVWrK5e2qjzGRA="; doCheck = false; nativeBuildInputs = [ pkg-config ]; From e1dd426976cc067d235ae70d81d35f3322497ba3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 27 Nov 2021 21:16:31 +0100 Subject: [PATCH 168/185] vorta: 0.7.8 -> 0.8.2 ChangeLogs: * https://github.com/borgbase/vorta/releases/tag/v0.8.0 * https://github.com/borgbase/vorta/releases/tag/v0.8.1 * https://github.com/borgbase/vorta/releases/tag/v0.8.2 (cherry picked from commit 4aa2320ec14b185e0a601b108c3d970f6bba22c8) --- pkgs/applications/backup/vorta/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 675ebf7d349b..7434c12cba29 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "vorta"; - version = "0.7.8"; + version = "0.8.2"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-qNBswy1dsCE6TEQLr/r7nnZWegDD8BD9pMkcpcuT7Q0="; + sha256 = "sha256-ut4HCfLU/P22y5QbNakTV4d4CnFRxJvn+cnJ0ZGpTlw="; }; nativeBuildInputs = [ wrapQtAppsHook ]; @@ -24,7 +24,6 @@ python3Packages.buildPythonApplication rec { peewee pyqt5 python-dateutil - APScheduler psutil qdarkstyle secretstorage From bb22eb6d8bbfb92504534b6555b4c9fa947b8480 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sun, 28 Nov 2021 03:58:53 +0000 Subject: [PATCH 169/185] rnix-lsp: Use nix 2.4 In e6548105b7ffbcb20d0a091be358165a21b510e2 rnix-lsp switched back to using the default nix because it was moved to 2.4. However, in e3b7448f2301459365d3e6833b9321a6dbf1ae73 the default nix moved back to 2.3.16. As rnix-lsp requires at least nix 2.4 for tests to succeed, the tests started failing --- pkgs/development/tools/rnix-lsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix index 327a93637fc2..d9a8c4bdd592 100644 --- a/pkgs/development/tools/rnix-lsp/default.nix +++ b/pkgs/development/tools/rnix-lsp/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, nix }: +{ lib, fetchFromGitHub, rustPlatform, nix_2_4 }: rustPlatform.buildRustPackage rec { pname = "rnix-lsp"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-Tw05eOIMJj+zX0fqtn6wJwolKNkYqfVuo/WO/WvYu2k="; - checkInputs = [ nix ]; + checkInputs = [ nix_2_4 ]; meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; From 8e6b3914626900ad8f465c3e3541edbb86a95d41 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 29 Nov 2021 08:54:04 +0800 Subject: [PATCH 170/185] Revert "nixos/test/boot: nix verify -> nix store verify" This reverts commit 6a4d2207b12c10b768a70f5d57d7dc2e216414eb. --- nixos/tests/boot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index 9945a1dcd62f..e8440598a822 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -36,7 +36,7 @@ let machine = create_machine(${machineConfig}) machine.start() machine.wait_for_unit("multi-user.target") - machine.succeed("nix store verify --no-trust -r --option experimental-features nix-command /run/current-system") + machine.succeed("nix verify -r --no-trust /run/current-system") with subtest("Check whether the channel got installed correctly"): machine.succeed("nix-instantiate --dry-run '' -A hello") From a9a3b199c8de375067e20c32c70d9991300dfd25 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Mon, 29 Nov 2021 07:00:10 +0100 Subject: [PATCH 171/185] stig: fix build (cherry picked from commit 77e9c5d38c1a218950b31e9c537a3136baf97c99) --- pkgs/applications/networking/p2p/stig/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 8b1a668090b7..d51391e1c4e0 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -44,6 +44,8 @@ python3Packages.buildPythonApplication rec { "--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second" # TestScrollBarWithScrollable.test_wrapping_bug fails "--deselect=tests/tui_test/scroll_test.py::TestScrollBarWithScrollable::test_wrapping_bug" + # https://github.com/rndusr/stig/issues/214 + "--deselect=tests/completion_test/classes_test.py::TestCandidates::test_candidates_are_sorted_case_insensitively" ] ++ lib.optionals stdenv.isDarwin [ "--deselect=tests/client_test/aiotransmission_test/api_torrent_test.py" "--deselect=tests/client_test/aiotransmission_test/rpc_test.py" From 55ee221efb0a47f5feadd5ce4d76e9eb05e45b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 28 Nov 2021 18:02:36 +0100 Subject: [PATCH 172/185] frogatto: 2021-05-24 -> 2021-11-23 And fix build (cherry picked from commit 873042271ad597dd77c95d380f75f05f6185249e) --- pkgs/games/frogatto/engine.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index 22aab537c217..9e8ee6fe8dd8 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -4,21 +4,16 @@ stdenv.mkDerivation { pname = "anura-engine"; - version = "unstable-2021-05-24"; + version = "unstable-2021-11-23"; src = fetchFromGitHub { owner = "anura-engine"; repo = "anura"; - rev = "ed50bbfa68a4aa09438d95d39103ec39156d438f"; - sha256 = "0bk0qklk9wwx3jr2kbrmansccn1nj962v5n2vlb5hxsrcv96s3dg"; + rev = "816425df31624066e2815e26a25b1c5d3d355cb4"; + sha256 = "1k7fnfgz003gcbyygv4aakhkkz3w3z9nyz7dlwz01xa6122zqyir"; fetchSubmodules = true; }; - postPatch = '' - substituteInPlace src/sys.cpp \ - --replace mallinfo2 mallinfo - ''; - nativeBuildInputs = [ which pkg-config ]; From 05bcb2956426e1c8547ab065d0ec93b90520d10c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 22 Nov 2021 07:38:45 +0100 Subject: [PATCH 173/185] =?UTF-8?q?compcert:=203.9=20=E2=86=92=203.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enable for Coq 8.14 Use default version of OCaml (instead of 4.05) VST is not ready for CompCert 3.10, so it still uses 3.9 (cherry picked from commit fa22c7cda37ad4c1fd7056e0b86d03b273699277) --- pkgs/development/coq-modules/compcert/default.nix | 3 ++- pkgs/top-level/coq-packages.nix | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 3b94a8087d3f..253b710048d4 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -16,12 +16,13 @@ let compcert = mkCoqDerivation rec { defaultVersion = with versions; switch coq.version [ { case = range "8.8" "8.11"; out = "3.8"; } - { case = range "8.12" "8.13"; out = "3.9"; } + { case = range "8.12" "8.14"; out = "3.10"; } ] null; release = { "3.8".sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; "3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb"; + "3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index bf5b65f93885..38599e3646cc 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -24,7 +24,6 @@ let Cheerios = callPackage ../development/coq-modules/Cheerios {}; CoLoR = callPackage ../development/coq-modules/CoLoR {}; compcert = callPackage ../development/coq-modules/compcert { - ocamlPackages = ocamlPackages_4_05; inherit fetchpatch makeWrapper coq2html lib stdenv; }; coq-bits = callPackage ../development/coq-modules/coq-bits {}; @@ -95,7 +94,9 @@ let topology = callPackage ../development/coq-modules/topology {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; - VST = callPackage ../development/coq-modules/VST {}; + VST = callPackage ../development/coq-modules/VST { + compcert = self.compcert.override { version = "3.9"; }; + }; zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {}; filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; From 9d5275d015a9973b3434ab771e36b58d9fecabd8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 22 Nov 2021 18:43:25 +0000 Subject: [PATCH 174/185] =?UTF-8?q?coqPackages.coqhammer:=201.3.1=20?= =?UTF-8?q?=E2=86=92=201.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit e5f41e735d8e6b41f27dd3dd7cf40cd740b8d6f2) --- pkgs/development/coq-modules/coqhammer/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 93582745564e..7cb859b202a2 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -5,13 +5,19 @@ with lib; mkCoqDerivation { pname = "coqhammer"; owner = "lukaszcz"; defaultVersion = with versions; switch coq.coq-version [ - { case = "8.13"; out = "1.3.1-coq8.13"; } - { case = "8.12"; out = "1.3.1-coq8.12"; } - { case = "8.11"; out = "1.3.1-coq8.11"; } - { case = "8.10"; out = "1.3.1-coq8.10"; } + { case = "8.14"; out = "1.3.2-coq8.14"; } + { case = "8.13"; out = "1.3.2-coq8.13"; } + { case = "8.12"; out = "1.3.2-coq8.12"; } + { case = "8.11"; out = "1.3.2-coq8.11"; } + { case = "8.10"; out = "1.3.2-coq8.10"; } { case = "8.9"; out = "1.1.1-coq8.9"; } { case = "8.8"; out = "1.1-coq8.8"; } ] null; + release."1.3.2-coq8.14".sha256 = "sha256:1pvs4p95lr31jb86f33p2q9v8zq3xbci1fk6s6a2g2snfxng1574"; + release."1.3.2-coq8.13".sha256 = "sha256:0krsm8qj9lgfbggxv2jhkbk3vy2cz63qypnarnl31fdmpykchi4b"; + release."1.3.2-coq8.12".sha256 = "sha256:08mnr13lrdnpims6kf8pk6axf4s8qqs0a71hzg3frkx21d6nawhh"; + release."1.3.2-coq8.11".sha256 = "sha256:1z54lmr180rdkv549f0dygxlmamsx3fygvsm0d7rz9j88f2z8kc5"; + release."1.3.2-coq8.10".sha256 = "sha256:08d63ckiwjx07hy5smg5c7a6b3m3a8ra4ljk3z6597633dx85cd0"; release."1.3.1-coq8.13".sha256 = "033j6saw24anb1lqbgsg1zynxi2rnxq7pgqwh11k8r8y3xisz78w"; release."1.3.1-coq8.12".sha256 = "0xy3vy4rv8w5ydwb9nq8y4dcimd91yr0hak2j4kn02svssg1kv1y"; release."1.3.1-coq8.11".sha256 = "0i9nlcayq0ac95vc09d1w8sd221gdjs0g215n086qscqjwimnz8j"; From 877bc00322c7202fe96621cdb1a83b32f09b2f1a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 22 Nov 2021 18:59:37 +0000 Subject: [PATCH 175/185] =?UTF-8?q?obelisk:=200.5.2=20=E2=86=92=200.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 52fc1808c95c9bf82c960ae510714bc06d511364) --- pkgs/development/tools/ocaml/obelisk/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix index d5e9d33d5db6..0d92840a82be 100644 --- a/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -1,12 +1,14 @@ -{ lib, fetchurl, ocamlPackages }: +{ lib, fetchFromGitHub, ocamlPackages }: ocamlPackages.buildDunePackage rec { pname = "obelisk"; - version = "0.5.2"; + version = "0.6.0"; useDune2 = true; - src = fetchurl { - url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz"; - sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6"; + src = fetchFromGitHub { + owner = "Lelio-Brun"; + repo = pname; + rev = "v${version}"; + sha256 = "1jjaqa2b7msl9qd3x7j34vdh1s9alq8hbvzk8a5srb4yyfyim15b"; }; buildInputs = with ocamlPackages; [ menhir re ]; From 045ce94e55b0bc25d8352d4b243ca5c6e56d9931 Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Sun, 28 Nov 2021 22:48:43 +0000 Subject: [PATCH 176/185] nixos/acme: Fix rate limiting of selfsigned services Closes NixOS/nixpkgs#147348 I was able to reproduce this intermittently in the test suite during the tests for HTTPd. Adding StartLimitIntervalSec=0 to disable rate limiting for these services works fine. I added it anywhere there was a ConditionPathExists. (cherry picked from commit be952aba1cff795f61f1608cb265b829c57fcb8e) --- nixos/modules/security/acme.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 88c5774d187c..2815e2593b23 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -77,6 +77,7 @@ let unitConfig = { ConditionPathExists = "!/var/lib/acme/.minica/key.pem"; + StartLimitIntervalSec = 0; }; serviceConfig = commonServiceConfig // { @@ -235,6 +236,7 @@ let unitConfig = { ConditionPathExists = "!/var/lib/acme/${cert}/key.pem"; + StartLimitIntervalSec = 0; }; serviceConfig = commonServiceConfig // { From 4b5602605d400a790833138675336d91da405aeb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 26 Nov 2021 16:22:30 +0100 Subject: [PATCH 177/185] privacyidea: 3.6.2 -> 3.6.3 ChangeLog: https://github.com/privacyidea/privacyidea/blob/v3.6.3/Changelog#L1-L5 * This package still needs `sqlsoup`, so I unmarked it as broken which is fine since it's building with sqlalchemy v1.3. * There's a small difference between the `git`-tag and the PyPI tarball, but it's non-functional[1]. [1] https://github.com/privacyidea/privacyidea/issues/2921 (cherry picked from commit a805549e43843f9f799531fe11cc4a62164e1fd8) --- pkgs/applications/misc/privacyidea/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index b8e4ebf841cd..6757cd3f7fa0 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -22,18 +22,21 @@ let }); werkzeug = self.callPackage ../../../development/python-modules/werkzeug/1.nix { }; flask = self.callPackage ../../../development/python-modules/flask/1.nix { }; + sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: { + meta = meta // { broken = false; }; + }); }; }; in python3'.pkgs.buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-kv6XqsbGkaGEhfNxSOjCe6JbFOJnuqwM8CR/J9lJjks="; + sha256 = "sha256-SsOEmbyEAKU3pdzsyqi5SwDgJMGEAzyCywoio9iFQAA="; fetchSubmodules = true; }; From d6d494513cd9aa5ef5545a96b4507e47216f0422 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 29 Nov 2021 02:03:59 +0100 Subject: [PATCH 178/185] mediawiki: 1.36.1 -> 1.36.2 (cherry picked from commit cd12d81d53de56b50b589bfd71cef8c245c7de88) --- pkgs/servers/web-apps/mediawiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index d321a3ca11e0..6d49632a8328 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediawiki"; - version = "1.36.1"; + version = "1.36.2"; src = with lib; fetchurl { url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "0ymda3x58a7ic4bwhbkxc7rskkwn164nplxzq9g4w9qnmwcqnsg6"; + sha256 = "sha256-xzV93phEnIY1E029gnkGYNcyWSywLL/zV0Nh3zn+4tQ="; }; prePatch = '' From 1131ea96cf8db685349cb61813ffe979dbaf7ee0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 29 Nov 2021 11:31:34 +0100 Subject: [PATCH 179/185] ucx: add optional Cuda support (cherry picked from commit 24fb8db66d32105d05f82f154e4820d079026313) --- pkgs/development/libraries/ucx/default.nix | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 0bb3fe135d66..06c0ada16feb 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -1,8 +1,17 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen -, numactl, rdma-core, libbfd, libiberty, perl, zlib +, numactl, rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin +, enableCuda ? false +, cudatoolkit }: -stdenv.mkDerivation rec { +let + # Needed for configure to find all libraries + cudatoolkit' = symlinkJoin { + inherit (cudatoolkit) name meta; + paths = [ cudatoolkit cudatoolkit.lib ]; + }; + +in stdenv.mkDerivation rec { pname = "ucx"; version = "1.11.2"; @@ -15,7 +24,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook doxygen ]; - buildInputs = [ numactl rdma-core libbfd libiberty perl zlib ]; + buildInputs = [ + libbfd + libiberty + numactl + perl + rdma-core + zlib + ] ++ lib.optional enableCuda cudatoolkit; configureFlags = [ "--with-rdmacm=${rdma-core}" @@ -23,7 +39,7 @@ stdenv.mkDerivation rec { "--with-rc" "--with-dm" "--with-verbs=${rdma-core}" - ]; + ] ++ lib.optional enableCuda "--with-cuda=${cudatoolkit'}"; enableParallelBuilding = true; From a4a2c1be8ed7fc2e3e57f64cbe9bc4f9615124d2 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 24 Nov 2021 22:26:07 -0500 Subject: [PATCH 180/185] python3Packages.qiskit-aqua: disable slow tests These tests were timing out, they pass locally but can overrun the timeout threshold depending on system load and speed. System load shouldn't cause hydra failures, so disabling. (cherry picked from commit c5b6e8a0fd39426e47349524ceb29c1a4d8328c8) --- pkgs/development/python-modules/qiskit-aqua/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index b5bfa729321e..88365e0f8b70 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -111,7 +111,7 @@ buildPythonPackage rec { "qiskit.optimization" ]; pytestFlagsArray = [ - "--timeout=30" + "--timeout=30" # limit test duration to 30 seconds. Some tests previously would run indefinitely "--durations=10" ]; disabledTestPaths = lib.optionals (!withPyscf) [ @@ -169,6 +169,8 @@ buildPythonPackage rec { "test_eoh" "test_qasm_5" "test_uccsd_hf" + "test_lih" + "test_lih_freeze_core" ] ++ lib.optionals (!withPyscf) [ "test_validate" # test/chemistry/test_inputparser.py ]; From a2211453ae12c9f6776431809a149acc4d745180 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Sun, 28 Nov 2021 13:34:51 -0800 Subject: [PATCH 181/185] ncgopher: 0.2.0 -> 0.3.0 (cherry picked from commit 8a69eb87010bfcde3cd23e75472ccb7b7d33f6b0) --- pkgs/applications/networking/ncgopher/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ncgopher/default.nix b/pkgs/applications/networking/ncgopher/default.nix index d96caf372efa..50ad2d312f94 100644 --- a/pkgs/applications/networking/ncgopher/default.nix +++ b/pkgs/applications/networking/ncgopher/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "ncgopher"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "jansc"; repo = "ncgopher"; rev = "v${version}"; - sha256 = "sha256-Yny5zZe5x7/pWda839HcFkHFuL/jl1Q7ykTZzKy871I="; + sha256 = "sha256-1tiijW3q/8zS9437G9gJDzBtxqVE3QUxgw74P7rcv98="; }; - cargoSha256 = "sha256-C4V1WsAUFtr+N64zyBk1V0E8gTM/U54q03J6Nj8ReLk="; + cargoSha256 = "sha256-LA8LjY8oZslGFQhKR8fJ2heYxSBqUnmeejXKRvZXjIs="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ From 22c62c13b58af90d04ecb2a3856e445cbe9562c5 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Mon, 29 Nov 2021 18:57:46 +0100 Subject: [PATCH 182/185] pgbouncer: 1.16.0 -> 1.16.1 (cherry picked from commit dbd39c4d41fb8ef843e1a621dfa47c30e58a3061) --- pkgs/servers/sql/pgbouncer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index e91fa775ddbe..441b99c7bcd6 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "0li66jk1v07bpfmmqzcqjn5vkhglfhwnbncc5bpalg5qidhr38x4"; + sha256 = "1z7p3ghpmbp5qv1bz9s186jn0hfnr300dc5p0hmh6vbnwklpfx08"; }; nativeBuildInputs = [ pkg-config ]; From d62a48f5225b6328c96ce61fefb0191e641ebb29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 24 Nov 2021 13:45:39 +0100 Subject: [PATCH 183/185] xorg.xf86videomach64: drop the ancient driver It doesn't seems worth keeping it alive. Broken by commit 0649fcdf2. (I hope I did this right without regenerating.) (cherry picked from commit 0c0f340c22b504ceba6e646c68b9abae5e716eca) --- pkgs/servers/x11/xorg/default.nix | 15 --------------- pkgs/servers/x11/xorg/tarballs.list | 1 - 2 files changed, 16 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 47d2985a0258..085048ae68dc 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2274,21 +2274,6 @@ lib.makeScope newScope (self: with self; { meta.platforms = lib.platforms.unix; }) {}; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videomach64 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - pname = "xf86-video-mach64"; - version = "6.9.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2"; - sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-mga"; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index cc41317bf0f8..75503b3a7395 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -101,7 +101,6 @@ mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2 From 03080a1f109ca6e61a4fccfae1f742258174807e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 27 Nov 2021 01:15:42 +0000 Subject: [PATCH 184/185] steamPackages.steam-runtime: 0.20210906.1 -> 0.20211102.0 (cherry picked from commit dbda557c643b16b7646615d8e82e39bf607abe0c) --- pkgs/games/steam/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index fc38c2eab99f..8f2398255a41 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt - version = "0.20210906.1"; + version = "0.20211102.0"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "1dkynar5y4q0pi32ihdhl7r81v9jxsb7lhc91mqhy43f6462qz1h"; + sha256 = "sha256-/ve4oVxKQ4uTaTiTg8Qc0Kyb4GRJKGZ5SQVLIyeJSpI="; name = "scout-runtime-${version}.tar.gz"; }; From 9aa248f94adcf3d2a570690c97bea2332c20860e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 28 Nov 2021 17:53:48 +0100 Subject: [PATCH 185/185] `symfony-cli`: bump and support more platforms. (cherry picked from commit 693bc570717c3145b674289a67e6a21f63c834ef) --- .../development/tools/symfony-cli/default.nix | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index b2e8d5ba279b..2eed473bb25a 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -1,13 +1,34 @@ { stdenvNoCC, fetchurl, lib }: -stdenvNoCC.mkDerivation rec { - pname = "symfony-cli"; - version = "4.26.8"; +let + version = "4.26.9"; - src = fetchurl { - url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; - sha256 = "sha256-/9jsdl39TOkuNCB4G7orJH4qR4Spdt7VTsC1jelyLs0="; + srcs = { + x86_64-linux = fetchurl { + url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; + sha256 = "0ivqqrpzbpyzp60bv25scarmvisj401rp7h2s3cxa7d17prja91v"; + }; + + i686-linux = fetchurl { + url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_386.gz"; + sha256 = "0ag5w70bkvj9wgp4yzzy824shj907sa5l20sqcgivi3r5gy0p277"; + }; + + aarch64-linux = fetchurl { + url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_arm64.gz"; + sha256 = "00325xz7xl3bprj5zbg5yhn36jf4n37zlyag10m8zcmq8asa6k51"; + }; + + x86_64-darwin = fetchurl { + url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_darwin_amd64.gz"; + sha256 = "00325xz7xl3bprj5zbg5yhn36jf4n37zlyag10m8zcmq8asa6k51"; + }; }; +in stdenvNoCC.mkDerivation rec { + inherit version; + pname = "symfony-cli"; + + src = srcs.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); dontBuild = true; @@ -24,6 +45,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://symfony.com/download"; license = licenses.unfree; maintainers = with maintainers; [ drupol ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" ]; }; }