From 5610ff5ba1cb55ccbf07b377e992614f8ae21a1d Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sat, 3 Apr 2021 10:54:48 +0200 Subject: [PATCH 001/171] Improved error message on disabling NSS modules when disabling nscd Move the hint from a comment to the error message, and provide a clearer example of how to achieve it. --- nixos/modules/config/nsswitch.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index d19d35a48906..52e343bbf1ca 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -95,11 +95,14 @@ with lib; config = { assertions = [ { - # Prevent users from disabling nscd, with nssModules being set. - # If disabling nscd is really necessary, it's still possible to opt out - # by forcing config.system.nssModules to []. assertion = config.system.nssModules.path != "" -> config.services.nscd.enable; - message = "Loading NSS modules from system.nssModules (${config.system.nssModules.path}), requires services.nscd.enable being set to true."; + message = '' + Loading NSS modules from system.nssModules (${config.system.nssModules.path}), + requires services.nscd.enable being set to true. + + If disabling nscd is really necessary, it is possible to disable loading NSS modules + by setting `system.nssModules = lib.mkForce [];` in your configuration.nix. + ''; } ]; From 8dda9e74d50bdda66607587b0cf077767ebbb20f Mon Sep 17 00:00:00 2001 From: Yisrael Dov Lebow Date: Mon, 5 Jul 2021 11:48:50 +0300 Subject: [PATCH 002/171] programs.chromium fix policies for brave --- nixos/modules/programs/chromium.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index b727f850a949..bbb4e2533d42 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -100,5 +100,9 @@ in # for google-chrome https://www.chromium.org/administrators/linux-quick-start environment.etc."opt/chrome/policies/managed/default.json".text = builtins.toJSON defaultProfile; environment.etc."opt/chrome/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts; + # for brave + environment.etc."brave/policies/managed/default.json".text = builtins.toJSON defaultProfile; + environment.etc."brave/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts; + }; } From de7e93748181f071d4689c319bfa1dc41573ad65 Mon Sep 17 00:00:00 2001 From: Yisrael Dov Lebow Date: Tue, 6 Jul 2021 06:18:05 +0300 Subject: [PATCH 003/171] Removing trailing whitespace Passing editor config test --- nixos/modules/programs/chromium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index bbb4e2533d42..17175e9d6023 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -100,7 +100,7 @@ in # for google-chrome https://www.chromium.org/administrators/linux-quick-start environment.etc."opt/chrome/policies/managed/default.json".text = builtins.toJSON defaultProfile; environment.etc."opt/chrome/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts; - # for brave + # for brave environment.etc."brave/policies/managed/default.json".text = builtins.toJSON defaultProfile; environment.etc."brave/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts; From 98aa1c7e30c035120cfa16030005515f6614eecc Mon Sep 17 00:00:00 2001 From: Yisrael Dov Lebow Date: Tue, 6 Jul 2021 18:16:57 +0300 Subject: [PATCH 004/171] Update nixos/modules/programs/chromium.nix Co-authored-by: Sandro --- nixos/modules/programs/chromium.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index 17175e9d6023..c90f5ac4bd4e 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -103,6 +103,5 @@ in # for brave environment.etc."brave/policies/managed/default.json".text = builtins.toJSON defaultProfile; environment.etc."brave/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts; - }; } From f8e08ed20e65e1a20032b937158d6022c0f35300 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Mar 2022 22:28:40 +0000 Subject: [PATCH 005/171] liquibase: 4.8.0 -> 4.9.0 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 06f4c947b205..87a66f9bdab7 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-dGK26S9wd+GFiGXEA9UvDc4b1m0DsfrpB4FcEIJf6zM="; + sha256 = "sha256-1InRJzHqikm6Jd7z54TW6JFn3FO0LtStehWNaC+rdw8="; }; nativeBuildInputs = [ makeWrapper ]; From d1009de69837eddf285f89c68c89a26375d0e76a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Mar 2022 22:38:23 +0000 Subject: [PATCH 006/171] mackerel-agent: 0.72.8 -> 0.72.9 --- pkgs/servers/monitoring/mackerel-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index d11add105f6b..54307fb98b43 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.72.8"; + version = "0.72.9"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IejLCi1TJ2Q0lpA2ZK3hea18YX483FV4IisYRRVD1Vg="; + sha256 = "sha256-+3a0FyVf5AB85gGGBI8/ssLBqj9Kp3w9DUNbSaAtXvA="; }; nativeBuildInputs = [ makeWrapper ]; From 745dd2d18bdcbf1a8f175174b523e20341bbe579 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 27 Mar 2022 18:21:35 +0200 Subject: [PATCH 007/171] xprintidle: init at 0.2.4 --- pkgs/tools/X11/xprintidle/default.nix | 40 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/X11/xprintidle/default.nix diff --git a/pkgs/tools/X11/xprintidle/default.nix b/pkgs/tools/X11/xprintidle/default.nix new file mode 100644 index 000000000000..8835d718333b --- /dev/null +++ b/pkgs/tools/X11/xprintidle/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, xorg +}: + +stdenv.mkDerivation rec { + pname = "xprintidle"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "g0hl1n"; + repo = "xprintidle"; + rev = version; + sha256 = "sha256-CgjHTvwQKR/TPQyEWKxN5j97Sh2iec0BQPhC96sfyoI="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + xorg.libXScrnSaver + xorg.libX11 + xorg.libXext + ]; + + meta = with lib; { + homepage = "https://github.com/g0hl1n/xprintidle"; + description = "A utility that queries the X server for the user's idle time and prints it to stdout"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5ee3327e03c..3aeae7e9de86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11238,6 +11238,8 @@ with pkgs; xfstests = callPackage ../tools/misc/xfstests { }; + xprintidle = callPackage ../tools/X11/xprintidle {}; + xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; xscast = callPackage ../applications/video/xscast { }; From 51f1663342257f21635563a9cb83091e4bab58fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Mar 2022 02:18:37 +0000 Subject: [PATCH 008/171] wcslib: 7.7 -> 7.9 --- .../libraries/science/astronomy/wcslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/pkgs/development/libraries/science/astronomy/wcslib/default.nix index 6adf52514710..2b2cade6fbba 100644 --- a/pkgs/development/libraries/science/astronomy/wcslib/default.nix +++ b/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wcslib"; - version = "7.7"; + version = "7.9"; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-pwjmtOkOLNZCdDRxW1kbucPUAFyZcl7ElLjgvtLeU1U="; + sha256 = "sha256-vv+MHw6GAAeIE8Ay0a/NnLMFwx9WdWdDSCQjPVgqulg="; }; nativeBuildInputs = [ flex ]; From fb245f546a122d65a107f7fdeff9e44501964279 Mon Sep 17 00:00:00 2001 From: Evils Date: Fri, 1 Apr 2022 15:36:06 +0200 Subject: [PATCH 009/171] rasdaemon: 0.6.7 -> 0.6.8 --- pkgs/os-specific/linux/rasdaemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rasdaemon/default.nix b/pkgs/os-specific/linux/rasdaemon/default.nix index 22ca59bff536..cccd91fff8e1 100644 --- a/pkgs/os-specific/linux/rasdaemon/default.nix +++ b/pkgs/os-specific/linux/rasdaemon/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rasdaemon"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "mchehab"; repo = "rasdaemon"; rev = "v${version}"; - sha256 = "sha256-vyUDwqDe+HD4mka6smdQuVSM5U9uMv/TrfHkyqVJMIo="; + sha256 = "sha256-gcwoc9lIJyqUiCSAHf1U8geLG58CxzjMFYFl8moaA2Q="; }; nativeBuildInputs = [ autoreconfHook ]; From 219ca5845235c7481e48096e32b34aac78630d79 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 1 Apr 2022 17:49:38 +0100 Subject: [PATCH 010/171] gitUpdater: add explicit url parameter to specify a git tree for tags That way gitUpdater could be used to extract most recent published releases for .nix files that don't use git directly to define builds. An example is iproute2 package which does not have a single place to lookup most recent release. --- pkgs/common-updater/git-updater.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/common-updater/git-updater.nix b/pkgs/common-updater/git-updater.nix index 304bad9af60c..edeb2dfb2c65 100644 --- a/pkgs/common-updater/git-updater.nix +++ b/pkgs/common-updater/git-updater.nix @@ -1,4 +1,5 @@ -{ genericUpdater +{ lib +, genericUpdater , common-updater-scripts }: @@ -9,9 +10,12 @@ , rev-prefix ? "" , odd-unstable ? false , patchlevel-unstable ? false +# explicit url is useful when git protocol is used only for tags listing +# while actual release is referred by tarball +, url ? null }: genericUpdater { inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable; - versionLister = "${common-updater-scripts}/bin/list-git-tags"; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${lib.optionalString (url != null) "--url=${url}"}"; } From cb79cf47f7624a46acbd964c207bdb4375a56bf7 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 4 Apr 2022 19:06:29 +0200 Subject: [PATCH 011/171] gscan2pdf: 2.12.5 -> 2.12.6 Also re-enabling a no-longer failing test. --- pkgs/applications/graphics/gscan2pdf/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 9d8ae0c8d35f..214688b56f89 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.12.5"; + version = "2.12.6"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; - sha256 = "sha256-MFWW9DTJ/svtgN3fbw+zeGpgg3pgIoC9jZ1HkG5p6sc="; + sha256 = "sha256-9ntpUEM3buT3EhneXz9G8bibvzOnEK6Xt0jJcTvLKT0="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -111,8 +111,6 @@ perlPackages.buildPerlPackage rec { # # Looks like you failed 1 test of 1. # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) rm t/169_import_scan.t - # t/1604_import_multipage_DjVu.t ................ Dubious, test returned 255 (wstat 65280, 0xff00) - rm t/1604_import_multipage_DjVu.t # Disable a test which passes but reports an incorrect status # t/0601_Dialog_Scan.t .......................... All 14 subtests passed From 067b774e7c998b93ce678c964a4886c81dad0747 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 6 Apr 2022 03:12:25 +0900 Subject: [PATCH 012/171] thunderbird-bin: 91.7.0 -> 91.8.0 --- .../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 492abf1f37c4..7fc6492af7f3 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.7.0"; + version = "91.8.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/af/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/af/thunderbird-91.8.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "bcc9a123b3de4d442836820d3eff52a37ff513b063850493e58c2132ad0ec029"; + sha256 = "9f6fe7d931b4f9ec06e6d22e69ad6e638a82fcd709cfaabd52ed6283a75a8d31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ar/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ar/thunderbird-91.8.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "4800a0be829e654d6917271b4944a5be3a8688e75eed58a4a5bae3643d2bce4b"; + sha256 = "f8523e3b9b4229a7f977c25ba08dad4edad0fd56c90c8c8bb473db2a1e00265d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ast/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ast/thunderbird-91.8.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "779bf2732f89a82f36449d75d14ec4f8cbceb79c7f2d590f0407f4261fd9a5f9"; + sha256 = "3a95ba998b4f863fe39fb3e3dfecb827108b92c317ed5594e4a409ccecc8b303"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/be/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/be/thunderbird-91.8.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "e1f033cf11d1d18828771ca81e90e6851a1b96971f0d3d81665ca6aebb6c737c"; + sha256 = "fd41c8189eb64d70038b0a3551b46386c3d6e4afc1474bc7e50d0b88208a5547"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/bg/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/bg/thunderbird-91.8.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "293917397d1d52415bab86a1d27e9442b5bafb989e65cb3cbee0ba601970bc2d"; + sha256 = "c7957994f4e3bb70b4f118ff6b939f52f46bc0d471a6098e18abbe23dbb58675"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/br/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/br/thunderbird-91.8.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "317883e2764505713e4507fffeaf1528f685fc774b99dc5b802164cdd1473292"; + sha256 = "6987eb50cb3460d42794f9192c57262479ed7082662395893bb3a5b9e094c0f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ca/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ca/thunderbird-91.8.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "cdfcbddc1697b46a85b67382d7b4a9d64d1ffc31d5faeb8e0edd21f4868a6008"; + sha256 = "b09400e218281f8b09d688f5dbab2c732761da8e47141726941dcaedc3780097"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cak/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/cak/thunderbird-91.8.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "8c1d1dff29b7631d5aad6384d02269b5c058bd1c37d85de0c92fd74e2a08e37c"; + sha256 = "02efc2043ddc4485a239b19d5b3593bb68f5780ccd11f6d4eb968594192a1bf5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cs/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/cs/thunderbird-91.8.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "3d1818c6d067552a7f7c62fc9dfae7370c309c9604f20ba1f1f4723020f04c7f"; + sha256 = "13af2518a999650cebff031813b812141b014b3fcd9a7bd3953b64229e870dac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cy/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/cy/thunderbird-91.8.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d339d87800e4060120468314544b34b4dfc355a5369363d6df826a6f10682afc"; + sha256 = "ec9def864905036110381f901de0d9c7609116cd1d9bee9414627a133d5fb19e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/da/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/da/thunderbird-91.8.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e00bb159fa9d113272866986eb8f9c3e6c3f29748cc7240cc736c00ed3eb1927"; + sha256 = "d6cc0667d1be9fc73491bc57a0b44715433eae3743ea8aba59229e19fd24a642"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/de/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/de/thunderbird-91.8.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "af8365195927f75f6aac52fd91904193172f5e3b7bc09a7e52a94840ede1a6aa"; + sha256 = "112bf23c33cacbf54319ac4534cff5be85d49704e69498f039cc45fd3abd0c8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/dsb/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/dsb/thunderbird-91.8.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "96bdb60659052126bca84a64a1f2fdd26654875d74feacd4b9d50cf66b90c3d9"; + sha256 = "7e190cf921b1b76cb3702e3ce534e1575b7dcc63ccc94d3d8bf384bd42000a60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/el/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/el/thunderbird-91.8.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "af0101f1d999947cb02b3cf7c92eadab0f360b64f64788a3ea2ecbb6e8628c9d"; + sha256 = "74917356bab02953ba56acf5736b3d2c9a1847f49fb4a75a273655e7678b80f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-CA/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/en-CA/thunderbird-91.8.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "3537bfe2ffe474e587df4549a243ace7fb02236e8a424fac9c9e23ea74978969"; + sha256 = "813d6df5de5768a3c82d3fc042907fd16f1f18695c5c294bb345cc593b71dfd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-GB/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/en-GB/thunderbird-91.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ff0daecd9a50d9bb060750d822bd0da409ac838f9280faf71ed6f146f1bd928d"; + sha256 = "0cbefc0c52f32b7654d045cc85c5ae882ca83b6ca138b3f6b82e194b53b0940f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-US/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/en-US/thunderbird-91.8.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f4da2a0627b042e61b8f25eb57396ab71d862c728abd9cc82e9eb102b27d26f5"; + sha256 = "d57fd4df24d4acb36ddcca83062114d16a8fa4e9255606e5f2ffcd4ac9b5ea5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/es-AR/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/es-AR/thunderbird-91.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "a052ed75f7b3aaa2fea27b7eaa658a0d75e03c5d8e51214e9207e79c8c656489"; + sha256 = "ffc858a7474ea2b6c95a6bacf2f0a9257c95f9ae67ea3d04bbb2f5499a58d618"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/es-ES/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/es-ES/thunderbird-91.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "312b2eb38ec895a77a10cbd41cf861f03520d9ce7ff6cc0b2fd9e282c1a85743"; + sha256 = "d3d77d80550c1ea96dff1f7fe59d12cd2bcf8b6d4f8db558c1c80d42e3767871"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/et/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/et/thunderbird-91.8.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "257137eab9877c8c6663cfa9200707f5ff5ff30076c72952f43db9eeb3fc334b"; + sha256 = "03b95415f92d446bf24e392a14ddb3f1256158f711e65156745270fe61d2c565"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/eu/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/eu/thunderbird-91.8.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "69e426d23b3d29aa625d3fcc18080befe5ea717279a4d17a798c987819ce9f0d"; + sha256 = "272f5e568abe042c6ce3d9ea53693bd1f2a18cc4ddcb0729fd2825a62ceb89af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fi/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/fi/thunderbird-91.8.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2acb1d75cf32c65ca281ee353a79973bda5b96cfb1b8c6d55f91f5051ad9b720"; + sha256 = "7171f34f07c49206eecfb1c3cf4d122b8fa9f24e68dd4075dd5c7313ba140fd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/fr/thunderbird-91.8.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "979a4ab6ae26ed9fe2320bc0baf828588ee96899d9aa04781aa5e3f7e1e4e35a"; + sha256 = "45004e1b26c234969a805fe13a56ce3ed53e30d400965f61a6e95b4be79fd811"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fy-NL/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/fy-NL/thunderbird-91.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "2cad6ddf73676bedc04d18afec2fce7f8085fe10400b514d5091113dbd1ccd39"; + sha256 = "bdd6a130ae5a1c12a49a2d2b84410b445e7d8b62bd3aa1eb64cf66fbb7436047"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ga-IE/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ga-IE/thunderbird-91.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "6a8b5f6f413bf2d9122b90865131f1b2e3d1f528a2c0c54b0c3118b16948ef6f"; + sha256 = "c03c8f98c0850402d909d1d802bc6fe189d145ed45bc576a821536a79e492bd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/gd/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/gd/thunderbird-91.8.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "e739fdbcd525b1ec9a6415a1fc2b4f982895bc07e503324f8ee7cb9c44e30bf1"; + sha256 = "b55a5edafa3ca381544c1e2d2ecf23a1557cdd9b10f937cc6f45c7a40e0a0831"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/gl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/gl/thunderbird-91.8.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b8b87d0c8d200264e7aab95fc2f1a59b3ffd1b0a6143409cb947df6acce2711b"; + sha256 = "89f1cafa62a8334ea2250c6c8b9c07716fc99745aeafa6a689760c8eb288ad5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/he/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/he/thunderbird-91.8.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "3d8048e55eb538414b436387419d0ed2b4589a6846d55c49665af2741082bd03"; + sha256 = "82f9405f187471371a137838a8d39d289f2160ca3ffde007fbc5f643c11c0a0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/hr/thunderbird-91.8.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "e3eb72e83138d593046db8c72a09538b3b83abdef9b1534b9cf757751f172f78"; + sha256 = "4920edd369b2317976d98707e4f59febe0b252a85666ddfe29e7f7043c502509"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hsb/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/hsb/thunderbird-91.8.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e110bd72de8a035ba2de4f849b09e60d11db161b09dda2bd4ba01ee7e42c0075"; + sha256 = "88a84bf4f2a599527da8dc082bfc8e7d2e94fec446057bde2296c52cd1d25e76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hu/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/hu/thunderbird-91.8.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2fc4d4e970257aff81352132dd73fc365cc7df822b70aef9716082cb455bbc6b"; + sha256 = "a996700c6846850579b599cf31f837320859861f4b459554cabe35fe75f07059"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hy-AM/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/hy-AM/thunderbird-91.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ff5d16b7712f6975e68305f4d50e3c97846238021a4ffeb87526a5db0eb76db3"; + sha256 = "05d31752442946111c5b35873bf2b2c4a87e3739bac6a4704d94c54f199a3c6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/id/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/id/thunderbird-91.8.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5063b921fbe8ea8273441868f1cda6e0e32a8fe00b2b866dd4f91c9f12f15011"; + sha256 = "c8df7bf840268f4493403e849757eb6cfcd0cf59137bae948252eb9e9ace96ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/is/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/is/thunderbird-91.8.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "55d42de9dea45c13ad4288144b544d61b789d94d85976525b18c6dd32a75d210"; + sha256 = "697487eba3eaf49d2613d877a2d58a1e357ad2f772ae2de031695902ad4514ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/it/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/it/thunderbird-91.8.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7a6774106b689e6f829f8f74b03d23a85d79b9f8304d9a60d3fd172188e1bc26"; + sha256 = "0749d5dcd105b82aea94bc704e10812bfd3fa375a776f7a95b94bb4886e543ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ja/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ja/thunderbird-91.8.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b557c29aa992758dd4f92d3dab71cdac764b82b66359b75f2695de4fa052f918"; + sha256 = "ac6aa38f830a8f3eea7d0c7d0c9695ce1351e84a19a831e3d87d212369353ef7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ka/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ka/thunderbird-91.8.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "681430faee4d1e6512ca4a68142b6c3314f26e2944c7de04016404c60bae735e"; + sha256 = "b051d95f3b69a7c2d8de178e517abd37afec4502de1a580788f150c77c0187dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/kab/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/kab/thunderbird-91.8.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "5b45b128a48395300ed63e033ea09562b368276c7e6a9ea7801db74b8db13e97"; + sha256 = "2e635bdf5de067b57ba639be3465fcff3bbe00119d0c3f031d6471aab7a9b9f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/kk/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/kk/thunderbird-91.8.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a44dfb8259cd9e8c694e8c842cf5b691f2bfe5d9c5176dcc65bcfa9a316e78d5"; + sha256 = "369cc371e500bc6ce224f9563c6bd586fb4748181372754c4b2c58e81d9f19c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ko/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ko/thunderbird-91.8.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "e04ab8d19264afe6207875ea08b878993041ca84b613c4184d608a4f8bbedcba"; + sha256 = "6b4270b67c7e2e47201cb37c7bc9b22599cc65ea3efc87e35b0fddedc0af8170"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/lt/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/lt/thunderbird-91.8.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4cc3797ed91e6edfe994821bca011f20a64a7d1f6bc13634c1a31c877b161b2c"; + sha256 = "a140ae146bb64c704130e6e84a63ccf7ccac77433a95964b0b5d1c2a52485e7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/lv/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/lv/thunderbird-91.8.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "011867f9ee77187f02b6ce0040ab9c2d4babd6d2bbbb4c174094cc5f35eca65d"; + sha256 = "5f88b779588a36ff7eac1c652400ebdaad501b00c83101e6614f1689bb0aebfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ms/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ms/thunderbird-91.8.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "8f9bd1f1d5052a8259f1096b38fef693f5a74e81b8a2bb69477fc1cfa7461796"; + sha256 = "48632dc4e44bae95dc2c435f334c4d65a7058b0f5cdaf492ba4b7788d2c5df9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nb-NO/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/nb-NO/thunderbird-91.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "7bc57e4bc1373b5b484eb98f9775b85bbe9c6564e246af157b51314f74a20c67"; + sha256 = "c065ca752ff112aeafb51684b2f8877af8a61a52a6e1a70b884967c78fb30880"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/nl/thunderbird-91.8.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "bff24b619fa4282cc6341828528798d0d256213b43f1bcb4b36070e370bd2ba6"; + sha256 = "44c9ea3d19b1f4b9151b49e3b8221eec179558bfe398076f5fc5b41266f8194f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nn-NO/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/nn-NO/thunderbird-91.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4286c9c093aacb233874bb1439e8b7880d7f3e81dc1bdeb24dd0096075d34b7d"; + sha256 = "6347f87681652379ccda8564dbd2572bab1fa04b0c487ff43e3f51f3719ac7d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pa-IN/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/pa-IN/thunderbird-91.8.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "6ae5d50b4296201996b6ddf9ab2614534ec5fa3ed903c8e9d36c3254af820862"; + sha256 = "6db940a4482f404fa89abc36a2e9737c835fa51d7c98503055fb98484f7586c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/pl/thunderbird-91.8.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "ac2fb293885f0a37d0ec6903cb72ca0d2126e18540a8e542ebf89e15748ed9e7"; + sha256 = "dffeffd240e5ba3f1e3de024ffe7a51ebc72eb3035bb994d02bffd106203dc2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pt-BR/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/pt-BR/thunderbird-91.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "7d31e4ea4f14cf1b3c2c2c7dc9af2d0c2e97d397a6748cb53f8fc0ded21c3d5b"; + sha256 = "5a05e3d9174bd26f3c9f62f82dc50e0e40965771d861bbb662bfc4cdf29ef83e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pt-PT/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/pt-PT/thunderbird-91.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "7eedd322ea310df8b308a075c995cb530892be67348b66bac82096cc3d7da035"; + sha256 = "dfe5055edaea41dba221a2b39d2fef7493a508d12e9cb39e29201a20f95afdbd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/rm/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/rm/thunderbird-91.8.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "606b4d58bc6afd7fe67be985d3eac5ad2c734c0037bd5e6380e9b0993579d762"; + sha256 = "17a587c8b3eb1b548089b70bff06f379fd1d6aaa234a024b2b1c17a1f2a6f60d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ro/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ro/thunderbird-91.8.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a189258f7986e540edec1c0cb35f84f58924a079cce2da2332ad80a323c63241"; + sha256 = "cc43a35c544bc15fb86a12538d70d20b5b22f5666b5467b7f8e87b31a12c5abe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ru/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ru/thunderbird-91.8.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "2677c5d98c13ad6cdf3698b644b38ea9c94e94e46eec9ef307036d5bd3d32c9d"; + sha256 = "82b05f1e853fdcb4cbce513dc87f9fe2784bc4bc5836274be15b1cff831a5dfc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sk/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/sk/thunderbird-91.8.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "f3d630189c20ff6d4246f4f67173f60ff89bc4643267e6fd27cc37a25437b6d6"; + sha256 = "31ca758cacb9f5ffbdb901f4a2b59b2b63a2b4f0f0b63a35ec45c1d1b642654e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/sl/thunderbird-91.8.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d2020220b3c54b9bbc114ff367c10818541bd070f5e0e0d4c56fdbb027bd8d85"; + sha256 = "8ce25c995945f164756d3b6727c5c2d49397520a0fdc1ec5b448bd04664f1314"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sq/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/sq/thunderbird-91.8.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "91cc13d2a69372b619273feeabb961ae4e27dda6973b64cbb316db7207760c27"; + sha256 = "db65e73da83a12d1e10713b0ace13250c127e798e91e81893ccb8f38bc635186"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/sr/thunderbird-91.8.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7b4c459eb200c9d407acfbcc451290a5f43c6b9f0aa4dac6d4536c267b6afadf"; + sha256 = "0cf912a9d51cb3ffb6cf7aa3eeaa61a54c253a617abce216c37770dcf5c36344"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sv-SE/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/sv-SE/thunderbird-91.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "be920ab8279dfe412f5e12082a7709d0e24ea7869f5a86d36e65962430a5798e"; + sha256 = "86578eaf49e4ea08c0ce7573ff13c8f0c5e2a3e0d03028c04b37042ed0739b1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/th/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/th/thunderbird-91.8.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2a6d558efee3c0d02e4695b77b1f9dbaacf673f499a4ef28e3763358bb61346f"; + sha256 = "44e9e7ea1807e41e51d531b6a5badd5ea660f19b52943ab012a1868c907d7a0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/tr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/tr/thunderbird-91.8.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "0cb0bb5991481cdb80d729f1c59276f4e1e12fac48b820fe5e352d63a44ff8ea"; + sha256 = "d95e9d475c73d31d90d1a1b4056501850386d0b727d4941a6927b92a7e1c1d6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/uk/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/uk/thunderbird-91.8.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "056a958ad687e5b3a0c707379d15ba2b23e17a5c11f113edebcecaf5ab229ada"; + sha256 = "a563e3da2a8f3f58b085ed06fb4a81ec0e7c36b2cbb777aa584857ee23793dcb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/uz/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/uz/thunderbird-91.8.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "31bf50803722d1b8017861da34237c41d725649a5884b33a15a3bc35738adb94"; + sha256 = "0005df2daa394d44ab2a413fc0f58b23569bfe30dc9a0d0789f86c2072158937"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/vi/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/vi/thunderbird-91.8.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "55b5d7c9c3ce8b02d58cb371b58afeff39f08e8b45b1d8875aaa267273ff65b0"; + sha256 = "7d987211388a37975dc93cb38a72e8e7e9a5a7535af5efecf5293ca5b1da6718"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/zh-CN/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/zh-CN/thunderbird-91.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "39983db7492adfd30f7c281f7de16f5538e65dfffd86579cc6abd91936c420b7"; + sha256 = "c043d0e5e1804090ab8cc8c740b2458c825def839c128391c0d6e71b36af4894"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/zh-TW/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/zh-TW/thunderbird-91.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "0b0dbff293c33ed286904f798153c64e8ee631430e9293bc384ca1f1368c44f8"; + sha256 = "3870ceaa2ea5c049877452a6b0c76dd7de9b85985b358076c0fc1c476d04a10c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/af/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/af/thunderbird-91.8.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "dd662bf17307215d0ffab8ea10852bf1a742b5dc0564b07b1f3583239169fccb"; + sha256 = "f004dc6825310f3f7554682816b0848e4461ca86d8d31b1f5f0287064be5af48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ar/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ar/thunderbird-91.8.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "b3ea9d805c423c3ae2b7bdf74bcc3bc3cda88467c28c3eb02c5cf9f42bcee801"; + sha256 = "be9fae6a15d1e3d7b4da462eaaa2cfa0317162c2ecfdbff8704d2f0239278380"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ast/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ast/thunderbird-91.8.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5853f37ec0ac021ace8ee23b2255bc680c2ac5a8c81a4023a98235d3fa2b53d4"; + sha256 = "5f92a809cf6d6a2df8477f54d1cf7a3ef65e27426fe184178bcc8c691a08487a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/be/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/be/thunderbird-91.8.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ef0149c8c758a487cfd748f0a0cd114ee01d3fe63605952e3f5cb02c0fe2e351"; + sha256 = "c87c60eee9c7cb082e7a06e608835d1e29154a06a77b688c564fceab1546eaa5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/bg/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/bg/thunderbird-91.8.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9ce3b7ee2fae34af3e272d1a0a24a086901e032e589169005a4b75ca1dff6051"; + sha256 = "f07c5dab6db9aec61478942a0b7add0fea0fb078c9be150efad19e606fcf7ebc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/br/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/br/thunderbird-91.8.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "6bb10ee9209b264889fd5338be11a6ed0295c4480eae1b0ca35ca8cd5e173066"; + sha256 = "d1b5d7c7de3ecb1b0b58989a25bbac3768b105730c6ddb87d1d3072001efa313"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ca/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ca/thunderbird-91.8.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "8b2cbcce416213c2628656722f2d6f4a8de47b8f601e6da665c99ba2710e3ae5"; + sha256 = "1e8e7f215c8a80504eaafcf3e867c6f8090953f685fc2bc7606f77efd11bd612"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cak/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/cak/thunderbird-91.8.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "140658bf9d5d0e7d8cdf7a6ecd987fd9d18a789d92a7ccc9fe64200fa531c0b6"; + sha256 = "43a0355b20dbc71adc4a6c35bba3e91d717ba08547c767303828f931b7cd26e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cs/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/cs/thunderbird-91.8.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5c4dffc7b3f672edbaf6906e487fc6636ab25fcc8dc9e3697b2b8d2a90ba24da"; + sha256 = "987a95eadb174ac453cc619b97ab4b5dbdc474de821f16a2e9f4906483792656"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cy/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/cy/thunderbird-91.8.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "b248ee575f00f1b4de3ac4be15886f270366b1073ad6dd84f4807ecc7fbd9a9f"; + sha256 = "1ee7b2902fa1fe373dd2ae2529af1c2f87f442c91618f2a470052641a6e963a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/da/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/da/thunderbird-91.8.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "e2c03805474f8c39467217cd26a08133fd3cba61de35d4a2515b1d535bea6d0b"; + sha256 = "09e15245d38b7d2963f1558c42ed13452737679459b9f78769dc0726cb8e42c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/de/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/de/thunderbird-91.8.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "5de15b1da2b90eac08889791178a2d8b304b97bb4377c2478a0142ad0dc166f0"; + sha256 = "1fcdd9e52197d1925a42fe193980bd1415d6c280afc8e0148f7ea3903fb79a7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/dsb/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/dsb/thunderbird-91.8.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "20c2c5e9a57440eb046b35ce7f549d846e17afd26cf4883d7ee9de2223bce0d2"; + sha256 = "362cef9146611f09d969893c4b4c7a8ba7b3d46a1b49183cba0eb8d7d46d2db9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/el/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/el/thunderbird-91.8.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "3c5c3462455517f391ef0aa194a39522397d971e8d5ab2113a47cde1bea3b7b6"; + sha256 = "7360fcb00c20b8dfdb2434d2347e8bffadcadc7fd50773dd96bc9173b3e800a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-CA/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/en-CA/thunderbird-91.8.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "adee07c4cc48bcd3595d32c881bedabf3410df9c3517c3f8f6feeb237552451d"; + sha256 = "86025c58c29acf2cc98ba6be305629605a3ad10304c87d6f4d55cb9948ddbb46"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-GB/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/en-GB/thunderbird-91.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b9eaf0f03ac73e961a160017bfc3f4537592d6d6d63239c3a8249fdb08a5f232"; + sha256 = "2535a948b23327f66c186387a50eeec44ab3eb42859be5ce9beeb660a47e1b1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-US/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/en-US/thunderbird-91.8.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "50783e08cf7bcb904bcca66270b55570a961390d078dae9998fcf8e527f92d3f"; + sha256 = "889e6f3f8d0b5b372b08ea3b85b9cc890ad62ef60d9bd41b3e4e9387e1361e7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/es-AR/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/es-AR/thunderbird-91.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e43babb45d6bffed8e2f27b7a21c211306322cec480b928124118b6bf999b6f9"; + sha256 = "f99012407c06c6b913207ac706fd542da011045b5503ff3290590332da09a7a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/es-ES/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/es-ES/thunderbird-91.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "eead62cde35d787634bb1b6e6e8a96458f05e68d0bb9cd66c3926350d890c5a2"; + sha256 = "ef8d7946c1c4475dcbe4144012630119e64bdcb3b809b4a00cebaa5d8effb5fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/et/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/et/thunderbird-91.8.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c3b4d1ebdc325e6ecd6f35012634ea5f4ffd620de7c30589a8999b128b986d59"; + sha256 = "5e2cefaaa8d44e3a90e7b31ac29ff62f9f3b50dff5b29ca1703bbe907a770d61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/eu/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/eu/thunderbird-91.8.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b23c783109a22c71bd5b337e2633bf2d17f8ee7b580faa43164b2ce7d70d5c45"; + sha256 = "7c89425da0c4c46e9291b7f039d7b42aae9442538b3afff0477b490f158ee473"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fi/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/fi/thunderbird-91.8.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "a34afada49c57d6816cfc472681b100366df881fdd343495b959df44dcc8bf5b"; + sha256 = "a861e4b0763b98c8d6361c2f36cee43cd12c6e7b9fcfa49010da9f861121fbbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/fr/thunderbird-91.8.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "85c5472de95eb357bba1eb697b17b309ec586717ef09a735cc94b3d7ee069ce3"; + sha256 = "0aab665a007cf87767f78a42c0ac3a767776895e9c0990a475545157878cbd87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fy-NL/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/fy-NL/thunderbird-91.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e654bd29cd2a4a99a09d0d7feca2af89cd308d8d9fca6ad1069e5b026e04cee2"; + sha256 = "1ed753c85bf519406001833b3ca3848262c6208eaec1899167704624a5b52701"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ga-IE/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ga-IE/thunderbird-91.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ae2e865abb044bb61f51f46636f84054f87ef0e2d46b0c4d85d990bcb05d45da"; + sha256 = "e2b75f8d236dd3a217c21461e2c0ae501fb23f0cabcc11a501aae8f0ca28175b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/gd/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/gd/thunderbird-91.8.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "54b117bb7ba110de0c3fb5e9c4d2743d54a49b941c273ed7f8c11dae30c1517e"; + sha256 = "6517d28e08abe6ae9cffb2e0d6cfe7407b137c7e4a2bd1fffd1f2d74592db168"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/gl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/gl/thunderbird-91.8.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "bcec6b86c99fd463cbb16974e43fb232bc93e5ff2b1b08b18332000b274eaa67"; + sha256 = "4bc16ea1a9939f1c0b363a34b580a4bf6601f646fdcd9c6d686fb07b1db4951b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/he/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/he/thunderbird-91.8.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9ab72a7b9a87a75b113421ceef891b3e546a056e48c039f7af20e85a1b17b598"; + sha256 = "1b60dde842257b9d9526618f5f7a13cacf6d9a8d7f9320073e9ca95a80633a32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/hr/thunderbird-91.8.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b8ec76e30180214f2c4d2743686e8de374207fbad8677d5801eb941174217834"; + sha256 = "a11ba48e82c8a78f21c0d38f947ea699f926842c5b8665d5e6b132754d063bbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hsb/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/hsb/thunderbird-91.8.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "5d35c9c51d1d94c55cf72901866ce0896770d8939fbbefe234f312f1b18c6b17"; + sha256 = "dfdd15a264d58454a721d7036db0659af9c920b71f1835a488338acab1540056"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hu/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/hu/thunderbird-91.8.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "dc34328fd070973dd230158679bc34ba79075eaf8c62b4c3d67fc9daa8fd04a2"; + sha256 = "126d2155fc30f15b6efa061d340d91926e0f72ff133411dad9fdfefaffa25210"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hy-AM/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/hy-AM/thunderbird-91.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "6e94dca126ef9f60dc8f6086b4396548fbf3db4cd85feba332ee9cdc5c5546e1"; + sha256 = "cc4d0984fe5caa81cf463a166a08af8d35bd7d68bef8a0b40b2edab4ffab3eb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/id/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/id/thunderbird-91.8.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "7ef09c4636f141fc19ca67e0787d1a04d4b6856d6bfc57732f1eacc31fe6b437"; + sha256 = "4dc4f402a2c3fb1d9f0f3fc10f937274f87bbb99f7442fbb782e6c91b6bef1a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/is/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/is/thunderbird-91.8.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "8644c28c791152e6de4bf932417328afbcb3ff1832e85ded577d88a045071ceb"; + sha256 = "9a52dec2873649da8e11105456e8d6cbb631b754f9988404c0985f03d10001d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/it/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/it/thunderbird-91.8.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "a17c80fdb39ff828ab0b7d8fb2274a2f9c1dafb4d8657c510e894697f72e6941"; + sha256 = "7764c87c166229b9b25410cbd816a49afcbf6ab37dae5ee071fc2940a068fc3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ja/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ja/thunderbird-91.8.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "50f48c0bb455132ee1a8e7f2a98a7e01688c0517c134dbf706538432615f44ec"; + sha256 = "9e858818a36ede51a15e2cf9e3b2b2d30dd83b6fe2cd5f66188776e3351e12f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ka/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ka/thunderbird-91.8.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "16b4cdc1dda75f62f664f5d0780e4dd9e65c91414fa3c6e546ed9ae39a5f251b"; + sha256 = "2e46a4036b32b90224e555691441c6a59e8e07fc6f0d6cae3aa591af3a2b04c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/kab/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/kab/thunderbird-91.8.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "ef2db45999395216684c0cdee16fbaa9ad8a665088d529bcb80df72d442b433b"; + sha256 = "0ae98410d16a73a4c42149b7b5c6325a58dacdd02ac8df0f263c51b8aad26e57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/kk/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/kk/thunderbird-91.8.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "fb1e05654c70c6b4361892799bf5e2b2035183407db9cae5307b4191548c3bd9"; + sha256 = "b74a98dda02f144ecc4a1fb76f014689d3c5a0d95805ca2adaccc7739f397296"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ko/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ko/thunderbird-91.8.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "ca29bff1b2276510bba6bdaf280ea8a198fc36c77b325e60a4c1f5207a16a7e2"; + sha256 = "074f6f4ac2ebd983490f6cc42a4ac8603da13f056145aa5dc577b2fe3fa4a4da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/lt/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/lt/thunderbird-91.8.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "7551bc85a46fa13c4fd7d72b31d34bda108bf5c7831825b7906c153542918f86"; + sha256 = "afb32ea82d83808ab40f33db0fa95462479bae8f237defa0c702a3d95fcc91d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/lv/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/lv/thunderbird-91.8.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "a6fd175e80f8f14431500cd272f7a277ab7b210b6d81c4b80c333e34e13260f7"; + sha256 = "91661ab053978137acb9bb6e820dfba0ee5007bc12b440504efaa6aa6c62f444"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ms/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ms/thunderbird-91.8.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "5fcb5b9a0a04957192a40fda0b097a1f781a98d9b18e6165810bbfad96cf188a"; + sha256 = "ba06582eb17d830d0805040810098db7fef4a001f8b5f8228491c0449ccb29f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nb-NO/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/nb-NO/thunderbird-91.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "50d5e767ea3c826d3c924d5a50bce2db2eff9b5ada8c2fd10b4bd8c85061e9da"; + sha256 = "c2463574caf1bbf6dee227ec57fae53178a713dcfd05e866b6458d9dc0f8febd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/nl/thunderbird-91.8.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "c44d23adedd33715a38aa6a704de273de1034dbf0964698224463a2eb3a22fde"; + sha256 = "2e84666be34fb7883a4ded36ab0a71ba987c554abb08c959330689ef15d3ac04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nn-NO/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/nn-NO/thunderbird-91.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "c2081d7dc420cf97cbfc38901af9e3654bdd00610ad27cfc0a006afb7de003c5"; + sha256 = "2e08edd2b0d198b1d6614af26fa86c3c6b646f6b53324aa6d7cda4629ab2dbf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pa-IN/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/pa-IN/thunderbird-91.8.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "426e6b686e8cfa660dadda666b7bfdc0a70ccb5db4134e4960cf7c408e88c9e4"; + sha256 = "9b5562cfa1a3c36b8f4f8a703ed232e5045812346cbb604f310b8c1861a99213"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/pl/thunderbird-91.8.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c667bddefd1b82dd4945ca3a4a392f60b27ab7ab56e1b9fece0cac0dc4eb4971"; + sha256 = "5ce1e65dc07f4f1d720abd18e31252aa74bdbb22f29305dfd23825fc9aec9062"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pt-BR/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/pt-BR/thunderbird-91.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ea24bf62001fa225ed08a05a34f8e5b0579de6c6b79fa08bd28760f41607ffd2"; + sha256 = "440af4305a7a2d8382e6d791b1cde11673b4a0b35973126b6f5b44f7ab236e84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pt-PT/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/pt-PT/thunderbird-91.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "8676b8fcd019099ede4973fa1e949e63ea06bd5dc599cc6dcc836dc49fdf4470"; + sha256 = "47f456163ee3036b9a20542b3a5fb0e6997fa9c3ea431c38964c887669191c42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/rm/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/rm/thunderbird-91.8.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "4aa9681f172a62d5be35c5c4e3ba500253541ef4f8e38eaf37fcb41dac7989c2"; + sha256 = "7c26dd177759f7c40a3106b9189cf245ef43be2e732d187ed1cdce44ba533073"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ro/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ro/thunderbird-91.8.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "12c57824de26d6bfde6e9de1c3d5b5b1481213ce939fc4860c2fc86aaf8d64a1"; + sha256 = "0297de849e5f1a5400023b40682980ec886fbe54087f8db6b3a316d5cdb2d5d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ru/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ru/thunderbird-91.8.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "3afa7da7eacf0a3479b92a72c3d1f503d62961a9683c9cf5a538da90e5a3bae8"; + sha256 = "c766d619d8bacc87fd729d3aa6b3a16741070a91181416243b389d5b25dd4829"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sk/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/sk/thunderbird-91.8.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "1f5b0a28de82f795eb54daf44b8b807fdd30a7bff9dc5d1565adb001d38bd354"; + sha256 = "9ba8276dab20f0e7c9820f2aae046ab4bbfd8a032b07282f1fd09bab167793da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/sl/thunderbird-91.8.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "340026146fd09e3ed7a49a7123898b3d005a147d4988bc2df2c86b173fa088fb"; + sha256 = "a15a3cf75610b0acb93fe067a9fc4f2c7298bfa7654175275a96c0ee8e7fdd89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sq/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/sq/thunderbird-91.8.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "64a9d0d4652d2d709aed3aa1e2a09bcf17ce936c0c4c950a27f8784e0a89d995"; + sha256 = "f1578326fdca0beeb09ed4bbe80178a5878a1bcac2f480a7e4155ee882f29197"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/sr/thunderbird-91.8.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "eb59bc42ef366a5ecf98f20f53113e69cc2f6591008bcccf592bc76dab636945"; + sha256 = "8fcd6be0a44a115630544bd5fb652a4dd3c4659a8233ab5aaeea7326c89d2c90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sv-SE/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/sv-SE/thunderbird-91.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0f833b8b7a83b06b2f3cab5bffe94bfe28cbfc043543f73102f6789fdce95e61"; + sha256 = "f4dac959ee9f29349228f055ae7409cadf2be0de9461bcaac940da4ea9f33c6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/th/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/th/thunderbird-91.8.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "149d88dbb883e9eb04584d080d5e746a0165fa9cecc100e1af875414bd2c1154"; + sha256 = "a3306d06a99bd4ae38b3289e9feaef2cb3e21fb46936ca1e369a21d114d033ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/tr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/tr/thunderbird-91.8.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "7b92aa7c7ace49f7e7d0489b5c69a2c1282fc267b3650aec765e194413b6e9e4"; + sha256 = "03cda6244d38a28e3420028288e3768fa668fb5358d047c6ea463a644e655c53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/uk/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/uk/thunderbird-91.8.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "217e921fb8d0fb6773ec7b4dabcb9a29293b15d2024353a4b542c8660f93e924"; + sha256 = "29800c3dd81f9851c19ef5c54c6a7bc18fbda218ef76cf5edd22a142b2d2d791"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/uz/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/uz/thunderbird-91.8.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9428919a2d99f2ae953e50d148ab27200a3d9d8d02e5a8f5615a804468867922"; + sha256 = "bb6020331a871f28003df188628cbc157409f3b97160efd02b71127faeff67d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/vi/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/vi/thunderbird-91.8.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "2ee2b69190e6a5640b378d8a4b1dbe78aff7cae1db131aa162e23ee6626ee215"; + sha256 = "8bc4c487dcda84a4a103ef287388c418b95c4ed78c80e2e5936fb654a6df3c43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/zh-CN/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/zh-CN/thunderbird-91.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "e0537b6f509428a3721bac1ab4ff4567568d9854ece675a68a7bc2c058176e7f"; + sha256 = "a41ca9b5e47f7628721ebb397f04e5cab625c5eb297b793a08f8103d9578c45f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/zh-TW/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/zh-TW/thunderbird-91.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ec7aec372154e7e7281fd1b2d84068140c50577d8e1f3ad30006092fefc61766"; + sha256 = "22489a052fc34ab1d364ee305c26b6d495b6ef4381e038427869a85d78ffe274"; } ]; } From b68eb22b90e3b42f10e93d0289747147ac530bf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 03:48:17 +0000 Subject: [PATCH 013/171] xjadeo: 0.8.10 -> 0.8.11 --- pkgs/tools/video/xjadeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/xjadeo/default.nix b/pkgs/tools/video/xjadeo/default.nix index bcd6d5601c0f..53d6c49b7e64 100644 --- a/pkgs/tools/video/xjadeo/default.nix +++ b/pkgs/tools/video/xjadeo/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "xjadeo"; - version = "0.8.10"; + version = "0.8.11"; src = fetchFromGitHub { owner = "x42"; repo = "xjadeo"; rev = "v${version}"; - sha256 = "0dma4cjgbrpy16x63zvfr0xss4lryl0zw7nvixvhq2f6z8day1ds"; + sha256 = "sha256-S8eIkmfjwpcILZc+by0Mk4VPRUlbJT0GBe8NlJ1F9EI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From b3dfff282b114daf304aa4c97a2532cd9b6b8ca3 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 3 Feb 2022 09:56:55 -0500 Subject: [PATCH 014/171] openstack-image: minor cleanups Format and remove unnecessary `with lib;`. --- .../maintainers/scripts/openstack/openstack-image.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/maintainers/scripts/openstack/openstack-image.nix b/nixos/maintainers/scripts/openstack/openstack-image.nix index 3255e7f3d44d..6638eb099938 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image.nix @@ -1,14 +1,11 @@ # nix-build '' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }" { config, lib, pkgs, ... }: - -with lib; - { - imports = - [ ../../../modules/installer/cd-dvd/channel.nix - ../../../modules/virtualisation/openstack-config.nix - ]; + imports = [ + ../../../modules/installer/cd-dvd/channel.nix + ../../../modules/virtualisation/openstack-config.nix + ]; system.build.openstackImage = import ../../../lib/make-disk-image.nix { inherit lib config; From e9f015480c0573736cc87b5a90588a0b92a507d3 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 3 Feb 2022 09:57:01 -0500 Subject: [PATCH 015/171] openstack-image: make it easy to disable copying the channel to improve iteration time --- .../maintainers/scripts/openstack/openstack-image.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/maintainers/scripts/openstack/openstack-image.nix b/nixos/maintainers/scripts/openstack/openstack-image.nix index 6638eb099938..6728a98758b8 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image.nix @@ -1,14 +1,18 @@ # nix-build '' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }" { config, lib, pkgs, ... }: +let + copyChannel = true; +in { imports = [ - ../../../modules/installer/cd-dvd/channel.nix ../../../modules/virtualisation/openstack-config.nix - ]; + ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix); + + documentation.enable = copyChannel; system.build.openstackImage = import ../../../lib/make-disk-image.nix { - inherit lib config; + inherit lib config copyChannel; additionalSpace = "1024M"; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package format = "qcow2"; From b8fe792394757f415c71c6cf20de10899c2388b1 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 3 Feb 2022 10:39:52 -0500 Subject: [PATCH 016/171] openstack-image-zfs: init --- .../scripts/openstack/openstack-image-zfs.nix | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 nixos/maintainers/scripts/openstack/openstack-image-zfs.nix diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix new file mode 100644 index 000000000000..dbd088e04141 --- /dev/null +++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix @@ -0,0 +1,115 @@ +# nix-build '' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }" + +{ config, lib, pkgs, ... }: +let + inherit (lib) mkOption types; + copyChannel = false; + cfg = config.openstackImage; + imageBootMode = if config.openstack.efi then "uefi" else "legacy-bios"; +in +{ + imports = [ + ../../../modules/virtualisation/openstack-config.nix + ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix); + + + options.openstackImage = { + name = mkOption { + type = types.str; + description = "The name of the generated derivation"; + default = "nixos-openstack-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}"; + }; + + sizeMB = mkOption { + type = types.int; + default = 8192; + description = "The size in MB of the image"; + }; + + format = mkOption { + type = types.enum [ "raw" "qcow2" "vpc" ]; + default = "vpc"; + description = "The image format to output"; + }; + }; + + config = { + documentation.enable = copyChannel; + openstack = { + efi = true; + zfs = { + enable = true; + datasets = { + "tank/system/root".mount = "/"; + "tank/system/var".mount = "/var"; + "tank/local/nix".mount = "/nix"; + "tank/user/home".mount = "/home"; + }; + }; + }; + + system.build.openstackImage' = import ../../../lib/make-disk-image.nix { + inherit lib config copyChannel; + additionalSpace = "1024M"; + pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package + format = "qcow2"; + + }; + + system.build.openstackImage = import ../../../lib/make-zfs-image.nix { + inherit lib config; + inherit (cfg) contents format name; + pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package + + configFile = pkgs.writeText "configuration.nix" + '' + { + imports = [ ]; + } + ''; + + includeChannel = copyChannel; + + bootSize = 1000; + + rootSize = cfg.sizeMB; + rootPoolProperties = { + ashift = 12; + autoexpand = "on"; + }; + + datasets = config.openstack.zfs.datasets; + + postVM = '' + extension=''${rootDiskImage##*.} + friendlyName=$out/${cfg.name} + rootDisk="$friendlyName.root.$extension" + bootDisk="$friendlyName.boot.$extension" + mv "$rootDiskImage" "$rootDisk" + mv "$bootDiskImage" "$bootDisk" + + mkdir -p $out/nix-support + echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products + echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products + + ${pkgs.jq}/bin/jq -n \ + --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ + --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_mode "${imageBootMode}" \ + --arg root "$rootDisk" \ + --arg boot "$bootDisk" \ + '{} + | .label = $system_label + | .boot_mode = $boot_mode + | .system = $system + | .disks.boot.logical_bytes = $boot_logical_bytes + | .disks.boot.file = $boot + | .disks.root.logical_bytes = $root_logical_bytes + | .disks.root.file = $root + ' > $out/nix-support/image-info.json + ''; + }; + }; +} From 80b00ef02a8efc958e2a16a7264c147e2a8ffbf4 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 3 Feb 2022 11:03:38 -0500 Subject: [PATCH 017/171] openstack-options: init --- nixos/modules/module-list.nix | 1 + .../virtualisation/openstack-options.nix | 71 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 nixos/modules/virtualisation/openstack-options.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1ad2592b1dd7..734d1dfa8dc3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1235,6 +1235,7 @@ ./virtualisation/amazon-options.nix ./virtualisation/hyperv-guest.nix ./virtualisation/kvmgt.nix + ./virtualisation/openstack-options.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/podman/default.nix diff --git a/nixos/modules/virtualisation/openstack-options.nix b/nixos/modules/virtualisation/openstack-options.nix new file mode 100644 index 000000000000..cbc779f27c8f --- /dev/null +++ b/nixos/modules/virtualisation/openstack-options.nix @@ -0,0 +1,71 @@ +{ config, lib, pkgs, ... }: +let + inherit (lib) literalExpression types; +in +{ + options = { + openstack = { + zfs = { + enable = lib.mkOption { + default = false; + internal = true; + description = '' + Whether the OpenStack instance uses a ZFS root. + ''; + }; + + datasets = lib.mkOption { + description = '' + Datasets to create under the `tank` and `boot` zpools. + + **NOTE:** This option is used only at image creation time, and + does not attempt to declaratively create or manage datasets + on an existing system. + ''; + + default = { }; + + type = types.attrsOf (types.submodule { + options = { + mount = lib.mkOption { + description = "Where to mount this dataset."; + type = types.nullOr types.string; + default = null; + }; + + properties = lib.mkOption { + description = "Properties to set on this dataset."; + type = types.attrsOf types.string; + default = { }; + }; + }; + }); + }; + }; + + efi = lib.mkOption { + default = pkgs.stdenv.hostPlatform.isAarch64; + defaultText = literalExpression "pkgs.stdenv.hostPlatform.isAarch64"; + internal = true; + description = '' + Whether the instance is using EFI. + ''; + }; + }; + }; + + config = lib.mkIf config.openstack.zfs.enable { + networking.hostId = lib.mkDefault "00000000"; + + fileSystems = + let + mountable = lib.filterAttrs (_: value: ((value.mount or null) != null)) config.openstack.zfs.datasets; + in + lib.mapAttrs' + (dataset: opts: lib.nameValuePair opts.mount { + device = dataset; + fsType = "zfs"; + }) + mountable; + }; +} From e5a7d077c1a1d6a91e40634e9fd4841a91b4bb1f Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 3 Feb 2022 11:05:52 -0500 Subject: [PATCH 018/171] openstack-config: support a ZFS root with /boot perhaps coming from an ESP --- .../virtualisation/openstack-config.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/nixos/modules/virtualisation/openstack-config.nix b/nixos/modules/virtualisation/openstack-config.nix index d01e0f23aba1..a5aa4b38eb66 100644 --- a/nixos/modules/virtualisation/openstack-config.nix +++ b/nixos/modules/virtualisation/openstack-config.nix @@ -1,8 +1,8 @@ -{ pkgs, lib, ... }: - -with lib; +{ config, pkgs, lib, ... }: let + inherit (lib) mkIf mkDefault; + cfg = config.openstack; metadataFetcher = import ./openstack-metadata-fetcher.nix { targetRoot = "/"; wgetExtraOptions = "--retry-connrefused"; @@ -18,16 +18,27 @@ in ]; config = { - fileSystems."/" = { + fileSystems."/" = mkIf (!cfg.zfs.enable) { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; autoResize = true; }; + fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) { + # The ZFS image uses a partition labeled ESP whether or not we're + # booting with EFI. + device = "/dev/disk/by-label/ESP"; + fsType = "vfat"; + }; + boot.growPartition = true; boot.kernelParams = [ "console=ttyS0" ]; - boot.loader.grub.device = "/dev/vda"; - boot.loader.timeout = 0; + boot.loader.grub.device = if (!cfg.efi) then "/dev/vda" else "nodev"; + boot.loader.grub.efiSupport = cfg.efi; + boot.loader.grub.efiInstallAsRemovable = cfg.efi; + + services.zfs.expandOnBoot = mkIf cfg.zfs.enable "all"; + boot.zfs.devNodes = mkIf cfg.zfs.enable "/dev/"; # Allow root logins services.openssh = { @@ -43,7 +54,7 @@ in path = [ pkgs.wget ]; description = "Fetch Metadata on startup"; wantedBy = [ "multi-user.target" ]; - before = [ "apply-ec2-data.service" "amazon-init.service"]; + before = [ "apply-ec2-data.service" "amazon-init.service" ]; wants = [ "network-online.target" ]; after = [ "network-online.target" ]; script = metadataFetcher; From 14304bfe40d8fa90f6a371cd6445a3ec7d09e0e9 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 24 Mar 2022 08:58:54 -0700 Subject: [PATCH 019/171] openstack-config: setup serial access on ttyS0 --- nixos/modules/virtualisation/openstack-config.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/modules/virtualisation/openstack-config.nix b/nixos/modules/virtualisation/openstack-config.nix index a5aa4b38eb66..0b392cca68e1 100644 --- a/nixos/modules/virtualisation/openstack-config.nix +++ b/nixos/modules/virtualisation/openstack-config.nix @@ -11,7 +11,11 @@ in { imports = [ ../profiles/qemu-guest.nix + + # Note: While we do use the headless profile, we also explicitly + # turn on the serial console on ttyS0 below. ../profiles/headless.nix + # The Openstack Metadata service exposes data on an EC2 API also. ./ec2-data.nix ./amazon-init.nix @@ -36,6 +40,12 @@ in boot.loader.grub.device = if (!cfg.efi) then "/dev/vda" else "nodev"; boot.loader.grub.efiSupport = cfg.efi; boot.loader.grub.efiInstallAsRemovable = cfg.efi; + boot.loader.timeout = 1; + boot.loader.grub.extraConfig = '' + serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1 + terminal_output console serial + terminal_input console serial + ''; services.zfs.expandOnBoot = mkIf cfg.zfs.enable "all"; boot.zfs.devNodes = mkIf cfg.zfs.enable "/dev/"; @@ -47,6 +57,11 @@ in passwordAuthentication = mkDefault false; }; + users.users.root.initialPassword = "foobar"; + + # Enable the serial console on ttyS0 + systemd.services."serial-getty@ttyS0".enable = true; + # Force getting the hostname from Openstack metadata. networking.hostName = mkDefault ""; From a8f41adbb753f1a94cfd9086f09b177cf11a7a4b Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 16 Feb 2022 13:56:51 -0500 Subject: [PATCH 020/171] amazon-image: use make-multi-disk-zfs-image --- nixos/lib/{make-zfs-image.nix => make-multi-disk-zfs-image.nix} | 0 nixos/maintainers/scripts/ec2/amazon-image.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename nixos/lib/{make-zfs-image.nix => make-multi-disk-zfs-image.nix} (100%) diff --git a/nixos/lib/make-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix similarity index 100% rename from nixos/lib/make-zfs-image.nix rename to nixos/lib/make-multi-disk-zfs-image.nix diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 6358ec68f7cf..2d89db0a7f34 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -73,7 +73,7 @@ in { } ''; - zfsBuilder = import ../../../lib/make-zfs-image.nix { + zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix { inherit lib config configFile; inherit (cfg) contents format name; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package From d4c502a94a03a66da48870f30588dc7d601c50f8 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 21 Feb 2022 14:56:56 -0500 Subject: [PATCH 021/171] openstack-metadata-fetcher: don't fail if any specific wget's fail --- nixos/modules/virtualisation/openstack-metadata-fetcher.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix index 25104bb47667..d62428b47a44 100644 --- a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix +++ b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix @@ -14,9 +14,9 @@ wget ${wgetExtraOptions} "$@" } - wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path + wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path || true # When no user-data is provided, the OpenStack metadata server doesn't expose the user-data route. (umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data || rm -f "$metaDir/user-data") - wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname - wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key + wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname || true + wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key || true '' From 1c0b76b5c447ff0879ae5e57fa8af0cb5639bdd8 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 8 Mar 2022 09:21:41 -0500 Subject: [PATCH 022/171] openstack-image-zfs: don't support vpc type, default to qcow2 --- nixos/maintainers/scripts/openstack/openstack-image-zfs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix index dbd088e04141..714b24a9e046 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix @@ -27,8 +27,8 @@ in }; format = mkOption { - type = types.enum [ "raw" "qcow2" "vpc" ]; - default = "vpc"; + type = types.enum [ "raw" "qcow2" ]; + default = "qcow2"; description = "The image format to output"; }; }; From 0a086bf7bf88d617f0cb126f8119e9e57b77af45 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 8 Mar 2022 09:22:38 -0500 Subject: [PATCH 023/171] openstack-config: enable tty1 This appears to be the "default" console for openstack, but my evidence is experience on just one provider. --- nixos/modules/virtualisation/openstack-config.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/modules/virtualisation/openstack-config.nix b/nixos/modules/virtualisation/openstack-config.nix index 0b392cca68e1..c5c832fb8105 100644 --- a/nixos/modules/virtualisation/openstack-config.nix +++ b/nixos/modules/virtualisation/openstack-config.nix @@ -13,7 +13,10 @@ in ../profiles/qemu-guest.nix # Note: While we do use the headless profile, we also explicitly - # turn on the serial console on ttyS0 below. + # turn on the serial console on tty1 below. + # Note that I could not find any documentation indicating tty1 was + # the correct choice. I picked tty1 because that is what one + # particular host was using. ../profiles/headless.nix # The Openstack Metadata service exposes data on an EC2 API also. @@ -36,13 +39,13 @@ in }; boot.growPartition = true; - boot.kernelParams = [ "console=ttyS0" ]; + boot.kernelParams = [ "console=tty1" ]; boot.loader.grub.device = if (!cfg.efi) then "/dev/vda" else "nodev"; boot.loader.grub.efiSupport = cfg.efi; boot.loader.grub.efiInstallAsRemovable = cfg.efi; boot.loader.timeout = 1; boot.loader.grub.extraConfig = '' - serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1 + serial --unit=1 --speed=115200 --word=8 --parity=no --stop=1 terminal_output console serial terminal_input console serial ''; @@ -59,8 +62,8 @@ in users.users.root.initialPassword = "foobar"; - # Enable the serial console on ttyS0 - systemd.services."serial-getty@ttyS0".enable = true; + # Enable the serial console on tty1 + systemd.services."serial-getty@tty1".enable = true; # Force getting the hostname from Openstack metadata. networking.hostName = mkDefault ""; From 9e3dab7d2e2f7e08baa65dfec78e27343608bdbd Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 8 Mar 2022 09:24:33 -0500 Subject: [PATCH 024/171] openstack-image-zfs: build a single-image ZFS root --- .../scripts/openstack/openstack-image-zfs.nix | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix index 714b24a9e046..b18b3265283f 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix @@ -48,15 +48,7 @@ in }; }; - system.build.openstackImage' = import ../../../lib/make-disk-image.nix { - inherit lib config copyChannel; - additionalSpace = "1024M"; - pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - format = "qcow2"; - - }; - - system.build.openstackImage = import ../../../lib/make-zfs-image.nix { + system.build.openstackImage = import ../../../lib/make-single-disk-zfs-image.nix { inherit lib config; inherit (cfg) contents format name; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package @@ -84,28 +76,21 @@ in extension=''${rootDiskImage##*.} friendlyName=$out/${cfg.name} rootDisk="$friendlyName.root.$extension" - bootDisk="$friendlyName.boot.$extension" mv "$rootDiskImage" "$rootDisk" - mv "$bootDiskImage" "$bootDisk" mkdir -p $out/nix-support - echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products ${pkgs.jq}/bin/jq -n \ --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ - --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg boot_mode "${imageBootMode}" \ --arg root "$rootDisk" \ - --arg boot "$bootDisk" \ '{} | .label = $system_label | .boot_mode = $boot_mode | .system = $system - | .disks.boot.logical_bytes = $boot_logical_bytes - | .disks.boot.file = $boot | .disks.root.logical_bytes = $root_logical_bytes | .disks.root.file = $root ' > $out/nix-support/image-info.json From b4c495aeffb610cffd08e0000817f02742365dec Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 8 Mar 2022 09:25:26 -0500 Subject: [PATCH 025/171] openstack-image-zfs: make the generated configuration.nix valid Drops the wrong expandOnBoot option (defaults to all) and mark ZFS as enabled. --- nixos/maintainers/scripts/openstack/openstack-image-zfs.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix index b18b3265283f..515cc5cb38b3 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix @@ -55,8 +55,9 @@ in configFile = pkgs.writeText "configuration.nix" '' - { - imports = [ ]; + { modulesPath, ... }: { + imports = [ "''${modulesPath}/virtualisation/openstack-config.nix" ]; + openstack.zfs.enable = true; } ''; From 8a5bdce5665e24c1656aab2235ac9bd556316adf Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 8 Mar 2022 09:25:44 -0500 Subject: [PATCH 026/171] make-single-disk-zfs-image: init --- nixos/lib/make-single-disk-zfs-image.nix | 322 +++++++++++++++++++++++ 1 file changed, 322 insertions(+) create mode 100644 nixos/lib/make-single-disk-zfs-image.nix diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix new file mode 100644 index 000000000000..9310febd9179 --- /dev/null +++ b/nixos/lib/make-single-disk-zfs-image.nix @@ -0,0 +1,322 @@ +# Note: This is a private API, internal to NixOS. Its interface is subject +# to change without notice. +# +# The result of this builder is a single disk image, partitioned like this: +# +# * partition #1: a very small, 1MiB partition to leave room for Grub. +# +# * partition #2: boot, a partition formatted with FAT to be used for /boot. +# FAT is chosen to support EFI. +# +# * partition #3: nixos, a partition dedicated to a zpool. +# +# This single-disk approach does not satisfy ZFS's requirements for autoexpand, +# however automation can expand it anyway. For example, with +# `services.zfs.expandOnBoot`. +{ lib +, pkgs +, # The NixOS configuration to be installed onto the disk image. + config + +, # size of the FAT partition, in megabytes. + bootSize ? 1024 + +, # The size of the root partition, in megabytes. + rootSize ? 2048 + +, # The name of the ZFS pool + rootPoolName ? "tank" + +, # zpool properties + rootPoolProperties ? { + autoexpand = "on"; + } +, # pool-wide filesystem properties + rootPoolFilesystemProperties ? { + acltype = "posixacl"; + atime = "off"; + compression = "on"; + mountpoint = "legacy"; + xattr = "sa"; + } + +, # datasets, with per-attribute options: + # mount: (optional) mount point in the VM + # properties: (optional) ZFS properties on the dataset, like filesystemProperties + # Notes: + # 1. datasets will be created from shorter to longer names as a simple topo-sort + # 2. you should define a root's dataset's mount for `/` + datasets ? { } + +, # The files and directories to be placed in the target file system. + # This is a list of attribute sets {source, target} where `source' + # is the file system object (regular file or directory) to be + # grafted in the file system at path `target'. + contents ? [ ] + +, # The initial NixOS configuration file to be copied to + # /etc/nixos/configuration.nix. This configuration will be embedded + # inside a configuration which includes the described ZFS fileSystems. + configFile ? null + +, # Shell code executed after the VM has finished. + postVM ? "" + +, name ? "nixos-disk-image" + +, # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw. + format ? "raw" + +, # Include a copy of Nixpkgs in the disk image + includeChannel ? true +}: +let + formatOpt = if format == "qcow2-compressed" then "qcow2" else format; + + compress = lib.optionalString (format == "qcow2-compressed") "-c"; + + filenameSuffix = "." + { + qcow2 = "qcow2"; + vdi = "vdi"; + vpc = "vhd"; + raw = "img"; + }.${formatOpt} or formatOpt; + rootFilename = "nixos.root${filenameSuffix}"; + + # FIXME: merge with channel.nix / make-channel.nix. + channelSources = + let + nixpkgs = lib.cleanSource pkgs.path; + in + pkgs.runCommand "nixos-${config.system.nixos.version}" { } '' + mkdir -p $out + cp -prd ${nixpkgs.outPath} $out/nixos + chmod -R u+w $out/nixos + if [ ! -e $out/nixos/nixpkgs ]; then + ln -s . $out/nixos/nixpkgs + fi + rm -rf $out/nixos/.git + echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix + ''; + + closureInfo = pkgs.closureInfo { + rootPaths = [ config.system.build.toplevel ] + ++ (lib.optional includeChannel channelSources); + }; + + modulesTree = pkgs.aggregateModules + (with config.boot.kernelPackages; [ kernel zfs ]); + + tools = lib.makeBinPath ( + with pkgs; [ + config.system.build.nixos-enter + config.system.build.nixos-install + dosfstools + e2fsprogs + gptfdisk + nix + parted + utillinux + zfs + ] + ); + + hasDefinedMount = disk: ((disk.mount or null) != null); + + stringifyProperties = prefix: properties: lib.concatStringsSep " \\\n" ( + lib.mapAttrsToList + ( + property: value: "${prefix} ${lib.escapeShellArg property}=${lib.escapeShellArg value}" + ) + properties + ); + + featuresToProperties = features: + lib.listToAttrs + (builtins.map + (feature: { + name = "feature@${feature}"; + value = "enabled"; + }) + features); + + createDatasets = + let + datasetlist = lib.mapAttrsToList lib.nameValuePair datasets; + sorted = lib.sort (left: right: (lib.stringLength left.name) < (lib.stringLength right.name)) datasetlist; + cmd = { name, value }: + let + properties = stringifyProperties "-o" (value.properties or { }); + in + "zfs create -p ${properties} ${name}"; + in + lib.concatMapStringsSep "\n" cmd sorted; + + mountDatasets = + let + datasetlist = lib.mapAttrsToList lib.nameValuePair datasets; + mounts = lib.filter ({ value, ... }: hasDefinedMount value) datasetlist; + sorted = lib.sort (left: right: (lib.stringLength left.value.mount) < (lib.stringLength right.value.mount)) mounts; + cmd = { name, value }: + '' + mkdir -p /mnt${lib.escapeShellArg value.mount} + mount -t zfs ${name} /mnt${lib.escapeShellArg value.mount} + ''; + in + lib.concatMapStringsSep "\n" cmd sorted; + + unmountDatasets = + let + datasetlist = lib.mapAttrsToList lib.nameValuePair datasets; + mounts = lib.filter ({ value, ... }: hasDefinedMount value) datasetlist; + sorted = lib.sort (left: right: (lib.stringLength left.value.mount) > (lib.stringLength right.value.mount)) mounts; + cmd = { name, value }: + '' + umount /mnt${lib.escapeShellArg value.mount} + ''; + in + lib.concatMapStringsSep "\n" cmd sorted; + + + fileSystemsCfgFile = + let + mountable = lib.filterAttrs (_: value: hasDefinedMount value) datasets; + in + pkgs.runCommand "filesystem-config.nix" + { + buildInputs = with pkgs; [ jq nixpkgs-fmt ]; + filesystems = builtins.toJSON { + fileSystems = lib.mapAttrs' + ( + dataset: attrs: + { + name = attrs.mount; + value = { + fsType = "zfs"; + device = "${dataset}"; + }; + } + ) + mountable; + }; + passAsFile = [ "filesystems" ]; + } '' + ( + echo "builtins.fromJSON '''" + jq . < "$filesystemsPath" + echo "'''" + ) > $out + + nixpkgs-fmt $out + ''; + + mergedConfig = + if configFile == null + then fileSystemsCfgFile + else + pkgs.runCommand "configuration.nix" + { + buildInputs = with pkgs; [ nixpkgs-fmt ]; + } + '' + ( + echo '{ imports = [' + printf "(%s)\n" "$(cat ${fileSystemsCfgFile})"; + printf "(%s)\n" "$(cat ${configFile})"; + echo ']; }' + ) > $out + + nixpkgs-fmt $out + ''; + + image = ( + pkgs.vmTools.override { + rootModules = + [ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++ + (pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos"); + kernel = modulesTree; + } + ).runInLinuxVM ( + pkgs.runCommand name + { + memSize = 1024; + QEMU_OPTS = "-drive file=$rootDiskImage,if=virtio,cache=unsafe,werror=report"; + preVM = '' + PATH=$PATH:${pkgs.qemu_kvm}/bin + mkdir $out + + rootDiskImage=root.raw + qemu-img create -f raw $rootDiskImage ${toString (bootSize + rootSize)}M + ''; + + postVM = '' + ${if formatOpt == "raw" then '' + mv $rootDiskImage $out/${rootFilename} + '' else '' + ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename} + ''} + rootDiskImage=$out/${rootFilename} + set -x + ${postVM} + ''; + } '' + export PATH=${tools}:$PATH + set -x + + cp -sv /dev/vda /dev/sda + cp -sv /dev/vda /dev/xvda + + parted --script /dev/vda -- \ + mklabel gpt \ + mkpart no-fs 1MiB 2MiB \ + set 1 bios_grub on \ + align-check optimal 1 \ + mkpart primary fat32 2MiB ${toString bootSize}MiB \ + align-check optimal 2 \ + mkpart primary fat32 ${toString bootSize}MiB -1MiB \ + align-check optimal 3 \ + print + + sfdisk --dump /dev/vda + + + zpool create \ + ${stringifyProperties " -o" rootPoolProperties} \ + ${stringifyProperties " -O" rootPoolFilesystemProperties} \ + ${rootPoolName} /dev/vda3 + parted --script /dev/vda -- print + + ${createDatasets} + ${mountDatasets} + + mkdir -p /mnt/boot + mkfs.vfat -n ESP /dev/vda2 + mount /dev/vda2 /mnt/boot + + mount + + # Install a configuration.nix + mkdir -p /mnt/etc/nixos + # `cat` so it is mutable on the fs + cat ${mergedConfig} > /mnt/etc/nixos/configuration.nix + + export NIX_STATE_DIR=$TMPDIR/state + nix-store --load-db < ${closureInfo}/registration + + nixos-install \ + --root /mnt \ + --no-root-passwd \ + --system ${config.system.build.toplevel} \ + --substituters "" \ + ${lib.optionalString includeChannel ''--channel ${channelSources}''} + + df -h + + umount /mnt/boot + ${unmountDatasets} + + zpool export ${rootPoolName} + '' + ); +in +image From d3aff5fa3cb1ecd9d339e3801373ec3cca0057e4 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 8 Mar 2022 09:26:05 -0500 Subject: [PATCH 027/171] openstack-config: make the expandOnBoot option default to `all` --- nixos/modules/virtualisation/openstack-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/openstack-config.nix b/nixos/modules/virtualisation/openstack-config.nix index c5c832fb8105..f7806228c653 100644 --- a/nixos/modules/virtualisation/openstack-config.nix +++ b/nixos/modules/virtualisation/openstack-config.nix @@ -50,7 +50,7 @@ in terminal_input console serial ''; - services.zfs.expandOnBoot = mkIf cfg.zfs.enable "all"; + services.zfs.expandOnBoot = mkIf cfg.zfs.enable (lib.mkDefault "all"); boot.zfs.devNodes = mkIf cfg.zfs.enable "/dev/"; # Allow root logins From d99f30137492749eb011f01b5fcd3c29fd411825 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 8 Mar 2022 09:26:44 -0500 Subject: [PATCH 028/171] openstack-config: note the image metadata needed to boot a uefi image --- nixos/modules/virtualisation/openstack-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/virtualisation/openstack-config.nix b/nixos/modules/virtualisation/openstack-config.nix index f7806228c653..af4f57466109 100644 --- a/nixos/modules/virtualisation/openstack-config.nix +++ b/nixos/modules/virtualisation/openstack-config.nix @@ -1,5 +1,8 @@ { config, pkgs, lib, ... }: +# image metadata: +# hw_firmware_type=uefi + let inherit (lib) mkIf mkDefault; cfg = config.openstack; From 555bc5335bf8dcec8e0562ca1bedc96efdc8fc80 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 8 Mar 2022 09:29:00 -0500 Subject: [PATCH 029/171] openstack-image-zfs: start copying the channel now that we've mostly got the expressions down --- nixos/maintainers/scripts/openstack/openstack-image-zfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix index 515cc5cb38b3..d62a560642d0 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix @@ -3,7 +3,7 @@ { config, lib, pkgs, ... }: let inherit (lib) mkOption types; - copyChannel = false; + copyChannel = true; cfg = config.openstackImage; imageBootMode = if config.openstack.efi then "uefi" else "legacy-bios"; in From 745790d3c1285ab3eb486cb3c66e16c2ebf37c70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 8 Apr 2022 01:16:29 +0000 Subject: [PATCH 030/171] python3Packages.pylama: 8.3.7 -> 8.3.8 https://github.com/klen/pylama/blob/8.3.8/Changelog --- pkgs/development/python-modules/pylama/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 5d8674aac023..0289b2462136 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pylama"; - version = "8.3.7"; + version = "8.3.8"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "klen"; repo = "pylama"; rev = version; - hash = "sha256-//mrvZb4bT4aATURqa4g1DUagYe9SoP3o3OrwmiEJnI="; + hash = "sha256-g6Lq5NaieUI/alxqoVFfL5VaCHwB/jLcp02/N1W69yE="; }; patches = [ @@ -72,6 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Code audit tool for python"; homepage = "https://github.com/klen/pylama"; + changelog = "https://github.com/klen/pylama/blob/${version}/Changelog"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; From bcd08bb618dc599f157490db01c3d9caf7984fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 8 Apr 2022 02:50:34 +0000 Subject: [PATCH 031/171] python3Packages.tzlocal: 4.1 -> 4.2 https://github.com/regebro/tzlocal/blob/4.2/CHANGES.txt --- pkgs/development/python-modules/tzlocal/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 7079392e4f66..bb51abb1822c 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "4.1"; # version needs to be compatible with APScheduler + version = "4.2"; # version needs to be compatible with APScheduler disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DygBWsaKXAZyEEAKkZf8XTa6m8P46vHaPL1ZrN/tngk="; + sha256 = "ee5842fa3a795f023514ac2d801c4a81d1743bbe642e3940143326b3a00addd7"; }; propagatedBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tzinfo object for the local timezone"; homepage = "https://github.com/regebro/tzlocal"; + changelog = "https://github.com/regebro/tzlocal/blob/${version}/CHANGES.txt"; license = licenses.cddl; maintainers = with maintainers; [ dotlambda ]; }; From 0c4017153957120c0953a355ee5eb39d5bf8acec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 15:54:26 +0200 Subject: [PATCH 032/171] python3Packages.rns: init at 0.3.4 --- .../python-modules/rns/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/rns/default.nix diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix new file mode 100644 index 000000000000..39496de24c09 --- /dev/null +++ b/pkgs/development/python-modules/rns/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, netifaces +, pyserial +, pythonOlder +}: + +buildPythonPackage rec { + pname = "rns"; + version = "0.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "markqvist"; + repo = "Reticulum"; + rev = version; + hash = "sha256-fpXbp0Tj22flco9Rg4JTWZes6oxY7FhvYD76jA3yVuE="; + }; + + propagatedBuildInputs = [ + cryptography + netifaces + pyserial + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "RNS" + ]; + + meta = with lib; { + description = "Cryptography-based networking stack for wide-area networks"; + homepage = "https://github.com/markqvist/Reticulum"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad2f91731238..b4a718f56034 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8869,6 +8869,8 @@ in { rnginline = callPackage ../development/python-modules/rnginline { }; + rns = callPackage ../development/python-modules/rns { }; + robomachine = callPackage ../development/python-modules/robomachine { }; robot-detection = callPackage ../development/python-modules/robot-detection { }; From bed3a732cb086389793d959633b6df2dbd641abe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 15:56:24 +0200 Subject: [PATCH 033/171] python3Packages.lxmf: init at 0.1.4 --- .../python-modules/lxmf/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/lxmf/default.nix diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix new file mode 100644 index 000000000000..9650c5d89572 --- /dev/null +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, rns +, pythonOlder +}: + +buildPythonPackage rec { + pname = "lxmf"; + version = "0.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "markqvist"; + repo = "lxmf"; + rev = version; + hash = "sha256-kWawKlEAnn/uNjM2TT2aVW2V4M0+S/1Ysrw/muJhC0s="; + }; + + propagatedBuildInputs = [ + rns + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "LXMF" + ]; + + meta = with lib; { + description = "Lightweight Extensible Message Format for Reticulum"; + homepage = "https://github.com/markqvist/lxmf"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4a718f56034..712a85b2f7d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4894,6 +4894,8 @@ in { lupupy = callPackage ../development/python-modules/lupupy { }; + lxmf= callPackage ../development/python-modules/lxmf { }; + lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; }; From 5d89f265661a113235d30bd16bb8e87e0126d108 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Apr 2022 16:03:34 +0200 Subject: [PATCH 034/171] python3Packages.nomadnet: init at 0.1.7 --- .../python-modules/nomadnet/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/nomadnet/default.nix diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix new file mode 100644 index 000000000000..4505c33a696b --- /dev/null +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, rns +, fetchFromGitHub +, lxmf +, urwid +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nomadnet"; + version = "0.1.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "markqvist"; + repo = "NomadNet"; + rev = version; + hash = "sha256-WJpcV6+cnK1525lbYvkWqrGasioph72nuoNV4oWxVK0="; + }; + + propagatedBuildInputs = [ + rns + lxmf + urwid + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "nomadnet" + ]; + + meta = with lib; { + description = "Off-grid, resilient mesh communication"; + homepage = "https://github.com/markqvist/NomadNet"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 712a85b2f7d1..95448b8a2a06 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5413,6 +5413,8 @@ in { nanoleaf = callPackage ../development/python-modules/nanoleaf { }; + nomadnet = callPackage ../development/python-modules/nomadnet { }; + nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; From 3760e94ffa50e5bab21edbb93a384d682101f72e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 9 Apr 2022 21:21:37 +0100 Subject: [PATCH 035/171] python3Packages.django-hijack: 2.1.10 -> 3.2.0 switch to using wheel for its pre-built assets --- .../python-modules/django-hijack/default.nix | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index fd9c30a4bc7c..78cce76ca5b0 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -1,34 +1,34 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python, - django, django_compat, django_nose +{ lib +, fetchPypi +, buildPythonPackage +, django +, django_compat +, pytest-django +, pytestCheckHook }: + buildPythonPackage rec { pname = "django-hijack"; - version = "2.1.10"; + version = "3.2.0"; - # the pypi packages don't include everything required for the tests - src = fetchFromGitHub { - owner = "arteria"; - repo = "django-hijack"; - rev = "v${version}"; - sha256 = "01fwkjdzvw0yx2spwi7zc1yy64ndq1y72bfmk7kxnq5x803m2ak6"; + # the wheel comes with pre-built assets, allowing us to avoid fighting + # with npm/webpack/gettext to build them ourselves. + format = "wheel"; + src = fetchPypi { + inherit version format; + pname = "django_hijack"; + dist = "py3"; + python = "py3"; + sha256 = "1ixn7ppmbq1bgqahwv3z57hk80ql7sxpwl8jms7y8w5z1h91cn86"; }; - checkInputs = [ django_nose ]; propagatedBuildInputs = [ django django_compat ]; - checkPhase = '' - runHook preCheck - - # we have to do a little bit of tinkering to convince the tests to run against the installed package, not the - # source directory - mkdir testbase - pushd testbase - mv ../runtests.py . - ${python.interpreter} runtests.py hijack - popd - - runHook postCheck + checkInputs = [ pytestCheckHook pytest-django ]; + preCheck = '' + export DJANGO_SETTINGS_MODULE='hijack.tests.test_app.settings' ''; + pytestFlagsArray = [ "--pyargs" "hijack" ]; meta = with lib; { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; From 33b61afdd9c092c118b860f8e87dfeb814b05e0d Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 9 Apr 2022 21:51:56 +0100 Subject: [PATCH 036/171] python39Packages.django-hijack-admin: mark as broken --- .../development/python-modules/django-hijack-admin/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index ee5a47d3787c..ccd285757cbd 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -34,5 +34,8 @@ buildPythonPackage rec { homepage = "https://github.com/arteria/django-hijack-admin"; license = licenses.mit; maintainers = with maintainers; [ lsix ]; + # may be unmaintained, doesn't work with recent django-hijack: + # https://github.com/django-hijack/django-hijack-admin/issues/46 + broken = true; }; } From 1da640b2076bfe44e124cef34e0845a1cd8701ab Mon Sep 17 00:00:00 2001 From: Chua Hou Date: Mon, 11 Apr 2022 19:36:47 +0800 Subject: [PATCH 037/171] stork: 1.4.1 -> 1.4.2 --- pkgs/applications/misc/stork/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 48e2859fa849..b65dad473590 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "stork"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "jameslittle230"; repo = "stork"; rev = "v${version}"; - sha256 = "sha256-aBsxRLUufVUauySCxZKk/ZfcU/5KR7jOHmnx6mHmsFs="; + sha256 = "sha256-itjRJLbRTwovK+HcNEzwViEDTJ1MoRRTvZD412XYVKk="; }; - cargoSha256 = "sha256-oNoWGdXYfp47IpqU1twbORPOYrHjArNf43Zyeyat4Xs="; + cargoSha256 = "sha256-GaYdgC3Bf759ZPcZxoFG0nmCSz7aNHuqtyid6RS8Ui8="; nativeBuildInputs = [ pkg-config ]; From 825c7d5938eb5c0f866474df4db4f074a5b31cc3 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Mon, 11 Apr 2022 18:42:29 +0300 Subject: [PATCH 038/171] dsq: pass version to the build Adopted from the way the package handles its version in releases: https://github.com/multiprocessio/dsq/blob/9a2da3c6d9f8db6b1e5c9209e0ddbe92d32c66d2/.github/workflows/releases.yml#L20 --- pkgs/tools/misc/dsq/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index 72a38cf1eaf3..e70913114eb9 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -5,6 +5,7 @@ , runCommand , nix-update-script , dsq +, testVersion , diffutils }: @@ -23,10 +24,14 @@ buildGoModule rec { nativeBuildInputs = [ diffutils ]; + ldflags = [ "-X" "main.Version=${version}" ]; + passthru = { updateScript = nix-update-script { attrPath = pname; }; tests = { + version = testVersion { package = dsq; }; + pretty-csv = runCommand "${pname}-test" { } '' mkdir "$out" cat < "$out/input.csv" From 72ff0a0bf853da399322acad72f1910727b219c7 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Tue, 12 Apr 2022 02:27:03 +0530 Subject: [PATCH 039/171] openssh_hpn: 8.9p1 -> 9.0p1 --- pkgs/tools/networking/openssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 77277f20950b..d5d9a9e871b0 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -19,12 +19,12 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "8.9p1"; + version = "9.0p1"; extraDesc = " with high performance networking patches"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - sha256 = "1ry5prcax0134v6srkgznpl9ch5snkgq7yvjqvd8c5mbnxa7cjgx"; + sha256 = "12m2f9czvgmi7akp7xah6y7mrrpi280a3ksk47iwr7hy2q1475q3"; }; extraPatches = [ From a0257674da77e84bb33d655e3be0f92cbd4fe217 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 21:33:06 +0000 Subject: [PATCH 040/171] python310Packages.vertica-python: 1.0.4 -> 1.0.5 --- pkgs/development/python-modules/vertica-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index cd6186e574f3..0fdd4ed6d962 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IpdrR9mDG+8cNnXgSXkmXahSEP4EGnEBJqZk5SNu9pA="; + hash = "sha256-m9r6P8GTehx33QO/aCuKArrpJ/ycVHWPkQ9sPc3tmeo="; }; propagatedBuildInputs = [ From b817072297e6ad9ebc73637c1d0dff0804554759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Tue, 12 Apr 2022 11:07:55 +1000 Subject: [PATCH 041/171] ejson2env: add version The version needs to be specified using `ldflags` or the displayed version string is just "dev". --- pkgs/tools/admin/ejson2env/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/admin/ejson2env/default.nix b/pkgs/tools/admin/ejson2env/default.nix index 9e873d467e1f..9cc65b4944ee 100644 --- a/pkgs/tools/admin/ejson2env/default.nix +++ b/pkgs/tools/admin/ejson2env/default.nix @@ -13,6 +13,10 @@ buildGoModule rec { vendorSha256 = "sha256-BY45WirK9AVhvFGB5uqI4dLxzO2WuNNhhJbQ6nsRXao="; + ldflags = [ + "-X main.version=${version}" + ]; + meta = with lib; { description = "A tool to simplify storing secrets that should be accessible in the shell environment in your git repo."; homepage = "https://github.com/Shopify/ejson2env"; From 9ff1ab4037e2c20bb4ff11af452e4321d17edc99 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 11 Apr 2022 20:54:10 +0200 Subject: [PATCH 042/171] nixos/doc: add notes on additional drivers or firmware This describes how to build your own installer medium with some custom firmware/drivers, using an Intel MacBook as an example - on which WiFi doesn't work out of the box, due to it being nonfree. Fixes #15162. Co-authored-by: Lucas Hoffmann Co-authored-by: Robert Hensing --- .../development/building-nixos.chapter.md | 31 +++++++++++++++++ .../development/building-nixos.chapter.xml | 34 +++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/nixos/doc/manual/development/building-nixos.chapter.md b/nixos/doc/manual/development/building-nixos.chapter.md index 3310dee98f96..27d7e1d38553 100644 --- a/nixos/doc/manual/development/building-nixos.chapter.md +++ b/nixos/doc/manual/development/building-nixos.chapter.md @@ -30,6 +30,37 @@ To check the content of an ISO image, mount it like so: # mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso ``` +## Additional drivers or firmware {#sec-building-image-drivers} + +If you need additional (non-distributable) drivers or firmware in the +installer, you might want to extend these configurations. + +For example, to build the GNOME graphical installer ISO, but with support for +certain WiFi adapters present in some MacBooks, you can create the following +file at `modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix`: + +```nix +{ config, ... }: + +{ + imports = [ ./installation-cd-graphical-gnome.nix ]; + + boot.initrd.kernelModules = [ "wl" ]; + + boot.kernelModules = [ "kvm-intel" "wl" ]; + boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; +} +``` + +Then build it like in the example above: + +```ShellSession +$ git clone https://github.com/NixOS/nixpkgs.git +$ cd nixpkgs/nixos +$ export NIXPKGS_ALLOW_UNFREE=1 +$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix default.nix +``` + ## Technical Notes {#sec-building-image-tech-notes} The config value enforcement is implemented via `mkImageMediaOverride = mkOverride 60;` diff --git a/nixos/doc/manual/from_md/development/building-nixos.chapter.xml b/nixos/doc/manual/from_md/development/building-nixos.chapter.xml index ad9349da0686..e7a76a6d715d 100644 --- a/nixos/doc/manual/from_md/development/building-nixos.chapter.xml +++ b/nixos/doc/manual/from_md/development/building-nixos.chapter.xml @@ -43,6 +43,40 @@ $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd # mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso + + +
+ Additional drivers or firmware + + If you need additional (non-distributable) drivers or firmware in + the installer, you might want to extend these configurations. + + + For example, to build the GNOME graphical installer ISO, but with + support for certain WiFi adapters present in some MacBooks, you + can create the following file at + modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix: + + +{ config, ... }: + +{ + imports = [ ./installation-cd-graphical-gnome.nix ]; + + boot.initrd.kernelModules = [ "wl" ]; + + boot.kernelModules = [ "kvm-intel" "wl" ]; + boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; +} + + + Then build it like in the example above: + + +$ git clone https://github.com/NixOS/nixpkgs.git +$ cd nixpkgs/nixos +$ export NIXPKGS_ALLOW_UNFREE=1 +$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix default.nix
From 682b3d03efb4abfa3e715ab7a6fb111d7d479081 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Tue, 12 Apr 2022 21:51:54 +0530 Subject: [PATCH 043/171] sickgear: 0.25.28 -> 0.25.31 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index ebe79b927761..4c2048000a64 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.28"; + version = "0.25.31"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "16d0yvsp9yp67q1clhjs77syd13bmfgbadxcc1x8yfrfvdy6v39l"; + sha256 = "11l537c7d6mrbvn24bfkzydb96mwzhr8z5rl6imiphjzr0f8qyyp"; }; dontBuild = true; From ee81903bdfe1c45cb9cdf137b2b2b27f51782b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Apr 2022 19:55:42 +0000 Subject: [PATCH 044/171] abcmidi: 2022.03.20 -> 2022.04.06 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 88fc66602459..b4a5420aa9c0 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.03.20"; + version = "2022.04.06"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-4PN4XL9Jx+vcT2QCA6GwomIqP7lRXkyBkRz641tephw="; + hash = "sha256-s1LFiwFXQsodQdGvgNy7pgXhsWYHw7lVhRXuNYHnvNQ="; }; meta = with lib; { From 079d0fef5e3432036af8ce8a5c2b71418ccf1c7f Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 13 Apr 2022 14:28:52 +0300 Subject: [PATCH 045/171] CoinMP: enableParallelBuilding 4m 17s -> 1m 39s --- pkgs/development/libraries/CoinMP/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index d34b465f135a..25b9ba0fb574 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l"; }; + enableParallelBuilding = true; + hardeningDisable = [ "format" ]; meta = with lib; { From f87ed34bca7df09582a32df9be757f19a4b2e028 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Wed, 13 Apr 2022 21:42:51 +0800 Subject: [PATCH 046/171] gotktrix: 0.1.2 -> 0.1.3 --- .../networking/instant-messengers/gotktrix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix index f44c05da5c01..9cab98156c81 100644 --- a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gotktrix"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K+q0sykdOMnAWypOXnwTU5oTokpYw61CTsAW1gIvGSQ="; + sha256 = "sha256-/UDXqN7FnFvbiXp3pID1WbNfCuKDsMrFQvL1101xxOo="; }; - vendorSha256 = "sha256-Br9KgUoN01yoGujgbj5UEoB57K87oEH/o40rrRtIZVY="; + vendorSha256 = "sha256-xA2DW4v6aT4fEW2WSa96oRr5Yrb2HoR054V1+BiWSvk="; buildInputs = [ gtk4 From ae10b8d024ad669a2812e96e9d8c1578ed4904ff Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 13 Apr 2022 11:58:18 -0300 Subject: [PATCH 047/171] wormhole-william: enable tests --- pkgs/tools/networking/wormhole-william/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/wormhole-william/default.nix b/pkgs/tools/networking/wormhole-william/default.nix index 157119e64750..95d77f7402c7 100644 --- a/pkgs/tools/networking/wormhole-william/default.nix +++ b/pkgs/tools/networking/wormhole-william/default.nix @@ -13,7 +13,12 @@ buildGoModule rec { vendorSha256 = "sha256-J6iht3cagcwFekydShgaYJtkNLfEvSDqonkC7+frldM="; - doCheck = false; + preCheck = '' + # wormhole_test.go:692: failed to establish connection + substituteInPlace wormhole/wormhole_test.go \ + --replace "TestWormholeDirectoryTransportSendRecvDirect" \ + "SkipWormholeDirectoryTransportSendRecvDirect" + ''; meta = with lib; { homepage = "https://github.com/psanford/wormhole-william"; From b16749039a6dc396ce43d8c3a368117b000d229c Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 13 Apr 2022 23:01:11 +0300 Subject: [PATCH 048/171] megacmd: autoreconfHook and enableParallelBuilding 5m 14s -> 1m 16s --- pkgs/applications/misc/megacmd/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 8ca4ec418957..698925220aaf 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, autoconf -, automake +, autoreconfHook , c-ares , cryptopp , curl @@ -14,7 +13,6 @@ , libmediainfo , libraw , libsodium -, libtool , libuv , libzen , pcre-cpp @@ -35,7 +33,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ c-ares @@ -54,10 +53,6 @@ stdenv.mkDerivation rec { sqlite ]; - preConfigure = '' - ./autogen.sh - ''; - configureFlags = [ "--disable-curl-checks" "--disable-examples" From d580e84c541992aacc7974666f29f68ef29cff47 Mon Sep 17 00:00:00 2001 From: Alexander Tsvyashchenko Date: Wed, 13 Apr 2022 23:03:13 +0200 Subject: [PATCH 049/171] Fixed `dm-haiku` and `flax` builds. --- pkgs/development/python-modules/dm-haiku/default.nix | 2 ++ pkgs/development/python-modules/flax/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 8a6eabfde0f5..804233804a1f 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -54,6 +54,8 @@ buildPythonPackage rec { # likely that's the reason the upstream uses TF-nightly for tests? # `nixpkgs` doesn't have the corresponding TF version packaged. "haiku/_src/integration/jax2tf_test.py" + # `TypeError: lax.conv_general_dilated requires arguments to have the same dtypes, got float32, float16`. + "haiku/_src/integration/numpy_inputs_test.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index 1f1622dc1aea..42d506cccde3 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "flax"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "0rvdaxyf68qmm5d77gbizpcibyz2ic2pb2x7rgf7p8qwijyc39ws"; + sha256 = "0j5ngdndm9nm49gcda7m36qzwk5lcbi4jnij9fi96vld54ip6f6v"; }; buildInputs = [ jaxlib ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { pytestCheckHook tensorflow ]; - pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; + pytestFlagsArray = [ "-n $NIX_BUILD_CORES -W ignore::FutureWarning" ]; disabledTestPaths = [ # Docs test, needs extra deps + we're not interested in it. From a4b6c7c6c487db181f50a3a0feaf1b00db018a56 Mon Sep 17 00:00:00 2001 From: Nazarii Bardiuk Date: Wed, 13 Apr 2022 22:00:02 +0100 Subject: [PATCH 050/171] caffeine-ng: fix broken tray icon Caffeine adds icons to /usr/share in setup script https://github.com/caffeine-ng/caffeine-ng/blob/ec85235f6b4acd2cb8986403d072bc7da35d8763/setup.py#L18-L21 --- pkgs/tools/X11/caffeine-ng/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix index 36d43ea75d4d..85f196b460ea 100644 --- a/pkgs/tools/X11/caffeine-ng/default.nix +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -34,6 +34,7 @@ python3Packages.buildPythonApplication rec { postInstall = '' mkdir -p $out/share cp -r share $out/ + cp -r caffeine/assets/icons $out/share/icons # autostart file cp -r $out/lib/python*/site-packages/etc $out/etc/ glib-compile-schemas --strict $out/share/glib-2.0/schemas From eb63cc10d58e89d302d801e9bdb12b714bd0b9fb Mon Sep 17 00:00:00 2001 From: 4825764518 <100122841+4825764518@users.noreply.github.com> Date: Sun, 10 Apr 2022 17:48:33 -0400 Subject: [PATCH 051/171] xmrig-mo: 6.16.4-mo1 -> 6.16.5-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 25f27bd5063a..2c69a3960f70 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.16.4-mo1"; + version = "6.16.5-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-OnKz/Sl/b0wpZ1tqeEXhNxNNmQJXBhv5YNnKu9aOVZA="; + sha256 = "sha256-TNiHvRLS+eAPHa+qbnVSAyWTPGJxdp9eheQamd4i24E="; }; meta = with lib; { From fc88850f1077142a7abe70b5ffd390e453ea4095 Mon Sep 17 00:00:00 2001 From: papojari Date: Wed, 13 Apr 2022 21:34:06 +0200 Subject: [PATCH 052/171] dabet: init at 3.0.0 --- pkgs/tools/misc/dabet/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/dabet/default.nix diff --git a/pkgs/tools/misc/dabet/default.nix b/pkgs/tools/misc/dabet/default.nix new file mode 100644 index 000000000000..13a63b392c1c --- /dev/null +++ b/pkgs/tools/misc/dabet/default.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchFromGitea }: + +rustPlatform.buildRustPackage rec { + pname = "dabet"; + version = "3.0.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "papojari"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-B5z2RUkvztnGCKeVsjp/yzrI8m/6mjBB0DS1yhFZhM4="; + }; + + cargoSha256 = "sha256-v1lc2quqxuNUbBQHaTtIDUPPTMyz8nj+TNCdSjrfrOA="; + + meta = with lib; { + description = "Print the duration between two times"; + homepage = "https://codeberg.org/papojari/dabet"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ papojari ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27e83d8d1e77..d4e7be0b6bf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2854,6 +2854,8 @@ with pkgs; cucumber = callPackage ../development/tools/cucumber {}; + dabet = callPackage ../tools/misc/dabet { }; + dabtools = callPackage ../applications/radio/dabtools { }; daemontools = callPackage ../tools/admin/daemontools { }; From 641257cc96ee8d12fc0fb5f541625e1939ecd700 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 14 Apr 2022 04:20:00 +0000 Subject: [PATCH 053/171] tldr: 1.4.2 -> 1.4.3 https://github.com/tldr-pages/tldr-c-client/releases/tag/v1.4.3 --- 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 05d3026e76f4..141a6afb66b3 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.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "tldr-pages"; repo = "tldr-cpp-client"; rev = "v${version}"; - sha256 = "sha256-dsEqnHIs6vamdfLrkstRcV90tt7QcKIJwrPr+ksTVlQ="; + sha256 = "sha256-ZNUW2PebRUDLcZ2/dXClXqf8NUjgw6N73h32PJ8iwmM="; }; buildInputs = [ curl libzip ]; From c8c6adced1331844ea047dc921f4e9335dff85aa Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 14 Apr 2022 04:20:00 +0000 Subject: [PATCH 054/171] tldr: install completions --- pkgs/tools/misc/tldr/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 141a6afb66b3..698236ada183 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, curl, libzip, pkg-config }: +{ lib, stdenv, fetchFromGitHub, curl, libzip, pkg-config, installShellFiles }: stdenv.mkDerivation rec { pname = "tldr"; @@ -12,12 +12,16 @@ stdenv.mkDerivation rec { }; buildInputs = [ curl libzip ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config installShellFiles ]; makeFlags = ["CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" "CFLAGS="]; installFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + installShellCompletion --cmd tldr autocomplete/complete.{bash,fish,zsh} + ''; + meta = with lib; { description = "Simplified and community-driven man pages"; longDescription = '' From c357dd1d9f0e909c2fc7d4494308ce789cfec131 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 14 Apr 2022 11:08:53 +0200 Subject: [PATCH 055/171] python3Packages.pysnmp-pyasn1: init at 1.1.2 --- .../python-modules/pysnmp-pyasn1/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/pysnmp-pyasn1/default.nix diff --git a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix new file mode 100644 index 000000000000..3caccf688b8c --- /dev/null +++ b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pysnmp-pyasn1"; + version = "1.1.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pysnmp"; + repo = "pyasn1"; + rev = "v${version}"; + hash = "sha256-R4reMwVcJBTfTEHUk6sSUugsEPuKIziH1WbjMakP/dA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyasn1" + ]; + + meta = with lib; { + description = "Python ASN.1 encoder and decoder"; + homepage = "https://github.com/pysnmp/pyasn1"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f29b76457d6..4f55fde614ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7765,6 +7765,8 @@ in { pysnmp = callPackage ../development/python-modules/pysnmp { }; + pysnmp-pyasn1 = callPackage ../development/python-modules/pysnmp-pyasn1 { }; + pysnooper = callPackage ../development/python-modules/pysnooper { }; pysnow = callPackage ../development/python-modules/pysnow { }; From f681f8f18b18fc9441d0594680a6f63822f6bd5d Mon Sep 17 00:00:00 2001 From: squalus Date: Thu, 14 Apr 2022 09:16:12 -0700 Subject: [PATCH 056/171] librewolf: 99.0-1 -> 99.0.1-3 --- .../networking/browsers/firefox/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/firefox/librewolf/src.json index d209a83ab9df..9b770c743d2a 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/src.json +++ b/pkgs/applications/networking/browsers/firefox/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "99.0-1", + "packageVersion": "99.0.1-3", "source": { - "rev": "99.0-1", - "sha256": "0x9c19h4l1djhdq48ylnqjrrfkk2zalfpgj57cba5jqxl2fhglx3" + "rev": "99.0.1-3", + "sha256": "0ag4n86hvyp6kx3hp60yn7q45rgjbx7054frj6226ni2ribjx4ln" }, "firefox": { - "version": "99.0", - "sha512": "08f6d5a668140c4275aba6df463ed3af596043dfe5f27573583afbc1e9f6b27ebca79a52ce2c9598261c631b400b5378744e9e70f51ef9c4098b419e9904aa7c" + "version": "99.0.1", + "sha512": "0006b773ef1057a6e0b959d4f39849ad4a79272b38d565da98062b9aaf0effd2b729349c1f9fa10fccf7d2462d2c536b02c167ae6ad4556d6e519c6d22c25a7f" } } From 942f536c766f883694eccb50a9f1660e90a0da62 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 17 Mar 2022 16:31:47 +0000 Subject: [PATCH 057/171] wasilibc: unstable-2021-09-23 -> unstable-2022-04-12 Done in response to a few PRs which I made to wasi-libc to make things better for downstream packagers like us. --- .../libraries/wasilibc/default.nix | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index e8436f9e9565..9448041c5e76 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation { pname = "wasilibc"; - version = "unstable-2021-09-23"; + version = "unstable-2022-04-12"; src = buildPackages.fetchFromGitHub { owner = "WebAssembly"; repo = "wasi-libc"; - rev = "ad5133410f66b93a2381db5b542aad5e0964db96"; - hash = "sha256-RiIClVXrb18jF9qCt+5iALHPCZKYcnad7JsILHBV0pA="; + rev = "a279514a6ef30cd8ee1469345b33172fcbc8d52d"; + sha256 = "0a9ldas8p7jg7jlkhb9wdiw141z7vfz6p18mnmxnnnna7bp1y3fz"; fetchSubmodules = true; }; + outputs = [ "out" "dev" "share" ]; + # clang-13: error: argument unused during compilation: '-rtlib=compiler-rt' [-Werror,-Wunused-command-line-argument] postPatch = '' substituteInPlace Makefile \ @@ -19,21 +21,24 @@ stdenv.mkDerivation { ''; preBuild = '' - export NIX_CFLAGS_COMPILE="-I$(pwd)/sysroot/include $NIX_CFLAGS_COMPILE" + export SYSROOT_LIB=${builtins.placeholder "out"}/lib + export SYSROOT_INC=${builtins.placeholder "dev"}/include + export SYSROOT_SHARE=${builtins.placeholder "share"}/share + mkdir -p "$SYSROOT_LIB" "$SYSROOT_INC" "$SYSROOT_SHARE" + makeFlagsArray+=( + "SYSROOT_LIB:=$SYSROOT_LIB" + "SYSROOT_INC:=$SYSROOT_INC" + "SYSROOT_SHARE:=$SYSROOT_SHARE" + ) ''; - makeFlags = [ - "WASM_CC=${stdenv.cc.targetPrefix}cc" - "WASM_NM=${stdenv.cc.targetPrefix}nm" - "WASM_AR=${stdenv.cc.targetPrefix}ar" - "INSTALL_DIR=${placeholder "out"}" - ]; - enableParallelBuilding = true; - postInstall = '' - mv $out/lib/*/* $out/lib - ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports + # We just build right into the install paths, per the `preBuild`. + dontInstall = true; + + preFixup = '' + ln -s $share/share/undefined-symbols.txt $out/lib/wasi.imports ''; meta = with lib; { From 1b1204bc49114b80d4573c421bc4bfd677275ea4 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 14 Apr 2022 16:02:00 -0400 Subject: [PATCH 058/171] python3Packages.qiskit-terra: 0.19.2 -> 0.20.0 --- .../python-modules/qiskit-terra/default.nix | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 1a5aa516c52d..8289e3e24ec2 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -2,8 +2,8 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +, rustPlatform # Python requirements -, cython , dill , numpy , networkx @@ -14,6 +14,7 @@ , retworkx , scipy , scikit-quant ? null +, setuptools-rust , stevedore , symengine , sympy @@ -54,18 +55,24 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.19.2"; + version = "0.20.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-P2QTdt1H9I5T/ONNoo7XEVnoHweOdq3p2NH3l3/yAn4="; + sha256 = "sha256-/t87IgazpJlfd8NT2Pkn5b6/Ut104DcJEFCubQ/bBiw="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ rust.rustc rust.cargo cargoSetupHook ]); + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "sha256-tNiBXn32g1PTuTmKNXSac+4PLSc1Ao9n+oAMfvVYR30="; + }; propagatedBuildInputs = [ dill @@ -96,7 +103,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "qiskit" - "qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial" + "qiskit.pulse" ]; disabledTestPaths = [ @@ -109,7 +116,10 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ "--durations=10" ]; disabledTests = [ - "TestUnitarySynthesisPlugin" # uses unittest mocks for transpiler.run(), seems incompatible somehow w/ pytest infrastructure + "TestUnitarySynthesisPlugin" # use unittest mocks for transpiler.run(), seems incompatible somehow w/ pytest infrastructure + # matplotlib tests seems to fail non-deterministically + "TestMatplotlibDrawer" + "TestGraphMatplotlibDrawer" "test_copy" # assertNotIn doesn't seem to work as expected w/ pytest vs unittest # Flaky tests @@ -153,18 +163,14 @@ buildPythonPackage rec { "test_two_qubit_weyl_decomposition_ab0" "test_sample_counts_memory_superposition" "test_piecewise_polynomial_function" - "test_vqe_qasm" "test_piecewise_chebyshev_mutability" "test_bit_conditional_no_cregbundle" "test_gradient_wrapper2" "test_two_qubit_weyl_decomposition_abmb" "test_two_qubit_weyl_decomposition_abb" - "test_two_qubit_weyl_decomposition_aac" - "test_aqc" - "test_gradient" - "test_piecewise_polynomial_rotations_mutability" - "test_confidence_intervals_1" - "test_trotter_from_bound" + "test_vqe_qasm" + "test_dag_from_networkx" + "test_defaults_to_dict_46" ]; # Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding From 8c33504431e9669f324db150174d5bc8de2bbfcf Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 14 Apr 2022 13:23:50 -0700 Subject: [PATCH 059/171] discourse: 2.9.0.beta3 -> 2.9.0.beta4 --- pkgs/servers/web-apps/discourse/default.nix | 6 +- .../plugins/discourse-assign/default.nix | 4 +- .../plugins/discourse-calendar/default.nix | 4 +- .../discourse-canned-replies/default.nix | 4 +- .../discourse-chat-integration/default.nix | 4 +- .../plugins/discourse-checklist/default.nix | 4 +- .../discourse-data-explorer/default.nix | 4 +- .../plugins/discourse-docs/default.nix | 4 +- .../plugins/discourse-github/Gemfile.lock | 2 +- .../plugins/discourse-github/default.nix | 4 +- .../plugins/discourse-github/gemset.nix | 4 +- .../plugins/discourse-math/default.nix | 4 +- .../discourse-openid-connect/default.nix | 4 +- .../plugins/discourse-prometheus/default.nix | 4 +- .../discourse-saved-searches/default.nix | 4 +- .../plugins/discourse-solved/default.nix | 4 +- .../discourse-spoiler-alert/default.nix | 4 +- .../plugins/discourse-voting/default.nix | 4 +- .../discourse-yearly-review/default.nix | 4 +- .../web-apps/discourse/rubyEnv/Gemfile | 4 +- .../web-apps/discourse/rubyEnv/Gemfile.lock | 46 +++++----- .../web-apps/discourse/rubyEnv/gemset.nix | 84 +++++++++---------- 22 files changed, 104 insertions(+), 106 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index b863a40dfc58..f192780e7fd2 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -11,13 +11,13 @@ }@args: let - version = "2.9.0.beta3"; + version = "2.9.0.beta4"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-+VYHGkISY4PFScUzk6eJ7eN9cPTjNEww/kusKcufMI0="; + sha256 = "sha256-DpUEBGLgjcroVzdDG8/nGvC+ym19ZkGa7qvHKZZ1mH4="; }; runtimeDeps = [ @@ -161,7 +161,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/app/assets/javascripts/yarn.lock"; - sha256 = "0xx5gncvb2mwpwwbgi4y320ji143i38vmz946xjcx5z3jxxjkymz"; + sha256 = "1l4nfc14cm42lkilsawfhdcnv1ln7m7bpan9a804abv4hwrs3f52"; }; assets = stdenv.mkDerivation { diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index 7fa373106f7c..3cf491a2f42d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "d8d2dc950a0512cc53885afbd1da26ea38fdf1e1"; - sha256 = "sha256-FRq/zL+Hiu/Pd/8HDOmFW8Uoovw9so1gKbM4by3jSYg="; + rev = "7a854fe5046783bcff6cc24fca818056e1b9414a"; + sha256 = "sha256-SGGwj0V4mTXD33tLnH76tQD/f6IvDbacq23XbaRdLsI="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index 15d7abfec19e..d935b37b5a11 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "c44d348c7739f08fe026f1d67dbd902cb2f4d590"; - sha256 = "sha256-+876F3/nGhqtwQn2D/v3WzqchemsocnneiYYFmjqGGo="; + rev = "eb8bc3e864c6f735fa5a005e854f8c37411b6288"; + sha256 = "sha256-fc3oQj2NqaTfmokJUryd2oBd/eVAcNOMMT0ZT45bU28="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index e41574a2ca7e..07e58652d9fe 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-canned-replies"; - rev = "f9d1d87e352c0d1c41c1a8e4ef26b7766e39d2f1"; - sha256 = "sha256-luFPwcnH6faTJV7Bhx9nnaxkK5PHI9vqhHrFO0m49mg="; + rev = "18af3367d9eda8842e8ff0de96c90aa2f0bdb0a3"; + sha256 = "sha256-v8QOR0/9RUJ1zFmzhKYe/GEev3Jl4AlXWkQyuquyuJY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-canned-replies"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index e279c12ce70b..f96348e6f273 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-chat-integration"; - rev = "0c367e19ca4c06ace067f1268c1a1a64d8da4253"; - sha256 = "sha256-X7bkAjINzKTrWcVd9MPl51Vy6pOWp378ACJJTSihQRc="; + rev = "eaa7de8c2b659d107c2b16ac0d469592aff79d7c"; + sha256 = "sha256-7anXDbltMBM22dBnE5FFwNk7IJEUFZgDzR4Q/AYn6ng="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix index c5958589fd19..d1bcd57fc66a 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-checklist"; - rev = "c4f3df0d825082eeaaa3fd9fceba0258080aa6fa"; - sha256 = "sha256-VGKDpu8tohMgSjMoTzhVnPLHMfLsXOejXL3bmQQ3jWM="; + rev = "68941e370e132c17fc2aa21ac40c033df72c9771"; + sha256 = "sha256-jJM/01fKxc1RBcSPt9/KDxMkBMH2AOp9dINxSneNhAs="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-checklist"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index 74c6b3eebb4f..8073d89df817 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-data-explorer"; - rev = "e7c19ac107dcd37618c7ac7b98530e99c7fe31db"; - sha256 = "sha256-w7IzniVlSArmR58Xk9U4MLolV61w/7t1C0nMqERM9J4="; + rev = "baaac7ce671e716559329ae756988cc395d7079e"; + sha256 = "sha256-bUCRfbKXdNbiJnU3xPMhG3s8kH7wQQoS2kV7ScHGOMQ="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index b006f62dc545..071b1eb5dd9b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "e517e69c09479654c197b1d620e6e7a5e69edca7"; - sha256 = "sha256-fbkuFWyY25V3B32a7NYtTcOlBot18JZYRth6ainHDQo="; + rev = "72b2e87e84221588bc2ff08961a492044f1f8237"; + sha256 = "sha256-moR4TJYffh6JwC7oxeS4+Cyngi88Ht2eTbSEJJ4JKdY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index a569496b5a89..ba0516980977 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -30,7 +30,7 @@ GEM octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - public_suffix (4.0.6) + public_suffix (4.0.7) ruby2_keywords (0.0.5) sawyer (0.8.2) addressable (>= 2.3.5) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index 8970f8560516..f9ccaed863ef 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "810105186dbe8441852e2df9a9fc2ae8b8516ec6"; - sha256 = "sha256-96sqnvtEmm7sxFPAk6iDiYm7XChaQV+6HXZt/m5BtsI="; + rev = "36cbacdd32916435391b4700c024074da3bcbe74"; + sha256 = "sha256-R4Kp7NFMIXYDcAZlOUdhNdN/mmQMgXlLFolzo2OZahw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index 62b54dbb0b0c..7bab2858b652 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -148,10 +148,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; ruby2_keywords = { groups = ["default"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index 85475db73fb1..d65087cca737 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-math"; - rev = "447c4811ea44d006da98dcbb6dfde142ada53567"; - sha256 = "sha256-iq3wWhYhOnh+QgChEsSIlRzDmD8kXbjNerVGfuNF7uY="; + rev = "b875a21b4d5225b61cb525531d30eaf852db6237"; + sha256 = "sha256-UKba9ZaVjIxOqUYdl00Z2sLt3Y+exBX7MJax8EzXB1Q="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-math"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index d6282cd8c62e..e3c52319d279 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-openid-connect"; - rev = "dfcdc38d77aab4010cfe032cdd4155b4ae60ed14"; - sha256 = "sha256-I2cuyhA4jhhz+pJ5692/lRj6YRViP//HsoZOZjtu/e4="; + rev = "e897702139b9c0dca40b9385427ba8bad0e1eae9"; + sha256 = "sha256-miosXf4to60BqGsbXYEL37G38uVHrz2/2Pizn0Rlp2o="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index a1e540f7fd0d..e5d7259099ad 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "834f8683dfae475483c50bdeec979a5fa4a1cf04"; - sha256 = "sha256-M7NnXUib/iKxQT+UTqicmrZONR/Z+oXl46BNgYf1SQM="; + rev = "43536e4a4977718972a673dc2475ae07df9a0a45"; + sha256 = "sha256-7sQldPLY7YW/sr4WBHWxJVvhvRK0LwO3+52HAIJFvY4="; }; patches = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index 84d801b12fa9..682032bb9d0f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-saved-searches"; - rev = "a7eafe288a2f93aa8cc7cf59d8173adc70c8f48a"; - sha256 = "sha256-Zli+tzNxLIwp5sZome+pXqvpsvqM/kXRbe73QtH0rTc="; + rev = "f008809ee3bf3a8a5c11daff0807d59ab4336a0c"; + sha256 = "sha256-/OyFL/9fLdVpsFQIlnjQ6ser6hdEs4X434nAaqKCTUE="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index e7b0adbb826b..ebec54bc6e5d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "9aba2bd6b7efbea3e46158fd0b1ce96a975379d7"; - sha256 = "sha256-RmYsDCDuVxXX91haljP6Jbx3s4Nl2RV6UU3PBQ/Xi7Y="; + rev = "17ba805a06ddfc27c6435eb20c0f8466f1708be8"; + sha256 = "sha256-G48c1khRVnCPXA8ujpDmEzL10uLC9e2sYVLVEXWIk0s="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index 63cdeefd235e..b4f7e000fd64 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-spoiler-alert"; - rev = "7382d74af57f4476004014598135aec530b0342f"; - sha256 = "sha256-YyCG1bAfjJ9/itHlsZTBQgkRjgPKNKPzJopnP/Z7/NA="; + rev = "4a07519cf9d7ac713f5e21ba770adb127524a22d"; + sha256 = "sha256-pMTXdjqI4GrLNfZMbyPdeW+Jwieh6I4O/pT2Yyf4ltA="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-spoiler-alert"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index f2a97d9e44d6..4d0f71fdd7f6 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "2de1fe5df1a5c25ad1e0e31e8d28adca315d9092"; - sha256 = "sha256-XxrRPIc9F78wHF6p1qqUZhkPqKWSebqGZn9P5lNTDeo="; + rev = "1da667721269ca01ef53c35ec0470486b490e72c"; + sha256 = "sha256-VCMv6YWHY24v9KyO4q0YSSYK+mszOVqP46slOh8okvY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index 62e943537a6c..e38aa7f83571 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "f2224b38c96c8772ce6cc64514b8a3edaa42ebb9"; - sha256 = "sha256-dJtQXaLsADXcsADzExGPj3L2x4zlNfsQCNBk17W0a5A="; + rev = "ef4855f6afa16ef86013bba7da8e50a63e11b493"; + sha256 = "sha256-IVKGysAKr+lKV1CO1JJIMLtzcvpK8joWjx8Bfy+dx8Y="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index c66a3f25542c..2766c3feadc0 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -31,9 +31,7 @@ end gem 'json' -# TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals -# This is a desired upgrade we should get to. -gem 'sprockets', '3.7.2' +gem 'sprockets' # this will eventually be added to rails, # allows us to precompile all our templates in the unicorn master diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 7ae505b5c194..4e832c8abdb1 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -92,7 +92,7 @@ GEM chunky_png (1.4.0) coderay (1.1.3) colored2 (3.1.2) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) connection_pool (2.2.5) cose (1.2.0) cbor (~> 0.5.9) @@ -129,10 +129,10 @@ GEM sprockets (>= 3.3, < 4.1) ember-source (2.18.2) erubi (1.10.0) - excon (0.92.1) + excon (0.92.2) execjs (2.8.1) exifr (1.3.9) - fabrication (2.27.0) + fabrication (2.28.0) faker (2.20.0) i18n (>= 1.8.11, < 2) fakeweb (1.3.0) @@ -194,7 +194,7 @@ GEM json (2.6.1) json-schema (2.8.1) addressable (>= 2.4) - json_schemer (0.2.19) + json_schemer (0.2.20) ecma-re-validator (~> 0.3) hana (~> 1.3) regexp_parser (~> 2.0) @@ -206,7 +206,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) literate_randomizer (0.4.0) - lograge (0.11.2) + lograge (0.12.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) @@ -215,7 +215,7 @@ GEM logstash-logger (0.26.1) logstash-event (~> 1.2) logster (2.11.0) - loofah (2.15.0) + loofah (2.16.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -236,13 +236,13 @@ GEM ffi (~> 1.9) minitest (5.15.0) mocha (1.13.0) - msgpack (1.4.5) + msgpack (1.5.1) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) mustache (1.1.1) nio4r (2.5.8) - nokogiri (1.13.3) + nokogiri (1.13.4) mini_portile2 (~> 2.8.0) racc (~> 1.4) oauth (0.5.8) @@ -280,12 +280,12 @@ GEM openssl-signature_algorithm (1.1.1) openssl (~> 2.0) optimist (3.0.1) - parallel (1.22.0) - parallel_tests (3.7.3) + parallel (1.22.1) + parallel_tests (3.8.1) parallel - parser (3.1.1.0) + parser (3.1.2.0) ast (~> 2.4.1) - pg (1.3.4) + pg (1.3.5) progress (3.6.0) pry (0.13.1) coderay (~> 1.1) @@ -295,8 +295,8 @@ GEM pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.6) - puma (5.6.2) + public_suffix (4.0.7) + puma (5.6.4) nio4r (~> 2.0) r2 (0.2.7) racc (1.6.0) @@ -339,7 +339,7 @@ GEM redis (4.5.1) redis-namespace (1.8.2) redis (>= 3.0.4) - regexp_parser (2.2.1) + regexp_parser (2.3.0) request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) @@ -361,7 +361,7 @@ GEM rspec-html-matchers (0.9.4) nokogiri (~> 1) rspec (>= 3.0.0.a, < 4) - rspec-mocks (3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-rails (5.1.1) @@ -380,7 +380,7 @@ GEM json-schema (~> 2.2) railties (>= 3.1, < 7.1) rtlit (0.0.5) - rubocop (1.26.0) + rubocop (1.27.0) parallel (~> 1.10) parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) @@ -389,7 +389,7 @@ GEM rubocop-ast (>= 1.16.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) + rubocop-ast (1.17.0) parser (>= 3.1.1.0) rubocop-discourse (2.5.0) rubocop (>= 1.1.0) @@ -430,7 +430,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sprockets (3.7.2) + sprockets (4.0.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.4.2) @@ -439,7 +439,7 @@ GEM sprockets (>= 3.0.0) sshkey (2.0.0) stackprof (0.2.19) - test-prof (1.0.7) + test-prof (1.0.8) thor (1.2.1) tilt (2.0.10) tzinfo (2.0.4) @@ -453,7 +453,7 @@ GEM unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) - uniform_notifier (1.15.0) + uniform_notifier (1.16.0) uri_template (0.7.0) webmock (3.14.0) addressable (>= 2.8.0) @@ -583,7 +583,7 @@ DEPENDENCIES shoulda-matchers sidekiq simplecov - sprockets (= 3.7.2) + sprockets sprockets-rails sshkey stackprof @@ -598,4 +598,4 @@ DEPENDENCIES yaml-lint BUNDLED WITH - 2.3.5 + 2.3.9 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 72748dad501b..84f4c37dfb22 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -351,10 +351,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; connection_pool = { groups = ["default"]; @@ -573,10 +573,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12d0xkb2qkydygs4py2z2m7vzx0hygx2dnyk98ja8lkj2k348925"; + sha256 = "01pcl1vx60x3f28rs6iw1lgqxycgb2yxq2p45k7b4a8liadykhba"; type = "gem"; }; - version = "0.92.1"; + version = "0.92.2"; }; execjs = { groups = ["assets" "default"]; @@ -603,10 +603,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zmak7fgis1nk9j157g2rjzxrw9prr3jzlxap9vix3xm0gkihr53"; + sha256 = "0rgbmk044akxa84z9vdl8lkmd9z4xy3na1w0vh12pz02drxd93j9"; type = "gem"; }; - version = "2.27.0"; + version = "2.28.0"; }; faker = { dependencies = ["i18n"]; @@ -1012,10 +1012,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03lzdfwpmywxc6l5apnhfjwl8swf9jz2ajwjgq38am0q60ggjrcf"; + sha256 = "1ahcnfw3lchyyq7ixjfghkw709fbm8mkqsqq9yhd9in3bhzywa88"; type = "gem"; }; - version = "0.2.19"; + version = "0.2.20"; }; jwt = { groups = ["default"]; @@ -1080,10 +1080,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vrjm4yqn5l6q5gsl72fmk95fl6j9z1a05gzbrwmsm3gp1a1bgac"; + sha256 = "15pjm9pa5m3mbv9xvfgfr16q4jyaznsg8y63jz9x4jqr8npw0vx3"; type = "gem"; }; - version = "0.11.2"; + version = "0.12.0"; }; logstash-event = { groups = ["default"]; @@ -1122,10 +1122,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yp1h1j7pdkqvnx8jl6bkzlajav3h5mhqzihgs9p6y3c8927mw23"; + sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; type = "gem"; }; - version = "2.15.0"; + version = "2.16.0"; }; lru_redux = { groups = ["default"]; @@ -1303,10 +1303,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cshgsx3hmpgx639xyqjqa2q3hgrhlyr9rpwhsglsx529alqq125"; + sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw"; type = "gem"; }; - version = "1.4.5"; + version = "1.5.1"; }; multi_json = { groups = ["default"]; @@ -1364,10 +1364,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.4"; }; oauth = { groups = ["default"]; @@ -1518,10 +1518,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bncdqm62l1q8flw10gl86gcc74zm89s5vrjww73i3094jg64pam"; + sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; type = "gem"; }; - version = "1.22.0"; + version = "1.22.1"; }; parallel_tests = { dependencies = ["parallel"]; @@ -1529,10 +1529,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vsfsfd194xnzjz94ml157w61fnag8jg47b4bssc508kb3vmk20w"; + sha256 = "01kzjshbim0w5ax7vcjfxvb83x2pglws7qr43x0qkd731f8w10f7"; type = "gem"; }; - version = "3.7.3"; + version = "3.8.1"; }; parser = { dependencies = ["ast"]; @@ -1540,20 +1540,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c"; + sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; type = "gem"; }; - version = "3.1.1.0"; + version = "3.1.2.0"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090c3kazlmiizp25las7dgi8wlc11s29nrs2gy3qrp1z8qikgcmb"; + sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; progress = { groups = ["default"]; @@ -1603,10 +1603,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; puma = { dependencies = ["nio4r"]; @@ -1614,10 +1614,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56"; + sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw"; type = "gem"; }; - version = "5.6.2"; + version = "5.6.4"; }; r2 = { groups = ["default"]; @@ -1849,10 +1849,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; + sha256 = "0a6nxfq3ln1i109jx172n33s73a90l8g04h8p56bmw9phj467h9k"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; request_store = { dependencies = ["rack"]; @@ -1966,10 +1966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3"; + sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm"; type = "gem"; }; - version = "3.11.0"; + version = "3.11.1"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -2030,10 +2030,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03c6v6bfqdw8vnda0if0sx7aff0iq6xnv1adyfs0bi9msgggafcr"; + sha256 = "00d9nzlnbxr3jqkya2b2rcahs9l22qpdk5qf3y7pws8m555l8slk"; type = "gem"; }; - version = "1.26.0"; + version = "1.27.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2041,10 +2041,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv"; + sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; rubocop-discourse = { dependencies = ["rubocop" "rubocop-rspec"]; @@ -2226,10 +2226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + sha256 = "19k5cwg8gyb6lkmz4kab7c5nlplpgj64jy7vw8p5l2i2ysq5hym0"; type = "gem"; }; - version = "3.7.2"; + version = "4.0.3"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -2271,10 +2271,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vg0zjfgibdcgkzb4c25v0f4v6v8mvpzvgcag194rwglmkkyrwkx"; + sha256 = "04yxdm2cdhwp0wsp8891f06cprp4442p3mlgpdc4pziflpfvaw05"; type = "gem"; }; - version = "1.0.7"; + version = "1.0.8"; }; thor = { groups = ["default" "development" "test"]; @@ -2371,10 +2371,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00dj2vsz9sq5i9wnncbiy4v5vayqbssppazzigd1ibpl60pzfxkq"; + sha256 = "1dfvqixshwvm82b9qwdidvnkavdj7s0fbdbmyd4knkl6l3j9xcwr"; type = "gem"; }; - version = "1.15.0"; + version = "1.16.0"; }; uri_template = { groups = ["default"]; From c519bc33e89fad4b97685725760dfd26f7f8f96b Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 14 Apr 2022 16:05:31 -0400 Subject: [PATCH 060/171] python3Packages.qiskit-aer: 0.10.3 -> 0.10.4 --- .../python-modules/qiskit-aer/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index d7b195f1debf..7fb67c5449bd 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.10.3"; + version = "0.10.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - sha256 = "sha256-COvJCj18qRNQJUXKrtlYJQGLjna44IgtNZeNVJJaIHg="; + sha256 = "sha256-mf+Pgw/daFkt1bvqSeYzlO/Sd2F2MtwZcLr+h1u+eb0="; }; postPatch = '' @@ -55,15 +55,14 @@ buildPythonPackage rec { cmake ninja scikit-build - pybind11 ]; buildInputs = [ blas catch2 + nlohmann_json fmt muparserx - nlohmann_json spdlog ]; @@ -71,6 +70,7 @@ buildPythonPackage rec { cvxpy cython # generates some cython files at runtime that need to be cython-ized numpy + pybind11 ]; preBuild = '' @@ -80,19 +80,18 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; # *** Testing *** - pythonImportsCheck = [ "qiskit.providers.aer" "qiskit.providers.aer.backends.qasm_simulator" "qiskit.providers.aer.backends.controller_wrappers" # Checks C++ files built correctly. Only exists if built & moved to output ]; - # Slow tests disabledTests = [ - "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues? - "test_initialize_2" # TODO: simulations appear incorrect, off by >10%. - # These tests fail on cvxpy >= 1.1.15 + # these tests don't work with cvxpy >= 1.1.15 "test_clifford" "test_approx_random" + "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues? + "test_initialize_2" # TODO: simulations appear incorrect, off by >10%. + "test_pauli_error_2q_gate_from_string_1qonly" # these fail for some builds. Haven't been able to reproduce error locally. "test_kraus_gate_noise" From e95a63295b2e0eff8eb57fee6ef71d60553f7246 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 14 Apr 2022 16:03:28 -0400 Subject: [PATCH 061/171] python3Packages.qiskit-ibmq-provider: 0.18.3 -> 0.19.0 --- .../python-modules/qiskit-ibmq-provider/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 0c8f74cf66dd..8f8d510712c9 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.3"; + version = "0.19.0"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "1n1w1lnq2xw94hhhn6kdvw8dqlxk5fxwpm8ng31gxbp1s3qgni17"; + sha256 = "sha256-ODu8OgGpzlMjRX7ebMu4DXKj6jUyohCq4Hb8aV5eWIU="; }; propagatedBuildInputs = [ @@ -58,6 +58,7 @@ buildPythonPackage rec { requests requests_ntlm websocket-client + websockets ] ++ lib.optionals withVisualization visualizationPackages; postPatch = '' @@ -72,12 +73,12 @@ buildPythonPackage rec { pproxy qiskit-aer vcrpy - websockets ] ++ lib.optionals (!withVisualization) visualizationPackages; pythonImportsCheck = [ "qiskit.providers.ibmq" ]; - # These disabled tests require internet connection, aren't skipped elsewhere disabledTests = [ + "test_coder_operators" # fails for some reason on nixos-21.05+ + # These disabled tests require internet connection, aren't skipped elsewhere "test_old_api_url" "test_non_auth_url" "test_non_auth_url_with_hub" From 42a14c6b27cbe25fcfa423d11ce23f68a8496b99 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 14 Apr 2022 18:39:53 -0400 Subject: [PATCH 062/171] python3Packages.qiskit-nature: 0.3.1 -> 0.3.2 --- pkgs/development/python-modules/qiskit-nature/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 2693daa6ead0..7b652c507223 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -21,15 +21,15 @@ buildPythonPackage rec { pname = "qiskit-nature"; - version = "0.3.1"; + version = "0.3.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "qiskit"; + owner = "Qiskit"; repo = pname; rev = version; - sha256 = "sha256-EkYppEOQGmRIxKC4ArXZb0b+p1gPGnP6AU8LbEbOpPo="; + sha256 = "sha256-BXUVRZ8X3OJiRexNXZsnvp+Yh8ARNYohYH49/IYFYM0="; }; propagatedBuildInputs = [ @@ -56,7 +56,7 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_two_qubit_reduction" # unsure of failure reason. Might be related to recent cvxpy update? + "test_two_qubit_reduction" # failure cause unclear ]; meta = with lib; { From 85b365078ae553ccc8ef9dbd36de85445d74e29e Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 14 Apr 2022 16:06:03 -0400 Subject: [PATCH 063/171] python3Packages.qiskit: 0.34.2 -> 0.36.0 --- pkgs/development/python-modules/qiskit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index aa81ba00a8ca..74d227e22e90 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -28,15 +28,15 @@ 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.34.2"; + version = "0.36.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "qiskit"; + owner = "Qiskit"; repo = "qiskit"; rev = version; - sha256 = "sha256-weL65IQs6vbjJiPJdaizU0ST6u9qDYb0LhTwC6yAdhY="; + sha256 = "sha256-zTdvROru56/HNpoHKSVe3pQZeDSMFmaTCUAr1FOaE5A="; }; propagatedBuildInputs = [ From d2b696f5d47cbc80bb043ab877505c27ef2dfe97 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 14 Apr 2022 18:52:28 -0400 Subject: [PATCH 064/171] python3Packages.qiskit-finance: fix build --- pkgs/development/python-modules/qiskit-finance/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index 1fc98361ad09..2c544d5a92ed 100644 --- a/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -33,6 +33,10 @@ buildPythonPackage rec { sha256 = "sha256-wnto3IqrJFAqIv6QAXe3BB9fvXQXe2fw/iUZe3+198M="; }; + postPatch = '' + substituteInPlace requirements.txt --replace "pandas<1.4.0" "pandas" + ''; + propagatedBuildInputs = [ fastdtw numpy From 175925681ae2980c5d7737245295799a8220d8b8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 14 Apr 2022 19:30:08 -0500 Subject: [PATCH 065/171] libsForQt5.bismuth: 3.1.0 -> 3.1.1 https://github.com/Bismuth-Forge/bismuth/releases/tag/v3.1.1 --- pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix index 997e9d873d72..bf46029356ea 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "bismuth"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "Bismuth-Forge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kvWrhDbC7nqz810dE42xbd430OSkTN42Hkl6fXR90as="; + sha256 = "sha256-SGeqTmU603gKlzCUJ6AMaG7++9JvMw5EpSATwJEqNq8="; }; cmakeFlags = [ From 572d0f99978cfd4c59e1facc99e1561cd4e68e11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Apr 2022 02:57:03 +0000 Subject: [PATCH 066/171] firefox-devedition-bin-unwrapped: 100.0b5 -> 100.0b6 --- .../firefox-bin/devedition_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index b6c6976bbb90..a294a8708059 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "100.0b5"; + version = "100.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ach/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ach/firefox-100.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "fb1b570f098ca5d80f41f14ada1f7ad6dc43e5e1c6984e1fca29cfd275dabded"; + sha256 = "6b5ac2e733e44616405f31b16bc995f945740477d00988ce5dd4f16c4ec74085"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/af/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/af/firefox-100.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "31322e6c45045322977b5d240350e0e4740f9c48174b719553410fea3212f475"; + sha256 = "5b25ad2870b33002060f493368f79921046f5b19e4adf0c5e1836b7d00347790"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/an/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/an/firefox-100.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "137eb68b647af950362682646f7edf754bfb51a03b20f59b777f877b3ef003c2"; + sha256 = "9fc4a88d9216ba0b5979e939092314f135da9e33a3d8df7cadcf142f19b0b71f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ar/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ar/firefox-100.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "22d24c6bad9ce2ded7634449fbc5d0bcdd4972aac15f60e04cf963ab0ee252bd"; + sha256 = "23f33752d3df64ee98cdbdc569b8cb4cea2dbbae71810a3a14a82a6361f97b9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ast/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ast/firefox-100.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e8a2e7ea146efe41105d84a667568662d029a9773855ae31768ba9c14abbdde7"; + sha256 = "a5d357ed9b58fe0a2b7c95e24cb18659c7aee29cb1cda0071b7afdee9c3ac9eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/az/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/az/firefox-100.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "34d76711bdc45cc45650cb4c94e553f67579be3f406c391c9878cb6de1c39bb5"; + sha256 = "1191a7c0a3222d55a605bbb5f25d064414d08b9bfb6dc6ad74dd1de357177701"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/be/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/be/firefox-100.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "fdd4d1cea3b71f54b58230a30c744d2ff7b0237869fd14e617ba3322c2d59f6f"; + sha256 = "69445ca3cf31d63162ddd0aab1538655a08e325aad57a3d343ac310193a942a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/bg/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bg/firefox-100.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e63e65a92f73a31d2adac6a0c1b6dc45f38425ed8596039332108565de43daa6"; + sha256 = "f2ff0a6bf22b9ed16b0656d4e0848c509cee2de9a638d556500909e1352ae5b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/bn/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bn/firefox-100.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "29fbffaeb7bd8750cf1fb543692855d427200d7df6e9ca92224bd96103b06b35"; + sha256 = "1fbfdb8d6f22567eb1112c63ab6192cb439b9d2cd5e57c10401c76f9f9cd215b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/br/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/br/firefox-100.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "3c1bc8cace7f4d2c7522fc9dd994c42707ca4d54b74ead88726c8e83862c3757"; + sha256 = "e05895d70c72aadcb77dc6d84a6a054a8410b29e05d5da6eeac0fdee1b66b130"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/bs/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bs/firefox-100.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "3e6c94efea22c4bd2620225e8a339689e3e4f642d474f4580092a85d7c4a4950"; + sha256 = "ba125689cbd845e9bf8df940bbfd0796326939ba9b45d4bc0c0a8ddf64dd6f61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ca-valencia/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ca-valencia/firefox-100.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "485b33fe034acd03412b3407338cd246077209fc1ccd566f2ac9d347c8da6308"; + sha256 = "37a5ba26d10cbc2aa8222a2f19133a12710adeb389234ff53a91b43ddd5e901a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ca/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ca/firefox-100.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "a0b2780c0a634c85a9dbdc00b6952c81b503c3173d2c2cb9df5d9c5958ab640c"; + sha256 = "5f11f3a11b93f06235981200b690cb9aaf95ed8d459ea8e1d6ac7c6a73d9d9e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/cak/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cak/firefox-100.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "360abc1da779874423792e63b545343aaeb3984201193c687c3c8b67b67cecb1"; + sha256 = "1d4a103b8c2c601b908a635d2b5edaec068c1a2e644e1924022a94e57e1b2f6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/cs/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cs/firefox-100.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1dc722b7931908a38f43254aa1c1c78fb77ee30868c15455c0448927e658613d"; + sha256 = "358b2c3c3c5a9945b35f1c71eadaf7d5305d214ecfe37fda811fd37d326dfd35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/cy/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cy/firefox-100.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "55eba066d11752cbf973312d55568e51b720f21e66bf590adadbe93be386e989"; + sha256 = "bcbab842e30d22f7d646d2494451e0e676c40c16c1e3532b4c6cd6eb501fb7c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/da/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/da/firefox-100.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "cc3fa0c0ef8a1af9f8bb78e7196c5cc7a6c6df2d9f25c5fe8d79f47879354331"; + sha256 = "3b462ea57616171ebe43e218d7fbcc8c45d508fa2b91490d5b107842bf936d25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/de/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/de/firefox-100.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b745aa34eca890302b701be19bdd3affcba37e7b1af388e4844ce61c3a1244fb"; + sha256 = "067a586989c84a280366c6021daf270652d443465b63d03e0fb9ff02eeb3f3ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/dsb/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/dsb/firefox-100.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e7a4c1390919cfd01fe13f5a81ce35fbdf0868c725783d603c7d2e210e3ba368"; + sha256 = "42621cd070dc172b08bdce256c91d6faeede97b116b353f1edf2354c0e37ec3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/el/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/el/firefox-100.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "6f0b80919e22ec67f80c7c034fdd9e290cf2ec442ae828a706e780df2ec54d90"; + sha256 = "f079ccc06590277ccf09d4e34b73d3b363d79651d6e2a07d7e127a42ab552bac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/en-CA/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-CA/firefox-100.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "0184e33ff9582a77a5f9d61f1904f3cd097feda7576aaa276480eff92dfcb4de"; + sha256 = "e3f239da659c77662a10ba061f806d615f9a57fe89d1207ac04cacc603a9a587"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/en-GB/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-GB/firefox-100.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "b5affd31a9004c9161d6a55cb713999932b18f1340ce67d0e7f77b0c805ca785"; + sha256 = "e41640386bbceef99290458576da3272ea400e78641cbae73ece0e07045396ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/en-US/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-US/firefox-100.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "635c5b79c514b9b7717c903cdabc2f6bf3f19cb9689354dc33f21cc8eed3d540"; + sha256 = "7f5888e7c0480f4f1626943f1878945166179ab94d995e23d0b8f5eb9d83ab4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/eo/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/eo/firefox-100.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "9e4a718c0932688ece8883fd2fa2d175c3483d73ac16075d8efa0e6758f4cf61"; + sha256 = "6c07749b176c7c533a824357da81a42ef10fc78f09b58e7a090d3e36fd77a6d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/es-AR/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-AR/firefox-100.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3bc0ce89dc3ab79108bf527fccc9aa9663f61e6578b2561fc7e1950dcaaed1db"; + sha256 = "2d23cfea40e6948fd330b2e72f40edab597e5261fb9abcbd539d0b9f513fd946"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/es-CL/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-CL/firefox-100.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "966db10e384f875272ffcdb743c472a78a75a95e0990a32fb16fe2b8d5a70761"; + sha256 = "eef75de09e6fa7d21ca4aa799ea4b279dcdeefa79d9b4ef7f3b5266c90c2a8ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/es-ES/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-ES/firefox-100.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "8b23f6957fb0825b973c4ab59c80ffdfeb8370a72a291ebec6ae7abff1ca3392"; + sha256 = "31d985ab2af1ba15fc6b41580fed4a06fa33fb8cf3dfcf96b1a5ea4e361058f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/es-MX/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-MX/firefox-100.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "75102ce28fbb425fb0c13dccfdbc5095c1c92c4dd83e14140bd672fe60547603"; + sha256 = "1fdc9e77eadf9abb55224bf0db1e555eb99f4a7c525f6021fe226ea7de9db026"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/et/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/et/firefox-100.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "ab7d6e1294e49e83307bac9541b15163263bc15693fd0845c335e523e5420623"; + sha256 = "2df8328fcf9f10b84b2110f31ec32a5dce7054845c37f7e30b023daee4701322"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/eu/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/eu/firefox-100.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "6defedc5c4faacc9765a1d26352d9d8f30f895a6ec5bad1c3ed7c3d98ec42e16"; + sha256 = "30037fbdb33703b894bb0e33b192d23aa1b67ab9b944b1381d27f95e0c44bdf9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/fa/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fa/firefox-100.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "0fe1b25b3b970e04980ca729a6630648b0923b98fd00bc81a4553235d741a6c6"; + sha256 = "37af6700e54f98541fe1f703c13ccad70a72bb7e28200762bf636bd3494b443d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ff/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ff/firefox-100.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e8ad5c7403928bfa5e34c6bbb8958730dba8dcc6d799c9a7676d82440b8f1ab8"; + sha256 = "3612950e42cf9532bb5be99f9f73e2f6b480c58570b1092f8eb337aba1257234"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/fi/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fi/firefox-100.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "37e8619971dffc7c6caa43cf72f5870c5d5d1ed489bf8a3596215f285f17fa1a"; + sha256 = "a8a2bace3af643c6b82bdfb043f90d4cd6ec10abfed6ada230786ef7eaaf9ee4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/fr/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fr/firefox-100.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "90c21cec994d7fa1c4ffa6512c448a4948be5eb5d318a0f6c4ae6d6b6f801780"; + sha256 = "296f91da1aec6481bdfecf311db4560268082d6f75f0354c6b09ab64494c211c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/fy-NL/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fy-NL/firefox-100.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c12a1b475b4d611d4083bb11d7384573817aef22796e91c7df968b7d6d726133"; + sha256 = "3bdd5b38483c8a8fdab13767ad8f38d60e9c12359740d8017ec8a7a83338e99d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ga-IE/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ga-IE/firefox-100.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "fcdf90dbd66c1c87e7f8b25d820c5c866f0d905bbe424a8b6d8c27e7cbef5677"; + sha256 = "5f734b553ce52eaa91bc3ee1ac2afea09aefb35e886ba68d56cf3b1e55dfbebc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/gd/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gd/firefox-100.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "bfbeca59a046bffa5156621946c397884998fbd383085fab5159ae775db9cc9f"; + sha256 = "c2b3ef9590646143e48ffebc75d7f9c4a688ae0d3c3a648683a5f7a02aaee74c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/gl/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gl/firefox-100.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "c0f1de5a454ae0f8df7407d08394f73cf8e09f39342288d6670d4c0b8adf2e77"; + sha256 = "513ca5b29b690986d0aef335cb98406d599a18ee44ed2b8fdf7687ff3dc87ba2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/gn/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gn/firefox-100.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "5e177db13df6f5195603d8d2acb92dccdf2989fdb721e6ef6b758120f2efff75"; + sha256 = "4a5974953f144ffff20a946073aa8891225d80e3dcc405d0230bc601973e8634"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/gu-IN/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gu-IN/firefox-100.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "748aedc09ffe44b4f8223456afbfb43901b492ff401c6ff39127ff4267ce6123"; + sha256 = "a2e780ccad66a9a741551b5f7425be3e91f5a225a50e39ebf5770808fac484d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/he/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/he/firefox-100.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "91c1abfed2e942c076c6b0068edd2dca02e496321fbd79fdd39c7c2dbe7c5c2a"; + sha256 = "093fef7512fc82efe8aaef9108bf84ab7a9730e2fa94b8092206c0804068bcd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/hi-IN/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hi-IN/firefox-100.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "4e13080d458b980cac72cdda1f40a786db926b494fc905eab71cf3535f5383ea"; + sha256 = "1b6955622ff8fda11d439dcb4f425a3d84c16c49ee30b1e6eb246555fa07bd09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/hr/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hr/firefox-100.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "583c5a5f6aa0e328c57c303ba97d1bdfc0a2a959485560d27aa2e906a0deeb8e"; + sha256 = "571c7bc2b25002094425eaa8878aaa4b339027a5932d5a073b23fa7d3cf9c945"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/hsb/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hsb/firefox-100.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "d8c10888b1e3735fce5d1213322f62732b030919ff4b5df70d12d934d348e91c"; + sha256 = "7443ddc6143f466712de34ebffb4d41633aec8c0d7b253c3008f68b600a59b3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/hu/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hu/firefox-100.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4133206571188244ddf17b96d287d5683fbfeffe2cdd5b2c8ee63fb7db56e3c2"; + sha256 = "7413002d74a0c2a0dbc19f783e84fb79a71c73fb28034ad4894a7d64d1745b03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/hy-AM/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hy-AM/firefox-100.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "7326ae0a0d0a0afc40f6aa8b0b1506dbe7ead006c641eed4812e63bbb58bdb82"; + sha256 = "a8169b877a7f2e85bbf363c5f0b6a05b28f2aa948689535b2b608cdb8d4c5af5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ia/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ia/firefox-100.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "e61cc178ec2a648c0bb229e5145d8755343427388911bc6386fae77a5ecfae5e"; + sha256 = "54245a95072f8b98a6d556ccb79547d56291b9f915f7e5723f49ff97a1bc1098"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/id/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/id/firefox-100.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0ac90236941c9a0a5f17e2e5e96ee14c0ef6d5e5645566bc09cb9023359db882"; + sha256 = "43fb95f81026dfae3b889d085b2584cbee7f6b1bec6edd0378d3965b056f8c8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/is/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/is/firefox-100.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b1efef91567c6b1d52b5fcccf9fbb3c3f81b05929242ebc68168c4712e47c3b5"; + sha256 = "79e94ad99e19f325915231ce35fa741ed617c5595d5a2d1233ff0b2f2cf20733"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/it/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/it/firefox-100.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "33e8282f6b1b3a9e404374f93eb6207c3110177fdc11c831469fa721c6669d93"; + sha256 = "0f2147837a3b3d90cddd387125a8579cc576e1613a520fab8265de36ba1039c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ja/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ja/firefox-100.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ad13269606214cc9fa7d05037db3c6ecb192a5bcc06872aa487b023c2823862d"; + sha256 = "b755262db8331612cc447c6c5c944374338cd7d52fad732803c1b2d3b8744921"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ka/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ka/firefox-100.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "42b97eab01d92ad491e744890fe6984af4f435ce96595c5dd7bed02f6f5ff369"; + sha256 = "3dffe30c39f3fee7ef4fdd0f02e619a79f1d67eb3b49efdf35838090e0c03bd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/kab/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kab/firefox-100.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "64c9abf3921fcf698ed5cda9724884f2e3c1ad8651cbdf9a9fbebf2d8ca930fe"; + sha256 = "c675eaf355c484362f3b9586a30eac9362452f548d90fa8f70ede88f33f7b30f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/kk/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kk/firefox-100.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "9f4546b31322c74e76b13e4557bc412d5d75adddbba16f4e0b0ca8badc81f83f"; + sha256 = "cefa5aed2f200c3ebb263695c4192fd16b73861edb20085e956332f9f9c009ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/km/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/km/firefox-100.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "daac53a85b255ad6b491efa2c4d021c0aa91f927e3a5f0fb0d1462ae473a9daf"; + sha256 = "02f6a77a412311af0ea581fafa12826bec93c333c14ff6d1f9da0dd783c8aa0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/kn/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kn/firefox-100.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "20b8072ddf8fc07f5095ad97464fe0b84b10215fa02bdd9a31254a92c12541a9"; + sha256 = "e6dedf44d9a0f1a8d379b8f07add326581b06223b335935f81f7c9a442bac2b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ko/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ko/firefox-100.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "29be35485bf287596145f26602aac5a520d7e980f3012b564a297e13b83bf489"; + sha256 = "022550ce534cdf4ba489bbcd553052c535fb0ee908155b728718619f33f95630"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/lij/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lij/firefox-100.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "7023d002cc4a7081eccbd5f061bbfe295f1856ed39724be4228e727119bc0a57"; + sha256 = "f2e075a6ef35fd8c802cd929f9c81043d9221f947269ca13be695b58edd603b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/lt/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lt/firefox-100.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "d121af78fa8bddf3825a89e751d37f12ea7c7513f331e015b0a951efedd80609"; + sha256 = "4ac54a885a81db97df5940cac5429c59442de591fba560c9608cc0f9ba1df74d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/lv/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lv/firefox-100.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3f4a005f6ba7b09766f9a9d0186c0d5c82049be965e40f58eaa9c0474fb9d5e0"; + sha256 = "413dee96d7535b5a276a34871db10b37ae9b6ed233df8a81db0d9080b1cc2ae9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/mk/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/mk/firefox-100.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "d1e7703d77584b93261676bb4e5e15a9df0953012392cc52636bafad697bfda8"; + sha256 = "9fa2653fb6cbd77e874b1306c9c070097c4728deec0972edf9b7b03aa79a2b9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/mr/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/mr/firefox-100.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "e7dcd45869323e949baed0e6e561a3051439e190ab3927d59af1008973e58f9b"; + sha256 = "e26dc9319727f9f7c0fb98efae44d89228499b52edda8f02328586bfae4c79a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ms/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ms/firefox-100.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "bb605564c51282e7c5c48150fa61196374b77c2de48c394f4c887c2bd0456f11"; + sha256 = "0001655c4a42a6c113f428315200b5cd1eee08cc417fd82464db87c322f5e949"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/my/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/my/firefox-100.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "9c0bec027eaad1ce4e2e6abeb35e62276805fd49ef818ddc67fd826c8a95f93e"; + sha256 = "78fcac093123a0b4b6ebffb1e9f10ee5906d526b96d5be1b249a1e60acc4fcb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/nb-NO/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nb-NO/firefox-100.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "141aec935cb203578e819481b9548e29212c29c94a6c60dd79bad0f676633cd9"; + sha256 = "6c218dc369434feb3ff30840cd940c19e10d3e900325246445fdb7113c22c284"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ne-NP/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ne-NP/firefox-100.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "5d3e083b078496ca6fa34960a3e480baa69b582bb737fbcded6a119c9216c0b5"; + sha256 = "9a1a9a2380ebc3da9035066bb212b14b1b8bb6fb80feb6ed220cad1a3969ca6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/nl/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nl/firefox-100.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "f7a8257d2c2cd266e46db87b6ebd8a7530a486d503760baee3d7ab655dc5e7d2"; + sha256 = "6ff75975cb1ba028e78aad213837b17fe0b06e5f522996b3b9cd450beab24b51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/nn-NO/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nn-NO/firefox-100.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "30ec48d85ebccfc9314cb642a8171d5ce98dbd0ab102f6ec00cbff2d26163d0e"; + sha256 = "911e765ba62cfc8d69d7e4d68f1a5d44a1b311400731a3593e98ad72516c47dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/oc/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/oc/firefox-100.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "4d580c477ef3dab1f217114b24486d29df4ce022fa444b013a296603c3ff5936"; + sha256 = "23341acf2319454172a718a0123fa15bc9367028984449c7a2cdb50644a618b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/pa-IN/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pa-IN/firefox-100.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "02953120d3becd386ce8551fd4f97e1da930b7778906096fda8d79340e53230f"; + sha256 = "bae2060e37bd636ffdab3d3f84b73078c4dc78d7ec7eb7bb9504be4dbc3398bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/pl/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pl/firefox-100.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "362c1d650bf4613e46384ba5837daa80a790b504fedc254c8af7cc146127fe1d"; + sha256 = "cc397c80e75d00507fa6e170ec43df337450796c829e44d518523b871e33f585"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/pt-BR/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pt-BR/firefox-100.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "38ec5f6aeb156437f2925df9f1e5135bfa9d85e55d570548c56770334fe09bb1"; + sha256 = "2bcb44821f106ad7478fe7b61c7952c20be135a2efe1185d91123930729f78a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/pt-PT/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pt-PT/firefox-100.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "9cfcd7212cd3531ee0694cc58653a53acd211494705f1d3040bbf03b4bb537f3"; + sha256 = "7f4c5713972e5bca35b891bd850fd90fcf60d254ebc15435e5b814a212428b44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/rm/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/rm/firefox-100.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ffce43f1c388618b53abaec130e288210cdb1361af512eedf0780d591e7ccffe"; + sha256 = "67316b932226848b73a95687e6d218983d8056a966771c3bf16344f158578a53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ro/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ro/firefox-100.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "62bbfeb4a6692c25a1a2a0eb5e790e262e0141dcb74056cb55dc5e7e4a958954"; + sha256 = "7e61a6ce962f1ae0a74ff7a29b6edd7106fe95e4c2df399c22a17f1cf4d0dde9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ru/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ru/firefox-100.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0acf8d6c81c1704a67c9b7b9542ac6f1bd0b929cd0f0814b84cf64a46cc38107"; + sha256 = "bcad404db75ebac101f503fb793572ac010219f41c6716d33cec0552821bb281"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/sco/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sco/firefox-100.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "fc172346729982645acf975a7fba8e045eb81755540faf3eea9699a7474e4ab5"; + sha256 = "4b01c6ae78219c122ae455627b24594966be61d335dcca8e8547784e8050051f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/si/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/si/firefox-100.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "64ef404110234acc639faefe93499578b88506e287d0e75ec2fc36be625e7025"; + sha256 = "5aed65aa84e19c8a270cbf6ad3284c23c83dbff841b4639a15af6cdd9148560f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/sk/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sk/firefox-100.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6fdeb9de76bc3d7d7b5907340368adcd69d28b0db7a46bf96ee54ab731821952"; + sha256 = "a06083cf85f88232898d99dd0174e7999c3e65bc8f893c144775722975410235"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/sl/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sl/firefox-100.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "259b7c2467220ed58a725006b70b1610d7b1589892e75b0eda1ed5a97ea8d65d"; + sha256 = "fce1013364e0f49f9cf56b4d50be3f17ec92d4dfe77a0ba6672404abbfd954e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/son/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/son/firefox-100.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "56f4d79d2e4c3df1ea6903c230d790aa2e40adb704358c6d225fcb2103122cdd"; + sha256 = "be37a85ae43d646b5b0249303c65d6f0e3c7e15b65986da7e221119d3b8537aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/sq/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sq/firefox-100.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "73490c2374b06cb4a8fdcf5c1ed32484581b62f380aef5d8d6da8c1319caa0b2"; + sha256 = "dbbcd4da798dca36965a408f74deef86001cdefdbeedd93d3d5c8c34cfd5e4e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/sr/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sr/firefox-100.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "06070996a689d5cac3f97348af762834d0a9e56446b8b58ceba11235f49f17cd"; + sha256 = "cb8a4d3af1f8e5af4c6121afaab85eb51239d0a98e9caae0e87df435d9d746ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/sv-SE/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sv-SE/firefox-100.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "bc2b8826c8635d5e96b596aa5add0a6f6146fd9b70195323b6fac588ad4e0a88"; + sha256 = "941b3175289f26cc8102c5c436a477cb04af6a35e15861d2473d55b3dc36a04b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/szl/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/szl/firefox-100.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "40eb80afc5f91513f4ee96dddd842b7b424b4caa2b41cbb0542b6a9c009b2099"; + sha256 = "48fb048a32877082ff1511484cc1eb7847198da4af366c136bcc260879e30970"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ta/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ta/firefox-100.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "79132eab776f5e3eba46368a837297be38123ac7036ab550c82d60037e8bc594"; + sha256 = "16ad13edf164a8867a56dcd59e4bb8c09d2cb3cabbab8c2d7e0a4ed0c02db587"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/te/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/te/firefox-100.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "b2062d708ca2964fe0d046da13c6e763dcc6702dbffc4bb32ace4301e2653941"; + sha256 = "9c4e9fb72917b2e7b6abec7872366d687874af3c4e0d2acd862363120e3ceae0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/th/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/th/firefox-100.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "4e1ce1968f16403268a69ab85abb33422eb52cb0f36c854a16dda87d5abd941d"; + sha256 = "2a14cee27f951ec1e9e6e342cafee68a18513ed1b4d210e0490862296b12f0a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/tl/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/tl/firefox-100.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "c1ee82d1b14be9bf7c634029884a7eb59c051f26663e00ea0bf6e5f74ef9e04c"; + sha256 = "dd1bf5dbb47615dc2f3a473ab541686fe53cd7d3ac3e5bedab37ce436db5fe07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/tr/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/tr/firefox-100.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "0c58541768c627cb4d556b34ed8523f3bccfdaa757cdcde37d1fe7d19c934562"; + sha256 = "eb9b3f14fa9c2c57784f1e37e198b9eb4bdb8cd3f11ebb52b2a51ba47cc10ccf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/trs/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/trs/firefox-100.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "139f2a1abb08dc5ef684d51226fbe64c41e08ad4f183a8b15ff155c5fe51e922"; + sha256 = "d39ad94019221ecb2cc895ca16d71f4d461a52eef741b5728447ab054ffe12aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/uk/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/uk/firefox-100.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "633fa83f990bc1e8a791a0486bf9034f5b4709fd3e2d868f42895b66c5476ca7"; + sha256 = "9fbc6fa34062cb64fc6c5eb09df6e3736865e09124efd465c6b30c1bc8329494"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/ur/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ur/firefox-100.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "25d7518b88be9d1cbf504a8c214049f265f74a0def26bf5a1c60d562d999a5e8"; + sha256 = "ca1ed7e7746e5a2085328158185715b7b850e8129adf77b1d6f4e90580563563"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/uz/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/uz/firefox-100.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "39f6c200dc56585bf527e8daa59f460d9193f7d5e7194efb7b1bfbf2d4f92e4e"; + sha256 = "ad05af6f178de687697e7f98b18a64c2cbcc1bad2b167d5bb35e13ac57d03880"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/vi/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/vi/firefox-100.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "e4d0a5838b837d7020da1595cf77093d53aa5d7f765fcc98da20c11c0e853874"; + sha256 = "22b133203f3bb3c901c225e1275215c0c7e3ab5714e640d218532a9db8c636eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/xh/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/xh/firefox-100.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "679180e00ca70e112d5053c72cabc0ca5eb92f2f16915c556aefc861188d0318"; + sha256 = "570c959de8351eb8ffaae05292be916bd94f34f51a1ffcc84e3176b7f23d230b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/zh-CN/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/zh-CN/firefox-100.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c280eef16ab855db69e975f8cac93a2987e125236d7df34a5a336cc837cfd901"; + sha256 = "f0e4fa1b580f778be335285b1154abdfde0b95c6d2c67f7547ab07bcc7fd5172"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-x86_64/zh-TW/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/zh-TW/firefox-100.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "2b6d0a74fd53d907a6e0f6e28be41e9cfa62e61c42dbc132d16c39f87980ad49"; + sha256 = "cd49d2954a7014a926cc012c1e439926af1f58c5e11234e2f9d2489c417388f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ach/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ach/firefox-100.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "579452bc9bf650c9664775a5ec438be6cf4276b807840a38e30a0c08237a777d"; + sha256 = "a3b67450658e8c34ce17f5f3b63afc4116cccdd2d786c72958afdb468c0c7eab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/af/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/af/firefox-100.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a9828b2f4954f63b8b4b37722da0a50f1b9e6230aa981f51597718bf05e52b54"; + sha256 = "c7a9ca1c35ed17fe138df0608d02b345c6e358612a03f3408bd46a792f3bed2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/an/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/an/firefox-100.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "0d7083b1feef4c8cde1be64ff26c37afdba36454802266c28b1916f760881de4"; + sha256 = "242731960f5b500d25f9b328731437a4229aa4d668fc849d2111506dc4741b97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ar/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ar/firefox-100.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "57e5e2863caf348c475daaa6949dabe013aab0b3e63db61b3a9b9ef4049e62e9"; + sha256 = "4adf2045f911f74323a9e65b4fd2cf249a5369ad5143daa36eb0b1999b5adacc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ast/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ast/firefox-100.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e954fde4dcca82fdfd8605bcd43930f0b85117c1b2dc9edeba75b435b77b121e"; + sha256 = "d0827bf52bf91304a0a17c9f5edbc6081be1f1d9eaeba6dc24b63e8b251dbe11"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/az/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/az/firefox-100.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "a893f228de842c6bdd0c41df3db328c737b57a945a55e1e56f3672a7beffbe5b"; + sha256 = "41de2d574563135721d0a975d8d90f4eccac60f3be51d4cca5e957473793629d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/be/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/be/firefox-100.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "8cb4ca15ee69f9bb74cd13de82697526d6e64c6968881489b7ddbe4ad9266c54"; + sha256 = "736900d6a404a97e13cfeeef68681ec7980266ba983f62c0779fd6a8b502e22b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/bg/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bg/firefox-100.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "2d8a566a4619f549bf6b68a2d1b0fad51843de0257da54039050affbc21de948"; + sha256 = "77351b45bc0bd3749c54ea1efb1ebb2ba1ced97f9885906a9b86523e85eb011d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/bn/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bn/firefox-100.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "e75c5aecf6b0bd0d60423bb66980c085957b1acd1549426a44a4a7991d1f2db3"; + sha256 = "5d9b274d20b5137e531660f92a7ac3b481abd756870af815159ac30e7df47e8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/br/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/br/firefox-100.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "bb8794c3069989e0f06f0dbd0b7fee638bcf9e6e3d24d28ce41db3a182a83a60"; + sha256 = "22239f50b370747d3029e7f4ab8ac47de15cd5aa8b6d421193299fed9f9b556e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/bs/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bs/firefox-100.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "db964f0e1eb920cac95cd0dc14175f5e20a1ec32f56a3b43554f22cc67dce752"; + sha256 = "5e2d51cf768f00ab8a30f8d54e2bb88eed75baf20c381e87b7186f5927447137"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ca-valencia/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ca-valencia/firefox-100.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "ca124cd11585fc521b4e2d1c4bc0c2407056abffbb2b36e46ec568c6490b28d3"; + sha256 = "cdbee7378c4584d51a7142c695401ebe21a05c87961171fae2fc71e76485e92e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ca/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ca/firefox-100.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "6ca6e8c905b44c09c4d061656fe2cace22d261ea4efd04917fc2aa2ce13a1cb6"; + sha256 = "1f8f6e0a3917828f7e30deff842c6d5f0c5a2389c87969783d46950c6b072722"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/cak/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cak/firefox-100.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "44bfca1c2cac5eea67f68891da93604edbdf6e0eda92fd1686d83512feff2089"; + sha256 = "42996e08427b937cb2e2aa4d7ea569b729c9002d293be5288e02ab1588e3cbfc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/cs/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cs/firefox-100.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "491a9c7a2471fc1a06751282340f1b6bd00118a8ea11d54420985822c0e9a19e"; + sha256 = "692d99947185928b46142ae910c76d4c1ee2328aa2e67212919aef39741d67db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/cy/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cy/firefox-100.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "b9e55860c0f14afcd2d2cf87e5ca7d4b853fce667f93a6b493323423c16f8adc"; + sha256 = "b2f7ee9c016bc107e63dee850688b048c43f5d1caca1aa81d22cde4ffbe6c964"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/da/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/da/firefox-100.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "899a53b667b4f64e953b7d1cf430eea8e67de747b28c93435cf33f008dc464eb"; + sha256 = "095ae3d0657a68903c4d60a21240b9c3fc399284063e5c366ccedcf58361c80b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/de/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/de/firefox-100.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "efecb119d1becf00b34babaf42cae5f5c586dc8cc2a29c71d410b68b7aa00cc5"; + sha256 = "359364e7ee5ed03556c7b7390cdb4b1e91e027598a74231cfc20fd5d5c601b1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/dsb/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/dsb/firefox-100.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "b47d0bed633a6c8608c600d6b1c8c49bfe40e4b1df6f72bb7dd49e722084cf81"; + sha256 = "24f7caf5bbc8edefa104c6b4a646a1afa254da9bb8a1965193b7e4a97ef848ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/el/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/el/firefox-100.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "07b34038828ea049ea6c1bba71d27bada83ec514d8d58be92f9005ff01cd6853"; + sha256 = "97bfe8f01d8f6024b85a6f25ee084642dc2e2c50dc189d1b6bccfa7835120bad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/en-CA/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-CA/firefox-100.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "fe1dfeca3de53837003d93aecf5fa971a51e8a585cbe9a1c44f338d8d1d7788c"; + sha256 = "fa534341dcfeeb5778d19d5c38fdd8a56e92e756212d256c2fd40c499435e6cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/en-GB/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-GB/firefox-100.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "fe4baa77504d9ed1f789726db85599d5cc634765ae19cb4604234ccf7a43b97d"; + sha256 = "a38f383c06a2cce4ddc49fd304b1b5742dcbc2cdd189dd5b6e91b1494231504a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/en-US/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-US/firefox-100.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "6ca97f006b90f98676efae14423c8707527182e118f4d3020e51eddcb14cf8d5"; + sha256 = "c5ad47cc4f5829eb3d01c7031833e3f8aa24d07947415947d5e86e492be37c20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/eo/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/eo/firefox-100.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "e9fb1b7b6752629891df490ff625897ae5d929c435c824cb6c5dce18340e3273"; + sha256 = "d96ddc5a07581ac62078cac8d702425d6764cbffd93ea1a35ddcbfa5258e01ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/es-AR/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-AR/firefox-100.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b18a2fb101d28d1dae1b4a33d63906a7c6720ddf5e4418eecf8f6df0be58e017"; + sha256 = "e5c069a162cd02c3449b6b6c800c491f80270cbd9e29bb418351b40ca318d08e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/es-CL/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-CL/firefox-100.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "37a54082b8bb69c925894718eefcb1229ad661cfe31aa95906da163a213ea4b6"; + sha256 = "e45ea8d1bfc96f500e1061eed4694f2c7c81fb5b5ea76411cb7bdf7df8e74b1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/es-ES/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-ES/firefox-100.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "bb38bb93c74878646f31c09d524eaadf18a1e2f6ace957abfabd05e1e63898e2"; + sha256 = "a86e913fce09abd34f69f72f338e5d276360b39584266fcb160aa4cb5ef15e10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/es-MX/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-MX/firefox-100.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6c75d42e34b6fde9e8b3ad31ad3574af87dfab2f5eef71b457fbdb9ca6dbe12e"; + sha256 = "d39ac7c519aa5ab3c2b02da50f882480d657672573ac13b76ffa1620a7c31dea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/et/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/et/firefox-100.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "e25b97ff49fcfaef9906cee48f0f342272d2b9807a6221aa6b4fa5939bfba70e"; + sha256 = "2d83aecece8c35f11bd3190da1d91100779c4516292fb683792c09a9df63297b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/eu/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/eu/firefox-100.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f929034c74b057e32db4408ca25b9e9aff9b26d487db29cbb0c0fa0ade96748a"; + sha256 = "acb38b6a8d2111511d31cb967da094d68eb4bc5e1fb4af613392cdb931a81b69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/fa/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fa/firefox-100.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "2fd4af491c79dbceee3de7e04fef413535757c0588072ece7e5ebcf252815782"; + sha256 = "4c509afe344db0cf9eff8f3bafabdc80b25f78537dfcc931d05a326d97b3793b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ff/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ff/firefox-100.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "7b0f38144eef79ead877a352a03abb3d50631031b051750d3d9ab84dd8afe319"; + sha256 = "23c02e6d2f18351c72917c02f6795b1183482e35c6fa5990ecab8e724959c4ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/fi/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fi/firefox-100.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "fefaec6affe3be2d963967397aa6b0c7495570d0fb437820d87ef6289654fd80"; + sha256 = "30f696e3e0b419017fed38ab434a99ffb303eaa4d9d96bd2525ad84cebb20d51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/fr/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fr/firefox-100.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "1dcb22611d288ea566f1d319b4fa8f6ec7057e05d39a1be794ae12f343e29809"; + sha256 = "40d631f78caf08e8a04a4dc1286cd749d66130a9b3f887f8a74d1f15ed7247a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/fy-NL/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fy-NL/firefox-100.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "fe15fecf740bdc9f9476366f394a10f2f919d7c84f64844025faafbf28fef05f"; + sha256 = "62563d3d7c5755f1163d956f1bf82cb81c48b5349db293e66185c95b8e65caa6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ga-IE/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ga-IE/firefox-100.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "06c5708ca8cf4ded0cbc7b52e0772bc4fb86ae55d822ff09088af5c35e60d917"; + sha256 = "72914c49d6b5384987942a6c8127891c7eaa088d08bf9192ce448b11342f512e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/gd/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gd/firefox-100.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "fdbf7f54a4120dee131687fc81e972e4df52347de4e8473a152ca0b98d7bef92"; + sha256 = "1a127b1a4a8407476f1ed73ebd982fc5d0262e2fc413748b4228d9bc9d28a59e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/gl/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gl/firefox-100.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "807d0deda34da90207a6ddac26649f38eded1a6b2337d9cb73ed28c55bd316b4"; + sha256 = "1a84a2d00d065f69492a73e6917e07de8824b185139e3acb75b0f0dd5f82d604"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/gn/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gn/firefox-100.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "a70ec6595f9ff5cfcc8ae0185d4ece632a17ff49817b98052bee8981dbd63d58"; + sha256 = "6ddf864b2b2258d0ced011ac2d0ed13455e99d3c093642a477f95ca13a3349cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/gu-IN/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gu-IN/firefox-100.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "44e9a22d946e4405db84069d329b66293b0d789b59d98bed4570d98dd19b6c0f"; + sha256 = "86688035900e5bf2dabfb7e8c7320dc4ccf33b46d8c9e963216a750ba2e2b300"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/he/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/he/firefox-100.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "1855cfb19d6bd857a14950399e238c30768e23c08d21a1db38b49dcedf2302bb"; + sha256 = "d35c7ac5d61d9253ab69da2a77bbaef7037e7cfa2339d4730201fe41776adc90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/hi-IN/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hi-IN/firefox-100.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "47fc9f90b3d52e353594bef6c84bf408ef3e37fa2d0eefe17997bab546b2f9b5"; + sha256 = "48872f0b68ccf4df855e58a4520f5f8347b05de318a0991d83088521b4d178e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/hr/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hr/firefox-100.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "bcbe511cd9bf09605f1e6bdb3b65e9f8eff6c6e8cbdb904987941d2edbd10b42"; + sha256 = "9c1c1303aadb4071a82b558fd470c96671872cd480e444686ec74f41afd46e2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/hsb/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hsb/firefox-100.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "5a5b5063eaeeeec63d13f138ba43280ea6cde0aeb03bcf18c6f5ed0c7ab575d6"; + sha256 = "828330501590e2ad3021397cb7b37a86c015b93536e4e2383fc5c5a1e8d6a6f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/hu/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hu/firefox-100.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "7828ea71f5ecf9afcc52fad0047789ece2c8be5c7ba8d390d98a24daffebc0c1"; + sha256 = "592c69c6377657bccbf2b81ae54bc8f37fa6d081dc36d0465c20eaf6d673f32f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/hy-AM/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hy-AM/firefox-100.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "c76b2e07e5085caf56c8c94848f7d7dc4b40c5000a792921bce762ed55b73f4a"; + sha256 = "a95989dbd6b7b499840f5cc65a765129ca23392455afd21c0ff865112900b5b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ia/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ia/firefox-100.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "de9ace36727f9fb070138d30bb854bf28ad57b7a9895cff492d48231826044cd"; + sha256 = "a9b225d969b0d8c621a2b545cbb42ce7188d78c09c248422d6379d83934201b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/id/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/id/firefox-100.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "01dcade8b0d7dd4f4ec9a408291c643bbfbcb922ba0b2cd84645799c22c46082"; + sha256 = "304f4d04d3e73a477598a034d3fd016948c5e1662bc236d640219b4b96159690"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/is/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/is/firefox-100.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "a8aa5de061a5414e55f45c61bece3f4471662f36e3e30163daef028cbc62a675"; + sha256 = "3cd144b87e3ef57703ce60c57a09ea8c6ab910408a7c891f9b9b653dca51c55c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/it/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/it/firefox-100.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "4610c04780fc075cb49a09e0815671dcd8f3b625a5b30913c8ff5be81cfd13cb"; + sha256 = "b024d3b0fe4ac5691c6cf1e0c18ce2bff91083746bb988799f2eb3ab74e22e80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ja/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ja/firefox-100.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "7ca93bd2ab0a1e0e0aa1a41df7331c65f27747b3d511527c557e613272a736ba"; + sha256 = "fe3d9b0c7d0e8f47e9f1bc12429200aeb951b303946365bb32f51c9d807259cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ka/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ka/firefox-100.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "55cf179d73cfafc5526e5701de3560e4bf9c1d02c28c77cc66801b828fa9e33f"; + sha256 = "2e4d0f5f2eab6787db359c47a48b35a202b713de0807299a41a751b527a9ccf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/kab/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kab/firefox-100.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c7930dbea998892979a16d3e60b19db62cbbe8388e68a2ea59a11e234e8f94b9"; + sha256 = "49166beef9b6952940d1ce420afd77777fbe84143b65693f9b75db6768b88e01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/kk/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kk/firefox-100.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "771eb9217226b36cb04719555a82c3b11e783059183ebc9c295677ea06d69321"; + sha256 = "24aec891a8189714c9299c695346a3d0a4ea52621f08b890d5db63ba36bc627d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/km/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/km/firefox-100.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "970daaec6f449ab1d6dc8688ee9f41b95d295523ed57ec14c5f34fc98ee18dee"; + sha256 = "90f5b7811a2f0bdfefd14261d1e0e7fe85466dc96c666316134c97095606c6ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/kn/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kn/firefox-100.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "fae2d5a9a428ddba10cdafb6fce6e0d591b5ba8353d2cf88ed423602fd150576"; + sha256 = "e423d1231edbef812e8cbd50f53dba4b48dc9083cbd5d91825392229015c38c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ko/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ko/firefox-100.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "4a66e9cec2224382645d962908218bb89fe4a499b9138c83966dd70d9d25b172"; + sha256 = "cadd481242635d64b224e080adc1bdcfff9f7ced4715b0ea9655ab333ac7d039"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/lij/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lij/firefox-100.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "85ef4a63c9dc97f9b482382a83f5a7a6880c5df87acce7e142506c2d449e4f69"; + sha256 = "4798691d44767027a39c1124053b2351523e615a06b32bd2bf4f9da7b858159a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/lt/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lt/firefox-100.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "da3ccc7021eb4b62c35c716089599f714cfef218856063e083c3547d64271b4c"; + sha256 = "ac49b6d34eb8caac4a6900246adb3562eb2228a50fcdc543f79903ea267b339e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/lv/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lv/firefox-100.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6aa1d5453d938f16330e0ed54d63bc59c5b57e7da5ddbc41a05c2f75dea68e73"; + sha256 = "4f6e6a26a2b8a23855dbdeabd2363ee0155914542e4c48c655d6b52da6289b34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/mk/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/mk/firefox-100.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "e0cc100f8be06fd97cb029837a054e60d136272a9f6b78eaef692d3bc5d8a669"; + sha256 = "522590d926022cbe833ce0050e5d23db47bab2c8de1e1e0ae3e96941b53dfb6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/mr/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/mr/firefox-100.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "d3a3d72bebefc51cd8eb1a1ebc1431a9845d15af6321b76e2982a0d210397409"; + sha256 = "4df57dacc8b71070aa077281beffc04bfc632666b2b26caedc1fda4e484e59d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ms/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ms/firefox-100.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "c59362f1817f98ec80ea275b39f50bed7a0ee1154d6a6ea3ad6dbe8f2eb1bf79"; + sha256 = "005506663901ad539817197972864f67812a9f5e3f1055e7418ab4bb052ecdad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/my/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/my/firefox-100.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ec1d06208223422633c2ca495bb17ca946e379d361a2e00f94ed08588b6b2263"; + sha256 = "aeb8445d5425640ceb8d2b823a7dd3e79fbd355f07420d015af4559d2bf2cebe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/nb-NO/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nb-NO/firefox-100.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "2e31732057bda76dd2d74d8e2b3e6c38a2035bf163234fd82fc867b544d34dc1"; + sha256 = "d41588beac0fc9a3eeab9f2843b8aef53e61a7c15dcdc34eb89e73838d9dab24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ne-NP/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ne-NP/firefox-100.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "eba3a80cb0b761b68d5e318d5f8110a7d19da1261868cbc1f1a39eb47c08c018"; + sha256 = "c3c981a5a701118e70b6b03338451d7d50325234be03838e403e57b822b6fb61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/nl/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nl/firefox-100.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "1f7ae0dc78d5b30741e8d645471aa1875c2de144742383eb5c24cc2deda79f77"; + sha256 = "ee902a63548299b6ceb9cfa263991233c32b0bf8534dc5256ce84714eab01f12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/nn-NO/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nn-NO/firefox-100.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "acd635ad253a878043ec4121984da468901c49d4fb511ec9cfad478980ecf647"; + sha256 = "e3fcf444660a2e8b3abe10d9d3a512985e9791fb7916ffafac564d9849816241"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/oc/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/oc/firefox-100.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "2721c54a1bee621d9c7cf2f5c657dc48a7d9406d80c5aeb9963bf7b128c17629"; + sha256 = "0b80101b082209ead23287d0d7efa136eea099b9895b9a4a8906abafb8a7dbcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/pa-IN/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pa-IN/firefox-100.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "97c435e09c0b56bd9bf66d50e90034a502e9af6cc1984d5acdd2d948f7556273"; + sha256 = "14f8fe19c6cea1d38eba2f4aff8a8787875632e7ef867b44a48bcda59ad0c32f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/pl/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pl/firefox-100.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "36e81c101b8cb68be0f69339c47ff4e5839397096775cf9ea46f0ff1efe5353a"; + sha256 = "796b575f4ada12cd1aa0fdeae8b5c198eb2e6a327bd0cede066b1beff4961d96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/pt-BR/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pt-BR/firefox-100.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fb90a3a2a303f945bc34e2a6ec397f0116ac77f02062e7a7c8dcd382606dfec0"; + sha256 = "a1a83e3e317bc7465922b40327031fd48610627c0e1554569710a7b40fedd98c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/pt-PT/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pt-PT/firefox-100.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "8797c65c277cc0f46a8d8b2cafc370be55c57eccc8e9fc88d3053e2969f9de58"; + sha256 = "0ff375602235a96b6197366ae22f4c05cbb3c9068d48cdb08a035e3af084d3f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/rm/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/rm/firefox-100.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "b8cd7b28f31d4e1ee874f1073065897444eb9503e207b924a875a8c3a0b21509"; + sha256 = "5599c540c50162d1a79ea16196bb15fda9fed825508b60b4961d91255709593d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ro/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ro/firefox-100.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "3907d9aa29f56fbf97008e65f83ae25719f4156961ff3e976661a2012f16fafd"; + sha256 = "771be3da68642a15baa1e054bf23e9df272d0b0ab46f1e42c6fdf35e85035b9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ru/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ru/firefox-100.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "4913bf6de1f5b14d005f20bbc0d2ef97227903d296851034735e872e28b3f065"; + sha256 = "bcca4b9aace48ed4da4c881ed47b0bbc3d20fddd07273ecf1c84758633f350b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/sco/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sco/firefox-100.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "ac4fb9005a71ca5bd25120946b65ebc0f437d8c86b9dcdc11e9b874ade8b4dbb"; + sha256 = "1ca439331c6437dee10d1f2cd72907499894bd98af036dbedc964248217ff510"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/si/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/si/firefox-100.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8fdac92f650f10a9dc9322f817f1bb6f60b5a9fe97942cc1ca5ae694aad71523"; + sha256 = "b643cfd20a0bc56b1989dc1c4dc96535d6585a53bb5d13c85ca53bb1027e1732"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/sk/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sk/firefox-100.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "57987896b0e1b8846911b878dc360d139002401ed57a9b95fe47f2801c983848"; + sha256 = "5aa1dc132c3d2a42b6086cf824c8b6ae7a30d8b55341a05acfc3eaaa8dd4cad0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/sl/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sl/firefox-100.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "3097cfb125f9b275270955c454577b7aa5ffe68b5ee0917cf6b3e0c31d9c5b25"; + sha256 = "92b2a15a04c4cee559e0a6565509a546ac7a2c4e3fadbba0c6197356e99f71f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/son/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/son/firefox-100.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "8588038e834177672a47530e8e86c202123606ef6f1a5d9a4d5c40cac8cb9aec"; + sha256 = "8a25e8af341178bbbcc0731788b1116ab64fbb55480836b94ad6e7830b6b5f16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/sq/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sq/firefox-100.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "cc229e95ce396fc37fd7103e70acae2414de501823beb04e71c702cc65c430f6"; + sha256 = "66b7ea3b488b980c425576fdad6009d2c246bdb4686b24b519604a54dba6f756"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/sr/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sr/firefox-100.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "9c134f28f92311c8c8764df4d37727134fecab10197cbbaae01d26773e2897a3"; + sha256 = "1aecc3a24dab4a843a967b8c023bbe01488dc113e451cfd7d39e7c2caac1c153"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/sv-SE/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sv-SE/firefox-100.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "40c8f4af652dae7a3eb1b1cab01f032ecb526600cbeea0dd5ccc4319b0d50310"; + sha256 = "d5189ed627ac49286cec9733c8658c271ee99930f2d07754993e776a58eacfa0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/szl/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/szl/firefox-100.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "d71882b04563f7f89a4c0bd2431e6b33e2af010b40b1dd50304f9daf0ca66525"; + sha256 = "45c48d7381499d5aeca0fe340ecc8af33016821fa8f081f6c52c878a9af3640f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ta/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ta/firefox-100.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "a473f9123d53de141e0592e03e8c9dd6ce8f057c57f89f55957c1436d139582f"; + sha256 = "1a8a9fe5eb0e9e8d213d667cc1aa478f9f381d5a444f8d2be518fb04926e4f64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/te/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/te/firefox-100.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "042aae2c4d10d2b7407b3252a39600217ab8ac0c9e34045c31e70cd8e792968f"; + sha256 = "1f3aa559af38662aea444f52974c2843ffede5505e71e83d73e331d2c4b92275"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/th/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/th/firefox-100.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6455ef37c941c978b1380f6ff3de41c0b7f8348d498d154e78c9c7b6e8992187"; + sha256 = "05bbf88a5b9e914d86244555d06d560b328e8e873e380e67d40edb6d3971d383"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/tl/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/tl/firefox-100.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "b41d0029729bb4fa1e8d8c596232272c1e238d8bbdb675d31e42250faed54396"; + sha256 = "8cd7f71325ce2a54403032bc80fe366acfd7a8ce3e3871ae1a8f4e0b5315ddf9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/tr/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/tr/firefox-100.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e0345c71199784d40fa159617371a72e3f3e05d2aadc041d14c6b3e450304afd"; + sha256 = "41275c3dcfc9624390a2d3ce9d0aa0e746c4e3122f433924227299d46ff8ab42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/trs/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/trs/firefox-100.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "4a6afcbbb3d05bf6f3abe3194a21aa6ea6d2f76cc5429ef4ca0a433ab1d97f76"; + sha256 = "c04aafe011c8626d749990e0ba293a22c8a623c6eab9bc4bff2782708832a648"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/uk/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/uk/firefox-100.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "97709ab7965f859da2ce93cd4c22b875a0a94af8b8b7acabd1578d5ae82d6d85"; + sha256 = "965f445606d8c81d1745a7028ffd15af7cb9bf2473bfba5e673e3621afeaa6e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/ur/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ur/firefox-100.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "7c69d7f588540d0a72d9942671d40ab59f066b9798279dbe1b0b0980cfa13a06"; + sha256 = "8955e64902aca993d110401fe36b56c84b53a414b2da569525653ee28801d9ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/uz/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/uz/firefox-100.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "53c450eeb1223c2794b9270d257fdeec50bb4deece5bf5d7d05a5819f54989c5"; + sha256 = "e05ef7856c3c4777da187ed7212ebab01900881702d1fa8e221a86c57c6ef4f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/vi/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/vi/firefox-100.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "395e8ffa9c6a0145f6fdd005df0b73fd4d59410ba780818232cde2f3fc257d50"; + sha256 = "baca088760ee065eb8ad86d93c6b0325d23f88d18359693ba9c2a3971e9e5061"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/xh/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/xh/firefox-100.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "22359e92de488a24709445de54499c9ad49e841e4ef6ba45296b44fac089121c"; + sha256 = "c679216fca120982454a15087890fda40d21bb269a940d96dbe37428672db65f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/zh-CN/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/zh-CN/firefox-100.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7f5d0d771c546d41e835ce7842ee7659ec4a69cd78176b0c679b4b056e8d5499"; + sha256 = "ba77a6dc02a406174a79a99b510c2cf7f8be6f877acc57822ee174cc5a99931d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b5/linux-i686/zh-TW/firefox-100.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/zh-TW/firefox-100.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "8bd0dbb9bf1a3682ea39e43da3819a4f12bc147484528d869a252d2ad000f95a"; + sha256 = "108fbd9c48b974cfd533c514d8459990b5d278ac5381ba5cfb8fad8d885dcfac"; } ]; } From 539887622b9bc33186fc0aed6f1eaccdb9e19833 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 15 Apr 2022 04:20:00 +0000 Subject: [PATCH 067/171] starship: 2022-04-12 -> 1.6.2 https://github.com/starship/starship/releases/tag/v1.6.2 --- pkgs/tools/misc/starship/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index bbb4efef940a..f32774774812 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -14,15 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - # unstable was used for a quick fix for darwin - # revert to stable for the release after 1.5.4 - version = "unstable-2022-04-12"; + version = "1.6.2"; src = fetchFromGitHub { owner = "starship"; repo = pname; - rev = "a02e87833d6a0e0da3c239d0bbbf3b485356a655"; - sha256 = "sha256-oe/dKFgM8h+ur8E9/dw4byBl9vD6foUXyKX19HDozYU="; + rev = "v${version}"; + sha256 = "sha256-Swxc2gl3YP+0Kf+trp37rGhr5G8NT4L3Bb3lHwLm50Q="; }; nativeBuildInputs = [ installShellFiles pkg-config ]; @@ -40,7 +38,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-lku+K1Y5HIt4gDHqudhDMVs7XGoKw8HcMjXMGDu1vkg="; + cargoSha256 = "sha256-UvIectx6qWkXg/yVQe11NXhh2UD0D/dMCtK1kj3ln6M="; preCheck = '' HOME=$TMPDIR From c30945a93fbd3122a55ee6a63c9bfef7556bc82e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 15 Apr 2022 08:37:04 +0200 Subject: [PATCH 068/171] element-{web,desktop}: 1.10.9 -> 1.10.10 ChangeLog: https://github.com/vector-im/element-web/releases/tag/v1.10.10 --- .../instant-messengers/element/element-desktop-package.json | 2 +- .../networking/instant-messengers/element/pin.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 30593d17ba5f..960336d50a53 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.9", + "version": "1.10.10", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 01d9ed0a7967..1b42ed12f341 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.10.9", - "desktopSrcHash": "vbVnkb/sVW+c7JGIT8Fcjtwe7i10aY0mBoiNeAD8tvY=", + "version": "1.10.10", + "desktopSrcHash": "Atgcu+K28pScYokS/lTu+/mMeEC+1yTcn3Akq+KZJNY=", "desktopYarnHash": "0jm0i1yyfkg1ll11pb3qif1vdxx6rp0yl9kd8jg9nhsg2jzw66pr", - "webHash": "0yp29h2cmi18y8g8scqx3zmc1l80q28gid709ysqqb349gy1kls8" + "webHash": "1xp0rhw3k2znwvqqikhd771l2n6xyx8npcz87m9d4cisl82lpnr0" } From 7210bc054e0034614325c4dfb5d33a3a11e3eb8a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Apr 2022 10:01:12 +0200 Subject: [PATCH 069/171] python3Packages.iso4217: 1.8 -> 1.9 --- pkgs/development/python-modules/iso4217/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix index 12cf40a6764e..8df5f962ce58 100644 --- a/pkgs/development/python-modules/iso4217/default.nix +++ b/pkgs/development/python-modules/iso4217/default.nix @@ -16,7 +16,7 @@ let in buildPythonPackage rec { pname = "iso4217"; - version = "1.8"; + version = "1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dahlia"; repo = pname; rev = version; - hash = "sha256-L0vx6Aan6D1lusgBh/pcT373ZTxbtWpQnFKB2V0dxlA="; + hash = "sha256-7VrXAP/Qyzy2BDTmFwDlxHvF7HhndJsDMt/qHcsmhzs="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ From 92282f192977fb765c3ecdef260f89e682fbf3a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Apr 2022 10:38:59 +0200 Subject: [PATCH 070/171] python3Packages.pyefergy: disable tests --- pkgs/development/python-modules/pyefergy/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyefergy/default.nix b/pkgs/development/python-modules/pyefergy/default.nix index 28fb058c52a2..7b7e587feddb 100644 --- a/pkgs/development/python-modules/pyefergy/default.nix +++ b/pkgs/development/python-modules/pyefergy/default.nix @@ -1,11 +1,9 @@ { lib , aiohttp -, aresponses , buildPythonPackage , fetchFromGitHub , iso4217 , pytest-asyncio -, pytestCheckHook , pythonOlder , pytz }: @@ -21,7 +19,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - sha256 = "sha256-AdoM+PcVoajxhnEfkyN9UuNufChu8XGmZDLNC3mjrps="; + hash = "sha256-AdoM+PcVoajxhnEfkyN9UuNufChu8XGmZDLNC3mjrps="; }; propagatedBuildInputs = [ @@ -30,11 +28,8 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ - aresponses - pytest-asyncio - pytestCheckHook - ]; + # Tests require network access + doCheck =false; pythonImportsCheck = [ "pyefergy" From b56bba188bb4a3deab64f00a89c646a748db4fdf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 15 Apr 2022 12:18:17 +0200 Subject: [PATCH 071/171] eva: 0.2.7 -> 0.3.0 Changes: https://github.com/nerdypepper/eva/compare/v0.2.7...v0.3.0 I ha to go back to using `fetchFromGitHub` because `0.3.0` is not published on crates.io (cc @NerdyPepper). --- pkgs/tools/misc/eva/default.nix | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index f589d39f35ef..038ecc7bf228 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -1,29 +1,17 @@ -{ lib, rustPlatform, fetchCrate, fetchpatch }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "eva"; - version = "0.2.7"; + version = "0.3.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-4rmFvu6G4h8Pl592NlldSCkqZBbnTcXrs98ljIJmTXo="; + src = fetchFromGitHub { + owner = "nerdypepper"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-INXKjjHW9HZ1NWx1CQOerTBUy0rYFLNJMuRgKQfQwdc="; }; - cargoSha256 = "sha256-BG/W8lG/47kyA7assS6efEO+DRkpSFcZQhlSIozlonA="; - - patches = [ - # to fix the test suite (can be removed as soon as #33 is merged). - (fetchpatch { - url = "https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch"; - sha256 = "11q7dkz2x1888f3awnlr1nbbxzzfjrr46kd0kk6sgjdkyfh50cvv"; - }) - - # to fix `cargo test -- --test-threads $NIX_BUILD_CORES` - (fetchpatch { - url = "https://github.com/NerdyPepper/eva/commit/ccfb3d327567dbaf03b2283c7e684477e2e84590.patch"; - sha256 = "003yxqlyi8jna0rf05q2a006r2pkz6pcwwfl3dv8zb6p83kk1kgj"; - }) - ]; + cargoSha256 = "sha256-4l9y2qmS7G1PvxF8/51F7fx/sDuYHWDkcyOin2sYHdk="; meta = with lib; { description = "A calculator REPL, similar to bc"; From efed8d05c7e6e4bc068fa1e0b8bab69aae5ac1af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Apr 2022 13:56:09 +0000 Subject: [PATCH 072/171] python310Packages.mechanize: 0.4.7 -> 0.4.8 --- pkgs/development/python-modules/mechanize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index aa309ff33cea..5b0ca1735cbd 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.4.7"; + version = "0.4.8"; src = fetchPypi { inherit pname version; - sha256 = "1773a8f5818398e0010e781dc0f942cd88b107a57424c904d545cd827c216809"; + sha256 = "sha256-XoasB3c1fgBusEzSj37Z+BHUjf+mA9OJGsbSuSKA3JE="; }; propagatedBuildInputs = [ html5lib ]; From a6a25ec43d65f9dbf77ed52d28f582fb6ed03d68 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Fri, 15 Apr 2022 17:39:18 +0200 Subject: [PATCH 073/171] chromium: 100.0.4896.88 -> 100.0.4896.127 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 6fa09029ffb1..2577eda45168 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "100.0.4896.88", - "sha256": "0l628x41krsjgzff9996k5wkbcvcjqf4128z32hpj1pkg23719f5", - "sha256bin64": "1wqzs3f70ayi9vy3ncm5mild22xvhwn4d2lcfra31wwnzxi1nqxm", + "version": "100.0.4896.127", + "sha256": "0kgq38dy9mjyc44556i9gxhlsgd7dfvv1xi1ibk92b4p7i2y6427", + "sha256bin64": "0mm6lix14bf4ca440dyccnq54z0qvn5c886ghfyzy2q0bqzbq4nh", "deps": { "gn": { "version": "2022-01-21", @@ -19,9 +19,9 @@ } }, "beta": { - "version": "101.0.4951.26", - "sha256": "1wpdi5l0bic0z9ydvx5vj35z6fh21b3n8dsxyvcbm0rq4fca5zcg", - "sha256bin64": "13mx2jxq5pjzp6dxvnzkfs83krhvpbw0pim7z4c7hhyphjc4fhzr", + "version": "101.0.4951.34", + "sha256": "1pqglzc8k31a4x06jn9pd6y8m4nmmb7rv5b3zancmh0d3z0nz3v5", + "sha256bin64": "1zhif47j8nqglaj1z3ism3dl6z8n5ilyyr835an32mf6igkfj217", "deps": { "gn": { "version": "2022-03-14", From f573afae7763ff2823a7c948e08dab0a7e7b40e8 Mon Sep 17 00:00:00 2001 From: Nicolas M Date: Fri, 15 Apr 2022 17:47:11 +0200 Subject: [PATCH 074/171] soft-serve: 0.2.3 -> 0.3.0 --- pkgs/servers/soft-serve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index 582603a7a76c..0d4c58d2b86a 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-IaSXkbOBuvC7BhM+rGGYMcvk6jjKVDHH+lSs3y2UM40="; + sha256 = "sha256-FtWlE2CmUx9ric4yFItj7lc57259/BVINyUhSuBNapo="; }; - vendorSha256 = "sha256-m5xwxs6XvmPffDX9dkkEG0/LdlDDm6Eq9CC0tVdauVI="; + vendorSha256 = "sha256-MwbtrtfvQ1HimLjUCmk8Twr4tpfP4eFBUlDP15IZKto="; doCheck = false; From 985e1340e25264a2ff1b7d7bfa578527ba42ea00 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 15 Apr 2022 18:03:12 +0200 Subject: [PATCH 075/171] neomutt: 20220408 -> 20220415 ChangeLog: https://github.com/neomutt/neomutt/releases/tag/20220415 Fixes CVE-2022-1328 / GHSA-qfrq-pp74-gpff --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index ac7e1969c505..43cd7183c511 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "20220408"; + version = "20220415"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "1aziffkjxbflw1narih0dr8ghl142knsb5z14fjb7n5ya9xpgp05"; + sha256 = "sha256-iVKDgVN7YFPEMP+OISS7jRG9Whs2QG60yH1r2kw3MUQ="; }; buildInputs = [ From 2af96a4832eab80071287f7c39a2ef6e85aa7906 Mon Sep 17 00:00:00 2001 From: workflow <4farlion@gmail.com> Date: Fri, 15 Apr 2022 17:56:03 +0100 Subject: [PATCH 076/171] update node-packages.nix --- .../node-packages/node-packages.nix | 1534 +++++++++-------- 1 file changed, 861 insertions(+), 673 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index af5ab3f0ba2a..61504c5e64d9 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@alexbosworth/caporal-1.4.1" = { + "@alexbosworth/caporal-1.4.4" = { name = "_at_alexbosworth_slash_caporal"; packageName = "@alexbosworth/caporal"; - version = "1.4.1"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@alexbosworth/caporal/-/caporal-1.4.1.tgz"; - sha512 = "oNEyHFcHc66gzmUXDUqzoqEpjcQnsp4REzXMkQNGxMF7MZDxiec3m9IVvzFmXtl0jU48bX/+ay5aZ8G3EVQV3g=="; + url = "https://registry.npmjs.org/@alexbosworth/caporal/-/caporal-1.4.4.tgz"; + sha512 = "IUxyskkgV/N3Jk2+d6SE1CbHScKlqbAaakQjxJwk8NHmXszA8Fqh914VclQ1YvTkzjDNX9mMb1tdRAIhMHC7+A=="; }; }; "@alexbosworth/cli-table3-0.6.1" = { @@ -112,13 +112,13 @@ let sha512 = "hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg=="; }; }; - "@angular-devkit/architect-0.1303.2" = { + "@angular-devkit/architect-0.1303.3" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1303.2"; + version = "0.1303.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1303.2.tgz"; - sha512 = "aywsRuucfZ4Tu68wtYI8ItWVbsbc9wc0xm4DB+ROtkAcmuuk4aiLgSqW2Eux6QxmGnq9U/yjFMLASOhFB8qDlw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1303.3.tgz"; + sha512 = "WRVVBCzLlMqRZVhZXGASHzNJK/OCAvl/DTGhlLuJDIjF7lVGnXHjtwNM8ilYZq949OnC3fly5Z61TfhbN/OHCg=="; }; }; "@angular-devkit/core-13.3.2" = { @@ -130,6 +130,15 @@ let sha512 = "wav5plcnlxQAfZ+0EUt3dvVTJnJ1au2TlKVQ0jSQJdR1LA6N7QUI49N2Ua6ZnDMwruQaQkoynitMW2l1it3qYQ=="; }; }; + "@angular-devkit/core-13.3.3" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "13.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.3.3.tgz"; + sha512 = "lfQwY9LuVRwcNVzGmyPcwOpb3CAobP4T+c3joR1LLIPS5lzcM0oeCE2bon9N52Ktn4Q/pH98dVtjWL+jSrUADw=="; + }; + }; "@angular-devkit/schematics-13.3.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -139,6 +148,15 @@ let sha512 = "XCLb23jmqHN0gJg9ZlICaFgfpfnCufIQp5SOsRKMKRkhjKycvDmKnfBTKDlkzb1IaUl6wQwP5k7Z69b9EX+CQw=="; }; }; + "@angular-devkit/schematics-13.3.3" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "13.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.3.3.tgz"; + sha512 = "S8UNlw6IoR/kxBYbiwesuA7oJGSnFkD6bJwVLhpHdT6Sqrz2/IrjHcNgTJRAvhsOKIbfDtMtXRzl/PUdWEfgyw=="; + }; + }; "@angular-devkit/schematics-cli-13.3.2" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; @@ -3667,22 +3685,22 @@ let sha512 = "M4SmXu428wwQLu1iw6ST07iACjdKY5HiU+xpcgD3IQMMQazgN616GDzc6KZ1ebuBsF7B4TyQS7KZh9mfxnnldg=="; }; }; - "@fluentui/font-icons-mdl2-8.3.0" = { + "@fluentui/font-icons-mdl2-8.3.1" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.3.0"; + version = "8.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.3.0.tgz"; - sha512 = "o67iMsFFqBCSL/l9D+wAguHCPOFd9xde9SztL7zwlf/c3o3+7oPRfzI/Zs1BqMxwd3WDsoKidhS2X6U8sZAuyg=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.3.1.tgz"; + sha512 = "L+rYMpTqj335zOhgLEf5vbzyhbSnqTXdsTbN4I9eUHZStrCzrKVcrQ57J/PvBVCZlqkqC9EAOaqhsf2CahPhBg=="; }; }; - "@fluentui/foundation-legacy-8.2.5" = { + "@fluentui/foundation-legacy-8.2.6" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.2.5"; + version = "8.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.5.tgz"; - sha512 = "PP8Wbw1QK9lmzReh+C7XG7A7Q3WTXAaxAMHjcBE3m2OPnhlF77Ok6IAJBkuKTWg0SZYQqJilTDSkVDnXVylGgQ=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.6.tgz"; + sha512 = "exjlFBqtxoFdz9gAg106iTtYhdtvztUHWcpxENwBGfSyFdQNKBuitQPvR5V5xO2snWxJCo/UNK3YWjgTm7UB/A=="; }; }; "@fluentui/keyboard-key-0.4.0" = { @@ -3694,40 +3712,40 @@ let sha512 = "2jcD23FzOPaSXqWtfOSCzopkKtxTXUFuHZyVt4aqVRDEjPbkQ/7p37O1WL95xweWTR/9fEPO/gPtv9kOnXrJcA=="; }; }; - "@fluentui/merge-styles-8.5.0" = { + "@fluentui/merge-styles-8.5.1" = { name = "_at_fluentui_slash_merge-styles"; packageName = "@fluentui/merge-styles"; - version = "8.5.0"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.0.tgz"; - sha512 = "+WoaAaoYx/wfkrz1Ag40JqHvDUFfQcg+dQ3jaEOoau16y7EZGIe7oN8WYIXNMgWuMxH7r1QlanFbQZ+ziKjHmw=="; + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.1.tgz"; + sha512 = "jzTyqhockpunkFKbEK+8sBP2cbgLllcmcWdTkCrxb+8CxLXD5bMWGMgUiI99Xz7+G/01QBMgAHOngKC05dVS7A=="; }; }; - "@fluentui/react-8.64.3" = { + "@fluentui/react-8.65.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.64.3"; + version = "8.65.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.64.3.tgz"; - sha512 = "zFZIydeLY5rovBXxVNvaRuDM1+TkBJ1h7s7bCGgZHuWbya0vmiWUJOEKsGL2hNJw9nppCrgau7EZU2b5d4xePQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.65.0.tgz"; + sha512 = "wQqRT8RemcSLJ1cinAAwgerZaax8mYys2eO5ZQtCoO84gbKvlF2G1OLfZpjXPUnu/R06o99GdFdOqIyOnPqyDQ=="; }; }; - "@fluentui/react-focus-8.5.6" = { + "@fluentui/react-focus-8.5.7" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.5.6"; + version = "8.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.5.6.tgz"; - sha512 = "K4INgXiwlinLz0Msa5TQbhL3YoN1mtqXO3p7XChDKeIf0QepAUDTnmJCrtKXqzY5VuXauLXyqm2darcHFrotVw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.5.7.tgz"; + sha512 = "5pL5Tbtu5eGtKMNYSHpZ7pNd/gR+Ge2Ye9r8UjphX2X3xYm0/Q0ktjRO1xdPDi7KW20I3GgLDviCW2atSxqIBw=="; }; }; - "@fluentui/react-hooks-8.5.3" = { + "@fluentui/react-hooks-8.5.4" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.5.3"; + version = "8.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.5.3.tgz"; - sha512 = "zWiiEp/vYmKIXhw/bIVH9BnPKLT3zgWt9ryi3Tp1VVgxLEDloomM7RgDn0e2P8HZvynYRRT8GKq3XJ8H3AzAUg=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.5.4.tgz"; + sha512 = "WEU+NCrc080v631KFetcqNfXUBReX91cPbDyo8gi3M5babObs/m913SeV/m2llLKVCAelLVEIGw33QlQsGAK3g=="; }; }; "@fluentui/react-window-provider-2.2.0" = { @@ -3748,31 +3766,31 @@ let sha512 = "bqjpfhqaIkBy16vdYzdc7tER9Td7BTcmC+kCXuqkHOQVuG9LJfqVGRV0DA857KLhOxiy0GXwKMeDbNV5jJf6qQ=="; }; }; - "@fluentui/style-utilities-8.6.5" = { + "@fluentui/style-utilities-8.6.6" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.6.5"; + version = "8.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.6.5.tgz"; - sha512 = "X0ZIreRdUlnJnRQmKtngWEbrqFuecBlEv9fkKoHJeu+27AD+AU9RPYgK4fd/QCJRFoTU9WzQJj9tWylTBK+kFA=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.6.6.tgz"; + sha512 = "axMN7sq4W/YLuk0LiYPrg23e45Tkv89w9w6FCRnhj6JWja+inlK/IPh/qR2egOBkXU0iJY3g03KP0GMqqm5eWg=="; }; }; - "@fluentui/theme-2.6.4" = { + "@fluentui/theme-2.6.5" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.6.4"; + version = "2.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.4.tgz"; - sha512 = "MXCY2Z5zc1nK5PCN6tqhI1nplX/LF+8lF8YsrSGvu6VDnHilxi4Rifv2dRc+jybNI13tZ50uteok2Je7jABcMA=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.5.tgz"; + sha512 = "P22JpZSZoDjIWO5AxdPNjuDixqlhHvj8eEQB4Ilf/aYKXXzMI8HTc6eBcm9vQt3NKutzHsat3h+Jrstkw9H2YA=="; }; }; - "@fluentui/utilities-8.8.1" = { + "@fluentui/utilities-8.8.2" = { name = "_at_fluentui_slash_utilities"; packageName = "@fluentui/utilities"; - version = "8.8.1"; + version = "8.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.8.1.tgz"; - sha512 = "JtICpdTINvifiyjp/LxxuDiU8BMkU73mzAP/3mz5KIhqPn3QjKG9ZeaBLPpoUXNOP/I6i9AYbAQHDvQI/ZK5tg=="; + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.8.2.tgz"; + sha512 = "hmPS0NiKT1QfBHRX8hM9V179jlM1nt4JxBuzkb+52+XPYwcwBYZJfb4UaX0UhMJH7Em5xwc5Dy2AjNqPCOvnIg=="; }; }; "@gar/promisify-1.1.3" = { @@ -5746,13 +5764,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.257" = { + "@microsoft/load-themed-styles-1.10.258" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.257"; + version = "1.10.258"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.257.tgz"; - sha512 = "QRWEP1re0byEdedyYr82/mL8lcKPihNiASO+YJlohX9vsa/FSUSVD5lZQ87xSpgpOjGGc37CuPHhU+xnhLsS7A=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.258.tgz"; + sha512 = "MUJGLLztVKuL7cvQcErURsqDF1XW3XR8FKJDgoxZ1g55C7k28TNZ3DkLSVLI/Z3arCB5ZbYQBx5pXAXlyKXtEA=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -7798,13 +7816,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-13.3.2" = { + "@schematics/angular-13.3.3" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "13.3.2"; + version = "13.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.3.2.tgz"; - sha512 = "ycTrPEsaSEtJ/CR8MVBrU6jaxcdBSy1lGUW8qSElsGS0OkHFKaV7fkzS9h0gPK9ANp6grZn0Ms3Hy3gAKQkiiQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.3.3.tgz"; + sha512 = "kX5ghVCmWHcMN+g0pUaFuIJzwrXsVnK4bfid8DckU4EEtfFSv3UA5I1QNJRgpCPxTPhNEAk+3ePN8nzDSjdU+w=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -8527,13 +8545,13 @@ let sha512 = "azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g=="; }; }; - "@types/babel__traverse-7.14.2" = { + "@types/babel__traverse-7.17.0" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.14.2"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz"; - sha512 = "K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.0.tgz"; + sha512 = "r8aveDbd+rzGP+ykSdF3oPuTVRWRfbBiHl0rVDM2yNEmSMXfkObQLV46b4RnCv3Lra51OlfnZhkkFaDl2MIRaA=="; }; }; "@types/babylon-6.16.6" = { @@ -9391,13 +9409,13 @@ let sha512 = "Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="; }; }; - "@types/node-12.20.47" = { + "@types/node-12.20.48" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.47"; + version = "12.20.48"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz"; - sha512 = "BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.48.tgz"; + sha512 = "4kxzqkrpwYtn6okJUcb2lfUu9ilnb3yhUOH6qX3nug8D2DupZ2drIkff2yJzYcNJVl3begnlcaBJ7tqiTTzjnQ=="; }; }; "@types/node-13.13.52" = { @@ -9418,13 +9436,13 @@ let sha512 = "USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg=="; }; }; - "@types/node-14.18.12" = { + "@types/node-14.18.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.18.12"; + version = "14.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz"; - sha512 = "q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.18.13.tgz"; + sha512 = "Z6/KzgyWOga3pJNS42A+zayjhPbf2zM3hegRQaOPnLOzEi86VV++6FLDWgR1LGrVCRufP/ph2daa3tEa5br1zA=="; }; }; "@types/node-15.14.9" = { @@ -9436,13 +9454,13 @@ let sha512 = "qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A=="; }; }; - "@types/node-16.11.26" = { + "@types/node-16.11.27" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.26"; + version = "16.11.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz"; - sha512 = "GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.27.tgz"; + sha512 = "C1pD3kgLoZ56Uuy5lhfOxie4aZlA3UMGLX9rXteq4WitEZH6Rl80mwactt9QG0w0gLFlN/kLBTFnGXtDVWvWQw=="; }; }; "@types/node-16.11.6" = { @@ -9472,6 +9490,15 @@ let sha512 = "UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="; }; }; + "@types/node-17.0.24" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "17.0.24"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-17.0.24.tgz"; + sha512 = "aveCYRQbgTH9Pssp1voEP7HiuWlD2jW2BO56w+bVrJn04i61yh6mRfoKO6hEYQD9vF+W8Chkwc6j1M36uPkx4g=="; + }; + }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -9616,13 +9643,13 @@ let sha512 = "+TRLFmHLnpoV0uw4O/PzqMbPT6bhQM0q2KO0l+R7M3sHYRndPpNL6kv8p7Ee9ZxgQ6noYB18/t+heQi7eijOHA=="; }; }; - "@types/react-16.14.24" = { + "@types/react-16.14.25" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.24"; + version = "16.14.25"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.24.tgz"; - sha512 = "e7U2WC8XQP/xfR7bwhOhNFZKPTfW1ph+MiqtudKb8tSV8RyCsovQx2sNVtKoOryjxFKpHPPC/yNiGfdeVM5Gyw=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.25.tgz"; + sha512 = "cXRVHd7vBT5v1is72mmvmsg9stZrbJO04DJqFeh3Yj2tVKO6vmxg5BI+ybI6Ls7ROXRG3aFbZj9x0WA3ZAoDQw=="; }; }; "@types/react-dom-16.9.14" = { @@ -9868,13 +9895,13 @@ let sha512 = "7axfYN8SW9pWg78NgenHasSproWQee5rzyPVLC9HpaQSDgNArsnKJD88EaMfi4Pl48AyciO3agYCFqpHS1gLpg=="; }; }; - "@types/tough-cookie-4.0.1" = { + "@types/tough-cookie-4.0.2" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.1.tgz"; - sha512 = "Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg=="; + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz"; + sha512 = "Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw=="; }; }; "@types/uglify-js-3.13.2" = { @@ -10471,22 +10498,22 @@ let sha512 = "KmJUazIEZWhy0UaFHV5Uy8AXpTqJgCPizEHhtxs3f8mIkUnwWjcQFG7FGfsAW7RgsN8hwcSZ5ZFjmXhllVwrkw=="; }; }; - "@vue/compiler-core-3.2.32" = { + "@vue/compiler-core-3.2.33" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.32"; + version = "3.2.33"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.32.tgz"; - sha512 = "bRQ8Rkpm/aYFElDWtKkTPHeLnX5pEkNxhPUcqu5crEJIilZH0yeFu/qUAcV4VfSE2AudNPkQSOwMZofhnuutmA=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.33.tgz"; + sha512 = "AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw=="; }; }; - "@vue/compiler-dom-3.2.32" = { + "@vue/compiler-dom-3.2.33" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.32"; + version = "3.2.33"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.32.tgz"; - sha512 = "maa3PNB/NxR17h2hDQfcmS02o1f9r9QIpN1y6fe8tWPrS1E4+q8MqrvDDQNhYVPd84rc3ybtyumrgm9D5Rf/kg=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.33.tgz"; + sha512 = "GhiG1C8X98Xz9QUX/RlA6/kgPBWJkjq0Rq6//5XTAGSYrTMBgcLpP9+CnlUg1TFxnnCVughAG+KZl28XJqw8uQ=="; }; }; "@vue/component-compiler-utils-3.3.0" = { @@ -10525,13 +10552,13 @@ let sha512 = "LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ=="; }; }; - "@vue/shared-3.2.32" = { + "@vue/shared-3.2.33" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.32"; + version = "3.2.33"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.32.tgz"; - sha512 = "bjcixPErUsAnTQRQX4Z5IQnICYjIfNCyCl8p29v1M6kfVzvwOICPw+dz48nNuWlTOOx2RHhzHdazJibE8GSnsw=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.33.tgz"; + sha512 = "UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg=="; }; }; "@vue/web-component-wrapper-1.3.0" = { @@ -13900,13 +13927,13 @@ let sha512 = "xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw=="; }; }; - "async-2.6.3" = { + "async-2.6.4" = { name = "async"; packageName = "async"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; - sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; + url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz"; + sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; }; "async-3.2.3" = { @@ -14269,13 +14296,13 @@ let sha512 = "fChMDiSfWcW0EUWmiqlyc+VAIXKH0w7BBruL3cVWSwO+5oA5A9juGF4NCBV2/KAHzaKaG0hXKPE49Wh6Lq74ag=="; }; }; - "aws-sdk-2.1113.0" = { + "aws-sdk-2.1115.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1113.0"; + version = "2.1115.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1113.0.tgz"; - sha512 = "F+B+HFnKCVIOmErZ1jJ8YL4XxDSaUI9l3JskfpIrk0XdJVcIfyHgA4XUrTUda4z5TOy1Z7eWV2IXgEpVRM4xyw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1115.0.tgz"; + sha512 = "WuMPBkE2b0hGRcF4oYw9zhjG0PC20lFKHT5FS8PXgZgu4GK8adQ8oIK0wBYPjq3F6b+VNdhDWSy3R7a6K+ENOQ=="; }; }; "aws-sign2-0.6.0" = { @@ -17132,15 +17159,6 @@ let sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="; }; }; - "buffer-from-1.1.1" = { - name = "buffer-from"; - packageName = "buffer-from"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; - }; - }; "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; @@ -17960,13 +17978,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001331" = { + "caniuse-lite-1.0.30001332" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001331"; + version = "1.0.30001332"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001331.tgz"; - sha512 = "Y1xk6paHpUXKP/P6YjQv1xqyTbgAP05ycHBcRdQjTcyXlWol868sJJPlmk5ylOekw2BrucWes5jk+LvVd7WZ5Q=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz"; + sha512 = "10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw=="; }; }; "canvas-2.9.1" = { @@ -18122,22 +18140,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.5.67" = { + "cdk8s-1.5.69" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.5.67"; + version = "1.5.69"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.67.tgz"; - sha512 = "T64trVn18NKz3WAlYFavkFS3Cw1eGy/5DkBwNgKL/VIfbaJFfBEIBgATJysECulB1pV4zxFAFLly+h/lFAbdwA=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.69.tgz"; + sha512 = "IIewuKWN2rA0eEu0F2LqbWpMDbnFWnQta4pHhJr++MUfryi+SIDBibBn4f3Yr9X2wCYQ30zQorBKLPVWSDbsXg=="; }; }; - "cdk8s-plus-22-1.0.0-beta.191" = { + "cdk8s-plus-22-1.0.0-beta.193" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.191"; + version = "1.0.0-beta.193"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.191.tgz"; - sha512 = "zDd2VAfaumBEhRMHh0yPMcho15fDHTui8bkxx6yPYa/d8h8RhUkNPcAef2zBClarYdmquFtdo6MS24/6nduw0g=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.193.tgz"; + sha512 = "AnLYgHgNV8fuID4AYvrAL+drooU3LAcxqWONouo3nim3aIVlmCGecaNJU9K1bkVG+7P5TKoWsKiKx9QFzGBV2A=="; }; }; "cdktf-0.10.1" = { @@ -20246,13 +20264,13 @@ let sha512 = "JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw=="; }; }; - "commander-9.1.0" = { + "commander-9.2.0" = { name = "commander"; packageName = "commander"; - version = "9.1.0"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.1.0.tgz"; - sha512 = "i0/MaqBtdbnJ4XQs4Pmyb+oFQl+q0lsAmokVUH92SlSw4fkeAcG3bVon+Qt7hmtF+u3Het6o4VgrcY3qAoEB6w=="; + url = "https://registry.npmjs.org/commander/-/commander-9.2.0.tgz"; + sha512 = "e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w=="; }; }; "commandpost-1.4.0" = { @@ -20795,22 +20813,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-10.0.113" = { + "constructs-10.0.115" = { name = "constructs"; packageName = "constructs"; - version = "10.0.113"; + version = "10.0.115"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.0.113.tgz"; - sha512 = "Q2UNZz2nGiW2ZDZz7+FLOKQNyGr0LXc6mjuAvxXJ57UMwLabbhva8lKWMv3fztdsqlVbtl1DGq1vw2htbaNNJw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.0.115.tgz"; + sha512 = "BZfiDjilEzfq+y8hNGRbh5yIYa+mK6ZAO172Q03pvN47Fe2a2PxzA1Y6dNCP+AKcajAiyzHjYg/hw98XheZh5A=="; }; }; - "constructs-3.3.266" = { + "constructs-3.3.268" = { name = "constructs"; packageName = "constructs"; - version = "3.3.266"; + version = "3.3.268"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.266.tgz"; - sha512 = "J0aAGYEaYU+4J9PTCGgqIE7cZZZrG+1tvuJhcSn7eKkYqshYVMoCglVtStjD9RXs+e8QzQjvYU0D0dJwe8uc0A=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.268.tgz"; + sha512 = "hbWMEALQbekilwintwaWTw7Hxj+EKn45lIWd3jwp1kiLFfMe1IGOh81JC/suFw3Ig9eFe3akAgZu3mcBUarkjg=="; }; }; "consume-http-header-1.0.0" = { @@ -21408,31 +21426,31 @@ let sha512 = "YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ=="; }; }; - "core-js-3.21.1" = { + "core-js-3.22.0" = { name = "core-js"; packageName = "core-js"; - version = "3.21.1"; + version = "3.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz"; - sha512 = "FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.22.0.tgz"; + sha512 = "8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ=="; }; }; - "core-js-compat-3.21.1" = { + "core-js-compat-3.22.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.21.1"; + version = "3.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz"; - sha512 = "gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.0.tgz"; + sha512 = "WwA7xbfRGrk8BGaaHlakauVXrlYmAIkk8PNGb1FDQS+Rbrewc3pgFfwJFRw6psmJVAll7Px9UHRYE16oRQnwAQ=="; }; }; - "core-js-pure-3.21.1" = { + "core-js-pure-3.22.0" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.21.1"; + version = "3.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz"; - sha512 = "12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.22.0.tgz"; + sha512 = "ylOC9nVy0ak1N+fPIZj00umoZHgUVqmucklP5RT5N+vJof38klKn8Ze6KGyvchdClvEBr6LcQqJpI216LUMqYA=="; }; }; "core-util-is-1.0.2" = { @@ -23568,6 +23586,15 @@ let sha512 = "B9vvg5rHuQ8cbUXE/RMWMyX2YA5TecT3jKF5fLtGNlzPlU7zblSPmAm2OImDbWL+LDOQ6pUm+4LOFz+ywS41Zw=="; }; }; + "date-format-4.0.7" = { + name = "date-format"; + packageName = "date-format"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/date-format/-/date-format-4.0.7.tgz"; + sha512 = "k5xqlzDGIfv2N/DHR/BR8Kc4N9CRy9ReuDkmdxeX/jNfit94QXd36emWMm40ZOEDKNm/c91yV9EO3uGPkR7wWQ=="; + }; + }; "date-now-0.1.4" = { name = "date-now"; packageName = "date-now"; @@ -23604,13 +23631,13 @@ let sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="; }; }; - "dayjs-1.11.0" = { + "dayjs-1.11.1" = { name = "dayjs"; packageName = "dayjs"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.0.tgz"; - sha512 = "JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.1.tgz"; + sha512 = "ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA=="; }; }; "dayjs-1.8.36" = { @@ -24342,13 +24369,13 @@ let sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; }; }; - "define-properties-1.1.3" = { + "define-properties-1.1.4" = { name = "define-properties"; packageName = "define-properties"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; + sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; }; }; "define-property-0.2.5" = { @@ -26007,13 +26034,31 @@ let sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw=="; }; }; - "electron-to-chromium-1.4.107" = { + "electron-to-chromium-1.4.108" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.107"; + version = "1.4.108"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.107.tgz"; - sha512 = "Huen6taaVrUrSy8o7mGStByba8PfOWWluHNxSHGBrCgEdFVLtvdQDBr9LBCF9Uci8SYxh28QNNMO0oC17wbGAg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.108.tgz"; + sha512 = "/36KkMuL6+WTrodVlOjtHhH9Ro7BgRaQrh0bfKckwDtdRSjTBuZCOddeXxzK1PkwphoeTxGUFVT9xnmvQ7xEdw=="; + }; + }; + "electron-to-chromium-1.4.109" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.4.109"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.109.tgz"; + sha512 = "LCF+Oqs2Oqwf8M3oc8T59Wi9C0xpL1qVyqIR6bPTCl8uPvln7G184L39tO4SE4Dyg/Kp1RjAz//BKMvi0uvw4w=="; + }; + }; + "electron-to-chromium-1.4.110" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.4.110"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.110.tgz"; + sha512 = "TvHZrkj9anfWkxgblHlNr4IMQdm2N6D0o8Wu1BDpSL/RKT4DHyUt/tvDFtApgZ+LGFL3U9EO4LRZ1eSlQ8xMYA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -26702,13 +26747,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.19.4" = { + "es-abstract-1.19.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.19.4"; + version = "1.19.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.4.tgz"; - sha512 = "flV8e5g9/xulChMG48Fygk1ptpo4lQRJ0eJYtxJFgi7pklLx7EFcOJ34jnvr8pbWlaFN/AT1cZpe0hiFel9Hqg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz"; + sha512 = "Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA=="; }; }; "es-get-iterator-1.1.2" = { @@ -28979,13 +29024,13 @@ let sha512 = "N64ZpKqoLejlrwkIAnb9iLSA3Vx/kjgzpcDhygcqJ2KKjky8nCgUQ+dzXtbrLaWZGZNmNfQTsiQ0weZ1svglHg=="; }; }; - "fetch-cookie-0.10.1" = { + "fetch-cookie-0.11.0" = { name = "fetch-cookie"; packageName = "fetch-cookie"; - version = "0.10.1"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.10.1.tgz"; - sha512 = "beB+VEd4cNeVG1PY+ee74+PkuCQnik78pgLi5Ah/7qdUfov8IctU0vLUbBT8/10Ma5GMBeI4wtxhGrEfKNYs2g=="; + url = "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.11.0.tgz"; + sha512 = "BQm7iZLFhMWFy5CZ/162sAGjBfdNWb7a8LEqqnzsHFhxT/X/SVj/z2t2nu3aJvjlbQkrAlTUApplPRjWyH4mhA=="; }; }; "fetch-everywhere-1.0.5" = { @@ -29798,13 +29843,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.176.0" = { + "flow-parser-0.176.2" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.176.0"; + version = "0.176.2"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.176.0.tgz"; - sha512 = "h3OUIHINMtdOnaMXyJH5ryqly1rft0Lt/di22dJB35FCnulSTxWvQhDtOH2dxQMU48/wtUmAOo4sv7Mj7XNyng=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.176.2.tgz"; + sha512 = "unqoh60i18C67h2rvK0SCFUBac/waUcx7CF1a5E4D0Cwj1NErTP42RF7yb7+dy25Tpyzt7uwVtXw13Wr17VzWA=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -30257,13 +30302,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.11.9" = { + "fp-ts-2.11.10" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.11.9"; + version = "2.11.10"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.9.tgz"; - sha512 = "GhYlNKkCOfdjp71ocdtyaQGoqCswEoWDJLRr+2jClnBBq2dnSOtd6QxmJdALq8UhfqCyZZ0f0lxadU4OhwY9nw=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.10.tgz"; + sha512 = "wtUo3eA0/+GZnT+dCjkSt5CuGCH5ZXjjrcZvYm/3BC5KGavuwgvME+eRRHYtCGYWD6I+fJ2uZ9en/JVqDEPrJw=="; }; }; "fraction.js-4.2.0" = { @@ -30734,6 +30779,15 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; + "functions-have-names-1.2.2" = { + name = "functions-have-names"; + packageName = "functions-have-names"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.2.tgz"; + sha512 = "bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA=="; + }; + }; "fuse.js-6.4.1" = { name = "fuse.js"; packageName = "fuse.js"; @@ -32229,6 +32283,15 @@ let sha512 = "7a4mFIGpFZgjk1G+CbFudOX8y8J5HzHkP19eYuEcv1Dif5IITYVDoQxa5GTORL6dsmmQ/sdZQ3QXuT1DMq6gbg=="; }; }; + "grammy-1.7.3" = { + name = "grammy"; + packageName = "grammy"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/grammy/-/grammy-1.7.3.tgz"; + sha512 = "vODORSFt3lHInoHB5dWKXKF1zwGAd4JogQrtkczCVCyjLkqhED3OZjOOxeMI2mQxuGYiiCPyjUomRpzqP+KoTQ=="; + }; + }; "grant-4.7.0" = { name = "grant"; packageName = "grant"; @@ -32418,13 +32481,13 @@ let sha512 = "Wci5MbrQj+6d7rfvbORrA9uDlfMysBWYaG49ST5TKylNaXYFf3ixFOa74iM1KtM9eidosUbI3E1JlWi0JaidJA=="; }; }; - "graphql-sse-1.1.0" = { + "graphql-sse-1.2.0" = { name = "graphql-sse"; packageName = "graphql-sse"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-sse/-/graphql-sse-1.1.0.tgz"; - sha512 = "xE8AGPJa5X+g7iFmRQw/8H+7lXIDJvSkW6lou/XSSq17opPQl+dbKOMiqraHMx52VrDgS061ZVx90OSuqS6ykA=="; + url = "https://registry.npmjs.org/graphql-sse/-/graphql-sse-1.2.0.tgz"; + sha512 = "W6XLGLqmwSDUzyUF8dcEPwNmhYe8g90P+wWETZ+6cmk/2kS3zJ1SXgeglWQ2tFKC/FXrc68hTHdHdmLjetJn+Q=="; }; }; "graphql-subscriptions-1.2.1" = { @@ -32922,6 +32985,15 @@ let sha512 = "Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ=="; }; }; + "has-property-descriptors-1.0.0" = { + name = "has-property-descriptors"; + packageName = "has-property-descriptors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; + sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; + }; + }; "has-symbol-support-x-1.4.2" = { name = "has-symbol-support-x"; packageName = "has-symbol-support-x"; @@ -34182,13 +34254,13 @@ let sha512 = "3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw=="; }; }; - "http-status-1.5.0" = { + "http-status-1.5.1" = { name = "http-status"; packageName = "http-status"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-status/-/http-status-1.5.0.tgz"; - sha512 = "wcGvY31MpFNHIkUcXHHnvrE4IKYlpvitJw5P/1u892gMBAM46muQ+RH7UN1d+Ntnfx5apnOnVY6vcLmrWHOLwg=="; + url = "https://registry.npmjs.org/http-status/-/http-status-1.5.1.tgz"; + sha512 = "EP6M4naWmtIrCHL1QfVHz6hsQb8dJLP5rDO1oPn03eAXD3CNVXgUqR5302gr3Gl8B/gVE1zz+Pmws7aJx+VMSw=="; }; }; "http2-client-1.3.5" = { @@ -34263,6 +34335,15 @@ let sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; }; }; + "https-proxy-agent-5.0.1" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; + }; + }; "hue-sdk-0.1.0" = { name = "hue-sdk"; packageName = "hue-sdk"; @@ -38431,13 +38512,13 @@ let sha512 = "aeFHXnO9hQXirgLjYqYMoAdvBGnpLOEhRVe4w7RuYjaqwsIPof4xIfSj2YvNQ9ZAWalYpg1Tm8kiLeWEyEeX6w=="; }; }; - "jsii-srcmak-0.1.529" = { + "jsii-srcmak-0.1.531" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.529"; + version = "0.1.531"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.529.tgz"; - sha512 = "ldLyakH99iz5j0A0sxwXSCIWrAbeSb2QZs13D/3JU83wKzuPNx4f5zgXj/rmjkrF3o2XAkBo4H63P057In4oCQ=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.531.tgz"; + sha512 = "Ol0Lo1h03APM5zhVwGVaBgdzZbJb+o6D3cch9J9TEjSXOcQH/G64txSb/L2afLskqca3mj4ClCcli2XSwZv3FA=="; }; }; "json-bigint-1.0.0" = { @@ -38737,13 +38818,13 @@ let sha512 = "YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA=="; }; }; - "json2jsii-0.2.190" = { + "json2jsii-0.2.192" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.190"; + version = "0.2.192"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.190.tgz"; - sha512 = "v8iKJmPIjmoYfoAlhPdtxOonIaRxwe0dI9mfiy7TiYqlYnNH9pKnrFglyDizlvnSeUL5XVUabGiXDkfIDtBw2w=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.192.tgz"; + sha512 = "6Hwlnu4J4toplfk10/lzWZV8EwwgGZiclQDqKm8CX0ghmwE7kHsD8JUIjZbdVvcb1l+s1epXUCnEmKthv0nZdQ=="; }; }; "json3-3.2.6" = { @@ -40501,13 +40582,13 @@ let sha512 = "gto+BB2uEob8qRiTlOq+R3uX0YNHsX9mjxj9Sbdue/LIKqu6IlZjrsjKeGyOMquc/474GEqFyX2pdytpydp0rQ=="; }; }; - "lmdb-2.3.2" = { + "lmdb-2.3.3" = { name = "lmdb"; packageName = "lmdb"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/lmdb/-/lmdb-2.3.2.tgz"; - sha512 = "kgn/zic1JeatYwz/64vpj3SLxff/qS2H1DeTj8mxDrNuF6gDSLdDS2r6YogV4T6eV6GddMu5Zn0E9d/xyo39eA=="; + url = "https://registry.npmjs.org/lmdb/-/lmdb-2.3.3.tgz"; + sha512 = "CrooSvHOzd+jPXCXpiffu2+5m90Fe6L/cw90fg+4sCWNrw3W7/ad20CGuTkMVU7mAuwXEAJAfnUwvHN2pS9Rqg=="; }; }; "lmdb-darwin-arm64-2.3.2" = { @@ -42211,6 +42292,15 @@ let sha512 = "ncaWPsuw9Vl1CKA406hVnJLGQKy1OHx6buk8J4rE2lVW+NW5Y82G5/DIloO7NkqLOUtNPEANaWC1kZYVjXssPw=="; }; }; + "log4js-6.4.5" = { + name = "log4js"; + packageName = "log4js"; + version = "6.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/log4js/-/log4js-6.4.5.tgz"; + sha512 = "43RJcYZ7nfUxpPO2woTl8CJ0t5+gucLJZ43mtp2PlInT+LygCp/bl6hNJtKulCJ+++fQsjIv4EO3Mp611PfeLQ=="; + }; + }; "logform-2.4.0" = { name = "logform"; packageName = "logform"; @@ -47280,15 +47370,6 @@ let sha512 = "NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ=="; }; }; - "node-fetch-2.6.0" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz"; - sha512 = "8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="; - }; - }; "node-fetch-2.6.1" = { name = "node-fetch"; packageName = "node-fetch"; @@ -48279,13 +48360,13 @@ let sha512 = "Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA=="; }; }; - "npm-registry-fetch-13.1.0" = { + "npm-registry-fetch-13.1.1" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "13.1.0"; + version = "13.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.1.0.tgz"; - sha512 = "TIYL5X8CcwDhbFMXFDShNcpG6OMCYK6VzvSr6MUWP20tCU2DJ4ao2qQg3DT+3Pet8mO6/cgbZpon4LMh3duYLg=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.1.1.tgz"; + sha512 = "5p8rwe6wQPLJ8dMqeTnA57Dp9Ox6GH9H60xkyJup07FmVlu3Mk7pf/kIIpl9gaN5bM8NM+UUx3emUWvDNTt39w=="; }; }; "npm-registry-fetch-9.0.0" = { @@ -52997,13 +53078,13 @@ let sha512 = "choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ=="; }; }; - "pouchdb-abstract-mapreduce-7.2.2" = { + "pouchdb-abstract-mapreduce-7.3.0" = { name = "pouchdb-abstract-mapreduce"; packageName = "pouchdb-abstract-mapreduce"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.2.2.tgz"; - sha512 = "7HWN/2yV2JkwMnGnlp84lGvFtnm0Q55NiBUdbBcaT810+clCGKvhssBCrXnmwShD1SXTwT83aszsgiSfW+SnBA=="; + url = "https://registry.npmjs.org/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.3.0.tgz"; + sha512 = "+2fVt3SDh7D776lIGbYZOsKX5js1aUyUw7iJaTGitxSdQ2ObWSTrr3SUrj5Qo1CkgPXwRM3Tdoq/53JYAa2qCA=="; }; }; "pouchdb-adapter-node-websql-7.0.0" = { @@ -53042,31 +53123,31 @@ let sha512 = "yUktdOPIPvOVouCjJN3uop+bCcpdPwePrLm9eUAZNgEYnUFu0njdx7Q0WRsZ7UJ6l75HinL5ZHk4bnvEt86FLw=="; }; }; - "pouchdb-binary-utils-7.2.2" = { + "pouchdb-binary-utils-7.3.0" = { name = "pouchdb-binary-utils"; packageName = "pouchdb-binary-utils"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-binary-utils/-/pouchdb-binary-utils-7.2.2.tgz"; - sha512 = "shacxlmyHbUrNfE6FGYpfyAJx7Q0m91lDdEAaPoKZM3SzAmbtB1i+OaDNtYFztXjJl16yeudkDb3xOeokVL3Qw=="; + url = "https://registry.npmjs.org/pouchdb-binary-utils/-/pouchdb-binary-utils-7.3.0.tgz"; + sha512 = "xvBH/XGHGcou2vkEzszJxkCc7YElfRUrkLUg51Jbdmh1mogLDUO0bU3Tj6TOIIJfRkQrU/HV+dDkMAhsil0amQ=="; }; }; - "pouchdb-changes-filter-7.2.2" = { + "pouchdb-changes-filter-7.3.0" = { name = "pouchdb-changes-filter"; packageName = "pouchdb-changes-filter"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-changes-filter/-/pouchdb-changes-filter-7.2.2.tgz"; - sha512 = "1txJnTtL/C7zrq+spLt3pH9EDHTWmLLwp2zx8zUQrkt6eQtuLuXUI7G84xe+hfpU0rQvUzp/APYMnko0/6Rw0A=="; + url = "https://registry.npmjs.org/pouchdb-changes-filter/-/pouchdb-changes-filter-7.3.0.tgz"; + sha512 = "9E/EC9BP9dH9sfqUBdcWlR5HHeDdWqP82MmdEtg5c8spgxttYPwqrPfSHa7T2n55IRnaIoQbVyndmfAoz9GsOw=="; }; }; - "pouchdb-collate-7.2.2" = { + "pouchdb-collate-7.3.0" = { name = "pouchdb-collate"; packageName = "pouchdb-collate"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-collate/-/pouchdb-collate-7.2.2.tgz"; - sha512 = "/SMY9GGasslknivWlCVwXMRMnQ8myKHs4WryQ5535nq1Wj/ehpqWloMwxEQGvZE1Sda3LOm7/5HwLTcB8Our+w=="; + url = "https://registry.npmjs.org/pouchdb-collate/-/pouchdb-collate-7.3.0.tgz"; + sha512 = "ys7rXKtEr6cfghgUjknwFJiOkITebV6JmeTybJKCzMV0r2luXu0OoPQsKVpE/wbM/3F5LxfpbFKGFpPcfGMvTA=="; }; }; "pouchdb-collections-7.0.0" = { @@ -53078,22 +53159,22 @@ let sha512 = "DaoUr/vU24Q3gM6ghj0va9j/oBanPwkbhkvnqSyC3Dm5dgf5pculNxueLF9PKMo3ycApoWzHMh6N2N8KJbDU2Q=="; }; }; - "pouchdb-collections-7.2.2" = { + "pouchdb-collections-7.3.0" = { name = "pouchdb-collections"; packageName = "pouchdb-collections"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-collections/-/pouchdb-collections-7.2.2.tgz"; - sha512 = "6O9zyAYlp3UdtfneiMYuOCWdUCQNo2bgdjvNsMSacQX+3g8WvIoFQCYJjZZCpTttQGb+MHeRMr8m2U95lhJTew=="; + url = "https://registry.npmjs.org/pouchdb-collections/-/pouchdb-collections-7.3.0.tgz"; + sha512 = "Xr54m2+fErShXn+qAT4xwqJ+8NwddNPeTMJT4z4k1sZsrwfHmZsWbsKAyGPMF04eQaaU+7DDRMciu2VzaBUXyg=="; }; }; - "pouchdb-core-7.2.2" = { + "pouchdb-core-7.3.0" = { name = "pouchdb-core"; packageName = "pouchdb-core"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-core/-/pouchdb-core-7.2.2.tgz"; - sha512 = "AnMmSH+xx12Vk6oASDRQoElXfV9fSn8MIwfus0oa2lqkxowx4bvidofZbhZfKEiE6QgKwFEOBzs56MS3znI8TQ=="; + url = "https://registry.npmjs.org/pouchdb-core/-/pouchdb-core-7.3.0.tgz"; + sha512 = "fpEbjrYzmZivSupl7V0Aa2vHivyJHi9gx7+d021Wxajx4br515eYcN6Whk/L0L4xgoDVKoqUwmv+XgEF8EZhwg=="; }; }; "pouchdb-errors-7.0.0" = { @@ -53105,13 +53186,13 @@ let sha512 = "dTusY8nnTw4HIztCrNl7AoGgwvS1bVf/3/97hDaGc4ytn72V9/4dK8kTqlimi3UpaurohYRnqac0SGXYP8vgXA=="; }; }; - "pouchdb-errors-7.2.2" = { + "pouchdb-errors-7.3.0" = { name = "pouchdb-errors"; packageName = "pouchdb-errors"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-errors/-/pouchdb-errors-7.2.2.tgz"; - sha512 = "6GQsiWc+7uPfgEHeavG+7wuzH3JZW29Dnrvz8eVbDFE50kVFxNDVm3EkYHskvo5isG7/IkOx7PV7RPTA3keG3g=="; + url = "https://registry.npmjs.org/pouchdb-errors/-/pouchdb-errors-7.3.0.tgz"; + sha512 = "dTBbIC1BbCy6J9W/Csg5xROgb3wJN3HpbgAJHHSEtAkb8oA45KZmU3ZwEpNhf0AfPuQm4XgW1936PvlDlGgJiw=="; }; }; "pouchdb-extend-0.1.2" = { @@ -53123,22 +53204,22 @@ let sha1 = "d1ce511bf704ed2e29f7bf428a416acfffa124b8"; }; }; - "pouchdb-fetch-7.2.2" = { + "pouchdb-fetch-7.3.0" = { name = "pouchdb-fetch"; packageName = "pouchdb-fetch"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-fetch/-/pouchdb-fetch-7.2.2.tgz"; - sha512 = "lUHmaG6U3zjdMkh8Vob9GvEiRGwJfXKE02aZfjiVQgew+9SLkuOxNw3y2q4d1B6mBd273y1k2Lm0IAziRNxQnA=="; + url = "https://registry.npmjs.org/pouchdb-fetch/-/pouchdb-fetch-7.3.0.tgz"; + sha512 = "8/lcg8iMDG+GVs1dHNXA4ktJSEpH71dHU3xesMJ25tNQOqfAaaWrkfz9j71ZYDDkveLYE6UjUzl/sDacu2hSjw=="; }; }; - "pouchdb-find-7.2.2" = { + "pouchdb-find-7.3.0" = { name = "pouchdb-find"; packageName = "pouchdb-find"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-find/-/pouchdb-find-7.2.2.tgz"; - sha512 = "BmFeFVQ0kHmDehvJxNZl9OmIztCjPlZlVSdpijuFbk/Fi1EFPU1BAv3kLC+6DhZuOqU/BCoaUBY9sn66pPY2ag=="; + url = "https://registry.npmjs.org/pouchdb-find/-/pouchdb-find-7.3.0.tgz"; + sha512 = "EwhnfyxCAkKf8PG4tfndTTygEmtuz+o1LiZkxfPrflfXA3m1jo1ithib0hwBYtEwEYWuZxH6B8pRZutbLoQCGA=="; }; }; "pouchdb-json-7.0.0" = { @@ -53150,13 +53231,13 @@ let sha512 = "w0bNRu/7VmmCrFWMYAm62n30wvJJUT2SokyzeTyj3hRohj4GFwTRg1mSZ+iAmxgRKOFE8nzZstLG/WAB4Ymjew=="; }; }; - "pouchdb-mapreduce-utils-7.2.2" = { + "pouchdb-mapreduce-utils-7.3.0" = { name = "pouchdb-mapreduce-utils"; packageName = "pouchdb-mapreduce-utils"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.2.2.tgz"; - sha512 = "rAllb73hIkU8rU2LJNbzlcj91KuulpwQu804/F6xF3fhZKC/4JQMClahk+N/+VATkpmLxp1zWmvmgdlwVU4HtQ=="; + url = "https://registry.npmjs.org/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.3.0.tgz"; + sha512 = "KDVSd+H2r+XWTrQfKWV71SknDDYRjYXoeWs0ZQl3xITHCcTl+fIgqyagg/XN+Zy/U9LeLPGMe2JdgPx9H8lJgw=="; }; }; "pouchdb-md5-7.0.0" = { @@ -53168,13 +53249,13 @@ let sha512 = "yaSJKhLA3QlgloKUQeb2hLdT3KmUmPfoYdryfwHZuPTpXIRKTnMQTR9qCIRUszc0ruBpDe53DRslCgNUhAyTNQ=="; }; }; - "pouchdb-md5-7.2.2" = { + "pouchdb-md5-7.3.0" = { name = "pouchdb-md5"; packageName = "pouchdb-md5"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-md5/-/pouchdb-md5-7.2.2.tgz"; - sha512 = "c/RvLp2oSh8PLAWU5vFBnp6ejJABIdKqboZwRRUrWcfGDf+oyX8RgmJFlYlzMMOh4XQLUT1IoaDV8cwlsuryZw=="; + url = "https://registry.npmjs.org/pouchdb-md5/-/pouchdb-md5-7.3.0.tgz"; + sha512 = "wL04QgoKyd/L/TV5gxgcvlEyCJiZoXCOEFJklTzkdza/kBQNJGPH7i0ZhKa7Sb+AvZYoWZHddf1Zgv7rBScHkA=="; }; }; "pouchdb-merge-7.0.0" = { @@ -53186,13 +53267,13 @@ let sha512 = "tci5u6NpznQhGcPv4ho1h0miky9rs+ds/T9zQ9meQeDZbUojXNaX1Jxsb0uYEQQ+HMqdcQs3Akdl0/u0mgwPGg=="; }; }; - "pouchdb-merge-7.2.2" = { + "pouchdb-merge-7.3.0" = { name = "pouchdb-merge"; packageName = "pouchdb-merge"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-merge/-/pouchdb-merge-7.2.2.tgz"; - sha512 = "6yzKJfjIchBaS7Tusuk8280WJdESzFfQ0sb4jeMUNnrqs4Cx3b0DIEOYTRRD9EJDM+je7D3AZZ4AT0tFw8gb4A=="; + url = "https://registry.npmjs.org/pouchdb-merge/-/pouchdb-merge-7.3.0.tgz"; + sha512 = "E7LmchMzwYFm6V8OBxejzARLisanpksOju2LEfuiYnotGfNDeW7MByP0qBH0/zF8BfUyyjA1cl7ByaEpsapkeQ=="; }; }; "pouchdb-promise-5.4.3" = { @@ -53204,13 +53285,13 @@ let sha1 = "331d670b1989d5a03f268811214f27f54150cb2b"; }; }; - "pouchdb-selector-core-7.2.2" = { + "pouchdb-selector-core-7.3.0" = { name = "pouchdb-selector-core"; packageName = "pouchdb-selector-core"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-selector-core/-/pouchdb-selector-core-7.2.2.tgz"; - sha512 = "XYKCNv9oiNmSXV5+CgR9pkEkTFqxQGWplnVhO3W9P154H08lU0ZoNH02+uf+NjZ2kjse7Q1fxV4r401LEcGMMg=="; + url = "https://registry.npmjs.org/pouchdb-selector-core/-/pouchdb-selector-core-7.3.0.tgz"; + sha512 = "sK/cCrIGeL9ImcMhKGcwa54+bzX7Wv4hhVV+oUW3T1Nasaoxh+Muem1GuA+x1+SbTCE8y37rUg8i6DIOhX51ew=="; }; }; "pouchdb-utils-7.0.0" = { @@ -53222,13 +53303,13 @@ let sha512 = "1bnoX1KdZYHv9wicDIFdO0PLiVIMzNDUBUZ/yOJZ+6LW6niQCB8aCv09ZztmKfSQcU5nnN3fe656tScBgP6dOQ=="; }; }; - "pouchdb-utils-7.2.2" = { + "pouchdb-utils-7.3.0" = { name = "pouchdb-utils"; packageName = "pouchdb-utils"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pouchdb-utils/-/pouchdb-utils-7.2.2.tgz"; - sha512 = "XmeM5ioB4KCfyB2MGZXu1Bb2xkElNwF1qG+zVFbQsKQij0zvepdOUfGuWvLRHxTOmt4muIuSOmWZObZa3NOgzQ=="; + url = "https://registry.npmjs.org/pouchdb-utils/-/pouchdb-utils-7.3.0.tgz"; + sha512 = "HH+5IXXWn/ZgVCSnrlydBMYn6MabT7RS7SNoo9w8qVH9efpZSp3eLchw6yMQNLw8LQefWmbbskiHV9VgJmSVWQ=="; }; }; "pouchdb-wrappers-4.1.0" = { @@ -57083,13 +57164,13 @@ let sha512 = "1CJygtdvsfNFwiyjaMLBWtg2tfEqx/jSZ8S6TV+GlNL8kiH8rb4cm5Pb7A/C2BpyM/fA8ZJEudlCwi/jvAY+Ow=="; }; }; - "regexp.prototype.flags-1.4.2" = { + "regexp.prototype.flags-1.4.3" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.2.tgz"; - sha512 = "Ynz8fTQW5/1elh+jWU2EDDzeoNbD0OQ0R+D1VJU5ATOkUaro4A9YEkdN2ODQl/8UQFPPpZNw91fOcLFamM7Pww=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; + sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; }; }; "regexpp-1.1.0" = { @@ -61997,15 +62078,6 @@ let sha1 = "3722227c54e2faf24b1dc6d933cc144e6f71bfef"; }; }; - "spark-md5-3.0.1" = { - name = "spark-md5"; - packageName = "spark-md5"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.1.tgz"; - sha512 = "0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig=="; - }; - }; "spark-md5-3.0.2" = { name = "spark-md5"; packageName = "spark-md5"; @@ -62862,13 +62934,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.256" = { + "sscaff-1.2.258" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.256"; + version = "1.2.258"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.256.tgz"; - sha512 = "pVtKvFBNenal5UXDeEDQ98pK1n/mmEI3UYMaBmUImPVZB474uGlD99TkMGNFHUWBMmIf75zcEMezlG2FSxcJxA=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.258.tgz"; + sha512 = "xgzUmt9tuBjGwGXzffkOAvvXBqzWnrGDcsAbQbqXJ8uewtaWRI4SzVJsrsFJwQd18E1f7C7mPqR+eia2E4Ymuw=="; }; }; "ssh-config-1.1.6" = { @@ -63555,6 +63627,15 @@ let sha512 = "Qz32plKq/MZywYyhEatxyYc8vs994Gz0Hu2MSYXXLD233UyPeIeRBZARIIGwFer4Mdb8r3Y2UqKkgyDghM6QCg=="; }; }; + "streamroller-3.0.7" = { + name = "streamroller"; + packageName = "streamroller"; + version = "3.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/streamroller/-/streamroller-3.0.7.tgz"; + sha512 = "kh68kwiDGuIPiPDWwRbEC5us+kfARP1e9AsQiaLaSqGrctOvMn0mtL8iNY3r4/o5nIoYi3gPI1jexguZsXDlxw=="; + }; + }; "streamsearch-0.1.2" = { name = "streamsearch"; packageName = "streamsearch"; @@ -64680,22 +64761,22 @@ let sha512 = "4JaJp3HEoTCGARRWZQIZDUanhYv0iyoHikklVHVLH9xFE9db22g4TDv7CPeNA8HD1JgjXI1vlhR1JZvvhaTu2Q=="; }; }; - "svelte-preprocess-4.10.5" = { + "svelte-preprocess-4.10.6" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "4.10.5"; + version = "4.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.5.tgz"; - sha512 = "VKXPRScCzAZqeBZOGq4LLwtNrAu++mVn7XvQox3eFDV7Ciq0Lg70Q8QWjH9iXF7J+pMlXhPsSFwpCb2E+hoeyA=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.6.tgz"; + sha512 = "I2SV1w/AveMvgIQlUF/ZOO3PYVnhxfcpNyGt8pxpUVhPfyfL/CZBkkw/KPfuFix5FJ9TnnNYMhACK3DtSaYVVQ=="; }; }; - "svelte2tsx-0.5.8" = { + "svelte2tsx-0.5.9" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.5.8"; + version = "0.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.5.8.tgz"; - sha512 = "z5Mfpmy/jkpFIiePAocgWxGRJg+Ka0zlxyvFlpP2X1BoQuXjFC6pnIR9CGebOTmi+W1JnSUAdxrCCj/sEMXZ8Q=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.5.9.tgz"; + sha512 = "xTDASjlh+rKo4QRhTRYSH87sS7fRoyX67xhGIMPKa3FYqftRHRmMes6nVgEskiuhBovslNHYYpMMg5YM5n/STg=="; }; }; "sver-compat-1.5.0" = { @@ -73764,6 +73845,15 @@ let sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; }; + "yaml-2.0.0" = { + name = "yaml"; + packageName = "yaml"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml/-/yaml-2.0.0.tgz"; + sha512 = "JbfdlHKGP2Ik9IHylzWlGd4pPK++EU46/IxMykphS2ZKw7a7h+dHNmcXObLgpRDriBY+rpWslldikckX8oruWQ=="; + }; + }; "yaml-2.0.0-10" = { name = "yaml"; packageName = "yaml"; @@ -74463,15 +74553,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "13.3.2"; + version = "13.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-13.3.2.tgz"; - sha512 = "sfhMbm0wBAYmG+8YEYYZ5QkFyv2TJmMua/LbGoJE/y5UKBN+zLsMO3G/CW3D6pWThbgf04qQpi2LHonbPC/Bkg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-13.3.3.tgz"; + sha512 = "a+nnzFP1FfnypXpAhrHbIBaJcxzegWLZUvVzJQwt6P2z60IoHdvTVmyNbY89qI0LE1SrAokEUO1zW3Yjmu7fUw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1303.2" - sources."@angular-devkit/core-13.3.2" - sources."@angular-devkit/schematics-13.3.2" + sources."@angular-devkit/architect-0.1303.3" + sources."@angular-devkit/core-13.3.3" + sources."@angular-devkit/schematics-13.3.3" sources."@gar/promisify-1.1.3" sources."@npmcli/fs-1.1.1" sources."@npmcli/git-2.1.0" @@ -74480,7 +74570,7 @@ in sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-2.0.0" - sources."@schematics/angular-13.3.2" + sources."@schematics/angular-13.3.3" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -74545,7 +74635,7 @@ in sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" @@ -74852,7 +74942,7 @@ in sources."crc-32-1.2.2" sources."dateformat-4.6.3" sources."decompress-response-4.2.1" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."diff3-0.0.3" sources."duplexify-4.1.2" sources."end-of-stream-1.4.4" @@ -74883,6 +74973,7 @@ in sources."handlebars-4.7.7" sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."hpagent-0.1.2" sources."ignore-5.2.0" @@ -75060,7 +75151,7 @@ in sources."pascal-case-3.1.2" sources."source-map-0.7.3" sources."svelte-3.47.0" - sources."svelte2tsx-0.5.8" + sources."svelte2tsx-0.5.9" sources."tslib-2.3.1" sources."typescript-4.6.3" sources."vscode-css-languageservice-5.4.1" @@ -75399,7 +75490,7 @@ in sources."@tsconfig/node14-1.0.1" sources."@tsconfig/node16-1.0.2" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."JSONStream-1.3.5" @@ -75629,7 +75720,7 @@ in sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."abort-controller-3.0.0" @@ -75717,7 +75808,7 @@ in sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."indent-string-4.0.0" @@ -75915,7 +76006,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."acorn-8.7.0" @@ -76311,7 +76402,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -76342,7 +76433,7 @@ in sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."ast-types-0.9.6" - sources."async-2.6.3" + sources."async-2.6.4" sources."async-iter-stream-1.2.0" sources."asynckit-0.4.0" sources."atob-2.1.2" @@ -76525,7 +76616,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" - sources."fetch-cookie-0.10.1" + sources."fetch-cookie-0.11.0" (sources."figures-2.0.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -76613,7 +76704,7 @@ in sources."hash-base-3.1.0" sources."hasurl-1.0.0" sources."http-signature-1.2.0" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" sources."ignore-5.2.0" sources."ignore-walk-3.0.4" @@ -76820,50 +76911,50 @@ in sources."pify-4.0.1" sources."pluralize-7.0.0" sources."posix-character-classes-0.1.1" - (sources."pouchdb-abstract-mapreduce-7.2.2" // { + (sources."pouchdb-abstract-mapreduce-7.3.0" // { dependencies = [ - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."immediate-3.3.0" - sources."pouchdb-binary-utils-7.2.2" - sources."pouchdb-collections-7.2.2" - sources."pouchdb-errors-7.2.2" - sources."pouchdb-md5-7.2.2" - sources."pouchdb-utils-7.2.2" - sources."spark-md5-3.0.1" - sources."uuid-8.1.0" + sources."pouchdb-binary-utils-7.3.0" + sources."pouchdb-collections-7.3.0" + sources."pouchdb-errors-7.3.0" + sources."pouchdb-md5-7.3.0" + sources."pouchdb-utils-7.3.0" + sources."spark-md5-3.0.2" + sources."uuid-8.3.2" ]; }) sources."pouchdb-adapter-node-websql-7.0.0" sources."pouchdb-adapter-utils-7.0.0" sources."pouchdb-adapter-websql-core-7.0.0" sources."pouchdb-binary-utils-7.0.0" - (sources."pouchdb-changes-filter-7.2.2" // { + (sources."pouchdb-changes-filter-7.3.0" // { dependencies = [ - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."immediate-3.3.0" - sources."pouchdb-binary-utils-7.2.2" - sources."pouchdb-collections-7.2.2" - sources."pouchdb-errors-7.2.2" - sources."pouchdb-md5-7.2.2" - sources."pouchdb-utils-7.2.2" - sources."spark-md5-3.0.1" - sources."uuid-8.1.0" + sources."pouchdb-binary-utils-7.3.0" + sources."pouchdb-collections-7.3.0" + sources."pouchdb-errors-7.3.0" + sources."pouchdb-md5-7.3.0" + sources."pouchdb-utils-7.3.0" + sources."spark-md5-3.0.2" + sources."uuid-8.3.2" ]; }) - sources."pouchdb-collate-7.2.2" + sources."pouchdb-collate-7.3.0" sources."pouchdb-collections-7.0.0" - (sources."pouchdb-core-7.2.2" // { + (sources."pouchdb-core-7.3.0" // { dependencies = [ - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."immediate-3.3.0" - sources."pouchdb-binary-utils-7.2.2" - sources."pouchdb-collections-7.2.2" - sources."pouchdb-errors-7.2.2" - sources."pouchdb-md5-7.2.2" - sources."pouchdb-merge-7.2.2" - sources."pouchdb-utils-7.2.2" - sources."spark-md5-3.0.1" - sources."uuid-8.1.0" + sources."pouchdb-binary-utils-7.3.0" + sources."pouchdb-collections-7.3.0" + sources."pouchdb-errors-7.3.0" + sources."pouchdb-md5-7.3.0" + sources."pouchdb-merge-7.3.0" + sources."pouchdb-utils-7.3.0" + sources."spark-md5-3.0.2" + sources."uuid-8.3.2" ]; }) (sources."pouchdb-errors-7.0.0" // { @@ -76872,52 +76963,48 @@ in ]; }) sources."pouchdb-extend-0.1.2" - (sources."pouchdb-fetch-7.2.2" // { + sources."pouchdb-fetch-7.3.0" + (sources."pouchdb-find-7.3.0" // { dependencies = [ - sources."node-fetch-2.6.0" - ]; - }) - (sources."pouchdb-find-7.2.2" // { - dependencies = [ - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."immediate-3.3.0" - sources."pouchdb-binary-utils-7.2.2" - sources."pouchdb-collections-7.2.2" - sources."pouchdb-errors-7.2.2" - sources."pouchdb-md5-7.2.2" - sources."pouchdb-utils-7.2.2" - sources."spark-md5-3.0.1" - sources."uuid-8.1.0" + sources."pouchdb-binary-utils-7.3.0" + sources."pouchdb-collections-7.3.0" + sources."pouchdb-errors-7.3.0" + sources."pouchdb-md5-7.3.0" + sources."pouchdb-utils-7.3.0" + sources."spark-md5-3.0.2" + sources."uuid-8.3.2" ]; }) sources."pouchdb-json-7.0.0" - (sources."pouchdb-mapreduce-utils-7.2.2" // { + (sources."pouchdb-mapreduce-utils-7.3.0" // { dependencies = [ - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."immediate-3.3.0" - sources."pouchdb-binary-utils-7.2.2" - sources."pouchdb-collections-7.2.2" - sources."pouchdb-errors-7.2.2" - sources."pouchdb-md5-7.2.2" - sources."pouchdb-utils-7.2.2" - sources."spark-md5-3.0.1" - sources."uuid-8.1.0" + sources."pouchdb-binary-utils-7.3.0" + sources."pouchdb-collections-7.3.0" + sources."pouchdb-errors-7.3.0" + sources."pouchdb-md5-7.3.0" + sources."pouchdb-utils-7.3.0" + sources."spark-md5-3.0.2" + sources."uuid-8.3.2" ]; }) sources."pouchdb-md5-7.0.0" sources."pouchdb-merge-7.0.0" sources."pouchdb-promise-5.4.3" - (sources."pouchdb-selector-core-7.2.2" // { + (sources."pouchdb-selector-core-7.3.0" // { dependencies = [ - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."immediate-3.3.0" - sources."pouchdb-binary-utils-7.2.2" - sources."pouchdb-collections-7.2.2" - sources."pouchdb-errors-7.2.2" - sources."pouchdb-md5-7.2.2" - sources."pouchdb-utils-7.2.2" - sources."spark-md5-3.0.1" - sources."uuid-8.1.0" + sources."pouchdb-binary-utils-7.3.0" + sources."pouchdb-collections-7.3.0" + sources."pouchdb-errors-7.3.0" + sources."pouchdb-md5-7.3.0" + sources."pouchdb-utils-7.3.0" + sources."spark-md5-3.0.2" + sources."uuid-8.3.2" ]; }) (sources."pouchdb-utils-7.0.0" // { @@ -77340,7 +77427,7 @@ in sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" sources."@types/json5-0.0.29" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -77379,7 +77466,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -77398,7 +77485,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.108" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.9.3" @@ -77783,7 +77870,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1113.0" // { + (sources."aws-sdk-2.1115.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -77828,7 +77915,7 @@ in ]; }) sources."deep-copy-1.4.2" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."denque-1.5.1" sources."depd-1.1.2" @@ -77883,6 +77970,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."helmet-4.6.0" sources."http-errors-1.7.2" @@ -78260,7 +78348,7 @@ in sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -78275,9 +78363,9 @@ in }) sources."@vue/cli-ui-addon-webpack-5.0.4" sources."@vue/cli-ui-addon-widgets-5.0.4" - sources."@vue/compiler-core-3.2.32" - sources."@vue/compiler-dom-3.2.32" - sources."@vue/shared-3.2.32" + sources."@vue/compiler-core-3.2.33" + sources."@vue/compiler-dom-3.2.33" + sources."@vue/shared-3.2.33" (sources."@wry/equality-0.1.11" // { dependencies = [ sources."tslib-1.14.1" @@ -78330,7 +78418,7 @@ in sources."arrify-2.0.1" sources."assign-symbols-1.0.0" sources."ast-types-0.14.2" - sources."async-2.6.3" + sources."async-2.6.4" sources."async-retry-1.3.3" sources."at-least-node-1.0.0" sources."atob-2.1.2" @@ -78386,7 +78474,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -78439,12 +78527,12 @@ in sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.21.1" // { + (sources."core-js-compat-3.22.0" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.21.1" + sources."core-js-pure-3.22.0" sources."core-util-is-1.0.3" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -78490,7 +78578,7 @@ in sources."deepmerge-4.2.2" sources."defaults-1.0.3" sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."define-property-2.0.2" sources."depd-1.1.2" sources."deprecated-decorator-0.1.6" @@ -78507,14 +78595,14 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.108" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -78612,7 +78700,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.176.0" + sources."flow-parser-0.176.2" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forwarded-0.2.0" @@ -78669,6 +78757,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" @@ -79446,7 +79535,7 @@ in sources."@types/minimist-1.2.2" sources."@types/ms-0.7.31" sources."@types/nlcst-1.0.0" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/normalize-package-data-2.4.1" sources."@types/parse5-6.0.3" sources."@types/supports-color-8.1.1" @@ -79953,7 +80042,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.20.2" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -79963,7 +80052,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.109" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -80069,7 +80158,7 @@ in sources."argparse-1.0.10" sources."asn1-0.2.6" sources."assert-plus-1.0.0" - sources."async-2.6.3" + sources."async-2.6.4" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -80254,7 +80343,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -80339,8 +80428,8 @@ in }; dependencies = [ sources."browserslist-4.20.2" - sources."caniuse-lite-1.0.30001331" - sources."electron-to-chromium-1.4.107" + sources."caniuse-lite-1.0.30001332" + sources."electron-to-chromium-1.4.109" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."node-releases-2.0.3" @@ -80368,14 +80457,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1113.0" // { + (sources."aws-sdk-2.1115.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -80454,7 +80543,7 @@ in sources."htmlparser2-6.1.0" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" sources."inflight-1.0.6" @@ -80507,6 +80596,7 @@ in (sources."puppeteer-10.4.0" // { dependencies = [ sources."debug-4.3.1" + sources."https-proxy-agent-5.0.0" ]; }) sources."querystring-0.2.0" @@ -80993,13 +81083,13 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.64.2"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.64.2.tgz"; - sha512 = "sYju0HhL1tlxwa85jBioJZ7Cgbzbuy8Xx2MrE084KZ/00KEfVOMEEKoAjtKIK4BanQCeDA/EzuBjEksDx8K9Ag=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-12.0.2.tgz"; + sha512 = "YzXz0nkJwtYAeRiO6Q/17AR7v4Q9IGKGYybC2fhdtMw07tlf9fdSvfumxsfhnSYKHoasEznj9RghaSyrFchQyg=="; }; dependencies = [ - (sources."@alexbosworth/caporal-1.4.1" // { + (sources."@alexbosworth/caporal-1.4.4" // { dependencies = [ sources."colorette-1.4.0" ]; @@ -81020,6 +81110,8 @@ in sources."string_decoder-1.3.0" ]; }) + sources."@colors/colors-1.5.0" + sources."@dabh/diagnostics-2.0.3" sources."@grammyjs/types-2.6.0" sources."@grpc/grpc-js-1.6.1" sources."@grpc/proto-loader-0.6.9" @@ -81045,12 +81137,12 @@ in sources."@types/express-serve-static-core-4.17.28" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.8" sources."@types/serve-static-1.13.10" - sources."@types/tough-cookie-4.0.1" + sources."@types/tough-cookie-4.0.2" sources."@types/ws-8.5.3" sources."abort-controller-3.0.0" sources."accepts-1.3.8" @@ -81100,6 +81192,8 @@ in dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."supports-color-7.2.0" sources."type-fest-0.20.2" ]; @@ -81136,10 +81230,13 @@ in sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."color-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.9.0" sources."colorette-2.0.16" sources."colors-1.4.0" + sources."colorspace-1.1.4" sources."combined-stream-1.0.8" sources."commander-6.2.1" sources."concat-stream-1.6.2" @@ -81158,7 +81255,6 @@ in sources."crypto-js-4.1.1" sources."crypto-random-string-2.0.0" sources."csv-parse-5.0.4" - sources."cycle-1.0.3" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" @@ -81174,6 +81270,7 @@ in sources."ecpair-2.0.1" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" + sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."escalade-3.1.1" @@ -81197,9 +81294,9 @@ in }) sources."extend-3.0.2" sources."external-editor-1.1.1" - sources."eyes-0.1.8" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" + sources."fecha-4.2.2" sources."figures-1.7.0" (sources."finalhandler-1.1.2" // { dependencies = [ @@ -81207,6 +81304,7 @@ in sources."statuses-1.5.0" ]; }) + sources."fn.name-1.1.0" sources."form-data-2.5.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -81233,7 +81331,7 @@ in }) sources."got-9.6.0" sources."graceful-fs-4.2.10" - (sources."grammy-1.7.1" // { + (sources."grammy-1.7.3" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -81271,6 +81369,8 @@ in sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."external-editor-3.1.0" sources."figures-3.2.0" sources."mute-stream-0.0.8" @@ -81289,6 +81389,7 @@ in sources."ip-1.1.5" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" + sources."is-arrayish-0.3.2" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" @@ -81304,11 +81405,11 @@ in }) sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" + sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" - sources."isstream-0.1.2" sources."json-buffer-3.0.0" sources."json-schema-traverse-1.0.0" sources."json2csv-5.0.7" @@ -81316,9 +81417,11 @@ in sources."jstat-1.9.5" sources."keyv-3.1.0" sources."kind-of-6.0.3" + sources."kuler-2.0.0" sources."latest-version-5.1.0" (sources."lightning-5.9.0" // { dependencies = [ + sources."@types/node-17.0.23" sources."asyncjs-util-1.2.8" sources."body-parser-1.19.2" sources."bolt07-1.8.0" @@ -81390,6 +81493,7 @@ in (sources."ln-service-53.11.0" // { dependencies = [ sources."@grpc/grpc-js-1.6.2" + sources."@types/node-17.0.23" sources."bolt09-0.2.3" sources."lightning-5.10.1" ]; @@ -81411,10 +81515,18 @@ in }) (sources."ln-telegram-3.21.1" // { dependencies = [ - sources."body-parser-1.19.2" + sources."@types/node-17.0.23" + (sources."body-parser-1.19.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."bolt07-1.8.0" sources."bolt09-0.2.2" + sources."debug-4.3.4" sources."depd-1.1.2" + sources."grammy-1.7.1" sources."http-errors-1.8.1" sources."invoices-2.0.4" (sources."lightning-5.8.6" // { @@ -81431,6 +81543,7 @@ in sources."tiny-secp256k1-2.2.1" ]; }) + sources."ms-2.1.2" sources."on-finished-2.3.0" sources."psbt-2.0.0" sources."qs-6.9.7" @@ -81453,9 +81566,16 @@ in dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."supports-color-7.2.0" ]; }) + (sources."logform-2.4.0" // { + dependencies = [ + sources."ms-2.1.3" + ]; + }) sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -81497,12 +81617,15 @@ in sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" + sources."one-time-1.0.0" sources."onetime-1.1.0" (sources."ora-5.4.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."cli-cursor-3.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" sources."supports-color-7.2.0" @@ -81521,7 +81644,7 @@ in dependencies = [ sources."@alexbosworth/fiat-1.0.1" sources."@grpc/grpc-js-1.5.7" - sources."@types/node-17.0.21" + sources."@types/node-17.0.23" sources."@types/ws-8.5.2" sources."asyncjs-util-1.2.8" sources."body-parser-1.19.2" @@ -81539,6 +81662,7 @@ in sources."ln-service-53.9.4" (sources."ln-sync-3.11.0" // { dependencies = [ + sources."@types/node-17.0.21" sources."lightning-5.8.2" sources."ln-service-53.9.3" ]; @@ -81587,6 +81711,7 @@ in sources."rx-4.1.0" sources."rxjs-7.5.5" sources."safe-buffer-5.1.2" + sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" sources."sanitize-filename-1.6.3" sources."semver-7.3.7" @@ -81610,10 +81735,13 @@ in sources."sha.js-2.4.11" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" + sources."simple-swizzle-0.2.2" sources."sjcl-1.0.8" (sources."slice-ansi-4.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) sources."smart-buffer-4.2.0" @@ -81642,6 +81770,7 @@ in sources."strip-ansi-3.0.1" ]; }) + sources."text-hex-1.0.0" sources."through-2.3.8" sources."tiny-emitter-2.1.0" (sources."tiny-secp256k1-2.2.1" // { @@ -81653,6 +81782,7 @@ in sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.1" sources."tr46-0.0.3" + sources."triple-beam-1.3.0" sources."truncate-utf8-bytes-1.0.2" sources."tslib-2.3.1" sources."tweetnacl-1.0.3" @@ -81669,6 +81799,8 @@ in dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."import-lazy-2.1.0" sources."supports-color-7.2.0" ]; @@ -81686,15 +81818,21 @@ in sources."widest-line-3.1.0" sources."wif-2.0.6" sources."window-size-1.1.1" - (sources."winston-2.4.5" // { + (sources."winston-3.7.2" // { dependencies = [ - sources."async-1.0.0" - sources."colors-1.0.3" + sources."readable-stream-3.6.0" + ]; + }) + (sources."winston-transport-4.5.0" // { + dependencies = [ + sources."readable-stream-3.6.0" ]; }) (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) sources."wrappy-1.0.2" @@ -82236,7 +82374,7 @@ in sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" sources."dash-ast-1.0.0" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."defined-1.0.0" sources."deps-sort-2.0.1" sources."des.js-1.0.1" @@ -82253,7 +82391,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-to-primitive-1.2.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" @@ -82267,6 +82405,7 @@ in sources."glob-7.2.0" sources."has-1.0.3" sources."has-bigints-1.0.1" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { @@ -82422,7 +82561,7 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."accepts-1.3.8" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -83128,7 +83267,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -83190,7 +83329,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-9.1.0" + sources."commander-9.2.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -84135,10 +84274,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.146"; + version = "1.0.148"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.146.tgz"; - sha512 = "DPTpfMPJFC82Qqyx7Ci5XYwJ6bOE1UWozEw9lbw70nTEPoCWfO2Yu45A/68491xVp22eRbMQ0wbP7eSHRtCS5Q=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.148.tgz"; + sha512 = "sNZPZDbxMrECsM8gr1zOprPsq+TGdZtrRlh3MIpUQuFql65nHjhJjtB5FCCCFE4h53KsdNaBvkukEcWAoilpCQ=="; }; dependencies = [ sources."@jsii/check-node-1.56.0" @@ -84146,7 +84285,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-12.20.47" + sources."@types/node-12.20.48" sources."@xmldom/xmldom-0.8.2" sources."ajv-8.11.0" sources."ansi-regex-5.0.1" @@ -84157,8 +84296,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-1.5.67" - sources."cdk8s-plus-22-1.0.0-beta.191" + sources."cdk8s-1.5.69" + sources."cdk8s-plus-22-1.0.0-beta.193" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -84171,18 +84310,18 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.266" + sources."constructs-3.3.268" sources."date-format-4.0.6" sources."debug-4.3.4" sources."decamelize-5.0.1" sources."deep-equal-2.0.5" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."detect-indent-5.0.0" sources."detect-newline-2.1.0" sources."dot-case-3.0.4" sources."emoji-regex-8.0.0" sources."entities-2.0.3" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -84201,6 +84340,7 @@ in ]; }) sources."function-bind-1.1.1" + sources."functions-have-names-1.2.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" @@ -84209,6 +84349,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" @@ -84258,14 +84399,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.529" // { + (sources."jsii-srcmak-0.1.531" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.190" + sources."json2jsii-0.2.192" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -84291,7 +84432,7 @@ in sources."picomatch-2.3.1" sources."punycode-2.1.1" sources."queue-microtask-1.2.3" - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" @@ -84309,7 +84450,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.1" sources."spdx-license-list-6.5.0" - sources."sscaff-1.2.256" + sources."sscaff-1.2.258" (sources."streamroller-3.0.6" // { dependencies = [ sources."fs-extra-10.0.1" @@ -84391,7 +84532,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/node-fetch-2.6.1" sources."@xmldom/xmldom-0.8.2" sources."ansi-regex-5.0.1" @@ -84420,18 +84561,18 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.0.113" + sources."constructs-10.0.115" sources."date-format-4.0.6" sources."debug-4.3.4" sources."decamelize-1.2.0" sources."deep-equal-2.0.5" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."detect-indent-5.0.0" sources."detect-newline-2.1.0" sources."emoji-regex-8.0.0" sources."entities-2.0.3" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -84448,6 +84589,7 @@ in sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + sources."functions-have-names-1.2.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" @@ -84463,6 +84605,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."inflight-1.0.6" @@ -84563,7 +84706,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.529" // { + (sources."jsii-srcmak-0.1.531" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -84608,7 +84751,7 @@ in sources."prettier-2.6.2" sources."punycode-2.1.1" sources."queue-microtask-1.2.3" - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."reserved-words-0.1.2" @@ -85306,7 +85449,7 @@ in sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" - sources."async-2.6.3" + sources."async-2.6.4" sources."await-semaphore-0.1.3" sources."balanced-match-1.0.2" sources."big-integer-1.6.51" @@ -85335,10 +85478,10 @@ in sources."debounce-1.2.1" sources."debug-4.3.4" sources."deep-extend-0.6.0" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."duplexer2-0.1.4" sources."end-of-stream-1.4.4" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-to-primitive-1.2.1" sources."event-lite-0.1.2" sources."execa-1.0.0" @@ -85346,7 +85489,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-3.2.5" sources."follow-redirects-1.14.9" - sources."fp-ts-2.11.9" + sources."fp-ts-2.11.10" sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -85364,10 +85507,11 @@ in sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-bigints-1.0.1" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -85753,7 +85897,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -85790,7 +85934,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.109" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -87109,7 +87253,7 @@ in sources."array-union-2.1.0" sources."asn1-0.2.6" sources."assert-plus-1.0.0" - sources."async-2.6.3" + sources."async-2.6.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atomically-1.7.0" @@ -87316,7 +87460,7 @@ in sources."http-errors-1.8.1" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" @@ -87813,7 +87957,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -87842,7 +87986,7 @@ in sources."cycle-onionify-4.0.0" sources."d-1.0.1" sources."debug-3.2.7" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."es5-ext-0.10.60" sources."es6-iterator-2.0.3" @@ -87871,6 +88015,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."iconv-lite-0.4.24" sources."inherits-2.0.4" @@ -88150,7 +88295,7 @@ in sources."clear-module-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-9.1.0" + sources."commander-9.2.0" sources."comment-json-4.2.2" sources."concat-map-0.0.1" sources."configstore-5.0.1" @@ -89062,11 +89207,11 @@ in sources."@types/mapbox-gl-0.54.5" sources."@types/mime-types-2.1.1" sources."@types/minimist-1.2.2" - sources."@types/node-14.18.12" + sources."@types/node-14.18.13" sources."@types/node-fetch-2.6.1" sources."@types/prop-types-15.7.5" sources."@types/rc-1.2.1" - sources."@types/react-16.14.24" + sources."@types/react-16.14.25" sources."@types/react-dom-16.9.14" sources."@types/react-window-1.8.5" sources."@types/react-window-infinite-loader-1.0.6" @@ -89119,7 +89264,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -89160,7 +89305,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.21.1" // { + (sources."core-js-compat-3.22.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -89176,7 +89321,7 @@ in sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."deltachat-node-1.76.0" @@ -89186,7 +89331,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-14.2.9" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.109" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -89251,6 +89396,7 @@ in sources."fs-extra-8.1.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" + sources."functions-have-names-1.2.2" sources."gensync-1.0.0-beta.2" sources."geojson-flatten-1.0.4" sources."geojson-vt-3.2.1" @@ -89283,6 +89429,7 @@ in sources."gud-1.0.0" sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -89443,7 +89590,7 @@ in sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.15.0" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" sources."regexpu-core-5.0.1" sources."regjsgen-0.6.0" (sources."regjsparser-0.8.4" // { @@ -89770,12 +89917,12 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.12" + sources."@types/node-14.18.13" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.6" sources."assert-plus-1.0.0" - sources."async-2.6.3" + sources."async-2.6.4" sources."asynckit-0.4.0" sources."aws-sdk-2.1097.0" sources."aws-sign2-0.7.0" @@ -89807,7 +89954,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."http-signature-1.2.0" - sources."http-status-1.5.0" + sources."http-status-1.5.1" sources."ieee754-1.1.13" sources."inherits-2.0.4" sources."ini-2.0.0" @@ -89973,7 +90120,7 @@ in sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.10.0" sources."abbrev-1.1.1" @@ -90063,7 +90210,7 @@ in sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" - (sources."define-properties-1.1.3" // { + (sources."define-properties-1.1.4" // { dependencies = [ sources."object-keys-1.1.1" ]; @@ -90163,6 +90310,7 @@ in sources."gauge-4.0.4" sources."get-caller-file-2.0.5" sources."get-installed-path-2.1.1" + sources."get-intrinsic-1.1.1" (sources."get-package-info-1.0.0" // { dependencies = [ sources."debug-2.6.9" @@ -90187,6 +90335,8 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" @@ -90194,7 +90344,7 @@ in sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" @@ -90580,7 +90730,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -90609,7 +90759,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.109" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -90875,18 +91025,18 @@ in }) sources."@fluentui/date-time-utilities-8.5.0" sources."@fluentui/dom-utilities-2.2.0" - sources."@fluentui/font-icons-mdl2-8.3.0" - sources."@fluentui/foundation-legacy-8.2.5" + sources."@fluentui/font-icons-mdl2-8.3.1" + sources."@fluentui/foundation-legacy-8.2.6" sources."@fluentui/keyboard-key-0.4.0" - sources."@fluentui/merge-styles-8.5.0" - sources."@fluentui/react-8.64.3" - sources."@fluentui/react-focus-8.5.6" - sources."@fluentui/react-hooks-8.5.3" + sources."@fluentui/merge-styles-8.5.1" + sources."@fluentui/react-8.65.0" + sources."@fluentui/react-focus-8.5.7" + sources."@fluentui/react-hooks-8.5.4" sources."@fluentui/react-window-provider-2.2.0" sources."@fluentui/set-version-8.2.0" - sources."@fluentui/style-utilities-8.6.5" - sources."@fluentui/theme-2.6.4" - sources."@fluentui/utilities-8.8.1" + sources."@fluentui/style-utilities-8.6.6" + sources."@fluentui/theme-2.6.5" + sources."@fluentui/utilities-8.8.2" (sources."@gulp-sourcemaps/identity-map-2.0.1" // { dependencies = [ sources."acorn-6.4.2" @@ -90908,7 +91058,7 @@ in ]; }) sources."@humanwhocodes/object-schema-1.2.1" - sources."@microsoft/load-themed-styles-1.10.257" + sources."@microsoft/load-themed-styles-1.10.258" sources."@node-rs/crc32-1.5.0" sources."@node-rs/crc32-android-arm-eabi-1.5.0" sources."@node-rs/crc32-android-arm64-1.5.0" @@ -91258,7 +91408,7 @@ in }) sources."default-resolution-2.0.0" sources."defer-to-connect-1.1.3" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."define-property-2.0.2" (sources."del-6.0.0" // { dependencies = [ @@ -91606,6 +91756,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."has-value-1.0.0" @@ -92508,7 +92659,7 @@ in sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" @@ -92715,7 +92866,7 @@ in sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."astral-regex-2.0.0" - sources."async-2.6.3" + sources."async-2.6.4" sources."async-each-1.0.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" @@ -92823,7 +92974,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -93013,7 +93164,7 @@ in ]; }) sources."defaults-1.0.3" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."define-property-2.0.2" (sources."del-4.1.1" // { dependencies = [ @@ -93064,7 +93215,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.109" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -93090,7 +93241,7 @@ in sources."errno-0.1.8" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.7" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."escalade-3.1.1" @@ -93277,6 +93428,7 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" + sources."functions-have-names-1.2.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stdin-6.0.0" @@ -93307,6 +93459,7 @@ in sources."has-bigints-1.0.1" sources."has-cors-1.1.0" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -93848,7 +94001,7 @@ in sources."rechoir-0.6.2" sources."reflect-metadata-0.1.13" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" sources."regexpp-3.2.0" sources."relateurl-0.2.7" sources."remove-trailing-separator-1.1.0" @@ -94804,7 +94957,7 @@ in sources."@types/json-schema-7.0.11" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/q-1.5.5" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.1" @@ -95009,7 +95162,7 @@ in }) sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -95214,7 +95367,7 @@ in sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."define-property-2.0.2" (sources."del-6.0.0" // { dependencies = [ @@ -95267,7 +95420,7 @@ in sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.109" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -95288,7 +95441,7 @@ in sources."errno-0.1.8" sources."error-ex-1.3.2" sources."errorhandler-1.5.1" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -95451,6 +95604,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" + sources."functions-have-names-1.2.2" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -95478,6 +95632,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -95986,7 +96141,7 @@ in sources."pnp-webpack-plugin-1.7.0" (sources."portfinder-1.0.28" // { dependencies = [ - sources."async-2.6.3" + sources."async-2.6.4" sources."debug-3.2.7" ]; }) @@ -96203,7 +96358,7 @@ in }) sources."regenerator-runtime-0.13.9" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."relateurl-0.2.7" @@ -96855,7 +97010,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.11" sources."@jridgewell/trace-mapping-0.3.4" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.10.0" sources."@types/yoga-layout-1.9.2" @@ -96882,7 +97037,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -96907,7 +97062,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.969999" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.109" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -97535,7 +97690,7 @@ in sources."@types/duplexify-3.6.1" sources."@types/json-schema-7.0.11" sources."@types/long-4.0.1" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" @@ -97894,7 +98049,7 @@ in sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" @@ -98105,7 +98260,7 @@ in sources."picomatch-2.3.1" (sources."portfinder-1.0.28" // { dependencies = [ - sources."async-2.6.3" + sources."async-2.6.4" sources."debug-3.2.7" ]; }) @@ -98636,7 +98791,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.0" sources."@types/inquirer-6.5.0" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -98963,13 +99118,13 @@ in sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."deep-equal-2.0.5" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."define-property-2.0.2" sources."director-1.2.7" sources."dot-prop-4.2.1" sources."duplexer-0.1.2" sources."enabled-2.0.0" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" @@ -99020,6 +99175,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" + sources."functions-have-names-1.2.2" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" @@ -99032,6 +99188,7 @@ in sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-bigints-1.0.1" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -99173,7 +99330,7 @@ in }) sources."readdirp-2.2.1" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" @@ -99443,7 +99600,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/node-fetch-2.6.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -99472,7 +99629,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -99537,7 +99694,7 @@ in sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.109" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -99640,7 +99797,7 @@ in sources."keyv-4.2.2" sources."kleur-3.0.3" sources."latest-version-5.1.0" - sources."lmdb-2.3.2" + sources."lmdb-2.3.3" sources."lmdb-darwin-arm64-2.3.2" sources."lmdb-darwin-x64-2.3.2" sources."lmdb-linux-arm-2.3.2" @@ -100085,7 +100242,7 @@ in sha512 = "76zCOpXUl/85CMk9aJwWbBy2vGYv+Yn17PcUMhksTtMJLAUujje3eP8v7FufC2pN9SbQx88Gtr4ARXGeVWwAJA=="; }; dependencies = [ - sources."async-2.6.3" + sources."async-2.6.4" sources."debug-4.3.4" sources."lodash-4.17.21" sources."lodash.groupby-4.6.0" @@ -100330,7 +100487,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -100435,10 +100592,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "4.13.0"; + version = "4.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.13.0.tgz"; - sha512 = "HF4X8Ov5uw32ksrJAJb2eG/lHu2yPe1+VZg+A5vl6rWn/GeCiuQeJdvjZB2RWJ4c0yDoGd16UbLvpUdnWZk6jg=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.13.1.tgz"; + sha512 = "2gj+T45cAuhaT6OICHKPxRAnGSXEsYRa/tgcNM8HmhENEcyjun7x0LAgP/soRXjENJ2CgWJrATU0EVUhb9uAYA=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -100569,7 +100726,7 @@ in sources."http-cache-semantics-4.1.0" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" @@ -100828,7 +100985,7 @@ in dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."async-2.6.3" + sources."async-2.6.4" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bl-1.2.3" @@ -101090,7 +101247,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -101176,7 +101333,7 @@ in sources."deep-extend-0.6.0" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" sources."duplexer3-0.1.4" @@ -101184,7 +101341,7 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" @@ -101220,6 +101377,7 @@ in sources."fs.realpath-1.0.0" sources."fullname-4.0.1" sources."function-bind-1.1.1" + sources."functions-have-names-1.2.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" @@ -101249,6 +101407,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-cache-semantics-4.1.0" @@ -101448,7 +101607,7 @@ in sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."reftools-1.1.9" - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."remove-trailing-separator-1.1.0" @@ -101635,7 +101794,7 @@ in }) sources."@oclif/screen-1.0.4" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.5" sources."@types/ws-8.5.3" @@ -101761,7 +101920,7 @@ in sources."graphql-language-service-parser-1.10.4" sources."graphql-language-service-types-1.8.7" sources."graphql-language-service-utils-2.5.1" - sources."graphql-sse-1.1.0" + sources."graphql-sse-1.2.0" sources."graphql-ws-5.7.0" sources."has-flag-4.0.0" sources."http-errors-1.6.3" @@ -102359,7 +102518,7 @@ in ]; }) sources."default-resolution-2.0.0" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."define-property-2.0.2" sources."detect-file-1.0.0" sources."duplexify-3.7.1" @@ -102444,6 +102603,7 @@ in sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" sources."has-1.0.3" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -102777,7 +102937,7 @@ in sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."default-compare-1.0.0" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."define-property-2.0.2" sources."detect-file-1.0.0" (sources."each-props-1.3.2" // { @@ -102845,6 +103005,7 @@ in sources."graceful-fs-4.2.10" sources."gulplog-1.0.0" sources."has-1.0.3" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -103152,7 +103313,7 @@ in sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-9.1.0" + sources."commander-9.2.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."glob-7.2.0" @@ -103193,7 +103354,7 @@ in }; dependencies = [ sources."ansi-styles-4.3.0" - sources."async-2.6.3" + sources."async-2.6.4" sources."basic-auth-2.0.1" sources."call-bind-1.0.2" sources."chalk-4.1.2" @@ -103415,16 +103576,16 @@ in sources."@colors/colors-1.5.0" sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.12" + sources."@types/node-14.18.13" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."argparse-1.0.10" sources."asn1-0.2.6" sources."assert-plus-1.0.0" - sources."async-2.6.3" + sources."async-2.6.4" sources."asynckit-0.4.0" - sources."aws-sdk-2.1113.0" + sources."aws-sdk-2.1115.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -104361,7 +104522,7 @@ in sources."has-symbols-1.0.3" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -105075,7 +105236,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1113.0" // { + (sources."aws-sdk-2.1115.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -105341,7 +105502,7 @@ in ]; }) sources."http-signature-1.2.0" - (sources."https-proxy-agent-5.0.0" // { + (sources."https-proxy-agent-5.0.1" // { dependencies = [ sources."debug-4.3.4" ]; @@ -107281,7 +107442,7 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -107305,7 +107466,7 @@ in sources."cookie-0.4.2" sources."cors-2.8.5" sources."custom-event-1.0.1" - sources."date-format-4.0.6" + sources."date-format-4.0.7" sources."debug-2.6.9" sources."depd-2.0.0" sources."destroy-1.2.0" @@ -107359,7 +107520,7 @@ in sources."isbinaryfile-4.0.10" sources."jsonfile-6.1.0" sources."lodash-4.17.21" - (sources."log4js-6.4.4" // { + (sources."log4js-6.4.5" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -107409,7 +107570,7 @@ in }) sources."source-map-0.6.1" sources."statuses-2.0.1" - (sources."streamroller-3.0.6" // { + (sources."streamroller-3.0.7" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -107579,7 +107740,7 @@ in sources."buffer-from-1.1.2" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" sources."chalk-2.4.2" sources."chardet-1.4.0" sources."chownr-1.1.4" @@ -107608,7 +107769,7 @@ in sources."convert-source-map-1.8.0" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.21.1" + sources."core-js-3.22.0" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" @@ -107632,7 +107793,7 @@ in sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -107647,12 +107808,12 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.109" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -107730,6 +107891,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" @@ -107742,7 +107904,7 @@ in sources."html-encoding-sniffer-2.0.1" sources."http-errors-1.8.1" sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.2.0" @@ -108050,7 +108212,7 @@ in sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."core-util-is-1.0.3" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."duplexify-3.7.1" sources."end-of-stream-1.4.4" sources."extend-3.0.2" @@ -108064,6 +108226,7 @@ in sources."glob-stream-6.1.0" sources."graceful-fs-4.2.10" sources."has-1.0.3" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -108887,7 +109050,7 @@ in sources."decode-uri-component-0.2.0" sources."dedent-0.7.0" sources."defaults-1.0.3" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -108904,7 +109067,7 @@ in sources."envinfo-7.8.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -108979,6 +109142,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" @@ -108986,7 +109150,7 @@ in sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" @@ -110456,14 +110620,14 @@ in sources."@types/babel__core-7.1.19" sources."@types/babel__generator-7.6.4" sources."@types/babel__template-7.4.1" - sources."@types/babel__traverse-7.14.2" + sources."@types/babel__traverse-7.17.0" sources."@types/estree-0.0.51" sources."@types/graceful-fs-4.1.5" sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.11" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -110636,7 +110800,7 @@ in sources."cached-path-relative-1.1.0" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -110707,7 +110871,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.21.1" // { + (sources."core-js-compat-3.22.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -110742,7 +110906,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."define-property-2.0.2" sources."defined-1.0.0" sources."delayed-stream-1.0.0" @@ -110759,7 +110923,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.109" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -110890,6 +111054,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -111497,7 +111662,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.5" sources."@types/get-stdin-5.0.1" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -112364,7 +112529,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -112378,7 +112543,7 @@ in sources."chownr-1.1.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-9.1.0" + sources."commander-9.2.0" sources."concat-map-0.0.1" sources."cross-fetch-3.1.5" sources."d3-7.4.4" @@ -112843,7 +113008,7 @@ in sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-21.0.0" @@ -113266,7 +113431,7 @@ in sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" sources."imurmurhash-0.1.4" @@ -113786,7 +113951,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -114541,7 +114706,7 @@ in sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -115036,10 +115201,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "8.6.0"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-8.6.0.tgz"; - sha512 = "icekvN8FJFESIFkLaFEVl05Nocl5Id5HnoVhJzhCUvtNY8tj9kfUlH/J527fZq/8ltsAUqpettfutwRjQYS2fA=="; + url = "https://registry.npmjs.org/npm/-/npm-8.7.0.tgz"; + sha512 = "fOSunmSa1K3dBv4YFoX54wew3PC6aYYDMGWBAonWRO4Yc7smYtk3nLrCda6+dtkTJwA8D4Tv/0wmnpYNgf5VFw=="; }; buildInputs = globalBuildInputs; meta = { @@ -115111,7 +115276,7 @@ in sources."color-name-1.1.4" sources."color-support-1.1.3" sources."colors-1.0.3" - sources."commander-9.1.0" + sources."commander-9.2.0" sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" @@ -115166,7 +115331,7 @@ in sources."hosted-git-info-5.0.0" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" sources."ignore-5.2.0" @@ -115249,7 +115414,7 @@ in sources."npm-package-arg-9.0.2" sources."npm-packlist-5.0.0" sources."npm-pick-manifest-7.0.1" - sources."npm-registry-fetch-13.1.0" + sources."npm-registry-fetch-13.1.1" sources."npmlog-6.0.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" @@ -115915,7 +116080,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -115941,7 +116106,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.21.1" // { + (sources."core-js-compat-3.22.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -116006,7 +116171,7 @@ in sources."clone-1.0.4" ]; }) - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" (sources."define-property-0.2.5" // { dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { @@ -116052,7 +116217,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.109" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -116062,7 +116227,7 @@ in sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - (sources."es-abstract-1.19.4" // { + (sources."es-abstract-1.19.5" // { dependencies = [ sources."object-inspect-1.12.0" ]; @@ -116136,6 +116301,7 @@ in }) sources."has-bigints-1.0.1" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -116789,7 +116955,7 @@ in sources."browserslist-4.20.2" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -116820,7 +116986,7 @@ in sources."domutils-2.8.0" sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.109" sources."entities-3.0.1" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -116969,7 +117135,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -117024,6 +117190,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hat-0.0.3" @@ -117342,7 +117509,7 @@ in sources."decompress-response-3.3.0" sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."dns-equal-1.0.0" sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" @@ -117362,6 +117529,7 @@ in }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + sources."functions-have-names-1.2.2" sources."get-browser-rtc-1.1.0" sources."get-intrinsic-1.1.1" sources."get-stdin-4.0.1" @@ -117370,6 +117538,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hat-0.0.3" @@ -117493,7 +117662,7 @@ in sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.7" sources."redent-1.0.0" - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" sources."repeating-2.0.1" sources."resolve-1.22.0" sources."restore-cursor-2.0.0" @@ -117603,7 +117772,7 @@ in sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.6" sources."assert-plus-1.0.0" - sources."async-2.6.3" + sources."async-2.6.4" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -118072,7 +118241,7 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."ieee754-1.2.1" sources."ignore-5.2.0" sources."inherits-2.0.4" @@ -118204,7 +118373,7 @@ in }) (sources."@pm2/io-5.0.0" // { dependencies = [ - sources."async-2.6.3" + sources."async-2.6.4" sources."eventemitter2-6.4.5" sources."semver-6.3.0" sources."tslib-1.9.3" @@ -118212,7 +118381,7 @@ in }) (sources."@pm2/js-api-0.6.7" // { dependencies = [ - sources."async-2.6.3" + sources."async-2.6.4" sources."eventemitter2-6.4.5" ]; }) @@ -118294,7 +118463,7 @@ in sources."has-flag-4.0.0" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -118394,7 +118563,7 @@ in sources."uuid-3.4.0" (sources."vizion-2.2.1" // { dependencies = [ - sources."async-2.6.3" + sources."async-2.6.4" ]; }) sources."vm2-3.9.9" @@ -118418,10 +118587,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.32.6"; + version = "6.32.7"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.32.6.tgz"; - sha512 = "ucrdCw3F/qjjzoR9+UtLXH1jkDqsbinz+hzSz54WQOOPt/F+9uxm8irrO/mdGkmsy844kAX6vsfS85gZLTg+yA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.32.7.tgz"; + sha512 = "2LtKMtQ7ffQEIW0lQn6z1WBnz2SPB416DDlyEf3WzOlXCO0BXjLr6kX2vDOTFzKyHWbhjcd45qw3ty3G92fb2Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -119195,7 +119364,7 @@ in sources."has-1.0.3" sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."ini-1.3.8" sources."ip-1.1.5" sources."is-docker-2.2.1" @@ -119525,8 +119694,8 @@ in sources."concat-map-0.0.1" sources."cycle-1.0.3" sources."deep-equal-2.0.5" - sources."define-properties-1.1.3" - sources."es-abstract-1.19.4" + sources."define-properties-1.1.4" + sources."es-abstract-1.19.5" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" @@ -119534,12 +119703,14 @@ in sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + sources."functions-have-names-1.2.2" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" sources."glob-7.2.0" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."i-0.3.7" @@ -119579,7 +119750,7 @@ in sources."pkginfo-0.4.1" sources."prompt-0.2.14" sources."read-1.0.7" - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" sources."revalidator-0.1.8" sources."rimraf-2.7.1" sources."semver-5.7.1" @@ -119760,7 +119931,7 @@ in sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.11" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -119828,7 +119999,7 @@ in ]; }) sources."assign-symbols-1.0.0" - sources."async-2.6.3" + sources."async-2.6.4" sources."async-each-1.0.3" sources."async-limiter-1.0.1" sources."atob-2.1.2" @@ -119952,7 +120123,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -120036,7 +120207,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.21.1" // { + (sources."core-js-compat-3.22.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -120140,7 +120311,7 @@ in sources."pump-3.0.0" ]; }) - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."define-property-2.0.2" sources."del-4.1.1" sources."depd-1.1.2" @@ -120182,7 +120353,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.109" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -120213,7 +120384,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -120330,6 +120501,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" + sources."functions-have-names-1.2.2" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -120366,6 +120538,7 @@ in }) sources."has-cors-1.1.0" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" @@ -120903,7 +121076,7 @@ in sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.15.0" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" sources."regexpu-core-5.0.1" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -121500,7 +121673,7 @@ in sources."get-caller-file-2.0.5" sources."html-encoding-sniffer-3.0.0" sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" sources."is-fullwidth-code-point-3.0.0" sources."is-potential-custom-element-name-1.0.1" @@ -121588,7 +121761,7 @@ in sources."@redocly/openapi-core-1.0.0-beta.94" sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.11" - sources."@types/node-14.18.12" + sources."@types/node-14.18.13" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -122359,10 +122532,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.70.1"; + version = "2.70.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.70.1.tgz"; - sha512 = "CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.70.2.tgz"; + sha512 = "EitogNZnfku65I1DD5Mxe8JYRUCy0hkK5X84IlDtUs+O6JRMpRciXTzyCUuX11b5L5pvjH+OmFXiQ3XjabcXgg=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -122593,7 +122766,7 @@ in sources."hosted-git-info-4.1.0" sources."htmlparser2-6.1.0" sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."ignore-5.2.0" @@ -123079,10 +123252,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.13.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.13.0.tgz"; - sha512 = "IICXx9c2jAZzE+tPiO5E/DZ6J7Lglhg8PkeeYbYNozNtlzPl9rNUoeSyKkWVrZtt7DG+iQZtBaJtu8e/Y2vB2w=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.14.0.tgz"; + sha512 = "+8B26dyIfsQ9QqDubKJhVRbSjcg0qJNWlFU/fdHYoLn/nUO4u1u+4AYdnUSiku8bDyrdaAjFJp9Zk3cwPCsm9A=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -123111,7 +123284,7 @@ in sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" sources."@types/lodash-4.14.181" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/responselike-1.0.0" sources."adm-zip-0.5.9" sources."agent-base-6.0.2" @@ -123137,7 +123310,7 @@ in sources."async-3.2.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1113.0" // { + (sources."aws-sdk-2.1115.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -123230,7 +123403,7 @@ in sources."type-1.2.0" ]; }) - sources."dayjs-1.11.0" + sources."dayjs-1.11.1" sources."debug-4.3.4" (sources."decompress-4.2.1" // { dependencies = [ @@ -123336,7 +123509,7 @@ in sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.2.0" @@ -124202,10 +124375,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.905.0"; + version = "1.906.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.905.0.tgz"; - sha512 = "VAUwhWBeWONI/a2ky0ONMizr74zCmEJuMej5zV8XgmowONj6KwQotm0k7kfs3l1ZH5RKHBMWREA65TulcGGObA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.906.0.tgz"; + sha512 = "BqHGSWBVx7LuiM9BuPE2zXRCQyAN7wJch4IEm0LFibZcLaoJ+4QWcn6X2ZynRzMCX7UJOntQUQj3q7lTmSaiug=="; }; buildInputs = globalBuildInputs; meta = { @@ -124229,7 +124402,7 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."component-emitter-1.3.0" @@ -124585,7 +124758,7 @@ in sources."abstract-leveldown-6.2.3" ]; }) - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" (sources."define-property-2.0.2" // { dependencies = [ sources."isobject-3.0.1" @@ -124607,7 +124780,7 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" (sources."es-get-iterator-1.1.2" // { dependencies = [ sources."isarray-2.0.5" @@ -124677,6 +124850,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" + sources."functions-have-names-1.2.2" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" @@ -124690,6 +124864,7 @@ in sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" sources."has-network-0.0.1" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."has-value-1.0.0" // { @@ -125096,7 +125271,7 @@ in }) sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" sources."relative-url-1.0.2" (sources."remark-3.2.3" // { dependencies = [ @@ -125465,7 +125640,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1113.0" // { + (sources."aws-sdk-2.1115.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -126619,16 +126794,16 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.6.0.tgz"; - sha512 = "POL3IqLUuGqb9DdvuXQaSTNXYnw/odK4hqW86+2LwGcZTdbUPKBBln7pq74wXmcnRE+12bXMY1CvbcUNa2d5nw=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.7.0.tgz"; + sha512 = "GrvG24j0+i8AOm0k0KyJ6Dqc+TAR2yzB7rtS4nljHStunVxCTr/1KYlv4EsOeoqtHLzeWMOd5D2O6nDdP/yw4A=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -126683,7 +126858,7 @@ in sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" - sources."svelte-preprocess-4.10.5" + sources."svelte-preprocess-4.10.6" sources."to-regex-range-5.0.1" sources."typescript-4.6.3" sources."wrappy-1.0.2" @@ -126701,10 +126876,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.25"; + version = "0.14.26"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.25.tgz"; - sha512 = "IdQP7sSFH0UgtFhpFu29GfWPR8obahr/k3ntXsW4AlGxplsnDTd7cLkmtkoNZe+gcXV9ixvcBi7LzR+FY3Nssg=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.26.tgz"; + sha512 = "U4pJ0ISruXQ6z+4++szyN2fsapa9/usVb1UlPC0p6sPfWfmQgFlR4125zWsMr0nl1ScsYa8VdEweQlk7mrq6zw=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.3" @@ -126713,7 +126888,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -126772,8 +126947,8 @@ in sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" sources."svelte-3.47.0" - sources."svelte-preprocess-4.10.5" - sources."svelte2tsx-0.5.8" + sources."svelte-preprocess-4.10.6" + sources."svelte2tsx-0.5.9" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" sources."typescript-4.6.3" @@ -127861,7 +128036,7 @@ in sources."debug-4.3.4" sources."deep-equal-1.1.1" sources."deep-is-0.1.4" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."diff-4.0.2" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" @@ -127878,12 +128053,14 @@ in sources."format-0.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + sources."functions-have-names-1.2.2" sources."get-intrinsic-1.1.1" sources."get-stdin-5.0.1" sources."glob-7.2.0" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hosted-git-info-2.8.9" @@ -127975,7 +128152,7 @@ in sources."strip-bom-3.0.0" ]; }) - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" sources."remark-footnotes-3.0.0" sources."remark-frontmatter-3.0.0" sources."remark-gfm-1.0.0" @@ -128060,14 +128237,16 @@ in }; dependencies = [ sources."call-bind-1.0.2" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."function-bind-1.1.1" + sources."functions-have-names-1.2.2" sources."get-intrinsic-1.1.1" sources."has-1.0.3" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."match-index-1.0.3" sources."object-keys-1.1.1" - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" ]; buildInputs = globalBuildInputs; meta = { @@ -128669,10 +128848,10 @@ in sources."array.prototype.find-2.2.0" sources."call-bind-1.0.2" sources."check-ends-with-period-1.0.1" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."emoji-regex-6.5.1" sources."end-with-1.0.2" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" @@ -128680,6 +128859,7 @@ in sources."get-symbol-description-1.0.0" sources."has-1.0.3" sources."has-bigints-1.0.1" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" @@ -128782,14 +128962,15 @@ in dependencies = [ sources."array-includes-3.1.4" sources."call-bind-1.0.2" - sources."define-properties-1.1.3" - sources."es-abstract-1.19.4" + sources."define-properties-1.1.4" + sources."es-abstract-1.19.5" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" sources."has-1.0.3" sources."has-bigints-1.0.1" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" @@ -128881,7 +129062,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -128933,7 +129114,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.21.1" + sources."core-js-3.22.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -128946,7 +129127,7 @@ in }) sources."deep-extend-0.6.0" sources."defer-to-connect-2.0.1" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -128968,7 +129149,7 @@ in }) sources."engine.io-parser-5.0.3" sources."entities-2.2.0" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -128997,6 +129178,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" @@ -129005,7 +129187,7 @@ in sources."http-errors-1.8.1" sources."http2-wrapper-1.0.3" sources."http_ece-1.1.0" - (sources."https-proxy-agent-5.0.0" // { + (sources."https-proxy-agent-5.0.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -129224,7 +129406,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -129276,7 +129458,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.21.1" + sources."core-js-3.22.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -129289,7 +129471,7 @@ in }) sources."deep-extend-0.6.0" sources."defer-to-connect-2.0.1" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -129311,7 +129493,7 @@ in }) sources."engine.io-parser-5.0.3" sources."entities-2.2.0" - sources."es-abstract-1.19.4" + sources."es-abstract-1.19.5" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -129340,6 +129522,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" @@ -129348,7 +129531,7 @@ in sources."http-errors-1.8.1" sources."http2-wrapper-1.0.3" sources."http_ece-1.1.0" - (sources."https-proxy-agent-5.0.0" // { + (sources."https-proxy-agent-5.0.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -129640,7 +129823,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.21.1" + sources."core-js-3.22.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -130094,10 +130277,10 @@ in thelounge-theme-chord = nodeEnv.buildNodePackage { name = "thelounge-theme-chord"; packageName = "thelounge-theme-chord"; - version = "1.0.1"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/thelounge-theme-chord/-/thelounge-theme-chord-1.0.1.tgz"; - sha512 = "Y9nr1ZIUAGFyDBRCXmJcZ93pEWdjzfvyFvg+4X0hPC/+mn1QmE5nfx060ExCNRY4uKl1T0muWV89X4B2FAVoHg=="; + url = "https://registry.npmjs.org/thelounge-theme-chord/-/thelounge-theme-chord-1.1.3.tgz"; + sha512 = "1STzJ2NT68+4IxSlV82W3Z8UkVwCZV+qLdDW/z927k4ZKCjP0cWGH7nB2CwiBBJpBm4zAhBjmwa4Ip3jYWZ/eg=="; }; buildInputs = globalBuildInputs; meta = { @@ -130233,7 +130416,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -130314,7 +130497,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.21.1" + sources."core-js-3.22.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -130409,7 +130592,7 @@ in sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" sources."http_ece-1.1.0" - (sources."https-proxy-agent-5.0.0" // { + (sources."https-proxy-agent-5.0.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -130700,7 +130883,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -130781,7 +130964,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.21.1" + sources."core-js-3.22.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -130876,7 +131059,7 @@ in sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" sources."http_ece-1.1.0" - (sources."https-proxy-agent-5.0.0" // { + (sources."https-proxy-agent-5.0.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -132064,7 +132247,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."clean-stack-2.2.0" - sources."commander-9.1.0" + sources."commander-9.2.0" sources."concat-map-0.0.1" sources."crypto-random-string-2.0.0" sources."del-6.0.0" @@ -132196,7 +132379,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-16.11.26" + sources."@types/node-16.11.27" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -132513,7 +132696,7 @@ in sources."@types/is-empty-1.2.1" sources."@types/js-yaml-4.0.5" sources."@types/ms-0.7.31" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."ansi-regex-6.0.1" @@ -132666,7 +132849,7 @@ in sources."get-caller-file-2.0.5" sources."glob-7.2.0" sources."has-unicode-2.0.1" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -132826,7 +133009,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@vercel/build-utils-2.15.1" sources."@vercel/go-1.3.2" sources."@vercel/node-1.14.1" @@ -133324,7 +133507,7 @@ in sha512 = "HZfrlqpVu8N0UkSyjldPsGFpVFByYaDRDMmBvmKwKai2rAsd2vtde2CFnX9rOpmg3pN2vET8j3qtqZvZLzmkjQ=="; }; dependencies = [ - sources."core-js-3.21.1" + sources."core-js-3.22.0" sources."jsonc-parser-3.0.0" sources."regenerator-runtime-0.13.9" sources."request-light-0.5.8" @@ -133413,7 +133596,7 @@ in sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -133453,7 +133636,7 @@ in sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.110" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.9.3" @@ -133727,7 +133910,7 @@ in sources."arrify-1.0.1" sources."asn1-0.2.6" sources."assert-plus-1.0.0" - sources."async-2.6.3" + sources."async-2.6.4" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -134028,7 +134211,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -134989,7 +135172,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.21.1" + sources."core-js-pure-3.22.0" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { dependencies = [ @@ -135033,7 +135216,7 @@ in sources."has-unicode-2.0.1" sources."html-encoding-sniffer-2.0.1" sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -135186,7 +135369,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/yauzl-2.9.2" sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" @@ -135278,7 +135461,7 @@ in sources."deepmerge-4.2.2" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."doctrine-3.0.0" sources."dom-serializer-1.4.1" @@ -135353,6 +135536,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" + sources."functions-have-names-1.2.2" (sources."fx-runner-1.2.0" // { dependencies = [ sources."commander-2.9.0" @@ -135381,6 +135565,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-yarn-2.1.0" @@ -135562,7 +135747,7 @@ in sources."readable-stream-3.6.0" sources."real-require-0.1.0" sources."regenerator-runtime-0.13.9" - sources."regexp.prototype.flags-1.4.2" + sources."regexp.prototype.flags-1.4.3" sources."regexpp-3.2.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -135712,7 +135897,7 @@ in sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -135736,10 +135921,10 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.20.2" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001331" + sources."caniuse-lite-1.0.30001332" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.107" + sources."electron-to-chromium-1.4.110" sources."enhanced-resolve-5.9.3" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -135883,7 +136068,7 @@ in sources."@types/http-proxy-1.17.8" sources."@types/json-schema-7.0.11" sources."@types/mime-1.3.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/retry-0.12.1" @@ -135898,7 +136083,7 @@ in sources."ansi-html-community-0.0.8" sources."anymatch-3.1.2" sources."array-flatten-2.1.2" - sources."async-2.6.3" + sources."async-2.6.4" sources."balanced-match-1.0.2" sources."batch-0.6.1" sources."binary-extensions-2.2.0" @@ -136197,7 +136382,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -136777,7 +136962,7 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."astral-regex-1.0.0" - sources."async-2.6.3" + sources."async-2.6.4" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -136856,7 +137041,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.21.1" + sources."core-js-3.22.0" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -136872,7 +137057,7 @@ in sources."deep-extend-0.6.0" sources."default-uid-1.0.0" sources."defaults-1.0.3" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -136928,6 +137113,7 @@ in sources."fullname-4.0.1" sources."function-bind-1.1.1" sources."gauge-1.2.7" + sources."get-intrinsic-1.1.1" sources."get-stdin-4.0.1" sources."get-stream-4.1.0" sources."getpass-0.1.7" @@ -136959,7 +137145,9 @@ in ]; }) sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbol-support-x-1.4.2" + sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" sources."has-unicode-2.0.1" sources."hosted-git-info-2.8.9" @@ -136971,7 +137159,7 @@ in ]; }) sources."http-signature-1.2.0" - (sources."https-proxy-agent-5.0.0" // { + (sources."https-proxy-agent-5.0.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -137659,10 +137847,10 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "6.0.7"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-6.0.7.tgz"; - sha512 = "aJTTKN4m9m8wM02yQ4jMOXMp53Ni+r+VDAs0D+bo9l9x9nCMhOocNWeTjoaancHkb7LpNb4oLILp58HzTy0GpQ=="; + url = "https://registry.npmjs.org/zx/-/zx-6.1.0.tgz"; + sha512 = "LcvyN946APdktLPm1ta4wfNiJaDuq1iHOTDwApP69ug5hNYWzMYaVMC5Ek6Ny4nnSLpJ6wdY42feR/2LY5/nVA=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -137670,7 +137858,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.24" sources."@types/which-2.0.1" sources."braces-3.0.2" sources."chalk-5.0.1" @@ -137715,7 +137903,7 @@ in sources."universalify-2.0.0" sources."web-streams-polyfill-3.2.1" sources."which-2.0.2" - sources."yaml-1.10.2" + sources."yaml-2.0.0" ]; buildInputs = globalBuildInputs; meta = { From 5d05f3acf015f6ac10a1a4acac661893ca8068ac Mon Sep 17 00:00:00 2001 From: Nicolas M Date: Fri, 15 Apr 2022 20:28:34 +0200 Subject: [PATCH 077/171] melt: 0.2.0 -> 0.3.0 --- pkgs/tools/security/melt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/melt/default.nix b/pkgs/tools/security/melt/default.nix index 846b70b87538..5690958848c0 100644 --- a/pkgs/tools/security/melt/default.nix +++ b/pkgs/tools/security/melt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "melt"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "melt"; rev = "v${version}"; - sha256 = "sha256-HambmUodAwgi1/r/Nj7P7gXNK5pyBO3omMZ9ZvSK7cc=4"; + sha256 = "sha256-I1LNCrJo3Ihh03aTUG0QhS6ySuMqNJJGyZ8XZzClDlU="; }; - vendorSha256 = "sha256-1f3QBbWaTiplEp/4ihds1PwrEnoq/81TzlT46TufGFs="; + vendorSha256 = "sha256-eRFWDyXN2c5VSxYOE12sczYP3rGtzLjY9M2DQgHNFyA="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; From 782d03bca71ecfe225a6d71a9ca2d5055d8af327 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 15 Apr 2022 19:33:52 +0100 Subject: [PATCH 078/171] graalvmXX-ee: remove This package was last updated in 2020. It is out-of-date compared to upstream and we have the graalvmXX-ce already, that is much better maintained nowadays. --- .../compilers/graalvm/enterprise-edition.nix | 183 ------------------ pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 4 - 3 files changed, 2 insertions(+), 187 deletions(-) delete mode 100644 pkgs/development/compilers/graalvm/enterprise-edition.nix diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix deleted file mode 100644 index f3ca8a4f5bbb..000000000000 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ /dev/null @@ -1,183 +0,0 @@ -{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsa-lib, setJavaClassPath }: - -let - common = javaVersion: - let - graalvmXXX-ee = stdenv.mkDerivation rec { - pname = "graalvm${javaVersion}-ee"; - version = "20.2.1"; - srcs = [ - (requireFile { - name = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz"; - sha256 = { "8" = "e0bb182146283a43824dd2c2ceeb89b6ff7a93f9a85da889f8663ce1c2bd3002"; - "11" = "e5d92d361e7859fe5f88c92d7bb466e285e07f1e4e2d9944948f85fa0e3aee2b"; - }.${javaVersion}; - url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; - }) - (requireFile { - name = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "37ac6a62f68adad513057a60513ba75749adf98cc73999b3918afe159900428d"; - "11" = "f62df715ad529f8b84854644ac99e0a9a349232c7f03985d20a2a8be20edaa44"; - }.${javaVersion}; - url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; - }) - (requireFile { - name = "llvm-toolchain-installable-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "da98a8c17b0c724b41d1596b57e282a1ecfcbf9140404dfb04b0d4d9fb159d8a"; - "11" = "fc442c396e92f59d034a69175104cb3565c3d128426bd939cc94c6ceccbb720f"; - }.${javaVersion}; - url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; - }) - (requireFile { - name = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "44f6887249f2eb54cba98dd4d9de019da5463d92982e03bf655fffe4bb520daf"; - "11" = "941f3752ccb097958f49250586f04c305092ded3ea4c1b7d9a0f7632e47fa335"; - }.${javaVersion}; - url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; - }) - (requireFile { - name = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "5c3993c701bd09c6064dcf4a6d9c7489620d0654b03c74682398c788c0211c09"; - "11" = "de3ebf35ce47dc399d7976cbd09fde0e85f2c10f85bc3fe8f32bb9e2b500ab70"; - }.${javaVersion}; - url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; - }) - (requireFile { - name = "wasm-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "c0a334b271fd32c098bb3c42eada7eafb9f536becaa756097eebe4682915b067"; - "11" = "9e801071992a0ff976bc40b640a8b9368fd8ea890ba986543658fcbaa3a7fd68"; - }.${javaVersion}; - url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; - }) - ]; - nativeBuildInputs = [ unzip perl ]; - unpackPhase = '' - unpack_jar() { - jar=$1 - unzip -o $jar -d $out - perl -ne 'use File::Path qw(make_path); - use File::Basename qw(dirname); - if (/^(.+) = (.+)$/) { - make_path dirname("$ENV{out}/$1"); - system "ln -s $2 $ENV{out}/$1"; - }' $out/META-INF/symlinks - perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { - my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + - ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + - ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); - chmod $mode, "$ENV{out}/$1"; - }' $out/META-INF/permissions - rm -rf $out/META-INF - } - - mkdir -p $out - arr=($srcs) - tar xf ''${arr[0]} -C $out --strip-components=1 - unpack_jar ''${arr[1]} - unpack_jar ''${arr[2]} - unpack_jar ''${arr[3]} - unpack_jar ''${arr[4]} - unpack_jar ''${arr[5]} - ''; - - installPhase = { - "8" = '' - # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html - substituteInPlace $out/jre/lib/security/java.security \ - --replace file:/dev/random file:/dev/./urandom \ - --replace NativePRNGBlocking SHA1PRNG - - # provide libraries needed for static compilation - for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do - ln -s $f $out/jre/lib/svm/clibraries/linux-amd64/$(basename $f) - done - - # allow using external truffle-api.jar and languages not included in the distrubution - rm $out/jre/lib/jvmci/parentClassLoader.classpath - ''; - "11" = '' - # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html - substituteInPlace $out/conf/security/java.security \ - --replace file:/dev/random file:/dev/./urandom \ - --replace NativePRNGBlocking SHA1PRNG - - # provide libraries needed for static compilation - for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do - ln -s $f $out/lib/svm/clibraries/linux-amd64/$(basename $f) - done - ''; - }.${javaVersion}; - - dontStrip = true; - - # copy-paste openjdk's preFixup - preFixup = '' - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat < $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - postFixup = '' - rpath="${ { "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64"; - "11" = "$out/lib/jli:$out/lib/server:$out/lib"; - }.${javaVersion} - }:${ - lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender - glib zlib bzip2 alsa-lib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" - - for f in $(find $out -type f -perm -0100); do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true - patchelf --set-rpath "$rpath" "$f" || true - done - - for f in $(find $out -type f -perm -0100); do - if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi - done - ''; - - propagatedBuildInputs = [ setJavaClassPath zlib ]; # $out/bin/native-image needs zlib to build native executables - - doInstallCheck = true; - installCheckPhase = '' - echo ${lib.escapeShellArg '' - public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello World"); - } - } - ''} > HelloWorld.java - $out/bin/javac HelloWorld.java - - # run on JVM with Graal Compiler - $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld - $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' - - # Ahead-Of-Time compilation - $out/bin/native-image --no-server HelloWorld - ./helloworld - ./helloworld | fgrep 'Hello World' - - # Ahead-Of-Time compilation with --static - $out/bin/native-image --no-server --static HelloWorld - ./helloworld - ./helloworld | fgrep 'Hello World' - ''; - - passthru.home = graalvmXXX-ee; - - meta = with lib; { - homepage = "https://www.graalvm.org/"; - description = "High-Performance Polyglot VM"; - license = licenses.unfree; - maintainers = with maintainers; [ volth hlolli ]; - platforms = [ "x86_64-linux" ]; - }; - }; - in - graalvmXXX-ee; -in { - graalvm8-ee = common "8"; - graalvm11-ee = common "11"; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dde08c9d5e9d..2e2c4e1fce14 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -492,6 +492,8 @@ mapAliases ({ graalvm11 = graalvm11-ce; graalvm8-ce = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19 graalvm8 = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19 + graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15 + graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15 gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0f80b57c95d..208c5e5c0d9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12788,10 +12788,6 @@ with pkgs; graalvm = graalvm11-ce; }; - inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { }) - graalvm8-ee - graalvm11-ee; - openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; lingua-franca = callPackage ../development/compilers/lingua-franca { }; From 01bc138a8ef25314e08843845655480c9b04e879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 15 Apr 2022 16:28:41 +0100 Subject: [PATCH 079/171] nixos/stage-1-init: Merge mdraid module into swraid --- nixos/modules/module-list.nix | 1 - nixos/modules/system/boot/stage-1.nix | 4 +- .../system/boot/systemd/initrd-mdraid.nix | 32 -------------- nixos/modules/tasks/swraid.nix | 44 +++++++++++++++---- nixos/tests/all-tests.nix | 2 +- ...d-mdraid.nix => systemd-initrd-swraid.nix} | 8 ++-- 6 files changed, 42 insertions(+), 49 deletions(-) delete mode 100644 nixos/modules/system/boot/systemd/initrd-mdraid.nix rename nixos/tests/{systemd-initrd-mdraid.nix => systemd-initrd-swraid.nix} (90%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1d8bf49fdd27..2452ee685eb5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1186,7 +1186,6 @@ ./system/boot/systemd/tmpfiles.nix ./system/boot/systemd/user.nix ./system/boot/systemd/initrd.nix - ./system/boot/systemd/initrd-mdraid.nix ./system/boot/timesyncd.nix ./system/boot/tmp.nix ./system/etc/etc-activation.nix diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 3ab873604d3a..5e42eda3875b 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -355,7 +355,7 @@ let [ { object = bootStage1; symlink = "/init"; } - { object = pkgs.writeText "mdadm.conf" config.boot.initrd.services.mdraid.mdadmConf; + { object = pkgs.writeText "mdadm.conf" config.boot.initrd.services.swraid.mdadmConf; symlink = "/etc/mdadm.conf"; } { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { @@ -731,6 +731,6 @@ in }; imports = [ - (mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "initrd" "services" "mdraid" "mdadmConf" ]) + (mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "initrd" "services" "swraid" "mdadmConf" ]) ]; } diff --git a/nixos/modules/system/boot/systemd/initrd-mdraid.nix b/nixos/modules/system/boot/systemd/initrd-mdraid.nix deleted file mode 100644 index b30f2e083fd0..000000000000 --- a/nixos/modules/system/boot/systemd/initrd-mdraid.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, pkgs, lib, ... }: let - - cfg = config.boot.initrd.services.mdraid; - -in { - options.boot.initrd.services.mdraid = { - enable = (lib.mkEnableOption "mdraid support in initrd") // { - visible = false; - }; - - mdadmConf = lib.mkOption { - description = "Contents of /etc/mdadm.conf in initrd."; - type = lib.types.lines; - default = ""; - }; - }; - - config = lib.mkIf (config.boot.initrd.systemd.enable && cfg.enable) { - boot.initrd.systemd = { - contents."/etc/mdadm.conf" = lib.mkIf (cfg.mdadmConf != "") { - text = cfg.mdadmConf; - }; - - initrdBin = [ pkgs.mdadm ]; - }; - - boot.initrd.services.udev.packages = [ pkgs.mdadm ]; - boot.initrd.systemd.packages = [ pkgs.mdadm ]; - - boot.kernelModules = [ "dm-raid" ]; - }; -} diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix index 8fa19194bed4..0b53a6d152d0 100644 --- a/nixos/modules/tasks/swraid.nix +++ b/nixos/modules/tasks/swraid.nix @@ -1,17 +1,43 @@ -{ pkgs, ... }: +{ config, pkgs, lib, ... }: let -{ + cfg = config.boot.initrd.services.swraid; - environment.systemPackages = [ pkgs.mdadm ]; +in { - services.udev.packages = [ pkgs.mdadm ]; + options.boot.initrd.services.swraid = { + enable = (lib.mkEnableOption "swraid support using mdadm") // { + visible = false; # only has effect when the new stage 1 is in place + }; - systemd.packages = [ pkgs.mdadm ]; + mdadmConf = lib.mkOption { + description = "Contents of /etc/mdadm.conf in initrd."; + type = lib.types.lines; + default = ""; + }; + }; - boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid10" "raid456" ]; + config = { + environment.systemPackages = [ pkgs.mdadm ]; - boot.initrd.extraUdevRulesCommands = '' - cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/ - ''; + services.udev.packages = [ pkgs.mdadm ]; + systemd.packages = [ pkgs.mdadm ]; + + boot.initrd.availableKernelModules = lib.mkIf (config.boot.initrd.systemd.enable -> cfg.enable) [ "md_mod" "raid0" "raid1" "raid10" "raid456" ]; + + boot.initrd.extraUdevRulesCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' + cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/ + ''; + + boot.initrd.systemd = lib.mkIf cfg.enable { + contents."/etc/mdadm.conf" = lib.mkIf (cfg.mdadmConf != "") { + text = cfg.mdadmConf; + }; + + packages = [ pkgs.mdadm ]; + initrdBin = [ pkgs.mdadm ]; + }; + + boot.initrd.services.udev.packages = lib.mkIf cfg.enable [ pkgs.mdadm ]; + }; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 443a5e181f67..438955b44dcf 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -520,8 +520,8 @@ in systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {}; systemd-escaping = handleTest ./systemd-escaping.nix {}; - systemd-initrd-mdraid = handleTest ./systemd-initrd-mdraid.nix {}; systemd-initrd-simple = handleTest ./systemd-initrd-simple.nix {}; + systemd-initrd-swraid = handleTest ./systemd-initrd-swraid.nix {}; systemd-journal = handleTest ./systemd-journal.nix {}; systemd-machinectl = handleTest ./systemd-machinectl.nix {}; systemd-networkd = handleTest ./systemd-networkd.nix {}; diff --git a/nixos/tests/systemd-initrd-mdraid.nix b/nixos/tests/systemd-initrd-swraid.nix similarity index 90% rename from nixos/tests/systemd-initrd-mdraid.nix rename to nixos/tests/systemd-initrd-swraid.nix index 0d8827558fbb..28a0fb3192ae 100644 --- a/nixos/tests/systemd-initrd-mdraid.nix +++ b/nixos/tests/systemd-initrd-swraid.nix @@ -1,5 +1,5 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { - name = "systemd-initrd-mdraid"; + name = "systemd-initrd-swraid"; nodes.machine = { pkgs, ... }: { # Use systemd-boot @@ -17,7 +17,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { enable = true; emergencyAccess = true; }; - services.mdraid = { + services.swraid = { enable = true; mdadmConf = '' ARRAY /dev/md0 devices=/dev/vdc,/dev/vdd @@ -26,7 +26,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { kernelModules = [ "raid0" ]; }; - specialisation.boot-mdraid.configuration.virtualisation.bootDevice = "/dev/disk/by-label/testraid"; + specialisation.boot-swraid.configuration.virtualisation.bootDevice = "/dev/disk/by-label/testraid"; }; testScript = '' @@ -36,7 +36,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { machine.succeed("mkdir -p /mnt && mount /dev/md0 /mnt && echo hello > /mnt/test && umount /mnt") # Boot from the RAID - machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-mdraid.conf") + machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-swraid.conf") machine.succeed("sync") machine.crash() machine.wait_for_unit("multi-user.target") From 399ed1f1bda0546f4fbd73cd5c4d1dc0acc51fb1 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 15 Apr 2022 20:08:43 +0100 Subject: [PATCH 080/171] graalvmXX-ce: remove Ruby/Python/WASM support Those additional languages does not seem to really have much usage (e.g.: none in nixpkgs). For example, Ruby is pretty much broken for all environments for quite sometime already, however nobody seemed to border enough to fix it. They also add a good amount of size to the derivation. So let's remove them. It should be really easy if someone still cares for them and want to add them back on their own system: just use the `mkGraal` function (that we export) to generate their own version of GraalVM with all extra features they want. --- .../graalvm/community-edition/default.nix | 24 +++----- .../graalvm11-ce-sources.json | 44 ++----------- .../graalvm17-ce-sources.json | 36 ++--------- .../graalvm/community-edition/mkGraal.nix | 61 +++++++++---------- .../graalvm/community-edition/update.nix | 3 +- 5 files changed, 52 insertions(+), 116 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 6f42bfcc4539..b4448cda9c39 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -18,11 +18,9 @@ let graalvm11-ce-dev-version = "22.2.0-dev-20220401_1942"; graalvm17-ce-dev-version = "22.2.0-dev-20220401_1942"; - commonProducts = [ + products = [ "graalvm-ce" "native-image-installable-svm" - "ruby-installable-svm" - "wasm-installable-svm" ]; in @@ -32,24 +30,21 @@ in graalvm11-ce = mkGraal rec { config = { x86_64-darwin = { + inherit products; arch = "darwin-amd64"; - products = commonProducts ++ [ "python-installable-svm" ]; }; x86_64-linux = { + inherit products; arch = "linux-amd64"; - products = commonProducts ++ [ "python-installable-svm" ]; }; aarch64-darwin = { + inherit products; arch = "darwin-aarch64"; - products = [ - "graalvm-ce" - "native-image-installable-svm" - ]; version = graalvm11-ce-dev-version; }; aarch64-linux = { + inherit products; arch = "linux-aarch64"; - products = commonProducts; }; }; defaultVersion = graalvm11-ce-release-version; @@ -65,19 +60,16 @@ in graalvm17-ce = mkGraal rec { config = { x86_64-darwin = { + inherit products; arch = "darwin-amd64"; - products = commonProducts ++ [ "python-installable-svm" ]; }; x86_64-linux = { + inherit products; arch = "linux-amd64"; - products = commonProducts ++ [ "python-installable-svm" ]; }; aarch64-darwin = { + inherit products; arch = "darwin-aarch64"; - products = [ - "graalvm-ce" - "native-image-installable-svm" - ]; version = graalvm17-ce-dev-version; }; }; diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json index 070c783d0336..e3d514d58b9d 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json @@ -1,12 +1,12 @@ { "darwin-aarch64": { - "graalvm-ce|java11|22.2.0-dev-20220401_1942": { - "sha256": "c83dee740ae148486598759e44a717b09d8124e4ea50f9da1e7d49d016572b89", - "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220401_1942/graalvm-ce-java11-darwin-aarch64-dev.tar.gz" + "graalvm-ce|java11|22.2.0-dev-20220414_2112": { + "sha256": "7d1d39a7cc2579112e745943fa5b557405b501f5c3c3fde441f9a31c7627d18d", + "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/graalvm-ce-java11-darwin-aarch64-dev.tar.gz" }, - "native-image-installable-svm|java11|22.2.0-dev-20220401_1942": { - "sha256": "661311ae26bfd6c46360b9e65aabe9361dc5cd05878a404343adf16925ae78fa", - "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220401_1942/native-image-installable-svm-java11-darwin-aarch64-dev.jar" + "native-image-installable-svm|java11|22.2.0-dev-20220414_2112": { + "sha256": "5ec82588bf493c38656ca7c31fff276342ce1cbadee41309ae7a3486f56f7ba7", + "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/native-image-installable-svm-java11-darwin-aarch64-dev.jar" } }, "darwin-amd64": { @@ -17,18 +17,6 @@ "native-image-installable-svm|java11|22.0.0.2": { "sha256": "03c27de6cce61ee8073e89252212457f3fbac2c0bc9bfa4acbff12176476c176", "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java11-darwin-amd64-22.0.0.2.jar" - }, - "python-installable-svm|java11|22.0.0.2": { - "sha256": "67ee2f1cc10b0189e359344c31b22f423e636ff4ec2dd7d9437c3eb0ef54e601", - "url": "https://github.com/graalvm/graalpython/releases/download/vm-22.0.0.2/python-installable-svm-java11-darwin-amd64-22.0.0.2.jar" - }, - "ruby-installable-svm|java11|22.0.0.2": { - "sha256": "a25c0099a21ca1ca9904dd3acdeef509f67a13b96c6135b6de199e9805330df9", - "url": "https://github.com/oracle/truffleruby/releases/download/vm-22.0.0.2/ruby-installable-svm-java11-darwin-amd64-22.0.0.2.jar" - }, - "wasm-installable-svm|java11|22.0.0.2": { - "sha256": "d74c210a8a87b8eb0c4d18a65fde6f2c03ebc94d9bf7ed87bbb9cacc460006d7", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/wasm-installable-svm-java11-darwin-amd64-22.0.0.2.jar" } }, "linux-aarch64": { @@ -39,14 +27,6 @@ "native-image-installable-svm|java11|22.0.0.2": { "sha256": "51d41e890a5aabf8e7b9d4f4e0f88206ee70a261f7dbb0315d51770ab8f3009e", "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java11-linux-aarch64-22.0.0.2.jar" - }, - "ruby-installable-svm|java11|22.0.0.2": { - "sha256": "e0fb582a9c6b4167e7dc267c58ca1968bd1c471b3bc5c56061b436f175486d80", - "url": "https://github.com/oracle/truffleruby/releases/download/vm-22.0.0.2/ruby-installable-svm-java11-linux-aarch64-22.0.0.2.jar" - }, - "wasm-installable-svm|java11|22.0.0.2": { - "sha256": "a48470ae391c75cb2805b7fe27cde2c925c0466fdbc0623dfbb67c54f19dbf8c", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/wasm-installable-svm-java11-linux-aarch64-22.0.0.2.jar" } }, "linux-amd64": { @@ -57,18 +37,6 @@ "native-image-installable-svm|java11|22.0.0.2": { "sha256": "8504a3441f5b28b8fd625f676674a9216f082ae63a4e30d43930c80f9672e71d", "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java11-linux-amd64-22.0.0.2.jar" - }, - "python-installable-svm|java11|22.0.0.2": { - "sha256": "2f01d1bbc2ed2c507952d8ceaab1cb2176fc67e2d8c4b3bf5864e8d930c60c55", - "url": "https://github.com/graalvm/graalpython/releases/download/vm-22.0.0.2/python-installable-svm-java11-linux-amd64-22.0.0.2.jar" - }, - "ruby-installable-svm|java11|22.0.0.2": { - "sha256": "e90f7ebc13b6c1f8e3f98881bb4fe2336870744174b2b6d41dc672d15f0b9a40", - "url": "https://github.com/oracle/truffleruby/releases/download/vm-22.0.0.2/ruby-installable-svm-java11-linux-amd64-22.0.0.2.jar" - }, - "wasm-installable-svm|java11|22.0.0.2": { - "sha256": "c0fdfc40374b70f6f1597dd21660535c813dc5c3948c8a6ea9559a20f4d3fb5e", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/wasm-installable-svm-java11-linux-amd64-22.0.0.2.jar" } } } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json index 65e28b8b11cc..861f5e454e27 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json @@ -1,12 +1,12 @@ { "darwin-aarch64": { - "graalvm-ce|java17|22.2.0-dev-20220401_1942": { - "sha256": "f0409c59adbce62da7be46ab7d0e01abe5c080ef97d0b555e6c773f94dbfdecf", - "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220401_1942/graalvm-ce-java17-darwin-aarch64-dev.tar.gz" + "graalvm-ce|java17|22.2.0-dev-20220414_2112": { + "sha256": "1ae8991d95814945d33cf8758a1e7072c48660680d1d90ec5629671e25f99344", + "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/graalvm-ce-java17-darwin-aarch64-dev.tar.gz" }, - "native-image-installable-svm|java17|22.2.0-dev-20220401_1942": { - "sha256": "3770dc4810d7ebae8f9ca2212e91112629096a964d3caea1667b0aaf5f70c1e0", - "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220401_1942/native-image-installable-svm-java17-darwin-aarch64-dev.jar" + "native-image-installable-svm|java17|22.2.0-dev-20220414_2112": { + "sha256": "8a35491ea5487e755c087072fc827d81ec37a23075dcb29850e6f6cd5ff9630f", + "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/native-image-installable-svm-java17-darwin-aarch64-dev.jar" } }, "darwin-amd64": { @@ -17,18 +17,6 @@ "native-image-installable-svm|java17|22.0.0.2": { "sha256": "007fa742cd139d447f83d776b6d78e717c9df11d56a61061a5937547c20028b7", "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java17-darwin-amd64-22.0.0.2.jar" - }, - "python-installable-svm|java17|22.0.0.2": { - "sha256": "af887b0304d5ec98fab1be2cd1fca2aa3b10e84e823142a7f274560b1e0ea7c1", - "url": "https://github.com/graalvm/graalpython/releases/download/vm-22.0.0.2/python-installable-svm-java17-darwin-amd64-22.0.0.2.jar" - }, - "ruby-installable-svm|java17|22.0.0.2": { - "sha256": "fc5eb6f833136ae3fda61f46fe0af66a8454ca2f803ca35eaff7336521cb468d", - "url": "https://github.com/oracle/truffleruby/releases/download/vm-22.0.0.2/ruby-installable-svm-java17-darwin-amd64-22.0.0.2.jar" - }, - "wasm-installable-svm|java17|22.0.0.2": { - "sha256": "b76e6d872ce07ca9facd5b997dbb6e557ba72aa369ddd5f1664431bd11b98796", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/wasm-installable-svm-java17-darwin-amd64-22.0.0.2.jar" } }, "linux-amd64": { @@ -39,18 +27,6 @@ "native-image-installable-svm|java17|22.0.0.2": { "sha256": "8c25f650d58c2649c97061cb806dfaec9e685d5d2b80afc7cf72fe61d6891831", "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java17-linux-amd64-22.0.0.2.jar" - }, - "python-installable-svm|java17|22.0.0.2": { - "sha256": "b3b78a15bd29b4eaaf0f2607e21181ca2a5b41b38ba43a3ff2656c2f6effda8a", - "url": "https://github.com/graalvm/graalpython/releases/download/vm-22.0.0.2/python-installable-svm-java17-linux-amd64-22.0.0.2.jar" - }, - "ruby-installable-svm|java17|22.0.0.2": { - "sha256": "d86c9ad50cbed980fa69d69b2eccd47d31880d8c55553483f59ce9eda15628bd", - "url": "https://github.com/oracle/truffleruby/releases/download/vm-22.0.0.2/ruby-installable-svm-java17-linux-amd64-22.0.0.2.jar" - }, - "wasm-installable-svm|java17|22.0.0.2": { - "sha256": "7f7e51e4a24384b3dd960c12ab9b05b1fea58a0457d6b80e3797228fab93c0bd", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/wasm-installable-svm-java17-linux-amd64-22.0.0.2.jar" } } } diff --git a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix index 5b20890ced1b..9758ca020671 100644 --- a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix +++ b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix @@ -59,6 +59,11 @@ let (writeShellScriptBin "${stdenv.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"'') ]); + withNativeImageSvm = builtins.any (p: p == "native-image-installable-svm") platform.products; + withRubySvm = builtins.any (p: p == "ruby-installable-svm") platform.products; + withPythonSvm = builtins.any (p: p == "python-installable-svm") platform.products; + withWasmSvm = builtins.any (p: p == "wasm-installable-svm") platform.products; + graalvmXXX-ce = stdenv.mkDerivation rec { inherit version; pname = name; @@ -69,7 +74,6 @@ let alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype - openssl # libssl.so wanted by languages/ruby/lib/mri/openssl.so stdenv.cc.cc.lib # libstdc++.so.6 xorg.libX11 xorg.libXext @@ -77,6 +81,8 @@ let xorg.libXrender xorg.libXtst zlib + ] ++ lib.optionals withRubySvm [ + openssl # libssl.so wanted by languages/ruby/lib/mri/openssl.so ]; nativeBuildInputs = [ unzip perl makeWrapper ] @@ -172,7 +178,7 @@ let # Workaround for libssl.so.10 wanted by TruffleRuby # Resulting TruffleRuby cannot use `openssl` library. - autoPatchelfIgnoreMissingDeps = stdenv.isDarwin; + autoPatchelfIgnoreMissingDeps = withRubySvm && stdenv.isDarwin; preFixup = lib.optionalString (stdenv.isLinux) '' # We cannot use -exec since wrapProgram is a function but not a @@ -191,10 +197,14 @@ let find "$out" -name libfontmanager.so -exec \ patchelf --add-needed libfontconfig.so {} \; - # Workaround for libssl.so.10/libcrypto.so.10 wanted by TruffleRuby - patchelf $out/languages/ruby/lib/mri/openssl.so \ - --replace-needed libssl.so.10 libssl.so \ - --replace-needed libcrypto.so.10 libcrypto.so + ${ + lib.optionalString withRubySvm '' + # Workaround for libssl.so.10/libcrypto.so.10 wanted by TruffleRuby + patchelf $out/languages/ruby/lib/mri/openssl.so \ + --replace-needed libssl.so.10 libssl.so \ + --replace-needed libcrypto.so.10 libcrypto.so + '' + } ''; # $out/bin/native-image needs zlib to build native executables. @@ -222,7 +232,7 @@ let $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' ${# --static flag doesn't work for darwin - lib.optionalString (stdenv.isLinux && !useMusl) '' + lib.optionalString (withNativeImageSvm && stdenv.isLinux && !useMusl) '' echo "Ahead-Of-Time compilation" $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces --no-server HelloWorld ./helloworld | fgrep 'Hello World' @@ -234,49 +244,38 @@ let } ${# --static flag doesn't work for darwin - lib.optionalString (stdenv.isLinux && useMusl) '' + lib.optionalString (withNativeImageSvm && stdenv.isLinux && useMusl) '' echo "Ahead-Of-Time compilation with --static and --libc=musl" $out/bin/native-image --no-server --libc=musl --static HelloWorld ./helloworld | fgrep 'Hello World' '' } - ${# TODO: Doesn't work on MacOS, we have this error: - # "Launching JShell execution engine threw: Operation not permitted (Bind failed)" - lib.optionalString (stdenv.isLinux) '' + ${ + lib.optionalString withWasmSvm '' echo "Testing Jshell" echo '1 + 1' | $out/bin/jshell '' } ${ - lib.optionalString (builtins.any (a: a == "python-installable-svm") platform.products) '' + lib.optionalString withPythonSvm '' echo "Testing GraalPython" $out/bin/graalpython -c 'print(1 + 1)' echo '1 + 1' | $out/bin/graalpython '' } - echo "Testing TruffleRuby" ${ - lib.optionalString (builtins.any (a: a == "ruby-installable-svm") platform.products) '' - # Hide warnings about wrong locale - export LANG=C - export LC_ALL=C - $out/bin/ruby -e 'puts(1 + 1)' - '' - } - ${# FIXME: irb is broken in all platforms - # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL - # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even - # though `openssl` is in `propagatedBuildInputs`. For more details see: - # https://github.com/NixOS/nixpkgs/pull/105815 - # TODO: "truffleruby: an internal exception escaped out of the interpreter" - # error on linux-aarch64 - # TODO: "core/kernel.rb:234:in `gem_original_require': - # /nix/store/wlc5xalzj2ip1l83siqw8ac5fjd52ngm-graalvm11-ce/languages/llvm/native/lib: - # cannot read file data: Is a directory (RuntimeError)" error on linux-amd64 - lib.optionalString false '' + lib.optionalString withRubySvm '' + echo "Testing TruffleRuby" + # Hide warnings about wrong locale + export LANG=C + export LC_ALL=C + $out/bin/ruby -e 'puts(1 + 1)' + '' + # FIXME: irb is broken in all platforms + + lib.optionalString false '' echo '1 + 1' | $out/bin/irb '' } diff --git a/pkgs/development/compilers/graalvm/community-edition/update.nix b/pkgs/development/compilers/graalvm/community-edition/update.nix index 191f3cb45a15..6201ab100177 100644 --- a/pkgs/development/compilers/graalvm/community-edition/update.nix +++ b/pkgs/development/compilers/graalvm/community-edition/update.nix @@ -8,6 +8,7 @@ , writeShellScript , jq , gnused +, forceUpdate ? false }: /* @@ -199,7 +200,7 @@ let */ updateScriptText = newVersion: currentVersion: - if isNew newVersion currentVersion + if (forceUpdate || (isNew newVersion currentVersion)) then let versionKey = versionKeyInDefaultNix currentVersion; From 4f8562f6824e99973c67dd220617fb4517d41209 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 15 Apr 2022 20:34:09 +0100 Subject: [PATCH 081/171] nixos/doc: add note about the recent graalvmXX-ce changes --- .../manual/from_md/release-notes/rl-2205.section.xml | 11 +++++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ 2 files changed, 13 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 96dbfd59c83b..1521efc72aa6 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1393,6 +1393,17 @@ pkgs.cosmoc. + + + pkgs.graalvmXX-ce packages no longer + provide support for Python/Ruby/WASM, instead focusing only in + Java and Native Image Support. If you need to add support + back, please see the + pkgs.graalvmCEPackages.mkGraal function to + create your own customized version of GraalVM with support for + what you need. + +
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index a1b0212fafc3..ef683e519c8a 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -479,6 +479,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `pkgs.cosmopolitan` no longer provides the `cosmoc` command. It has been moved to `pkgs.cosmoc`. +- `pkgs.graalvmXX-ce` packages no longer provide support for Python/Ruby/WASM, instead focusing only in Java and Native Image Support. If you need to add support back, please see the `pkgs.graalvmCEPackages.mkGraal` function to create your own customized version of GraalVM with support for what you need. + ## Other Notable Changes {#sec-release-22.05-notable-changes} From 7c060cf3bb61fdaf73e5b9286e63466974ff70f4 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Fri, 15 Apr 2022 21:50:43 +0200 Subject: [PATCH 082/171] python3Packages.pywlroots: 0.15.11 -> 0.15.12 --- pkgs/development/python-modules/pywlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index b4f23f71d748..e6c64cc33e3f 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.11"; + version = "0.15.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L+59uf3/wqWnmWpqm8RAyIEarbj2Sdwf1Pbweh/z9C8="; + sha256 = "sha256-4uS47SJelkeBkqBcA6xzcTQqAXXSgcVJIZErVdR9ELY="; }; nativeBuildInputs = [ pkg-config ]; From 158b0e037f175cd3a93ed5766be8cc4d10f4b3ef Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 15 Apr 2022 20:49:29 +0100 Subject: [PATCH 083/171] graalvm17-ce: re-enable it on aarch64-linux However without support for Native Image, since it is failing to build. --- .../graalvm/community-edition/default.nix | 14 +++++++++----- .../community-edition/graalvm17-ce-sources.json | 6 ++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index b4448cda9c39..32b77d0f6e1e 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -52,11 +52,6 @@ in platforms = builtins.attrNames config; }; - # TODO: fix aarch64-linux, failing during Native Image compilation - # "Caused by: java.io.IOException: Cannot run program - # "/nix/store/1q1mif7h3lgxdaxg6j39hli5azikrfla-gcc-wrapper-9.3.0/bin/gcc" (in - # directory"/tmp/SVM-4194439592488143713"): error=0, Failed to exec spawn - # helper: pid: 19865, exit value: 1" graalvm17-ce = mkGraal rec { config = { x86_64-darwin = { @@ -72,6 +67,15 @@ in arch = "darwin-aarch64"; version = graalvm17-ce-dev-version; }; + aarch64-linux = { + # TODO: error with native-image-installable-svm in aarch64-linux: + # "Caused by: java.io.IOException: Cannot run program + # "/nix/store/00000000000000000000000000000000-gcc-wrapper-9.3.0/bin/gcc" (in + # directory"/tmp/SVM-0000000000000000000"): error=0, Failed to exec spawn + # helper: pid: 19865, exit value: 1" + products = [ "graalvm-ce" ]; + arch = "linux-aarch64"; + }; }; defaultVersion = graalvm17-ce-release-version; javaVersion = "17"; diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json index 861f5e454e27..475c0feb050b 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json @@ -19,6 +19,12 @@ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java17-darwin-amd64-22.0.0.2.jar" } }, + "linux-aarch64": { + "graalvm-ce|java17|22.0.0.2": { + "sha256": "c7d78387d2a144944f26773697c1b61d3478a081a1c5e7fc20f47f1f5f3c82c7", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java17-linux-aarch64-22.0.0.2.tar.gz" + } + }, "linux-amd64": { "graalvm-ce|java17|22.0.0.2": { "sha256": "4f743e0ed3d974b7d619ca2ed6014554e8c12e5ebbb38b9bc9e820b182169bd4", From d80c876d48d673aef50994b5920257bde403be3e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Apr 2022 23:22:53 +0200 Subject: [PATCH 084/171] metasploit: 6.1.37 -> 6.1.38 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 20 +++++++------- pkgs/tools/security/metasploit/default.nix | 4 +-- pkgs/tools/security/metasploit/gemset.nix | 30 ++++++++++----------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index fe38b6cd19c5..bb742e3832c0 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.37" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.38" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 4a8f6c4be93d..d6e628191152 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 214817055bc104e6876882ef794f1de1031edb53 - ref: refs/tags/6.1.37 + revision: 295599a02453423ea06e25c7f4347d88d1f2debc + ref: refs/tags/6.1.38 specs: - metasploit-framework (6.1.37) + metasploit-framework (6.1.38) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -31,7 +31,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.80) + metasploit-payloads (= 2.0.83) metasploit_data_models metasploit_payloads-mettle (= 1.0.18) mqtt @@ -129,13 +129,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.575.0) - aws-sdk-core (3.130.0) + aws-partitions (1.577.0) + aws-sdk-core (3.130.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.305.0) + aws-sdk-ec2 (1.307.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.68.0) @@ -254,7 +254,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.80) + metasploit-payloads (2.0.83) metasploit_data_models (5.0.5) activerecord (~> 6.0) activesupport (~> 6.0) @@ -308,7 +308,7 @@ GEM ruby-rc4 ttfunk pg (1.3.5) - public_suffix (4.0.6) + public_suffix (4.0.7) puma (5.6.4) nio4r (~> 2.0) racc (1.6.0) @@ -388,7 +388,7 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.0.6) + ruby_smb (3.1.0) bindata openssl-ccm openssl-cmac diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index cc359dcd0699..9f811999b79b 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.37"; + version = "6.1.38"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-umSWJq9jJrjawP+eXkZEKcomJNHpt7IOk+ZI1iAM6OU="; + sha256 = "sha256-3wpO2+ALt5sw6TSGCp7ARn5TEHVi+bBgP4uJPRwVIOM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 76c8ed6fe3f5..2d4c4808f45e 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07kbrac2r883h4bsw4qhgkd97v0f4p05saqj8zsy300wx56nyssm"; + sha256 = "0rl0wcvcl1dnyzyxs0m6iyma0ibx2f9a2d4zac6hrdfcqf4s6zx9"; type = "gem"; }; - version = "1.575.0"; + version = "1.577.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14ymvp06k46gvkpvz5zaqvbvr6wd8vdka5iq25q0wd0fzdx7aivm"; + sha256 = "0lrmk788830adljzfdv9ws4q7cqfh0qyp7w908pja4rkgsd4baln"; type = "gem"; }; - version = "3.130.0"; + version = "3.130.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dpid33sl72nsxyr7d57yqzqb9jby0dyjc0ncncdm41is7d25vki"; + sha256 = "13dbg60p44llx4h99s6vdqngkwkx1521ixvzrlj630wrjp6dfkp2"; type = "gem"; }; - version = "1.305.0"; + version = "1.307.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -694,12 +694,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "214817055bc104e6876882ef794f1de1031edb53"; - sha256 = "1rg81hhdcj76jc7b5dz9s4j2dji98i35x7pzq3dbh9k3mwk9cr5s"; + rev = "295599a02453423ea06e25c7f4347d88d1f2debc"; + sha256 = "1qr02lf3v2cb7xhb1yb2fl856zj6q2g0m1ilx4q9pdqbw3dlw2nz"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.37"; + version = "6.1.38"; }; metasploit-model = { groups = ["default"]; @@ -716,10 +716,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12xggj210fqprkcd6zb4rnis12l9q2fi42gmwh2hfdwvbm3syvzy"; + sha256 = "15vlazx39flz2pci2yqjcgd4ljslhivbq1vvyajgsxl15q772ni0"; type = "gem"; }; - version = "2.0.80"; + version = "2.0.83"; }; metasploit_data_models = { groups = ["default"]; @@ -1017,10 +1017,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; puma = { groups = ["default"]; @@ -1387,10 +1387,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mxm2948xz9pfl2jhngvjw89arvm9qznrf86pbqi8hi7cxfr4grk"; + sha256 = "0j378l0zh3y2hdnxx753p2ds7nssi8v08fkv1wzm3yl5ws8zkxaf"; type = "gem"; }; - version = "3.0.6"; + version = "3.1.0"; }; rubyntlm = { groups = ["default"]; From 77e1ad8f3a99467a0b4f77bd321991d2e85c2765 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 12 Mar 2022 16:42:42 +0100 Subject: [PATCH 085/171] python310Packages.gb-io: init at 0.1.1 --- .../python-modules/gb-io/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/gb-io/default.nix diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix new file mode 100644 index 000000000000..e61248cecf93 --- /dev/null +++ b/pkgs/development/python-modules/gb-io/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, rustPlatform +, setuptools-rust +}: + +buildPythonPackage rec { + pname = "gb-io"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "althonos"; + repo = "gb-io.py"; + rev = "v${version}"; + sha256 = "05fpz11rqqjrb8lc8id6ssv7sni9i1h7x1ra5v5flw9ghpf29ncm"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src sourceRoot; + name = "${pname}-${version}"; + sha256 = "1qh31jysg475f2qc70b3bczmzywmg9987kn2vsmk88h8sx4nnwc5"; + }; + + sourceRoot = "source"; + + nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + checkPhase = '' + python -m unittest discover + ''; + + pythonImportsCheck = [ "gb_io" ]; + + meta = with lib; { + homepage = "https://github.com/althonos/gb-io.py"; + description = "A Python interface to gb-io, a fast GenBank parser written in Rust"; + license = licenses.mit; + maintainers = with lib.maintainers; [ dlesl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f29b76457d6..f2a5e65b4577 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3200,6 +3200,8 @@ in { inherit (pkgs) bluez glib pkg-config; }; + gb-io = callPackage ../development/python-modules/gb-io { }; + gbinder-python = callPackage ../development/python-modules/gbinder-python { }; gcovr = callPackage ../development/python-modules/gcovr { }; From 44a44019456f9a0b9697dcae4664724ab340f700 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 15 Apr 2022 23:20:52 +0100 Subject: [PATCH 086/171] buildGraalvmNativeImage: mark as broken if Native Image is not available --- .../build-support/build-graalvm-native-image/default.nix | 2 ++ .../compilers/graalvm/community-edition/mkGraal.nix | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index d34f562bc537..760896706ac2 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -55,5 +55,7 @@ stdenv.mkDerivation (args // { platforms = graalvmDrv.meta.platforms; # default to executable name mainProgram = executable; + # need to have native-image-installable-svm available + broken = !(builtins.elem "native-image-installable-svm" graalvmDrv.products); } // meta; }) diff --git a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix index 9758ca020671..8f4aaba44f08 100644 --- a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix +++ b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix @@ -59,10 +59,10 @@ let (writeShellScriptBin "${stdenv.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"'') ]); - withNativeImageSvm = builtins.any (p: p == "native-image-installable-svm") platform.products; - withRubySvm = builtins.any (p: p == "ruby-installable-svm") platform.products; - withPythonSvm = builtins.any (p: p == "python-installable-svm") platform.products; - withWasmSvm = builtins.any (p: p == "wasm-installable-svm") platform.products; + withNativeImageSvm = builtins.elem "native-image-installable-svm" platform.products; + withRubySvm = builtins.elem "ruby-installable-svm" platform.products; + withPythonSvm = builtins.elem "python-installable-svm" platform.products; + withWasmSvm = builtins.elem "wasm-installable-svm" platform.products; graalvmXXX-ce = stdenv.mkDerivation rec { inherit version; @@ -282,6 +282,7 @@ let ''; passthru = { + inherit (platform) products; home = graalvmXXX-ce; updateScript = import ./update.nix { inherit lib writeShellScript jq sourcesFilename name config gnused defaultVersion; From bb426117beec29e9712031a1ccb70dd6a0d0123d Mon Sep 17 00:00:00 2001 From: workflow <4farlion@gmail.com> Date: Sat, 16 Apr 2022 00:25:38 +0100 Subject: [PATCH 087/171] add coc-flutter NPM dependency --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 769 ++++++++++-------- 2 files changed, 424 insertions(+), 346 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 7056a985faee..48e83f691917 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -55,6 +55,7 @@ , "coc-emmet" , "coc-eslint" , "coc-explorer" +, "coc-flutter" , "coc-git" , "coc-go" , "coc-highlight" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 61504c5e64d9..de068fb318d0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -481,31 +481,31 @@ let sha512 = "+D3xnPD5985iphgAqgUerBDs371a2WzzoEVi7eHJUMMsP/gEnSTdSH0HNxsqhYv6CW4EdKtvDAQdAwA1VtCf2A=="; }; }; - "@aws-sdk/client-s3-3.67.0" = { + "@aws-sdk/client-s3-3.72.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.67.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.67.0.tgz"; - sha512 = "+wSWhkxXG8mY5rlsTXdDaYULpzq8AZ3B2TZKVGEXb6zs1txedyWSYeZr6ENpBoxtJepmlwXDC7oRm39eVoRixw=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.72.0.tgz"; + sha512 = "WQnNs++yTsBARaZqpxIAB3CX9BrqgxnLo4g/wT8cLqRilhL8OY1KPowe8SptXcXbo2AdAuAtcFK2GC+MYcCgmg=="; }; }; - "@aws-sdk/client-sso-3.67.0" = { + "@aws-sdk/client-sso-3.72.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.67.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.67.0.tgz"; - sha512 = "njBLSqX2+4eTjeptODxdYgBC8cYwwNE3VwrIFgf+nosIo8Ll07evZgHhfZsyURou0cUUpxFInDf1KaAotH9lBQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.72.0.tgz"; + sha512 = "mQ2qSy5chVTzNo17kcOtylp8gUJr2SIx7ZkaC5ZUrA9RZu673XKFm1SXvL0aBw1LQBioKU2kGNwsUSDunXulpQ=="; }; }; - "@aws-sdk/client-sts-3.67.0" = { + "@aws-sdk/client-sts-3.72.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.67.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.67.0.tgz"; - sha512 = "gTWQU/4tPQLMJpLXgSbUss5s5dsyxpXJW2gWosvLLtX5QlchGBzWEawoA3QIxFRkNJrXqLyaVDBdFFqB+l0mVQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.72.0.tgz"; + sha512 = "m6nEXe5wi7Cx9DHBFOji+i2tn+EXNlBC2BymlFZ+KerxAfjLyu9U16Xx9VzmfnQS5dz0Fyh0DLBIcI9DY5+ywQ=="; }; }; "@aws-sdk/config-resolver-3.58.0" = { @@ -535,22 +535,22 @@ let sha512 = "CdtnTQ9zqLx1FbXdbgjijLbMcIWOyQM03TFaLSCjI3FNbUwyt3T7StBU9tj/LtbypHhSdXyQBpzUtXTOMWCEhg=="; }; }; - "@aws-sdk/credential-provider-ini-3.67.0" = { + "@aws-sdk/credential-provider-ini-3.72.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.67.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.67.0.tgz"; - sha512 = "47uNhLsd2eKWOa+alsyoT48TbtIfYtIJmC85APunHczqfpUC1YHOyHZ3pCzByGrgx4khjnJ323gfq9kreEHCvA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.72.0.tgz"; + sha512 = "KeZAywZ5CxEUIRvIpxRiOkRUwGy+rTTGTfjQz/Mz6AUj+nx+8M5WnSLRgENcwXmX59A7VdqosvD1jnRiXJjmPg=="; }; }; - "@aws-sdk/credential-provider-node-3.67.0" = { + "@aws-sdk/credential-provider-node-3.72.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.67.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.67.0.tgz"; - sha512 = "nxBUJ4rANue9MWQyhrmkZwuKVVpwbUXEqyMwJD1uxEZnYXksmAoVxKW/m4vxy1nh/65wAFCCipeLmqYzwJ8m0A=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.72.0.tgz"; + sha512 = "8yNNILXPAD9RlcKI0aronXOgwF9vRZQqEwPuvkurCPFQFt+OM/4/HTJns2NSVmImKDMV36sG+6Ld6aJEVW4cLQ=="; }; }; "@aws-sdk/credential-provider-process-3.58.0" = { @@ -562,13 +562,13 @@ let sha512 = "npgFqPUjMhUamf1FvJjBYUdpbWx8XWkKCwJsX73I7IYQAvAi2atCOkdtKq+4rds0VWAYu6vzlaI1tXgFxjOPNQ=="; }; }; - "@aws-sdk/credential-provider-sso-3.67.0" = { + "@aws-sdk/credential-provider-sso-3.72.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.67.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.67.0.tgz"; - sha512 = "AwS7tvA++2li0+yZkiCL1zk56EC3N6fDXWDqPEG/lKuviwyv1B+up6r/6ks7ADWbXuOKzrmslS7rn3DT2ZUkig=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.72.0.tgz"; + sha512 = "2NGjF2gMls5f/9QbUQEHR9kbVGePLI7EXVOyPb1H6DvQLp54keMVdTlSzKlRIcGUNd4MBYuDJak8Slf976/UVw=="; }; }; "@aws-sdk/credential-provider-web-identity-3.55.0" = { @@ -589,13 +589,13 @@ let sha512 = "vTdVFLIHGZTx/Anp9GpkTXVuvwSCNOecTutU5Py4i6fATgefWiSutc5Xc/FLujBSc0EhAXDGZIcTMpZC7jUpeg=="; }; }; - "@aws-sdk/eventstream-serde-browser-3.58.0" = { + "@aws-sdk/eventstream-serde-browser-3.72.0" = { name = "_at_aws-sdk_slash_eventstream-serde-browser"; packageName = "@aws-sdk/eventstream-serde-browser"; - version = "3.58.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.58.0.tgz"; - sha512 = "oR5yoOoJrTSUKwbxZSt37bZgMXUUSsOub96E6SOb8wh8TMq2f0wvqeO8A+aaxY487gKpzuVUClp7jSQ9LgiVcw=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.72.0.tgz"; + sha512 = "UhMZ4P60mZu7G+craAdkRgR4/n3lWAgrNp1upgN2W8RLEQwhqY3qHiUdn/kp6qvontwHnxZkXNB+5Zm5pcP8bQ=="; }; }; "@aws-sdk/eventstream-serde-config-resolver-3.55.0" = { @@ -607,22 +607,22 @@ let sha512 = "NTJHLq1sbXyXAaJucKvcdN3Svr/fM2TjHEC3l8P/torFjIsX1+Ykpi8tZt8KsX8RjoUTTfKylh41AjJq0K9X4Q=="; }; }; - "@aws-sdk/eventstream-serde-node-3.58.0" = { + "@aws-sdk/eventstream-serde-node-3.72.0" = { name = "_at_aws-sdk_slash_eventstream-serde-node"; packageName = "@aws-sdk/eventstream-serde-node"; - version = "3.58.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.58.0.tgz"; - sha512 = "U1DnRVfvKOXty+Bei6oqhRWFzGWzxl0OFHtev9GzC7BE/E6s4Gn695o+NO+9IwQgjOlc/JsGyAcWevq3MDxymg=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.72.0.tgz"; + sha512 = "woemBkQ3O7mTiT3kdJH72s3lQLhr2B7hxRhYeaa1xQf1UjLJkKXL5PEOOrcylmxLdF6rYLsFs8Y/Hr4FZfqAqA=="; }; }; - "@aws-sdk/eventstream-serde-universal-3.58.0" = { + "@aws-sdk/eventstream-serde-universal-3.72.0" = { name = "_at_aws-sdk_slash_eventstream-serde-universal"; packageName = "@aws-sdk/eventstream-serde-universal"; - version = "3.58.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.58.0.tgz"; - sha512 = "w7czmMNvCCspJi8Ij0lTByCiuYBhyNzYTM1wv33vtF7dL+FJgi4W4c5WFAOtvpsPulobY013TWCjPJG+V0IPGQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.72.0.tgz"; + sha512 = "iIaDC/2xgK+2kLiOPJv8wMDCCtI2JB8bkeac6cQOfn4hZGQdP6fvRGFWD2R8//VR52H68N2vrhCXHvtjnF4iFg=="; }; }; "@aws-sdk/fetch-http-handler-3.58.0" = { @@ -715,13 +715,13 @@ let sha512 = "nx6X6qLPwvbJrGoPxXSu4tsOek2eRnnjk78hhRUDfxFewpHJQLSPlyNKkXAo+C3syVALe6RJRmUYu5bShY6FfA=="; }; }; - "@aws-sdk/middleware-flexible-checksums-3.58.0" = { + "@aws-sdk/middleware-flexible-checksums-3.72.0" = { name = "_at_aws-sdk_slash_middleware-flexible-checksums"; packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.58.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.58.0.tgz"; - sha512 = "R8S3U1boaIb7+kYhLJBks7rv/eaGj7I5T/2CgmcGY1BJBUU0h0arjPC7eeA/5wV29EHapoxVYQvJda//706rCw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.72.0.tgz"; + sha512 = "lrwTmpygp6bxGRi6kbMq+EtTW5nsts+B7Wj7MA8PBIQsKU06T2tYxjDBYOyHB1MiVhltlq+vebBvacT64KsbFA=="; }; }; "@aws-sdk/middleware-header-default-3.58.0" = { @@ -886,13 +886,13 @@ let sha512 = "e+2FLgo+eDx7oh7ap5HngN9XSVMxredAVztLHxCcSN0lFHHHzMa8b2SpXbaowUxQHh7ziymSqvOrPYFQ71Filg=="; }; }; - "@aws-sdk/s3-request-presigner-3.67.0" = { + "@aws-sdk/s3-request-presigner-3.72.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.67.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.67.0.tgz"; - sha512 = "GOkB+k5EVSRJg6v3th8Ynhrh89hIW4uP0CjrKChvrDpBOyU2cFN0yLYtIVKaY6FZh7wanMGLhDzCsHPnpBKmfQ=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.72.0.tgz"; + sha512 = "6CxvI0tdamXn58OEmg59YHZPpsiLvCDtbijs9JhCYxvMblhkyPwWZglsZgcEkzIEPySe9RTZ5/BTHn6FzAe4xw=="; }; }; "@aws-sdk/service-error-classification-3.55.0" = { @@ -931,13 +931,13 @@ let sha512 = "Akvc8G9Del2+umg0R/5Gc/PWgQwbxxTXdnm6YTHtDzvyPPiYWBs6au6WqJQqcqk07gcQV67MLVqFFhnFuLlcVg=="; }; }; - "@aws-sdk/smithy-client-3.55.0" = { + "@aws-sdk/smithy-client-3.72.0" = { name = "_at_aws-sdk_slash_smithy-client"; packageName = "@aws-sdk/smithy-client"; - version = "3.55.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.55.0.tgz"; - sha512 = "YgBpqg6R3Qg8CH9biOP1N1lYTvh8VLGD6AoDGgy/R1dQSqRQuxgKANLl3DOVcZnIZLsw4TdB0m7U+ZPtirPR1Q=="; + url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.72.0.tgz"; + sha512 = "eQ2pEzxtS1Vz1XyNKzG4Z+mtfwRzcAs4FUQP0wrrYVJMsIdI0X4vvro8gYGoBbQtOz65uY3XqQdLuXX/SabTQg=="; }; }; "@aws-sdk/types-3.55.0" = { @@ -1021,31 +1021,31 @@ let sha512 = "30dzofQQfx6tp1jVZkZ0DGRsT0wwC15nEysKRiAcjncM64A0Cm6sra77d0os3vbKiKoPCI/lMsFr4o3533+qvQ=="; }; }; - "@aws-sdk/util-create-request-3.58.0" = { + "@aws-sdk/util-create-request-3.72.0" = { name = "_at_aws-sdk_slash_util-create-request"; packageName = "@aws-sdk/util-create-request"; - version = "3.58.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.58.0.tgz"; - sha512 = "EP6HLQHc8RxjSJ95Ca9Ppp5F0aS6QNSQg03hbjcpmKK42h8dtuXFp5qGAu35VxUg6IRztN2x7lpa+b3d/SdDoQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.72.0.tgz"; + sha512 = "SRxo1RWQ9e7QonuIH8oNEiOJTtasOtYNRD5QYwbJKhNkB4Z6AaE00V28AjrdS/+rMOcb0DKugXZ8Nhbd+n+K0g=="; }; }; - "@aws-sdk/util-defaults-mode-browser-3.55.0" = { + "@aws-sdk/util-defaults-mode-browser-3.72.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-browser"; packageName = "@aws-sdk/util-defaults-mode-browser"; - version = "3.55.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.55.0.tgz"; - sha512 = "OS3gAwR84bHz7ObhjsSJM+grfeaBq3leGrj7xiX4BH3C8J+c10GMo3fqx1pV8Fq5F+9lMmhHpfOocD63SN5Q8A=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.72.0.tgz"; + sha512 = "xeoh4jdq+tpZWDwGeXeoAQI+rZaCBEicjumBcqfzkRFE3DyaeyPHn3hiKGSR13R+P6Uf86aqaRNmWAeZZjeE0w=="; }; }; - "@aws-sdk/util-defaults-mode-node-3.58.0" = { + "@aws-sdk/util-defaults-mode-node-3.72.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-node"; packageName = "@aws-sdk/util-defaults-mode-node"; - version = "3.58.0"; + version = "3.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.58.0.tgz"; - sha512 = "KNUCp0MXI+z3Z3pQCKDkx3Stdy1TXDjcUB+ZJFxRTJGIuBYwX4fV6G8s/zeFJi5Qv1ztR3CJ9fWJGsrx9mQ5EA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.72.0.tgz"; + sha512 = "Qf4BZmjWTaWaWbIhra/il8zUAdYY6G4JIcg9WMzQgnh1L/iXpCZddInfB2zT4j5rSAuBf5Ov2T6zvtw3/KOh6Q=="; }; }; "@aws-sdk/util-format-url-3.58.0" = { @@ -2353,13 +2353,13 @@ let sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; }; }; - "@blueprintjs/colors-4.0.5" = { + "@blueprintjs/colors-4.1.0" = { name = "_at_blueprintjs_slash_colors"; packageName = "@blueprintjs/colors"; - version = "4.0.5"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.5.tgz"; - sha512 = "5ewWnDdUzyP7hnfidIPyAykGmjHAY2xjcUPM3J2hmnAQ4FORWPv7Mr3PJ9D0D7GfZV/ACx3URRclE1MXfvVlGA=="; + url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.1.0.tgz"; + sha512 = "aXgkEBg2oEz6lCE/sidvREUzQF7eJq2R8BvfOcQ1ICV4r/KVFszee6seA12ZtVaphfvuR4EE/raH6F1d0f4y7g=="; }; }; "@blueprintjs/core-3.54.0" = { @@ -3424,6 +3424,51 @@ let sha512 = "QRVtqJuS1mcT56oHpVegkKBlgtWjXw/gHNWO3eL9oyB5Sc7HBoc2OLG/nYpVfT/Jejvo3NUrD0Udk7XgoyDKkA=="; }; }; + "@envelop/core-2.3.1" = { + name = "_at_envelop_slash_core"; + packageName = "@envelop/core"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@envelop/core/-/core-2.3.1.tgz"; + sha512 = "AnYUci7EGyA8flml881lDvVDl6n/u6GQpVIOTsZVO29d4/rPqSJ2KFguDD3mjDL406doTTLNuDI4ndxfJl6fmQ=="; + }; + }; + "@envelop/disable-introspection-3.3.1" = { + name = "_at_envelop_slash_disable-introspection"; + packageName = "@envelop/disable-introspection"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@envelop/disable-introspection/-/disable-introspection-3.3.1.tgz"; + sha512 = "THR8UnRQQB5nCLmITXvebwXwSHvFjS+ThA3RRVXpFX9EupMbTFN5a4NHty7+BYD798c3VrBZ/InbMlEWqw1c9g=="; + }; + }; + "@envelop/parser-cache-4.3.1" = { + name = "_at_envelop_slash_parser-cache"; + packageName = "@envelop/parser-cache"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@envelop/parser-cache/-/parser-cache-4.3.1.tgz"; + sha512 = "IqerCVjvVTiGvSZ8qSpdEc55hhiuekufJd0+ldWtyMPznhMaYOzpLifFUhjhhD7004eJM17n9vjJQFa7fIGz8Q=="; + }; + }; + "@envelop/types-2.2.0" = { + name = "_at_envelop_slash_types"; + packageName = "@envelop/types"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@envelop/types/-/types-2.2.0.tgz"; + sha512 = "Lghvfs0kh53G5mUKpCMlB/FhHh3O8SSR4hewB7JyE9hOEu/9h/6u+GHH/OEgdaRHky1Sae5Jf4grO+h21ka4ig=="; + }; + }; + "@envelop/validation-cache-4.3.1" = { + name = "_at_envelop_slash_validation-cache"; + packageName = "@envelop/validation-cache"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@envelop/validation-cache/-/validation-cache-4.3.1.tgz"; + sha512 = "lmtu9idhdWqbYkcFoFsL1ED4y38DLvj6EDEwE9tULXWuZm4WWmlNQAmKHAwB1d3kGVQAMtxM59crkOOJGRBgHQ=="; + }; + }; "@eslint/eslintrc-0.4.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; @@ -3910,13 +3955,13 @@ let sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg=="; }; }; - "@graphql-tools/batch-execute-8.4.4" = { + "@graphql-tools/batch-execute-8.4.5" = { name = "_at_graphql-tools_slash_batch-execute"; packageName = "@graphql-tools/batch-execute"; - version = "8.4.4"; + version = "8.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.4.4.tgz"; - sha512 = "5B3srfrNh7qqaH4FWysiZXPDVD7snwM+qsW3Bkq8M0iRAZVUb3P9o23xJbBwS32g678TuCjKy113K0PSqHyeCw=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.4.5.tgz"; + sha512 = "wx2bK3EZ5XSF/jXCQyx/IAucHxCbcQpNNE3wlIxrymZkGSVnwdz0xBfefsn17smImNXGaXgQ+pE7gPDCKmeGrw=="; }; }; "@graphql-tools/delegate-7.1.5" = { @@ -3928,13 +3973,13 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-8.7.4" = { + "@graphql-tools/delegate-8.7.6" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "8.7.4"; + version = "8.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.4.tgz"; - sha512 = "OXdIHRqqUDFvBebSZ/MQAvQOJ1Kvl7gjD78ClG4bPts6qDfFHwzlX0V8QESFCo8H67VDRzB4nnqlDyOIzjVNlQ=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.6.tgz"; + sha512 = "x/dJzgocSANk4Tw6kaASn2aSTJpYvQoLsOSH2fVgnjiaDJkidwctbb5rpbEs6n+WjNB2gW/ldyHTdEbNREJjsw=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -3946,22 +3991,22 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/graphql-file-loader-7.3.9" = { + "@graphql-tools/graphql-file-loader-7.3.10" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "7.3.9"; + version = "7.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.9.tgz"; - sha512 = "jCc4X6+PFVQlhpd+bvHxfldteYrzWvoYDNy+dzPgw3O/NYtjJ/B1wH6X2L4wXI+CDlKEdUKSEe+Dk6j9gmaItw=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.10.tgz"; + sha512 = "IkhBU3ho+LL9hKSwiBX/of0zIkq/T1Z3Cd8v2COZAsq1qfg07s1xJUA+gZYZPkxcaa12ThUxyNGf5SuF6T7uZA=="; }; }; - "@graphql-tools/import-6.6.11" = { + "@graphql-tools/import-6.6.12" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.6.11"; + version = "6.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.11.tgz"; - sha512 = "lKIRTsDxqdzrJtEOnqW4pr73/QRbGhyc37xewz4EvCYoUk6FEwqilEZIrkChmdQFjOV9BnwxFCp8KaS0P+qU4A=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.12.tgz"; + sha512 = "M0detzy3ihJGJbo7MZ6j02198o2nBhiY2MpnWEMRtUMgmZgz5ZTctK3lIxMsd+6LU96m+mc1i2MNIruTHQ6czw=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -3973,13 +4018,13 @@ let sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA=="; }; }; - "@graphql-tools/json-file-loader-7.3.9" = { + "@graphql-tools/json-file-loader-7.3.10" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "7.3.9"; + version = "7.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.9.tgz"; - sha512 = "yLX5ADmT4m8hZvgsh9zjvcfS0ijrh3C/TNroRt81thN2nFMYmglRbxmOZgHXnT5DnL8v/BiqmlVpiq4cWEeJcw=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.10.tgz"; + sha512 = "wLWv0NWRJm3YG1uKkGU4dFTiw8vy6iLxsSCW6ud8f87AfEIG07vS6w2598c1kB1UlTAGqWQYG3HyJ65cjFripA=="; }; }; "@graphql-tools/load-6.2.4" = { @@ -3991,13 +4036,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.5.8" = { + "@graphql-tools/load-7.5.9" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.5.8"; + version = "7.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.8.tgz"; - sha512 = "+kQ7aT9GEuBmiGQlGsFU5f2e1A0hMbwCePzHYOvHR5BF8soJeToWZLiIC2hJf6z06aco+LC9x/os+6p9U9+7iQ=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.9.tgz"; + sha512 = "khm1v76ZZseptpweCQ1SIUWi8Y17VCWKTFmKNGkaCDtFEOrwPH6B8u+/J3xS5J+ltQc9FoomMpn6ZELUOqq1dg=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -4009,13 +4054,13 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-8.2.8" = { + "@graphql-tools/merge-8.2.9" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.2.8"; + version = "8.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.8.tgz"; - sha512 = "e4kpzgEIlA0sC0NjJlMwUL73Iz/HoP2OgAUReDDsupvWCqW3PMxjNoviS8xmcklVnv1w8Vmr8U2tao+x40ypLA=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.9.tgz"; + sha512 = "mHRrqMc1NTL6MALBQK1DmAzSxJIKoaCaW7ZCk5bRGzVj/MNQz3OsqlDb/+t9/ONT0V+WI/uxBFsrLMwa4p6L7A=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -4027,13 +4072,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.3.8" = { + "@graphql-tools/schema-8.3.9" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.3.8"; + version = "8.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.8.tgz"; - sha512 = "Bba60ali4fLOKJz/Kk39RcBrDUBtu0Wy7pjpIOmFIKQKwUBNNB0eAmfpvrjnFhRAVdO2kOkPpc8DQY+SCG+lWw=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.9.tgz"; + sha512 = "9YFCzn0sYAGTWhZrVYY/neK5cie3s0dNm7Qq38tkhOh2ME5BtHW/8ZIq+UrLGKsBYwa+Qjb/UojGWUm2yG/z6Q=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -4045,13 +4090,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.9.11" = { + "@graphql-tools/url-loader-7.9.13" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.9.11"; + version = "7.9.13"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.11.tgz"; - sha512 = "janH0mhUxIsttEFwjtFIDAsfQwf1A2f9qKrvBIljF1Gcr/IWVH2DB7HfaQ5jIQrxaKv2wD3VHuU+/vMz+hpyOw=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.13.tgz"; + sha512 = "AeLCLhUyXt2Owt624v0/xjGBvBrYJLWhdNm5LJLcWrMxRoEq16B+E5/JOq3aXruDAaq3VmINjnRMM1As+FphSg=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -4081,13 +4126,13 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; - "@graphql-tools/utils-8.6.7" = { + "@graphql-tools/utils-8.6.8" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.6.7"; + version = "8.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.7.tgz"; - sha512 = "Qi3EN95Rt3hb8CyDKpPKFWOPrnc00P18cpVTXEgtKxetSP39beJBeEEtLB0R53eP/6IolsyTZOTgkET1EaERaw=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.8.tgz"; + sha512 = "EdUUeKi/wp/UvuknyINpQ/uXDqTM3qxPPPDIq5RpfW0zQOeCvbZcx8xHoMox0TYKvKtg3zoB7aprUtoW+iZLxw=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -4099,13 +4144,49 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-8.4.13" = { + "@graphql-tools/wrap-8.4.15" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "8.4.13"; + version = "8.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.13.tgz"; - sha512 = "q0Fa0CVgcaqm4FI4GXAVLjz8TQaF6lpFOm/rlgEkMzW9wFY/ZvDs+K3fVh9BgNvpudJArnVzAZgl2+FHNdY9CA=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.15.tgz"; + sha512 = "O3a3IP2yDWqR+B+WtAodiLx166ylGWLuM86upQfZGyJgjhIGqVAEqKIZbE/FyvHUpSiuVpcKwDgwtfCV/s1qNQ=="; + }; + }; + "@graphql-typed-document-node/core-3.1.1" = { + name = "_at_graphql-typed-document-node_slash_core"; + packageName = "@graphql-typed-document-node/core"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.1.1.tgz"; + sha512 = "NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg=="; + }; + }; + "@graphql-yoga/common-2.3.0" = { + name = "_at_graphql-yoga_slash_common"; + packageName = "@graphql-yoga/common"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-yoga/common/-/common-2.3.0.tgz"; + sha512 = "EPKK97953c8E1FiaLHMMGqLKtoAN5H9qHr0AiAzMlruJHn0JcbMf2qFTUXklCsuk6UEwNtxeHX42zim11O/E1g=="; + }; + }; + "@graphql-yoga/node-2.3.0" = { + name = "_at_graphql-yoga_slash_node"; + packageName = "@graphql-yoga/node"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-yoga/node/-/node-2.3.0.tgz"; + sha512 = "uofEmKIDYthJuCcdhbgU0VW5i2cCqZVKIiEW/xbwvCOBJt439k46D+M6youiQYJ1miaA/m0btbuZ1sAo/TLjdQ=="; + }; + }; + "@graphql-yoga/subscription-2.0.0" = { + name = "_at_graphql-yoga_slash_subscription"; + packageName = "@graphql-yoga/subscription"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-yoga/subscription/-/subscription-2.0.0.tgz"; + sha512 = "HlG+gIddjIP3/BDrMZymdzmzDjNdYuSGMxx6+1JA83gAEVRDR4yOoT4QeNKYqRhLK9xca/Hxp1PfBpquSa244Q=="; }; }; "@grpc/grpc-js-1.5.10" = { @@ -4144,6 +4225,15 @@ let sha512 = "9+89Ne1K8F9u86T+l1yIV2DS+dWHYVK61SsDZN4MFTFehOOaJ4rHxa1cW8Lwdn2/6tOx7N3+SY/vfcjztOHopA=="; }; }; + "@grpc/grpc-js-1.6.4" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.6.4.tgz"; + sha512 = "Jqq8t3ylPLPK4XXnYPj2uuESirRCAaQ0//GxRLPK6Xq2TBHb2DlmSzJUh15a6R4uUIjBwA8wI69JuKleZXz4jQ=="; + }; + }; "@grpc/proto-loader-0.6.9" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -7771,6 +7861,15 @@ let sha512 = "feQEZlyBvQsbT/fvpJ4jJ5OLGaUPpnskHYDsY8DGpPymN+HUeDQrqkBEbbKRwMKidFTI2cxk2kJNNTnvdS9jyw=="; }; }; + "@repeaterjs/repeater-3.0.4" = { + name = "_at_repeaterjs_slash_repeater"; + packageName = "@repeaterjs/repeater"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@repeaterjs/repeater/-/repeater-3.0.4.tgz"; + sha512 = "AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA=="; + }; + }; "@request/api-0.6.0" = { name = "_at_request_slash_api"; packageName = "@request/api"; @@ -10021,13 +10120,13 @@ let sha512 = "XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ=="; }; }; - "@types/webpack-env-1.16.3" = { + "@types/webpack-env-1.16.4" = { name = "_at_types_slash_webpack-env"; packageName = "@types/webpack-env"; - version = "1.16.3"; + version = "1.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.3.tgz"; - sha512 = "9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw=="; + url = "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.4.tgz"; + sha512 = "llS8qveOUX3wxHnSykP5hlYFFuMfJ9p5JvIyCiBgp7WTfl6K5ZcyHj8r8JsN/J6QODkAsRRCLIcTuOCu8etkUw=="; }; }; "@types/webpack-sources-3.2.0" = { @@ -10048,15 +10147,6 @@ let sha512 = "B5m9aq7cbbD/5/jThEr33nUY8WEfVi6A2YKCTOvw5Ldy7mtsOkqRvGjnzy6g7iMMDsgu7xREuCzqATLDLQVKcQ=="; }; }; - "@types/websocket-1.0.5" = { - name = "_at_types_slash_websocket"; - packageName = "@types/websocket"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.5.tgz"; - sha512 = "NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ=="; - }; - }; "@types/whatwg-url-8.2.1" = { name = "_at_types_slash_whatwg-url"; packageName = "@types/whatwg-url"; @@ -12955,6 +13045,15 @@ let sha512 = "iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg=="; }; }; + "archiver-5.3.1" = { + name = "archiver"; + packageName = "archiver"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz"; + sha512 = "8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w=="; + }; + }; "archiver-utils-2.1.0" = { name = "archiver-utils"; packageName = "archiver-utils"; @@ -14305,6 +14404,15 @@ let sha512 = "WuMPBkE2b0hGRcF4oYw9zhjG0PC20lFKHT5FS8PXgZgu4GK8adQ8oIK0wBYPjq3F6b+VNdhDWSy3R7a6K+ENOQ=="; }; }; + "aws-sdk-2.1116.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.1116.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1116.0.tgz"; + sha512 = "36JFrxPPh/fRQWsgGrZZbzTxRu7dq4KyCKKXPxgVMXylEJsG/KEAVMB1f3eq4PiI5eGxYrpt2OkKoMQZQZLjPA=="; + }; + }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -23577,15 +23685,6 @@ let sha512 = "eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w=="; }; }; - "date-format-4.0.6" = { - name = "date-format"; - packageName = "date-format"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/date-format/-/date-format-4.0.6.tgz"; - sha512 = "B9vvg5rHuQ8cbUXE/RMWMyX2YA5TecT3jKF5fLtGNlzPlU7zblSPmAm2OImDbWL+LDOQ6pUm+4LOFz+ywS41Zw=="; - }; - }; "date-format-4.0.7" = { name = "date-format"; packageName = "date-format"; @@ -24945,13 +25044,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.4.16" = { + "diff2html-3.4.17" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.16"; + version = "3.4.17"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.16.tgz"; - sha512 = "KfkvEoZTJertjoGPYFLn8n0yRdvzJcHvFJpJwbIxUlHU9x6qqhRZEM+TlgtU09jdLqRZAQyWFoxPiP6HeT2IYA=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.17.tgz"; + sha512 = "B/H+iLRHTsRl2Ffs/7tYJ0Rg4uisXe83inIdNE8trXY83Wn7OCTslJNP7fyaUpSsLbRIzPSNgT7LqFNiIQlDyg=="; }; }; "diff3-0.0.3" = { @@ -26034,24 +26133,6 @@ let sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw=="; }; }; - "electron-to-chromium-1.4.108" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.4.108"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.108.tgz"; - sha512 = "/36KkMuL6+WTrodVlOjtHhH9Ro7BgRaQrh0bfKckwDtdRSjTBuZCOddeXxzK1PkwphoeTxGUFVT9xnmvQ7xEdw=="; - }; - }; - "electron-to-chromium-1.4.109" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.4.109"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.109.tgz"; - sha512 = "LCF+Oqs2Oqwf8M3oc8T59Wi9C0xpL1qVyqIR6bPTCl8uPvln7G184L39tO4SE4Dyg/Kp1RjAz//BKMvi0uvw4w=="; - }; - }; "electron-to-chromium-1.4.110" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; @@ -29015,6 +29096,15 @@ let sha512 = "5rOQWkBVz3FnYWTi/ELZmq4CoK1Pb+xKNZWuJRsOwo0+8DrP43CrWJtyLVvb5U7z7ggE5llahfDbLjaVNzXVJQ=="; }; }; + "fecha-4.2.3" = { + name = "fecha"; + packageName = "fecha"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz"; + sha512 = "OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="; + }; + }; "fetch-blob-3.1.5" = { name = "fetch-blob"; packageName = "fetch-blob"; @@ -32058,6 +32148,15 @@ let sha512 = "mxP1gmk5Bg72biHUgH7RYAQAjqX16/e5npGYPeBScspNYdwxqK87PDkZADy3p26dlOnbZN3G7tP06xzASKb7/g=="; }; }; + "goldengate-11.2.1" = { + name = "goldengate"; + packageName = "goldengate"; + version = "11.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/goldengate/-/goldengate-11.2.1.tgz"; + sha512 = "v0REhYrm8fUJMvDAGzYhymB3R9BqTEulUcD740zNEsH2umNc9Jv+RI4sXGygIXUtUi9FSlBrO4udVerBoRMBLQ=="; + }; + }; "gonzales-pe-4.3.0" = { name = "gonzales-pe"; packageName = "gonzales-pe"; @@ -32481,15 +32580,6 @@ let sha512 = "Wci5MbrQj+6d7rfvbORrA9uDlfMysBWYaG49ST5TKylNaXYFf3ixFOa74iM1KtM9eidosUbI3E1JlWi0JaidJA=="; }; }; - "graphql-sse-1.2.0" = { - name = "graphql-sse"; - packageName = "graphql-sse"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-sse/-/graphql-sse-1.2.0.tgz"; - sha512 = "W6XLGLqmwSDUzyUF8dcEPwNmhYe8g90P+wWETZ+6cmk/2kS3zJ1SXgeglWQ2tFKC/FXrc68hTHdHdmLjetJn+Q=="; - }; - }; "graphql-subscriptions-1.2.1" = { name = "graphql-subscriptions"; packageName = "graphql-subscriptions"; @@ -42283,15 +42373,6 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; - "log4js-6.4.4" = { - name = "log4js"; - packageName = "log4js"; - version = "6.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-6.4.4.tgz"; - sha512 = "ncaWPsuw9Vl1CKA406hVnJLGQKy1OHx6buk8J4rE2lVW+NW5Y82G5/DIloO7NkqLOUtNPEANaWC1kZYVjXssPw=="; - }; - }; "log4js-6.4.5" = { name = "log4js"; packageName = "log4js"; @@ -63618,15 +63699,6 @@ let sha512 = "OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ=="; }; }; - "streamroller-3.0.6" = { - name = "streamroller"; - packageName = "streamroller"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-3.0.6.tgz"; - sha512 = "Qz32plKq/MZywYyhEatxyYc8vs994Gz0Hu2MSYXXLD233UyPeIeRBZARIIGwFer4Mdb8r3Y2UqKkgyDghM6QCg=="; - }; - }; "streamroller-3.0.7" = { name = "streamroller"; packageName = "streamroller"; @@ -64464,15 +64536,6 @@ let sha512 = "cVqd/URpp7si1HWu5YqQ3vqQkjuolAwHypY1B4itPlS71/lsf6TQPZ2Y0ijT22EYVkvH5ove9JFJf4u7VGPuZw=="; }; }; - "subscriptions-transport-ws-0.11.0" = { - name = "subscriptions-transport-ws"; - packageName = "subscriptions-transport-ws"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.11.0.tgz"; - sha512 = "8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ=="; - }; - }; "subscriptions-transport-ws-0.9.18" = { name = "subscriptions-transport-ws"; packageName = "subscriptions-transport-ws"; @@ -66166,6 +66229,15 @@ let sha512 = "pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw=="; }; }; + "tiny-lru-7.0.6" = { + name = "tiny-lru"; + packageName = "tiny-lru"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-lru/-/tiny-lru-7.0.6.tgz"; + sha512 = "zNYO0Kvgn5rXzWpL0y3RS09sMK67eGaQj9805jlK9G6pSadfriTczzLHFXa/xcW4mIRfmlB9HyQ/+SgL0V1uow=="; + }; + }; "tiny-queue-0.2.1" = { name = "tiny-queue"; packageName = "tiny-queue"; @@ -73845,15 +73917,6 @@ let sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; }; - "yaml-2.0.0" = { - name = "yaml"; - packageName = "yaml"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-2.0.0.tgz"; - sha512 = "JbfdlHKGP2Ik9IHylzWlGd4pPK++EU46/IxMykphS2ZKw7a7h+dHNmcXObLgpRDriBY+rpWslldikckX8oruWQ=="; - }; - }; "yaml-2.0.0-10" = { name = "yaml"; packageName = "yaml"; @@ -73872,6 +73935,15 @@ let sha512 = "5kGSQrzDyjCk0BLuFfjkoUE9vYcoyrwZIZ+GnpOSM9vhkvPjItYiWJ1jpRSo0aU4QmsoNrFwDT4O7XS2UGcBQg=="; }; }; + "yaml-2.0.1" = { + name = "yaml"; + packageName = "yaml"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml/-/yaml-2.0.1.tgz"; + sha512 = "1NpAYQ3wjzIlMs0mgdBmYzLkFgWBIWrzYVDYfrixhoFNNgJ444/jT2kUT2sicRbJES3oQYRZugjB6Ro8SjKeFg=="; + }; + }; "yaml-ast-parser-0.0.43" = { name = "yaml-ast-parser"; packageName = "yaml-ast-parser"; @@ -77485,7 +77557,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.108" + sources."electron-to-chromium-1.4.110" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.9.3" @@ -78595,7 +78667,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.108" + sources."electron-to-chromium-1.4.110" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -80052,7 +80124,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -80429,7 +80501,7 @@ in dependencies = [ sources."browserslist-4.20.2" sources."caniuse-lite-1.0.30001332" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."node-releases-2.0.3" @@ -81083,10 +81155,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "12.0.2"; + version = "12.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-12.0.2.tgz"; - sha512 = "YzXz0nkJwtYAeRiO6Q/17AR7v4Q9IGKGYybC2fhdtMw07tlf9fdSvfumxsfhnSYKHoasEznj9RghaSyrFchQyg=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-12.1.0.tgz"; + sha512 = "Kj7bXqIw9oe3zvDKSyfkqRG+5rVMUU91QEYBCf1EybHwGOyKZi3QO7rdf4M5QMM/D1wHsxyWE5h6J6mCoDitdw=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.4" // { @@ -81113,7 +81185,7 @@ in sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@grammyjs/types-2.6.0" - sources."@grpc/grpc-js-1.6.1" + sources."@grpc/grpc-js-1.6.4" sources."@grpc/proto-loader-0.6.9" sources."@handsontable/formulajs-2.0.2" sources."@mitmaro/errors-1.0.0" @@ -81143,7 +81215,7 @@ in sources."@types/request-2.48.8" sources."@types/serve-static-1.13.10" sources."@types/tough-cookie-4.0.2" - sources."@types/ws-8.5.3" + sources."@types/ws-8.5.2" sources."abort-controller-3.0.0" sources."accepts-1.3.8" (sources."agent-base-6.0.2" // { @@ -81318,17 +81390,7 @@ in sources."ini-2.0.0" ]; }) - (sources."goldengate-11.1.1" // { - dependencies = [ - sources."bolt07-1.8.0" - (sources."invoices-2.0.4" // { - dependencies = [ - sources."tiny-secp256k1-2.2.0" - ]; - }) - sources."ln-service-53.10.0" - ]; - }) + sources."goldengate-11.2.1" sources."got-9.6.0" sources."graceful-fs-4.2.10" (sources."grammy-1.7.3" // { @@ -81378,12 +81440,13 @@ in sources."restore-cursor-3.1.0" sources."supports-color-7.2.0" sources."tmp-0.0.33" - sources."type-fest-0.21.3" ]; }) - (sources."invoices-2.0.5" // { + (sources."invoices-2.0.4" // { dependencies = [ - sources."bolt09-0.2.2" + sources."bolt07-1.8.0" + sources."tiny-secp256k1-2.2.0" + sources."uint8array-tools-0.0.6" ]; }) sources."ip-1.1.5" @@ -81419,33 +81482,29 @@ in sources."kind-of-6.0.3" sources."kuler-2.0.0" sources."latest-version-5.1.0" - (sources."lightning-5.9.0" // { + (sources."lightning-5.8.2" // { dependencies = [ - sources."@types/node-17.0.23" + sources."@grpc/grpc-js-1.5.7" + sources."@types/node-17.0.21" sources."asyncjs-util-1.2.8" sources."body-parser-1.19.2" sources."bolt07-1.8.0" sources."bolt09-0.2.2" sources."depd-1.1.2" sources."http-errors-1.8.1" - (sources."invoices-2.0.4" // { - dependencies = [ - sources."bolt09-0.2.1" - sources."tiny-secp256k1-2.2.0" - ]; - }) sources."on-finished-2.3.0" sources."psbt-2.0.0" sources."qs-6.9.7" sources."raw-body-2.4.3" sources."statuses-1.5.0" + sources."type-fest-2.12.0" ]; }) (sources."ln-accounting-5.0.6" // { dependencies = [ sources."@grpc/grpc-js-1.5.7" - sources."@types/node-17.0.21" - sources."@types/ws-8.5.2" + sources."@types/node-17.0.23" + sources."@types/ws-8.5.3" sources."body-parser-1.19.2" sources."bolt07-1.8.0" sources."bolt09-0.2.2" @@ -81457,53 +81516,51 @@ in ]; }) sources."http-errors-1.8.1" - sources."invoices-2.0.4" - (sources."lightning-5.8.2" // { - dependencies = [ - sources."asyncjs-util-1.2.8" - sources."tiny-secp256k1-2.2.1" - ]; - }) (sources."ln-service-53.10.0" // { dependencies = [ sources."@grpc/grpc-js-1.6.1" - sources."@types/node-17.0.23" - sources."@types/ws-8.5.3" sources."asyncjs-util-1.2.8" sources."lightning-5.9.0" - sources."tiny-secp256k1-2.2.1" - sources."type-fest-2.12.2" ]; }) sources."on-finished-2.3.0" - (sources."p2tr-1.3.0" // { - dependencies = [ - sources."tiny-secp256k1-2.2.1" - ]; - }) + sources."p2tr-1.3.0" sources."psbt-2.0.0" sources."qs-6.9.7" sources."raw-body-2.4.3" sources."statuses-1.5.0" - sources."tiny-secp256k1-2.2.0" - sources."type-fest-2.12.0" - sources."uint8array-tools-0.0.7" + sources."type-fest-2.12.2" ]; }) (sources."ln-service-53.11.0" // { dependencies = [ sources."@grpc/grpc-js-1.6.2" sources."@types/node-17.0.23" - sources."bolt09-0.2.3" - sources."lightning-5.10.1" + sources."@types/ws-8.5.3" + sources."bolt09-0.2.2" + sources."invoices-2.0.5" + (sources."lightning-5.10.1" // { + dependencies = [ + sources."bolt09-0.2.3" + ]; + }) + sources."type-fest-2.12.2" ]; }) (sources."ln-sync-3.12.0" // { dependencies = [ - (sources."invoices-2.0.4" // { + sources."@grpc/grpc-js-1.6.1" + sources."@types/node-17.0.23" + sources."@types/ws-8.5.3" + sources."body-parser-1.19.2" + sources."bolt09-0.2.2" + sources."depd-1.1.2" + sources."http-errors-1.8.1" + (sources."lightning-5.9.0" // { dependencies = [ + sources."asyncjs-util-1.2.8" sources."bolt07-1.8.0" - sources."tiny-secp256k1-2.2.0" + sources."psbt-2.0.0" ]; }) (sources."ln-service-53.10.0" // { @@ -81511,11 +81568,18 @@ in sources."bolt07-1.8.0" ]; }) + sources."on-finished-2.3.0" + sources."qs-6.9.7" + sources."raw-body-2.4.3" + sources."statuses-1.5.0" + sources."type-fest-2.12.2" ]; }) (sources."ln-telegram-3.21.1" // { dependencies = [ + sources."@grpc/grpc-js-1.6.1" sources."@types/node-17.0.23" + sources."@types/ws-8.5.3" (sources."body-parser-1.19.2" // { dependencies = [ sources."debug-2.6.9" @@ -81526,21 +81590,20 @@ in sources."bolt09-0.2.2" sources."debug-4.3.4" sources."depd-1.1.2" + sources."goldengate-11.1.1" sources."grammy-1.7.1" sources."http-errors-1.8.1" - sources."invoices-2.0.4" - (sources."lightning-5.8.6" // { + (sources."lightning-5.9.0" // { dependencies = [ sources."asyncjs-util-1.2.8" - sources."tiny-secp256k1-2.2.1" ]; }) sources."ln-service-53.10.0" (sources."ln-sync-3.11.1" // { dependencies = [ sources."asyncjs-util-1.2.8" + sources."lightning-5.8.6" sources."ln-service-53.9.4" - sources."tiny-secp256k1-2.2.1" ]; }) sources."ms-2.1.2" @@ -81549,8 +81612,7 @@ in sources."qs-6.9.7" sources."raw-body-2.4.3" sources."statuses-1.5.0" - sources."tiny-secp256k1-2.2.0" - sources."uint8array-tools-0.0.7" + sources."type-fest-2.12.2" ]; }) sources."lodash-4.17.21" @@ -81643,9 +81705,9 @@ in (sources."paid-services-3.14.5" // { dependencies = [ sources."@alexbosworth/fiat-1.0.1" - sources."@grpc/grpc-js-1.5.7" + sources."@grpc/grpc-js-1.6.1" sources."@types/node-17.0.23" - sources."@types/ws-8.5.2" + sources."@types/ws-8.5.3" sources."asyncjs-util-1.2.8" sources."body-parser-1.19.2" sources."bolt01-1.2.3" @@ -81653,18 +81715,16 @@ in sources."bolt09-0.2.2" sources."depd-1.1.2" sources."http-errors-1.8.1" - (sources."invoices-2.0.4" // { - dependencies = [ - sources."tiny-secp256k1-2.2.0" - ]; - }) sources."lightning-5.8.6" sources."ln-service-53.9.4" (sources."ln-sync-3.11.0" // { dependencies = [ + sources."@grpc/grpc-js-1.5.7" sources."@types/node-17.0.21" + sources."@types/ws-8.5.2" sources."lightning-5.8.2" sources."ln-service-53.9.3" + sources."type-fest-2.12.0" ]; }) sources."on-finished-2.3.0" @@ -81672,7 +81732,7 @@ in sources."qs-6.9.7" sources."raw-body-2.4.3" sources."statuses-1.5.0" - sources."type-fest-2.12.0" + sources."type-fest-2.12.2" ]; }) sources."parseurl-1.3.3" @@ -81773,11 +81833,7 @@ in sources."text-hex-1.0.0" sources."through-2.3.8" sources."tiny-emitter-2.1.0" - (sources."tiny-secp256k1-2.2.1" // { - dependencies = [ - sources."uint8array-tools-0.0.7" - ]; - }) + sources."tiny-secp256k1-2.2.1" sources."tmp-0.0.29" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.1" @@ -81787,12 +81843,12 @@ in sources."tslib-2.3.1" sources."tweetnacl-1.0.3" sources."tweetnacl-util-0.15.1" - sources."type-fest-2.12.2" + sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typeforce-1.18.0" - sources."uint8array-tools-0.0.6" + sources."uint8array-tools-0.0.7" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-5.1.0" // { @@ -84311,7 +84367,7 @@ in sources."colors-1.4.0" sources."commonmark-0.30.0" sources."constructs-3.3.268" - sources."date-format-4.0.6" + sources."date-format-4.0.7" sources."debug-4.3.4" sources."decamelize-5.0.1" sources."deep-equal-2.0.5" @@ -84410,7 +84466,7 @@ in sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" - sources."log4js-6.4.4" + sources."log4js-6.4.5" sources."lower-case-2.0.2" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" @@ -84451,7 +84507,7 @@ in sources."sort-json-2.0.1" sources."spdx-license-list-6.5.0" sources."sscaff-1.2.258" - (sources."streamroller-3.0.6" // { + (sources."streamroller-3.0.7" // { dependencies = [ sources."fs-extra-10.0.1" ]; @@ -84562,7 +84618,7 @@ in sources."commonmark-0.30.0" sources."concat-map-0.0.1" sources."constructs-10.0.115" - sources."date-format-4.0.6" + sources."date-format-4.0.7" sources."debug-4.3.4" sources."decamelize-1.2.0" sources."deep-equal-2.0.5" @@ -84718,7 +84774,7 @@ in sources."jsonschema-1.4.0" sources."locate-path-5.0.0" sources."lodash.isequal-4.5.0" - sources."log4js-6.4.4" + sources."log4js-6.4.5" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" sources."merge2-1.4.1" @@ -84770,7 +84826,7 @@ in sources."sort-json-2.0.1" sources."source-map-0.5.7" sources."spdx-license-list-6.5.0" - (sources."streamroller-3.0.6" // { + (sources."streamroller-3.0.7" // { dependencies = [ sources."fs-extra-10.0.1" sources."jsonfile-6.1.0" @@ -85250,6 +85306,23 @@ in bypassCache = true; reconstructLock = true; }; + coc-flutter = nodeEnv.buildNodePackage { + name = "coc-flutter"; + packageName = "coc-flutter"; + version = "1.9.7"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-flutter/-/coc-flutter-1.9.7.tgz"; + sha512 = "12tXdF76vIOKhswubUNsd69jva2QxVStJuKSL8Ul7qH664MH3Pk1H6h26V+xu+vAeJKLZYp27MFZQmlpnd82IQ=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "flutter support for (Neo)vim"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; @@ -85474,7 +85547,7 @@ in sources."which-1.3.1" ]; }) - sources."date-format-4.0.6" + sources."date-format-4.0.7" sources."debounce-1.2.1" sources."debug-4.3.4" sources."deep-extend-0.6.0" @@ -85544,7 +85617,7 @@ in ]; }) sources."lodash-4.17.21" - sources."log4js-6.4.4" + sources."log4js-6.4.5" sources."lru-cache-6.0.0" sources."metals-languageclient-0.4.2" sources."minimatch-3.1.2" @@ -85594,7 +85667,7 @@ in sources."shell-quote-1.7.3" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."streamroller-3.0.6" + sources."streamroller-3.0.7" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" (sources."string_decoder-1.1.1" // { @@ -85934,7 +86007,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -89175,7 +89248,7 @@ in sources."@babel/template-7.16.7" sources."@babel/traverse-7.17.9" sources."@babel/types-7.17.0" - sources."@blueprintjs/colors-4.0.5" + sources."@blueprintjs/colors-4.1.0" sources."@blueprintjs/core-3.54.0" sources."@blueprintjs/icons-3.33.0" sources."@deltachat/message_parser_wasm-0.3.0" @@ -89331,7 +89404,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-14.2.9" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -90759,7 +90832,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -92681,7 +92754,7 @@ in ]; }) sources."@types/webpack-dev-server-3.11.6" - sources."@types/webpack-env-1.16.3" + sources."@types/webpack-env-1.16.4" (sources."@types/webpack-sources-3.2.0" // { dependencies = [ sources."source-map-0.7.3" @@ -93215,7 +93288,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -95420,7 +95493,7 @@ in sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -97062,7 +97135,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.969999" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -99694,7 +99767,7 @@ in sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -101186,9 +101259,9 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.6.11" // { + (sources."@graphql-tools/import-6.6.12" // { dependencies = [ - sources."@graphql-tools/utils-8.6.7" + sources."@graphql-tools/utils-8.6.8" sources."tslib-2.3.1" ]; }) @@ -101213,10 +101286,10 @@ in sources."tslib-2.3.1" ]; }) - (sources."@graphql-tools/schema-8.3.8" // { + (sources."@graphql-tools/schema-8.3.9" // { dependencies = [ - sources."@graphql-tools/merge-8.2.8" - sources."@graphql-tools/utils-8.6.7" + sources."@graphql-tools/merge-8.2.9" + sources."@graphql-tools/utils-8.6.8" sources."tslib-2.3.1" ]; }) @@ -101739,26 +101812,30 @@ in }) sources."@cronvel/get-pixels-3.4.0" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" - sources."@graphql-tools/batch-execute-8.4.4" - sources."@graphql-tools/delegate-8.7.4" - sources."@graphql-tools/graphql-file-loader-7.3.9" - sources."@graphql-tools/import-6.6.11" - sources."@graphql-tools/json-file-loader-7.3.9" - sources."@graphql-tools/load-7.5.8" - sources."@graphql-tools/merge-8.2.8" - sources."@graphql-tools/schema-8.3.8" - (sources."@graphql-tools/url-loader-7.9.11" // { + sources."@envelop/core-2.3.1" + sources."@envelop/disable-introspection-3.3.1" + sources."@envelop/parser-cache-4.3.1" + sources."@envelop/types-2.2.0" + sources."@envelop/validation-cache-4.3.1" + sources."@graphql-tools/batch-execute-8.4.5" + sources."@graphql-tools/delegate-8.7.6" + sources."@graphql-tools/graphql-file-loader-7.3.10" + sources."@graphql-tools/import-6.6.12" + sources."@graphql-tools/json-file-loader-7.3.10" + sources."@graphql-tools/load-7.5.9" + sources."@graphql-tools/merge-8.2.9" + sources."@graphql-tools/schema-8.3.9" + (sources."@graphql-tools/url-loader-7.9.13" // { dependencies = [ - (sources."subscriptions-transport-ws-0.11.0" // { - dependencies = [ - sources."ws-7.5.7" - ]; - }) sources."ws-8.5.0" ]; }) - sources."@graphql-tools/utils-8.6.7" - sources."@graphql-tools/wrap-8.4.13" + sources."@graphql-tools/utils-8.6.8" + sources."@graphql-tools/wrap-8.4.15" + sources."@graphql-typed-document-node/core-3.1.1" + sources."@graphql-yoga/common-2.3.0" + sources."@graphql-yoga/node-2.3.0" + sources."@graphql-yoga/subscription-2.0.0" sources."@iarna/toml-2.2.5" sources."@n1ru4l/graphql-live-query-0.9.0" sources."@nodelib/fs.scandir-2.1.5" @@ -101793,10 +101870,10 @@ in ]; }) sources."@oclif/screen-1.0.4" + sources."@repeaterjs/repeater-3.0.4" sources."@types/json-schema-7.0.9" sources."@types/node-17.0.24" sources."@types/parse-json-4.0.0" - sources."@types/websocket-1.0.5" sources."@types/ws-8.5.3" sources."abort-controller-3.0.0" sources."accepts-1.3.8" @@ -101920,7 +101997,6 @@ in sources."graphql-language-service-parser-1.10.4" sources."graphql-language-service-types-1.8.7" sources."graphql-language-service-utils-2.5.1" - sources."graphql-sse-1.2.0" sources."graphql-ws-5.7.0" sources."has-flag-4.0.0" sources."http-errors-1.6.3" @@ -102053,6 +102129,7 @@ in sources."symbol-observable-1.2.0" sources."sync-fetch-0.3.1" sources."terminal-kit-1.49.4" + sources."tiny-lru-7.0.6" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tree-kit-0.7.4" @@ -103585,7 +103662,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.4" sources."asynckit-0.4.0" - sources."aws-sdk-2.1115.0" + sources."aws-sdk-2.1116.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -105054,22 +105131,22 @@ in sources."@aws-sdk/abort-controller-3.55.0" sources."@aws-sdk/chunked-blob-reader-3.55.0" sources."@aws-sdk/chunked-blob-reader-native-3.58.0" - sources."@aws-sdk/client-s3-3.67.0" - sources."@aws-sdk/client-sso-3.67.0" - sources."@aws-sdk/client-sts-3.67.0" + sources."@aws-sdk/client-s3-3.72.0" + sources."@aws-sdk/client-sso-3.72.0" + sources."@aws-sdk/client-sts-3.72.0" sources."@aws-sdk/config-resolver-3.58.0" sources."@aws-sdk/credential-provider-env-3.55.0" sources."@aws-sdk/credential-provider-imds-3.58.0" - sources."@aws-sdk/credential-provider-ini-3.67.0" - sources."@aws-sdk/credential-provider-node-3.67.0" + sources."@aws-sdk/credential-provider-ini-3.72.0" + sources."@aws-sdk/credential-provider-node-3.72.0" sources."@aws-sdk/credential-provider-process-3.58.0" - sources."@aws-sdk/credential-provider-sso-3.67.0" + sources."@aws-sdk/credential-provider-sso-3.72.0" sources."@aws-sdk/credential-provider-web-identity-3.55.0" sources."@aws-sdk/eventstream-marshaller-3.58.0" - sources."@aws-sdk/eventstream-serde-browser-3.58.0" + sources."@aws-sdk/eventstream-serde-browser-3.72.0" sources."@aws-sdk/eventstream-serde-config-resolver-3.55.0" - sources."@aws-sdk/eventstream-serde-node-3.58.0" - sources."@aws-sdk/eventstream-serde-universal-3.58.0" + sources."@aws-sdk/eventstream-serde-node-3.72.0" + sources."@aws-sdk/eventstream-serde-universal-3.72.0" sources."@aws-sdk/fetch-http-handler-3.58.0" sources."@aws-sdk/hash-blob-browser-3.58.0" sources."@aws-sdk/hash-node-3.55.0" @@ -105080,7 +105157,7 @@ in sources."@aws-sdk/middleware-bucket-endpoint-3.58.0" sources."@aws-sdk/middleware-content-length-3.58.0" sources."@aws-sdk/middleware-expect-continue-3.58.0" - sources."@aws-sdk/middleware-flexible-checksums-3.58.0" + sources."@aws-sdk/middleware-flexible-checksums-3.72.0" sources."@aws-sdk/middleware-header-default-3.58.0" sources."@aws-sdk/middleware-host-header-3.58.0" sources."@aws-sdk/middleware-location-constraint-3.55.0" @@ -105103,12 +105180,12 @@ in sources."@aws-sdk/protocol-http-3.58.0" sources."@aws-sdk/querystring-builder-3.55.0" sources."@aws-sdk/querystring-parser-3.55.0" - sources."@aws-sdk/s3-request-presigner-3.67.0" + sources."@aws-sdk/s3-request-presigner-3.72.0" sources."@aws-sdk/service-error-classification-3.55.0" sources."@aws-sdk/shared-ini-file-loader-3.58.0" sources."@aws-sdk/signature-v4-3.58.0" sources."@aws-sdk/signature-v4-multi-region-3.66.0" - sources."@aws-sdk/smithy-client-3.55.0" + sources."@aws-sdk/smithy-client-3.72.0" sources."@aws-sdk/types-3.55.0" sources."@aws-sdk/url-parser-3.55.0" sources."@aws-sdk/util-arn-parser-3.55.0" @@ -105118,9 +105195,9 @@ in sources."@aws-sdk/util-body-length-node-3.55.0" sources."@aws-sdk/util-buffer-from-3.55.0" sources."@aws-sdk/util-config-provider-3.55.0" - sources."@aws-sdk/util-create-request-3.58.0" - sources."@aws-sdk/util-defaults-mode-browser-3.55.0" - sources."@aws-sdk/util-defaults-mode-node-3.58.0" + sources."@aws-sdk/util-create-request-3.72.0" + sources."@aws-sdk/util-defaults-mode-browser-3.72.0" + sources."@aws-sdk/util-defaults-mode-node-3.72.0" sources."@aws-sdk/util-format-url-3.58.0" sources."@aws-sdk/util-hex-encoding-3.58.0" sources."@aws-sdk/util-locate-window-3.55.0" @@ -105236,7 +105313,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1115.0" // { + (sources."aws-sdk-2.1116.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -107808,7 +107885,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -110923,7 +111000,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -116217,7 +116294,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -116986,7 +117063,7 @@ in sources."domutils-2.8.0" sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" sources."entities-3.0.1" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -120353,7 +120430,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.109" + sources."electron-to-chromium-1.4.110" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -123299,7 +123376,7 @@ in sources."file-type-4.4.0" ]; }) - (sources."archiver-5.3.0" // { + (sources."archiver-5.3.1" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -123310,7 +123387,7 @@ in sources."async-3.2.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1115.0" // { + (sources."aws-sdk-2.1116.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -125640,7 +125717,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1115.0" // { + (sources."aws-sdk-2.1116.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -126440,10 +126517,10 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "14.6.1"; + version = "14.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-14.6.1.tgz"; - sha512 = "FfNdvZUZdzh9KDQxDnO7Opp+prKh8OQVuSW8S13cBtxrooCbm6J6royhUeb++53WPMt04VB+ZbOz/QmzAijs6Q=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-14.7.0.tgz"; + sha512 = "vAVPAYaHhcexOiuvym0S64UWIIonMKgYz1Eh+SZgXKkKFLL+wwBzzWGH7Bdnk/HLyH3KlrX+tlisFdEG8ik+Lw=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -132438,7 +132515,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff2html-3.4.16" + sources."diff2html-3.4.17" sources."dnd-page-scroll-0.0.4" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" @@ -132467,7 +132544,7 @@ in sources."depd-2.0.0" ]; }) - sources."fecha-4.2.2" + sources."fecha-4.2.3" sources."finalhandler-1.1.2" sources."fn.name-1.1.0" sources."forwarded-0.2.0" @@ -137903,7 +137980,7 @@ in sources."universalify-2.0.0" sources."web-streams-polyfill-3.2.1" sources."which-2.0.2" - sources."yaml-2.0.0" + sources."yaml-2.0.1" ]; buildInputs = globalBuildInputs; meta = { From b45fbd05f3cf05905484a57863a3e3daf7e30784 Mon Sep 17 00:00:00 2001 From: workflow <4farlion@gmail.com> Date: Sat, 16 Apr 2022 00:27:48 +0100 Subject: [PATCH 088/171] vimPlugins.coc-flutter: init at 1.9.7 --- pkgs/applications/editors/vim/plugins/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 8b55c1706939..db7da93649e8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1116,6 +1116,7 @@ self: super: { "coc-emmet" "coc-eslint" "coc-explorer" + "coc-flutter" "coc-git" "coc-go" "coc-highlight" From bc7102133f734715729a923d3a3b08abf288fac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 16 Apr 2022 02:22:48 +0200 Subject: [PATCH 089/171] libbpf: remove unused with builtins --- pkgs/os-specific/linux/libbpf/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 8e6b9fa0663a..cb2f4611fde0 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -8,8 +8,6 @@ , nixosTests }: -with builtins; - stdenv.mkDerivation rec { pname = "libbpf"; version = "0.7.0"; From 60714e2cd319d3217e33397e65a63ad8beb4a8e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 16 Apr 2022 02:35:15 +0200 Subject: [PATCH 090/171] nextcloud-client: build dolphin plugin --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index deac64c903e1..4b3a68352416 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -2,6 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake +, extra-cmake-modules , inotify-tools , libcloudproviders , libsecret @@ -15,6 +16,7 @@ , qtwebsockets , qtquickcontrols2 , qtgraphicaleffects +, plasma5Packages , sqlite , inkscape , xdg-utils @@ -40,6 +42,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config cmake + extra-cmake-modules inkscape ]; @@ -49,6 +52,7 @@ mkDerivation rec { libsecret openssl pcre + plasma5Packages.kio qtbase qtkeychain qttools From e532f3ecf44d0bbb7b6ae45a0e3e87ec4dc40b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 16 Apr 2022 02:35:27 +0200 Subject: [PATCH 091/171] nextcloud-client: build man pages --- pkgs/applications/networking/nextcloud-client/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 4b3a68352416..5454765ad25c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -4,6 +4,7 @@ , cmake , extra-cmake-modules , inotify-tools +, installShellFiles , libcloudproviders , libsecret , openssl @@ -17,6 +18,7 @@ , qtquickcontrols2 , qtgraphicaleffects , plasma5Packages +, sphinx , sqlite , inkscape , xdg-utils @@ -44,6 +46,7 @@ mkDerivation rec { cmake extra-cmake-modules inkscape + sphinx ]; buildInputs = [ @@ -75,6 +78,10 @@ mkDerivation rec { "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit ]; + postBuild = '' + make doc-man + ''; + meta = with lib; { description = "Nextcloud themed desktop client"; homepage = "https://nextcloud.com"; From d48d193e6b2adf6edb9ff08d64ca487aad44049e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 01:13:25 +0000 Subject: [PATCH 092/171] babashka: 0.8.0 -> 0.8.1 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index de46d33bdf60..1f663b5488d2 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-xe+WL2V56ETnWv6ey+3xrvC21MfhT5AMtmOkVPbX5N0="; + sha256 = "sha256-9mh3ki6Q0vwlF+j4+UVznIhZ6Xleh7ChklJ5ojjGhYM="; }; executable = "bb"; From d78ebf03f16a444999adea68305664f53f026768 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 01:16:53 +0000 Subject: [PATCH 093/171] python310Packages.pyamg: 4.2.2 -> 4.2.3 --- pkgs/development/python-modules/pyamg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index b2a230685cc8..09a113a42185 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pyamg"; - version = "4.2.2"; + version = "4.2.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mtrFqUwEustYlCcCiV1FQZm7dJKohu650xHdiNg6D6E="; + sha256 = "sha256-N608Hcr/JDXCq3yOw2lCrwcmxWPTUFm80Y6wdHP3GC4="; }; nativeBuildInputs = [ From aa3157a802a9c9e24d60a7b92d9f5516493b882e Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 16 Apr 2022 01:33:37 +0000 Subject: [PATCH 094/171] sudolikeaboss: remove --- pkgs/tools/security/sudolikeaboss/default.nix | 31 --------------- pkgs/tools/security/sudolikeaboss/deps.nix | 39 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 pkgs/tools/security/sudolikeaboss/default.nix delete mode 100644 pkgs/tools/security/sudolikeaboss/deps.nix diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix deleted file mode 100644 index 242da1a67bb4..000000000000 --- a/pkgs/tools/security/sudolikeaboss/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -# This file was generated by go2nix, then modified by hand for Darwin support. -{ lib, buildGoPackage, fetchFromGitHub, darwin }: - -buildGoPackage rec { - pname = "sudolikeaboss-unstable"; - version = "20161127-${lib.strings.substring 0 7 rev}"; - rev = "2d9afe19f872c9f433d476e57ee86169781b164c"; - - goPackagePath = "github.com/ravenac95/sudolikeaboss"; - - src = fetchFromGitHub { - owner = "ravenac95"; - repo = "sudolikeaboss"; - inherit rev; - sha256 = "0ni3v4kanxfzxzjd48f5dgv62jbfrw7kdmq0snj09hw7ciw55yg6"; - }; - - goDeps = ./deps.nix; - - buildInputs = with darwin.apple_sdk.frameworks; [ - Cocoa - ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Get 1password access from iterm2"; - license = licenses.mit; - maintainers = [ maintainers.grahamc ]; - platforms = platforms.darwin; - }; -} diff --git a/pkgs/tools/security/sudolikeaboss/deps.nix b/pkgs/tools/security/sudolikeaboss/deps.nix deleted file mode 100644 index 350306a24f4b..000000000000 --- a/pkgs/tools/security/sudolikeaboss/deps.nix +++ /dev/null @@ -1,39 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/Sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/Sirupsen/logrus"; - rev = "881bee4e20a5d11a6a88a5667c6f292072ac1963"; - sha256 = "176a09lp20f0qfhwwlh2xg0vk7z1g7gq8k2wr3sg1fd8m86wrzzg"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "b061729afc07e77a8aa4fad0a2fd840958f1942a"; - sha256 = "0q87n5an7ha2d8kl6gn9wi41rq0whsxq68w5x3nxz7w9vgkfnq1k"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; - sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "0c96df335ed3f17f758cba1a2c71b7849dd828e3"; - sha256 = "02zn1f539y5yc1sx82ym8c3pp3z371d1ldhl20skwjwbdw1ln8hm"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dde08c9d5e9d..cf2c44812528 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1205,6 +1205,7 @@ mapAliases ({ steam-run-native = steam-run; # added 2022-02-21 stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09 subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31 + sudolikeaboss = throw "sudolikeaboss is no longer maintained by upstream"; # Added 2022-04-16 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; surf-webkit2 = throw "'surf-webkit2' has been renamed to/replaced by 'surf'"; # Converted to throw 2022-02-22 svgcleaner = throw "svgcleaner has been removed"; # Added 2021-11-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22d842be9220..f190e0e16a5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28048,8 +28048,6 @@ with pkgs; stride = callPackage ../applications/networking/instant-messengers/stride { }; - sudolikeaboss = callPackage ../tools/security/sudolikeaboss { }; - speedread = callPackage ../applications/misc/speedread { }; station = callPackage ../applications/networking/station { }; From f1ae889cc21b7cfa5b3c1c5598888f3a73047368 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 16 Apr 2022 02:08:15 +0000 Subject: [PATCH 095/171] kt: 12.1.0 -> 13.1.0 --- pkgs/tools/misc/kt/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix index e4713890ac40..3e9bac0e09e9 100644 --- a/pkgs/tools/misc/kt/default.nix +++ b/pkgs/tools/misc/kt/default.nix @@ -1,17 +1,21 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "kt"; - version = "12.1.0"; + version = "13.1.0"; src = fetchFromGitHub { owner = "fgeller"; repo = "kt"; rev = "v${version}"; - sha256 = "014q39bg88vg1xdq1bz6wj982zb148sip3a42hbrinh8qj41y4yg"; + sha256 = "sha256-1UGsiMMmAyIQZ62hNIi0uzyX2uNL03EWupIazjznqDc="; }; - goPackagePath = "github.com/fgeller/kt"; + vendorSha256 = "sha256-PeNpDro6G78KLN6B2CDhsTKamRTWQyxPJYWuuv6sUyw="; + + ldflags = [ "-s" "-w" ]; + + doCheck = false; meta = with lib; { description = "Kafka command line tool"; From cdc17db88264d66527c95cffaf78e60ed433faaf Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 14 Apr 2022 21:21:59 -0400 Subject: [PATCH 096/171] xfitter: 2.0.1 -> 2.2.0 --- .../science/physics/xfitter/default.nix | 64 +-- .../physics/xfitter/undefined_behavior.patch | 454 ------------------ 2 files changed, 34 insertions(+), 484 deletions(-) delete mode 100644 pkgs/applications/science/physics/xfitter/undefined_behavior.patch diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 51d6c9d68fe4..2be615387889 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -1,53 +1,57 @@ -{ lib, stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, lapack, libyaml, lynx -, mela, root5, qcdnum, which, libtirpc +{ lib +, stdenv +, fetchurl +, apfel +, apfelgrid +, applgrid +, blas +, ceres-solver +, cmake +, gfortran +, gsl +, lapack +, lhapdf +, libtirpc +, libyaml +, libyamlcpp +, pkg-config +, qcdnum +, root +, zlib , memorymappingHook, memstreamHook }: stdenv.mkDerivation rec { pname = "xfitter"; - version = "2.0.1"; + version = "2.2.0"; src = fetchurl { name = "${pname}-${version}.tgz"; url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${pname}-${version}.tgz"; - sha256 = "0kmgc67nw5flp92yw5x6l2vsnhwsfi5z2a20404anisdgdjs8zc6"; + sha256 = "sha256-ZHIQ5hOY+k0/wmpE0o4Po+RZ4MkVMk+bK1Rc6eqwwH0="; }; - patches = [ - ./undefined_behavior.patch - ]; + preConfigure = '' + substituteInPlace CMakeLists.txt \ + --replace "-fallow-argument-mismatch" "" + ''; - preConfigure = - # Fix F77LD to workaround for a following build error: - # - # gfortran: error: unrecognized command line option '-stdlib=libc++' - # - lib.optionalString stdenv.isDarwin '' - substituteInPlace src/Makefile.in \ - --replace "F77LD = \$(F77)" "F77LD = \$(CXXLD)" \ - ''; - - configureFlags = [ - "--enable-apfel" - "--enable-apfelgrid" - "--enable-applgrid" - "--enable-mela" - "--enable-lhapdf" - ]; - - nativeBuildInputs = [ gfortran which ]; + nativeBuildInputs = [ cmake gfortran pkg-config ]; buildInputs = - [ apfel apfelgrid applgrid blas lhapdf libyaml lapack mela root5 qcdnum ] + [ apfel blas ceres-solver lhapdf lapack libyaml root qcdnum gsl libyamlcpp zlib ] + ++ lib.optionals ("5" == lib.versions.major root.version) [ apfelgrid applgrid ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ] ++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc ; - propagatedBuildInputs = [ lynx ]; - - enableParallelBuilding = true; NIX_CFLAGS_COMPILE = lib.optional (stdenv.hostPlatform.libc == "glibc") "-I${libtirpc.dev}/include/tirpc"; NIX_LDFLAGS = lib.optional (stdenv.hostPlatform.libc == "glibc") "-ltirpc"; + # workaround wrong library IDs + postInstall = lib.optionalString stdenv.isDarwin '' + ln -sv "$out/lib/xfitter/"* "$out/lib/" + ''; + meta = with lib; { description = "The xFitter project is an open source QCD fit framework ready to extract PDFs and assess the impact of new data"; license = licenses.gpl3; diff --git a/pkgs/applications/science/physics/xfitter/undefined_behavior.patch b/pkgs/applications/science/physics/xfitter/undefined_behavior.patch deleted file mode 100644 index 53278527a807..000000000000 --- a/pkgs/applications/science/physics/xfitter/undefined_behavior.patch +++ /dev/null @@ -1,454 +0,0 @@ -diff --git a/DY/src/finterface.cc b/DY/src/finterface.cc ---- a/DY/src/finterface.cc -+++ b/DY/src/finterface.cc -@@ -14,17 +14,17 @@ - using namespace std; - - extern "C" { -- int dy_create_calc_(const int *ds_id, const int *chg_prod, -+ void dy_create_calc_(const int *ds_id, const int *chg_prod, - const double *beam_en, const char *boz, - const double *ranges, const char *var_name, - const int *n_bins, const double *bin_edges); - -- int dy_do_calc_(); -+ void dy_do_calc_(); - -- int dy_get_res_(const int *ds_id, double *calc_res); -+ void dy_get_res_(const int *ds_id, double *calc_res); - -- int dy_release_(); -- int dy_set_ewpars_(); -+ void dy_release_(); -+ void dy_set_ewpars_(); - } - - typedef map DCmap; -@@ -34,7 +34,7 @@ vector gBinMatrices; - - // initializes Drell-Yan LO calculations with info on - // beam, process, kinematic cuts, and bins. --int dy_create_calc_(const int *ds_id, const int *chg_prod, -+void dy_create_calc_(const int *ds_id, const int *chg_prod, - const double *beam_en, const char *boz, - const double *ranges, const char *var_name, - const int *n_bins, const double *bin_edges) -@@ -99,13 +99,11 @@ int dy_create_calc_(const int *ds_id, const int *chg_prod, - // create calculator and put to map - DYcalc * dc = new DYcalc(bm, pc, int_steps); - gCalcs.insert( pair( *ds_id,dc ) ); -- -- return 1; - } - - - // calculate Drell-Yan LO cross sections for all data sets --int dy_do_calc_() -+void dy_do_calc_() - { - // evolve convolutions - vector::iterator ipc = gPDFconvs.begin(); -@@ -118,28 +116,24 @@ int dy_do_calc_() - if ( true != idc->second->Integrate() ) { - cout << "Something is wrong with DY integration for " - << idc->first << " data set." << endl; -- return 0; -+ return; - } - } -- -- return 1; - } - - - // return DY calculations for data set ds_name --int dy_get_res_(const int *ds_id, double *calc_res) -+void dy_get_res_(const int *ds_id, double *calc_res) - { - DYcalc * dc = gCalcs.find(*ds_id)->second; - dc->getCalcRes(calc_res); -- -- return 1; - } - --int dy_set_ewpars_(){ -+void dy_set_ewpars_(){ - PhysPar::setPhysPar(); - } - --int dy_release_() -+void dy_release_() - { - vector::iterator ipc = gPDFconvs.begin(); - for (; ipc!=gPDFconvs.end(); ipc++){ -@@ -155,6 +149,4 @@ int dy_release_() - for (; idc != gCalcs.end() ; idc++){ - delete (idc->second); - } -- -- return 1; - } -diff --git a/DiffDIS/include/DataTable.h b/DiffDIS/include/DataTable.h ---- a/DiffDIS/include/DataTable.h -+++ b/DiffDIS/include/DataTable.h -@@ -307,6 +307,7 @@ class DataTable_t { - for(ic=0; ic < GetNcols(); ic++) { - for(ir=0; ir < npt; ir++) Data[ic][ir] = A.Data[ic][ir]; - } -+ return *this; - } - - //@} -diff --git a/FastNLO/src/FastNLOInterface.cc b/FastNLO/src/FastNLOInterface.cc ---- a/FastNLO/src/FastNLOInterface.cc -+++ b/FastNLO/src/FastNLOInterface.cc -@@ -39,14 +39,14 @@ void gauleg(double x1,double x2,double *x,double *w, int n); - - - extern "C" { -- int fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_FIT_ORDER, bool *PublicationUnits , double* murdef, double* murscale, double *mufdef, double* mufscale); -- int fastnlocalc_(const int *idataset, double *xsec); -- int fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *tot, int *Npt); -- int fastnlopointskip_(const int *idataset, int *point, int *npoints); -- int hf_errlog_(const int* ID, const char* TEXT, long length); -- int hf_stop_(); -+ void fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_FIT_ORDER, bool *PublicationUnits , double* murdef, double* murscale, double *mufdef, double* mufscale); -+ void fastnlocalc_(const int *idataset, double *xsec); -+ void fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *tot, int *Npt); -+ void fastnlopointskip_(const int *idataset, int *point, int *npoints); -+ void hf_errlog_(const int* ID, const char* TEXT, long length); -+ void hf_stop_(); - double interp_(double *A, double *xx1, double *x, int *NGrid1, double *res); -- int setfastnlotoppar_(const int *idataset); -+ void setfastnlotoppar_(const int *idataset); - } - - -@@ -58,7 +58,7 @@ map gFastNLO_array; - map gUsedPoints_array; - int CreateUsedPointsArray(int idataset, int npoints); - --int fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_FIT_ORDER, bool *PublicationUnits , double* murdef, double* murscale, double *mufdef, double* mufscale) { -+void fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_FIT_ORDER, bool *PublicationUnits , double* murdef, double* murscale, double *mufdef, double* mufscale) { - - - map::const_iterator FastNLOIterator = gFastNLO_array.find(*idataset); -@@ -67,7 +67,7 @@ int fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_ - const char* text = "I: Double initialization of the same fastnlo data set!"; - hf_errlog_(&id, text, (long)strlen(text)); - //hf_stop_(); -- return 1; -+ return; - } - - FastNLOxFitter* fnloreader = new FastNLOxFitter( thfile ); -@@ -112,10 +112,9 @@ int fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_ - } - - gFastNLO_array.insert(pair(*idataset, fnloreader) ); -- return 0; - } - --int setfastnlotoppar_(const int *idataset) { -+void setfastnlotoppar_(const int *idataset) { - //!< Dedicated settings for difftop - map::const_iterator FastNLOIterator = gFastNLO_array.find(*idataset); - map::const_iterator UsedPointsIterator = gUsedPoints_array.find(*idataset); -@@ -130,11 +129,9 @@ int setfastnlotoppar_(const int *idataset) { - fnloreader->SetExternalFuncForMuF( &Function_Mu ); - fnloreader->SetExternalFuncForMuR( &Function_Mu); - //fnloreader->SetScaleFactorsMuRMuF(1.0,1.0); //Be reminded that muR and muF scales are hard coded (that's not true!) -- -- return 0; - } - --int fastnlocalc_(const int *idataset, double *xsec) { -+void fastnlocalc_(const int *idataset, double *xsec) { - - map::const_iterator FastNLOIterator = gFastNLO_array.find(*idataset); - map::const_iterator UsedPointsIterator = gUsedPoints_array.find(*idataset); -@@ -176,13 +173,10 @@ int fastnlocalc_(const int *idataset, double *xsec) { - outputidx++; - } - } -- -- -- return 0; - } - - //MK14 New function for Difftop calculation: it is called in trunk/src/difftop_fastnlo.f --int fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *tot, int *Npt){ -+void fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *tot, int *Npt){ - - map::const_iterator FastNLOIterator = gFastNLO_array.find(*idataset); - map::const_iterator UsedPointsIterator = gUsedPoints_array.find(*idataset); -@@ -262,10 +256,6 @@ int fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *to - Total += interpC(xsec,xg[k],thbin,Nthpoints)*wg[k]; - - *tot = Total; -- -- -- -- return 0; - } - - -@@ -277,7 +267,7 @@ int fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *to - - - --int fastnlopointskip_(const int *idataset, int *point, int *npoints) { -+void fastnlopointskip_(const int *idataset, int *point, int *npoints) { - map::const_iterator UsedPointsIterator = gUsedPoints_array.find(*idataset); - if(UsedPointsIterator == gUsedPoints_array.end( )) - CreateUsedPointsArray(*idataset, *npoints); -@@ -292,8 +282,6 @@ int fastnlopointskip_(const int *idataset, int *point, int *npoints) { - - BoolArray* usedpoints = UsedPointsIterator->second; - usedpoints->at(*point-1) = false; -- -- return 0; - } - - int CreateUsedPointsArray(int idataset, int npoints) { -diff --git a/Hathor/src/HathorInterface.cc b/Hathor/src/HathorInterface.cc ---- a/Hathor/src/HathorInterface.cc -+++ b/Hathor/src/HathorInterface.cc -@@ -6,9 +6,9 @@ - #include "../interface/xFitterPdf.h" - - extern "C" { -- int hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, const double& mt, -+ void hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, const double& mt, - const unsigned int& pertubOrder, const unsigned int& precisionLevel); -- int hathorcalc_(const int *idataset, double *xsec); -+ void hathorcalc_(const int *idataset, double *xsec); - } - - extern "C" { -@@ -19,7 +19,7 @@ extern "C" { - } - - extern "C" { -- int hf_errlog_(const int* ID, const char* TEXT, long length); -+ void hf_errlog_(const int* ID, const char* TEXT, long length); - } - - // FIXME: delete pointers at the end! (in some hathordestroy_ or so) -@@ -28,7 +28,7 @@ xFitterPdf* pdf; - int* rndStore; - double mtop; - --int hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, const double& mt, -+void hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, const double& mt, - const unsigned int& pertubOrder, const unsigned int& precisionLevel) { - - if(hathor_array.size()==0) { -@@ -69,7 +69,7 @@ int hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, con - return 0; - } - --int hathorcalc_(const int *idataset, double *xsec) { -+void hathorcalc_(const int *idataset, double *xsec) { - rlxd_reset(rndStore); - - std::map::const_iterator hathorIter = hathor_array.find(*idataset); -diff --git a/src/TheorEval.cc b/src/TheorEval.cc ---- a/src/TheorEval.cc -+++ b/src/TheorEval.cc -@@ -62,6 +62,7 @@ TheorEval::initTheory() - list sl; - this->assignTokens(sl); - this->convertToRPN(sl); -+ return 0; - } - - int -@@ -167,6 +168,7 @@ TheorEval::assignTokens(list &sl) - sl.push_back(t); - } - } -+ return 0; - } - - int -@@ -217,6 +219,7 @@ TheorEval::convertToRPN(list &sl) - cout << endl; - */ - -+ return 0; - } - - int -@@ -236,6 +239,7 @@ TheorEval::initTerm(int iterm, valarray *val) - hf_errlog_(id, text, textlen); - return -1; - } -+ return 0; - } - - int -@@ -348,6 +352,7 @@ TheorEval::initGridTerm(int iterm, valarray *val) - - // associate grid and valarray pointers in token - _mapGridToken[g] = val; -+ return 0; - } - - int -@@ -430,6 +435,7 @@ TheorEval::initKfTerm(int iterm, valarray *val) - - // write k-factor array to the token valarray - *val = valarray(vkf.data(), vkf.size()); -+ return 0; - } - - int -@@ -465,6 +471,7 @@ TheorEval::setCKM(const vector &v_ckm) - int textlen = strlen(text); - hf_errlog_(id, text, textlen); - #endif -+ return 0; - } - - int -@@ -531,6 +538,7 @@ TheorEval::Evaluate(valarray &vte ) - } - //vte /= _units; - } -+ return 0; - } - - int -@@ -555,6 +563,7 @@ TheorEval::getGridValues() - - - } -+ return 0; - } - - int -diff --git a/src/ftheor_eval.cc b/src/ftheor_eval.cc ---- a/src/ftheor_eval.cc -+++ b/src/ftheor_eval.cc -@@ -19,15 +19,15 @@ - using namespace std; - - extern "C" { -- int set_theor_eval_(int *dsId);//, int *nTerms, char **TermName, char **TermType, -+ void set_theor_eval_(int *dsId);//, int *nTerms, char **TermName, char **TermType, - // char **TermSource, char *TermExpr); -- int set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, -+ void set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, - double *allBins); - // int set_theor_units_(int *dsId, double *units); -- int init_theor_eval_(int *dsId); -- int update_theor_ckm_(); -- int get_theor_eval_(int *dsId, int* np, int* idx); -- int close_theor_eval_(); -+ void init_theor_eval_(int *dsId); -+ void update_theor_ckm_(); -+ void get_theor_eval_(int *dsId, int* np, int* idx); -+ void close_theor_eval_(); - } - - /// global dataset to theory evaluation pointer map -@@ -59,7 +59,7 @@ extern struct ord_scales { - dataset ID. - write details on argumets - */ --int set_theor_eval_(int *dsId)//, int *nTerms, char **TermName, char **TermType, -+void set_theor_eval_(int *dsId)//, int *nTerms, char **TermName, char **TermType, - // char **TermSource, char *TermExpr) - { - // convert fortran strings to c++ -@@ -90,15 +90,13 @@ int set_theor_eval_(int *dsId)//, int *nTerms, char **TermName, char **TermType, - << " already exists." << endl; - exit(1); // make proper exit later - } -- -- return 1; - } - - /*! - Sets datasets bins in theory evaluations. - write details on argumets - */ --int set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, -+void set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, - double *allBins) - { - tTEmap::iterator it = gTEmap.find(*dsId); -@@ -110,7 +108,6 @@ int set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, - - TheorEval *te = gTEmap.at(*dsId); - te->setBins(*nBinDimension, *nPoints, binFlags, allBins); -- return 1; - } - - /* -@@ -132,7 +129,7 @@ int set_theor_units_(int *dsId, double *units) - /*! - Initializes theory for requested dataset. - */ --int init_theor_eval_(int *dsId) -+void init_theor_eval_(int *dsId) - { - tTEmap::iterator it = gTEmap.find(*dsId); - if (it == gTEmap.end() ) { -@@ -148,7 +145,7 @@ int init_theor_eval_(int *dsId) - /*! - Updates the CKM matrix to all the initialized appl grids - */ --int update_theor_ckm_() -+void update_theor_ckm_() - { - double a_ckm[] = { ckm_matrix_.Vud, ckm_matrix_.Vus, ckm_matrix_.Vub, - ckm_matrix_.Vcd, ckm_matrix_.Vcs, ckm_matrix_.Vcb, -@@ -164,7 +161,7 @@ int update_theor_ckm_() - /*! - Evaluates theory for requested dataset and writes it to the global THEO array. - */ --int get_theor_eval_(int *dsId, int *np, int*idx) -+void get_theor_eval_(int *dsId, int *np, int*idx) - { - - tTEmap::iterator it = gTEmap.find(*dsId); -@@ -194,11 +191,11 @@ int get_theor_eval_(int *dsId, int *np, int*idx) - // write the predictions to THEO array - if( ip != *np ){ - cout << "ERROR in get_theor_eval_: number of points mismatch" << endl; -- return -1; -+ return; - } - } - --int close_theor_eval_() -+void close_theor_eval_() - { - tTEmap::iterator it = gTEmap.begin(); - for (; it!= gTEmap.end(); it++){ -diff --git a/src/lhapdf6_output.c b/src/lhapdf6_output.c ---- a/src/lhapdf6_output.c -+++ b/src/lhapdf6_output.c -@@ -64,7 +64,7 @@ extern double bvalij_(int *,int *,int *,int *,int *); - extern double bvalxq_(int *,int *,double *,double *,int *); - extern double hf_get_alphas_(double *); - extern int getord_(int *); --extern int grpars_(int *, double *, double *, int *, double *, double *, int *); -+extern void grpars_(int *, double *, double *, int *, double *, double *, int *); - extern int getcbt_(int *, double *, double *, double *); - extern void getpdfunctype_heraf_(int *mc, int *asymh, int *symh, char *name, size_t size); - extern void hf_errlog_(int *, char *, size_t); -diff --git a/tools/draw/include/FileOpener.h b/tools/draw/include/FileOpener.h ---- a/tools/draw/include/FileOpener.h -+++ b/tools/draw/include/FileOpener.h -@@ -61,7 +61,7 @@ class InFileOpener_t { - string GetPath() const {return ind < 0 ? "" : Flist[ind];} - - // ================================== -- int Add(const string& fname) { -+ void Add(const string& fname) { - Flist.push_back(fname); - } - From 0a2bc8348099cdd38122d59e92fa72e49adae561 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 02:36:32 +0000 Subject: [PATCH 097/171] diffoscope: 209 -> 210 --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index e1bb3a184f5a..92fc69be7b5d 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -11,11 +11,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "209"; + version = "210"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-ZyHec9EbLrHmzCGd/Cwg/y9XCUQPtZhRH0xCouHKMp0="; + sha256 = "sha256-KaECH995scVdBbxQ4YhZUFmm04ptgi4yx14oDFX+zSw="; }; outputs = [ "out" "man" ]; From 3bc98d3bc10f7bd4fd2df3b31b2eefb7fe26410c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 16 Apr 2022 04:43:58 +0200 Subject: [PATCH 098/171] nextcloud-client: place vfs plugins in correct directory --- pkgs/applications/networking/nextcloud-client/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 5454765ad25c..018080e9efc0 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -41,6 +41,13 @@ mkDerivation rec { ./0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch ]; + postPatch = '' + for file in src/libsync/vfs/*/CMakeLists.txt; do + substituteInPlace $file \ + --replace "PLUGINDIR" "KDE_INSTALL_PLUGINDIR" + done + ''; + nativeBuildInputs = [ pkg-config cmake From bd7d8adc321dae1c2c9f10989b49ec016f3d9eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 16 Apr 2022 05:13:51 +0200 Subject: [PATCH 099/171] nextcloud-client: split headers into dev output --- pkgs/applications/networking/nextcloud-client/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 018080e9efc0..3afdbec0ac54 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -28,6 +28,8 @@ mkDerivation rec { pname = "nextcloud-client"; version = "3.4.4"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; From 20f9d3e2ca5bf4d45396d2b3ed5dfc2bd275b330 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sat, 16 Apr 2022 12:34:49 +0800 Subject: [PATCH 100/171] vivaldi: 5.1.2567.73-1 -> 5.2.2623.39-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 30d719593e83..87be80bda8ce 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.1.2567.73-1"; + version = "5.2.2623.39-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "04jzhipn4ip7x3zdwmfnp6w0qc2y1qdfy5w3qyy0r114jz9s9i7g"; + sha256 = "1dd44b109gdbjqcbf5rhvgyiqb6qi8vpimsh5fb359dmnqfan1hk"; }; unpackPhase = '' From db6e8b7538b6330d6aaa1c2fe437e2a1d0ca9ad9 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sat, 16 Apr 2022 12:35:03 +0800 Subject: [PATCH 101/171] vivaldi-ffmepg-codecs: 97.0.4692.71 -> 101.0.4951.15 --- .../networking/browsers/vivaldi/ffmpeg-codecs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 461fd0050cf1..c550c8cea25a 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "97.0.4692.71"; + version = "101.0.4951.15"; src = fetchurl { - url = "https://launchpadlibrarian.net/579085093/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; - sha256 = "sha256-YUv1D8U776NJBRPvYJigG7gyH9zd19FbnjAvIEhfYpA="; + url = "https://launchpadlibrarian.net/594594495/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; + sha256 = "sha256-aelr/jODmgyVunSFFn6W+QHEmSWJeWzU4SaS5rjHli4="; }; buildInputs = [ dpkg ]; From 11aa76540c10a85759a1d4b7d4ebe03a51136c93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 04:40:01 +0000 Subject: [PATCH 102/171] haste-server: 3dcc43578b99dbafac35dece9d774ff2af39e8d0 -> 72863858338a57d54eb9dee55530e90ebbc22453 --- pkgs/servers/haste-server/default.nix | 4 ++-- pkgs/servers/haste-server/node-deps.nix | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/haste-server/default.nix b/pkgs/servers/haste-server/default.nix index 998d9c4235de..80f06bf4fa43 100644 --- a/pkgs/servers/haste-server/default.nix +++ b/pkgs/servers/haste-server/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "haste-server"; - version = "3dcc43578b99dbafac35dece9d774ff2af39e8d0"; + version = "72863858338a57d54eb9dee55530e90ebbc22453"; src = fetchFromGitHub { owner = "toptal"; repo = "haste-server"; rev = version; - hash = "sha256-srSPRlG+gXSIwgVFLyfzRex97tCbV9FZXYpLD0KFRfw="; + hash = "sha256-MoEqpfihI3ZqSTHOxFbGziDv8khgq2Nd44YuKYDGflc="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/haste-server/node-deps.nix b/pkgs/servers/haste-server/node-deps.nix index df902e8e18cd..fbb33a90c73f 100644 --- a/pkgs/servers/haste-server/node-deps.nix +++ b/pkgs/servers/haste-server/node-deps.nix @@ -22,13 +22,13 @@ let sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; - "ansi-regex-3.0.0" = { + "ansi-regex-3.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"; + sha512 = "+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="; }; }; "ansi-regex-5.0.1" = { @@ -499,13 +499,13 @@ let sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; - "graceful-fs-4.2.9" = { + "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.9"; + version = "4.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; - sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; "growl-1.10.5" = { @@ -1341,11 +1341,11 @@ let name = "haste"; packageName = "haste"; version = "0.1.0"; - src = ../../../../../../../../nix/store/5pfi6mmmdlqm2ixww08p7mlqj9a2dwbz-source; + src = ../../../../../../../../../nix/store/jmii2np1kr78g0pnyf2y8wvj09nc1pr0-source; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" sources."ansi-colors-4.1.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."argparse-2.0.1" @@ -1412,7 +1412,7 @@ let sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."growl-1.10.5" sources."has-flag-4.0.0" sources."he-1.2.0" From 55f57facbfabaee42908c24a2ac4b4dd8443fa65 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Mon, 11 Apr 2022 17:38:15 +0300 Subject: [PATCH 103/171] emacs: 27.2 -> 28.1 --- pkgs/applications/editors/emacs/27.nix | 16 ---------------- pkgs/applications/editors/emacs/28.nix | 5 +++++ pkgs/applications/editors/emacs/at-fdcwd.patch | 15 --------------- pkgs/applications/editors/emacs/generic.nix | 2 +- pkgs/top-level/aliases.nix | 4 ++-- pkgs/top-level/all-packages.nix | 13 +++++++++---- pkgs/top-level/packages-config.nix | 2 +- 7 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/27.nix create mode 100644 pkgs/applications/editors/emacs/28.nix delete mode 100644 pkgs/applications/editors/emacs/at-fdcwd.patch diff --git a/pkgs/applications/editors/emacs/27.nix b/pkgs/applications/editors/emacs/27.nix deleted file mode 100644 index 064231b24565..000000000000 --- a/pkgs/applications/editors/emacs/27.nix +++ /dev/null @@ -1,16 +0,0 @@ -import ./generic.nix (rec { - version = "27.2"; - sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk="; - patches = fetchpatch: [ - (fetchpatch { - name = "fix-aarch64-darwin-triplet.patch"; - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082"; - sha256 = "sha256-RF9b5PojFUAjh2TDUW4+HaWveV30Spy1iAXhaWf1ZVg="; - }) - # glibc 2.34 compat - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/emacs/raw/181aafcdb7ee2fded9fce4cfc448f27edccc927f/f/emacs-glibc-2.34.patch"; - sha256 = "sha256-2o3C/jhZPl2OW/LmVPt/fhdwbS9NOdF9lVEF1Kn9aEk="; - }) - ]; -}) diff --git a/pkgs/applications/editors/emacs/28.nix b/pkgs/applications/editors/emacs/28.nix new file mode 100644 index 000000000000..e66917ab93f0 --- /dev/null +++ b/pkgs/applications/editors/emacs/28.nix @@ -0,0 +1,5 @@ +import ./generic.nix (rec { + version = "28.1"; + sha256 = "sha256-KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE="; + patches = _: [ ]; +}) diff --git a/pkgs/applications/editors/emacs/at-fdcwd.patch b/pkgs/applications/editors/emacs/at-fdcwd.patch deleted file mode 100644 index 2d8099b73736..000000000000 --- a/pkgs/applications/editors/emacs/at-fdcwd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h -index 84ede3e..8e8f42e 100644 ---- a/lib/careadlinkat.h -+++ b/lib/careadlinkat.h -@@ -23,6 +23,10 @@ - #include - #include - -+#ifndef AT_FDCWD -+#define AT_FDCWD -2 -+#endif -+ - struct allocator; - - /* Assuming the current directory is FD, get the symbolic link value diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 82a1d6af8329..a7345b1decfa 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -11,7 +11,7 @@ , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , sigtool, jansson, harfbuzz, sqlite, nixosTests -, dontRecurseIntoAttrs ,emacsPackagesFor +, dontRecurseIntoAttrs, emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params , systemd ? null , withX ? !stdenv.isDarwin diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dde08c9d5e9d..0c2b45c914a5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -344,8 +344,8 @@ mapAliases ({ electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 # Emacs - emacs27Packages = emacs27.pkgs; # Added 2020-12-18 - emacs27WithPackages = emacs27.pkgs.withPackages; # Added 2020-12-18 + emacs28Packages = emacs28.pkgs; # Added 2021-10-04 + emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 emacsPackages = emacs.pkgs; # Added 2020-12-18 emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22d842be9220..4f43b7635388 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25480,10 +25480,11 @@ with pkgs; em = callPackage ../applications/editors/em { }; - emacs = emacs27; - emacs-nox = emacs27-nox; + emacs = emacs28; + emacsNativeComp = emacs28NativeComp; + emacs-nox = emacs28-nox; - emacs27 = callPackage ../applications/editors/emacs/27.nix { + emacs28 = callPackage ../applications/editors/emacs/28.nix { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; @@ -25495,7 +25496,11 @@ with pkgs; inherit (darwin) sigtool; }; - emacs27-nox = lowPrio (emacs27.override { + emacs28NativeComp = emacs28.override { + nativeComp = true; + }; + + emacs28-nox = lowPrio (emacs28.override { withX = false; withNS = false; withGTK2 = false; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index c33f8b2dc2aa..fa99c0eead85 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -47,6 +47,6 @@ }; # This is an alias which we disallow by default; explicitly allow it - emacs27Packages = emacs27.pkgs; + emacs28Packages = emacs28.pkgs; }; } From 67565c3af8982a4ccfe9d2ffbf9ca48116cc87eb Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Thu, 14 Apr 2022 15:55:33 +0300 Subject: [PATCH 104/171] tests/emacs-daemon: fix failure for unset $DISPLAY axelf4 figured[1] out a workaround for fixing a failure due to an unset $DISPLAY variable. [1] https://github.com/NixOS/nixpkgs/pull/168076#issuecomment-1098083299 --- nixos/tests/emacs-daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix index d53031a67f62..310e93e19b0b 100644 --- a/nixos/tests/emacs-daemon.nix +++ b/nixos/tests/emacs-daemon.nix @@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { ) # connects to the daemon - machine.succeed("emacsclient --create-frame $EDITOR >&2 &") + machine.succeed("emacsclient --no-wait --frame-parameters='((display . \"'\"$DISPLAY\"'\"))' --create-frame $EDITOR >&2") # checks that Emacs shows the edited filename machine.wait_for_text("emacseditor") From 913242e45c185b008f6e3bec8c3812bcba8b5491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Apr 2022 05:01:35 +0000 Subject: [PATCH 105/171] python3Packages.git-annex-adapter: fix build --- pkgs/development/python-modules/git-annex-adapter/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index d41874cff3b5..bcc4148c1953 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -22,6 +22,10 @@ buildPythonPackage rec { url = "https://github.com/alpernebbi/git-annex-adapter/commit/6c210d828e8a57b12c716339ad1bf15c31cd4a55.patch"; sha256 = "17kp7pnm9svq9av4q7hfic95xa1w3z02dnr8nmg14sjck2rlmqsi"; }) + (fetchpatch { + url = "https://github.com/alpernebbi/git-annex-adapter/commit/b78a8f445f1fb5cf34b28512fc61898ef166b5a1.patch"; + hash = "sha256-BSVoOPWsgY1btvn68bco4yb90FAC7ay2kYZ+q9qDHHw="; + }) (substituteAll { src = ./git-annex-path.patch; gitAnnex = "${git-annex}/bin/git-annex"; From 92fe27da603271baf3495a8496a9d917c639329d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 16 Apr 2022 08:34:58 +0200 Subject: [PATCH 106/171] vscode: move asar to nativeBuildInputs --- pkgs/applications/editors/vscode/generic.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index d704497b4f0c..c5576304e721 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -66,9 +66,9 @@ let buildInputs = [ libsecret libXScrnSaver libxshmfence ] ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages); - runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; + runtimeDependencies = lib.optional stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; - nativeBuildInputs = [unzip] ++ lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook wrapGAppsHook ]; + nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook nodePackages.asar wrapGAppsHook ]; dontBuild = true; dontConfigure = true; @@ -114,7 +114,7 @@ let # this is a fix for "save as root" functionality packed="resources/app/node_modules.asar" unpacked="resources/app/node_modules" - ${nodePackages.asar}/bin/asar extract "$packed" "$unpacked" + asar extract "$packed" "$unpacked" substituteInPlace $unpacked/@vscode/sudo-prompt/index.js \ --replace "/usr/bin/pkexec" "/run/wrappers/bin/pkexec" \ --replace "/bin/bash" "${bash}/bin/bash" From 2ca1c986175e864bb67a955a4189f7acf51f8b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 16 Apr 2022 08:35:14 +0200 Subject: [PATCH 107/171] vscode: fix auto encoding detection crashing editor window Closes #152939 --- pkgs/applications/editors/vscode/generic.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index c5576304e721..9a4f1b92d41f 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -120,6 +120,12 @@ let --replace "/bin/bash" "${bash}/bin/bash" rm -rf "$packed" + # without this symlink loading JsChardet, the library that is used for auto encoding detection when files.autoGuessEncoding is true, + # fails to load with: electron/js2c/renderer_init: Error: Cannot find module 'jschardet' + # and the window immediately closes which renders VSCode unusable + # see https://github.com/NixOS/nixpkgs/issues/152939 for full log + ln -rs "$unpacked" "$packed" + # this fixes bundled ripgrep chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg ''; From 5e6bd5771bdf0ac79b705e1444b194ecb70adc4b Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 16 Apr 2022 08:45:50 +0200 Subject: [PATCH 108/171] kde-frameworks: update homepage --- pkgs/development/libraries/kde-frameworks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 2f7d0943dd48..9732fcb663df 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -82,7 +82,7 @@ let meta = let meta = args.meta or {}; in meta // { - homepage = meta.homepage or "http://www.kde.org"; + homepage = meta.homepage or "https://kde.org"; license = meta.license or license; maintainers = (meta.maintainers or []) ++ maintainers; platforms = meta.platforms or lib.platforms.linux; From b558afaa5f27e13808dfe03722fbb657f5265edf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 09:44:33 +0200 Subject: [PATCH 109/171] python3Packages.flux-led: 0.28.27 -> 0.28.28 --- pkgs/development/python-modules/flux-led/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index f07efbee7f30..9e1c881805e8 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.27"; + version = "0.28.28"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-Z1NgQo4BrfdPAwoELzyjZphmuvPK/c09j/BvDOWaD9I="; + sha256 = "sha256-FtZHZ48XGo+0aP4ARSfzI9xzFVptYhG6CDVGTT4oDBQ="; }; propagatedBuildInputs = [ From 8fe13bfac72307b2e5b06d103e8c81239c255261 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 07:52:39 +0000 Subject: [PATCH 110/171] python310Packages.syslog-rfc5424-formatter: 1.2.2 -> 1.2.3 --- .../python-modules/syslog-rfc5424-formatter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix index 040db8d1e078..392c7806786e 100644 --- a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix +++ b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "syslog-rfc5424-formatter"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "easypost"; repo = pname; - rev = "v${version}"; - sha256 = "17ym5ls5r6dd9pg9frdz8myfq5fxyqlwdq1gygc9vnrxbgw2c9kb"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-dvRSOMXRmZf0vEEyX6H7OBSfo/PgyOLKuDS8X6g4qe0="; }; # Tests are not picked up, review later again From 389ea38a85daef56c4e0f4cd0eb5ab65b48a0057 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 10:09:33 +0200 Subject: [PATCH 111/171] python3Packages.syslog-rfc5424-formatter: disable on older Python releases --- .../syslog-rfc5424-formatter/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix index 392c7806786e..50ebc91d9e81 100644 --- a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix +++ b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix @@ -1,23 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "syslog-rfc5424-formatter"; version = "1.2.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "easypost"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-dvRSOMXRmZf0vEEyX6H7OBSfo/PgyOLKuDS8X6g4qe0="; + hash = "sha256-dvRSOMXRmZf0vEEyX6H7OBSfo/PgyOLKuDS8X6g4qe0="; }; # Tests are not picked up, review later again doCheck = false; - pythonImportsCheck = [ "syslog_rfc5424_formatter" ]; + pythonImportsCheck = [ + "syslog_rfc5424_formatter" + ]; meta = with lib; { description = "Python logging formatter for emitting RFC5424 Syslog messages"; From a86ec5d4d60b7aebd07e3d465423430e93d985dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 10:15:51 +0200 Subject: [PATCH 112/171] python3Packages.pymazda: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/pymazda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix index fdc7e1f67873..5ee3234b70d8 100644 --- a/pkgs/development/python-modules/pymazda/default.nix +++ b/pkgs/development/python-modules/pymazda/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.3.2"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d51619cfbd90f4bb4e8fbfe1bccd58d4f5ece9bdb78d8f33fed1776d749d5fa9"; + sha256 = "sha256-jvDjitS8r0oyANxUGbYksX7O7dbEqZeWEpYc9gABb78="; }; propagatedBuildInputs = [ From 70d0e2456857dc10dd7d2654277fc1dd8d8cc216 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 Apr 2022 19:50:06 +0800 Subject: [PATCH 113/171] nixos/logrotate: use packages from buildPackages in configuration checkPhase, fixing cross compilation --- nixos/modules/services/logging/logrotate.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 332a2a597edc..e6eb0552c9e9 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -162,8 +162,8 @@ let # file exist, but we only have sandboxed users here so brown these # out. according to man page that means su, create and createolddir. # files required to exist also won't be present, so missingok is forced. - user=$(${pkgs.coreutils}/bin/id -un) - group=$(${pkgs.coreutils}/bin/id -gn) + user=$(${pkgs.buildPackages.coreutils}/bin/id -un) + group=$(${pkgs.buildPackages.coreutils}/bin/id -gn) sed -e "s/\bsu\s.*/su $user $group/" \ -e "s/\b\(create\s\+[0-9]*\s*\|createolddir\s\+[0-9]*\s\+\).*/\1$user $group/" \ -e "1imissingok" -e "s/\bnomissingok\b//" \ @@ -173,7 +173,7 @@ let # 'error:' at common log level, so we can use grep, taking care # to keep error codes set -o pipefail - if ! ${pkgs.logrotate}/sbin/logrotate --debug /tmp/logrotate.conf 2>&1 \ + if ! ${pkgs.buildPackages.logrotate}/sbin/logrotate --debug /tmp/logrotate.conf 2>&1 \ | ( ! grep "error:" ) > /tmp/logrotate-error; then echo "Logrotate configuration check failed." echo "The failing configuration (after adjustments to pass tests in sandbox) was:" From 3016d0aeb8458210e449bf2adeafef2ee539e89c Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 3 Mar 2022 08:35:07 +0800 Subject: [PATCH 114/171] polybar: 3.5.7 -> 3.6.2 Co-authored-by: Alexander Foremny --- .../from_md/release-notes/rl-2205.section.xml | 18 ++++++++++++++++++ .../manual/release-notes/rl-2205.section.md | 3 +++ pkgs/applications/misc/polybar/default.nix | 14 ++++++++++++-- .../misc/polybar/remove-hardcoded-etc.diff | 13 +++++++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/misc/polybar/remove-hardcoded-etc.diff diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 33b0b3faea6f..4048b882f0da 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -2002,6 +2002,24 @@ + + + The polybar package has been updated from + 3.5.7 to 3.6.2. See + the + changelog for more details. + + + + + Breaking changes include changes to escaping rules in + configuration values, changes in behavior when + encountering invalid tag names, and changes to + inter-process-messaging (IPC). + + + + Renamed option diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index a671f08acfd9..dab71c900dc7 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -709,6 +709,9 @@ In addition to numerous new and upgraded packages, this release has the followin - The RPC protocol version was bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume. - A bug involving encrypt-on-receive has been fixed. Read the [zrepl documentation](https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder) and check the output of `zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS` on the receiver. +- The `polybar` package has been updated from 3.5.7 to 3.6.2. See [the changelog](https://github.com/polybar/polybar/releases/tag/3.6.0) for more details. + - Breaking changes include changes to escaping rules in configuration values, changes in behavior when encountering invalid tag names, and changes to inter-process-messaging (IPC). + - Renamed option `services.openssh.challengeResponseAuthentication` to `services.openssh.kbdInteractiveAuthentication`. Reason is that the old name has been deprecated upstream. Using the old option name will still work, but produce a warning. diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 3660b0d7e0b1..f737f18d158e 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -2,6 +2,7 @@ , cairo , cmake , fetchFromGitHub +, libuv , libXdmcp , libpthreadstubs , libxcb @@ -43,13 +44,13 @@ stdenv.mkDerivation rec { pname = "polybar"; - version = "3.5.7"; + version = "3.6.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-h12VW3IY4do4cKz2Fd/QgVTBk+zJO+qXuRUCQUyO/x0="; + hash = "sha256-mLAcA8afGLNhRRU/x/TngCMcSRXdEM5wKWoYZhezJqU="; fetchSubmodules = true; }; @@ -62,6 +63,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo + libuv libXdmcp libpthreadstubs libxcb @@ -84,6 +86,14 @@ stdenv.mkDerivation rec { ++ lib.optional i3Support i3 ++ lib.optional i3GapsSupport i3-gaps; + patches = [ ./remove-hardcoded-etc.diff ]; + + # Replace hardcoded /etc when copying and reading the default config. + postPatch = '' + substituteInPlace CMakeLists.txt --replace "/etc" $out + substituteAllInPlace src/utils/file.cpp + ''; + postInstall = if i3Support then '' wrapProgram $out/bin/polybar \ diff --git a/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff b/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff new file mode 100644 index 000000000000..d0c6db8b6b0a --- /dev/null +++ b/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff @@ -0,0 +1,13 @@ +diff --git a/src/utils/file.cpp b/src/utils/file.cpp +index 9511ad61..d3d82b99 100644 +--- a/src/utils/file.cpp ++++ b/src/utils/file.cpp +@@ -322,7 +322,7 @@ namespace file_util { + possible_paths.push_back(xdg_config_dir + suffix + ".ini"); + } + +- possible_paths.push_back("/etc" + suffix + ".ini"); ++ possible_paths.push_back("@out@" + suffix + ".ini"); + + for (const string& p : possible_paths) { + if (exists(p)) { From 0e9bebed0c0ed6f15d7c6873df57d463297eb02f Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Fri, 15 Apr 2022 21:53:13 -0300 Subject: [PATCH 115/171] neovim: 0.6.0 -> 0.7.0 --- pkgs/applications/editors/neovim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index e06096933c97..b4858b21eeed 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-0XCW047WopPr3pRTy9rF3Ff6MvNRHT4FletzOERD41A="; + sha256 = "sha256-eYYaHpfSaYYrLkcD81Y4rsAMYDP1IJ7fLJJepkACkA8="; }; patches = [ From bc73bc21ce933a4a9b31ff2ee64deb655498fb2d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 16 Apr 2022 11:05:22 +0100 Subject: [PATCH 116/171] graalvm17-ce: enable Native Image in aarch64-linux Co-authored-by: tricktron --- .../graalvm/community-edition/default.nix | 7 +------ .../community-edition/graalvm17-ce-sources.json | 16 ++++++++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 32b77d0f6e1e..e45c89b3f1be 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -68,12 +68,7 @@ in version = graalvm17-ce-dev-version; }; aarch64-linux = { - # TODO: error with native-image-installable-svm in aarch64-linux: - # "Caused by: java.io.IOException: Cannot run program - # "/nix/store/00000000000000000000000000000000-gcc-wrapper-9.3.0/bin/gcc" (in - # directory"/tmp/SVM-0000000000000000000"): error=0, Failed to exec spawn - # helper: pid: 19865, exit value: 1" - products = [ "graalvm-ce" ]; + inherit products; arch = "linux-aarch64"; }; }; diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json index 475c0feb050b..57fdd4c28846 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json @@ -1,12 +1,12 @@ { "darwin-aarch64": { - "graalvm-ce|java17|22.2.0-dev-20220414_2112": { - "sha256": "1ae8991d95814945d33cf8758a1e7072c48660680d1d90ec5629671e25f99344", - "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/graalvm-ce-java17-darwin-aarch64-dev.tar.gz" + "graalvm-ce|java17|22.2.0-dev-20220415_1945": { + "sha256": "1dbb0e0b9c85391ea6f1a0bd95ae252a396152d83e3a0e79cffd988144259e68", + "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220415_1945/graalvm-ce-java17-darwin-aarch64-dev.tar.gz" }, - "native-image-installable-svm|java17|22.2.0-dev-20220414_2112": { - "sha256": "8a35491ea5487e755c087072fc827d81ec37a23075dcb29850e6f6cd5ff9630f", - "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/native-image-installable-svm-java17-darwin-aarch64-dev.jar" + "native-image-installable-svm|java17|22.2.0-dev-20220415_1945": { + "sha256": "029499c011ceb1a4560957db651805325a201488b5f0b7467f007c7385d004e2", + "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220415_1945/native-image-installable-svm-java17-darwin-aarch64-dev.jar" } }, "darwin-amd64": { @@ -23,6 +23,10 @@ "graalvm-ce|java17|22.0.0.2": { "sha256": "c7d78387d2a144944f26773697c1b61d3478a081a1c5e7fc20f47f1f5f3c82c7", "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java17-linux-aarch64-22.0.0.2.tar.gz" + }, + "native-image-installable-svm|java17|22.0.0.2": { + "sha256": "798947d0a93988929d2b8e3555f7c65225e789124cd99fbc0c3aae5f350175db", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java17-linux-aarch64-22.0.0.2.jar" } }, "linux-amd64": { From 7062faa185108f3d609a2dc20c4c4b4cb4419293 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 10:15:36 +0000 Subject: [PATCH 117/171] python310Packages.pg8000: 1.24.1 -> 1.24.2 --- pkgs/development/python-modules/pg8000/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 8653c28c878d..29ab17c8ba83 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.24.1"; + version = "1.24.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KRIixd39ZqP8DTIXAM9ZHIsPkw0vyEh3fWz8/1VEPOY="; + sha256 = "sha256-q3/ASKVvysTZwkeyKoNW5gjdmgPUg18ch/ui5PJihKU="; }; propagatedBuildInputs = [ From 4f1fd175d300020f5b318500a57f974df9b2e8fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 01:34:02 +0000 Subject: [PATCH 118/171] brave: 1.37.113 -> 1.37.116 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 74ffdf3ccd8b..5d6df5dac0de 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -93,11 +93,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.37.113"; + version = "1.37.116"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "YjLUDoVrZitJEQOfoM/YmD55OOL/K3KF9v76zjguQHM="; + sha256 = "HoqmzUyYas5ho9S8ZeXHj+LuNspejuQ69B6HxuKXWtw="; }; dontConfigure = true; From 4624d0a8d30b6f5c67347114b05bd95baed7e2dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Apr 2022 02:30:07 +0000 Subject: [PATCH 119/171] bacon: 2.0.1 -> 2.1.0 --- pkgs/development/tools/bacon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index 093a37e2b96d..76478114df49 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aOxwM9ur0E/biLOzhDyTCWYBwdbpsTQ49aCfkFea5ck="; + sha256 = "sha256-SlyJSBgFRLMQX68QGSTtffYL7mRROR+AF/Kix6f4miQ="; }; - cargoSha256 = "sha256-AUoLwryuEdUdWasaHuap6qff8DRi90iq/v4afyG9beo="; + cargoSha256 = "sha256-TIENdbXpMWdsnyTIHCMpa0KJnzJPlrDZoKoAdjBw2uM="; buildInputs = lib.optional stdenv.isDarwin CoreServices; From bc5e8ae506d1d25cd62560e6bc626cf334f7336f Mon Sep 17 00:00:00 2001 From: Faye Duxovni Date: Fri, 15 Apr 2022 20:13:47 -0400 Subject: [PATCH 120/171] buildRustCrate: don't try to set CARGO_FEATURE_ variables for dep: features These features are internal-only, have special characters that bash doesn't support in variable names, and aren't normally given environment variables by cargo as far as I can tell. --- pkgs/build-support/rust/build-rust-crate/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index afb938e51182..20b93b1921f8 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -277,9 +277,14 @@ crate_: lib.makeOverridable # Create a list of features that are enabled by the crate itself and # through the features argument of buildRustCrate. Exclude features - # with a forward slash, since they are passed through to dependencies. + # with a forward slash, since they are passed through to dependencies, + # and dep: features, since they're internal-only and do nothing except + # enable optional dependencies. crateFeatures = lib.optionals (crate ? features) - (builtins.filter (f: !lib.hasInfix "/" f) (crate.features ++ features)); + (builtins.filter + (f: !(lib.hasInfix "/" f || lib.hasPrefix "dep:" f)) + (crate.features ++ features) + ); libName = if crate ? libName then crate.libName else crate.crateName; libPath = if crate ? libPath then crate.libPath else ""; From 077d187a4b37ba81ebe9f6985c1dbd0b19f6d33d Mon Sep 17 00:00:00 2001 From: X9VoiD Date: Tue, 29 Mar 2022 14:48:01 +0800 Subject: [PATCH 121/171] broadcom_sta: fix build on linux 5.17 Fix build issues when compiling against Linux 5.17 --- .../linux/broadcom-sta/default.nix | 2 + .../linux/broadcom-sta/linux-5.17.patch | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/os-specific/linux/broadcom-sta/linux-5.17.patch diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 5d86c2311f1f..b15c61488cbb 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation { ./linux-5.6.patch # source: https://gist.github.com/joanbm/5c640ac074d27fd1d82c74a5b67a1290 ./linux-5.9.patch + # source: https://github.com/archlinux/svntogit-community/blob/5ec5b248976f84fcd7e3d7fae49ee91289912d12/trunk/012-linux517.patch + ./linux-5.17.patch ./null-pointer-fix.patch ./gcc.patch ]; diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-5.17.patch b/pkgs/os-specific/linux/broadcom-sta/linux-5.17.patch new file mode 100644 index 000000000000..74847cb6bb40 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-5.17.patch @@ -0,0 +1,39 @@ +diff -u -r a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +--- a/src/wl/sys/wl_linux.c 2022-03-23 00:35:42.930416350 +0000 ++++ b/src/wl/sys/wl_linux.c 2022-03-23 00:40:12.903771013 +0000 +@@ -2980,7 +2980,11 @@ + else + dev->type = ARPHRD_IEEE80211_RADIOTAP; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) + bcopy(wl->dev->dev_addr, dev->dev_addr, ETHER_ADDR_LEN); ++#else ++ eth_hw_addr_set(wl->dev, dev->dev_addr); ++#endif + + #if defined(WL_USE_NETDEV_OPS) + dev->netdev_ops = &wl_netdev_monitor_ops; +@@ -3261,7 +3265,11 @@ + static ssize_t + wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) + wl_info_t * wl = PDE_DATA(file_inode(filp)); ++#else ++ wl_info_t * wl = pde_data(file_inode(filp)); ++#endif + #endif + int bcmerror, len; + int to_user = 0; +@@ -3318,7 +3326,11 @@ + static ssize_t + wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) + wl_info_t * wl = PDE_DATA(file_inode(filp)); ++#else ++ wl_info_t * wl = pde_data(file_inode(filp)); ++#endif + #endif + int from_user = 0; + int bcmerror; From 6b2eca8d5654837a2e7ac2caf2938e79d02778cb Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 15 Apr 2022 20:54:38 +0200 Subject: [PATCH 122/171] nixos/ipfs: remove unused code This code became obsolete with 4044d81d5cea617e58ec9682f9cc447dde326850, just a couple days after it was introduced. --- nixos/modules/services/network-filesystems/ipfs.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index a670551d9f3b..fe375e6ad19f 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -1,8 +1,7 @@ -{ config, lib, pkgs, options, utils, ... }: +{ config, lib, pkgs, utils, ... }: with lib; let cfg = config.services.ipfs; - opt = options.services.ipfs; ipfsFlags = utils.escapeSystemdExecArgs ( optional cfg.autoMount "--mount" ++ From 8a5e51525d44b1468018c0b0a4c0758bcb533657 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 15 Apr 2022 21:06:21 +0200 Subject: [PATCH 123/171] nixos/ipfs: add Luflosi as maintainer --- nixos/modules/services/network-filesystems/ipfs.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index fe375e6ad19f..45fb58e6336d 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -315,6 +315,9 @@ in in [ "" "%t/ipfs.sock" ] ++ lib.optional (fromCfg != null) fromCfg; }; + }; + meta = { + maintainers = with lib.maintainers; [ Luflosi ]; }; } From faad370edcb37162401be50d45526f52bb16a713 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 15 Apr 2022 21:09:07 +0200 Subject: [PATCH 124/171] nixos/ipfs: fix the services.ipfs.autoMigrate option Apparently this was never properly tested and never worked. When the IPFS repo needs upgrading, the first call to ipfs, which is run before running the migration, fails with the error message "Error: ipfs repo needs migration". To fix this, simply run the migration before any `ipfs config` calls but don't run it when `dataDir` is empty and we need to call `ipfs init`. Writing a NixOS test for this would require keeping at least two versions of IPFS in Nixpkgs, which we don't currently do. --- nixos/modules/services/network-filesystems/ipfs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 45fb58e6336d..395b9788855f 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -254,15 +254,15 @@ in else # After an unclean shutdown this file may exist which will cause the config command to attempt to talk to the daemon. This will hang forever if systemd is holding our sockets open. rm -vf "$IPFS_PATH/api" - + '' + optionalString cfg.autoMigrate '' + ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y + '' + '' ipfs --offline config profile apply ${profile} fi '' + optionalString cfg.autoMount '' ipfs --offline config Mounts.FuseAllowOther --json true ipfs --offline config Mounts.IPFS ${cfg.ipfsMountDir} ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir} - '' + optionalString cfg.autoMigrate '' - ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y '' + '' ipfs --offline config show \ | ${pkgs.jq}/bin/jq '. * $extraConfig' --argjson extraConfig ${ From 5c9a8665511a7757aac91b020c8b7162d7cde479 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 16 Apr 2022 12:37:37 +0100 Subject: [PATCH 125/171] graalvmXX-ce: add sourcesPath parameter In #168816, we removed support for Python/Ruby/WASM to reduce the support burden of GraalVM languages that, arguably, are not really being used. However, the way that `pkgs.graalvmCEPackages.mkGraal` function works right now doesn't allow passing a custom sources file, that would allow someone to compile GraalVM with the additional products (e.g.: Python). This PR adds this possibility. So if someone wants to create a custom graalvm11-ce derivation with Python support, for example, they can do something like this: ```nix let graalvm11-ce-custom = pkgs.graalvmCEPackages.mkGraal { config = { x86_64-linux = { products = [ "graalvm-ce" "python-installable-svm" ]; arch = "linux-amd64"; }; }; defaultVersion = "22.0.0.2"; javaVersion = "11"; platforms = "x86_64-linux"; sourcesPath = /home/someone/graalvm11-ce-sources.json; }; in { environment.systemPackages = [ graalvm11-ce-custom ]; } ``` --- .../graalvm/community-edition/default.nix | 4 ++-- .../graalvm11-ce-sources.json | 12 +++++------ .../graalvm/community-edition/mkGraal.nix | 18 +++++++++-------- .../graalvm/community-edition/update.nix | 20 +++++++++---------- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index e45c89b3f1be..c50b9e49f55a 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -15,8 +15,8 @@ let */ graalvm11-ce-release-version = "22.0.0.2"; graalvm17-ce-release-version = "22.0.0.2"; - graalvm11-ce-dev-version = "22.2.0-dev-20220401_1942"; - graalvm17-ce-dev-version = "22.2.0-dev-20220401_1942"; + graalvm11-ce-dev-version = "22.2.0-dev-20220415_1945"; + graalvm17-ce-dev-version = "22.2.0-dev-20220415_1945"; products = [ "graalvm-ce" diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json index e3d514d58b9d..732cefbdf738 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json @@ -1,12 +1,12 @@ { "darwin-aarch64": { - "graalvm-ce|java11|22.2.0-dev-20220414_2112": { - "sha256": "7d1d39a7cc2579112e745943fa5b557405b501f5c3c3fde441f9a31c7627d18d", - "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/graalvm-ce-java11-darwin-aarch64-dev.tar.gz" + "graalvm-ce|java11|22.2.0-dev-20220415_1945": { + "sha256": "ab81b00177124d746a3871b6e48ce7611e93dd3b4f6dee45d77300ef214fbab8", + "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220415_1945/graalvm-ce-java11-darwin-aarch64-dev.tar.gz" }, - "native-image-installable-svm|java11|22.2.0-dev-20220414_2112": { - "sha256": "5ec82588bf493c38656ca7c31fff276342ce1cbadee41309ae7a3486f56f7ba7", - "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220414_2112/native-image-installable-svm-java11-darwin-aarch64-dev.jar" + "native-image-installable-svm|java11|22.2.0-dev-20220415_1945": { + "sha256": "9d3753736fe71f55f3fb3bcbdf43271dd96dda0c4b731d11f3f890d5bddf3bbb", + "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/22.2.0-dev-20220415_1945/native-image-installable-svm-java11-darwin-aarch64-dev.jar" } }, "darwin-amd64": { diff --git a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix index 8f4aaba44f08..768ad1fbaa17 100644 --- a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix +++ b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix @@ -1,7 +1,9 @@ -{ javaVersion +{ config , defaultVersion +, javaVersion , platforms -, config +, forceUpdate ? false +, sourcesPath ? ./. + "/graalvm${javaVersion}-ce-sources.json" , useMusl ? false }: @@ -32,10 +34,11 @@ , gtkSupport ? stdenv.isLinux , cairo , glib -, gtk3 -, writeShellScript -, jq + # updateScript deps , gnused +, gtk3 +, jq +, writeShellScript }: assert useMusl -> stdenv.isLinux; @@ -44,8 +47,7 @@ let platform = config.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); version = platform.version or defaultVersion; name = "graalvm${javaVersion}-ce"; - sourcesFilename = "${name}-sources.json"; - sources = builtins.fromJSON (builtins.readFile (./. + "/${sourcesFilename}")); + sources = builtins.fromJSON (builtins.readFile sourcesPath); runtimeLibraryPath = lib.makeLibraryPath ([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]); @@ -285,7 +287,7 @@ let inherit (platform) products; home = graalvmXXX-ce; updateScript = import ./update.nix { - inherit lib writeShellScript jq sourcesFilename name config gnused defaultVersion; + inherit config defaultVersion forceUpdate gnused jq lib name sourcesPath writeShellScript; graalVersion = version; javaVersion = "java${javaVersion}"; }; diff --git a/pkgs/development/compilers/graalvm/community-edition/update.nix b/pkgs/development/compilers/graalvm/community-edition/update.nix index 6201ab100177..77f9d0e095ba 100644 --- a/pkgs/development/compilers/graalvm/community-edition/update.nix +++ b/pkgs/development/compilers/graalvm/community-edition/update.nix @@ -1,14 +1,14 @@ -{ javaVersion -, graalVersion +{ config , defaultVersion -, config -, sourcesFilename -, name -, lib -, writeShellScript -, jq +, forceUpdate , gnused -, forceUpdate ? false +, graalVersion +, javaVersion +, jq +, lib +, name +, sourcesPath +, writeShellScript }: /* @@ -185,7 +185,7 @@ let newVersion = getLatestVersion graalVersion; sourcesJson = genSources javaVersion defaultVersion config; - sourcesJsonPath = lib.strings.escapeShellArg ./. + "/${sourcesFilename}"; + sourcesJsonPath = lib.strings.escapeShellArg sourcesPath; # versionKeyInDefaultNix String -> String versionKeyInDefaultNix = graalVersion: From 9f4b7f2952d71eb2a8abd99d3d15c7e4ccd90aee Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sat, 16 Apr 2022 15:00:45 +0300 Subject: [PATCH 126/171] libpostal: mark supported on darwin --- pkgs/development/libraries/libpostal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpostal/default.nix b/pkgs/development/libraries/libpostal/default.nix index d32cb2731a11..6b616a61d517 100644 --- a/pkgs/development/libraries/libpostal/default.nix +++ b/pkgs/development/libraries/libpostal/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/openvenues/libpostal"; license = licenses.mit; maintainers = [ maintainers.Thra11 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From d9d57d2053478dc5cfe9435e71bbc22485b39282 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 16 Apr 2022 14:02:55 +0200 Subject: [PATCH 127/171] yaru-theme: unstable-2022-04-07 -> 22.04.4 --- pkgs/data/themes/yaru/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index e2bc278299dd..18c471e4f96b 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "unstable-2022-04-07"; # 22.04.3.1 is broken + version = "22.04.4"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; - rev = "9bdbf66bf3718c6595c7a15ef4698ba471a36526"; - sha256 = "02f6m0jxnsczw3y7v7bqdihxa33sx2z93yn3j8w4z9r9fv2pn06b"; + rev = version; + sha256 = "sha256-EnlzjJDbiMIImn0XmiurK++JnD/kBqv4Mw6B/ps8d4Y="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; From 6b2691d7ce0ebfadf750a29a2733fbaffec03d5f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 16 Apr 2022 13:33:19 +0100 Subject: [PATCH 128/171] graalvmXX-ce: add documentation to mkGraal function --- .../graalvm/community-edition/default.nix | 2 -- .../graalvm/community-edition/mkGraal.nix | 31 +++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index c50b9e49f55a..167aaa95c5ff 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -49,7 +49,6 @@ in }; defaultVersion = graalvm11-ce-release-version; javaVersion = "11"; - platforms = builtins.attrNames config; }; graalvm17-ce = mkGraal rec { @@ -74,6 +73,5 @@ in }; defaultVersion = graalvm17-ce-release-version; javaVersion = "17"; - platforms = builtins.attrNames config; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix index 768ad1fbaa17..77f0fa9b7dc5 100644 --- a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix +++ b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix @@ -1,9 +1,36 @@ -{ config +{ + # An attrset describing each platform configuration. All values are extract + # from the GraalVM releases available on + # https://github.com/graalvm/graalvm-ce-builds/releases + # Example: + # config = { + # x86_64-linux = { + # # List of products that will be included in the GraalVM derivation + # # See `with{NativeImage,Ruby,Python,WASM,*}Svm` variables for the + # # available values + # products = [ "graalvm-ce" "native-image-installable-svm" ]; + # # GraalVM arch, not to be confused with the nix platform + # arch = "linux-amd64"; + # # GraalVM version + # version = "22.0.0.2"; + # }; + # } + config + # GraalVM version that will be used unless overriden by `config..version` , defaultVersion + # Java version used by GraalVM , javaVersion -, platforms + # Platforms were GraalVM will be allowed to build (i.e. `meta.platforms`) +, platforms ? builtins.attrNames config + # If set to true, update script will (re-)generate the sources file even if + # there are no updates available , forceUpdate ? false + # Path for the sources file that will be used + # See `update.nix` file for a description on how this file works , sourcesPath ? ./. + "/graalvm${javaVersion}-ce-sources.json" + # Use musl instead of glibc to allow true static builds in GraalVM's + # Native Image (i.e.: `--static --libc=musl`). This will cause glibc builds + # to fail, so it should be used with care , useMusl ? false }: From 5ed926eb38cc58138021719bb913ca2303f7d114 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 16 Apr 2022 14:05:01 +0100 Subject: [PATCH 129/171] trivy: 0.25.3 -> 0.26.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 4dbc1c96bb9f..c9595286173d 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.25.3"; + version = "0.26.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TRcGUjmhV5vP3c4VeGfRtV+Fcnl/09HIQ+ojfAFWdm8="; + sha256 = "sha256-Se42a9Q76LsMk6b04P2C2sWSZ2UgfnQrpJUC2gwdCwY="; }; - vendorSha256 = "sha256-3rJj+LDHQPYpYsU52kldFFpgS7Ry1n5Kjy0IAK6q/vU="; + vendorSha256 = "sha256-y/7KhDx6p+n6nvFHWcvGbvOWsXvvL81jOgfjxsL/JDg="; excludedPackages = "misc"; From b2f53084006be15f213f87fd2fc1739899869016 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 16 Apr 2022 15:19:03 +0200 Subject: [PATCH 130/171] nixos/doc: move "Building NixOS" into "Installation", not "Development" This section mostly describes how to build various installer images, so it fits better in that chapter. Proposed in https://github.com/NixOS/nixpkgs/pull/168306#discussion_r848329534 --- nixos/doc/manual/development/development.xml | 1 - .../{development => installation}/building-nixos.chapter.xml | 0 .../{development => installation}/building-nixos.chapter.md | 0 nixos/doc/manual/installation/installation.xml | 1 + 4 files changed, 1 insertion(+), 1 deletion(-) rename nixos/doc/manual/from_md/{development => installation}/building-nixos.chapter.xml (100%) rename nixos/doc/manual/{development => installation}/building-nixos.chapter.md (100%) diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index 21286cdbd2b4..624ee3931659 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -14,7 +14,6 @@ - diff --git a/nixos/doc/manual/from_md/development/building-nixos.chapter.xml b/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml similarity index 100% rename from nixos/doc/manual/from_md/development/building-nixos.chapter.xml rename to nixos/doc/manual/from_md/installation/building-nixos.chapter.xml diff --git a/nixos/doc/manual/development/building-nixos.chapter.md b/nixos/doc/manual/installation/building-nixos.chapter.md similarity index 100% rename from nixos/doc/manual/development/building-nixos.chapter.md rename to nixos/doc/manual/installation/building-nixos.chapter.md diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml index 1d443bbd0ee1..ba07d71d0ca3 100644 --- a/nixos/doc/manual/installation/installation.xml +++ b/nixos/doc/manual/installation/installation.xml @@ -14,4 +14,5 @@ + From 7d83997eb49f8098ac3dd2c1641d873bbba394c8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 5 Apr 2022 15:24:25 +0000 Subject: [PATCH 131/171] busybox: 1.34.1 -> 1.35.0 --- pkgs/os-specific/linux/busybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 970129f97390..636a07edddfd 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -50,14 +50,14 @@ in stdenv.mkDerivation rec { pname = "busybox"; - version = "1.34.1"; + version = "1.35.0"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0jfm9fik7nv4w21zqdg830pddgkdjmplmna9yjn9ck1lwn4vsps1"; + sha256 = "sha256-+u6yRMNaNIozT0pZ5EYm7ocPsHtohNaMEK6LwZ+DppQ="; }; hardeningDisable = [ "format" "pie" ] From b690d6aff3e62a4e43c658ed92e51f64e7177daf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 13:24:46 +0000 Subject: [PATCH 132/171] python310Packages.diff-cover: 6.4.5 -> 6.5.0 --- pkgs/development/python-modules/diff-cover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 22435ae71ba5..1fc50c5ef232 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "6.4.5"; + version = "6.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - sha256 = "sha256-qUuMHBfcJEmJF/con+ODtFfYrU7yo//KgKiSpByLWKY="; + sha256 = "sha256-N2O0/C75EGO6crUCFGUiJLLQqfMVRNVQRZb1xKhHzXs="; }; propagatedBuildInputs = [ From b01b9080bd892b1084515a46fe8507699d9272fa Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 16 Apr 2022 06:38:53 -0400 Subject: [PATCH 133/171] vector: 0.20.1 -> 0.21.0 --- pkgs/tools/misc/vector/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index c5b6cc96ea90..41279b1434db 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -21,16 +21,16 @@ # TODO investigate adding "api" "api-client" "vrl-cli" and various "vendor-*" # "disk-buffer" is using leveldb TODO: investigate how useful # it would be, perhaps only for massive scale? -, features ? ([ "sinks" "sources" "transforms" ] +, features ? ([ "sinks" "sources" "transforms" "vrl-cli" ] # the second feature flag is passed to the rdkafka dependency # building on linux fails without this feature flag (both x86_64 and AArch64) - ++ lib.optionals enableKafka [ "rdkafka-plain" "rdkafka/dynamic_linking" ] + ++ lib.optionals enableKafka [ "rdkafka/gssapi-vendored" ] ++ lib.optional stdenv.targetPlatform.isUnix "unix") }: let pname = "vector"; - version = "0.20.1"; + version = "0.21.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -39,10 +39,10 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0xC6CpmSTRt7zj6RHqtjbMXWEiMUOdIymWVGI8Js+70="; + sha256 = "sha256-ZhOtrv63ZhG3OEWLTk+VdZr6Y6f9KvyCJvAKWck7B7o="; }; - cargoSha256 = "sha256-NLMyE9+iYFWuMmL50TeLZVvlHkIDaSZYJwXK4ykGrb8="; + cargoSha256 = "sha256-VGB+ljojXGrQmcN0AT90hFk9h5nwjDTtzGpWmItw9x4="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; @@ -55,6 +55,9 @@ rustPlatform.buildRustPackage { TZDIR = "${tzdata}/share/zoneinfo"; + # needed to dynamically link rdkafka + CARGO_FEATURE_DYNAMIC_LINKING=1; + buildNoDefaultFeatures = true; buildFeatures = features; @@ -105,5 +108,6 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/timberio/vector"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ thoughtpolice happysalada ]; + platforms = with platforms; linux; }; } From cb285332031e9ec9e345ef5e99a0d12758564179 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 16 Apr 2022 14:55:45 +0100 Subject: [PATCH 134/171] syft: 0.44.0 -> 0.44.1 --- pkgs/tools/admin/syft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 0128c6191c16..11c748f5d64e 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.44.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w5/lTGkwH6cLzbj6/ZUJyFtwx9EyA5Q7hs/CwtsdsJA="; + sha256 = "sha256-kDTTOc2sPCKWGeVuXlGhOo2dHjBZ1QEE7jAEVs4a70U="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; From 228209d60b661109fcea362de18594e7d9c8a2e5 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sat, 16 Apr 2022 15:56:12 +0200 Subject: [PATCH 135/171] libnfc: 1.7.1 -> 1.8.0 https://github.com/nfc-tools/libnfc/blob/master/ChangeLog --- pkgs/development/libraries/libnfc/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index 7e0d18115ef7..41d546723600 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -1,14 +1,17 @@ -{ lib, stdenv, fetchurl, libusb-compat-0_1, readline }: +{ lib, stdenv, fetchFromGitHub, libusb-compat-0_1, readline, cmake, pkg-config }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libnfc"; - version = "1.7.1"; + version = "1.8.0"; - src = fetchurl { - url = "http://dl.bintray.com/nfc-tools/sources/libnfc-1.7.1.tar.bz2"; - sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll"; + src = fetchFromGitHub { + owner = "nfc-tools"; + repo = pname; + rev = "libnfc-${version}"; + sha256 = "5gMv/HajPrUL/vkegEqHgN2d6Yzf01dTMrx4l34KMrQ="; }; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libusb-compat-0_1 readline ]; configureFlags = [ "sysconfdir=/etc" ]; @@ -17,7 +20,7 @@ stdenv.mkDerivation { description = "Open source library libnfc for Near Field Communication"; license = licenses.gpl3; homepage = "https://github.com/nfc-tools/libnfc"; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; } From 554fc3d6274d7f63acea680e7f3e0bfbab3b798d Mon Sep 17 00:00:00 2001 From: Heph Date: Sat, 2 Apr 2022 21:21:56 +0200 Subject: [PATCH 136/171] gmid: 1.8.1 -> 1.8.3 --- pkgs/servers/gemini/gmid/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/gemini/gmid/default.nix b/pkgs/servers/gemini/gmid/default.nix index b6ccbd1de704..3f4a440746ce 100644 --- a/pkgs/servers/gemini/gmid/default.nix +++ b/pkgs/servers/gemini/gmid/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, bison, which, libressl, libevent }: +{ lib, stdenv, fetchFromGitHub, bison, libressl, libevent }: stdenv.mkDerivation rec { pname = "gmid"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - hash = "sha256-XNif164C5b5sVsZW7sy0id4qM/mJzg3RhoHbwJuJqDk="; + hash = "sha256-vghoPsyGspPn22Kl61qiaALS2R243JSuS80uKFBHc9k="; }; - nativeBuildInputs = [ bison which ]; + nativeBuildInputs = [ bison ]; buildInputs = [ libressl libevent ]; From 267fa3bc87368171815e5961ae343bc03f4f1403 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 16:14:45 +0000 Subject: [PATCH 137/171] python310Packages.google-cloud-error-reporting: 1.5.1 -> 1.5.2 --- .../python-modules/google-cloud-error-reporting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 9c5af01714c5..767f93f92269 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.5.1"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7gFpvFxtYneABxW2mOwW1V2E7kobmj0yzV0pxaRhs8c="; + sha256 = "sha256-wjRUPBZwyGP+2528vZ/x4EqiZwqH+9ZvK5rx4ISklHE="; }; postPatch = '' From 5a1c6f1d63c2a1debe221c33f20aa0ee8c4dcfa7 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 16 Dec 2021 23:40:21 +0100 Subject: [PATCH 138/171] python3Packages.shiv: init at 1.0.1 --- .../python-modules/shiv/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/shiv/default.nix diff --git a/pkgs/development/python-modules/shiv/default.nix b/pkgs/development/python-modules/shiv/default.nix new file mode 100644 index 000000000000..14cb688be464 --- /dev/null +++ b/pkgs/development/python-modules/shiv/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, click +, pip +, setuptools +, wheel +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "shiv"; + version = "1.0.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "ec16095a0565906536af7f5e57771e9ae7a061b646ed63ad66ebbc70c30f4d2a"; + }; + + propagatedBuildInputs = [ click pip setuptools wheel ]; + + pythonImportsCheck = [ "shiv" ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Command line utility for building fully self contained Python zipapps"; + homepage = "https://github.com/linkedin/shiv"; + license = licenses.bsd2; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91bd3639de9a..fb14bc48aa7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9854,6 +9854,8 @@ with pkgs; shen-sources = callPackage ../development/interpreters/shen-sources { }; + shiv = with python3Packages; toPythonApplication shiv; + shocco = callPackage ../tools/text/shocco { }; shopify-cli = callPackage ../development/web/shopify-cli { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e9173cbbf24..5554d2c62a93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9239,6 +9239,8 @@ in { shippai = callPackage ../development/python-modules/shippai { }; + shiv = callPackage ../development/python-modules/shiv { }; + shodan = callPackage ../development/python-modules/shodan { }; shortuuid = callPackage ../development/python-modules/shortuuid { }; From a5fb565bf50b4efb8409f58a5c7ba47418be64ad Mon Sep 17 00:00:00 2001 From: Milan Svoboda Date: Wed, 30 Dec 2020 12:00:25 +0100 Subject: [PATCH 139/171] nixos/auto-upgrade: add persistent option --- .../from_md/release-notes/rl-2205.section.xml | 8 ++++ .../manual/release-notes/rl-2205.section.md | 4 ++ nixos/modules/tasks/auto-upgrade.nix | 39 +++++++++++++++---- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 96dbfd59c83b..85c97ead8c3f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1506,6 +1506,14 @@ + + + The auto-upgrade service now accepts persistent (default: + true) parameter. By default auto-upgrade will now run + immediately if it would have been triggered at least once + during the time when the timer was inactive. + + If you are using Wayland you can choose to use the Ozone diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index a1b0212fafc3..9d240c995918 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -520,6 +520,10 @@ In addition to numerous new and upgraded packages, this release has the followin - Support for older versions of hadoop have been added to the module - Overriding and extending site XML files has been made easier +- The auto-upgrade service now accepts persistent (default: true) parameter. + By default auto-upgrade will now run immediately if it would have been triggered at least + once during the time when the timer was inactive. + - If you are using Wayland you can choose to use the Ozone Wayland support in Chrome and several Electron apps by setting the environment variable `NIXOS_OZONE_WL=1` (for example via diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix index a5755d08d7de..d00dc761d6e3 100644 --- a/nixos/modules/tasks/auto-upgrade.nix +++ b/nixos/modules/tasks/auto-upgrade.nix @@ -63,13 +63,16 @@ in { }; dates = mkOption { - default = "04:40"; type = types.str; + default = "04:40"; + example = "daily"; description = '' - Specification (in the format described by + How often or when upgrade occurs. For most desktop and server systems + a sufficient upgrade frequency is once a day. + + The format is described in systemd.time - 7) of the time at - which the update will occur. + 7. ''; }; @@ -123,6 +126,22 @@ in { }); }; + persistent = mkOption { + default = true; + type = types.bool; + example = false; + description = '' + Takes a boolean argument. If true, the time when the service + unit was last triggered is stored on disk. When the timer is + activated, the service unit is triggered immediately if it + would have been triggered at least once during the time when + the timer was inactive. Such triggering is nonetheless + subject to the delay imposed by RandomizedDelaySec=. This is + useful to catch up on missed runs of the service when the + system was powered down. + ''; + }; + }; }; @@ -217,11 +236,17 @@ in { ''; startAt = cfg.dates; + + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; }; - systemd.timers.nixos-upgrade.timerConfig.RandomizedDelaySec = - cfg.randomizedDelaySec; - + systemd.timers.nixos-upgrade = { + timerConfig = { + RandomizedDelaySec = cfg.randomizedDelaySec; + Persistent = cfg.persistent; + }; + }; }; } From 6961aae3da2d00a17f7a410eb4f5a95afe21570a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 19:31:06 +0200 Subject: [PATCH 140/171] python3Packages.google-cloud-error-reporting: disable on older Python releases --- .../google-cloud-error-reporting/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 767f93f92269..7ae7babaebf5 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -8,22 +8,21 @@ , mock , proto-plus , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-error-reporting"; version = "1.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wjRUPBZwyGP+2528vZ/x4EqiZwqH+9ZvK5rx4ISklHE="; + hash = "sha256-wjRUPBZwyGP+2528vZ/x4EqiZwqH+9ZvK5rx4ISklHE="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'google-cloud-logging>=1.14.0, <2.4' 'google-cloud-logging>=1.14.0' - ''; - propagatedBuildInputs = [ google-cloud-logging libcst From 36873851dc6b084ec0f997db35bfe0e81581a221 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Apr 2022 19:58:37 +0000 Subject: [PATCH 141/171] sic-image-cli: 0.19.1 -> 0.20.0 --- pkgs/tools/graphics/sic-image-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/sic-image-cli/default.nix b/pkgs/tools/graphics/sic-image-cli/default.nix index 168816b886af..1f7785aa9734 100644 --- a/pkgs/tools/graphics/sic-image-cli/default.nix +++ b/pkgs/tools/graphics/sic-image-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sic-image-cli"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "foresterre"; repo = "sic"; rev = "v${version}"; - sha256 = "sha256-lFb1roQd6CK/9fKWO4SC0CbOLZglB+pS9ZqTdGRHk0Y="; + sha256 = "sha256-KoDX/d457dTHsmz8VTPhfF2MiB5vZzLFKG46/L351SQ="; }; - cargoSha256 = "sha256-9m8gdbrVv+6tGMg1GTUPy4eRqRQa9zy9BZwfZqNqSS0="; + cargoSha256 = "sha256-sKEZhJivLbos0KLzPCEnGgTCgbyWSIOvHMhoC1IaJRo="; nativeBuildInputs = [ installShellFiles nasm ]; From ea1de3f2ce068f70f14742dfd9e19e7dadb8d3a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Apr 2022 20:24:29 +0200 Subject: [PATCH 142/171] home-assistant: 2022.4.4 -> 2022.4.5 https://github.com/home-assistant/core/releases/tag/2022.4.5 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7017331af86d..a40ac3baba33 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.4.4"; + version = "2022.4.5"; components = { "abode" = ps: with ps; [ abodepy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1ba54a3ef2ff..69e4943f5fe0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -168,7 +168,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.4.4"; + hassVersion = "2022.4.5"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -186,7 +186,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-NcFQjLNBGT0tNrlgkVLB3uFr9Yh4rc4HnLzALYvcrYA="; + hash = "sha256-rt1hNkjt000Wd/Wg4ThK/GJxQ/q7wysmSlzrvc4joCE="; }; # leave this in, so users don't have to constantly update their downstream patch handling From 0b478f9069aedf7ac433cb0202ececcffa9174b9 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Sat, 16 Apr 2022 20:24:32 +0200 Subject: [PATCH 143/171] sof-firmware: 2.0 -> 2.1.1 --- pkgs/os-specific/linux/firmware/sof-firmware/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index 841e73cfc8ba..7192fbac4785 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "sof-firmware"; - version = "2.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "thesofproject"; repo = "sof-bin"; rev = "v${version}"; - sha256 = "sha256-pDxNcDe/l1foFYuHB0w3YZidKIeH6h0IuwRmMzeMteE="; + sha256 = "sha256-/OYYfIJWMT+rBBhSCtHaSWvwRMlReEQ5y4FuMfk5zUg="; }; dontFixup = true; # binaries must not be stripped or patchelfed From fc8cdc28c5db77594f2d9fc98597031f81329a52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 18:36:19 +0000 Subject: [PATCH 144/171] python310Packages.types-setuptools: 57.4.11 -> 57.4.14 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index c59baea3c6e3..ee2489df8c48 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.11"; + version = "57.4.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ji90BuDH1wWta7RSa1t2H6UAv5nqt03oWsNZIYfWKTU="; + sha256 = "sha256-3wL+HdJE9Yz05nz8PQqXkwotYact2J8h2BxxAXzYP5o="; }; # Module doesn't have tests From 5307f207b93143f3db5766463478d90d8dcf6a5d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 21:15:36 +0200 Subject: [PATCH 145/171] python3Packages.securetar: init at 2022.02.0 --- .../python-modules/securetar/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/securetar/default.nix diff --git a/pkgs/development/python-modules/securetar/default.nix b/pkgs/development/python-modules/securetar/default.nix new file mode 100644 index 000000000000..68b25355744d --- /dev/null +++ b/pkgs/development/python-modules/securetar/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "securetar"; + version = "2022.02.0"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "pvizeli"; + repo = pname; + rev = version; + hash = "sha256-FwQp08jwcGh07zpHqRNoUUmeLZJh78wI8wCXySi3Tdc="; + }; + + propagatedBuildInputs = [ + cryptography + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "securetar" + ]; + + meta = with lib; { + description = "Module to handle tarfile backups"; + homepage = "https://github.com/pvizeli/securetar"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92039ecefa8b..39c2bff67873 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9154,6 +9154,8 @@ in { secure = callPackage ../development/python-modules/secure { }; + securetar = callPackage ../development/python-modules/securetar { }; + seekpath = callPackage ../development/python-modules/seekpath { }; segments = callPackage ../development/python-modules/segments { }; From b363e6b691691b78601cb6a3e2c705b3ba173b7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 21:17:57 +0200 Subject: [PATCH 146/171] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7017331af86d..2cf2ab5f26a8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -237,7 +237,8 @@ ]; "backup" = ps: with ps; [ aiohttp-cors - ]; # missing inputs: securetar + securetar + ]; "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip "balboa" = ps: with ps; [ @@ -3161,6 +3162,7 @@ "axis" "azure_devops" "azure_event_hub" + "backup" "balboa" "bayesian" "binary_sensor" From 4a86b1c78201bc92fee43f119e0ba1ad9982d8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 8 Apr 2022 03:51:28 +0000 Subject: [PATCH 147/171] setzer: 0.4.4 -> 0.4.7 --- pkgs/applications/editors/setzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 3cfc37b36a03..cc1d08cc3f9b 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.4.4"; + version = "0.4.7"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - hash = "sha256-y39u1eSX7vzcIJzoykU7Y7FTmeZnBW/IlvJLzKHfz8Y="; + hash = "sha256-IP56jOiiIK9EW4D5yEdLc49rUzcvegAX3Yyk2ERK/pE="; }; format = "other"; From 66430ab09ec0375d535812a0e29decc84b076f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 11 Apr 2022 03:07:23 +0000 Subject: [PATCH 148/171] banking: 0.3.0 -> 0.4.0 --- pkgs/applications/office/banking/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/applications/office/banking/default.nix index 8f2636395292..c46fba171495 100644 --- a/pkgs/applications/office/banking/default.nix +++ b/pkgs/applications/office/banking/default.nix @@ -5,27 +5,26 @@ , appstream-glib , desktop-file-utils , glib -, gtk3 , libxml2 , meson , ninja , pkg-config , wrapGAppsHook , gobject-introspection -, libhandy +, libadwaita , librsvg }: python3.pkgs.buildPythonApplication rec { pname = "banking"; - version = "0.3.0"; + version = "0.4.0"; format = "other"; src = fetchFromGitLab { owner = "tabos"; repo = "banking"; rev = version; - sha256 = "1w5x9iczw5hb9bfdm1df37n8xhdrida1yfrd82k9l8hb1k4q3h9d"; + sha256 = "sha256-VGNCSirQslRfLIFeo375BNlHujoNXm+s55Ty+hB+ZRI="; }; patches = [ @@ -35,17 +34,21 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.com/tabos/banking/-/commit/c3cc9afc380fe666ae6e331aa8a97659c60397a4.patch"; sha256 = "r9n9l47XU4Tg4U5sfiFdGkbG8QB7O4ol9CB1ya06yOc="; }) + # fix build with libadwaita 1.0.0 + (fetchpatch { + url = "https://gitlab.com/tabos/banking/-/commit/27ac4a89ba6047005d43de71a469ef30d1fda8b5.patch"; + hash = "sha256-dpDjdYf3gDsyFMTfGes+x27yUxKEnKjLulJxX2encG0="; + }) ]; postPatch = '' - patchShebangs meson_post_install.py + patchShebangs meson_post_conf.py meson_post_install.py ''; nativeBuildInputs = [ appstream-glib # for appstream-util desktop-file-utils # for desktop-file-validate glib # for glib-compile-resources - gtk3 # for gtk-update-icon-cache libxml2 # for xmllint meson ninja @@ -55,8 +58,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gobject-introspection - gtk3 - libhandy + libadwaita librsvg ]; From f718d306566402ffb502001b2427629e4eadb12f Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 16 Apr 2022 14:50:05 -0400 Subject: [PATCH 149/171] dgraph: 20.07.3 -> 21.12.0 --- pkgs/servers/dgraph/default.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index 3aa7b074848e..723316e50b01 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -1,30 +1,37 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, jemalloc, nodejs }: buildGoModule rec { pname = "dgraph"; - version = "20.07.3"; + version = "21.12.0"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "sha256-yuKXcxewt64T0ToDPid37WUEhwLu+yt4tjhDQobj/Ls="; + sha256 = "sha256-OYDWr+wJEIP7raIHsXSjvuFr2ENJOllufO5ff6lxoR4="; }; - vendorSha256 = "sha256-2Ub0qdEaVSHHE5K0bNSXJFukGeSSXNpIBoUldF8jGpI="; + vendorSha256 = "sha256-YtU3Yeq/lNeq7cOB+KvHbvlH9g40WuJk1ovHxCQMG60="; doCheck = false; + ldflags = [ + "-X github.com/dgraph-io/dgraph/x.dgraphVersion=${version}-oss" + ]; + + tags = [ + "oss" + ]; + nativeBuildInputs = [ installShellFiles ]; - # see licensing - buildPhase = '' - make oss BUILD_VERSION=${version} - ''; + # todo those dependencies are required in the makefile, but verify how they are used + # actually + buildInputs = [ jemalloc nodejs ]; - installPhase = '' - install dgraph/dgraph -Dt $out/bin + subPackages = [ "dgraph" ]; + postInstall = '' for shell in bash zsh; do $out/bin/dgraph completion $shell > dgraph.$shell installShellCompletion dgraph.$shell From ae51dd5b70cab6200c85e540476a1f64b1945744 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 21:33:01 +0200 Subject: [PATCH 150/171] python3Packages.python-family-hub-local: init at 0.0.2 --- .../python-family-hub-local/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/python-family-hub-local/default.nix diff --git a/pkgs/development/python-modules/python-family-hub-local/default.nix b/pkgs/development/python-modules/python-family-hub-local/default.nix new file mode 100644 index 000000000000..01d9da8423dd --- /dev/null +++ b/pkgs/development/python-modules/python-family-hub-local/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, aiohttp +, async-timeout +, pillow +, fetchPypi +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "python-family-hub-local"; + version = "0.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + hash = "sha256-bbOBlUJ4g+HOcJihEBAz3lsHR9Gn07z8st14FRFeJbc="; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + pillow + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pyfamilyhublocal" + ]; + + meta = with lib; { + description = "Module to accesse information from Samsung FamilyHub fridges locally"; + homepage = "https://github.com/Klathmon/python-family-hub-local"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92039ecefa8b..25d143b0d21d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8138,6 +8138,8 @@ in { python-editor = callPackage ../development/python-modules/python-editor { }; + python-family-hub-local = callPackage ../development/python-modules/python-family-hub-local { }; + python-fsutil = callPackage ../development/python-modules/python-fsutil { }; pythonefl = callPackage ../development/python-modules/python-efl { }; From 98ca6c1fbd51de674a78cec6e091bd5c262f0216 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 21:34:00 +0200 Subject: [PATCH 151/171] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7017331af86d..cb52124f2d6e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -773,7 +773,8 @@ "fail2ban" = ps: with ps; [ ]; "familyhub" = ps: with ps; [ - ]; # missing inputs: python-family-hub-local + python-family-hub-local + ]; "fan" = ps: with ps; [ ]; "fastdotcom" = ps: with ps; [ From 689781a0692e8f00769bac599524b410709da89c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 16 Apr 2022 21:35:45 +0200 Subject: [PATCH 152/171] python3Packages.zimports: propagate tomli --- pkgs/development/python-modules/zimports/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index d4c6c6b7e474..dc9a61892405 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -4,8 +4,9 @@ , buildPythonPackage , flake8-import-order , pyflakes -, mock +, tomli , setuptools +, mock }: buildPythonPackage rec { @@ -22,9 +23,10 @@ buildPythonPackage rec { disabled = !isPy3k; propagatedBuildInputs = [ - pyflakes flake8-import-order + pyflakes setuptools + tomli ]; checkInputs = [ From b9bf28fd70ae179f703b6bd99f7b0620473b183f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 15 Apr 2022 16:37:10 +0100 Subject: [PATCH 153/171] nixos/stage-1-init: Pass all parameters to the builder This is for compatiblity with the old builder to get compat with uboot support and to prepend microcode updates to the initrd --- nixos/modules/system/boot/systemd/initrd.nix | 3 +++ pkgs/build-support/kernel/make-initrd-ng.nix | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 7f5d3ae092a7..6c1b42da1c41 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -125,6 +125,9 @@ let }; initialRamdisk = pkgs.makeInitrdNG { + name = "initrd-${kernel-name}"; + inherit (config.boot.initrd) compressor compressorArgs prepend; + contents = map (path: { object = path; symlink = ""; }) (subtractLists cfg.suppressedStorePaths cfg.storePaths) ++ mapAttrsToList (_: v: { object = v.source; symlink = v.target; }) (filterAttrs (_: v: v.enable) cfg.contents); }; diff --git a/pkgs/build-support/kernel/make-initrd-ng.nix b/pkgs/build-support/kernel/make-initrd-ng.nix index 9fd202c44847..1890bbcd173a 100644 --- a/pkgs/build-support/kernel/make-initrd-ng.nix +++ b/pkgs/build-support/kernel/make-initrd-ng.nix @@ -66,14 +66,28 @@ in compressorArgs = _compressorArgsReal; }; + inherit extension makeUInitrd uInitrdArch prepend; + ${if makeUInitrd then "uInitrdCompression" else null} = uInitrdCompression; + passAsFile = ["contents"]; contents = lib.concatMapStringsSep "\n" ({ object, symlink, ... }: "${object}\n${if symlink == null then "" else symlink}") contents + "\n"; - nativeBuildInputs = [makeInitrdNGTool patchelf glibc cpio]; + nativeBuildInputs = [makeInitrdNGTool patchelf glibc cpio] ++ lib.optional makeUInitrd ubootTools; } '' mkdir ./root make-initrd-ng "$contentsPath" ./root mkdir "$out" (cd root && find * .[^.*] -exec touch -h -d '@1' '{}' +) + for PREP in $prepend; do + cat $PREP >> $out/initrd + done (cd root && find * .[^.*] -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd") + + if [ -n "$makeUInitrd" ]; then + mkimage -A "$uInitrdArch" -O linux -T ramdisk -C "$uInitrdCompression" -d "$out/initrd" $out/initrd.img + # Compatibility symlink + ln -sf "initrd.img" "$out/initrd" + else + ln -s "initrd" "$out/initrd$extension" + fi '' From ed97ebc9d257092c7d66db0058e4aa1156be9866 Mon Sep 17 00:00:00 2001 From: misuzu Date: Sat, 16 Apr 2022 22:39:02 +0300 Subject: [PATCH 154/171] cmus: fix build on aarch64-darwin --- pkgs/applications/audio/cmus/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index ea7ad1015be9..3a4cae32a1fd 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config -, libiconv, CoreAudio, AudioUnit +, libiconv, CoreAudio, AudioUnit, VideoToolbox , alsaSupport ? stdenv.isLinux, alsa-lib ? null # simple fallback for everyone else @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ lib.optional stdenv.cc.isClang clangGCC - ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit ] + ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ] ++ flatten (concatMap (a: a.deps) opts); makeFlags = [ "LD=$(CC)" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 283c0fc798fc..52f7b93e0b06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25137,7 +25137,7 @@ with pkgs; cmctl = callPackage ../applications/networking/cluster/cmctl { }; cmus = callPackage ../applications/audio/cmus { - inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; + inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio VideoToolbox; libjack = libjack2; }; From 0a25dbfa97cc4b0983c14457f30498902d0da288 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 22:21:10 +0200 Subject: [PATCH 155/171] python3Packages.rova: init at 0.3.0 --- .../python-modules/rova/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/rova/default.nix diff --git a/pkgs/development/python-modules/rova/default.nix b/pkgs/development/python-modules/rova/default.nix new file mode 100644 index 000000000000..5f419615dd53 --- /dev/null +++ b/pkgs/development/python-modules/rova/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "rova"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "GidoHakvoort"; + repo = pname; + rev = "v${version}"; + hash = "sha256-TLL9Ta+7Xd55hGTTXjc6CBMj+tW1LpFrprpsnGqZvkQ="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "rova" + ]; + + meta = with lib; { + description = "Module to access for ROVA calendars"; + homepage = "https://github.com/GidoHakvoort/rova"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92039ecefa8b..58f16fef3bad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8946,6 +8946,8 @@ in { routes = callPackage ../development/python-modules/routes { }; + rova = callPackage ../development/python-modules/rova { }; + rpcq = callPackage ../development/python-modules/rpcq { }; rpdb = callPackage ../development/python-modules/rpdb { }; From ed778189c96fa0a2b1057b1a24256992520f5171 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 22:22:09 +0200 Subject: [PATCH 156/171] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7017331af86d..c542eeadb677 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2189,7 +2189,8 @@ boto3 ]; "rova" = ps: with ps; [ - ]; # missing inputs: rova + rova + ]; "rpi_camera" = ps: with ps; [ ]; "rpi_gpio" = ps: with ps; [ From f470406b6b1258b9873bb7057354f6590395e713 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 22:27:17 +0200 Subject: [PATCH 157/171] python3Packages.meteofrance-api: init at 1.0.2 --- .../meteofrance-api/default.nix | 70 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/meteofrance-api/default.nix diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix new file mode 100644 index 000000000000..dadd872adcda --- /dev/null +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry +, pytestCheckHook +, pythonOlder +, pytz +, requests +, requests-mock +, typing-extensions +, urllib3 +}: + +buildPythonPackage rec { + pname = "meteofrance-api"; + version = "1.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "hacf-fr"; + repo = pname; + rev = "v${version}"; + hash = "sha256-X8f0z9ZPXH7Wc3GqHmPptxpNxbHeezdOzw4gZCprumU="; + }; + + nativeBuildInputs = [ + # Doesn't work with poetry-core at the moment + poetry + ]; + + propagatedBuildInputs = [ + pytz + requests + urllib3 + ] ++ lib.optionals (pythonOlder "3.7") [ + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ + "meteofrance_api" + ]; + + disabledTests = [ + # Tests require network access + "test_currentphenomenons" + "test_forecast" + "test_full_with_coastal_bulletint" + "test_fulls" + "test_no_rain_expected" + "test_picture_of_the_day" + "test_places" + "test_rain" + "test_session" + "test_workflow" + ]; + + meta = with lib; { + description = "Module to access information from the Meteo-France API"; + homepage = "https://github.com/hacf-fr/meteofrance-api"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92039ecefa8b..efbcde7ec5cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5140,6 +5140,8 @@ in { meteoalertapi = callPackage ../development/python-modules/meteoalertapi { }; + meteofrance-api = callPackage ../development/python-modules/meteofrance-api { }; + mezzanine = callPackage ../development/python-modules/mezzanine { }; micawber = callPackage ../development/python-modules/micawber { }; From acac82f1caad842b5089353fb03864b7dd7dc964 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 22:27:47 +0200 Subject: [PATCH 158/171] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7017331af86d..4d0aa7037bdb 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1534,7 +1534,8 @@ pymeteireann ]; "meteo_france" = ps: with ps; [ - ]; # missing inputs: meteofrance-api + meteofrance-api + ]; "meteoalarm" = ps: with ps; [ meteoalertapi ]; @@ -3416,6 +3417,7 @@ "meraki" "met" "met_eireann" + "meteo_france" "meteoclimatic" "microsoft_face" "microsoft_face_detect" From ba5b91166ad31a11b86edf0521ba12e356d527a1 Mon Sep 17 00:00:00 2001 From: hqurve Date: Sat, 16 Apr 2022 16:31:02 -0400 Subject: [PATCH 159/171] cubiomes-viewer: 2.0.0 -> 2.1.1 --- pkgs/applications/misc/cubiomes-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 18b61bc8a9bc..42355054ee88 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-6XPgSreWcRXN8ymP7zS5a7Cfl9wSLMxjmiugJPp6l+g="; + sha256 = "sha256-cIA6W82XEeW0k9WNygZ/KVFZE31QThpkV4OazVEvmtw="; fetchSubmodules = true; }; From 0fdca0cc2f26816e1d07cb06af26e1f2184989a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 22:37:43 +0200 Subject: [PATCH 160/171] python3Packages.oasatelematics: init at 0.3 --- .../python-modules/oasatelematics/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/oasatelematics/default.nix diff --git a/pkgs/development/python-modules/oasatelematics/default.nix b/pkgs/development/python-modules/oasatelematics/default.nix new file mode 100644 index 000000000000..c4d7ca121387 --- /dev/null +++ b/pkgs/development/python-modules/oasatelematics/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "oasatelematics"; + version = "0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "panosmz"; + repo = pname; + rev = "v${version}"; + hash = "sha256-3O7XbNVj1S3ZwheklEhm0ivw16Tj7drML/xYC9383Kg="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "oasatelematics" + ]; + + meta = with lib; { + description = "Python wrapper for the OASA Telematics API"; + homepage = "https://github.com/panosmz/oasatelematics"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79ac7e75af7c..bd311f37efe8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5713,6 +5713,8 @@ in { nwdiag = callPackage ../development/python-modules/nwdiag { }; + oasatelematics = callPackage ../development/python-modules/oasatelematics { }; + oath = callPackage ../development/python-modules/oath { }; oauth2 = callPackage ../development/python-modules/oauth2 { }; From 1879daa085ff0969db78cfce0d0ba8a6553017bd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 22:39:26 +0200 Subject: [PATCH 161/171] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e599ca6ab7cf..d3f4101be6ea 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1808,7 +1808,8 @@ "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ - ]; # missing inputs: oasatelematics + oasatelematics + ]; "obihai" = ps: with ps; [ pyobihai ]; From f905e9f20340e25ae78b393e51079a2b5de7a95e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 22:49:45 +0200 Subject: [PATCH 162/171] python3Packages.aio-geojson-generic-client: init at 0.1 --- .../aio-geojson-generic-client/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/aio-geojson-generic-client/default.nix diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix new file mode 100644 index 000000000000..df13e8d7519a --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, aio-geojson-client +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-generic-client"; + version = "0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-generic-client"; + rev = "v${version}"; + hash = "sha256-6Gc3SRRQiISBZnCg7a+rCQHR4NQipBHmG5gWZZXIsxY="; + }; + + propagatedBuildInputs = [ + aiohttp + aio-geojson-client + pytz + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aio_geojson_generic_client" + ]; + + meta = with lib; { + description = "Python library for accessing GeoJSON feeds"; + homepage = "https://github.com/exxamalte/python-aio-geojson-generic-client"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79ac7e75af7c..0a77f36a320c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -229,6 +229,8 @@ in { aio-geojson-client = callPackage ../development/python-modules/aio-geojson-client { }; + aio-geojson-generic-client = callPackage ../development/python-modules/aio-geojson-generic-client { }; + aio-geojson-geonetnz-quakes = callPackage ../development/python-modules/aio-geojson-geonetnz-quakes { }; aio-geojson-geonetnz-volcano = callPackage ../development/python-modules/aio-geojson-geonetnz-volcano { }; From 7771628eb1dc0c9e7577ed10b5471dacadbd8c72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 22:51:25 +0200 Subject: [PATCH 163/171] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e599ca6ab7cf..78421fb6ed69 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -947,7 +947,8 @@ geniushub-client ]; "geo_json_events" = ps: with ps; [ - ]; # missing inputs: aio_geojson_generic_client + aio-geojson-generic-client + ]; "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ @@ -3298,6 +3299,7 @@ "generic" "generic_hygrostat" "generic_thermostat" + "geo_json_events" "geo_location" "geo_rss_events" "geofency" From 2833064bcc9f7e6b0bf88995121b688055c56f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 16 Apr 2022 22:59:35 +0200 Subject: [PATCH 164/171] neovide: 2022-02-04 -> 0.8.0 (#168770) * neovide: 2022-02-04 -> 0.8.0 * neovide: Remove unsupported platform darwin --- pkgs/applications/editors/neovim/neovide/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 2c0a50bfed6b..9cb786989efb 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -25,16 +25,16 @@ }: rustPlatform.buildRustPackage rec { pname = "neovide"; - version = "unstable-2022-02-04"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Kethku"; repo = "neovide"; - rev = "92bc1725f1733547eb0ae25b740425f03f358c2a"; - sha256 = "sha256-bKTteaj6gddp0NuV5Y0pfHotezU9Hmb136xOC9zkJ/M="; + rev = version; + sha256 = "sha256-pbniOWjEw1Z+PoXqbbFOUkW5Ii1UDOMoZpAvVF1uNEg="; }; - cargoSha256 = "sha256-TaZN49ou6bf1vW0mEsmaItp1c73d0M826MMrSGXpnGE="; + cargoSha256 = "sha256-7o7uJXH68pvfuiG1eSNmbPx8OO8QJjCe+oEFl38bFm4="; SKIA_SOURCE_DIR = let @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-F1DWLm7bdKnuCu5tMMekxSyaGq8gPRNtZwcRVXJxjZQ="; }; # The externals for skia are taken from skia/DEPS - externals = lib.mapAttrs (n: v: fetchgit v) (lib.importJSON ./skia-externals.json); + externals = lib.mapAttrs (n: fetchgit) (lib.importJSON ./skia-externals.json); in runCommand "source" {} ( '' @@ -128,7 +128,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Kethku/neovide"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ck3d ]; - platforms = platforms.unix; + platforms = platforms.linux; mainProgram = "neovide"; }; } From f3bdf57f61c178228c802cb2c6bf48bc309da9e0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 16 Apr 2022 23:04:20 +0200 Subject: [PATCH 165/171] ungoogled-chromium: 100.0.4896.88 -> 100.0.4896.127 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 2577eda45168..3d27f5b2f4cc 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "100.0.4896.88", - "sha256": "0l628x41krsjgzff9996k5wkbcvcjqf4128z32hpj1pkg23719f5", - "sha256bin64": "1wqzs3f70ayi9vy3ncm5mild22xvhwn4d2lcfra31wwnzxi1nqxm", + "version": "100.0.4896.127", + "sha256": "0kgq38dy9mjyc44556i9gxhlsgd7dfvv1xi1ibk92b4p7i2y6427", + "sha256bin64": "0mm6lix14bf4ca440dyccnq54z0qvn5c886ghfyzy2q0bqzbq4nh", "deps": { "gn": { "version": "2022-01-21", @@ -56,8 +56,8 @@ "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" }, "ungoogled-patches": { - "rev": "100.0.4896.88-1", - "sha256": "0f0c5mrjvk6lg59p4x6lg2az4f83y7zzikv5hlmqzpgydivk7c13" + "rev": "100.0.4896.127-1", + "sha256": "192kyhr0fa97csciv5kp496y9zwcsknwlrmdr4jic3rvv8ig1q9y" } } } From 928e563a1d022ec540e7df7eca1f5128eb03c053 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sat, 16 Apr 2022 19:39:35 +0200 Subject: [PATCH 166/171] zenith: 0.12.0 -> 0.13.1 --- pkgs/tools/system/zenith/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 3705c9cad90c..57d0f548f00e 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -5,26 +5,29 @@ , IOKit , nvidiaSupport ? false , makeWrapper +, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "zenith"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "bvaisvil"; repo = pname; rev = version; - sha256 = "1bn364rmp0q86rd7vgv4n7x09cdf9m4njcaq92jnk85ni6h147ax"; + sha256 = "sha256-N/DvPVYGM/DjTvKvOlR60q6rvNyfAQlnvFnFG5nbUmQ="; }; - cargoSha256 = "0c2mk2bcz4qjyqmf11yqhnhy4pqxr77b3c1gvr5jfmjshx4ff7v2"; + cargoSha256 = "sha256-Y/vvRJpv82Uc+Bu3lbZxRsu4TL6sAjz5AWHAHkwh98Y="; - nativeBuildInputs = lib.optional nvidiaSupport makeWrapper; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + nativeBuildInputs = [ llvmPackages.clang ] ++ lib.optional nvidiaSupport makeWrapper; + buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; buildFeatures = lib.optional nvidiaSupport "nvidia"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + postInstall = lib.optionalString nvidiaSupport '' wrapProgram $out/bin/zenith \ --suffix LD_LIBRARY_PATH : "/run/opengl-driver/lib" From d36ab13695f7888cb4764aa9e6f4cf9be7aa15c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 23:28:53 +0200 Subject: [PATCH 167/171] python3Packages.pysnmp-pysmi: init at 1.1.8 --- .../python-modules/pysnmp-pysmi/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/pysnmp-pysmi/default.nix diff --git a/pkgs/development/python-modules/pysnmp-pysmi/default.nix b/pkgs/development/python-modules/pysnmp-pysmi/default.nix new file mode 100644 index 000000000000..0616a7c695e9 --- /dev/null +++ b/pkgs/development/python-modules/pysnmp-pysmi/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, ply +, poetry-core +, requests +}: + +buildPythonPackage rec { + pname = "pysnmp-pysmi"; + version = "1.1.8"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pysnmp"; + repo = "pysmi"; + rev = "v${version}"; + hash = "sha256-nsIEZPD7bfbePZukkudP0ZH/m8Be88QkVDM5PdjNHVk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + ply + requests + ]; + + # Circular dependency with pysnmplib + doCheck = false; + + pythonImportsCheck = [ + "pysmi" + ]; + + meta = with lib; { + description = "SNMP MIB parser"; + homepage = "https://github.com/pysnmp/pysmi"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f55fde614ac..231cd45bbf69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7767,6 +7767,8 @@ in { pysnmp-pyasn1 = callPackage ../development/python-modules/pysnmp-pyasn1 { }; + pysnmp-pysmi = callPackage ../development/python-modules/pysnmp-pysmi { }; + pysnooper = callPackage ../development/python-modules/pysnooper { }; pysnow = callPackage ../development/python-modules/pysnow { }; From 88c2ebdaeb1889e535f6bfb8b091b6e5b023a500 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 23:29:26 +0200 Subject: [PATCH 168/171] python3Packages.pysnmplib: init at 5.0.10 --- .../python-modules/pysnmplib/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/pysnmplib/default.nix diff --git a/pkgs/development/python-modules/pysnmplib/default.nix b/pkgs/development/python-modules/pysnmplib/default.nix new file mode 100644 index 000000000000..3c3333074a68 --- /dev/null +++ b/pkgs/development/python-modules/pysnmplib/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pycryptodomex +, pysnmp-pyasn1 +, pysnmp-pysmi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysnmplib"; + version = "5.0.10"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pysnmp"; + repo = "pysnmp"; + rev = "v${version}"; + hash = "sha256-PsfsOVzeHCVdd1Bi+FYYi68Wzn1MI8dZUbRr/tmT+cA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysnmp-pysmi + pysnmp-pyasn1 + pycryptodomex + ]; + + # Module has no test, examples are used for testing + doCheck = false; + + pythonImportsCheck = [ + "pysnmp" + ]; + + meta = with lib; { + description = "Implementation of v1/v2c/v3 SNMP engine"; + homepage = "https://github.com/pysnmp/pysnmp"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 231cd45bbf69..e3a83b55ed97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7769,6 +7769,8 @@ in { pysnmp-pysmi = callPackage ../development/python-modules/pysnmp-pysmi { }; + pysnmplib = callPackage ../development/python-modules/pysnmplib { }; + pysnooper = callPackage ../development/python-modules/pysnooper { }; pysnow = callPackage ../development/python-modules/pysnow { }; From c28265b2891a18e6149a8d3c7d3966be1bd0a710 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Apr 2022 23:29:51 +0200 Subject: [PATCH 169/171] python3Packages.brother: 1.1.0 -> 1.2.0 --- .../python-modules/brother/default.nix | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 17d46940e254..db4ef16522e8 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -1,37 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub -, pysnmp +, pysnmplib , pytest-asyncio , pytest-error-for-skips -, pytest-runner , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "brother"; - version = "1.1.0"; + version = "1.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-ZDQIpzdr3XkYrSUgrBDZsUwUZRQCdJdvmniMezvJxzU="; + hash = "sha256-hKOZ5pTDwhM0lOXoatXXVvEVxiTfxIpBRe3fFcUfzwE="; }; - nativeBuildInputs = [ - pytest-runner - ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov --cov-report term-missing " "" - ''; - propagatedBuildInputs = [ - pysnmp + pysnmplib ]; checkInputs = [ @@ -40,7 +32,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "brother" ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov --cov-report term-missing " "" + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" + ''; + + pythonImportsCheck = [ + "brother" + ]; meta = with lib; { description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP"; From 7bd8dc9dd15f310a8ad0192225364a9232f56385 Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Sun, 17 Apr 2022 00:47:37 +0300 Subject: [PATCH 170/171] gopls: 0.8.2 -> 0.8.3 --- pkgs/development/tools/gopls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 4ff3ef5715a0..bc94c6a6ae60 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-BXalq73nXMDQg7+x/SJOAeiBK3yLVxH6pPPqPYWZ7KY="; + sha256 = "sha256-X5U06TEkf1vfCyV95wkg2qVd7I+8S8UPBgwacG0q85U="; }; modRoot = "gopls"; - vendorSha256 = "sha256-oH3w/17Vem+q2MahM1A5gmEniWLNhTXi0L7ozhza15o="; + vendorSha256 = "sha256-p6biMwicaG5peIu6dp+Pzun8TeNWmgW2QpLIZWqnalg="; doCheck = false; From 7833517adc1c4d44a83e0b8b4e9ca35c5213dc87 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Sat, 16 Apr 2022 14:54:14 -0700 Subject: [PATCH 171/171] =?UTF-8?q?yt-dlp:=202022.3.8.2=20=E2=86=92=202022?= =?UTF-8?q?.04.08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/yt-dlp/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 89ca84395d5f..efabd8bc453b 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , brotli +, certifi , ffmpeg , rtmpdump , phantomjs2 @@ -20,15 +21,15 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.3.8.2"; + version = "2022.04.08"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-aFRleMGObOh0ULU3adXVt/WiPlIJeEl222x8y/eVSyE="; + sha256 = "sha256-h1jQFlCdRXS5D73pdapwra73HtXnoZUUFYj21pRSBbo="; }; - propagatedBuildInputs = [ brotli mutagen pycryptodomex websockets ]; + propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; # Ensure these utilities are available in $PATH: # - ffmpeg: post-processing & transcoding support