From f329d721575dcd0fc4c6a5a00082a4c63b341f46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 01:04:49 +0100 Subject: [PATCH 01/98] python3Packages.fastnumbers: init at 3.2.1 --- .../python-modules/fastnumbers/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/fastnumbers/default.nix diff --git a/pkgs/development/python-modules/fastnumbers/default.nix b/pkgs/development/python-modules/fastnumbers/default.nix new file mode 100644 index 000000000000..12c3175424d3 --- /dev/null +++ b/pkgs/development/python-modules/fastnumbers/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fastnumbers +, fetchFromGitHub +, hypothesis +, pytestCheckHook +, pythonOlder +, typing-extensions +}: + +buildPythonPackage rec { + pname = "fastnumbers"; + version = "3.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "SethMMorton"; + repo = pname; + rev = version; + sha256 = "1v9l5p90y6ygrs0qmgdzxfv2vp1mpfp65snkl9jp6kcy44g3alhp"; + }; + + propagatedBuildInputs = [ + typing-extensions + ]; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + pythonImportsCheck = [ + "fastnumbers" + ]; + + meta = with lib; { + description = "Python module for number conversion"; + homepage = "https://github.com/SethMMorton/fastnumbers"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff164908e448..1239adbbc9c9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2640,6 +2640,8 @@ in { inherit python; }); + fastnumbers = callPackage ../development/python-modules/fastnumbers { }; + fastpair = callPackage ../development/python-modules/fastpair { }; fastparquet = callPackage ../development/python-modules/fastparquet { }; From 1573e35ba0cb5b85dac35aa827ed9bad4775dc15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 01:08:07 +0100 Subject: [PATCH 02/98] python3Packages.natsort: 7.1.1 -> 8.0.0 --- .../python-modules/natsort/default.nix | 53 +++++++++---------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index e7a2a6808a8a..0aad9299f5b9 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -1,48 +1,47 @@ { lib , buildPythonPackage -, pythonOlder +, fastnumbers , fetchPypi -, pytest -, pytest-cov -, pytest-mock -, hypothesis , glibcLocales -, pathlib ? null -, isPy3k +, hypothesis +, PyICU +, pytest-mock +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "natsort"; version = "7.1.1"; + format = "setuptools"; - checkInputs = [ - pytest - pytest-cov - pytest-mock - hypothesis - glibcLocales - ] - # pathlib was made part of standard library in 3.5: - ++ (lib.optionals (pythonOlder "3.4") [ pathlib ]); + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "00c603a42365830c4722a2eb7663a25919551217ec09a243d3399fa8dd4ac403"; }; - # Does not support Python 2 - disabled = !isPy3k; + propagatedBuildInputs = [ + fastnumbers + PyICU + ]; - # testing based on project's tox.ini - # natsort_keygen has pytest mock issues - checkPhase = '' - pytest --doctest-modules natsort - pytest --ignore=tests/test_natsort_keygen.py - ''; + checkInputs = [ + glibcLocales + hypothesis + pytest-mock + pytestCheckHook + ]; - meta = { - description = "Natural sorting for python"; + pythonImportsCheck = [ + "natsort" + ]; + + meta = with lib; { + description = "Natural sorting for Python"; homepage = "https://github.com/SethMMorton/natsort"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From a18ceb42152e65def0cc6213773be821c1941dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= <65870+suhr@users.noreply.github.com> Date: Wed, 10 Nov 2021 07:24:19 +0300 Subject: [PATCH 03/98] alloy: add alloy 6 --- pkgs/development/tools/alloy/default.nix | 44 +++++++++++------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 1dade32ac64d..92f7e8095128 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -1,16 +1,20 @@ { lib, stdenv, fetchurl, jre, makeWrapper, makeDesktopItem }: -let generic = { major, version, src }: - +let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "${nameMajor}-${version}"; - nameMajor = "alloy${major}"; + pname = "alloy${lib.versions.major version}"; + inherit version; + + src = fetchurl { + inherit sha256; + url = "https://github.com/AlloyTools/org.alloytools.alloy/releases/download/v${version}/org.alloytools.alloy.dist.jar"; + }; desktopItem = makeDesktopItem rec { - name = nameMajor; + name = pname; exec = name; icon = name; - desktopName = "Alloy ${major}"; + desktopName = "Alloy ${lib.versions.major version}"; genericName = "Relational modelling tool"; comment = meta.description; categories = "Development;IDE;Education;"; @@ -19,14 +23,14 @@ let generic = { major, version, src }: nativeBuildInputs = [ makeWrapper ]; buildCommand = '' - jar=$out/share/alloy/${nameMajor}.jar + jar=$out/share/alloy/${pname}.jar install -Dm644 ${src} $jar mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/${nameMajor} --add-flags \ - "-jar $jar" + makeWrapper ${jre}/bin/java $out/bin/${pname} --add-flags \ + "-jar $jar" - install -Dm644 ${./icon.png} $out/share/pixmaps/${nameMajor}.png + install -Dm644 ${./icon.png} $out/share/pixmaps/${pname}.png cp -r ${desktopItem}/share/applications $out/share ''; @@ -50,22 +54,14 @@ let generic = { major, version, src }: }; in rec { - alloy4 = let version = "4.2_2015-02-22"; in generic { - major = "4"; - inherit version; - src = fetchurl { - sha256 = "0p93v8jwx9prijpikkgmfdzb9qn8ljmvga5d9wvrkxddccjx9k28"; - url = "http://alloytools.org/download/alloy${version}.jar"; - }; + alloy5 = generic rec { + version = "5.1.0"; + sha256 = "02k9khs4k5nc86x9pp5k3vcb0kiwdgcin46mlap4fycnr673xd53"; }; - alloy5 = let version = "5.1.0"; in generic { - major = "5"; - inherit version; - src = fetchurl { - sha256 = "02k9khs4k5nc86x9pp5k3vcb0kiwdgcin46mlap4fycnr673xd53"; - url = "https://github.com/AlloyTools/org.alloytools.alloy/releases/download/v${version}/org.alloytools.alloy.dist.jar"; - }; + alloy6 = generic rec { + version = "6.0.0"; + sha256 = "sha256-rA7mNxcu0DWkykMyfV4JwFmQqg0HOIcwjjD4jCRxNww="; }; alloy = alloy5; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce0e680125bc..46874715ed32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13777,8 +13777,8 @@ with pkgs; inherit (callPackage ../development/tools/alloy { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }) - alloy4 alloy5 + alloy6 alloy; altair = callPackage ../development/tools/altair-graphql-client { }; From 6e5bd6685580ec5be0895e898ff2e7ef3f6d955d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Nov 2021 08:40:56 -0800 Subject: [PATCH 04/98] python3Packages.graphviz: 0.18 -> 0.18.1 https://github.com/xflr6/graphviz/blob/0.18.1/CHANGES.rst --- .../python-modules/graphviz/default.nix | 4 +- .../python-modules/graphviz/paths.patch | 38 +++++++------------ 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index ac5c3700bb56..11590048851d 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "graphviz"; - version = "0.18"; + version = "0.18.1"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "xflr6"; repo = "graphviz"; rev = version; - sha256 = "sha256-K98CwG+V+EFwzyawVjRwVhbX2FVfoX7dCAD5PXAWTq8="; + sha256 = "sha256-Y3w9btjYvKfcEQGuAzV+o6edJ9VmVcWhc+ICOqy87uM="; }; patches = [ diff --git a/pkgs/development/python-modules/graphviz/paths.patch b/pkgs/development/python-modules/graphviz/paths.patch index 2808cb0bdb48..337435c6bbad 100644 --- a/pkgs/development/python-modules/graphviz/paths.patch +++ b/pkgs/development/python-modules/graphviz/paths.patch @@ -1,8 +1,8 @@ diff --git a/graphviz/backend/dot_command.py b/graphviz/backend/dot_command.py -index d1903e6..6470d11 100644 +index 1e123d1..41e19c2 100644 --- a/graphviz/backend/dot_command.py +++ b/graphviz/backend/dot_command.py -@@ -10,7 +10,7 @@ from . import parameters +@@ -11,7 +11,7 @@ from . import _common __all__ = ['command'] #: :class:`pathlib.Path` of layout command (``Path('dot')``). @@ -38,48 +38,38 @@ index 6d4a4d1..2cc6cd8 100644 kwargs = {'stderr': subprocess.DEVNULL} if quiet else {} subprocess.Popen(cmd, **kwargs) diff --git a/tests/_common.py b/tests/_common.py -index ab93461..7eaca89 100644 +index 87b4cbd..4188beb 100644 --- a/tests/_common.py +++ b/tests/_common.py -@@ -10,7 +10,7 @@ __all__ = ['EXPECTED_DOT_BINARY', 'EXPECTED_DEFAULT_ENCODING', +@@ -14,9 +14,9 @@ __all__ = ['EXPECTED_DOT_BINARY', 'EXPECTED_UNFLATTEN_BINARY', 'as_cwd', 'check_startupinfo', 'StartupinfoMatcher'] --EXPECTED_DOT_BINARY = pathlib.Path('dot') -+EXPECTED_DOT_BINARY = pathlib.Path('@graphviz@/bin/dot') +-EXPECTED_DOT_BINARY = _compat.make_subprocess_arg(pathlib.Path('dot')) ++EXPECTED_DOT_BINARY = _compat.make_subprocess_arg(pathlib.Path('@graphviz@/bin/dot')) + +-EXPECTED_UNFLATTEN_BINARY = _compat.make_subprocess_arg(pathlib.Path('unflatten')) ++EXPECTED_UNFLATTEN_BINARY = _compat.make_subprocess_arg(pathlib.Path('@graphviz@/bin/unflatten')) EXPECTED_DEFAULT_ENCODING = 'utf-8' diff --git a/tests/backend/test_execute.py b/tests/backend/test_execute.py -index 05d6525..78484cb 100644 +index 2cb853a..8093dfe 100644 --- a/tests/backend/test_execute.py +++ b/tests/backend/test_execute.py -@@ -57,6 +57,7 @@ def test_run_check_input_lines_mocked(mocker, sentinel, mock_popen, - mock_sys_stderr.flush.assert_called_once_with() +@@ -15,6 +15,7 @@ def empty_path(monkeypatch): + monkeypatch.setenv('PATH', '') +@pytest.mark.skip(reason='empty $PATH has no effect') @pytest.mark.usefixtures('empty_path') @pytest.mark.parametrize( 'func, args', -diff --git a/tests/backend/test_unflattening.py b/tests/backend/test_unflattening.py -index 033a4d2..7d52689 100644 ---- a/tests/backend/test_unflattening.py -+++ b/tests/backend/test_unflattening.py -@@ -8,7 +8,7 @@ import graphviz - - import _common - --EXPECTED_UNFLATTEN_BINARY = pathlib.Path('unflatten') -+EXPECTED_UNFLATTEN_BINARY = pathlib.Path('@graphviz@/bin/unflatten') - - - @pytest.mark.exe diff --git a/tests/backend/test_viewing.py b/tests/backend/test_viewing.py -index f5acddb..6b34884 100644 +index 59a23d5..f73f905 100644 --- a/tests/backend/test_viewing.py +++ b/tests/backend/test_viewing.py -@@ -25,6 +25,6 @@ def test_view(mocker, mock_platform, mock_popen, mock_startfile, quiet): +@@ -26,6 +26,6 @@ def test_view_mocked(mocker, mock_platform, mock_popen, mock_startfile, quiet): if mock_platform == 'darwin': mock_popen.assert_called_once_with(['open', 'nonfilepath'], **kwargs) elif mock_platform in ('linux', 'freebsd'): From 5346a90b83b92adbe2a1356726b7da6e224938a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 16 Nov 2021 07:54:43 -0800 Subject: [PATCH 05/98] megapixels: 1.4.0 -> 1.4.2 --- pkgs/applications/graphics/megapixels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index 2204ebc745ee..9cb7bb2972ed 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitLab { owner = "postmarketOS"; repo = "megapixels"; rev = version; - sha256 = "sha256-I7eevbIg+DEY9hnvat65J4Kem1FFNZc4XzaQQaewP/4="; + sha256 = "sha256-ebeKbAo03+jeMveySSIz36gbwslWVMRLj+/adW8rlEQ="; }; nativeBuildInputs = [ From 88120a137726a274905a7fc18c8d01888582384a Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 16 Nov 2021 15:59:32 -0800 Subject: [PATCH 06/98] discourse/update.py: use nix-instantiate The interface of `nix eval` is not stable across versions of nix that are currently in the wild, so use the older nix-instantiate command instead. --- pkgs/servers/web-apps/discourse/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index 8352ac09f367..ffdff7bc06a1 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -79,7 +79,7 @@ def _call_nix_update(pkg, version): def _nix_eval(expr: str): nixpkgs_path = Path(__file__).parent / '../../../../' try: - output = subprocess.check_output(['nix', 'eval', '--json', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True) + output = subprocess.check_output(['nix-instantiate', '--strict', '--json', '--eval', '-E', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True) except subprocess.CalledProcessError: return None return json.loads(output) From 090ebba30fbecde536ed31e3cd989104c28ce0c4 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 16 Nov 2021 16:53:15 -0800 Subject: [PATCH 07/98] nix-universal-prefetch: 0.3.0 -> 0.4.0 --- .../package-management/nix-universal-prefetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-universal-prefetch/default.nix b/pkgs/tools/package-management/nix-universal-prefetch/default.nix index 802fc4047bfc..69ebf1c7cd00 100644 --- a/pkgs/tools/package-management/nix-universal-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-universal-prefetch/default.nix @@ -6,13 +6,13 @@ # No gems used, so mkDerivation is fine. stdenv.mkDerivation rec { pname = "nix-universal-prefetch"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "samueldr"; repo = "nix-universal-prefetch"; rev = "v${version}"; - sha256 = "1nmxp6846ip2x3mibys3ymgi0813g18p9szqnsciiib3dbis4kwf"; + sha256 = "sha256-HGn4qHWqpUwlS3yQrD3j5oH0yOlphsoSPD2vkyyRv+0="; }; installPhase = '' From 5ba86837095dda9ff8d4cf494990eea1a33ae1c5 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 19 Nov 2021 15:12:25 +0900 Subject: [PATCH 08/98] thunderbird-bin: 91.3.0 -> 91.3.2 --- .../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 7e899fd18e39b82ec29db402773bd595a7477b1e Mon Sep 17 00:00:00 2001 From: oxalica Date: Fri, 19 Nov 2021 17:04:01 +0800 Subject: [PATCH 09/98] thunderbird: reintroduce buildconfig patch to reduce closure size This (partially) reverts commit 9ea377439ed377d61f9aad1df7e93ee3164beccd. --- .../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 bdae026114bd0fd2e691e61bfdb1f99dd42b8224 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 19 Nov 2021 15:12:44 +0900 Subject: [PATCH 10/98] thunderbird: 91.3.1 -> 91.3.2 --- .../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 e25e4731af5b03537128e75fe39b2964d29cf6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 20 Nov 2021 18:51:07 -0800 Subject: [PATCH 11/98] python3Packages.greeclimate: 0.12.5 -> 1.0.0 --- pkgs/development/python-modules/greeclimate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 2fd95e676c96..3beb08f1bd0d 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "0.12.5"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = version; - sha256 = "sha256-Lu6DxYrK3WgRC09QQXZLIgYSIaWydcEofNiA1PKP8Ek="; + sha256 = "sha256-zaa3Z6w1BdmOV1otoewc1Zpvltnn5QDJHkAVldZCQlY="; }; propagatedBuildInputs = [ From f4441ac4033bc89956e3fcdec419bcfa3de59aab Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 21 Nov 2021 17:16:20 +0100 Subject: [PATCH 12/98] ghostwriter: 2.0.2 -> 2.1.0 --- pkgs/applications/editors/ghostwriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index fdada2e7769a..b828df6d8d41 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - sha256 = "sha256-kNt0IIAcblDJ81ENIkoJuJvrI+F+fdVgWUJ6g1YpjqU="; + sha256 = "sha256-NPuwT0msFvGyS33X7lefdPZZ3AC4pZb1tvmOzzlQlgc="; }; nativeBuildInputs = [ qmake pkg-config qttools ]; From b1c113d7367ca938cd17b3ea700386a523cb7508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 21 Nov 2021 17:49:04 +0100 Subject: [PATCH 13/98] terraform-providers: update --- .../terraform-providers/providers.json | 230 +++++++++--------- 1 file changed, 117 insertions(+), 113 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2f2e143af759..a71f02cf3887 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -10,27 +10,28 @@ "owner": "vancluever", "provider-source-address": "registry.terraform.io/vancluever/acme", "repo": "terraform-provider-acme", - "rev": "v2.5.2", - "sha256": "0yk5yxx8vdfymxggydpzsb2a0iw4n8010wlprz23qg37gb2p26yf", - "vendorSha256": "04zrrn67w30ib0n5s4f31x3nl3h3xz2r522ldkbbx20jy5iabrkk", - "version": "2.5.2" + "rev": "v2.7.0", + "sha256": "0dyzsfazhxjjfkykykz823n0fk2fbl53nwxpv7wvl1zzmg72lk37", + "vendorSha256": "1sw83jxa3kjjqrjv3z1hczlszskc7lk0i4lrnvdnxa6s642i7brl", + "version": "2.7.0" }, "aiven": { "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v2.1.14", - "sha256": "14bfdhn3daygj1v3lm9b3791sx2cd5h0panchpp39h6vrccrpmmk", - "vendorSha256": "1j09bfbld03yxq0vv9ld0xmw5axbza2bwlz01i1gl1v9dprlnbkc", - "version": "2.1.14" + "rev": "v2.3.2", + "sha256": "14ivvb1ql06gxfi6ffg1kg9k9xadds6fgzj9wp2hh3an2rf7v9ym", + "vendorSha256": "0akqbhjz309znzjqm633nk2zbf925l6027n88bb7mgbv1zjxqw9j", + "version": "2.3.2" }, "akamai": { - "owner": "terraform-providers", + "owner": "akamai", "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v0.7.1", - "sha256": "0mg81147yz0m24xqljpw6v0ayhvb4fwf6qwaj7ii34hy2gjwv405", - "version": "0.7.1" + "rev": "v1.8.0", + "sha256": "0jpw16bap4q75dzchimfqgqqkkn3ckw19q9rjfb8zbkvini5ybw1", + "vendorSha256": "sha256-03Q0/YrivaG2fMgIjW6mxWOIdFZ7FKYB8C6DZIGr+/w=", + "version": "1.8.0" }, "alicloud": { "owner": "terraform-providers", @@ -43,10 +44,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/archive", "repo": "terraform-provider-archive", - "rev": "v2.0.0", - "sha256": "1d5n379zyjp2srg43g78a8h33qwcpkfkj7c35idvbyydi35vzlpl", + "rev": "v2.2.0", + "sha256": "11iv6c0bnrp2s69h3b7f238jdnkcjgrihp8c46lhw393ki6aqfhk", "vendorSha256": null, - "version": "2.0.0" + "version": "2.2.0" }, "arukas": { "owner": "terraform-providers", @@ -80,28 +81,28 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.56.0", - "sha256": "0fa61i172maanxmxz28mj7mkgrs9a5bs61mlvb0d5y97lv6pm2xg", - "vendorSha256": "1s22k4b2zq5n0pz6iqbqsf6f7chsbvkpdn432rvyshcryxlklfvl", - "version": "3.56.0" + "rev": "v3.66.0", + "sha256": "1s9bdpadg34wbr0qgiafn86xnaryfdfa5vdbvz6i24dps082gv6y", + "vendorSha256": "1cycfd3vc9980ijfwldgyvx3v003khrcm3qg18928s7k16xaql0b", + "version": "3.66.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v1.4.0", - "sha256": "13y0h8af37gfsjhccbfsnj6kqcn61lr1znmsxipjr5h9ka5lc209", + "rev": "v2.10.0", + "sha256": "1q70kighdgsq1jwwfhcjx6458242lvkczlzjl0mf5j5y7k5g3m42", "vendorSha256": null, - "version": "1.4.0" + "version": "2.10.0" }, "azurerm": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.58.0", - "sha256": "1zy3q5d63pz2rdczcs9xnxzasb2jbzhyg8nbk2r252mdnhx6h9vh", + "rev": "v2.86.0", + "sha256": "0p508qvqh0bg3x80i62i4p3q4nzgq0il651vrcg4c13lwynk2wcn", "vendorSha256": null, - "version": "2.58.0" + "version": "2.86.0" }, "azurestack": { "owner": "hashicorp", @@ -241,27 +242,28 @@ "owner": "poseidon", "provider-source-address": "registry.terraform.io/poseidon/ct", "repo": "terraform-provider-ct", - "rev": "v0.8.0", - "sha256": "1mm86q3rl81dm2yfg2hdf88x8g5mhwwixrxgrffpkjvjqy42a8h7", - "version": "0.8.0" + "rev": "v0.9.1", + "sha256": "1d8q6ffh64v46r80vmbpsgmjw1vg6y26hpq3nz2h5mvqm0fqya9r", + "vendorSha256": "sha256-e/r59hnVRxrSqmQUwYZiN+YCCz+LbxUHGV2MFGcmJn4=", + "version": "0.9.1" }, "datadog": { "owner": "DataDog", "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.2.0", - "sha256": "1qrk40w81qzcmm52gr3ysrh077417cxyh4xy7igwdjfzl85z22mx", - "vendorSha256": "0iphsz6y9gajwmw5rj4yq65azx02ki093agqbqw49rnzdhc6jahr", - "version": "3.2.0" + "rev": "v3.6.0", + "sha256": "00j40m720m2kh0pn4953n8zis78g02ah9yjkcavcjkpxy4p899ma", + "vendorSha256": "1i5ph7p4pj5ph9rkynii50n3npjprrcsmd15i430wpyjxvsjnw8c", + "version": "3.6.0" }, "digitalocean": { "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.2.0", - "sha256": "14v9sh2qqdflzzp5mvkr7hd5c21hch8b8shxiwm0ar4qgdxq3wfy", + "rev": "v2.16.0", + "sha256": "0l67yd7l0s36lwp1hm44d77i7d5019j0ddjzf22aw8cv9xd5fhxw", "vendorSha256": null, - "version": "2.2.0" + "version": "2.16.0" }, "dme": { "owner": "terraform-providers", @@ -274,10 +276,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/dns", "repo": "terraform-provider-dns", - "rev": "v3.0.0", - "sha256": "160dbmg7xg7iyc70f66dphyiysrdbscwya2n28idi8wp5rjx8bid", - "vendorSha256": null, - "version": "3.0.0" + "rev": "v3.2.1", + "sha256": "1zynfwm7hl7pnldjr2nxj0a06j209r62g8zpkasj6zdjscy62rc8", + "vendorSha256": "sha256-D/CD3O/EHIa2GTwmIAZM3e3bFSLMXy4KhAGWeD4i7kI=", + "version": "3.2.1" }, "dnsimple": { "owner": "terraform-providers", @@ -311,10 +313,10 @@ "owner": "phillbaker", "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", - "rev": "v1.5.2", - "sha256": "1yfmlqab2jb679gbns04sdcjfihzsa0dfp7blhfk3v5zhgv1g7ys", - "vendorSha256": "15m9aqb2lqjv6g3k46zyha2m118wpbjrh4ap1bfps0fcxn20qvr5", - "version": "1.5.2" + "rev": "v2.0.0-beta.2", + "sha256": "1pr0vaag0b0i83381pcpxnq5bpjfj80bm6m483rivbaqbxr0dakw", + "vendorSha256": "1w92k895ikrqm9n1hf36wlh9nq278vifl3r14v0rxa8g9awizfdr", + "version": "2.0.0-beta.2" }, "exoscale": { "owner": "terraform-providers", @@ -336,10 +338,10 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v0.34.0", - "sha256": "1za00gzmyxr6wfzzq92m3spi9563pbpjwj24sm95kj34l6mfwpyx", + "rev": "v0.38.0", + "sha256": "1pfwpx83f5v12r9h2a89z8xvqpmwzsadzxx6wh0d1csdkdrr9z1n", "vendorSha256": null, - "version": "0.34.0" + "version": "0.38.0" }, "flexibleengine": { "owner": "terraform-providers", @@ -375,9 +377,10 @@ "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.4.0", - "sha256": "03k3xjhxw70n00dvwd0fkdshff9hnicrah6rm6zqmksb4mb7wji3", - "version": "3.4.0" + "rev": "v3.8.0", + "sha256": "0ha6lp0z3lqdk05fhggdgdz50dm7z6ksn648khp44n7in0c0c5pj", + "vendorSha256": "sha256-tkPenz+gkghIGMYF9iFj1TXUV3NGm/zYGQ3nP2hWdZA=", + "version": "3.8.0" }, "google": { "owner": "hashicorp", @@ -401,10 +404,10 @@ "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.12.0", - "sha256": "0jqm8ql8kams2rh90fwdmv9nnf4npzpxaagm9725nsf0iqn3qlhn", - "vendorSha256": "0pxd3sgpkry7gik6rgfl3cpgawhvgpb0sn1rkhdp9p11iwx7xxbi", - "version": "1.12.0" + "rev": "v1.14.0", + "sha256": "1d8w2a86m1q79f41ypgwg4i4w5269br1yvh437xiypvabajn7yjl", + "vendorSha256": "0gk0hk4f060hbl89ay1r91ayp5mwnc236x5jxvw4sgi2cq7mmns2", + "version": "1.14.0" }, "gridscale": { "owner": "terraform-providers", @@ -424,10 +427,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", - "rev": "v2.1.2", - "sha256": "1385r9wk6mpb9fj53bkq586v8lw2310dim3kgj3pkrc1fssvwj0z", + "rev": "v2.4.1", + "sha256": "1lkkydjmm99qmj9bl498swdil909akznhvlqpwr4m67imwlzi1cy", "vendorSha256": null, - "version": "2.1.2" + "version": "2.4.1" }, "heroku": { "owner": "terraform-providers", @@ -440,10 +443,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/http", "repo": "terraform-provider-http", - "rev": "v2.0.0", - "sha256": "0x6a9qf819g16dj9inyvhwff67xy0ixyy70ck56lkidrldara444", + "rev": "v2.1.0", + "sha256": "1gih0ksrmhz82966c45ad2yv829pcgbvls92cll7r5haqgvx6k79", "vendorSha256": null, - "version": "2.0.0" + "version": "2.1.0" }, "huaweicloud": { "owner": "terraform-providers", @@ -472,10 +475,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.14.0", - "sha256": "1r3y7r0mnbzd7xk6d5f7pvysl3p8vl5i5phya89dfwrk2x9xyw21", - "vendorSha256": null, - "version": "1.14.0" + "rev": "v1.36.0", + "sha256": "09lhxh1cmg1k939gaksaqx11j06f971s1091wk03vivgfzrjy3hn", + "vendorSha256": "sha256-IjCLN/7EKenJbbHfBnRJh1LT3Ym/R2yEu+7zCnJ8Giw=", + "version": "1.36.0" }, "icinga2": { "owner": "terraform-providers", @@ -523,10 +526,10 @@ "owner": "Mongey", "provider-source-address": "registry.terraform.io/Mongey/kafka", "repo": "terraform-provider-kafka", - "rev": "v0.3.3", - "sha256": "10il2mmsrk27zgzdkwn495sfhlad2nnc2xa7qzn7rlqzh92bb8rb", - "vendorSha256": "1gxx561s7jghiq6kqb2nns52bbcp0ks2dylrb1lvy7g2798cpspf", - "version": "0.3.3" + "rev": "v0.4.1", + "sha256": "0k1vrd2h7d01ypyhs2q1x83nnmiivglwsbrmwrj4k750x2wniygq", + "vendorSha256": "06n2xpic0lmb81rbkx39avz6zgnspmi6xv69kfzdvx7q3zpf7w4s", + "version": "0.4.1" }, "kafka-connect": { "owner": "Mongey", @@ -541,10 +544,10 @@ "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.1.1", - "sha256": "0qh0y1j3y5hzcr8h8wzralv7h8dmrg8jnjccz0fzcmhbkazfrs4p", - "vendorSha256": "0il4rvwa23zghrq0b8qrzgxyjy0211v9z2a4ln2xmlhcz0105zg8", - "version": "3.1.1" + "rev": "v3.6.0", + "sha256": "1lrnzfjrw0yn4hsklhikf75n6drra7nljlzxf2asfkfaiwgcik99", + "vendorSha256": "17v5h5s2vijfx5yxhindr30g8ilmz7hamkxhmlk0zg5qb80mzqc1", + "version": "3.6.0" }, "ksyun": { "owner": "terraform-providers", @@ -557,10 +560,10 @@ "owner": "gavinbunney", "provider-source-address": "registry.terraform.io/gavinbunney/kubectl", "repo": "terraform-provider-kubectl", - "rev": "v1.10.0", - "sha256": "1w8g47dh77i7bhvxwysn7ldrcxl999sivxc7ws71ly5mnsljhhz0", - "vendorSha256": "1qrw2mg8ik2n6xlrnbcrgs9zhr9mwh1niv47kzhbp3mxvj5vdskk", - "version": "1.10.0" + "rev": "v1.13.1", + "sha256": "0jm6zri6j3wdgwg8wixfh6w8il3vnqmwlbpa6scbfa8zq71qi1a0", + "vendorSha256": "1ahxhb6ws1mq4x7nbww8di0b19z6669gn18scqipvxcvmsihfx4m", + "version": "1.13.1" }, "kubernetes": { "owner": "hashicorp", @@ -633,10 +636,10 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", - "rev": "v3.0.0", - "sha256": "08h1h0rpaxpidhslpq1i4bmc6i48rwcg7fsvwgqc202l5m7yk3wd", + "rev": "v3.2.0", + "sha256": "07qdgxvdk564psb4v5d8saaak2037y04b3cj2p09m18fbam8cpry", "vendorSha256": null, - "version": "3.0.0" + "version": "3.2.0" }, "metalcloud": { "owner": "terraform-providers", @@ -732,10 +735,10 @@ "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/oci", "repo": "terraform-provider-oci", - "rev": "v4.49.0", - "sha256": "1s1gfnj3pi3q11jrdc2qxz9ccdk549nki0qkcnd0s7lxac8xzyfh", + "rev": "v4.53.0", + "sha256": "0vbi8k6mvcwvmjrs7walw1gfam77simvcr89gmh84jagvz0mngbw", "vendorSha256": null, - "version": "4.49.0" + "version": "4.53.0" }, "okta": { "owner": "terraform-providers", @@ -776,10 +779,10 @@ "owner": "terraform-provider-openstack", "provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack", "repo": "terraform-provider-openstack", - "rev": "v1.43.1", - "sha256": "0n6r88p3a6p8p0gjys2r1kcgkwq450jmyd741g45lxmaf3jz2ynb", - "vendorSha256": "0k4srszs8xgf8gz4fa7ysqyww52d7kvqy6zf22f1gkcjyiks9pl7", - "version": "1.43.1" + "rev": "v1.45.0", + "sha256": "0r769ckswcz6q3qmdxkvhqkq77x9qlv3359lvaplmkilk7zhpvcj", + "vendorSha256": "1wcls4kc19wy2nkwzrc1zc2lrlazfqr6dmfvzv9andldvd8swspg", + "version": "1.45.0" }, "opentelekomcloud": { "owner": "terraform-providers", @@ -806,10 +809,10 @@ "owner": "ovh", "provider-source-address": "registry.terraform.io/ovh/ovh", "repo": "terraform-provider-ovh", - "rev": "v0.15.0", - "sha256": "1cmcfg9vq8cl98d5xambm5hr516b9pblm06y1py9v7msmfh3g09i", + "rev": "v0.16.0", + "sha256": "0vvxcm4ff6zw5ngwq9cia2ifjg8a2adyf66dyc2d8lavvfld22v9", "vendorSha256": null, - "version": "0.15.0" + "version": "0.16.0" }, "packet": { "owner": "packethost", @@ -843,10 +846,10 @@ "owner": "cyrilgdn", "provider-source-address": "registry.terraform.io/cyrilgdn/postgresql", "repo": "terraform-provider-postgresql", - "rev": "v1.8.1", - "sha256": "07qaiy3vmz179am1qrxwvrk7xpraaa8g0hf49bj54pw7nkrmaixq", + "rev": "v1.14.0", + "sha256": "08z8i2y4qmq7zd50hjaiz6vazwb9yszm1c0mxc87sxayj0mcyl6r", "vendorSha256": null, - "version": "1.8.1" + "version": "1.14.0" }, "powerdns": { "owner": "terraform-providers", @@ -873,10 +876,10 @@ "owner": "cyrilgdn", "provider-source-address": "registry.terraform.io/cyrilgdn/rabbitmq", "repo": "terraform-provider-rabbitmq", - "rev": "v1.5.1", - "sha256": "1yxvhzrp63wv5zbzj3ma2745g1marpj32b5h41ha27h0i42498ky", - "vendorSha256": null, - "version": "1.5.1" + "rev": "v1.6.0", + "sha256": "0src4d032z3mpv10fgya2izqm8qfdgr87rfhpnld1r90yvxqgnl2", + "vendorSha256": "sha256-wbnjAM2PYocAtRuY4fjLPGFPJfzsKih6Q0YCvFyMulQ=", + "version": "1.6.0" }, "rancher": { "owner": "terraform-providers", @@ -965,10 +968,10 @@ "owner": "scottwinkler", "provider-source-address": "registry.terraform.io/scottwinkler/shell", "repo": "terraform-provider-shell", - "rev": "v1.6.0", - "sha256": "0jxb30vw93ibnwz8nfqapac7p9r2famzvsf2h4nfbmhkm6mpan4l", - "vendorSha256": "1p2ja6cw3dl7mx41svri6frjpgb9pxsrl7sq0rk1d3sviw0f88sg", - "version": "1.6.0" + "rev": "v1.7.10", + "sha256": "15pw8i1j47ppwrrh1gpfdkba54zab50ziqfqsc17pmv2gisq8d9d", + "vendorSha256": "0d76xpzfba4xxxafgw0k2dkm22xpzgsa2bf53jwrgwyfvjgvj41c", + "version": "1.7.10" }, "signalfx": { "owner": "terraform-providers", @@ -1067,18 +1070,19 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/time", "repo": "terraform-provider-time", - "rev": "v0.6.0", - "sha256": "0fb81hisjicib9rzbn51jqfrchyjd3hzq98adnf22cbra8wlnxlm", - "version": "0.6.0" + "rev": "v0.7.2", + "sha256": "02b7l65civmphhdax05ajvbfm2ilqf421di1p3vj1zysz194wgl2", + "vendorSha256": "sha256-oBgHd0KTAdlnAZZZdT1FOzcfC0afdIKoDEIwx/rMxRk=", + "version": "0.7.2" }, "tls": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tls", "repo": "terraform-provider-tls", - "rev": "v3.0.0", - "sha256": "1p9d5wrr4xwf2i930zlcarm1zl8ysj3nyc6rrbhpxk04kr6ap0wz", + "rev": "v3.1.0", + "sha256": "0g2bgvw02ydwgb6blica5a139crnyp4hdhzxf433n3fflwyvl6r1", "vendorSha256": null, - "version": "3.0.0" + "version": "3.1.0" }, "triton": { "owner": "terraform-providers", @@ -1112,10 +1116,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v2.24.1", - "sha256": "1xk14q06js774lqyylkbp53dnlsbgh3vi38mqqmndh80xigs6d99", - "vendorSha256": "1ksla455qfgxpk2dmq3pg52nyyw3v0bg6fm5s60j6cb0lzvjbq48", - "version": "2.24.1" + "rev": "v3.0.0", + "sha256": "0k6wwkjxj9ywv16713k6r3ybni9041jx0y0ma7ygcxwk3mciac1z", + "vendorSha256": "03l8bk9jsqf4c7gv0hs1rli7wmlcvpdxmxhra9vndnz6g0jvkvyx", + "version": "3.0.0" }, "vcd": { "owner": "terraform-providers", @@ -1142,10 +1146,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", - "rev": "v2.0.1", - "sha256": "0ah3bi4zpg8j59v4bj9a8vyknpnyl1g8bx4qyfwwz4gnqp9m4anr", + "rev": "v2.0.2", + "sha256": "0ncl2vs6gcx9wm710hg575hqinkg45ds73n209xwdbpxlbv8qb7m", "vendorSha256": null, - "version": "2.0.1" + "version": "2.0.2" }, "vthunder": { "owner": "terraform-providers", From d3c7e5801f572697f0483436dff80fc4ffa1658d Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 21 Nov 2021 18:35:38 +0100 Subject: [PATCH 14/98] imagemagick: 7.1.0-14 -> 7.1.0-15 --- 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 257206b4f27e..9ca6fa912fe6 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-14"; + version = "7.1.0-15"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-w4h4KEfmDC/dDgtk7xgEnIYvSfPlKfsvdFhx43Tn9GA="; + sha256 = "sha256-M5BhCb5caknohwk0oncJBCBJs32p0EdNs4dNqRfDRYc="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 4a5127954cf6b43dfd4e6298ced8559e011509dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 21 Nov 2021 18:45:15 +0100 Subject: [PATCH 15/98] terraform-providers.sops: set provider-source-address --- .../networking/cluster/terraform-providers/providers.json | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a71f02cf3887..eda196530aab 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -996,6 +996,7 @@ }, "sops": { "owner": "carlpett", + "provider-source-address": "registry.terraform.io/carlpett/sops", "repo": "terraform-provider-sops", "rev": "v0.5.1", "sha256": "1x32w1qw46rwa8bjhkfn6ybr1dkbdqk0prlm0bnwn3gvvj0hc7kh", From d06436f798cdc47c3570d17773a4081475ef608b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Nov 2021 00:12:07 +0100 Subject: [PATCH 16/98] python3Packages.pep440: init at 0.1.0 --- .../python-modules/pep440/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pep440/default.nix diff --git a/pkgs/development/python-modules/pep440/default.nix b/pkgs/development/python-modules/pep440/default.nix new file mode 100644 index 000000000000..83187327af17 --- /dev/null +++ b/pkgs/development/python-modules/pep440/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pep440"; + version = "0.1.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "m1H/yqqDiFrj6tmD9jo8nDakCBZxkBPq/HtSOXMH4ZQ="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pep440" + ]; + + meta = with lib; { + description = "Python module to check whether versions number match PEP 440"; + homepage = "https://github.com/Carreau/pep440"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87b06b9eb148..ff2d47073c71 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5608,6 +5608,8 @@ in { pep257 = callPackage ../development/python-modules/pep257 { }; + pep440 = callPackage ../development/python-modules/pep440 { }; + pep517 = callPackage ../development/python-modules/pep517 { }; pep8 = callPackage ../development/python-modules/pep8 { }; From 44bd0265ba2fa225ca5bc2d13004190f43a0bb58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Nov 2021 00:20:38 +0100 Subject: [PATCH 17/98] python3Packages.setupmeta: init at 3.3.0 --- .../python-modules/setupmeta/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/setupmeta/default.nix diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix new file mode 100644 index 000000000000..07b521ee9495 --- /dev/null +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, git +, mock +, pep440 +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "setupmeta"; + version = "3.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "codrsquad"; + repo = pname; + rev = "v${version}"; + sha256 = "21hABRiY8CTKkpFjePgBAtjs4/G5eFS3aPNMCBC41CY="; + }; + + checkInputs = [ + git + mock + pep440 + pytestCheckHook + setuptools-scm + ]; + + disabledTests = [ + # Tests want to scan site-packages + "test_check_dependencies" + "test_scenario" + "test_git_versioning" + ]; + + pythonImportsCheck = [ + "setupmeta" + ]; + + meta = with lib; { + description = "Python module to simplify setup.py files"; + homepage = "https://github.com/codrsquad/setupmeta"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff2d47073c71..133ee6325e80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8509,6 +8509,8 @@ in { setproctitle = callPackage ../development/python-modules/setproctitle { }; + setupmeta = callPackage ../development/python-modules/setupmeta { }; + setuptools-declarative-requirements = callPackage ../development/python-modules/setuptools-declarative-requirements { }; setuptools-git = callPackage ../development/python-modules/setuptools-git { }; From 3aa5d80be94d37b39d9a87a726f7b9226d46162d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Nov 2021 00:22:48 +0100 Subject: [PATCH 18/98] stacs: init at 0.2.0 --- pkgs/tools/security/stacs/default.nix | 42 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/tools/security/stacs/default.nix diff --git a/pkgs/tools/security/stacs/default.nix b/pkgs/tools/security/stacs/default.nix new file mode 100644 index 000000000000..352c217b76a4 --- /dev/null +++ b/pkgs/tools/security/stacs/default.nix @@ -0,0 +1,42 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "stacs"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "stacscan"; + repo = pname; + rev = version; + sha256 = "00ZYdpJktqUXdzPcouHyZcOQyFm7jdFNVuDqsufOviE="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setupmeta + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + pydantic + typing-extensions + yara-python + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "stacs" + ]; + + meta = with lib; { + description = "Static token and credential scanner"; + homepage = "https://github.com/stacscan/stacs"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d022b844475c..6a35a13b741c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3543,6 +3543,8 @@ with pkgs; ssmsh = callPackage ../tools/admin/ssmsh { }; + stacs = callPackage ../tools/security/stacs { }; + stagit = callPackage ../development/tools/stagit { }; starboard = callPackage ../applications/networking/cluster/starboard { }; From 5ff62e34a64442fb1ba9bf0d6b7f8b2e4648537e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Nov 2021 00:36:40 +0100 Subject: [PATCH 19/98] boofuzz: init at 0.4.0 --- pkgs/tools/security/boofuzz/default.nix | 54 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/tools/security/boofuzz/default.nix diff --git a/pkgs/tools/security/boofuzz/default.nix b/pkgs/tools/security/boofuzz/default.nix new file mode 100644 index 000000000000..353758c3d5f9 --- /dev/null +++ b/pkgs/tools/security/boofuzz/default.nix @@ -0,0 +1,54 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "boofuzz"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "jtpereyda"; + repo = pname; + rev = "v${version}"; + sha256 = "4WtTZ2S2rC2XXN0HbiEht9NW0JXcPnpp66AH67F88yk="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + attrs + click + colorama + flask + funcy + future + psutil + pyserial + pydot + six + tornado + ]; + + checkInputs = with python3.pkgs; [ + mock + netifaces + pytest-bdd + pytestCheckHook + ]; + + disabledTests = [ + # Tests require socket access + "test_raw_l2" + "test_raw_l3" + ]; + + pythonImportsCheck = [ + "boofuzz" + ]; + + meta = with lib; { + description = "Network protocol fuzzing tool"; + homepage = "https://github.com/jtpereyda/boofuzz"; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d022b844475c..42f07f5ba723 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3818,6 +3818,8 @@ with pkgs; bomutils = callPackage ../tools/archivers/bomutils { }; + boofuzz= callPackage ../tools/security/boofuzz { }; + bsdbuild = callPackage ../development/tools/misc/bsdbuild { }; bsdiff = callPackage ../tools/compression/bsdiff { }; From 645cd20f666b4271b25474b361f82d3571a45bd0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Nov 2021 00:49:35 +0100 Subject: [PATCH 20/98] chopchop: init at 1.0.0 --- pkgs/tools/security/chopchop/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/chopchop/default.nix diff --git a/pkgs/tools/security/chopchop/default.nix b/pkgs/tools/security/chopchop/default.nix new file mode 100644 index 000000000000..10ac9e7f4a77 --- /dev/null +++ b/pkgs/tools/security/chopchop/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "chopchop"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "michelin"; + repo = "ChopChop"; + rev = "v${version}"; + sha256 = "qSBQdcS6d0tctSHRbkY4T7s6Zj7xI2abaPUvNKh1M2E="; + }; + + vendorSha256 = "UxWARWOFp8AYKEdiJwRZNwFrphgMTJSZjnvktTNOsgU="; + + meta = with lib; { + description = "CLI to search for sensitive services/files/folders"; + homepage = "https://github.com/michelin/ChopChop"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d022b844475c..2704c5dfa02f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2515,6 +2515,8 @@ with pkgs; chntpw = callPackage ../tools/security/chntpw { }; + chopchop = callPackage ../tools/security/chopchop { }; + cliphist = callPackage ../tools/wayland/cliphist { }; clipman = callPackage ../tools/wayland/clipman { }; From 4a82bca53019050767e95fb18ade8f775de0a5d4 Mon Sep 17 00:00:00 2001 From: piegames Date: Mon, 22 Nov 2021 01:37:31 +0100 Subject: [PATCH 21/98] gnomeExtensions: expose gnome41Extensions in top-level --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ec0d104b9bc..713031452df7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30882,7 +30882,9 @@ with pkgs; inherit (callPackage ../desktops/gnome/extensions { }) gnomeExtensions gnome38Extensions - gnome40Extensions; + gnome40Extensions + gnome41Extensions + ; gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { }; From e86fa71ba6785a563ae3c8b7ce4c8cf72f6ce3c0 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Sun, 21 Nov 2021 21:02:04 -0800 Subject: [PATCH 22/98] shaderc: include darwin libtool Signed-off-by: Ana Hobden --- 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 98fd890f48702a0634a74a69c1e60d3c2549a860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 22 Nov 2021 09:50:55 -0300 Subject: [PATCH 23/98] nordic: install the kde related themes --- pkgs/data/themes/nordic/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 41189b21f499..31f9ec44ad36 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + mkdir -p $out/share/themes cp -a Nordic* $out/share/themes rm -r $out/share/themes/*/.gitignore @@ -88,13 +89,23 @@ stdenv.mkDerivation rec { rm -r $out/share/themes/*/gnome-shell/{extensions,*.scss} rm -r $out/share/themes/*/gtk-2.0/{assets.svg,assets.txt,links.fish,render-assets.sh} rm -r $out/share/themes/*/gtk-3.0/{apps,widgets,*.scss} - rm -r $out/share/themes/*/kde rm -r $out/share/themes/*/xfwm4/{assets,render_assets.fish} + + # move kde related contents to appropriate directories + mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,sddm/themes/Nordic} + mv -v $out/share/themes/Nordic/kde/aurorae/* $out/share/aurorae/themes/ + mv -v $out/share/themes/Nordic/kde/colorschemes/* $out/share/color-schemes/ + mv -v $out/share/themes/Nordic/kde/konsole $out/share/ + mv -v $out/share/themes/Nordic/kde/kvantum/* $out/share/Kvantum/ + mv -v $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/ + mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/Nordic/ + rm -rf $out/share/themes/Nordic/kde + runHook postInstall ''; meta = with lib; { - description = "Gtk themes using the Nord color pallete"; + description = "Gtk and KDE themes using the Nord color pallete"; homepage = "https://github.com/EliverLara/Nordic"; license = licenses.gpl3Only; platforms = platforms.all; From ddc86424766e0cd18befea3ca56a2be276c7ef1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 22 Nov 2021 09:53:52 -0300 Subject: [PATCH 24/98] nordic: this git revision was released as stable --- pkgs/data/themes/nordic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 31f9ec44ad36..8d41ce5e38df 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2021-11-19"; + version = "2.1.0"; srcs = [ (fetchFromGitHub { From 0bbd6b822e1898a605c4d31683f7bcdcc4a41410 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 16:29:53 +0100 Subject: [PATCH 25/98] =?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 --- 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 6fac1340ff04..460e76429053 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -185,6 +185,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 bb92dc9a69b1..10125aa62e8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4418,7 +4418,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 bd9179343af415cf45656671d65f18c0e50ee2f5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 16:27:40 +0100 Subject: [PATCH 26/98] =?UTF-8?q?flatpak-builder:=201.0.14=20=E2=86=92=201?= =?UTF-8?q?.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 --- .../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 4041bc18302d1ee695abf606c33490ea2391fbe8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 18 Nov 2021 22:25:34 -0300 Subject: [PATCH 27/98] palemoon: 29.4.1 -> 29.4.2.1 --- .../networking/browsers/palemoon/default.nix | 94 ++++++++++--------- 1 file changed, 50 insertions(+), 44 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 5231b0a0f933..c41e40b6f838 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,37 +1,36 @@ -{ stdenv -, lib -, fetchzip -, writeScript +{ lib +, stdenv , alsa-lib , autoconf213 , cairo -, desktop-file-utils , dbus , dbus-glib +, desktop-file-utils +, fetchzip , ffmpeg , fontconfig , freetype , gnome2 , gnum4 -, gtk2 -, libevent , libGL , libGLU +, libevent , libnotify , libpulseaudio , libstartup_notification +, pango , perl , pkg-config , python2 , unzip , which , wrapGAppsHook +, writeScript , xorg , yasm , zip , zlib -, withGTK3 ? true -, gtk3 +, withGTK3 ? true, gtk3, gtk2 }: # Only specific GCC versions are supported with branding @@ -43,38 +42,16 @@ assert with lib.strings; ( && versionOlder stdenv.cc.version "11" ); -let - libPath = lib.makeLibraryPath [ - ffmpeg - libpulseaudio - ]; - gtkVersion = if withGTK3 then "3" else "2"; -in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.1"; + version = "29.4.2.1"; src = fetchzip { - url = "http://archive.palemoon.org/source/palemoon-${version}-source.tar.xz"; - stripRoot = false; - sha256 = "0kb9yn1q8rrmnlsyvxvv2gdgyyf12g6rxlyh82lmc0gysvd4qd2c"; + name = "${pname}-${version}"; + url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz"; + sha256 = "sha256-iTn1jbbsw7u+rVe/1J9yJbS0wi5Rlkcy4rO8nWcXu2I="; }; - passthru.updateScript = writeScript "update-${pname}" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p common-updater-scripts curl libxml2 - - set -eu -o pipefail - - # Only release note announcement == finalized release - version="$( - curl -s 'http://www.palemoon.org/releasenotes.shtml' | - xmllint --html --xpath 'html/body/table/tbody/tr/td/h3/text()' - 2>/dev/null | head -n1 | - sed 's/v\(\S*\).*/\1/' - )" - update-source-version ${pname} "$version" - ''; - nativeBuildInputs = [ autoconf213 desktop-file-utils @@ -99,12 +76,13 @@ stdenv.mkDerivation rec { freetype gnome2.GConf gtk2 - libevent libGL libGLU + libevent libnotify libpulseaudio libstartup_notification + pango zlib ] ++ (with xorg; [ @@ -118,10 +96,16 @@ stdenv.mkDerivation rec { pixman xorgproto ]) - ++ lib.optional withGTK3 gtk3; + ++ lib.optionals withGTK3 [ + gtk3 + ]; enableParallelBuilding = true; + postPatch = '' + patchShebangs ./mach + ''; + configurePhase = '' runHook preConfigure @@ -135,8 +119,8 @@ stdenv.mkDerivation rec { # Clear this if not a 64bit build _BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"} - # Set GTK Version to 2 or 3 - _GTK_VERSION=${gtkVersion} + # Set GTK Version + _GTK_VERSION=${if withGTK3 then "3" else "2"} # Standard build options for Pale Moon ac_add_options --enable-application=palemoon @@ -212,14 +196,22 @@ stdenv.mkDerivation rec { dontWrapGApps = true; - preFixup = '' - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${libPath}" - ) + preFixup = + let + libPath = lib.makeLibraryPath [ + ffmpeg + libpulseaudio + ]; + in + '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${libPath}" + ) wrapGApp $out/lib/palemoon-${version}/palemoon ''; meta = with lib; { + homepage = "https://www.palemoon.org/"; description = "An Open Source, Goanna-based web browser focusing on efficiency and customization"; longDescription = '' Pale Moon is an Open Source, Goanna-based web browser focusing on @@ -232,10 +224,24 @@ stdenv.mkDerivation rec { experience, while offering full customization and a growing collection of extensions and themes to make the browser truly your own. ''; - homepage = "https://www.palemoon.org/"; changelog = "https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/${version}_Release"; license = licenses.mpl20; maintainers = with maintainers; [ AndersonTorres OPNA2608 ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; + + passthru.updateScript = writeScript "update-${pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl libxml2 + + set -eu -o pipefail + + # Only release note announcement == finalized release + version="$( + curl -s 'http://www.palemoon.org/releasenotes.shtml' | + xmllint --html --xpath 'html/body/table/tbody/tr/td/h3/text()' - 2>/dev/null | head -n1 | + sed 's/v\(\S*\).*/\1/' + )" + update-source-version ${pname} "$version" + ''; } From bcb0427773687c04ee2c1c59e30d86ca31ef8942 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Mon, 22 Nov 2021 09:42:23 -0800 Subject: [PATCH 28/98] libtool: add meta.platforms and make cctools Darwin only Signed-off-by: Ana Hobden --- 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 528716bb8e61dfc443566c9f3345df4b25d72483 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Mon, 22 Nov 2021 12:14:18 -0800 Subject: [PATCH 29/98] ocaml: Fix aarch64-darwin build --- 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 1b6a3b56e622..3aa90733a92d 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"; From 6c142e0215a1f7c6ce9a87ee786336aa28d6825b Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Mon, 22 Nov 2021 15:21:46 -0500 Subject: [PATCH 30/98] maintainers: remove mdlayher from golang team Signed-off-by: Matt Layher --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index fecea9e41483..7cd7fa237d59 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -93,7 +93,6 @@ with lib.maintainers; { cstrahan Frostman kalbasit - mdlayher mic92 orivej rvolosatovs From 3987f21582750fbcb18aa6f1d898f1a8bd0c2b9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Nov 2021 21:55:36 +0100 Subject: [PATCH 31/98] slowlorust: init at 0.1.1 --- pkgs/tools/networking/slowlorust/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/networking/slowlorust/default.nix diff --git a/pkgs/tools/networking/slowlorust/default.nix b/pkgs/tools/networking/slowlorust/default.nix new file mode 100644 index 000000000000..dc98d95828f5 --- /dev/null +++ b/pkgs/tools/networking/slowlorust/default.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "slowlorust"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "MJVL"; + repo = pname; + rev = version; + sha256 = "c4NWkQ/QvlUo1YoV2s7rWB6wQskAP5Qp1WVM23wvV3c="; + }; + + cargoSha256 = "Wu1mm+yJw2SddddxC5NfnMWLr+dplnRxH3AJ1/mTAKM="; + + meta = with lib; { + description = "Lightweight slowloris (HTTP DoS) tool"; + homepage = "https://github.com/MJVL/slowlorust"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b36f2f8da7f6..eb46a6458eab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9492,6 +9492,8 @@ with pkgs; slirp4netns = callPackage ../tools/networking/slirp4netns { }; + slowlorust = callPackage ../tools/networking/slowlorust { }; + slsnif = callPackage ../tools/misc/slsnif { }; slstatus = callPackage ../applications/misc/slstatus { From 17dc5d7faa81b7c3c735ded16a1b24892db93ffb Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 22 Nov 2021 20:24:41 -0300 Subject: [PATCH 32/98] palemoon: factor mozconfig in a new file It makes easier to understand and customize the building. --- .../networking/browsers/palemoon/default.nix | 50 +++---------------- .../networking/browsers/palemoon/mozconfig | 46 +++++++++++++++++ 2 files changed, 53 insertions(+), 43 deletions(-) create mode 100644 pkgs/applications/networking/browsers/palemoon/mozconfig diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index c41e40b6f838..8a257ee626ff 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -112,50 +112,14 @@ stdenv.mkDerivation rec { export MOZCONFIG=$PWD/mozconfig export MOZ_NOSPAM=1 - # Keep this similar to the official .mozconfig file, - # only minor changes for portability are permitted with branding. - # https://developer.palemoon.org/build/linux/ - echo > $MOZCONFIG ' - # Clear this if not a 64bit build - _BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"} + export build64=${lib.optionalString stdenv.hostPlatform.is64bit "1"} + export gtkversion=${if withGTK3 then "3" else "2"} + export xlibs=${lib.makeLibraryPath [ xorg.libX11 ]} + export prefix=$out + export mozmakeflags="-j${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"}" + export autoconf=${autoconf213}/bin/autoconf - # Set GTK Version - _GTK_VERSION=${if withGTK3 then "3" else "2"} - - # Standard build options for Pale Moon - ac_add_options --enable-application=palemoon - ac_add_options --enable-optimize="-O2 -w" - ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION - ac_add_options --enable-jemalloc - ac_add_options --enable-strip - ac_add_options --enable-devtools - ac_add_options --enable-av1 - - ac_add_options --disable-eme - ac_add_options --disable-webrtc - ac_add_options --disable-gamepad - ac_add_options --disable-tests - ac_add_options --disable-debug - ac_add_options --disable-necko-wifi - ac_add_options --disable-updater - - ac_add_options --with-pthreads - - # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding. - ac_add_options --enable-official-branding - export MOZILLA_OFFICIAL=1 - - ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]} - - # - # NixOS-specific adjustments - # - - ac_add_options --prefix=$out - - mk_add_options MOZ_MAKE_FLAGS="-j${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"}" - mk_add_options AUTOCONF=${autoconf213}/bin/autoconf - ' + substituteAll ${./mozconfig} $MOZCONFIG runHook postConfigure ''; diff --git a/pkgs/applications/networking/browsers/palemoon/mozconfig b/pkgs/applications/networking/browsers/palemoon/mozconfig new file mode 100644 index 000000000000..0eab96e58469 --- /dev/null +++ b/pkgs/applications/networking/browsers/palemoon/mozconfig @@ -0,0 +1,46 @@ +# -*- mode: sh; coding: utf-8-unix; fill-column: 80 -*- + +# Mozconfig template file for nixpkgs + +# Keep this similar to the official .mozconfig file, only minor changes for +# portability are permitted with branding. +# https://developer.palemoon.org/build/linux/ + +_BUILD_64=@build64@ + +# Set GTK Version +_GTK_VERSION=@gtkversion@ + +# Standard build options for Pale Moon +ac_add_options --enable-application=palemoon +ac_add_options --enable-optimize="-O2 -w" +ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION +ac_add_options --enable-jemalloc +ac_add_options --enable-strip +ac_add_options --enable-devtools +ac_add_options --enable-av1 + +ac_add_options --disable-eme +ac_add_options --disable-webrtc +ac_add_options --disable-gamepad +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-necko-wifi +ac_add_options --disable-updater + +ac_add_options --with-pthreads + +# Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding. +ac_add_options --enable-official-branding +export MOZILLA_OFFICIAL=1 + +ac_add_options --x-libraries=@xlibs@ + +# +# NixOS-specific adjustments +# + +ac_add_options --prefix=@prefix@ + +mk_add_options MOZ_MAKE_FLAGS=@mozmakeflags@ +mk_add_options AUTOCONF=@autoconf@ From 7727ce7c3bcea49ee389966f659aa3b96394b649 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 23 Nov 2021 00:24:48 +0100 Subject: [PATCH 33/98] Revert "wireguard-tools: allow system resolvconf implementation if available" --- pkgs/tools/networking/wireguard-tools/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index c57b1eb56969..5df98954ae16 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -37,11 +37,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/system/wg-quick@.service \ --replace /usr/bin $out/bin '' + lib.optionalString stdenv.isLinux '' - # we want to allow users to provide their own resolvconf implementation, i.e. the one provided by systemd-resolved for f in $out/bin/*; do - wrapProgram $f \ - --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables ]} \ - --suffix PATH : ${lib.makeBinPath [ openresolv ]} + wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables openresolv ]} done '' + lib.optionalString stdenv.isDarwin '' for f in $out/bin/*; do From 9c390b6b38e7b67df6c25f45dd25746976b09c5f Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 22 Nov 2021 16:10:47 -0800 Subject: [PATCH 34/98] python3Packages.hangups: fix async-timeout --- pkgs/development/python-modules/hangups/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix index fd269f0b69e4..1832803388fc 100644 --- a/pkgs/development/python-modules/hangups/default.nix +++ b/pkgs/development/python-modules/hangups/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "protobuf>=3.1.0,<3.17" "protobuf" \ + --replace "async-timeout>=2,<4" "async-timeout" \ --replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup" ''; From ab0c07470b52cf74bb1b671f80c182f6bde8faf6 Mon Sep 17 00:00:00 2001 From: pasqui23 Date: Tue, 23 Nov 2021 01:31:31 +0000 Subject: [PATCH 35/98] kaffeine: init at 2.0.18 (#143985) Co-authored-by: Sandro --- pkgs/applications/video/kaffeine/default.nix | 50 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/video/kaffeine/default.nix diff --git a/pkgs/applications/video/kaffeine/default.nix b/pkgs/applications/video/kaffeine/default.nix new file mode 100644 index 000000000000..6cbce01f61f6 --- /dev/null +++ b/pkgs/applications/video/kaffeine/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchFromGitLab +, kio +, cmake +, extra-cmake-modules +, libvlc +, libX11 +, kidletime +, kdelibs4support +, libXScrnSaver +, wrapQtAppsHook +, qtx11extras +}: + +stdenv.mkDerivation rec { + pname = "kaffeine"; + version = "2.0.18"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + repo = pname; + owner = "Multimedia"; + rev = "v${version}"; + hash = "sha256-FOaS9gkzkHglbsNBNMwjzbHCNQg3Mbf+9so/Vfbaquc="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + wrapQtAppsHook + ]; + + buildInputs = [ + libvlc + libX11 + kidletime + qtx11extras + kdelibs4support + libXScrnSaver + ]; + + meta = with lib; { + description = "KDE media player"; + homepage = "https://apps.kde.org/kaffeine/"; + license = licenses.gpl2; + maintainers = [ maintainers.pasqui23 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69e5bb861b27..6a965bf7e5c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6697,6 +6697,8 @@ with pkgs; }; kakouneUtils = callPackage ../applications/editors/kakoune/plugins/kakoune-utils.nix { }; + kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { }; + kak-lsp = callPackage ../tools/misc/kak-lsp { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; From 8b8bd0e23effca7cb845e1089de9ceb3d1715690 Mon Sep 17 00:00:00 2001 From: pasqui23 Date: Tue, 23 Nov 2021 01:32:12 +0000 Subject: [PATCH 36/98] systemdgenie: init at 0.99.0 (#143984) --- .../system/systemdgenie/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/system/systemdgenie/default.nix diff --git a/pkgs/applications/system/systemdgenie/default.nix b/pkgs/applications/system/systemdgenie/default.nix new file mode 100644 index 000000000000..ad009be56355 --- /dev/null +++ b/pkgs/applications/system/systemdgenie/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, lib +, cmake +, extra-cmake-modules +, kxmlgui +, fetchFromGitLab +, kdelibs4support +, wrapQtAppsHook +}: +stdenv.mkDerivation rec{ + pname = "systemdgenie"; + version = "0.99.0"; + src = fetchFromGitLab { + domain = "invent.kde.org"; + repo = "SystemdGenie"; + owner = "system"; + rev = "v${version}"; + hash = "sha256-y+A2OuK1ZooPY5W0SsXEb1aaOAJ2b7QSwiumolmAaR4="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; + + buildInputs = [ kxmlgui kdelibs4support ]; + + meta = with lib; { + description = "Systemd management utility"; + homepage = "https://kde.org"; + license = licenses.gpl2; + maintainers = [ maintainers.pasqui23 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a965bf7e5c1..3005ee875883 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9846,6 +9846,8 @@ with pkgs; inherit (xorg) xauth xorgserver; }; + systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { }; + t = callPackage ../tools/misc/t { }; tabnine = callPackage ../development/tools/tabnine { }; From 106286b498496bc824157c2b5e8185dc6c83b4c6 Mon Sep 17 00:00:00 2001 From: Raphael Megzari Date: Tue, 23 Nov 2021 10:36:13 +0900 Subject: [PATCH 37/98] erlang: 24.1.6 -> 24.1.7 (#146999) --- pkgs/development/interpreters/erlang/R24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index 544bfbec5305..b59626e70671 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.1.6"; - sha256 = "sha256-Jh9w3+ft1RZjmb4PriCmHPj0tgkx8LBFjsg1s4BGojs="; + version = "24.1.7"; + sha256 = "sha256-R4rZVMn9AGvOy31eA1dsz2CFMKOG/cXkbLaJtT7zBrU="; } From fd5df16c244dc320a31fb2788153c8a109d81adc Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Sun, 21 Nov 2021 19:54:02 -0800 Subject: [PATCH 38/98] bwbasic: init at 3.20 --- .../interpreters/bwbasic/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/interpreters/bwbasic/default.nix diff --git a/pkgs/development/interpreters/bwbasic/default.nix b/pkgs/development/interpreters/bwbasic/default.nix new file mode 100644 index 000000000000..4fec1cc7b3e4 --- /dev/null +++ b/pkgs/development/interpreters/bwbasic/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, dos2unix, fetchurl, unzip }: + +stdenv.mkDerivation rec { + pname = "bwbasic"; + version = "3.20"; + + src = fetchurl { + url = "mirror://sourceforge/project/bwbasic/bwbasic/version%203.20/bwbasic-3.20.zip"; + sha256 = "1w9r4cl7z1lh52c1jpjragbspi1qn0zb7jhcsldav4gdnzxfw67f"; + }; + + nativeBuildInputs = [ dos2unix unzip ]; + + unpackPhase = '' + unzip $src + ''; + + postPatch = '' + dos2unix configure + patchShebangs configure + chmod +x configure + ''; + + hardeningDisable = [ "format" ]; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with lib; { + description = "Bywater BASIC Interpreter"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ irenes ]; + platforms = platforms.all; + homepage = "https://sourceforge.net/projects/bwbasic/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaf92ebfeffa..086843a0fa43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2296,6 +2296,8 @@ with pkgs; bwm_ng = callPackage ../tools/networking/bwm-ng { }; + bwbasic = callPackage ../development/interpreters/bwbasic { }; + byobu = callPackage ../tools/misc/byobu { # Choices: [ tmux screen ]; textual-window-manager = tmux; From fff44a9c1a1c7fa5c103ea9535dec71ed622f305 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Tue, 23 Nov 2021 05:55:36 +0100 Subject: [PATCH 39/98] slack: 4.21.1 -> 4.22.0 --- .../networking/instant-messengers/slack/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 1e2d87f031e5..5e0175518716 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -45,14 +45,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.21.1"; - x86_64-darwin-sha256 = "1xhhll7mbz3f98xd2pzhyv3a49sam2v9fmvglmsvnkrmqppzsr4g"; + x86_64-darwin-version = "4.22.0"; + x86_64-darwin-sha256 = "094p9vyv56m5qfp9jh2205ijfqcp0dr6bkmiv0wxihy2rg20b5zp"; - x86_64-linux-version = "4.21.1"; - x86_64-linux-sha256 = "0mmpvrg2gfjarhrh0cy6axmhbx8v8rkn51gyp9xhr9ll9zrjpvjq"; + x86_64-linux-version = "4.22.0"; + x86_64-linux-sha256 = "0k84glxp653lxgfv5b65zvvysax7fr3lhsjgq76safk7g7cjc86i"; - aarch64-darwin-version = "4.21.1"; - aarch64-darwin-sha256 = "1rkixwg0b0nqp7wzvm24qskc9q3cl43fqfbkv6i2qkrrhpyr3zqw"; + aarch64-darwin-version = "4.22.0"; + aarch64-darwin-sha256 = "1z2pcgva9ixjx702c1535b4k0xr9fdnfzi5m08xgvabk9x66hqx4"; version = { x86_64-darwin = x86_64-darwin-version; From d2c4e0a3ba7ad7b0b81ea8854b88ea38799b4d2e Mon Sep 17 00:00:00 2001 From: evils <30512529+evils@users.noreply.github.com> Date: Tue, 23 Nov 2021 06:05:27 +0100 Subject: [PATCH 40/98] kicad: 5.1.11 -> 5.1.12 (#145403) very minor change 5.1.11 was never officially released due to a re-tag --- .../science/electronics/kicad/versions.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 463e5b7d8211..31ddacf396cb 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,24 +3,24 @@ { "kicad" = { kicadVersion = { - version = "5.1.11"; + version = "5.1.12"; src = { - rev = "d6b7f2349bcdbc45b223e7fe0460d9f169343209"; - sha256 = "03658kfd313lnvr4jihq1i72g2dfbzba8j1z2y4fxg3vrs54y7a0"; + rev = "84ad8e8a86f13c0697f5cbed8c17977b6545ddc9"; + sha256 = "0kgikchqxds3mp71nkg307mr4c1dgv8akbmksz4w9x8jg4i1mfqq"; }; }; libVersion = { - version = "5.1.11"; + version = "5.1.12"; libSources = { - i18n.rev = "0b8cef6bd08818cc0360f240544733dce509da3f"; + i18n.rev = "0ad3d7e469e31c8868ad83f90e22a9c18f16aa1f"; i18n.sha256 = "0y51l0r62cnxkvpc21732p3cx7pjvaqjih8193502hlv9kv1j9p6"; - symbols.rev = "7d4cbbddceafa1f69858449e16ac7229abef3c9a"; + symbols.rev = "97c0bfdd2f5ebe952bc90c60f080a8e41da60615"; symbols.sha256 = "1zdajim409570xzis53kmrbdcf7000v2vmc90f49h214lrx2zhr2"; - templates.rev = "f4c74f4130c8432399089c8b2dc21319b769bbe9"; + templates.rev = "eca0f632eb76c8f49de4d5a590c83543090d0b7d"; templates.sha256 = "1fbhn1l3j2rwc29aida9b408wif55i23bp9ddcs7dvf83smjm05g"; - footprints.rev = "e53d53ac4a30959b03ed3297d7659ea82244fb45"; + footprints.rev = "b65732f8ebd7ab894fd638f3f2bf4a4e9b24f653"; footprints.sha256 = "0qpii55dgv2gxqg1qq0dngdnbb9din790qi5qv0l6qqrzx843h5s"; - packages3d.rev = "be0ba9377b4ec0f11a4b9aceda150eed93027f72"; + packages3d.rev = "0ddd588650fede09766b704feb15d30bcb6e144f"; packages3d.sha256 = "12w7m5nbk9kcnlnlg4sk1sd7xgb9i2kxfi0jcbd0phs89qyl7wjr"; }; }; From decac5a0d20b05d7b95b9e0e2ad324e4fe7df7ba Mon Sep 17 00:00:00 2001 From: evils <30512529+evils@users.noreply.github.com> Date: Tue, 23 Nov 2021 06:05:57 +0100 Subject: [PATCH 41/98] kicad-unstable: 2021-07-12 -> 6.0.0-rc1 (#142261) * kicad-unstable: 2021-07-12 -> 2021-11-10 with changes to library paths Plugin and Content Manager seems to work (not related to the library paths changes) * kicad-unstable: 2021-11-10 -> 6.0.0-rc1 --- .../science/electronics/kicad/default.nix | 4 ++-- .../science/electronics/kicad/versions.nix | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 9d7b1b7e5636..425234e7f772 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -209,8 +209,8 @@ stdenv.mkDerivation rec { ++ optionals (stable && with3d) [ "--set-default KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ] ++ optionals (!stable) [ - "--set-default KICAD6_FOOTPRINT_DIR ${footprints}/share/kicad/modules" - "--set-default KICAD6_SYMBOL_DIR ${symbols}/share/kicad/library" + "--set-default KICAD6_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" + "--set-default KICAD6_SYMBOL_DIR ${symbols}/share/kicad/symbols" "--set-default KICAD6_TEMPLATE_DIR ${templates}/share/kicad/template" "--prefix KICAD6_TEMPLATE_DIR : ${symbols}/share/kicad/template" "--prefix KICAD6_TEMPLATE_DIR : ${footprints}/share/kicad/template" diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 31ddacf396cb..50a75cdfd094 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,25 +27,25 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2021-07-12"; + version = "6.0.0-rc1"; src = { - rev = "76a6177eb7fc2efe8b5fd522355e70c44a33b150"; - sha256 = "1a94z29if73cnxjx75vkgasm339dasbrjwbg2zk1c35pfygnwrj5"; + rev = "9fb05440b3ef3073613ecdeba6112aeb6b26c4df"; + sha256 = "1j0hd6bpmd80dyvy9mz4n4rr8f849bdwdd4vs8vfbsswf0gxj734"; }; }; libVersion = { - version = "2021-07-12"; + version = "6.0.0-rc1"; libSources = { i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; - symbols.rev = "a6f64c12c9cdea4cda25cdd2c92708e7eb461d46"; - symbols.sha256 = "0j6ng3ysqlxcggjyq3bsgqzg6j50if74q2dpyrdh5pckfqvvmv20"; - templates.rev = "073d1941c428242a563dcb5301ff5c7479fe9c71"; - templates.sha256 = "14p06m2zvlzzz2w74y83f2zml7mgv5dhy2nyfkpblanxawrzxv1x"; - footprints.rev = "1bacc7562198e2a2985df7f2fbcd7620b4fd0d46"; - footprints.sha256 = "1h17q0xpl4k4klg3mafzsbl88wzrg73xjsh8llyni2jzs531545a"; - packages3d.rev = "d8b7e8c56d535f4d7e46373bf24c754a8403da1f"; - packages3d.sha256 = "0dh8ixg0w43wzj5h3164dz6l1vl4llwxhi3qcdgj1lgvrs28aywd"; + symbols.rev = "27b627393a7f2733e965ed82a5533a757789cbb2"; + symbols.sha256 = "0p1qay6h6ibkhcz1b8xszsihi432ddi8jgnan2xr5rl4539c4ydp"; + templates.rev = "8c9ff3dadb9c75cf2932f11c09a46c0c9d84784b"; + templates.sha256 = "0vbjy1v5923942ma0rqcp1dhylhxk1m4vyfxjxw13sizkrpmlwr1"; + footprints.rev = "4ce2242095912e491f1690210d9cb2328363b268"; + footprints.sha256 = "1zx13rrpiamxyv7y27mr5xsdz0d09hpwfgc2j496p3q41q2crlq0"; + packages3d.rev = "1080b6e565e56bae9be46db2278a1542092d7a2d"; + packages3d.sha256 = "0vwcbzq42hzjl4f0zjaswmiff1x59hv64g5n00mx1gl0gwngnyla"; }; }; }; From 74d907ad052d0ebeb67dcda97c6f227de3c5a3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= <238528+smancill@users.noreply.github.com> Date: Tue, 23 Nov 2021 02:10:30 -0300 Subject: [PATCH 42/98] libcanberra-gtk3: mark as unbroken on darwin (#147045) gtk3-x11 was fixed by #132239. --- pkgs/development/libraries/libcanberra/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index e5525a2bd827..91b720303199 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -65,8 +65,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = [ ]; platforms = platforms.unix; - # canberra-gtk-module.c:28:10: fatal error: 'gdk/gdkx.h' file not found - # #include - broken = stdenv.isDarwin && (gtkSupport == "gtk3"); }; } From ebbca75dc2b74d6b68f9a157ac2ec643a7570d19 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 22 Nov 2021 20:43:15 +0100 Subject: [PATCH 43/98] glances: 3.2.3.1 -> 3.2.4.2 --- pkgs/applications/system/glances/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 7c3120f57040..b25065c5f1ff 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib -, defusedxml, future, psutil, setuptools +, defusedxml, future, packaging, psutil, setuptools # Optional dependencies: , bottle, pysnmp , hddtemp @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.2.3.1"; + version = "3.2.4.2"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "0h7y36z4rizl1lyxacq32vpmvbwn9w2nrvrxn791060cksfw4xwd"; + sha256 = "0gql61lrav3f7wbsvgc1d6vf8r0xi5xs9rz9d3sqw3wj5m90w0vq"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): @@ -40,6 +40,7 @@ buildPythonApplication rec { defusedxml future netifaces + packaging psutil pysnmp setuptools From 67c9d4ae0086730668661af469886dfc99f1392e Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 22 Nov 2021 11:14:58 +0100 Subject: [PATCH 44/98] glm: fix aarch64-darwin build by fixing cmake warnings --- pkgs/development/libraries/glm/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index ef8cd49ba297..81b0b47d5ba8 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: stdenv.mkDerivation rec { version = "0.9.9.8"; @@ -11,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-F//+3L5Ozrw6s7t4LrcUmO7sN30ZSESdrPAYX57zgr8="; }; + # https://github.com/g-truc/glm/pull/1055 + # Fix more implicit-int-float-conversion warnings + # (https://github.com/g-truc/glm/pull/986 wasn't enough, and -Werror is used) + patches = [(fetchpatch { + url = "https://github.com/kraj/glm/commit/bd9b5060bc3b9581090d44f15b4e236566ea86a6.patch"; + sha256 = "sha256-QO4o/wV564kJimBcEyr9TWzREEnRJ1n0j0HPojN4pkI="; + })]; + outputs = [ "out" "doc" ]; nativeBuildInputs = [ cmake ]; From 712b402565e53a0e00113e9b617d4edd428d158c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 22 Nov 2021 23:24:50 +0000 Subject: [PATCH 45/98] 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? --- 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 1e3ff0d215c263bb5a0038ea035ab335ad265329 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Nov 2021 09:23:48 +0100 Subject: [PATCH 46/98] tfsec: 0.60.0 -> 0.60.1 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 9d60879d8803..f28df20f1994 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.60.0"; + version = "0.60.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LBU2nXpmktjyy3x5cBGsrCM6k+6BEZaoDybHVrIrVBo="; + sha256 = "sha256-JbEqoPuvfG6SwG+uGsV5vy+d+cs/VoGCntq8oU48+y8="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From e40586575cffec1f8a8fbe20d608f5b6ce0c92fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Nov 2021 09:51:18 +0100 Subject: [PATCH 47/98] python3Packages.opensensemap-api: 0.1.6 -> 0.2.0 --- .../python-modules/opensensemap-api/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/opensensemap-api/default.nix b/pkgs/development/python-modules/opensensemap-api/default.nix index 8311cb6c57e1..56edc136c44f 100644 --- a/pkgs/development/python-modules/opensensemap-api/default.nix +++ b/pkgs/development/python-modules/opensensemap-api/default.nix @@ -1,17 +1,21 @@ { lib -, buildPythonPackage -, fetchPypi , aiohttp , async-timeout +, buildPythonPackage +, fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "opensensemap-api"; - version = "0.1.6"; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e60aVIoKFqo++WJHUYGutugkjB8YgyNQgJbILgAyOOY="; + sha256 = "sha256-KSukSPpSbfbEEqTq4zqqo8OT7ptdPrGy2QyQYjErQWI="; }; propagatedBuildInputs = [ @@ -22,7 +26,9 @@ buildPythonPackage rec { # no tests are present doCheck = false; - pythonImportsCheck = [ "opensensemap_api" ]; + pythonImportsCheck = [ + "opensensemap_api" + ]; meta = with lib; { description = "OpenSenseMap API Python client"; From 8e986f6389393bbbb593c2a34f7139b9b5f450af Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Tue, 23 Nov 2021 10:54:26 +0100 Subject: [PATCH 48/98] nixos/bluetooth: fix bluetooth warnings --- nixos/modules/services/hardware/bluetooth.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 7f75ac272d40..69a66723e76c 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -11,12 +11,8 @@ let cfgFmt = pkgs.formats.ini { }; - # bluez will complain if some of the sections are not found, so just make them - # empty (but present in the file) for now defaults = { General.ControllerMode = "dual"; - Controller = { }; - GATT = { }; Policy.AutoEnable = cfg.powerOnBoot; }; From c8cdffea2852d2d35d65d1d52ff1a4bcf8d16e07 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 23 Nov 2021 12:10:41 +0100 Subject: [PATCH 49/98] tldr: 1.3.0 -> 1.4.2 --- pkgs/tools/misc/tldr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index dfde5a9113be..05d3026e76f4 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tldr"; - version = "1.3.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "tldr-pages"; repo = "tldr-cpp-client"; rev = "v${version}"; - sha256 = "10ylpiqc06p0qpma72vwksd7hd107s0vlx9c6s9rz4vc3i274lb6"; + sha256 = "sha256-dsEqnHIs6vamdfLrkstRcV90tt7QcKIJwrPr+ksTVlQ="; }; buildInputs = [ curl libzip ]; From 918756a197337bedf1760bf93563add35df0cb05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Nov 2021 12:20:18 +0100 Subject: [PATCH 50/98] python3Packages.hole: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/hole/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/hole/default.nix b/pkgs/development/python-modules/hole/default.nix index f8916322ea09..3175a8fabb58 100644 --- a/pkgs/development/python-modules/hole/default.nix +++ b/pkgs/development/python-modules/hole/default.nix @@ -1,17 +1,21 @@ { lib -, buildPythonPackage -, fetchPypi , aiohttp , async-timeout +, buildPythonPackage +, fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "hole"; - version = "0.6.0"; + version = "0.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-T6U6WVx+5+/UaSS2mMmjAjWu67ut+YGpq2ooP9YEazI="; + sha256 = "sha256-yZpzGfB5RTWaRn2DmT+cbSDC0pL16FyUc0Nr/V6TlhU="; }; propagatedBuildInputs = [ @@ -22,7 +26,9 @@ buildPythonPackage rec { # no tests are present doCheck = false; - pythonImportsCheck = [ "hole" ]; + pythonImportsCheck = [ + "hole" + ]; meta = with lib; { description = "Python API for interacting with a Pihole instance."; From 33bff3a785e2af2039bfd6b77f4ea787062f18a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Nov 2021 12:41:43 +0100 Subject: [PATCH 51/98] python3Packages.volkszaehler: 0.2.2 -> 0.3.0 --- .../python-modules/volkszaehler/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/volkszaehler/default.nix b/pkgs/development/python-modules/volkszaehler/default.nix index 6bd509d7cd40..3060985655bb 100644 --- a/pkgs/development/python-modules/volkszaehler/default.nix +++ b/pkgs/development/python-modules/volkszaehler/default.nix @@ -1,17 +1,21 @@ { lib -, buildPythonPackage -, fetchPypi , aiohttp , async-timeout +, buildPythonPackage +, fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "volkszaehler"; - version = "0.2.2"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1oqzhC3Yq2V30F3ilr80vKFnTmI/CdIVLuzMlIr40xI="; + sha256 = "sha256-eIHL4o6PxSHRnhdT8XV2YsV57B2c6xQSuOKm0VXrb0M="; }; propagatedBuildInputs = [ @@ -22,10 +26,12 @@ buildPythonPackage rec { # no tests are present doCheck = false; - pythonImportsCheck = [ "volkszaehler" ]; + pythonImportsCheck = [ + "volkszaehler" + ]; meta = with lib; { - description = "Python Wrapper for interacting with the Volkszahler API"; + description = "Python module for interacting with the Volkszahler API"; homepage = "https://github.com/home-assistant-ecosystem/python-volkszaehler"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; From 080a563fb5635fa83f8d4814778c4ac48428a16a Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Tue, 23 Nov 2021 11:45:24 +0000 Subject: [PATCH 52/98] exploitdb: 2021-11-18 -> 2021-11-23 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index d5d37cd70a0f..3997fdba293d 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-11-18"; + version = "2021-11-23"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-GSqJIM/wAgSKn9BWOSEwmrVTwI6ZOTZGNHRcepDT7MI="; + sha256 = "sha256-mYElt+KdeyRxr0Ef++/o47IWhPXBFmRIHbnw1UNXfr4="; }; nativeBuildInputs = [ makeWrapper ]; From 3705b869bd20562aae2d1ca95111950752c05fb6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Nov 2021 12:47:44 +0100 Subject: [PATCH 53/98] python3Packages.volkszaehler: 0.3.0 -> 0.3.2 --- .../python-modules/volkszaehler/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/volkszaehler/default.nix b/pkgs/development/python-modules/volkszaehler/default.nix index 3060985655bb..cbc51d024a6e 100644 --- a/pkgs/development/python-modules/volkszaehler/default.nix +++ b/pkgs/development/python-modules/volkszaehler/default.nix @@ -2,20 +2,22 @@ , aiohttp , async-timeout , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder }: buildPythonPackage rec { pname = "volkszaehler"; - version = "0.3.0"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-eIHL4o6PxSHRnhdT8XV2YsV57B2c6xQSuOKm0VXrb0M="; + src = fetchFromGitHub { + owner = "home-assistant-ecosystem"; + repo = "python-volkszaehler"; + rev = version; + sha256 = "sha256-EiruMlhXvbUhCaDtHc3qCLbpp/KHp9rVpk2FmbR4A/k="; }; propagatedBuildInputs = [ From 8ca4296c20eb7762c0f73a4fabdd00c545551ad9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Nov 2021 12:57:25 +0100 Subject: [PATCH 54/98] checkov: 2.0.595 -> 2.0.598 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 307a64ce3777..a5018b110d13 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.595"; + version = "2.0.598"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-KWT3KczjDtDfgcct7YfmmM9oLhPnAvVd9mC+GTQCTsw="; + sha256 = "sha256-h+pKg6rBF+f/EZaCcMQDISrE3jO55biHdn5tLPEUu1g="; }; nativeBuildInputs = with py.pkgs; [ From 1cc5df0346c486952924542d971fbed14a4da5ce Mon Sep 17 00:00:00 2001 From: eyjhb Date: Tue, 23 Nov 2021 13:31:41 +0100 Subject: [PATCH 55/98] matrix-synapse: 1.47.0 -> 1.47.1 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index b1d42c8091c7..7e2b2e0ceeda 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.47.0"; + version = "1.47.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SS7ETkYQ3XBihOA6TQp+6f0PNhhlUvMBR6fEYmiLT3k="; + sha256 = "sha256-ldk14yMaFZ1uegiTwB6txomGJTV1Gf/LqJyWJARmhJ4="; }; patches = [ From a391439b7bbec2fdc3234cf7a8e0bf661c579cf9 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Tue, 23 Nov 2021 20:33:01 +0800 Subject: [PATCH 56/98] gnomeExtensions.arcmenu: 14 -> 19 --- pkgs/desktops/gnome/extensions/arcmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index 68898fa42b0e..c245d593d396 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-arcmenu"; - version = "14"; + version = "19"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "sha256-Iobu5eNWSvAiTRe6wyx/0PgUtB9QIC9KdH0M1xhsM1I="; + sha256 = "sha256-GEeONrrH00Tt9tuxhH7Gv5lSZ2D/hFgeGbUstqJsWZo="; }; patches = [ From ebf1e1645946a77346bcd813fd094d084a32f6a5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 23 Nov 2021 13:39:28 +0100 Subject: [PATCH 57/98] sbcl_2_1_10: init at 2.1.10 http://www.sbcl.org/all-news.html#2.1.10 --- pkgs/development/compilers/sbcl/2.1.10.nix | 4 ++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+) create mode 100644 pkgs/development/compilers/sbcl/2.1.10.nix diff --git a/pkgs/development/compilers/sbcl/2.1.10.nix b/pkgs/development/compilers/sbcl/2.1.10.nix new file mode 100644 index 000000000000..8cf6f50b5869 --- /dev/null +++ b/pkgs/development/compilers/sbcl/2.1.10.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "2.1.10"; + sha256 = "0f5ihj486m7ghh3nc0jlnqa656sbqcmhdv32syz2rjx5b47ky67b"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6afbb4ef0ed5..bf1f3119e4e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12989,6 +12989,7 @@ with pkgs; sbcl_2_1_1 = callPackage ../development/compilers/sbcl/2.1.1.nix {}; sbcl_2_1_2 = callPackage ../development/compilers/sbcl/2.1.2.nix {}; sbcl_2_1_9 = callPackage ../development/compilers/sbcl/2.1.9.nix {}; + sbcl_2_1_10 = callPackage ../development/compilers/sbcl/2.1.10.nix {}; sbcl = sbcl_2_1_9; roswell = callPackage ../development/tools/roswell { }; From 469d7d5013d0629a508f46f435ee0ef0c788c2e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 23 Nov 2021 13:48:11 +0100 Subject: [PATCH 58/98] wireguard-tools: remove myself as maintainer --- pkgs/tools/networking/wireguard-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 5df98954ae16..00b91adc2738 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/"; homepage = "https://www.wireguard.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 d-xo ]; + maintainers = with maintainers; [ elseym ericsagnes zx2c4 globin ma27 d-xo ]; platforms = platforms.unix; }; } From 4985724c823c15661374d0ec396cf6039a4a476b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 23:21:06 +0000 Subject: [PATCH 59/98] build(deps): bump cachix/install-nix-action from 15 to 16 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 15 to 16. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v15...v16) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/basic-eval.yml | 2 +- .github/workflows/editorconfig.yml | 2 +- .github/workflows/manual-nixos.yml | 2 +- .github/workflows/manual-nixpkgs.yml | 2 +- .github/workflows/nixos-manual.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index c5e17faea865..67634af51f62 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -15,6 +15,6 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v16 # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index c0303ca80b9d..4cd3a1dfa8e8 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -28,7 +28,7 @@ jobs: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge if: env.PR_DIFF - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v16 if: env.PR_DIFF with: # nixpkgs commit is pinned so that it doesn't break diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index e134f263c884..b9181c5f3bbc 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v16 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 6866bc3af61a..3bdbd7f78fc4 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v16 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/nixos-manual.yml b/.github/workflows/nixos-manual.yml index eade07427d39..e1c5b4dc93b9 100644 --- a/.github/workflows/nixos-manual.yml +++ b/.github/workflows/nixos-manual.yml @@ -19,7 +19,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v16 - name: Check DocBook files generated from Markdown are consistent run: | nixos/doc/manual/md-to-db.sh From c6e22b597b7e5abf69170ac7ae8ba73456e60a30 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 17 Nov 2021 19:33:51 +0100 Subject: [PATCH 60/98] cups-brother-hll2350dw: init at 4.0.0-1 --- pkgs/misc/cups/drivers/hll2350dw/default.nix | 94 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 96 insertions(+) create mode 100644 pkgs/misc/cups/drivers/hll2350dw/default.nix diff --git a/pkgs/misc/cups/drivers/hll2350dw/default.nix b/pkgs/misc/cups/drivers/hll2350dw/default.nix new file mode 100644 index 000000000000..3fd0c0fbac09 --- /dev/null +++ b/pkgs/misc/cups/drivers/hll2350dw/default.nix @@ -0,0 +1,94 @@ +{ lib +, stdenv +, fetchurl +, dpkg +, autoPatchelfHook +, makeWrapper +, perl +, gnused +, ghostscript +, file +, coreutils +, gnugrep +, which +}: + +let + arches = [ "x86_64" "i686" "armv7l" ]; + + runtimeDeps = [ + ghostscript + file + gnused + gnugrep + coreutils + which + ]; +in + +stdenv.mkDerivation rec { + pname = "cups-brother-hll2350dw"; + version = "4.0.0-1"; + + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ]; + buildInputs = [ perl ]; + + dontUnpack = true; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf103566/hll2350dwpdrv-${version}.i386.deb"; + sha256 = "0b7hhln105agc3rwpi7cjlx5nf4d2yk9iksahdv3725nnd06lg46"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out + dpkg-deb -x $src $out + + # delete unnecessary files for the current architecture + '' + lib.concatMapStrings (arch: '' + echo Deleting files for ${arch} + rm -r "$out/opt/brother/Printers/HLL2350DW/lpd/${arch}" + '') (builtins.filter (arch: arch != stdenv.hostPlatform.linuxArch) arches) + '' + + # bundled scripts don't understand the arch subdirectories for some reason + ln -s \ + "$out/opt/brother/Printers/HLL2350DW/lpd/${stdenv.hostPlatform.linuxArch}/"* \ + "$out/opt/brother/Printers/HLL2350DW/lpd/" + + # Fix global references and replace auto discovery mechanism with hardcoded values + substituteInPlace $out/opt/brother/Printers/HLL2350DW/lpd/lpdfilter \ + --replace /opt "$out/opt" \ + --replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/HLL2350DW\"; #" \ + --replace "PRINTER =~" "PRINTER = \"HLL2350DW\"; #" + + # Make sure all executables have the necessary runtime dependencies available + find "$out" -executable -and -type f | while read file; do + wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}" + done + + # Symlink filter and ppd into a location where CUPS will discover it + mkdir -p $out/lib/cups/filter + mkdir -p $out/share/cups/model + + ln -s \ + $out/opt/brother/Printers/HLL2350DW/lpd/lpdfilter \ + $out/lib/cups/filter/brother_lpdwrapper_HLL2350DW + + ln -s \ + $out/opt/brother/Printers/HLL2350DW/cupswrapper/brother-HLL2350DW-cups-en.ppd \ + $out/share/cups/model/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://www.brother.com/"; + description = "Brother HL-L2350DW printer driver"; + license = licenses.unfree; + platforms = builtins.map (arch: "${arch}-linux") arches; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2350dw_us_eu_as&os=128"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6afbb4ef0ed5..b0d8b4a6cb61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32135,6 +32135,8 @@ with pkgs; cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { }; + cups-brother-hll2350dw = callPackage ../misc/cups/drivers/hll2350dw { }; + cups-drv-rastertosag-gdi = callPackage ../misc/cups/drivers/cups-drv-rastertosag-gdi { }; # this driver ships with pre-compiled 32-bit binary libraries From d051e2647bfdd7b2d158a52386b2a112a6ad3a8a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Nov 2021 14:46:41 +0100 Subject: [PATCH 61/98] python3Packages.jsonrpc-websocket: 3.1.0 -> 3.1.1 --- .../jsonrpc-websocket/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index 530c08dbaa05..ba7237022968 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -1,19 +1,25 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , aiohttp , jsonrpc-base , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "3.1.0"; + version = "3.1.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "eeaaac2330f6f1cdafd378ddf5287a47a7c8609ab212a2f576121c1e61c7a344"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "emlove"; + repo = "jsonrpc-websocket"; + rev = version; + sha256 = "aAXY1OUsF83rGQ1sg1lDrbWmxWqJJ+ZnuvHR1Y+ZDs4="; }; propagatedBuildInputs = [ @@ -26,7 +32,13 @@ buildPythonPackage rec { pytest-asyncio ]; - pytestFlagsArray = [ "tests.py" ]; + pytestFlagsArray = [ + "tests.py" + ]; + + pythonImportsCheck = [ + "jsonrpc_websocket" + ]; meta = with lib; { description = "A JSON-RPC websocket client library for asyncio"; From bc1f025afb28de72e9a8363d7553bafcffc086c8 Mon Sep 17 00:00:00 2001 From: piegames Date: Mon, 22 Nov 2021 01:51:52 +0100 Subject: [PATCH 62/98] gnomeExtensions: improve override mechanism The reduced reduncancy should help us avoid making some copy-paste errors, as happened previously. Also, increased ergonomics. --- .../gnome/extensions/extensionOverrides.nix | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index e8f9fb9cfb33..f20c63d08016 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -3,31 +3,36 @@ , gjs , xprop }: +let + # Helper method to reduce redundancy + patchExtension = name: override: super: (super // { + ${name} = super.${name}.overrideAttrs override; + }); +in # A set of overrides for automatically packaged extensions that require some small fixes. # The input must be an attribute set with the extensions' UUIDs as keys and the extension # derivations as values. Output is the same, but with patches applied. # # Note that all source patches refer to the built extension as published on extensions.gnome.org, and not # the upstream repository's sources. -super: super // { - - "caffeine@patapon.info" = super."caffeine@patapon.info".overrideAttrs (old: { +super: lib.trivial.pipe super [ + (patchExtension "caffeine@patapon.info" (old: { meta.maintainers = with lib.maintainers; [ eperuffo ]; - }); + })) - "dash-to-dock@micxgx.gmail.com" = super."dash-to-dock@micxgx.gmail.com".overrideAttrs (old: { + (patchExtension "dash-to-dock@micxgx.gmail.com" (old: { meta.maintainers = with lib.maintainers; [ eperuffo jtojnar rhoriguchi ]; - }); + })) - "display-brightness-ddcutil@themightydeity.github.com" = super."display-brightness-ddcutil@themightydeity.github.com".overrideAttrs (old: { + (patchExtension "display-brightness-ddcutil@themightydeity.github.com" (old: { # Has a hard-coded path to a run-time dependency # https://github.com/NixOS/nixpkgs/issues/136111 postPatch = '' substituteInPlace "extension.js" --replace "/usr/bin/ddcutil" "${ddcutil}/bin/ddcutil" ''; - }); + })) - "gnome-shell-screenshot@ttll.de" = super."gnome-shell-screenshot@ttll.de".overrideAttrs (old: { + (patchExtension "gnome-shell-screenshot@ttll.de" (old: { # Requires gjs # https://github.com/NixOS/nixpkgs/issues/136112 postPatch = '' @@ -35,12 +40,11 @@ super: super // { substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs" done ''; - }); + })) - "unite@hardpixel.eu" = super."unite@hardpixel.eu".overrideAttrs (old: { + (patchExtension "unite@hardpixel.eu" (old: { buildInputs = [ xprop ]; meta.maintainers = with lib.maintainers; [ rhoriguchi ]; - }); - -} + })) +] From e41a7715a29b193f14abd366f3c26b32017801da Mon Sep 17 00:00:00 2001 From: piegames Date: Mon, 22 Nov 2021 23:23:55 +0100 Subject: [PATCH 63/98] gnomeExtensions: improve README Document that the all-packages.nix needs to be updated too (this was forgotten in the GNOME 41 update). Also fixed typos. --- pkgs/desktops/gnome/extensions/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/extensions/README.md b/pkgs/desktops/gnome/extensions/README.md index 14a1d08ad04d..5586aae403dd 100644 --- a/pkgs/desktops/gnome/extensions/README.md +++ b/pkgs/desktops/gnome/extensions/README.md @@ -4,7 +4,7 @@ All extensions are packaged automatically. They can be found in the `pkgs.gnomeX ## Automatically packaged extensions -The actual packages are created by `buildGnomeExtensions.nix`, provided the correct arguments are fed into it. The important extension data is stored in `extensions.json`, one line/item per extension. That file is generated by running `update-extensions.py`. Furthermore, the automatic generated names are dumped in `collisions.json` for manual inspection. `extensionRenames.nix` contains provides new names for all extensions that collide. +The actual packages are created by `buildGnomeExtension.nix`, provided the correct arguments are fed into it. The important extension data is stored in `extensions.json`, one line/item per extension. That file is generated by running `update-extensions.py`. Furthermore, the automatic generated names are dumped in `collisions.json` for manual inspection. `extensionRenames.nix` contains new names for all extensions that collide. ### Extensions updates @@ -20,6 +20,7 @@ For GNOME updates, 3. Update `supported_versions` in `./update-extensions.py` and re-run it 4. Change `gnomeExtensions` to the new version 5. Update `./extensionsRenames.nix` accordingly +6. Update `all-packages.nix` accordingly (grep for `gnomeExtensions`) ## Manually packaged extensions From 39a3cf536763604291eac7617db84064d75f7e6f Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 23 Nov 2021 14:13:10 +0100 Subject: [PATCH 64/98] coreboot-toolchain: Fix building The sub-packages of coreboot-toolchain don't build currently. Fix that by using recurseIntoAttrs. Signed-off-by: Felix Singer --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0d8b4a6cb61..7401fbbabd7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12091,7 +12091,7 @@ with pkgs; pscid = nodePackages.pscid; - coreboot-toolchain = callPackages ../development/tools/misc/coreboot-toolchain { }; + coreboot-toolchain = recurseIntoAttrs (callPackage ../development/tools/misc/coreboot-toolchain { }); remarkable-toolchain = callPackage ../development/tools/misc/remarkable/remarkable-toolchain { }; From 763535823582f5072aafa1b1a73a212b6a10fe6f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:41:16 +0000 Subject: [PATCH 65/98] =?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 --- 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 e102c85c09b6658f5574e403d0d9c1a3c24f7bfe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:42:40 +0000 Subject: [PATCH 66/98] =?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 --- 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 1ad7180e2132dcbb5c11611eb2e84e7dd06c91b9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:43:33 +0000 Subject: [PATCH 67/98] =?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 --- 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 e9f6e6c49f279a405debe8c081ad5f887011fe21 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:43:49 +0000 Subject: [PATCH 68/98] =?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 --- 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 de1413c3966a74f01c8078519345727e59944b93 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:44:10 +0000 Subject: [PATCH 69/98] =?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 --- 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 74a4876377281cb83b2e226e71f98069a4c9baf3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:45:01 +0000 Subject: [PATCH 70/98] =?UTF-8?q?gnome-builder:=2041.1=20=E2=86=92=2041.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 --- 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 c87458e0023129164af036bd5e6e97417f91884e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:45:24 +0000 Subject: [PATCH 71/98] =?UTF-8?q?gupnp-tools:=200.10.1=20=E2=86=92=200.10.?= =?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/gupnp-tools/0.10/gupnp-tools-0.10.2.news --- 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 e2b522ca015ce1e76232f690c37a3bc5fc717f1f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 18:45:32 +0000 Subject: [PATCH 72/98] =?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 --- .../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 ad4ff3050df5292d8ab39e159dbe0f999a641d5a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 22 Nov 2021 19:50:12 +0100 Subject: [PATCH 73/98] gtk4.updateScript: correct policy 4.5.0 is unstable --- 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 41cb4807ae0d23a1ec34d63a9f17b17518fc228c Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Tue, 23 Nov 2021 11:40:45 -0300 Subject: [PATCH 74/98] xmrig-mo: 6.15.0-mo1 -> 6.15.3-mo1 --- 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 2f5b793c9b386ce8de0c559938c806e356a063b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Nov 2021 16:11:24 +0000 Subject: [PATCH 75/98] whalebird: 4.4.5 -> 4.4.6 --- pkgs/applications/misc/whalebird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 0809f835668a..b2475bf1d837 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.4.5"; + version = "4.4.6"; src = fetchurl { url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; - sha256 = "sha256-CIlj9Sc/hj2UMgQzfHA3iQYO6EPqcndqkNUCBecHq+E="; + sha256 = "sha256-Q67y6VO7U8EatMNWyJo4f9IHKylQSX7bNR0DH4bnH+A="; }; nativeBuildInputs = [ From 9ef72b907ca9054bfe8205d839f2063901aca609 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Tue, 23 Nov 2021 17:14:45 +0100 Subject: [PATCH 76/98] corrosion: fix darwin build (#147120) --- pkgs/development/tools/build-managers/corrosion/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index 2285579b0bbd..317956aa39cc 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , rustPlatform +, libiconv }: stdenv.mkDerivation rec { @@ -30,6 +31,8 @@ stdenv.mkDerivation rec { sha256 = "1fsq8zzzq28fj2fh92wmg8kmdj4y10mcpdmlgxsygy5lbh4xs13f"; }; + buildInputs = lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ cmake ] ++ (with rustPlatform; [ From 67dfb912b3700644789d42a2dd17317704f37fe5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Nov 2021 16:17:49 +0000 Subject: [PATCH 77/98] wsjtx: 2.5.1 -> 2.5.2 --- pkgs/applications/radio/wsjtx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index 3e889c210649..27ce5bb07a79 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "wsjtx"; - version = "2.5.1"; + version = "2.5.2"; # This is a "superbuild" tarball containing both wsjtx and a hamlib fork src = fetchurl { url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz"; - sha256 = "sha256-aof+OavQ+IBw3eef1+bQ9YwIXCdecYiADS+eRXTrmvQ="; + sha256 = "sha256-4KSJYhfUya8nH1KTsZ7JRgh0KnKdqrgSfofsjWaX7/M="; }; # Hamlib builds with autotools, wsjtx builds with cmake From 66c2813707e7af894effec56f506b9100fa215b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Nov 2021 16:20:58 +0000 Subject: [PATCH 78/98] pipenv: 2021.11.9 -> 2021.11.23 --- 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 2962edb9445971ce804189be8e4c9e3edfb2f465 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 23 Nov 2021 13:25:57 -0300 Subject: [PATCH 79/98] flutter: remove myself from maintainers --- pkgs/development/compilers/flutter/flutter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 376e0f529874..d700f686f630 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -169,7 +169,7 @@ runCommand drvName homepage = "https://flutter.dev"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ babariviere ericdallo thiagokokada ]; + maintainers = with maintainers; [ babariviere ericdallo ]; }; } '' mkdir -p $out/bin From 70c877ea4c62ceb5bca9cf02b5a1060aef884952 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 23 Nov 2021 13:26:07 -0300 Subject: [PATCH 80/98] hover: remove myself from maintainers --- pkgs/development/tools/hover/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/hover/default.nix b/pkgs/development/tools/hover/default.nix index 9b3a222723bf..c6c345584ed2 100644 --- a/pkgs/development/tools/hover/default.nix +++ b/pkgs/development/tools/hover/default.nix @@ -41,7 +41,7 @@ let homepage = "https://github.com/go-flutter-desktop/hover"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ ericdallo thiagokokada flexagoon ]; + maintainers = with maintainers; [ ericdallo flexagoon ]; }; subPackages = [ "." ]; From 846ebc44a6f72f8b9ac6c0186449c79cb9b0dec8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 23 Nov 2021 13:26:27 -0300 Subject: [PATCH 81/98] python3Package.aionotify: remove myself from maintainers --- pkgs/development/python-modules/aionotify/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aionotify/default.nix b/pkgs/development/python-modules/aionotify/default.nix index 93177733dedc..e653f4cca74e 100644 --- a/pkgs/development/python-modules/aionotify/default.nix +++ b/pkgs/development/python-modules/aionotify/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Simple, asyncio-based inotify library for Python"; license = with lib.licenses; [ bsd2 ]; platforms = platforms.linux; - maintainers = with lib.maintainers; [ thiagokokada ]; + maintainers = with lib.maintainers; [ ]; }; } From 1aa21798e8854de7a74d3de8332f5d4bb4612fa7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Nov 2021 16:34:29 +0000 Subject: [PATCH 82/98] blackfire: 2.5.1 -> 2.5.2 --- pkgs/development/tools/misc/blackfire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 6ba1ba061079..6f82e0731088 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "wak7LE5j6OKIHqCsEGrxSq1FAFzehMetYj6c/Zkr9dk="; + sha256 = "1RO5yabSNpIz5lWXngMOZ1S2vtnLEkXIj1ZoIinRrQ0="; }; nativeBuildInputs = [ From f6b1fcd3261936abc761b3a58b679d6e4829467c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Nov 2021 16:39:17 +0000 Subject: [PATCH 83/98] bluejeans-gui: 2.24.0.89 -> 2.25.0.78 --- .../networking/instant-messengers/bluejeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index bb87bd38dc6b..97530b722fdb 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.24.0.89"; + version = "2.25.0.78"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-rneX8ys/oKfVLavAZk5RJouOZkVsp+9BIAReSeYiKJc="; + sha256 = "sha256-Xk9iU7mNm3YlXKsmf6yPqd1YAklsFOWu+04Llb+2yWQ="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; From c9012aa712bcbfdaeb24a3730d7057df8a38a7f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Nov 2021 16:41:57 +0000 Subject: [PATCH 84/98] actionlint: 1.6.6 -> 1.6.8 --- 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 e9f119566ad0437cc9538a435b78aabaf710ffa0 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 23 Nov 2021 18:20:50 +0100 Subject: [PATCH 85/98] warzone2100: 4.2.1 -> 4.2.2 --- pkgs/games/warzone2100/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 0c5c5112f506..96d2e303bceb 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-N9D4K3+/Nt3N3/uHDD+jD6tzL0FMwmV7l+WGjGYa3Yk="; + sha256 = "sha256-F7TlnlQeEfGp1IBXlfKUgILKukUQxBFkoqXYmxfQOpk="; }; buildInputs = [ From b8173c4a0e03f3f25601bf4c12175a9fa6a887f0 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Tue, 23 Nov 2021 16:32:11 +1100 Subject: [PATCH 86/98] luaPackages.moonscript: Correct package version to dev-1 The "0.5.0-1" rockspec on luarocks has a bug, resulting in it pulling the current git master version, which is what we have effectively been using. Given that 0.5.0-1 is the latest release, is 6 years old, and that there have been some bug fixes since then, we do actually want to be using the git master version, but we also want to be using the correct rockspec (particularly as alt-getopt has been replaced by argparse in the `moon` binary). --- maintainers/scripts/luarocks-packages.csv | 2 +- pkgs/development/lua-modules/generated-packages.nix | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index d4a5f83d011b..23303d22c471 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -73,7 +73,7 @@ lyaml,,,,,,lblasc markdown,,,,,, mediator_lua,,,,,, mpack,,,,,, -moonscript,,,,,,arobyn +moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn nvim-client,https://github.com/neovim/lua-client.git,,,,, penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 983efa4329de..66b8396c0838 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2138,15 +2138,12 @@ buildLuarocksPackage { }) {}; moonscript = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, lpeg, alt-getopt, luafilesystem +, fetchgit, lua, lpeg, argparse, luafilesystem }: buildLuarocksPackage { pname = "moonscript"; - version = "0.5.0-1"; - knownRockspec = (fetchurl { - url = "https://luarocks.org/moonscript-0.5.0-1.rockspec"; - sha256 = "06ykvmzndkcmbwn85a4l1cl8v8jw38g0isdyhwwbgv0m5a306j6d"; - }).outPath; + version = "dev-1"; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/leafo/moonscript.git", "rev": "b7efcd131046ed921ae1075d7c0f6a3b64a570f7", @@ -2161,7 +2158,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua lpeg alt-getopt luafilesystem ]; + propagatedBuildInputs = [ lua lpeg argparse luafilesystem ]; meta = { homepage = "http://moonscript.org"; From 29185d80e9865db0f522bd5f10c998299dbbae66 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 87/98] 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. --- .../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 dbabce365c0d273ac7541b96533313b43280b2a1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 23 Nov 2021 18:33:43 +0100 Subject: [PATCH 88/98] python3.pkgs.holoviews: remove optional dependencies It was bringing in gdb as a transitive dependency, which is big. --- pkgs/development/python-modules/holoviews/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index a95d4816c497..e68499940ae6 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -25,16 +25,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorcet - param numpy - pyviz-comms - ipython - notebook pandas - matplotlib - bokeh - scipy panel + param + pyviz-comms ]; # tests not fully included with pypi release From 2f9426ad8312101f4e84bcc4e28860695d28005f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 23 Nov 2021 19:15:24 +0100 Subject: [PATCH 89/98] 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 --- 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 e8e0a51177a4657c363ab464f4b81cb4fdac61f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Nov 2021 16:29:22 +0000 Subject: [PATCH 90/98] python38Packages.pynput: 1.7.4 -> 1.7.5 --- pkgs/development/python-modules/pynput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index a700a7d1fd6d..7bfa96870ead 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynput"; - version = "1.7.4"; + version = "1.7.5"; src = fetchPypi { inherit pname version; - sha256 = "16fecc4d1e53a28fb7c669c79e189c3f2cde14a08d6b457c3da07075c82f3b4c"; + sha256 = "e6b7926dd162a883ff16f38e01720a930bbf2509146c9f1cdcecddd25288fb6e"; }; nativeBuildInputs = [ sphinx ]; From f709c86da27f56affc60cb1821ab7da53b4df4eb Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Tue, 23 Nov 2021 20:08:00 +0100 Subject: [PATCH 91/98] drawio: 15.7.3 -> 15.8.4 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 02c0fb409110..5e2e3b58dbaf 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "15.7.3"; + version = "15.8.4"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "3565bcceccb57daee222270164e85b696b8d261ab88b65699912da51946a1c36"; + sha256 = "4708c727b51c85a6b77a1b72a4075a1b24628aae42302203e66f704203692616"; }; nativeBuildInputs = [ From 95aad79a500930e61c31bd058c9692ae95592901 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 23 Nov 2021 11:10:42 -0800 Subject: [PATCH 92/98] devpi-client: 5.2.2 -> 5.2.3 (#147138) * devpi-client: 5.2.2 -> 5.2.3 * cleanup Co-authored-by: Antoine Eiche --- pkgs/development/tools/devpi-client/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index dcc3f38b995e..2b122326bfe5 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -25,19 +25,13 @@ buildPythonApplication rec { pname = "devpi-client"; - version = "5.2.2"; + version = "5.2.3"; src = fetchPypi { inherit pname version; - sha256 = "24ac6d94108996efad4ff5185dabb1e5120ae238134b8175d6de2ca9e766cd92"; + sha256 = "362eb26e95136a792491861cc2728d14a6309a9d4c4f13a7b9c3e6fd39de58ec"; }; - postPatch = '' - # can be removed after 5.2.2, updated upstream - substituteInPlace setup.py \ - --replace "pluggy>=0.6.0,<1.0" "pluggy" - ''; - buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ py devpi-common pluggy setuptools check-manifest pkginfo ]; From 80f8ca339233c0c0cfc962477d64e06f8841cdcd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Nov 2021 17:59:12 +0100 Subject: [PATCH 93/98] python3Packages.aiocurrencylayer: init at 1.0.2 --- .../aiocurrencylayer/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/aiocurrencylayer/default.nix diff --git a/pkgs/development/python-modules/aiocurrencylayer/default.nix b/pkgs/development/python-modules/aiocurrencylayer/default.nix new file mode 100644 index 000000000000..777c8905c7d5 --- /dev/null +++ b/pkgs/development/python-modules/aiocurrencylayer/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, poetry-core +, pytest-asyncio +, pytest-httpx +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiocurrencylayer"; + version = "1.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "home-assistant-ecosystem"; + repo = pname; + rev = version; + sha256 = "EVqnrMatOk2I6hiCkiT5FOWvMY9LEK8LlSHqi0x9kuQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + httpx + ]; + + checkInputs = [ + pytest-asyncio + pytest-httpx + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiocurrencylayer" + ]; + + meta = with lib; { + description = "Python API for interacting with currencylayer"; + homepage = "https://github.com/home-assistant-ecosystem/aiocurrencylayer"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ca5cddad816..76b708f76c84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -267,6 +267,8 @@ in { aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; + aiocurrencylayer = callPackage ../development/python-modules/aiocurrencylayer { }; + aiodiscover = callPackage ../development/python-modules/aiodiscover { }; aiodns = callPackage ../development/python-modules/aiodns { }; From 0bb676af5a7320bb948ed2af15ecc4f7211a8635 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 22 Nov 2021 14:47:56 -0500 Subject: [PATCH 94/98] python3Packages.yfinance: 0.1.66 -> 0.1.67 --- .../development/python-modules/yfinance/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 30b17f6897a9..b449ec59e967 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , multitasking , numpy , pandas @@ -9,12 +9,13 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.66"; + version = "0.1.67"; - # GitHub source releases aren't tagged - src = fetchPypi { - inherit pname version; - sha256 = "9ea6fd18319fd898a8428a4a3d67171812b54779e330ead4d4ed0c59eb311be5"; + src = fetchFromGitHub { + owner = "ranaroussi"; + repo = pname; + rev = version; + sha256 = "sha256-QwWShXelEBgLUvCwPqB7z5DjS1JsW/krPrsS3VkyaJg="; }; propagatedBuildInputs = [ From bcd47c40e7b5f3c39f719e44bf1884864a6f5d30 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 22 Nov 2021 14:48:24 -0500 Subject: [PATCH 95/98] python3Packages.qiskit-ibmq-provider: 0.18.0 -> 0.18.1 --- .../python-modules/qiskit-ibmq-provider/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 88fcb82857d5..5b304bf38984 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.18.0"; + version = "0.18.1"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "sha256-mVgR9vq9UpM/3VED4hpEev8YAoZY1URAxu7pVv+cjU8="; + sha256 = "sha256-rySSCyI+62G7kL1ZRtjX1WeWj3LPXECvrlXAcIDINF4="; }; propagatedBuildInputs = [ From b5d11d62a3ee454acd8ce4cc7ad7040b3d9672fc Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 22 Nov 2021 14:48:34 -0500 Subject: [PATCH 96/98] python3Packages.qiskit: 0.32.0 -> 0.32.1 --- pkgs/development/python-modules/qiskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 45e0326a1b71..9d050606006c 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -29,7 +29,7 @@ in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.32.0"; + version = "0.32.1"; disabled = pythonOlder "3.6"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = "qiskit"; rev = version; - sha256 = "sha256-fKR072hOD0a9TtWulqyKUT3Riwq+NHTtciR+NN5JC1Y="; + sha256 = "sha256-0L4TlolvL1akHhWSJ0GRQ/Cu/rZ+Es00jjNM5Ho2uEA="; }; propagatedBuildInputs = [ From da3825a61fb437aaeeb631278f6749c9e3300f57 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 23 Nov 2021 19:07:51 +0300 Subject: [PATCH 97/98] nnn: 4.3 -> 4.4 --- 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 3cd5413447d006489000dc20d2be7a758f95f363 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 24 Nov 2021 00:15:10 +0100 Subject: [PATCH 98/98] coreboot-toolchain: refactor the package set structure Previously we were unable to override individual attributes within the coreboot-toolchain packageset. By using callPackage on each of the attributes individually we retain the ability to call the override function to inject custom dependencies into the build. --- .../tools/misc/coreboot-toolchain/default.nix | 137 +++++++++--------- 1 file changed, 71 insertions(+), 66 deletions(-) diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index a9d8ab302ea4..d746a6d1ff33 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -1,72 +1,77 @@ -{ bison -, callPackage -, curl -, fetchgit -, flex -, getopt -, git -, gnat11 -, lib -, perl -, stdenvNoCC -, zlib -}: - +{ lib, callPackage }: let - common = arch: stdenvNoCC.mkDerivation rec { - pname = "coreboot-toolchain-${arch}"; - version = "4.15"; + common = arch: callPackage ( + { bison + , callPackage + , curl + , fetchgit + , flex + , getopt + , git + , gnat11 + , lib + , perl + , stdenvNoCC + , zlib + }: - src = fetchgit { - url = "https://review.coreboot.org/coreboot"; - rev = version; - sha256 = "1qsb2ca22h5f0iwc254qsfm7qcn8967ir8aybdxa1pakgmnfsyp9"; - fetchSubmodules = false; - leaveDotGit = true; - postFetch = '' - patchShebangs $out/util/crossgcc/buildgcc - PATH=${lib.makeBinPath [ getopt ]}:$PATH $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version - rm -rf $out/.git + stdenvNoCC.mkDerivation rec { + pname = "coreboot-toolchain-${arch}"; + version = "4.15"; + + src = fetchgit { + url = "https://review.coreboot.org/coreboot"; + rev = version; + sha256 = "1qsb2ca22h5f0iwc254qsfm7qcn8967ir8aybdxa1pakgmnfsyp9"; + fetchSubmodules = false; + leaveDotGit = true; + postFetch = '' + patchShebangs $out/util/crossgcc/buildgcc + PATH=${lib.makeBinPath [ getopt ]}:$PATH $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version + rm -rf $out/.git + ''; + }; + + nativeBuildInputs = [ bison curl git perl ]; + buildInputs = [ flex gnat11 zlib ]; + + enableParallelBuilding = true; + dontConfigure = true; + dontInstall = true; + + postPatch = '' + mkdir -p util/crossgcc/tarballs + + ${lib.concatMapStringsSep "\n" ( + file: "ln -s ${file.archive} util/crossgcc/tarballs/${file.name}" + ) (callPackage ./stable.nix { }) + } + + patchShebangs util/genbuild_h/genbuild_h.sh ''; - }; - nativeBuildInputs = [ bison curl git perl ]; - buildInputs = [ flex gnat11 zlib ]; + buildPhase = '' + export CROSSGCC_VERSION=$(cat .crossgcc_version) + make crossgcc-${arch} CPUS=$NIX_BUILD_CORES DEST=$out + ''; - enableParallelBuilding = true; - dontConfigure = true; - dontInstall = true; + meta = with lib; { + homepage = "https://www.coreboot.org"; + description = "coreboot toolchain for ${arch} targets"; + license = with licenses; [ bsd2 bsd3 gpl2 lgpl2Plus gpl3Plus ]; + maintainers = with maintainers; [ felixsinger ]; + platforms = platforms.linux; + }; + } + ); +in - postPatch = '' - mkdir -p util/crossgcc/tarballs - - ${lib.concatMapStringsSep "\n" ( - file: "ln -s ${file.archive} util/crossgcc/tarballs/${file.name}" - ) (callPackage ./stable.nix { }) - } - - patchShebangs util/genbuild_h/genbuild_h.sh - ''; - - buildPhase = '' - export CROSSGCC_VERSION=$(cat .crossgcc_version) - make crossgcc-${arch} CPUS=$NIX_BUILD_CORES DEST=$out - ''; - - meta = with lib; { - homepage = "https://www.coreboot.org"; - description = "coreboot toolchain for ${arch} targets"; - license = with licenses; [ bsd2 bsd3 gpl2 lgpl2Plus gpl3Plus ]; - maintainers = with maintainers; [ felixsinger ]; - platforms = platforms.linux; - }; - }; -in { - i386 = common "i386"; - x86_64 = common "x64"; - arm = common "arm"; - aarch64 = common "aarch64"; - riscv = common "riscv"; - ppc64 = common "ppc64"; - nds32le = common "nds32le"; -} +lib.listToAttrs (map (arch: lib.nameValuePair arch (common arch {})) [ + "i386" + "x64" + "arm" + "aarch64" + "riscv" + "ppc64" + "nds32le" +])