From 51af90bc627f074c7422f6fc30415021c0d66b47 Mon Sep 17 00:00:00 2001 From: MetaDark Date: Sat, 27 Jun 2020 12:52:38 -0400 Subject: [PATCH 001/228] cxxtest: package includes and run tests --- .../development/libraries/cxxtest/default.nix | 24 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index 00629339e086..e1898044efaf 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -1,10 +1,8 @@ -{ stdenv, fetchFromGitHub, python2Packages}: +{ stdenv, buildPythonApplication, fetchFromGitHub }: -let +buildPythonApplication rec { pname = "cxxtest"; version = "4.4"; -in python2Packages.buildPythonApplication { - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CxxTest"; @@ -13,16 +11,26 @@ in python2Packages.buildPythonApplication { sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17"; }; - setSourceRoot = '' - sourceRoot=$(echo */python) + sourceRoot = "source/python"; + + postCheck = '' + python scripts/cxxtestgen --error-printer -o build/GoodSuite.cpp ../test/GoodSuite.h + $CXX -I.. -o build/GoodSuite build/GoodSuite.cpp + build/GoodSuite ''; + postInstall = '' + mkdir -p "$out/include" + cp -r ../cxxtest "$out/include" + ''; + + dontWrapPythonPrograms = true; + meta = with stdenv.lib; { homepage = "http://cxxtest.com"; description = "Unit testing framework for C++"; - platforms = platforms.unix ; + platforms = platforms.unix; license = licenses.lgpl3; maintainers = [ maintainers.juliendehos ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcbbf5f5663c..403e934f323c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11736,7 +11736,7 @@ in cxx-prettyprint = callPackage ../development/libraries/cxx-prettyprint { }; - cxxtest = callPackage ../development/libraries/cxxtest { }; + cxxtest = python2Packages.callPackage ../development/libraries/cxxtest { }; cypress = callPackage ../development/web/cypress { }; From d134095d673ddcb96c1db92bd675f6e36f357040 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 24 Sep 2020 20:16:16 +0200 Subject: [PATCH 002/228] tpm2-tss: 2.4.1 -> 3.0.1 --- pkgs/development/libraries/tpm2-tss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 2421d3f88990..c9160083d60f 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "2.4.1"; + version = "3.0.1"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "09x5czaj4a8cyf8cxavcasx3yy1kik1s45a90c7zvxb7y1kfp9zs"; + sha256 = "10wayqk7h1v3hdyd09rkjjs9989r968dpgf8m0xjqgn7q3y78n61"; }; nativeBuildInputs = [ From dc070dd78ab13edc1dc22b38a8c2e04170422783 Mon Sep 17 00:00:00 2001 From: Daniel Duan Date: Sat, 26 Sep 2020 02:03:09 -0700 Subject: [PATCH 003/228] tre-command: 0.3.2 -> 0.3.3 --- pkgs/tools/system/tre-command/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix index d0f814147414..c3241a04587b 100644 --- a/pkgs/tools/system/tre-command/default.nix +++ b/pkgs/tools/system/tre-command/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tre-command"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "dduan"; repo = "tre"; rev = "v${version}"; - sha256 = "1kb8jwmjhlp9bk08rb6gq3j810cv9bidm28sa417vyykp9a8p2ky"; + sha256 = "10c8mpqzpw7m3vrm2vl2rx678z3c37hxpqyh3fn83dlh9f4f0j87"; }; - cargoSha256 = "0cqkpvq8b2vnqpkd819cdgh4fqr9yns337fgzah4m40ygs25n9iv"; + cargoSha256 = "0jd6cfs2zi2n34kirpsy12l76whaqwm1pkqa57w1ms5z658z07wj"; nativeBuildInputs = [ installShellFiles ]; From 8c72cf16fa2713aa808d5a3d37103e76b929d8db Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Mon, 28 Sep 2020 11:01:38 -0600 Subject: [PATCH 004/228] nixos/redshift: add executable option Added ability to configure the executable that the redshift service uses. --- nixos/modules/services/x11/redshift.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 21b0b33553ac..60d80a28762b 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -82,6 +82,15 @@ in { ''; }; + executable = mkOption { + type = types.str; + default = "/bin/redshift"; + example = "/bin/redshift-gtk"; + description = '' + Redshift executable to use within the package. + ''; + }; + extraOptions = mkOption { type = types.listOf types.str; default = []; @@ -114,7 +123,7 @@ in { partOf = [ "graphical-session.target" ]; serviceConfig = { ExecStart = '' - ${cfg.package}/bin/redshift \ + ${cfg.package}${cfg.executable} \ -l ${providerString} \ -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \ -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \ From 600d0c978a2188e60e89236395f5e3eecb2d29ce Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 16 Oct 2020 04:20:00 +0000 Subject: [PATCH 005/228] xonsh: 0.9.23 -> 0.9.24 https://github.com/xonsh/xonsh/releases/tag/0.9.24 --- pkgs/shells/xonsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 8ff2b4d270ee..711d7060fa55 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.23"; + version = "0.9.24"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "1by13ryq9ldc9wln3fk5mm6zvjp4aim57ikw49v0dfmz8irnpglp"; + sha256 = "1nk7kbiv7jzmr6narsnr0nyzkhlc7xw3b2bksyq2j6nda67b9b3y"; }; LC_ALL = "en_US.UTF-8"; From 47a1abdd21073e99256619cc925e7fbc7c807e55 Mon Sep 17 00:00:00 2001 From: Anatolii Prylutskyi Date: Fri, 16 Oct 2020 11:08:43 +0300 Subject: [PATCH 006/228] operator-sdk: 1.0.1 -> 1.1.0 --- pkgs/development/tools/operator-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 79baecd74f55..01485a5d27ea 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "1p2ra7mqn7crip6sjgq2j49782ncvs4qahjwg6jk5rdvvi4hbyc7"; + sha256 = "11xlay3sk5nr9pfbqifcrfi5h81qnhs3hg5b75zgqysgr4d2m987"; }; - vendorSha256 = "0zy540cbfm1kfc5sp802a9a5l2gkpgqprn8mlh9zg4d4shni61wa"; + vendorSha256 = "1bbj23rwghqfw9vsgj9i9zrxvl480adsmjg1zb06cdhh5j1hl0vy"; doCheck = false; From e94e19655a1d325b8bda6351ec1f0f57ca5e7147 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 16 Oct 2020 13:20:17 -0500 Subject: [PATCH 007/228] agave: 22 -> 30 https://github.com/agarick/agave/releases/tag/v30 (see also notes for other releases, not linked here) --- pkgs/data/fonts/agave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix index 0c2cd1609f61..ea64cf34578d 100644 --- a/pkgs/data/fonts/agave/default.nix +++ b/pkgs/data/fonts/agave/default.nix @@ -2,7 +2,7 @@ let pname = "agave"; - version = "22"; + version = "30"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf"; @@ -13,7 +13,7 @@ in fetchurl { install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf ''; - sha256 = "1jb8f0xcv5z0l5nyx733b6zclswi82vrh2nwyyhbqzgqrl4y1h6s"; + sha256 = "1f2f1fycwi8xbf8x03yfq78nv11b2msl4ll9flw8rkg023h9vwg7"; meta = with lib; { description = "truetype monospaced typeface designed for X environments"; From bdfe55d7180b617cfbc5e4d6bddbd1181c8e152f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Oct 2020 20:47:23 +0000 Subject: [PATCH 008/228] bindfs: 1.14.7 -> 1.14.8 --- pkgs/tools/filesystems/bindfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index f8968260ce79..e69f76e16304 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.14.7"; + version = "1.14.8"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "1lbqyc9vpgck05n0q3qsvsr34142iv721z6iwxhc5j98370ff9i8"; + sha256 = "15y4brlcrqhxl6z73785m0dr1vp2q3wc6xss08x9jjr0apzmmjp5"; }; dontStrip = true; From 7fc50eae84af76c06fb63a4a59f9ca16d60f20f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Oct 2020 00:22:40 +0000 Subject: [PATCH 009/228] bacula: 9.6.5 -> 9.6.6 --- pkgs/tools/backup/bacula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 8bf253a7b121..96fe33bea269 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: stdenv.mkDerivation rec { - name = "bacula-9.6.5"; + name = "bacula-9.6.6"; src = fetchurl { url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "0yn7qwkzix78bs811vmrn5gbywy7ggnsv72mdjz2lirqc6w3a3si"; + sha256 = "10c25igfvff09nz5ll8rxc46f659rnwimj1v9cdhr67lwdswk1k2"; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] From 67630ea1fb99cd560aef689b28041d64d2ef2014 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Oct 2020 07:22:32 +0000 Subject: [PATCH 010/228] cockroachdb: 20.1.4 -> 20.1.7 --- pkgs/servers/sql/cockroachdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index a5071efb486f..3418335d418f 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -14,13 +14,13 @@ let in buildGoPackage rec { pname = "cockroach"; - version = "20.1.4"; + version = "20.1.7"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "1m82m776axyf7b5f1lzlv5y7zslyhikfxjgagqy7ci5zwn8j4i0n"; + sha256 = "1m1jziby0mzfbpwsak1marh1k9sx8vhc17ix6lgikxip4dpf52qg"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; From 501cffe2f9afd4ce73d09901fb08ea5cab36cc2a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Oct 2020 11:28:57 +0000 Subject: [PATCH 011/228] circleci-cli: 0.1.10993 -> 0.1.11146 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 255403a0c279..adfcdbb1ffdb 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.10993"; + version = "0.1.11146"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1pi31zcg4nvrsyb66znf7g51z51qfw56kml6l2vgg4dbpwmzg87h"; + sha256 = "1pn421sc3ipdqvdwl6fvlvwcddck3v23j8rfk5lq5a2n4ip5r8z8"; }; vendorSha256 = "0fjj8hh0s0jcgz48japbcfpl4ihba2drvvxlyg69j8hrcb9lmi4l"; From b622f7fe80f8f0b7799e821abc345df1403a99e3 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 23 Oct 2020 18:01:06 -0400 Subject: [PATCH 012/228] angle-grinder: init at 0.15.0 --- pkgs/tools/text/angle-grinder/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/text/angle-grinder/default.nix diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/tools/text/angle-grinder/default.nix new file mode 100644 index 000000000000..a8702553c4b3 --- /dev/null +++ b/pkgs/tools/text/angle-grinder/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "angle-grinder"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "rcoh"; + repo = pname; + rev = "v${version}"; + sha256 = "1m5yj9412kjlnqi1nwh44i627ip0kqcbhvwgh87gl5vgd2a0m091"; + }; + + cargoSha256 = "0y4c1gja0i3h2whjpm74yf3z1y85pkwmpmrl2fjsyy0mn493hzv8"; + + meta = with stdenv.lib; { + description = "Slice and dice logs on the command line"; + homepage = "https://github.com/rcoh/angle-grinder"; + license = licenses.mit; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd731dd97561..bebd7a29698b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -701,6 +701,8 @@ in analog = callPackage ../tools/admin/analog {}; + angle-grinder = callPackage ../tools/text/angle-grinder {}; + ansifilter = callPackage ../tools/text/ansifilter {}; antora = callPackage ../development/tools/documentation/antora {}; From 26b7e792468c0c0ea6c726506f9f9c66778b146e Mon Sep 17 00:00:00 2001 From: Benedikt Morbach Date: Sat, 24 Oct 2020 14:45:05 +0200 Subject: [PATCH 013/228] ceph: Fix build with glibc 2.32 This adds a patch from upstream ceph to avoid using the deprecated sys_siglist if sigdescr_np is available. --- .../ceph/ceph-glibc-2-32-sigdescr_np.patch | 63 +++++++++++++++++++ pkgs/tools/filesystems/ceph/default.nix | 1 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch diff --git a/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch b/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch new file mode 100644 index 000000000000..f78c7af9e35a --- /dev/null +++ b/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch @@ -0,0 +1,63 @@ +From b9b6faf66ae67648626470cb4fc3f0850ac4d842 Mon Sep 17 00:00:00 2001 +From: David Disseldorp +Date: Tue, 1 Sep 2020 13:49:21 +0200 +Subject: [PATCH] cmake: detect and use sigdescr_np() if available + +sys_siglist is deprecated with glibc 2.32. A new thread-safe and +async-signal safe sigdescr_np() function is provided, so use it if +available. + +Fixes: https://tracker.ceph.com/issues/47187 +Signed-off-by: David Disseldorp +--- + cmake/modules/CephChecks.cmake | 1 + + src/global/signal_handler.h | 8 +++++--- + src/include/config-h.in.cmake | 3 +++ + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/cmake/modules/CephChecks.cmake b/cmake/modules/CephChecks.cmake +index 23687283a7c6..ca86dcbc73de 100644 +--- a/cmake/modules/CephChecks.cmake ++++ b/cmake/modules/CephChecks.cmake +@@ -24,6 +24,7 @@ check_function_exists(strerror_r HAVE_Strerror_R) + check_function_exists(name_to_handle_at HAVE_NAME_TO_HANDLE_AT) + check_function_exists(pipe2 HAVE_PIPE2) + check_function_exists(accept4 HAVE_ACCEPT4) ++check_function_exists(sigdescr_np HAVE_SIGDESCR_NP) + + include(CMakePushCheckState) + cmake_push_check_state(RESET) +diff --git a/src/global/signal_handler.h b/src/global/signal_handler.h +index 476724201aa9..c101b2e28733 100644 +--- a/src/global/signal_handler.h ++++ b/src/global/signal_handler.h +@@ -20,10 +20,12 @@ + + typedef void (*signal_handler_t)(int); + +-#ifndef HAVE_REENTRANT_STRSIGNAL +-# define sig_str(signum) sys_siglist[signum] +-#else ++#ifdef HAVE_SIGDESCR_NP ++# define sig_str(signum) sigdescr_np(signum) ++#elif HAVE_REENTRANT_STRSIGNAL + # define sig_str(signum) strsignal(signum) ++#else ++# define sig_str(signum) sys_siglist[signum] + #endif + + void install_sighandler(int signum, signal_handler_t handler, int flags); +diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake +index 1ea3703f620c..59bd4273511a 100644 +--- a/src/include/config-h.in.cmake ++++ b/src/include/config-h.in.cmake +@@ -220,6 +220,9 @@ + /* Define to 1 if you have sched.h. */ + #cmakedefine HAVE_SCHED 1 + ++/* Define to 1 if you have sigdescr_np. */ ++#cmakedefine HAVE_SIGDESCR_NP 1 ++ + /* Support SSE (Streaming SIMD Extensions) instructions */ + #cmakedefine HAVE_SSE + diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 9b9fe9a5aaf0..b221025f85b8 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -133,6 +133,7 @@ in rec { patches = [ ./0000-fix-SPDK-build-env.patch + ./ceph-glibc-2-32-sigdescr_np.patch ]; nativeBuildInputs = [ From 753f5ee01dcd50cacb9c353fcdd117b16e4d0e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 24 Oct 2020 15:37:59 +0200 Subject: [PATCH 014/228] nextcloud: 20.0.0 -> 20.0.1 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index fa17e10da7b9..a072536dbfd8 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -51,7 +51,7 @@ in { }; nextcloud20 = generic { - version = "20.0.0"; - sha256 = "1n2cv1i56g6qpzkbl5xaf420zzr4y7isg0lskmr7ymk83way0wx2"; + version = "20.0.1"; + sha256 = "1z1fzz1i41k4dhdhi005l3gzkvnmmgqqz3rdr374cvk73q7bbiln"; }; } From b7a2a5f967a75bba3a39b709e0053b30b93779cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 24 Oct 2020 15:22:12 +0200 Subject: [PATCH 015/228] nixos/nextcloud: fix several php endpoints --- nixos/modules/services/web-apps/nextcloud.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index bad1bd9c767d..53c2ab76fdfa 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -549,9 +549,7 @@ in { }; "/" = { priority = 900; - extraConfig = if major < 20 - then "rewrite ^ /index.php;" - else "try_files $uri $uri/ /index.php$request_uri;"; + extraConfig = "rewrite ^ /index.php;"; }; "~ ^/store-apps" = { priority = 201; @@ -575,7 +573,7 @@ in { "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)".extraConfig = '' return 404; ''; - ${if major < 20 then "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" else "~ \\.php(?:$|/)"} = { + "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" = { priority = 500; extraConfig = '' include ${config.services.nginx.package}/conf/fastcgi.conf; From 03faeaa8b37b9ab4fb08bb352cb4432c1e166fab Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Mon, 26 Oct 2020 10:00:28 -0400 Subject: [PATCH 016/228] kakounePlugins.rep: inherit from rep --- pkgs/applications/editors/kakoune/plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix index 3926973f7ead..93241b93b04d 100644 --- a/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/pkgs/applications/editors/kakoune/plugins/default.nix @@ -1,7 +1,7 @@ -{ pkgs, parinfer-rust }: +{ pkgs, parinfer-rust, rep }: { - inherit parinfer-rust; + inherit parinfer-rust rep; case-kak = pkgs.callPackage ./case.kak.nix { }; kak-ansi = pkgs.callPackage ./kak-ansi.nix { }; From 5ef5d96c0849bcb2760d7e3d2a7653c894a6e13a Mon Sep 17 00:00:00 2001 From: bb2020 Date: Mon, 26 Oct 2020 18:34:37 +0300 Subject: [PATCH 017/228] discrete-scroll: added myself as maintainer --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/os-specific/darwin/discrete-scroll/default.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 23d3d4b589a2..c5328419d128 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9874,4 +9874,10 @@ github = "wilsonehusin"; githubId = 14004487; }; + bb2020 = { + email = "bb2020@users.noreply.github.com"; + github = "bb2020"; + githubId = 19290397; + name = "Tunc Uzlu"; + }; } diff --git a/pkgs/os-specific/darwin/discrete-scroll/default.nix b/pkgs/os-specific/darwin/discrete-scroll/default.nix index e72402b77933..f38bf8d81322 100644 --- a/pkgs/os-specific/darwin/discrete-scroll/default.nix +++ b/pkgs/os-specific/darwin/discrete-scroll/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/emreyolcu/discrete-scroll"; platforms = platforms.darwin; license = licenses.mit; + maintainers = with lib.maintainers; [ bb2020 ]; }; } From 190a17a4b407a55caec8a594e492c3fb0e54a456 Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Wed, 28 Oct 2020 22:52:58 +0000 Subject: [PATCH 018/228] maintainers: add ronanmacf --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5b06fe102f6f..feb00b35211c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7407,6 +7407,12 @@ githubId = 1217934; name = "José Romildo Malaquias"; }; + ronanmacf = { + email = "macfhlar@tcd.ie"; + github = "ronanmacf"; + githubId = 25930627; + name = "Ronan Mac Fhlannchadha"; + }; rongcuid = { email = "rongcuid@outlook.com"; github = "rongcuid"; From 3b3fe0744d705a75bf36474b50f2566ee1e2a78b Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 29 Oct 2020 10:15:16 +0100 Subject: [PATCH 019/228] amdvlk: 2020.Q4.1 -> 2020.Q4.2 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 3e8c9a24a6ee..fdbff329c147 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2020.Q4.1"; + version = "2020.Q4.2"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "UxUsXngsMbLNSmg0a7gqCqw30ckZ8IlDrSZMMnKHlh4="; + sha256 = "qqP95+K8G9Z3Da1pUT9EGAUi83IM50qI9eZxpp7Vlqg="; }; buildInputs = [ From e369c0c0309ed06e30df353a7ea09fb0b1ed3ef9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 11:54:51 +0000 Subject: [PATCH 020/228] cordless: 2020-08-30 -> 2020-10-24 --- .../networking/instant-messengers/cordless/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/applications/networking/instant-messengers/cordless/default.nix index a262b0487464..1b475bdee846 100644 --- a/pkgs/applications/networking/instant-messengers/cordless/default.nix +++ b/pkgs/applications/networking/instant-messengers/cordless/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cordless"; - version = "2020-08-30"; + version = "2020-10-24"; src = fetchFromGitHub { owner = "Bios-Marcel"; repo = pname; rev = version; - sha256 = "sha256-CwOI7Ah4+sxD9We+Va5a6jYat5mjOeBk2EsOfwskz6k="; + sha256 = "18j8yrnipiivc49jwbb0ipgqwdi249fs9zxxz8qx8jfq77imvwbq"; }; subPackages = [ "." ]; - vendorSha256 = "sha256-01I7GrZkaskuz20kVK2YwqvP7ViPMlQ3BFaoLHwgvOE="; + vendorSha256 = "1h47aqf8bmyqvaayfj16br1402qzy7kf8rk96f3vnsyvsnkg5gw5"; meta = with stdenv.lib; { homepage = "https://github.com/Bios-Marcel/cordless"; From 4df7857cfd19b691a9ba4526bae9eee179621d8d Mon Sep 17 00:00:00 2001 From: luc65r Date: Wed, 28 Oct 2020 12:03:02 +0100 Subject: [PATCH 021/228] convbin: init at 3.0 --- pkgs/tools/misc/convbin/default.nix | 42 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/tools/misc/convbin/default.nix diff --git a/pkgs/tools/misc/convbin/default.nix b/pkgs/tools/misc/convbin/default.nix new file mode 100644 index 000000000000..0abf10710caa --- /dev/null +++ b/pkgs/tools/misc/convbin/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "convbin"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "mateoconlechuga"; + repo = pname; + rev = "v${version}"; + sha256 = "0n502zj8igm583kbfvyv7zhd97vb71jac41ncb9jr2yz2v5ir8j9"; + }; + + makeFlags = [ "CC=cc" ]; + + checkPhase = '' + pushd test + patchShebangs test.sh + ./test.sh + popd + ''; + + doCheck = true; + + installPhase = '' + install -Dm755 bin/convbin $out/bin/convbin + ''; + + meta = with stdenv.lib; { + description = "Converts files to other formats"; + longDescription = '' + This program is used to convert files to other formats, + specifically for the TI84+CE and related calculators. + ''; + homepage = "https://github.com/mateoconlechuga/convbin"; + license = licenses.bsd3; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11a8a1ccae33..7cb0ac859007 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3072,6 +3072,8 @@ in console-bridge = callPackage ../development/libraries/console-bridge { }; + convbin = callPackage ../tools/misc/convbin { }; + convmv = callPackage ../tools/misc/convmv { }; convoy = callPackage ../tools/filesystems/convoy { }; From 069e485c189e4815fbb463c7dc0dfbfa7b1e4686 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Thu, 29 Oct 2020 11:00:13 -0400 Subject: [PATCH 022/228] OSCAR: init at 1.2.0 --- pkgs/applications/misc/OSCAR/default.nix | 46 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/misc/OSCAR/default.nix diff --git a/pkgs/applications/misc/OSCAR/default.nix b/pkgs/applications/misc/OSCAR/default.nix new file mode 100644 index 000000000000..e619ad8c6971 --- /dev/null +++ b/pkgs/applications/misc/OSCAR/default.nix @@ -0,0 +1,46 @@ +{ stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }: +mkDerivation rec { + pname = "OSCAR"; + version = "1.2.0"; + + src = fetchFromGitLab { + owner = "pholy"; + repo = "OSCAR-code"; + rev = "v${version}"; + sha256 = "10r37d8c2avr167n2s9lhld1c9hmckm444fq163z1jsy9jpid6mg"; + }; + + buildInputs = [ qtbase qttools qtserialport libGLU ]; + nativeBuildInputs = [ qmake ]; + postPatch = '' + substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}" + ''; + + qmakeFlags = [ "OSCAR_QT.pro" ]; + + installPhase = '' + install -d $out/bin + install -d $out/share/OSCAR/Help + install -d $out/share/OSCAR/Html + install -d $out/share/OSCAR/Translations + install -d $out/share/icons/OSCAR + install -d $out/share/applications + install -T oscar/OSCAR $out/bin/OSCAR + # help browser was removed 'temporarily' in https://gitlab.com/pholy/OSCAR-code/-/commit/57c3e4c33ccdd2d0eddedbc24c0e4f2969da3841 + # install oscar/Help/* $out/share/OSCAR/Help + install oscar/Html/* $out/share/OSCAR/Html + install oscar/Translations/* $out/share/OSCAR/Translations + install -T Building/Linux/OSCAR.png $out/share/icons/OSCAR/OSCAR.png + install -T Building/Linux/OSCAR.desktop $out/share/applications/OSCAR.desktop + ''; + + meta = with stdenv.lib; { + homepage = "https://www.sleepfiles.com/OSCAR/"; + description = "Software for reviewing and exploring data produced by CPAP and related machines used in the treatment of sleep apnea"; + license = licenses.gpl3; + maintainers = [ maintainers.roconnor ]; + # Someone needs to create a suitable installPhase for Darwin and Windows. + # See https://gitlab.com/pholy/OSCAR-code/-/tree/master/Building. + broken = !stdenv.hostPlatform.isLinux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04e0f41e13ee..466dc88e05f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27196,6 +27196,8 @@ in opkg-utils = callPackage ../tools/package-management/opkg-utils { }; + OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; + pgmanage = callPackage ../applications/misc/pgmanage { }; pgadmin = callPackage ../applications/misc/pgadmin { From 345f1d11d3f8d65d8ee7a84993a64c22b7dd804c Mon Sep 17 00:00:00 2001 From: luc65r Date: Thu, 29 Oct 2020 19:22:04 +0100 Subject: [PATCH 023/228] unicorn(-emu): 1.0.2-rc4 -> 1.0.2 --- .../libraries/unicorn-emu/default.nix | 34 ------------------- .../development/libraries/unicorn/default.nix | 27 +++++++++++++++ .../python-modules/unicorn/default.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 +- pkgs/top-level/python-packages.nix | 4 ++- 6 files changed, 34 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/libraries/unicorn-emu/default.nix create mode 100644 pkgs/development/libraries/unicorn/default.nix diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix deleted file mode 100644 index 3e10f492eb98..000000000000 --- a/pkgs/development/libraries/unicorn-emu/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, cmocka, hexdump, writeScriptBin, binutils-unwrapped }: - -stdenv.mkDerivation rec { - pname = "unicorn-emulator"; - version = "1.0.2-rc4"; - - src = fetchurl { - url = "https://github.com/unicorn-engine/unicorn/archive/${version}.tar.gz"; - sha256 = "05w43jq3r97l3c8ggc745ai8m5l93p1b6q6cfp1zwzz6hl5kifiv"; - }; - - PREFIX = placeholder "out"; - MACOS_UNIVERSAL = stdenv.lib.optionalString stdenv.isDarwin "no"; - NIX_CFLAGS_COMPILE = "-Wno-error"; - - doCheck = !stdenv.isDarwin; - - checkInputs = [ - cmocka - hexdump - python.pkgs.setuptools - ]; - - nativeBuildInputs = [ pkgconfig python ]; - enableParallelBuilding = true; - - meta = { - description = "Lightweight multi-platform CPU emulator library"; - homepage = "http://www.unicorn-engine.org"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix new file mode 100644 index 000000000000..cea35519ad87 --- /dev/null +++ b/pkgs/development/libraries/unicorn/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, cmake +}: + +stdenv.mkDerivation rec { + pname = "unicorn"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "unicorn-engine"; + repo = pname; + rev = version; + sha256 = "0jgnyaq6ykpbg5hrwc0p3pargmr9hpzqfsj6ymp4k07pxnqal76j"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + + meta = with stdenv.lib; { + description = "Lightweight multi-platform CPU emulator library"; + homepage = "http://www.unicorn-engine.org"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice luc65r ]; + }; +} diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index e8f4b05916ec..8bd6507bb5ba 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { version = stdenv.lib.getVersion unicorn-emu; src = unicorn-emu.src; - sourceRoot = "unicorn-${version}/bindings/python"; + sourceRoot = "source/bindings/python"; prePatch = '' ln -s ${unicorn-emu}/lib/libunicorn${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3538ac56ecfa..25e7eb515ff5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -624,6 +624,7 @@ mapAliases ({ ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 + unicorn-emu = unicorn; # added 2020-10-29 usb_modeswitch = usb-modeswitch; # added 2016-05-10 usbguard-nox = usbguard; # added 2019-09-04 uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a37fab7ec3db..3108974b7cbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1649,7 +1649,6 @@ in candle = libsForQt5.callPackage ../applications/misc/candle { }; capstone = callPackage ../development/libraries/capstone { }; - unicorn-emu = callPackage ../development/libraries/unicorn-emu { }; casync = callPackage ../applications/networking/sync/casync { sphinx = python3Packages.sphinx; @@ -8072,6 +8071,8 @@ in unbound = callPackage ../tools/networking/unbound { }; + unicorn = callPackage ../development/libraries/unicorn { }; + units = callPackage ../tools/misc/units { enableCurrenciesUpdater = true; pythonPackages = python3Packages; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c93931fe0ab7..4691e2b6bd57 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7360,7 +7360,9 @@ in { unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; - unicorn = callPackage ../development/python-modules/unicorn { }; + unicorn = callPackage ../development/python-modules/unicorn { + unicorn-emu = pkgs.unicorn; + }; unidecode = callPackage ../development/python-modules/unidecode { }; From 8b0aa74128f75c1c4702eb1c1d9293694b36af1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Oct 2020 11:22:53 +0100 Subject: [PATCH 024/228] ssh-audit: 2.3.0 -> 2.3.1 --- pkgs/tools/security/ssh-audit/default.nix | 24 ++--------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/security/ssh-audit/default.nix b/pkgs/tools/security/ssh-audit/default.nix index 6a3dbfb615be..2fdc42e52803 100644 --- a/pkgs/tools/security/ssh-audit/default.nix +++ b/pkgs/tools/security/ssh-audit/default.nix @@ -2,39 +2,19 @@ python3Packages.buildPythonApplication rec { pname = "ssh-audit"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "jtesta"; repo = pname; rev = "v${version}"; - sha256 = "1k5nv2cdnzd3j2p729vjw6ya0gwwkxhqijs2b7p68wvp0n3y3m77"; + sha256 = "1h739r5nv5zkmjyyjwkw8r6d4avddjjxsamc5rffwfxi1kjavpxm"; }; - postPatch = '' - cp ./README.md packages/sshaudit/ - cp ./ssh-audit.py packages/sshaudit/sshaudit.py - mv packages/* . - ls -lah - ''; - checkInputs = with python3Packages; [ pytestCheckHook ]; - disabledTests = [ - "test_resolve_error" - "test_resolve_hostname_without_records" - "test_resolve_ipv4" - "test_resolve_ipv6" - "test_resolve_ipv46_both" - "test_resolve_ipv46_order" - "test_invalid_host" - "test_invalid_port" - "test_not_connected_socket" - "test_ssh2_server_simple" - ]; - meta = with lib; { description = "Tool for ssh server auditing"; homepage = "https://github.com/jtesta/ssh-audit"; From 85ce8025883e102594bd50881085c57e9a509e62 Mon Sep 17 00:00:00 2001 From: luc65r Date: Wed, 25 Mar 2020 11:14:46 +0100 Subject: [PATCH 025/228] mate.mate-tweak: init at 20.10.0 --- pkgs/desktops/mate/default.nix | 1 + pkgs/desktops/mate/mate-tweak/default.nix | 83 +++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 pkgs/desktops/mate/mate-tweak/default.nix diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 3970b2b2921c..10c278c8bf9a 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -39,6 +39,7 @@ let mate-system-monitor = callPackage ./mate-system-monitor { }; mate-terminal = callPackage ./mate-terminal { }; mate-themes = callPackage ./mate-themes { }; + mate-tweak = callPackage ./mate-tweak { }; mate-user-guide = callPackage ./mate-user-guide { }; mate-user-share = callPackage ./mate-user-share { }; mate-utils = callPackage ./mate-utils { }; diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix new file mode 100644 index 000000000000..9609d832f6b1 --- /dev/null +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -0,0 +1,83 @@ +{ stdenv +, fetchFromGitHub +, python3Packages +, intltool +, mate +, libnotify +, gtk3 +, gdk-pixbuf +, gobject-introspection +, wrapGAppsHook +, glib +}: + +python3Packages.buildPythonApplication rec { + pname = "mate-tweak"; + version = "20.10.0"; + + src = fetchFromGitHub { + owner = "ubuntu-mate"; + repo = pname; + rev = version; + sha256 = "08gw5i5wjxmzn92h9fv6g7q9i00n8shv1wlpy6cb31xy9wbmjph6"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + intltool + python3Packages.distutils_extra + gobject-introspection + ]; + + buildInputs = [ + gtk3 + gdk-pixbuf + libnotify + glib + mate.mate-applets + mate.mate-panel + mate.marco + mate.libmatekbd + mate.mate-session-manager + ]; + + propagatedBuildInputs = with python3Packages; [ + distro + pygobject3 + psutil + setproctitle + ]; + + strictDeps = false; + + dontWrapGApps = true; + + postPatch = '' + # mate-tweak hardcodes absolute paths everywhere. Nuke from orbit. + find . -type f -exec sed -i \ + -e s,/usr/lib/mate-tweak,$out/lib/mate-tweak,g \ + {} + + + sed -i 's,{prefix}/,,g' setup.py + ''; + + # Arguments to be passed to `makeWrapper`, only used by buildPython* + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + for i in bin/.mate-tweak-wrapped lib/mate-tweak/mate-tweak-helper; do + sed -i "s,usr,run/current-system/sw,g" $out/$i + done + ''; + + meta = with stdenv.lib; { + description = "Tweak tool for the MATE Desktop"; + homepage = "https://github.com/ubuntu-mate/mate-tweak"; + changelog = "https://github.com/ubuntu-mate/mate-tweak/releases/tag/${version}"; + license = [ licenses.gpl2Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ luc65r ]; + }; +} From 14368df9f6ee8e76f0ff5103a231082076c788d0 Mon Sep 17 00:00:00 2001 From: Sebastien Braun Date: Fri, 30 Oct 2020 13:54:16 +0100 Subject: [PATCH 026/228] gsoap: 2.8.53 -> 2.8.108 Fixes CVE-2019-7659 --- pkgs/development/libraries/gsoap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index fd9e327c1bc9..2614c50cca78 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "gsoap"; - version = "${majorVersion}.53"; + version = "${majorVersion}.108"; src = fetchurl { url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${version}.zip"; - sha256 = "0n35dh32gidi65c36cwjd91304pwiabfblvd64kg21djpjl06qcr"; + sha256 = "0x58bwlclk7frv03kg8bp0pm7zl784samvbzskrnr7dl5v866nvl"; }; buildInputs = [ openssl zlib ]; From 4e6820a2307d526711ecf801f03e37346f2a6c13 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Oct 2020 13:52:00 +0100 Subject: [PATCH 027/228] homeassistant: 0.117.0 -> 0.117.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 326cc480fddc..cc3736ac7de6 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 = "0.117.0"; + version = "0.117.1"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 98f5fe943247..31b48060b4f6 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.117.0"; + hassVersion = "0.117.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1f5axspj5hffmaqhpmrrflyd0c62lww36yvd2wr999yix7jhsfnc"; + sha256 = "1ifkxgsdm6bvrf573z75ry7vvrb3zi67x5j2nlsb44igfmk0nj1v"; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 2ca94066dbcb..ce3403b8f537 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20201021.3"; + version = "20201021.4"; src = fetchPypi { inherit pname version; - sha256 = "04z8rvmnpmy7xx90pvqcr58hsxjsc10mrrjcx7ppspglb91b9cpb"; + sha256 = "138h4cgvkn26xlr53ziz6d0zc00zw4wk40cpi4c4nia1lv6cqkxd"; }; # no Python tests implemented From 43effbbc59d177f152f83a2cd0d4183b0e201e9b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 30 Oct 2020 19:03:42 -0700 Subject: [PATCH 028/228] nixos/transmission: point at the settings dir in cfg.home. Without this, transmission starts with an empty config when using a custom home location. Signed-off-by: David Anderson --- nixos/modules/services/torrent/transmission.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 014a22bb5a8d..aeb58a7194f9 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -197,7 +197,7 @@ in install -D -m 600 -o '${cfg.user}' -g '${cfg.group}' /dev/stdin \ '${cfg.home}/${settingsDir}/settings.json' '')]; - ExecStart="${pkgs.transmission}/bin/transmission-daemon -f"; + ExecStart="${pkgs.transmission}/bin/transmission-daemon -f -g ${cfg.home}/${settingsDir}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = cfg.user; Group = cfg.group; From c959631b11a85041370054d490f9b5ba324eddee Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 31 Oct 2020 04:20:00 +0000 Subject: [PATCH 029/228] grpc: 1.32.0 -> 1.33.2 --- pkgs/development/libraries/grpc/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index e7d1aa4bf92b..98117c7ae410 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - version = "1.32.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.33.2"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0v48h0j0gxcp9s63z1ibwgz4416qd6iq728la80y6gl8rklrqf0c"; + sha256 = "0cc7yfa37ngrr0q9k3lm2yi4i57bfsyxwbblwc0f801k6wvgavcy"; fetchSubmodules = true; }; patches = [ @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp libnsl ]; + buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ] + ++ stdenv.lib.optionals stdenv.isLinux [ libnsl ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" From d703bf0a9bd7627ce56f6f98461e4ca728477b4f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 31 Oct 2020 04:20:00 +0000 Subject: [PATCH 030/228] skim: 0.9.1 -> 0.9.2 https://github.com/lotabout/skim/releases/tag/v0.9.2 --- pkgs/tools/misc/skim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 1c8dc40de1b7..6a613869e148 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.9.1"; + version = "0.9.2"; src = fetchCrate { inherit pname version; - sha256 = "1r8zf56kb9rhh8nlh8w684srr8jfhndf8742x8byw374my9xn8pb"; + sha256 = "0k101ymr6shi8hivf7kv52vwgcad2dwhyma0yg2pnp9q3ll0iszb"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "0wjlkyngrc03a92fwmavgj90h0kakww38bfc1wapn2my7p3b6nc1"; + cargoSha256 = "0b4pj30w07p67zvpn5af23ddkvknmfp5a33sy6ai8argfi73bf4c"; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim From 661f6bf2c95ad46c38af07526df8272456069e30 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 31 Oct 2020 04:20:00 +0000 Subject: [PATCH 031/228] lxc: 4.0.4 -> 4.0.5 --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 21c1eede9d7a..ade4299eaa7a 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "15frszz5am9bnr8vh1zpg89x0xigcfm19jax0z16cazd42xahr9w"; + sha256 = "1976l9308rx1ria1gazasypk5rmmf5jiqdh54dfrws5bslbdcb5g"; }; nativeBuildInputs = [ From 4346b1a27612d867d442d7759cd90160480a623f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 31 Oct 2020 04:20:00 +0000 Subject: [PATCH 032/228] pythonPackages.grpcio-tools: 1.32.0 -> 1.33.2 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index c60acb2d1f16..fe0fc9d3f8ea 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.32.0"; + version = "1.33.2"; src = fetchPypi { inherit pname version; - sha256 = "28547272c51e1d2d343685b9f531e85bb90ad7bd93e726ba646b5627173cbc47"; + sha256 = "af40774c0275f5465f49fd92bfcd9831b19b013de4cc77b8fb38aea76fa6dce3"; }; enableParallelBuilding = true; From f433d25ea0e9e9256fb350878d3fd346977c3b16 Mon Sep 17 00:00:00 2001 From: Philipp Kern Date: Sat, 31 Oct 2020 10:57:46 +0100 Subject: [PATCH 033/228] exim: unconditionally build with dsearch lookups enabled dsearch is required to do untainted lookups in directories. There's no reason not to build it in and it's a standard feature in other distributions. --- pkgs/servers/mail/exim/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 210863aa0078..8bd197f46c1d 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { s:^# \(RM_COMMAND\)=.*:\1=${coreutils}/bin/rm: s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch: s:^# \(PERL_COMMAND\)=.*:\1=${perl}/bin/perl: + s:^# \(LOOKUP_DSEARCH=yes\)$:\1: ${stdenv.lib.optionalString enableLDAP '' s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1: s:^# \(LOOKUP_LDAP=yes\)$:\1: From 0ad1519ad9b7cd0fa9222014f1f3eb7f36be022b Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Sat, 31 Oct 2020 16:33:45 +0100 Subject: [PATCH 034/228] nixos/tlp: Fix deprecation hint The deprecated extraConfig option refers to the config option, which does not exists. The settings option should be used. --- nixos/modules/services/hardware/tlp.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index 4230f2edd279..eb53f565a67f 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -39,7 +39,7 @@ in default = ""; description = '' Verbatim additional configuration variables for TLP. - DEPRECATED: use services.tlp.config instead. + DEPRECATED: use services.tlp.settings instead. ''; }; }; From 916c7ee66a459d38290d92c2ab2a8a90444ac36f Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Sat, 31 Oct 2020 16:40:10 +0100 Subject: [PATCH 035/228] platformio: 5.0.1 -> 5.0.2 --- pkgs/development/arduino/platformio/chrootenv.nix | 4 ++-- pkgs/development/arduino/platformio/core.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index 91300bda8f1c..81cc8f371f4f 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -22,8 +22,8 @@ let src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; - rev = "v5.0.1"; - sha256 = "01xh61ldilg6fg95l1p870rld2xffhnl9f9ndvbi5jdn8q634pmw"; + rev = "v5.0.2"; + sha256 = "1hbw8nbllyj0xyx1rz2chx9vyqf9949dcdx4v9hnfbsjwwpcfi0a"; }; diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 835e0c692e4b..42e1e49b41fb 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -75,14 +75,14 @@ let in buildPythonApplication rec { pname = "platformio"; - version = "5.0.1"; + version = "5.0.2"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "01xh61ldilg6fg95l1p870rld2xffhnl9f9ndvbi5jdn8q634pmw"; + sha256 = "1hbw8nbllyj0xyx1rz2chx9vyqf9949dcdx4v9hnfbsjwwpcfi0a"; }; propagatedBuildInputs = [ From fb25f00cbb638fe182958597bbbeada044afe0ed Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 31 Oct 2020 18:50:24 +0300 Subject: [PATCH 036/228] unit: 1.19.0 -> 1.20.0 --- pkgs/servers/http/unit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index cbe17cdb8064..318fcd498abe 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -30,14 +30,14 @@ let php74-unit = php74.override phpConfig; in stdenv.mkDerivation rec { - version = "1.19.0"; + version = "1.20.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = version; - sha256 = "0k3q42q198sb0w6hyyymw92dbhz67axn6w6vnzr0d883xw3sva7k"; + sha256 = "1qmcz01ifmd80qgpvf1y8nhad6yk56772xdhqvwfxn3mdjfqvcs8"; }; nativeBuildInputs = [ which ]; From 04640b31e5a3f20ef575683790839db4304a2340 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 18:04:36 +0000 Subject: [PATCH 037/228] datovka: 4.15.2 -> 4.15.5 --- pkgs/applications/networking/datovka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index f004a807aa79..2e598b1a7639 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -11,11 +11,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.15.2"; + version = "4.15.5"; src = fetchurl { url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz"; - sha256 = "0vna3vaivi6w7nlkwpqhwmyly0s1d5y2yg51br2f918pjhp2cp7q"; + sha256 = "1mnw1m3wjkw8rfh6fwwrhfmkna6j19pza9cs7kyp8qj1fzzqi8my"; }; buildInputs = [ libisds qmake qtbase qtsvg libxml2 ]; From f4490bb28afb4ae21a5adc73df2f58e438a4eb1f Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 31 Oct 2020 19:34:23 +0100 Subject: [PATCH 038/228] firefox: 82.0 -> 82.0.2 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 79391887608c..e7dd034a8ac4 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "82.0"; + ffversion = "82.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3lbvlb6yggd5v0pkr0x6j350jc5dpclqz7bv4i06r97a5ijdgfc7c6y605966hvw24v17byxr120xc7a39ikl1wnls7a9gyzyqcwyw8"; + sha512 = "25wkgsqnafmq30m1kd1axkm454dhl2bmz6100i3ccqnn31vw3nyy6k3k1apsn62siqswpm55iclzcb10y4dfyyqcszvflim47c8i37k"; }; patches = [ From fdbdd72f5f9ec9c2e4d4775dfd2960a41ec2a4aa Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 31 Oct 2020 19:53:34 +0100 Subject: [PATCH 039/228] firefox-bin: 82.0 -> 82.0.2 --- .../browsers/firefox-bin/release_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 0ae220a75f2b..a69f288be587 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "82.0"; + version = "82.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ach/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ach/firefox-82.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "beebf265e84b2bd961dcedaf82ed0cb6b89ef9ea37a0ec7ce1e6abfb78c44b23"; + sha256 = "7850a7cdf7f842d8ebac2d7d24f0823b1743b7fe139987554bc3f54af47c31f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/af/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/af/firefox-82.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "c58bc5dab361ccc70a94268e1dcb444524145ab9f53a6aa3b186dd806ac111bf"; + sha256 = "c43b0e976a553840da783139ecf2c8a59823da6a31a1d3b5588c496c270260e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/an/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/an/firefox-82.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "75092675363111128ab808211747276c2cadae6a4ea5c8b28807acebb73cf733"; + sha256 = "4f9103c6043e2fa7ceb0021e09e8616a4e4484d19641e6fc67cde0b60136d8aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ar/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ar/firefox-82.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "52adca504f18d6adfb02f346622a5b2b7e417cd6f243c566b79a01014efca53f"; + sha256 = "7f8bddc573ca33cd48b6e29709c80d8dd617a46f1435303fa0931ecc413b69e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ast/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ast/firefox-82.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "fa4133422e8d1969c111e7d066f51710f3b53b7e5e3a88de5dd84b8e6faaea89"; + sha256 = "d0bac8231fd4e9e777754378ff5b2e697379666b682c512d4d4d17a3bd82ad10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/az/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/az/firefox-82.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "0adc103451ac0d6671f62f3e1940d8d1fb5a6ed2544d015de9a02d75ffaca02c"; + sha256 = "3d0a5facfdce39e798ef72d22e737860327a669f1752deee7192877a2635ce97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/be/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/be/firefox-82.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "df27f72cc733bac439ed3dba89443286dfb2ca3af4efa33db161964c84293223"; + sha256 = "70606a5e490c3a0dcd1bf9b291c5d16525e044eca667166abbf1d75b58f3922b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/bg/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/bg/firefox-82.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "34190a84296246c3aa159067a9d575be628963c5c2e193512b8754524fa94503"; + sha256 = "501ba77092a68b32ba6048360f8695f52756593241f4a8d210a072260792cde2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/bn/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/bn/firefox-82.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "5eadf29b34dad12f373e675d349f093562b7e38a817f7faa76fcad273ababe2d"; + sha256 = "f465d794e887b6867bae0e9f768e468876ae7f31a78e91725ccc8f7d965ebfd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/br/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/br/firefox-82.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "53c6f9a4c5185ebf62c087dbe78163dcd46fe8bd3bf764a133a37116dbdf96a0"; + sha256 = "977beb4edf63e823087ce9e62ebb1c1d122991de4a350cfcfc93427b3f381608"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/bs/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/bs/firefox-82.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "260419497fa79e176558f0a5ee43e1bf717ec4782742969bbaaea39cba04c908"; + sha256 = "3951d25f3f1eeadde330e0a68fd581595fa56fc5e98bb4baa3fa707879377674"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ca-valencia/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ca-valencia/firefox-82.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "b2de05d651de2096559b9c40c75212baeff759632aabe70fa9c82283b5ae02d2"; + sha256 = "466fe1080eac737ed87cd83580f585fe5e685090b0d5b6a4c2c5a01ca33175bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ca/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ca/firefox-82.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "bb3ce2ca6c6d536bdabab8ad549623aaf287a6b7dc708a7888961d8aa72271a1"; + sha256 = "6e13af5bdbbe50b8101e60a15d22f9f561d1846e67689a23a933f6fffa73b9ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/cak/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/cak/firefox-82.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "8c918ef50f2e1db8e5e51420e6dcf6fad0a4f3f4e7054b9f3292a98ee804cfe9"; + sha256 = "a96ca82a2723e90595b76279b3b2a902cf4f121afa448784bf684cf26c514c8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/cs/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/cs/firefox-82.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "b8a4557ce44275e471e028c7fdac7259914cea670116991dfffb3a85fd111149"; + sha256 = "bfeac431918060b210d35ac74e7333b0c0f851435275c81f2ae76af34e3a05e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/cy/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/cy/firefox-82.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "45f3438b6218655c26ef846923af9860b5957f0cd1f3f0407a2aa80c20b54519"; + sha256 = "7f81dd91072ff34551394ef969c62baae625c648f5d880f5754862855f71dc74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/da/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/da/firefox-82.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "d015f6abed9728bdf06b922ba9edae3272950dc795cef120179ed21ed633b136"; + sha256 = "b21dcd0ecd9f0010852a143a38d5d0a77dc9240a49d959b00f101491d3a01e10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/de/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/de/firefox-82.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "29748fa89f1b0995f23cddec986379c9ddd89fc158d56591288eedd3345e52ef"; + sha256 = "56429f714fc1bb06efded1c601741ba3cc98788ed54ae345518328f9dcdf7f5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/dsb/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/dsb/firefox-82.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "cae1494636a96530e01c58d8a8914c2f2866eee16f96356dc89dd4cf98b67fe6"; + sha256 = "bafc42263929851718a7cf38163aa3c020b0631b0a0e5ce8fe238849f7cd76e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/el/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/el/firefox-82.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "28b09aed5ae0f9d7454d4e43955675535b7bcaf6a79d157aec1f3dc3fd6b922f"; + sha256 = "e1e8bb8cf866ea69465250a3f760a3cf9e9b06fe15ad03737c6739da5a5df2be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/en-CA/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/en-CA/firefox-82.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "d9fd41938262b2b43f91898b6509e11095ff851e249f066de4728d1c53edc1e2"; + sha256 = "f3a252002ceae09c56334010167861abb84840466c939fc87f0ce39aa1537566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/en-GB/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/en-GB/firefox-82.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "45385629837dca1afd1d9e6cf24aa3a656c180350e86740a47896cea612af934"; + sha256 = "2f384fdadb06254d12aa1c39b7cff6c26be4b7617d0b845a0efef2c92515cbf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/en-US/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/en-US/firefox-82.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4305f43e72aa46ae42882eaa4e436b22c5142a4c9b2dc9f9ccc3292e18a5e39a"; + sha256 = "d95758297ac2db1a050e6431b637855c4a58222db7d9014c3a8322448083a4d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/eo/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/eo/firefox-82.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "a7a9c9b927b590e6140967dc8988e63534bcecd68cbed7262af77826d4dcb65f"; + sha256 = "0591aa9225572cdce7036eff924dd3337b85625bdeb6d59aacdc7a06c5af1f71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/es-AR/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-AR/firefox-82.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e675a8d221812e8642f4d67449df2fed72412197c997acda804fa11aa3032ab6"; + sha256 = "455b211bf85363089721803255829e4e7891cb43b2b6f35f85bf8a7242c360b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/es-CL/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-CL/firefox-82.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "63968f8e55e9bc24ef220546aaff53a6a2ee93f395e4af4543515fddfbb8d175"; + sha256 = "b5d22bbd082eb5b6df2ab8002b465f64afdfb2c06b352a90c72e491aeab81336"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/es-ES/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-ES/firefox-82.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "fbc9948bf2e18ec24e1989592b755050177fc2e505610dfff23d775cbc8c394b"; + sha256 = "678c9ecf360ad9231f31a8f761a48e793b6438b598d200619e5fd54a3296e1d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/es-MX/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/es-MX/firefox-82.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e30cd73dafda4e54a27f6201738ed355fee2c4b7672765362d2d37dfd3aaf316"; + sha256 = "daf28e88dacd3202c759caec279244aa9bf418420df9ea11896658e53c966061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/et/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/et/firefox-82.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "39b2575e2e8b6799b3d646c357aa119cefbcaaa0f8645437a1e5b9ced78d154b"; + sha256 = "c42572576da4d6fd4cfbe5cc518b2c7dc68353141f952eaeadbd9b8679b98d95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/eu/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/eu/firefox-82.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b68837bea81a4018eb298ed2ea567f5367165a83e3233064c49b4d77bae30500"; + sha256 = "5945c782ae8d23473ec1d4682d7fc5a0c524e494393e96c98e3202061fa6551a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/fa/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fa/firefox-82.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "28edeeef1bee9b87e7aad6fa76b10bb83eafd90933487389aa7e1c3ca268bb0c"; + sha256 = "8b5f607d7726333fa9f012d5d9e74170350e205717f7ad0bd7aceec60620ab16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ff/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ff/firefox-82.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "21651607d2b7555996292e31a9fb0245c44e557333eb16c4b8c63f895872e9a8"; + sha256 = "996f0efe4c3eab9152a254077a53e994888fb20345302ed1718f8edba67a9bf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/fi/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fi/firefox-82.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2138da6e55db8fc9e90736b81fd0aec3f81a8b3882eb7aa78d816afd303f423e"; + sha256 = "2830c7775e54f3adbda827b5fae13fdde7fb4b3c8b37644273a88da33db78f2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/fr/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fr/firefox-82.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ea18177416ca979820721b44cfc735ce7a47a6cdd0480d2f72c5b72dac559967"; + sha256 = "bec556a28a30c478e36c3ea1463950039458d1a7442bd7a9807f31cc4ca003fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/fy-NL/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/fy-NL/firefox-82.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "152f3f1cebd0d6b94348bdbab74676faa605155c2020c32aca26c8ef2004dea2"; + sha256 = "b549eb7900d15f8606face90c521aac596230b25705f7dc459c039e8ef559698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ga-IE/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ga-IE/firefox-82.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "9e125c8c28854bd8ba25088b5b3b9b5aca3370dbb385200efe09c2d747cb78c5"; + sha256 = "5a69d9bd67dbae5e8659bf3980d373c485bc67d5719c3b37948d2054f92ecdfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/gd/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gd/firefox-82.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3568f741bc94e1c600158fc37d699d2b3f72ea5b8dc78c804e734dbd0c8ebd06"; + sha256 = "6d76b0659f3d0b0793cbc963dfbd6d20c7c91aa46aec1ab9cf9192d003eda3dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/gl/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gl/firefox-82.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f3b1437772a66728f999ed0827e6cd14f13b08773bab21aa530e04212867c6bc"; + sha256 = "4cdfa36bd0d880135ff959a04eed53b958684253f99469c45aea39cb4a25d1ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/gn/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gn/firefox-82.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "08b6c72f58d47e2442b6bd72c20025d2c23e9a4899a359ab48382e0088b68ac2"; + sha256 = "3cd0ffe9756155181cf68d2fdbc858a93be41104cfbac408adc98b72bcbb215d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/gu-IN/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/gu-IN/firefox-82.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "cf8d0967d9b16bdb8b0ed4ab0f572187003e861fe544b4d258a8b757c68733c8"; + sha256 = "083ee03240b7b1f4238a464844bfad31334a21a8dd025f1d12a252c2cca1049a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/he/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/he/firefox-82.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "42698b6833f395124fdd85307985827574a779ca00b71b4d9713e6f1348e93f3"; + sha256 = "36f8951cb387fb733d689ff2a77b563e8315f76b434c283867aaedc264b227c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hi-IN/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hi-IN/firefox-82.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "141c53b0ac4c9d14c3a8579be7dff6a194fa3926a388387fdf0fa82ae94ddf78"; + sha256 = "6d041154437f97a0dc4b3ec3125f2cbebc10dd2089ed0f98df1c1a6a85b7a536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hr/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hr/firefox-82.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "1159742531dc262a764a3bcaba7c15d4384846adc2df25b367dd3709dff3e2bc"; + sha256 = "4c5b7921cba2d915240d6d9b0bf515f9299827e75a84eb089626561cc9042db3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hsb/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hsb/firefox-82.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "c412cb345c588af3f7d462bef0f28e9d47550eb341f667b21ddcd9de3970dbec"; + sha256 = "4123ec9fda1e94d4433107999905d7cca0dc2b6cfa5c5c78d3a1d29983a5960b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hu/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hu/firefox-82.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "1fa586fa875235e397479ec1a4f25e25a3b5abbec5ba524ce90caabd9c1d8b4b"; + sha256 = "4c0afb928ad0b87a3efb26f09da8c5ef1ac415e14ac47b30463663ddb1955376"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hy-AM/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/hy-AM/firefox-82.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f50e5258073bfe6f72918853e15c083c64f427aa858ca04a35d4b230ca496da0"; + sha256 = "a2676e1450d88ab97b41cb4ee012da2a6240b739eca68e53d9607bbe0f7a313b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ia/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ia/firefox-82.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "523a8c9d5b76efbf7b9525cb83a1ddb3f3b096ce442815a0fec632550a0d848f"; + sha256 = "8494561d37a9d41d0c8683e793419d51ba3780b8229fe98a819ce675f8dc6aa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/id/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/id/firefox-82.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "394966ef0c7d5d203f37cc41fd2bdbd3569921c17b6b0baeef2c93386f50409a"; + sha256 = "3bbc1f1acba6fe029ef1a526e3e16f6000cac1ff226be21850e9e52348b5fe49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/is/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/is/firefox-82.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8dccf799cdc1af733382d9a9f96f3dd4d774a8e481a0a465af788b646c964d81"; + sha256 = "16fa5428d2a467bbe458c82544a3859386cfd8051de266d7af5656430a408535"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/it/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/it/firefox-82.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "bd9cfba5a4006b8ab1b1c7fb75ea54d92c3e8f88fb33ea203655486c31d40078"; + sha256 = "5b891f5a9bd4362c6b00cbcd846d724926f2862887c3db2d6fa55f968c7e0d3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ja/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ja/firefox-82.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "c2f4b1361bef84be0b4409147617f701cfe19741ce7d1b70ffff292ab4b4394b"; + sha256 = "a3469c0b8fa55dd271768ddd491ddf1730d732d9abd697dbf779fa820f4b6d4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ka/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ka/firefox-82.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "956eea50eb32e150c95a1fad99ee4f9fa05d80919612ac7c276af7d830612594"; + sha256 = "8115d086a7330139f03a25209384651209b0e998a3b754ba1f79f26beddd28ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/kab/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/kab/firefox-82.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "7d4b30c299083d0fc3b3c0f2efd9bee1d3bd05ca29b3b291de05816304b54e20"; + sha256 = "c2a7cf201875831fad0eec3b558a4be41c847279f7a66fb8e1006084a385c5d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/kk/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/kk/firefox-82.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "8c781741557932663a68f0d3d52e1e5f1fd2a25617645ff8aca986c1ba638bb2"; + sha256 = "33aecd099402158a1fd6dc47ccdddc1476f21e31a1f25c6cd8518226de7f5d23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/km/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/km/firefox-82.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "60e71694edf19046a2c0ac474daa40157d3ff9a974c9924b5278ba889e680c18"; + sha256 = "060686475df4e47104229d02d42760e5762fc1a9d8d785a8116670a24b7cb897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/kn/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/kn/firefox-82.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "2beabb264e3247a35e16a08d428799a62f9d50297e3824f31eb8f5341f85319a"; + sha256 = "3b86716fd6da73f439593a3915d24710176d9be1aa3d19313c2554962e55dc51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ko/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ko/firefox-82.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d3bc2f79ee0e2a15a56d9c2a29d78daa1ba28abbd2fd7a2eb7f4a8810bdc61bb"; + sha256 = "5fd1b0b428c57886552aabdaea3f691227f40cc19d18f851a2c880b1a1c8141f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/lij/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/lij/firefox-82.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4d723edcb08c066d4ff5eae520ad27aea85e6287bc37e656a7ccdf3f09d0722b"; + sha256 = "227f8dfd5b861f9e8edf1037c8f374dcae3aceefc61effab0e51907603fc21d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/lt/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/lt/firefox-82.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "56282e57b79c0ed78fe839b4c5d444d6c8ccec001b3f16bd566ec8c2f9f0520c"; + sha256 = "9ef7177b9fa3965a394dde8a39503fd8975829faca86e281d046f8fed50bdf27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/lv/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/lv/firefox-82.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "6748371e3a52387dfde06d1a623528a117a686b7252199a63dc166348a0f219b"; + sha256 = "ac98c34657aca401de5943724a7f8607d1370b78f80c211547010911a11be498"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/mk/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/mk/firefox-82.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "eaa8fde559b53b533d0b7275b5b79fba9cb42d31118a281f1b7fe17cc0f0e3c7"; + sha256 = "457fd0ccb4d43e99f39c89db76dc5d4cd79c560a578d1ff3229cd1d49493356d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/mr/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/mr/firefox-82.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "674ba4962bd455793b99f07a9f40709220d40a55e6ebd516bc15b54bf04655b7"; + sha256 = "3bad6fb96f29a3fac72eef3f53b48e9ff10a273da069eda050fa24bdf3ee8ec1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ms/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ms/firefox-82.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "91291fcff394f30b4f60968f183c3125961fb593eef5a9e839024d83d001cdab"; + sha256 = "20573511691d2615c9095988cea73d7fbb522a0b4ae958da1749ae8ee1ff31d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/my/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/my/firefox-82.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "1634f5d90130dfa27301588856c4f49bce0bb33c047d653bd46e255ce07e2414"; + sha256 = "4f4a7abd9a1409ab49ad956cc1cad0adb9254b3203d9d19b7fc967284d051554"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/nb-NO/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/nb-NO/firefox-82.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e35752e9fe37cd3a8518b042f2e287f29aa91213be680b111948e9115e5da523"; + sha256 = "c0480f74895deecbad2f58b1b4876fdfc2c920269f4c91143c9cac41d67162f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ne-NP/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ne-NP/firefox-82.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "17c5d7c04727b775ea544b4e6203e181b4f26d7fd833900fd3dbae853a8dede9"; + sha256 = "11fff99c2bf87ce9b5c315ffab4a305bed0d5170ffc4f65d00d5b5b380687214"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/nl/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/nl/firefox-82.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "d9ff2809b7d4b1fb30f0c61b5ab7c776bd4096940908afcc25472f4b4f78407c"; + sha256 = "a19b8a18022f9317303e7aba19415f45133b19849fae440ec41ec5e9016a532c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/nn-NO/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/nn-NO/firefox-82.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "0da44925c235fb19bd823464046150a57ce710be8f8f2593612e97bd0bd3d591"; + sha256 = "cc68e10b523681110a597c7583ede6ae08d20529bc001fa5059c9056287f3587"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/oc/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/oc/firefox-82.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "62a0679bfbdf27055924753661b20b2a022ba60e50bcbcca89ea7ec28394d3c0"; + sha256 = "a54056be66f78421a7f70cd5860ad5e804abd35017b02ca600c459c86c82ef50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/pa-IN/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pa-IN/firefox-82.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "f3f51aaeec650043cf70d2dccddd18ef8d184b61061a42b2d5ca4b06e891c8e1"; + sha256 = "6a64174c90146c52b462a2e8b921880927774b6d9b6478df26ea194735c6eb6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/pl/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pl/firefox-82.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a1a6ec0eebab8905dc53e58d781369ebce792f1a34e8702c7d9bea082238a1ff"; + sha256 = "558f08956b019d8046ac6c0e3a9922f79176d9997129e795901f40ce04651e55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/pt-BR/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pt-BR/firefox-82.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "76a3ee37676ad9260dfe8d434fde3eafe4d9615568056164058344bfec11bcaa"; + sha256 = "bcc8c4d9a55c8669cd378b2f89cfa61da82e54be360fb754be78289c2ab8434f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/pt-PT/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/pt-PT/firefox-82.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "6d0a39416ea8fa33b53f6aa886bff4cf35f0eeacd622c0572abf1b62ab067fb1"; + sha256 = "29ef81f9675b589122d311dd0f3075d48c99fb34aee9f9906d490585bd407468"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/rm/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/rm/firefox-82.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "cf66f96c69b89879ec2ee51050640f5e18aabc3c1ef14f6ee8479f4f12ff2d96"; + sha256 = "390bd332f1fae6f5a48cc7b8bdd285b282689446977d859e37d8a097920dec9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ro/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ro/firefox-82.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d4a70b102a860cc7f1556eb63d03ad64bebc5e0f22be5fb1ac3d833527b38964"; + sha256 = "1398529679e4220844a0b1880c0ff174fe2faa8b1c30c6041c1cd790d16a83fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ru/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ru/firefox-82.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e57613ab5c57551721cad739b025a9c998fe79f3a354ec626dc9bc5f88943550"; + sha256 = "a9ba4ded0a67ae842896aa75de3dda2b427d0748244649aa9c2db17dd35a9d02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/si/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/si/firefox-82.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "9565b8bfdf98c0e8b04c7fc6af23af2b04fee815ce6faab3188756e7b30985b5"; + sha256 = "a95b03c4085c096207a895d3ad193be7823da4e894793c0378391da5faaf01e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sk/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sk/firefox-82.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "05e190e6ced4d275a93da20e9922a631628db467e4a5dcf7c94cb7d728ffcbef"; + sha256 = "ce09728fc05f18a549c9083d383c58d4a62371d69a01d30f5aba782a60ec70b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sl/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sl/firefox-82.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "6fa4092cfa0d20f01a0e746a2adec4a31091579de08c5adaba186743cadaf04e"; + sha256 = "c344aa40296d249f2c6c85718fd6a9b30be0407b7df7eb73f1810cc873f03477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/son/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/son/firefox-82.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "4ad179b62c19de8171299301a312c4b4aec4805c4d255308d8a2ec840cc3058b"; + sha256 = "3356b16e9174c90cc8e1deee262b8381fbfc34e9cd03e6f7bd48072861de5be5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sq/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sq/firefox-82.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "0dab51efdbb69e6cbb1aeca8fae9d82709238b54bc40141335ff790f7ca91ff6"; + sha256 = "a90e1dada0ef38114f1a8ba7236d8bc97285dc46f81334c86ee7a9a03c8d2b0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sr/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sr/firefox-82.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "59523733a24aa0bab201560711a8a47cc684e8027eb5c06f814b0d59c6a985ad"; + sha256 = "d44891e53c9a41770dffb2fa744e3cea0a655194e218b70881e1f070aef07d69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sv-SE/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/sv-SE/firefox-82.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "53cbef7e2eba73d2ad27ec6ed717f1c69c71281d4e33a1d7e721ec30c372663b"; + sha256 = "e53a4ca8a04d7858c30260999b6acc09b8146ae8a8f4e558d62cca1ce18e7689"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ta/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ta/firefox-82.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7d866f79b6e80c76c2ddfdca477962f1b37dc3eeacd5270a90e4a0a0ee461cf2"; + sha256 = "a89ab7047cbbabde8a03e301f8067b130d37eb0ad7ddaf750051175dd721b6d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/te/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/te/firefox-82.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "846fadf4e10bc6f89db7b9a3ad06c17a85695779cd5f1c06414d6f4baef52921"; + sha256 = "6f80b934ff3bf696b4753f2cbf146d9151f40def404d6d749cf8de022be194ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/th/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/th/firefox-82.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "e2087d50eb61ba597a67af0cc3460ed3ac7e8af218b374e4c5294463aac8ce44"; + sha256 = "c37a9708768ddf723a2423ba0999e88b09a51028d7736234ffcaf8a32f56df8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/tl/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/tl/firefox-82.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "60a05602462133f36d29942dc5123aa0c71b1aaf2ab142efff6f7abc9cadcad6"; + sha256 = "5ab670b24e2ee1c4b4c7fe518e9d3967c85f0e27ea2c7a4ba82bbdaabc6c4fd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/tr/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/tr/firefox-82.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5cfc8cc8945f4a177af80df37653a61f310f413cd4ab3e5df55ed4457d7318b8"; + sha256 = "7e51ae3fca81e691675196b298a9b03de9e798f4fc032da8e5da295820a7d2c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/trs/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/trs/firefox-82.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "2cf90e62d2e1272aaa8d7acfb7ac51b35e9a3aef23f12aea2213146db324ac66"; + sha256 = "60263ac369cdc9aa9a8ab0dcb60219f3e14563fed709b99d8352c1b0469e9433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/uk/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/uk/firefox-82.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "bf0503793d0887754b2c4b87b92c4dcf111d8f5fcc27a288af3686fce2201366"; + sha256 = "38f8e0ed748427991ee9c45694460d3eee28a5f94ee1ff59eafcf9eb93fab9c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ur/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/ur/firefox-82.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "015e0e28477896710481a925c4bec0ceefd0c9f39179a13441b673031854ab1e"; + sha256 = "65e19c2395ff45bff79beb1aa4d9c18faaceb5a7000c6de672f6c1d6964571e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/uz/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/uz/firefox-82.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "0c372b3f8d98f41f2a69a62ffefa6181bb9d7d1a74c7a60a2603ee3a8883d635"; + sha256 = "d3967c3bbbd0ddd880a7cab3a359b946a7b99515c9b82bba044a33138822d864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/vi/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/vi/firefox-82.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "96b1a4aa05e054a7ec78bf314d151385b2a7a6f6ea3225993242ba798772e100"; + sha256 = "a142d7ddc06c688666811ace6a9c32f28e74006f29eff4aa4aaae105f64a34ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/xh/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/xh/firefox-82.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "68d69dc60b730b5ffe7a54943bc9404d0915b3730f840711a3c078bc8b71396a"; + sha256 = "a696daecebfb59e8a798dcc6eb241ce10562438a013f243dd60ac8671091f585"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/zh-CN/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/zh-CN/firefox-82.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b21aedfb3eb7cb8fac85fa9d9f8741ff182ada6635bbb669ec95c0cefc0edb5a"; + sha256 = "d1167e254dc6c16d5d4e38cd8b98bbc065e369d7bd7414e6871b028c601118a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/zh-TW/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-x86_64/zh-TW/firefox-82.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "81963acd1e8a92ab416fe4dae6f1c14f554d6d6a83fcd1d5021e5796bf5d7a98"; + sha256 = "453ebd33173b2ae4a5120d73e3e0fdde57b480e3f66ef2fffaba27390ae945ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ach/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ach/firefox-82.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "12b85628724e5c5acc545ba462b7f916d775dedde3eeb4141799f0f3d65ba6c2"; + sha256 = "c7840623cb65c9c28285d41694a85990e0bda181697e229ad4b71478dec8bf2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/af/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/af/firefox-82.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "66f1e12cbabfcaa3c51e68d06b213dcdf29292e981b18ace9ce6df9bfe3f9dd8"; + sha256 = "24915613ccc58840ccb1564ebacc906b96c7f171822f722265e02b8ee41b0dca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/an/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/an/firefox-82.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "6b61f6db8cd323371f8a4949ff455c79374a2efa0c327611128aaa397a02a025"; + sha256 = "d7acf25c0fce89775827a1e8198fccd117b94dafe5fd9820f557cee88379da8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ar/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ar/firefox-82.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "180633af5e8cfd13d832c9268d4b0eb44b2292b549d3d1093364db9967fc3e82"; + sha256 = "d24c74365c1b9384e8954f9b6ce4f2742bea269de7a20f448971a957f096ecf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ast/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ast/firefox-82.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "aa95f2894bbaf61fd74bcfb00218f73e77b83250c25b472e9938ce0e94403583"; + sha256 = "0b858a243143f6afa68bb14f836fbf4a7245cb2856432004222422ceeb4c4d57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/az/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/az/firefox-82.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3c42220f655d6d8785b0763d5d829744d0e579acff44cd146ec85378ef2800a9"; + sha256 = "80ef7662e88c0fc1711bf385443917b325dfa46252b837f043f41fab0139967b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/be/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/be/firefox-82.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "02fd047e0808ccdcaf484ab6fcc6d306ce97c6a401be4a0071eb310f31ccd45c"; + sha256 = "93c087192c67e074ab3b00fdf55d485f39c7b86cba4fd801e61d2f61e511a191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/bg/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/bg/firefox-82.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "556fbaef8fac39cebf0152e0c5945c6179aa013a724c4903b5553c12518913ca"; + sha256 = "19afb87d93e3a01305c24b725b8ed764f8ae2e31e72a8ce4132f1d6451589321"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/bn/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/bn/firefox-82.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "3a30215151a6e937a1555f28333b2763e5bcb825e4159267c4897f666206737f"; + sha256 = "e607dd2195d4a19d366de1f084bcdc91d4832287752c4a449d445eb7aaaff463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/br/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/br/firefox-82.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "9db07dc18e3925f20d1cdd668eb26dc279f7ee38bd71e0085e47ca9400938974"; + sha256 = "dbd5fa26f0b9b20933820005022af238a5f72c8688dc10a4aafa0318af67b342"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/bs/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/bs/firefox-82.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "7ad72fb89ac7ae6f453e5476759319b3e46a814a5ea3b74fa95350a20aeec2a1"; + sha256 = "7d3d4e3bc630e69b655f4668365359996266d15864b776fbe2e6a8773e212410"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ca-valencia/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ca-valencia/firefox-82.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "73f45df139c85e6b583fe0f5c5e429631154d02c7de5832e85366fceccec2854"; + sha256 = "a14d58cd78c72c29307887a91b534a7553ad2b4e81da5615bfb8a918d4abce60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ca/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ca/firefox-82.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "53f64671ca7527147f91fe2ec72053420866ec15f7d8f6175d88cde75f574514"; + sha256 = "2aac2aa56702b1269b5b5755da2663621da1603e6ad956afe07d86ff54d3e64e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/cak/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/cak/firefox-82.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "93471086769bbdedf2a6a7a63ed2fecaa785c9c1f337bb1e726462976604dfff"; + sha256 = "333cf7d04c22f644f0286102b498727dc448339de26fa1a1cfd353ad1b05a1ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/cs/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/cs/firefox-82.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "e9e1d7f0a0a5766d0ef1ec8f9eb747fcd28333425d139fa1f78891142f1aa91c"; + sha256 = "3d3756f69b0acfc95abd5ab21b9b77cd2272afdcb7056fa4b961c1528e467447"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/cy/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/cy/firefox-82.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "60caa6cb482ff870572551605e1b644d79901f1852b0bcd7ba64f926eb923bfe"; + sha256 = "97d16b2b8def95897751397a8f5293931e1620d2b17b6a6f036d47abc79ae822"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/da/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/da/firefox-82.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "726f620abbf287fb03d68127a7985e52a8e4ee176994bc7b0e8d10e7f3dd42a1"; + sha256 = "f97a2ded9c529e992df15b797afe0622a1d02cdf3e01fa46794b4ddddcfed0ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/de/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/de/firefox-82.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ebc0cffa8a0300165a39ee1fdfaf4c404d2204683117c6b5d7ae708a4a495053"; + sha256 = "4d9aba854f86075d29772957d7f31804ecdc1bc465315afbf0bd807a40f39bc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/dsb/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/dsb/firefox-82.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "e296964d066ab5799b0974c1841f36352040d9f6ad769e730f801a0b77eaaed8"; + sha256 = "bdf18303c3e67f6bda97c709460214bcad60dc11c35fb996bb628f79bb7d0a9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/el/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/el/firefox-82.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f1282eff07c147d33b114a76335cb4c6bfddc66518d2749d65d5613899a3cda3"; + sha256 = "29e9a29e97fea8cb4eb03c8ad67c8fb37e534199073202f381c6a9c50a9d6572"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/en-CA/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/en-CA/firefox-82.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "51ab497caf7a529e8b430280b8015ab3b8a5df3486ef81f3ffe721d1f0c2d752"; + sha256 = "7fd41cc61c01491048cd37db223007a568a8470eea693e76e3f3394901b1af5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/en-GB/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/en-GB/firefox-82.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "1a4f64d190155f3b090828261ec2ce0f61e4b3b2662a3f445291ee201c0fdfe0"; + sha256 = "818d44931c9ed4b4c258de26b33040409ebfe9a4856eb1f80715d15687ea9fdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/en-US/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/en-US/firefox-82.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "2039a8e94fcda9bcad97d62059579d64744da522c7d65beac0edcbd2e128a06f"; + sha256 = "54a64c8fbb263df7e05b8532f0d6f50bd34f6b3cf3080ffc99c123b6b7009210"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/eo/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/eo/firefox-82.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "1abf7e1a14264220bf83b998c71ae8d1cb7e5187c09a9ae2be1424761760955b"; + sha256 = "87e497515f1a90d315e58f592d9360baef382bb986cc17a1a20e9ea9013550fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/es-AR/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-AR/firefox-82.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "83bc86693bbb7dfaeae244c1120f5426b85b13f56756f299e3e3c902a0700851"; + sha256 = "3306113b2e5249c9bef8cbe3ee30a76855402f39385ef730725fe19c650248fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/es-CL/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-CL/firefox-82.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "b2ff29fe620aaa62e9b20ae1576574b2e4c7893eb664fb7c6f722a80093d81bf"; + sha256 = "72fc2f9c4269255c5c9b6c65f11ce8613dd68a1b382c53cab159c56af91d4f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/es-ES/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-ES/firefox-82.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "47f526244e2d7426d7a9d2faa1e114032bd43309c480a21523645c415ac54a17"; + sha256 = "720687e90a863bc08a79e7b98f52439efbf655cc170397095dcf2212839eeb77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/es-MX/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/es-MX/firefox-82.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f2f7f4e251574d11ea69854d0f5a9f7b078aa220d5fb1ef8275e25e4e75389a6"; + sha256 = "32db50431886cf3e181a440eb40e4d9e93ebb0dd6c7e9eb3f6bb4cb203530d37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/et/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/et/firefox-82.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "88ac5af23fa85690fe992ff457f79c991d4802e54a5a3a73682b3b1c6d444856"; + sha256 = "21c2de424dad554b4e74509df0b40a49c23b77c406d44c611ea0e08eb98d1886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/eu/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/eu/firefox-82.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "2fa7483b6be6503a5aa584895d6b177b51f94c344e0869638f6dc065437d69ff"; + sha256 = "96e3609f488fc8bdf899f07333121893dc5f74f520856536facb1a5b376773f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/fa/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fa/firefox-82.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "f9cf6f19e3faf9c206a4286224089855aa2fad94bb99250855925e167aa65943"; + sha256 = "572a6fe2bc5c0751077344e327ff11d434eeb26eade478dd79578822bc8ea167"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ff/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ff/firefox-82.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "b6171880f459eed455cab78fbf9a695168f23bb26c361099cd23f682a99704c6"; + sha256 = "08daf54db1c3927ff10c38ae462c806b0968abe89509e2a7251b39e2f3e3e43d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/fi/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fi/firefox-82.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "6f5d5eaa2e4a60122a18b998932645f6abe7542e04298d13cf5004804de12bb8"; + sha256 = "c2bfa5646d0f39262c79dbae82f2a443e145b0b318d4213e42f265dd378a0a73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/fr/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fr/firefox-82.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "1d239e0c59c17c3e8de5f88df643a2b59b55a1816f8d2779c115311c6729bf89"; + sha256 = "3e8ae367878e625b796e68fdc413ed4fa32a06260db7ecb000f3c089f7755a6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/fy-NL/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/fy-NL/firefox-82.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "7307baffe92d133f2b3b957c8592d7ef18e1129aebadb9c1a26b8f462ecb9b84"; + sha256 = "29dcf0040b32d2a183cc79f220ff37c6b8059a399fd111b9c4ab8f851b638acc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ga-IE/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ga-IE/firefox-82.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "1ae40826795c01e45921cee1293990a227f219ed20398b77cb8cf382207ed0d2"; + sha256 = "d2f0c91780ef7dd353d58e41e539b917e6c957231579517d1d75cef89769a5b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/gd/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gd/firefox-82.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "108f11cade989829a103e67090f03dec890b371004fe047215fe2feda8217a7b"; + sha256 = "1c305c577072a792aee284559202b4ca8108df8f96b1ef17c20d6918498b3599"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/gl/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gl/firefox-82.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "3be9987167773e448d194bcde682242576968ca04cdba2b3728e454b965a9b21"; + sha256 = "86c829c97c30e5c49081283cc8ff5073d357ab09520194c56df63ab56858b083"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/gn/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gn/firefox-82.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "be87dc9ecfe75423c59fd189896a508040f5f962828855f50a01fb4a46a6beb1"; + sha256 = "11a41052cb779cd11fa2e9c1f2f4367a190e78e36dce900f2fd84c451a6001be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/gu-IN/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/gu-IN/firefox-82.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "c2b1290375af17d0d63dfa90b006025dd8f9e7b35628caa782c849826df2fb53"; + sha256 = "6dfb8e60f2225a8db6a2b1ce31b23b51803d5fe9642cb85ff9f440e53c887616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/he/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/he/firefox-82.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9579aa350b3cc6c0814c24361a5b7a7b3ec75245f050ad994ab20e850b520f41"; + sha256 = "8d2f9ed875b38e6d19776c0bfb3a66fe030215d43ee247c9f1a5b85c7dcf0105"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hi-IN/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hi-IN/firefox-82.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "25a037775d64ceaa137fde2367e26f846e755f98edaf0fd04526b4afc80b17cb"; + sha256 = "cf160dc3ff74855a206882e045395dc1ddd69d545184d7f02acb20289465842a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hr/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hr/firefox-82.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "c84de35ed70512cd608de909ce887f0bbf79d5894a82facd94af478b1cc54764"; + sha256 = "e62b04dba13d6d8dfada3976f23715cd221d5a9f0c9d2ea9a0b828c87222b8db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hsb/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hsb/firefox-82.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "2d5ce7160c14b3770d19c3d32a068c1a08623ac2c3b0036d5f18ba7645463fbb"; + sha256 = "fbf8420109b4b7470bf8e5b889cbb51b5a9d827b9cedb2aeb5089f31e74b0211"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hu/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hu/firefox-82.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "bf0fa325c588eacb758697ed13a4aba6416ce35f6cae31891ff4b5ea0296e094"; + sha256 = "161c7f91df6806310a10631f6d338cf86138f5056d265e4dfcc2823634a1cc79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hy-AM/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/hy-AM/firefox-82.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "f45b28645f8dc656d291cbea9e969cca090014f1c4d508f2a0d8f500ce949066"; + sha256 = "a35885c431f6b160716355766c5e8f60ac94dc86675e91905c4781071de6c2a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ia/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ia/firefox-82.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "ac1ee6f6450f62fd4e0de61366b83a0fc8d7b7be5731591e83c4393ba2a6e9f6"; + sha256 = "e162f166587a94aaaf9a6419fdd9da21f949c7db0d1ad223016d470841e124cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/id/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/id/firefox-82.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "8117c5e493362fba30de0cb27cd5a8ef7ab9b31655701b44c9ab06a6b73af60a"; + sha256 = "bee0a6a4a0a9fa3c13650bcb4fefaaa07cce21211d2d4fc0030f4f9133781eab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/is/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/is/firefox-82.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "118b2dac91511e0e68a7dee939f586a9d9b31cc117d6295053a6125fe7e3bf57"; + sha256 = "8994bc2da81e1b17ac112e7ca7a43be9f578c049e879651a4014730937c83283"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/it/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/it/firefox-82.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "8680148fda005fd63ce5af1230060f7510a4b7b096da1f5dd864b9824990faff"; + sha256 = "7fa77ed489b07954543ba117dc3cf67fc70341a5e486d35596cc8f80f630482f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ja/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ja/firefox-82.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "eedf01ce82bce136c03a62de3437b42e52280e87c8491133116926ec7481b7a0"; + sha256 = "76d299e4d71a82e72bc2e446bcafcc1b1d63b54c57e9aeb7ff11e7bff8611811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ka/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ka/firefox-82.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "63c060cb338ee1a0bec05fa8b3749f21503dd3d78548b5673fa4b44b64ef0536"; + sha256 = "6c027f7dbdff43c097a73ecad83aec6c7d623cfc8cdd77049d4dcab70984b403"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/kab/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/kab/firefox-82.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "ba10887d808f197cffa458ba50d3cc7696be176dd088747a50adf676a0d1d666"; + sha256 = "ebd32284e83a0df7228f34263ea03b5b3f418fa5db193e01d20ef15f7ccc393d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/kk/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/kk/firefox-82.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "c93f19c29f0a47854ec1b90e8e4e5e77a08f5c2a3589fd3753c9aa6ceb6d515e"; + sha256 = "39dcaefc6135f51157802878702debd14950a82a32b57862c9428236425de620"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/km/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/km/firefox-82.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "7066bcd6a37faaf5db2ff5eca5c1049cdd4a9a1c034133de866b7d9d97913c03"; + sha256 = "30b0fc4885498d9453dd3179a82d7fd12bcdb5a2b1f3d6227d7a7a68123544eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/kn/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/kn/firefox-82.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "04d941f96c92525298e391a38ef24ee2d31411bd9f3d36ca2f667e3d400513e3"; + sha256 = "ab0f33c172a47fd5fe1e3caa014938647dc870a97e9db0d1ed7e9b09a3fc920b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ko/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ko/firefox-82.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b8fbf8316f2a3d93303ce52f63a08d7604ba8143d7bfbed6782912ab19609436"; + sha256 = "7e20d1d2c16e6278e1e8290c18b39833e23b12cc9bbcfcf3135e52d3c155118d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/lij/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/lij/firefox-82.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "a655f743a2397f808fe514e0e86f6297c3a8ff113bdd360249309d449ff5444c"; + sha256 = "5da50a6a54b1ce15af8ca26bdb2756449622f6d441593bae4f558c079ef732ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/lt/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/lt/firefox-82.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "dd4f654d1c8dfaf0a318c5633865649a8298fa92fb71b7c66ed9369710df2ea8"; + sha256 = "a4bf43fd06f915720f3050750f226629a602aed690b74df728cfd616f8d1d063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/lv/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/lv/firefox-82.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "820f1c5d3da3ae84b0a0c80dca3210ee61024a23141fb2111b5e609843aeb55d"; + sha256 = "8f8eaf80606a140616cfa17fb69bc611ac631a8ec1e4d204fb0de1c073b767aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/mk/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/mk/firefox-82.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "51991978ac9db66b157b6921941219ed6f2be3ed2ec9a1fd74933117a5708743"; + sha256 = "869715dd3d72c48db3007557aabc96fee78b73ecdc747ec0f361365eb1072111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/mr/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/mr/firefox-82.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "1012cc8a38bb7a3250d2328af5c3afef05b8316137ecea20e3941bb1428a4d4f"; + sha256 = "ae921995425812eb2b70a479dc1d6bc319d397c7c16e020460d2d1f65cdc9305"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ms/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ms/firefox-82.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "584504c48e0f0f28ba8b6dc5341743293b7f1795ea5c1c9a31c348c76cc62313"; + sha256 = "55fc6ca427864cd885fa8da786f50f4e88ef2d9adf331e55a6f8e781fe5f7838"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/my/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/my/firefox-82.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "5c4aa84945631ddb576f1a75120d5ccba9ec6d37f2ca7fa74fd673bfd3d4bd5b"; + sha256 = "26377b5108cd1208d111792dad61cf521fda0f4c4206d17e4907b06e4ab5e7d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/nb-NO/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/nb-NO/firefox-82.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d35d5cdf2b5ebb145c1c54a5e0d95501a38783a207d47e01eec4cf85a64541b5"; + sha256 = "19bcb61803f6d6bbecfd94eb769b3d302a951ac5d7f337b6937f9282cbb8222a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ne-NP/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ne-NP/firefox-82.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "af2f8135a7913914752a0f759c98a078823c6824a76625a6be4077563dafd3f2"; + sha256 = "4575f7730e5964fa5be7ec351907d97794c06bf101bea5a98785238304d1fea9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/nl/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/nl/firefox-82.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "beac8d7493bca8319c04f36d8e60985ebefa8af716db9aedf253d7b1bca496d2"; + sha256 = "f22f33b1a1127a4dc91781031c0112b05e8cd5fbbb8c732a6e18b5beeb5627ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/nn-NO/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/nn-NO/firefox-82.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "62e2abdda830a869247220edc5d623dd40d463d96458980f2b1aa70352f45dc8"; + sha256 = "d59e605d47601c18d12e6a2a57cfb8c8752fea2711e8cb0d822b18a4f7a2c049"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/oc/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/oc/firefox-82.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "d670d46d4641e4b89b3e9fd09e226ebc9822d43c8611020e410c0a239ee6d3d6"; + sha256 = "859b0b3b7317a4b94292edcb8f159d4c42404efcf67a170f435131b0b2331422"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/pa-IN/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pa-IN/firefox-82.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "244fd49efcb7579813b493904e63a889eaa832fa326b2da3fd4e5988bcee0294"; + sha256 = "b8553bcc65ce5a075875849508876f34478a0d8166b048b4b8d0b37aacad359e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/pl/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pl/firefox-82.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "31c4cbc76456d9e0d76ab98c997049d17940cc5f461941c72ba85e07b0859516"; + sha256 = "8428f5438edadd7f3e531aeb905bd46f52a3a624e1a36706b3e0e79d29366b94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/pt-BR/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pt-BR/firefox-82.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8c73c44493d265291f253ae7e739613a1cec1e82678021f3ee1738990eb101bd"; + sha256 = "021cb4431781ef19cf7be1f987b6859c2c8b7db67f1428cec475d4de82d38118"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/pt-PT/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/pt-PT/firefox-82.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "934e69f1c07b69c59c3e680ec7ab6d5e8bcf54e5a1e4bc32ef5782c15222544c"; + sha256 = "e55fe5ebb512e184e2c67dc6b866a0f727fa89bda6fb2ed763195761b67bc79c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/rm/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/rm/firefox-82.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "a825c9319954997f285370b4f13e20fe1b0eda62621b71570b2d7606e5a5668c"; + sha256 = "30bc0d66c940ddaeaff516e900f85c652a3dee07d2ede81710efd31c5858e72e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ro/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ro/firefox-82.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "df1de4c7dd186bd8b6558c6c4e902a1721ad3f73a40dd5163b82e98323931436"; + sha256 = "e467c27dafce634f4e507ba5520ea4dfc3d3fca2f751a8ae55fb3fb26a073b3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ru/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ru/firefox-82.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "4c02fa376103c6fb69f2610045a5f922a6a305b11f92899e9d7f42725cfe9ad2"; + sha256 = "d0ea589f932e1dd4a1f6d12a758210e22213794f5d45ec5bb85621aa1ba206d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/si/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/si/firefox-82.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "bc429d437ede468610dfb4f807d7107a6a0f60b32c425d61cf13cbfb4f1aceed"; + sha256 = "6a22d47d1c193a2a048c7535ec49f2198bd2616e123353af0391272db9decd3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sk/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sk/firefox-82.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "6e6620e108c4e6c0acafec1921ec4d99912dd0ca4d36d62cc5bef6127ca04c33"; + sha256 = "c38f8f2f172c0de6d526be926c874a765116f14af5f50cb65cd7771a46cdcfe0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sl/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sl/firefox-82.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "7aa6392e83496ebfba7b5ea4576aab2d28088c88558d88af74a588954bc5af20"; + sha256 = "f39c27bb7d334f20e09fed97c3589db6aae988d3e538d7e2dbae690ab4b4e521"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/son/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/son/firefox-82.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "3134725ede0ba297dc895b3682cc6ecf73931c0779a0fc979166f2ed652b6d4e"; + sha256 = "7edcdcb248e6cb9a78fd4061a2ab54e03692834f87c6d565ed9b777c952ba5fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sq/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sq/firefox-82.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "33d3a6bcdcfb199360770c677849e064d3727f3629b34f9913faccd5f173c6bb"; + sha256 = "db3a6edc2a4008c09ba931e965e9853404dd272455ec8d6b20bf86e14a095bea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sr/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sr/firefox-82.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b9ea179cc648bfb7688e5b21a0a5d128bd0247171b9e9114459a4ed7fe352281"; + sha256 = "aa6bf3ed3402813f56b6d6c53a70da8c7decad3f9d3c3af66336aadc632e334c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sv-SE/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/sv-SE/firefox-82.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "18227f53b7317262270f4ed973b080649d3011ea52ab434d56a09e91d750c8e3"; + sha256 = "8ffe039f7ed159150c6ad804e980c597741439dcc339841e464589ebd535eb38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ta/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ta/firefox-82.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "8c70c66802d6966e04462f934bfe16c94007209b4b6ecccbfe1cc044cd3c19d0"; + sha256 = "a46c944cc5b22fefe8503cf079be32cc5aeb2cd1b78e5642f5ec55f8baf28586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/te/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/te/firefox-82.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "c36cd994a88688e3af5360f24bdc6a69960723bc2dd196f3d42ab8d6099abbfb"; + sha256 = "a7ce32a838d4add3123116628301fb6642311fd3f6fffe0ca4ed6cb314c162fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/th/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/th/firefox-82.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "2ded98d2d5957ee42c665a1789ae4fbc549af60a08adf1e51baf7022db5f03cb"; + sha256 = "3ed82ac4d015d397cb53149f30e2842614092413d84dd6add365428b80c40cdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/tl/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/tl/firefox-82.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "14135d1ae961084d7979bb3ee13fa50bb2f59d8ea9fe18400084aedcd6ca5388"; + sha256 = "cdd9b16ad2fefdccbdea8bad3863e3177bd166fb595609f74b1afb7d279c4390"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/tr/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/tr/firefox-82.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "4ac2f0a8729427e508f9aaf3c6606145b84ea47009724a1d07c3182fbeb4678b"; + sha256 = "4b75d68d159ee4463854b53d0f68364648c2b36e6c0fc8937573cf2a1262ad0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/trs/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/trs/firefox-82.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "c7bf44d74cead7b7a5d44bb16331a113d8fb630c0bfa9740045ecc5d6858a099"; + sha256 = "b0947e9e8f45d848093805ff34a59d6c74a5559df91da5bf2255e2a24d386f95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/uk/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/uk/firefox-82.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7a796554c241f21c16573f20b2b1907a4f7af4cccf441739b9826e2140f640cf"; + sha256 = "a4ff8ded991f00825e10ebe69be7183899d8bca0692eae4e2c60049e80d6710d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ur/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/ur/firefox-82.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "8d5bdda725bad1479c32a18504fb584ac290f94e994b4c00a0686bb09bfb6913"; + sha256 = "ee50b6ac2818824211c5fb871f19eb0582a5f50c3873139d6aed613d9a853197"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/uz/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/uz/firefox-82.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "699bf3bd19bc7f4f213791ef2bd7ce8db0693928be611b952c6c8b34861efae1"; + sha256 = "6c530bd3bb2d1a3072513b203afd44affadd4cd3e8f9136f2b7e4e942d7cbd27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/vi/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/vi/firefox-82.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "731e97ab6e96cf3da549b1cd954fbd4c48112ba12792bf1b94f9ce5628505c47"; + sha256 = "ebfba78fe1778b0e724822adf1f448f005f4575c4c47eaf4d7347c808d2fe5a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/xh/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/xh/firefox-82.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "0078f3303b80aa63b1f664c49255077632729a5461b74a875e8cfb0ce3a23bb9"; + sha256 = "e9e9b4b5cf377ab18c857242d1915ec0198393d35fd93c4ead4ac1d790db4d97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/zh-CN/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/zh-CN/firefox-82.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "fe9cb3a43e12c64aa12e40e8f52651e1c4ef09a52bbb51a3492acf8a535172c1"; + sha256 = "c7d8459ff0eaaac129f168c54454af90f9618c8515f9df2a35de578611700372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/zh-TW/firefox-82.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0.2/linux-i686/zh-TW/firefox-82.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "020b7887120b134c127d444b59a5ce052fffd7653fffacaec9b0e4902e86158a"; + sha256 = "b9a3074700de458cd43721b683597f95f2ad81834a15d5ebde22dfc324d92fb3"; } ]; } From a7a7641e19698cd5e9d76611679a25d11a826dea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 19:16:58 +0000 Subject: [PATCH 040/228] fio: 3.22 -> 3.23 --- pkgs/tools/system/fio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 77a85e014734..2a945c78f821 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.22"; + version = "3.23"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "16p17l1xbqqkgppvwmfaywknhk4ybafnx8hm56ffd8bls9vaqw5m"; + sha256 = "0xr1d1jh7zhdhf0zfv8w6r99hk8h5d22v36h13hrd8mqyaz1g8m0"; }; buildInputs = [ python zlib ] From ac207159482b5df38da8a92d0d88c7b855fa9331 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 21:59:10 +0000 Subject: [PATCH 041/228] geekbench: 5.2.3 -> 5.2.5 --- pkgs/tools/misc/geekbench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 4d9434e9fb50..56292f3ad7dd 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.2.3"; + version = "5.2.5"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "03hasbibw79vbcrpdf2fnm42i2mxc0ia7k96xv012wn6d4dfvr4w"; + sha256 = "0mq33khmsay646csr7j7mqb1fr2dlacb58hjqyxfbh83r0a1q67p"; }; dontConfigure = true; From 172f396f7bf420d66b96c4c78a9a119b39f460fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 22:53:19 +0000 Subject: [PATCH 042/228] fet-sh: 1.7 -> 1.8 --- pkgs/tools/misc/fet-sh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/tools/misc/fet-sh/default.nix index 4041a9abdbad..e53c51c33e94 100644 --- a/pkgs/tools/misc/fet-sh/default.nix +++ b/pkgs/tools/misc/fet-sh/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "fet-sh"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "6gk"; repo = "fet.sh"; rev = "v${version}"; - sha256 = "02izkwfph4i62adwns4q4w1pfcmdsczm8ghagx5yb9315ww3adzn"; + sha256 = "1czjsyagwzbf8l023l1saz9ssb1hc245a64nfwc8wl0cn4h9byky"; }; dontBuild = true; From a70df2c2ccf5317f1ecbf5f1716364947b5b96b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 23:18:01 +0000 Subject: [PATCH 043/228] fnotifystat: 0.02.06 -> 0.02.07 --- pkgs/os-specific/linux/fnotifystat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index f01c96259a80..baa92decd9fc 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "fnotifystat"; - version = "0.02.06"; + version = "0.02.07"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "1mr2qzh8r8qq7haz4qgci2k5lcrcy493fm0m3ri40a81vaajfniy"; + sha256 = "0ipfg2gymbgx7bqlx1sq5p2y89k5j18iqnb0wa27n5s3kh9sh8w0"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' From db986689cac8b65598cb21aae0e98b1ecc6aeef4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 23:36:02 +0000 Subject: [PATCH 044/228] facter: 3.14.13 -> 3.14.14 --- pkgs/tools/system/facter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 170f3109a0a6..f9ea99432bf0 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.13"; + version = "3.14.14"; src = fetchFromGitHub { - sha256 = "1rink4xxh7f2ckqfl4pc3ljm9rfb5c4npsqzlys4f2snmq4d0h39"; + sha256 = "07pfa11i3nn2dk5g3c1qj3g7d2s8gd2fr0lmfijndaqxm7gjrn1a"; rev = version; repo = pname; owner = "puppetlabs"; From 1a130e752ab0ca5c1d9b582378c501602143eb3c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 23:47:06 +0000 Subject: [PATCH 045/228] flyway: 6.5.5 -> 7.1.1 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index c89b7acc51d8..2d8814dd2f72 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.5.5"; + version = "7.1.1"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "0g40lgrm9cslkdr4yn0h737djdr9fdyrc4hkq7wsrj0wx6d819dn"; + sha256 = "0ssspvgikn5avb49aldljx9avplhj33isbmwijk3548dg6dvh2da"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From 3408bddacfe6a76a1e317ba9bd3ca0e638ee89df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 00:15:25 +0000 Subject: [PATCH 046/228] gitAndTools.git-extras: 6.0.0 -> 6.1.0 --- .../version-management/git-and-tools/git-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index ed9e1cd4bdfa..d322a141cd94 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-extras"; - version = "6.0.0"; + version = "6.1.0"; src = fetchzip { url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; - sha256 = "0mxb3c5lb5n7c76bp10bw7bid564vjxi5f7cvzaj2ss93v5rr11g"; + sha256 = "12ff9rhgqd71xm72r385hx0h8g75hz0ag0adzqcwfa54k0lhrrrz"; }; nativeBuildInputs = [ unixtools.column which ]; From 155896c0cdc2ee128c044eee8b74b5c6ebcf00b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 00:41:26 +0000 Subject: [PATCH 047/228] gnu-pw-mgr: 2.4.2 -> 2.7.4 --- pkgs/tools/security/gnu-pw-mgr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix index de5234961d25..af6893b26e86 100644 --- a/pkgs/tools/security/gnu-pw-mgr/default.nix +++ b/pkgs/tools/security/gnu-pw-mgr/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gnu-pw-mgr"; - version = "2.4.2"; + version = "2.7.4"; src = fetchurl { url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${pname}-${version}.tar.xz"; - sha256 = "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17"; + sha256 = "0fhwvsmsqpw0vnivarfg63l8pgwqfv7d5wi6l80jpb41dj6qpjz8"; }; buildInputs = [ gnulib ]; From e2ade56177190015025cc78d50880d08ac461f22 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sat, 31 Oct 2020 17:56:10 -0700 Subject: [PATCH 048/228] prosody: install prosody-migrator tool --- pkgs/servers/xmpp/prosody/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index c9cd09bb748d..9b7ed2ac41d0 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -59,6 +59,10 @@ stdenv.mkDerivation rec { "--with-lua=${lua5}" ]; + postBuild = '' + make -C tools/migration + ''; + postInstall = '' ${concatMapStringsSep "\n" (module: '' cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ @@ -70,6 +74,11 @@ stdenv.mkDerivation rec { --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \ --prefix LUA_PATH ';' "$LUA_PATH" \ --prefix LUA_CPATH ';' "$LUA_CPATH" + + make -C tools/migration install + wrapProgram $out/bin/prosody-migrator \ + --prefix LUA_PATH ';' "$LUA_PATH" \ + --prefix LUA_CPATH ';' "$LUA_CPATH" ''; passthru = { From e687a4d233b3b8800805484d3f1df5a269c8fcfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 1 Nov 2020 00:56:18 +0000 Subject: [PATCH 049/228] genpass: 0.4.1 -> 0.4.9 * caught up with the newest released version * genpass main repo moved to sourcehut --- pkgs/tools/security/genpass/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix index 4310d3a8919f..6818af194b3a 100644 --- a/pkgs/tools/security/genpass/default.nix +++ b/pkgs/tools/security/genpass/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchFromGitHub +, fetchgit , rustPlatform , CoreFoundation , libiconv @@ -7,22 +7,21 @@ }: rustPlatform.buildRustPackage rec { pname = "genpass"; - version = "0.4.1"; + version = "0.4.9"; - src = fetchFromGitHub { - owner = "cyplo"; - repo = pname; + src = fetchgit { + url = "https://git.sr.ht/~cyplo/genpass"; rev = "v${version}"; - sha256 = "1b22m7g55k5ry0vwyd8pakh8rmfkhk37qy5r74cn3n5pv3fcwini"; + sha256 = "1dpv2iyd48xd8yw9bmymjjrkhsgmpwvsl5b9zx3lpaaq59ypi9g9"; }; - cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m"; + cargoSha256 = "1cwxpc3xkw673wiamr4v7clrzwxl8ma1vdr6bw0hixm37gxdxz7x"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; meta = with stdenv.lib; { description = "A simple yet robust commandline random password generator"; - homepage = "https://github.com/cyplo/genpass"; + homepage = "https://sr.ht/~cyplo/genpass/"; license = licenses.agpl3; maintainers = with maintainers; [ cyplo ]; }; From f6863c9f5d7f1198a6d0258ab4e76b111ca7806d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 03:09:39 +0000 Subject: [PATCH 050/228] gitlab-pages: 1.21.0 -> 1.28.0 --- pkgs/servers/http/gitlab-pages/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index 441dba9fb7b5..bef6744d1312 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.21.0"; + version = "1.28.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "0f317lx4iarlsbnq2ipcm4lpx66xzl8wfilj8xajq1csz19ws24z"; + sha256 = "15q32blkhmc5w1b2xh45y7cag8f6bw9bgiwin5ykrzj5d305wd16"; }; - vendorSha256 = "186rxvl523n1d87jz4zzbj83ikzw9d0c1wrj78xs4iqzm8z3snh0"; + vendorSha256 = "1gzkb2j2hl6ln8i5wjk2n9g8agpdzy1pzghb4sy1r8pdfp0i28r3"; subPackages = [ "." ]; doCheck = false; # Broken From bb1b9c501df8fff9aab67453d5a5d71d3e5dfe88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 03:50:30 +0000 Subject: [PATCH 051/228] tmuxp: 1.5.6 -> 1.5.8 --- pkgs/tools/misc/tmuxp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index a118195d4706..515d7001fbc7 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.5.6"; + version = "1.5.8"; src = fetchPypi { inherit pname version; - sha256 = "c305fc45bbf1093561e03cdcd37b2ab1f2efb9e208e74b2dc294cf414859bd8a"; + sha256 = "09b403c9e1ef50695fab1e72376ff5674906b485fbcaad50c7cafec1ba775087"; }; postPatch = '' From 7bbbfc47fdf72be598c6a9c4eb0b778b28a8d3c9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 1 Nov 2020 04:20:00 +0000 Subject: [PATCH 052/228] vault: 1.5.4 -> 1.5.5 --- pkgs/tools/security/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 9e5f48c46f10..b8fa53a057e1 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "0bin0r0qmyz8xal910csbclzc6ng2xv69jszyi69gd6n6f43vqw8"; + sha256 = "144v7vmp2amv29y6d50jzc21zrcw0g6qlwks16mvqy2hnbsnzdwa"; }; goPackagePath = "github.com/hashicorp/vault"; From dc2e926ba3487679b76dc87b74740d97f80ded1c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 1 Nov 2020 04:20:00 +0000 Subject: [PATCH 053/228] mkcert: 1.4.1 -> 1.4.2 https://github.com/FiloSottile/mkcert/releases/tag/v1.4.2 --- pkgs/development/tools/misc/mkcert/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index ec4042a2a276..5cb1d9a38ace 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mkcert"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; rev = "v${version}"; - sha256 = "0w1ji96hbd3anzsz82xjcafsqhgyz7c7n41rsq60yrllwbj5946f"; + sha256 = "0g85vpkfgkc7nzjl3asl2f4ncsh12naf2fkr0mvyihfmfy9fz0fw"; }; vendorSha256 = "0b8ggdpbyxx5n2myhchhlwmm5nndwpykp1ylnzdyw12mdskfvn9h"; @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = false; buildFlagsArray = '' - -ldflags=-X main.Version=v${version} + -ldflags=-s -w -X main.Version=v${version} ''; meta = with lib; { From 9578b4a66c8f7381c31b20f766f2d9286c2d80e8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 1 Nov 2020 04:20:00 +0000 Subject: [PATCH 054/228] vault-bin: 1.5.4 -> 1.5.5 --- pkgs/tools/security/vault/vault-bin.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 457d45111a07..6cc6e170302c 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,30 +1,30 @@ { stdenv, fetchurl, unzip }: let - version = "1.5.4"; + version = "1.5.5"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "1cyk9v70w0px2sxg8dichqgk38br9hc4kdl37jk57ci5gdl6w5ah"; + sha256 = "1vg1c34d2ck2a96p800gblq06jakg29yzrczaa6nsmnnr3k5hs9a"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "1n6hmhd4g2c6zzbimslxpghma5dyqwb96w60srbf9gn2vrimg4l4"; + sha256 = "1hf46mm7shvq9gpi50b6hcp2cydhzbkwigqcnl527y4cvc9iv7in"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "05d5m8kdwl6mcx3swkasm5zcmddlyl6m9lwj26vbg9pllx9zxvqm"; + sha256 = "1jna9rmdhqi7j8p67y9dzq716dv8fn4rjsn76mbvlgc5wylky6gz"; }; i686-darwin = fetchurl { url = "${base}/vault_${version}_darwin_386.zip"; - sha256 = "109hisdwd58za541qhw61bscfrh3szzfn8vdmr4c7nh5praiqznb"; + sha256 = "1qv02zd5dwaw1i52pnbyshbd8cy0x5nr3f2s9l3p9ci5rzad4rjn"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "0q8icl5ncvixrdmsd2ilzvpa6c1pswa6zgh3vccsj7sg8mxprjmr"; + sha256 = "1y4i62qq5cx2bv18dnbgys2qa5xx0acn8j3hdh0dbsw0zyms4qv7"; }; }; From dbc3eda9d910acc48251c057f8295b6be1c84ba4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 1 Nov 2020 04:20:00 +0000 Subject: [PATCH 055/228] sudo-font: 0.51 -> 0.52 --- pkgs/data/fonts/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index fab252af458b..f21fdb184161 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.51"; + version = "0.52"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "19m132183w5hrc5qvlb6cj38hir2302cqiljlfc72qdlb8al6fwi"; + sha256 = "1j5p7apclyy5gfj2kklmgcncdsp5iik4gd6mdl29anzijknd0kja"; postFetch = '' mkdir -p $out/share/fonts/ From 5da63dd70dfab4161449ccf980cd3357ebebdd14 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 1 Nov 2020 06:04:50 +0100 Subject: [PATCH 056/228] geonkick: 2.4.0 -> 2.5.0 --- pkgs/applications/audio/geonkick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 0da00d319720..8064c7607466 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "1ibsfyzkvzijv929p91db56gaxm582b7nikbn10wbbjvv4f46mmj"; + sha256 = "19zbz4v2n5ph4af721xls7ignmis2q2yqyd0m97g9b3njrgnfy3n"; }; nativeBuildInputs = [ cmake pkg-config ]; From 682d96df88cfb6230be95cd00a241a61987c7ed8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 31 Oct 2020 21:44:05 -0300 Subject: [PATCH 057/228] cde: update expression The old Github repository (pgbovine/CDE) was deleted; usnistgov/corr-CDE is an alternative fork. --- pkgs/tools/package-management/cde/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index ec6ad6eb55ab..957919e26001 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { version = "0.1"; src = fetchFromGitHub { - owner = "pgbovine"; - repo = "CDE"; - sha256 = "0raiz7pczkbnzxpg7g59v7gdp1ipkwgms2vh3431snw1va1gjzmk"; + owner = "usnistgov"; + repo = "corr-CDE"; rev = "v${version}"; + sha256 = "sha256-s375gtqBWx0GGXALXR+fN4bb3tmpvPNu/3bNz+75UWU="; }; # The build is small, so there should be no problem @@ -18,19 +18,22 @@ stdenv.mkDerivation rec { preferLocalBuild = true; patchBuild = '' - sed '/install/d' $src/Makefile > $src/Makefile + sed -i -e '/install/d' $src/Makefile ''; - + + preBuild = '' + patchShebangs . + ''; + installPhase = '' - mkdir -p $out/bin - cp cde $out/bin - cp cde-exec $out/bin + install -d $out/bin + install -t $out/bin cde cde-exec ''; meta = with stdenv.lib; { - homepage = "https://github.com/pgbovine/CDE"; + homepage = "https://pg.ucsd.edu/cde/manual/"; description = "A packaging tool for building portable packages"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.rlupton20 ]; platforms = platforms.linux; # error: architecture aarch64 is not supported by strace From 89fb549f7caf936a32ec33f09f62b86f4d559896 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 05:44:56 +0000 Subject: [PATCH 058/228] bdf2sfd: 1.1.4 -> 1.1.5 --- pkgs/tools/misc/bdf2sfd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix index 096164990458..728967ec3da8 100644 --- a/pkgs/tools/misc/bdf2sfd/default.nix +++ b/pkgs/tools/misc/bdf2sfd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bdf2sfd"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "fcambus"; repo = pname; rev = version; - sha256 = "1lg3yabnf26lghlrmhpq7hbhydmw85q0k64246b8fwv1dnxc7afd"; + sha256 = "1bpadw25barzmmsz9bkrsj3iwbgf945zqfakbgq1yscfb85bfgsp"; }; nativeBuildInputs = [ cmake ]; From a98a24fe1525f2c4fe87cd0bd4e96d3685ac47e1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 07:07:58 +0000 Subject: [PATCH 059/228] cargo-outdated: 0.9.11 -> 0.9.13 --- pkgs/tools/package-management/cargo-outdated/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 5d4eef2fbe5a..185cba66e311 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.11"; + version = "0.9.13"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "11fdh24366czb3vv2szf5bl0mhsilwvpfc1h4qxq18z2dpb0y18m"; + sha256 = "1dbhaaw1c3ww0s33r7z8kxks00f9gxv1ppcbmk2fbflhp7caf7fy"; }; - cargoSha256 = "0sr3ijq6vh2269xav03d117kzmg68xiwqsq48xjdrsnn4dx5lizy"; + cargoSha256 = "0nlfn9g7hrzz72lya2p5qb8wwj66300d33hjhnw2ambpj4347rh4"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] From 4f8477a28f8c033e2ae710f46116c5593af2cdad Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sun, 1 Nov 2020 04:10:08 -0300 Subject: [PATCH 060/228] popeye: 0.8.10 -> 0.9.0 Signed-off-by: Bryan A. S --- .../applications/networking/cluster/popeye/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index ff180bdc9b2f..6e7eccac2063 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,24 +2,24 @@ buildGoModule rec { pname = "popeye"; - version = "0.8.10"; + version = "0.9.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "1cx39xipvvhb12nhvg7kfssnqafajni662b070ynlw8p870bj0sn"; + sha256 = "1rslmcdjs53zvv0xaf00vxqsfc3jh2p584j3q6nfgrghc978xmpf"; }; buildFlagsArray = '' -ldflags= -s -w -X github.com/derailed/popeye/cmd.version=${version} - -X github.com/derailed/popeye/cmd.commit=b7a876eafd4f7ec5683808d8d6880c41c805056a - -X github.com/derailed/popeye/cmd.date=2020-08-25T23:02:30Z + -X github.com/derailed/popeye/cmd.commit=022c3104b642aab6bdb287468fb79068a33e1b0d + -X github.com/derailed/popeye/cmd.date=2020-10-31T16:44:45Z ''; - vendorSha256 = "0b2bawc9wnqwgvrv614rq5y4ns9di65zqcbb199y2ijpsaw5d9a7"; + vendorSha256 = "08195dnka7rs38py3kjii9zh9nifg2fnbi1wzjl0pc38i2bbrz0k"; doCheck = false; From d6ba21adf4fb175d6cd4d3ce753f4fe2315c0907 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 07:31:26 +0000 Subject: [PATCH 061/228] checkstyle: 8.36.2 -> 8.37 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 7e468f44b1ae..1e2b435fd082 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.36.2"; + version = "8.37"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "05yb3020q0r75ggh0nm56yj45ha2ppyhbnjn34wqpadi842pzpfh"; + sha256 = "1xhindlq46d5878mkbxc3f6fx6i00kqbj2aymlg0022v9h6r1p9p"; }; nativeBuildInputs = [ makeWrapper ]; From de694b3a14dc9787c87cae53933fbf7ccb6eb463 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 1 Nov 2020 16:34:16 +0900 Subject: [PATCH 062/228] sozu: 0.11.46 -> 0.11.50; fix Darwin build --- pkgs/servers/sozu/default.nix | 36 +++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index 1e8083587055..16561da7d297 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -1,22 +1,26 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub, darwin }: rustPlatform.buildRustPackage rec { - pname = "sozu"; - version = "0.11.46"; + pname = "sozu"; + version = "0.11.50"; - src = fetchFromGitHub { - owner = "sozu-proxy"; - repo = pname; - rev = version; - sha256 = "0anng5qvdx9plxs9qqr5wmjjz0gx5113jq28xwbxaaklvd4ni7cm"; - }; + src = fetchFromGitHub { + owner = "sozu-proxy"; + repo = pname; + rev = version; + sha256 = "1srg2b8vwc4vp07kg4fizqj1rbm9hvf6hj1mjdh6yvb9cpbw3jz7"; + }; - cargoSha256 = "19c2s9h4jk9pff72wdqw384mvrf40d8x4sx7qysnpb4hayq2ijh3"; + cargoSha256 = "5WOigCiQZQ5DaTd15vV8pUh8Xl3UIe9yLG1ptUtY+iA="; - meta = with stdenv.lib; { - description = "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures"; - homepage = "https://sozu.io"; - license = licenses.agpl3; - maintainers = with maintainers; [ filalex77 ]; - }; + buildInputs = + stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + meta = with stdenv.lib; { + description = + "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures"; + homepage = "https://www.sozu.io"; + license = licenses.agpl3; + maintainers = with maintainers; [ filalex77 ]; + }; } From 1ab35e7e64ea7d5b4b15711fde3350685ba016ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 07:37:17 +0000 Subject: [PATCH 063/228] chezmoi: 1.8.7 -> 1.8.8 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 448c0859c575..95e1f0592eef 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "1inmrcp01rxrjylkj9vzgw3q713q6jsqbnqllbzvp8q6kqfliayg"; + sha256 = "1ax0rq341k8mi7lghw1rkmlg802fd22zpql5v3g6lhgy6s1xq9wk"; }; - vendorSha256 = "0m946g6iw42q5ggki2j1lqdshpsxjmdsm1snnyzjzyy8gd88m4cx"; + vendorSha256 = "08x81r9y2x1xcld1s6maspq94wr817w9aqjdv226058ran0492s8"; doCheck = false; From e945bd753c49bdd5fd285f52c66b9e2cc01c21d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 07:54:34 +0000 Subject: [PATCH 064/228] compactor: 0.12.2 -> 1.0.0 --- pkgs/applications/networking/compactor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 5d9a658972c3..97a2f6992f9a 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "compactor"; - version = "0.12.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "dns-stats"; repo = pname; rev = version; - sha256 = "17p9wsslsh6ifnadvyygr0cgir4q4iirxfz9zpkpbhh76cx2qnay"; + sha256 = "0x5rwbv0ndf9zcvnsbd78ic6shh9hd0bh3gh0lzz9wlb99lslbkk"; }; # cbor-diag, cddl and wireshark-cli are only used for tests. From f3370e061b36483937256d238b38a46feb637bbb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 08:47:11 +0000 Subject: [PATCH 065/228] doppler: 3.15.0 -> 3.16.0 --- pkgs/tools/security/doppler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 8858fb15758c..2492390bdd83 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.15.0"; + version = "3.16.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "06icddb99ahmi5djrslpqsjjd38agvkhnfls5wqahclf0j4dylr6"; + sha256 = "1hypi62bzdpa55bd9z9lvisw7ybcn8jlk0kyck9h7wc2ll59jzwx"; }; - vendorSha256 = "0wqbwk72k4r30a3vnf0gnx3k97y8xgnr2iavk5bc8f8vkjv0bsv6"; + vendorSha256 = "1s8zwjfk9kcddn8cywr7llh9v5m140kvmi5lmy2glvwh3rwccgxf"; buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}"; From d54027f95c9bb56a4bfb54f86171e311954993c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 09:39:21 +0000 Subject: [PATCH 066/228] flameshot: 0.8.4 -> 0.8.5 --- pkgs/tools/misc/flameshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index de7d56e5584a..3dcf1e962691 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "flameshot"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "0nr50ma8l612drl2br084kb3xac7jqkqr41b26d4p9y7ylwk05yq"; + sha256 = "1z77igs60lz106vsf6wsayxjafxm3llf2lm4dpvsqyyrxybfq191"; }; nativeBuildInputs = [ cmake qttools qtsvg ]; From fa45e8792dc6abe7649c09af38004000825ee326 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 09:49:56 +0000 Subject: [PATCH 067/228] fly: 6.6.0 -> 6.7.0 --- pkgs/development/tools/continuous-integration/fly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 1dcb247a4c8a..405ac1e26b06 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fly"; - version = "6.6.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "09cfsq8vfjhavhqcydg0l3bi1g12y2p160yi2v0y5vk7ipiqyzrd"; + sha256 = "0jc0hr0h1xya7avzxdwmvhnsm5cr3g21pig52draz5vjaya7bg55"; }; vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4"; From 790714af65bf03234efce4c6ec9237166697bf86 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 1 Nov 2020 11:15:55 +0100 Subject: [PATCH 068/228] kdeApplications.okteta: remove alias After 3 years we can remove the alias. --- pkgs/applications/kde/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 5 deletions(-) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 4713c9ecf494..315a5b358855 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -27,7 +27,6 @@ still shows most of the available features is in `./gwenview.nix`. { lib, libsForQt5, fetchurl, - okteta }: let @@ -210,9 +209,6 @@ let rocs = callPackage ./rocs.nix {}; spectacle = callPackage ./spectacle.nix {}; yakuake = callPackage ./yakuake.nix {}; - # Okteta was removed from kde applications and will now be released independently - # Lets keep an alias for compatibility reasons - inherit okteta; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f449f65d12d..32dbe8b164ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21734,7 +21734,6 @@ in attrs = { inherit libsForQt5; inherit lib fetchurl; - inherit okteta; }; in recurseIntoAttrs (makeOverridable mkApplications attrs); From 6719d4b5c882b41073e32c9245b8b1848e7b6aca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 10:24:59 +0000 Subject: [PATCH 069/228] gcsfuse: 0.30.0 -> 0.32.0 --- pkgs/tools/filesystems/gcsfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 89fa3ebe33b6..d820e5e68e2a 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gcsfuse"; - version = "0.30.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "1ai1dgf07g2c08rp87kygrl67hyj7x793093wmnwaxfpylx5flv0"; + sha256 = "09k7479gd9rlzmxhcvc1b3ajy8frzd6881vnlvk3z9818n4aq7qc"; }; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; From 61040fa997191422631dc44dd0d5d6e5755efeaf Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 1 Nov 2020 12:41:33 +0300 Subject: [PATCH 070/228] iortcw: init at 1.51c --- pkgs/games/iortcw/default.nix | 27 +++++++++++++++++ pkgs/games/iortcw/sp.nix | 52 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 83 insertions(+) create mode 100644 pkgs/games/iortcw/default.nix create mode 100644 pkgs/games/iortcw/sp.nix diff --git a/pkgs/games/iortcw/default.nix b/pkgs/games/iortcw/default.nix new file mode 100644 index 000000000000..3aa459777ea7 --- /dev/null +++ b/pkgs/games/iortcw/default.nix @@ -0,0 +1,27 @@ +{ buildEnv, callPackage, makeWrapper }: + +let + sp = callPackage ./sp.nix {}; + mp = sp.overrideAttrs (oldAttrs: rec { + sourceRoot = "source/MP"; + }); +in buildEnv { + name = "iortcw"; + + paths = [ sp mp ]; + + pathsToLink = [ "/opt" ]; + + buildInputs = [ makeWrapper ]; + + # so we can launch sp from mp game and vice versa + postBuild = '' + for i in `find -L $out/opt/iortcw -maxdepth 1 -type f -executable`; do + makeWrapper $i $out/bin/`basename $i` --run "cd $out/opt/iortcw" + done + ''; + + meta = sp.meta // { + description = "Game engine for Return to Castle Wolfenstein"; + }; +} diff --git a/pkgs/games/iortcw/sp.nix b/pkgs/games/iortcw/sp.nix new file mode 100644 index 000000000000..71144ad0eb85 --- /dev/null +++ b/pkgs/games/iortcw/sp.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, opusfile, libogg, SDL2, openal, freetype +, libjpeg, curl, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "iortcw-sp"; + version = "1.51c"; + + src = fetchFromGitHub { + owner = "iortcw"; + repo = "iortcw"; + rev = version; + sha256 = "0g5wgqb1gm34pd05dj2i8nj3qhsz0831p3m7bsgxpjcg9c00jpyw"; + }; + + enableParallelBuilding = true; + + sourceRoot = "source/SP"; + + makeFlags = [ + "USE_INTERNAL_LIBS=0" + "COPYDIR=${placeholder "out"}/opt/iortcw" + "USE_OPENAL_DLOPEN=0" + "USE_CURL_DLOPEN=0" + ]; + + installTargets = [ "copyfiles" ]; + + buildInputs = [ + opusfile libogg SDL2 freetype libjpeg openal curl + ]; + nativeBuildInputs = [ makeWrapper ]; + + NIX_CFLAGS_COMPILE = [ + "-I${SDL2.dev}/include/SDL2" + "-I${opusfile}/include/opus" + ]; + NIX_CFLAGS_LINK = [ "-lSDL2" ]; + + postInstall = '' + for i in `find $out/opt/iortcw -maxdepth 1 -type f -executable`; do + makeWrapper $i $out/bin/`basename $i` --run "cd $out/opt/iortcw" + done + ''; + + meta = with stdenv.lib; { + description = "Single player version of game engine for Return to Castle Wolfenstein"; + homepage = src.meta.homepage; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32dbe8b164ad..4226f35c7fa6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25224,6 +25224,10 @@ in instead-launcher = callPackage ../games/instead-launcher { }; + iortcw = callPackage ../games/iortcw { }; + # used as base package for iortcw forks + iortcw_sp = callPackage ../games/iortcw/sp.nix { }; + ivan = callPackage ../games/ivan { }; ja2-stracciatella = callPackage ../games/ja2-stracciatella { }; From 8d6cac9e03eb22a72c9a9931e499c2d6ff8726cc Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Sun, 1 Nov 2020 11:56:06 +0100 Subject: [PATCH 071/228] filebot: 4.9.1 -> 4.9.2 --- pkgs/applications/video/filebot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index cdd70b4c8948..e9ae14e19aa2 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "filebot"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; - sha256 = "0l496cz703mjymjhgmyrkqbfld1bz53pdsbkx00h9a267j22fkms"; + sha256 = "0hcyam8l0fzc9fnp1dpawk0s3rwhfph78w99y7zlcv5l4l4h04lz"; }; unpackPhase = "tar xvf $src"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp -r filebot.sh lib/ jar/ $out/opt/ # Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead. substituteInPlace $out/opt/filebot.sh \ - --replace 'APP_DATA="$FILEBOT_HOME/data/$USER"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ + --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' wrapProgram $out/opt/filebot.sh \ --prefix PATH : ${stdenv.lib.makeBinPath [ openjdk11 ]} From e2ae423b3beecccbbb07924f8b7f99b59b2ca354 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 10:58:30 +0000 Subject: [PATCH 072/228] gllvm: 1.2.8 -> 1.2.9 --- pkgs/development/tools/gllvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index 58416e30a8c9..efa7ae21c3a5 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gllvm"; - version = "1.2.8"; + version = "1.2.9"; goPackagePath = "github.com/SRI-CSL/gllvm"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "SRI-CSL"; repo = "gllvm"; rev = "v${version}"; - sha256 = "090ghg7ivf6snkabba00pn8a9x5wj8dgpdq7qjhmw1lpijd0mq0y"; + sha256 = "15cgngvd9mg057iz32fk5kcprcvvavahbvfvl5ds8x7shbm60g7s"; }; meta = with stdenv.lib; { From 8c7ef10f716ca5983fd4bb69112aea0ae84e2d09 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 1 Nov 2020 11:23:39 +0300 Subject: [PATCH 073/228] vkquake: 1.04.1 -> 1.05.0 --- pkgs/games/quakespasm/vulkan.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 39474715021e..49f9e6832354 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -1,25 +1,16 @@ -{ stdenv, fetchpatch, fetchFromGitHub, makeWrapper, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }: +{ stdenv, fetchFromGitHub, makeWrapper, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }: stdenv.mkDerivation rec { pname = "vkquake"; - version = "1.04.1"; + version = "1.05.0"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "1ry861pk3z02hy7i0yi3xwmd1zma802qzcnlm09w6pslayd9rwbf"; + sha256 = "16ryjfkmnhlxv7b6yvyk3247q7ih4g90a7c4z501xiyp7h0wlsw8"; }; - # patches and patchFlags can be deleted with the next release - patches = [ - (fetchpatch { - url = "https://github.com/Novum/vkQuake/commit/a869a22d9b51c68e57646fa20e4c40fc6db36760.patch"; - sha256 = "sha256-ea5lcXTTlJZnuOdF1W+GCYvVgj/gW10tDNyTgfl3Kfs="; - }) - ]; - patchFlags = "-p2"; - sourceRoot = "source/Quake"; nativeBuildInputs = [ From f074f6e3ac0a2b87252e5f586ce4f80bd8d1bbb1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Nov 2020 14:19:23 +0100 Subject: [PATCH 074/228] zigbee2mqtt: 1.15.0 -> 1.16.0 --- pkgs/servers/zigbee2mqtt/default.nix | 4 +- pkgs/servers/zigbee2mqtt/node-packages.nix | 2820 +++++++++----------- 2 files changed, 1237 insertions(+), 1587 deletions(-) diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index e28d9a73aea3..10fa4e3340c9 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -3,7 +3,7 @@ let package = (import ./node.nix { inherit pkgs system; }).package; in package.override rec { - version = "1.15.0"; + version = "1.16.0"; reconstructLock = true; postInstall = '' @@ -20,7 +20,7 @@ package.override rec { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "1kbrkmam0x2mhqps58xwagp8y3q6zyz0qlx57ys2z2wcs12lpw4r"; + sha256 = "0hahzvp3099g0i4jqbkcq6vndpjigx7b6mg1vjcs5v0wyllxdlwp"; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index dfe00bd467bb..89f3be7119d4 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@babel/cli-7.11.6" = { + "@babel/cli-7.12.1" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.11.6"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.11.6.tgz"; - sha512 = "+w7BZCvkewSmaRM6H4L2QM3RL90teqEIHDIFXAmrW33+0jhlymnDAEdqVeCZATvxhQuio1ifoGVlJJbIiH9Ffg=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.1.tgz"; + sha512 = "eRJREyrfAJ2r42Iaxe8h3v6yyj1wu9OyosaUHW6UImjGf9ahGL9nsFNh7OCopvtcPL8WnEo7tp78wrZaZ6vG9g=="; }; }; "@babel/code-frame-7.10.4" = { @@ -22,31 +22,31 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/compat-data-7.11.0" = { + "@babel/compat-data-7.12.1" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz"; - sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz"; + sha512 = "725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ=="; }; }; - "@babel/core-7.11.6" = { + "@babel/core-7.12.3" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.11.6"; + version = "7.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz"; - sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz"; + sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g=="; }; }; - "@babel/generator-7.11.6" = { + "@babel/generator-7.12.1" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.11.6"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz"; - sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz"; + sha512 = "DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -67,31 +67,31 @@ let sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg=="; }; }; - "@babel/helper-compilation-targets-7.10.4" = { + "@babel/helper-compilation-targets-7.12.1" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz"; - sha512 = "a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz"; + sha512 = "jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g=="; }; }; - "@babel/helper-create-class-features-plugin-7.10.5" = { + "@babel/helper-create-class-features-plugin-7.12.1" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"; - sha512 = "0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"; + sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.10.4" = { + "@babel/helper-create-regexp-features-plugin-7.12.1" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz"; - sha512 = "2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz"; + sha512 = "rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA=="; }; }; "@babel/helper-define-map-7.10.5" = { @@ -103,13 +103,13 @@ let sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; }; }; - "@babel/helper-explode-assignable-expression-7.11.4" = { + "@babel/helper-explode-assignable-expression-7.12.1" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.11.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz"; - sha512 = "ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz"; + sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA=="; }; }; "@babel/helper-function-name-7.10.4" = { @@ -139,31 +139,31 @@ let sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; }; }; - "@babel/helper-member-expression-to-functions-7.11.0" = { + "@babel/helper-member-expression-to-functions-7.12.1" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; - sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz"; + sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ=="; }; }; - "@babel/helper-module-imports-7.10.4" = { + "@babel/helper-module-imports-7.12.1" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; - sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz"; + sha512 = "ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA=="; }; }; - "@babel/helper-module-transforms-7.11.0" = { + "@babel/helper-module-transforms-7.12.1" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; - sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; + sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w=="; }; }; "@babel/helper-optimise-call-expression-7.10.4" = { @@ -193,40 +193,40 @@ let sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg=="; }; }; - "@babel/helper-remap-async-to-generator-7.11.4" = { + "@babel/helper-remap-async-to-generator-7.12.1" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.11.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz"; - sha512 = "tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"; + sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A=="; }; }; - "@babel/helper-replace-supers-7.10.4" = { + "@babel/helper-replace-supers-7.12.1" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; - sha512 = "sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz"; + sha512 = "zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw=="; }; }; - "@babel/helper-simple-access-7.10.4" = { + "@babel/helper-simple-access-7.12.1" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; - sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; + sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.11.0" = { + "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"; - sha512 = "0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; + sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; }; }; "@babel/helper-split-export-declaration-7.11.0" = { @@ -247,22 +247,31 @@ let sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="; }; }; - "@babel/helper-wrap-function-7.10.4" = { - name = "_at_babel_slash_helper-wrap-function"; - packageName = "@babel/helper-wrap-function"; - version = "7.10.4"; + "@babel/helper-validator-option-7.12.1" = { + name = "_at_babel_slash_helper-validator-option"; + packageName = "@babel/helper-validator-option"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"; - sha512 = "6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz"; + sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A=="; }; }; - "@babel/helpers-7.10.4" = { + "@babel/helper-wrap-function-7.12.3" = { + name = "_at_babel_slash_helper-wrap-function"; + packageName = "@babel/helper-wrap-function"; + version = "7.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz"; + sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow=="; + }; + }; + "@babel/helpers-7.12.1" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz"; - sha512 = "L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz"; + sha512 = "9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g=="; }; }; "@babel/highlight-7.10.4" = { @@ -274,130 +283,130 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.11.5" = { + "@babel/parser-7.12.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.11.5"; + version = "7.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"; - sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz"; + sha512 = "kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.10.5" = { + "@babel/plugin-proposal-async-generator-functions-7.12.1" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz"; - sha512 = "cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz"; + sha512 = "d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A=="; }; }; - "@babel/plugin-proposal-class-properties-7.10.4" = { + "@babel/plugin-proposal-class-properties-7.12.1" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz"; - sha512 = "vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"; + sha512 = "cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.10.4" = { + "@babel/plugin-proposal-dynamic-import-7.12.1" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz"; - sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz"; + sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.10.4" = { + "@babel/plugin-proposal-export-namespace-from-7.12.1" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"; - sha512 = "aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"; + sha512 = "6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw=="; }; }; - "@babel/plugin-proposal-json-strings-7.10.4" = { + "@babel/plugin-proposal-json-strings-7.12.1" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz"; - sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"; + sha512 = "GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.11.0" = { + "@babel/plugin-proposal-logical-assignment-operators-7.12.1" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"; - sha512 = "/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"; + sha512 = "k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz"; - sha512 = "wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"; + sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.10.4" = { + "@babel/plugin-proposal-numeric-separator-7.12.1" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz"; - sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz"; + sha512 = "MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.11.0" = { + "@babel/plugin-proposal-object-rest-spread-7.12.1" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz"; - sha512 = "wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"; + sha512 = "s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.10.4" = { + "@babel/plugin-proposal-optional-catch-binding-7.12.1" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz"; - sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"; + sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.11.0" = { + "@babel/plugin-proposal-optional-chaining-7.12.1" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"; - sha512 = "v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz"; + sha512 = "c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw=="; }; }; - "@babel/plugin-proposal-private-methods-7.10.4" = { + "@babel/plugin-proposal-private-methods-7.12.1" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz"; - sha512 = "wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"; + sha512 = "mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.10.4" = { + "@babel/plugin-proposal-unicode-property-regex-7.12.1" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz"; - sha512 = "H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"; + sha512 = "MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -418,13 +427,13 @@ let sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; }; }; - "@babel/plugin-syntax-class-properties-7.10.4" = { + "@babel/plugin-syntax-class-properties-7.12.1" = { name = "_at_babel_slash_plugin-syntax-class-properties"; packageName = "@babel/plugin-syntax-class-properties"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz"; - sha512 = "GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; + sha512 = "U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -517,328 +526,328 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.10.4" = { + "@babel/plugin-syntax-top-level-await-7.12.1" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz"; - sha512 = "ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; + sha512 = "i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A=="; }; }; - "@babel/plugin-syntax-typescript-7.10.4" = { + "@babel/plugin-syntax-typescript-7.12.1" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz"; - sha512 = "oSAEz1YkBCAKr5Yiq8/BNtvSAPwkp/IyUnwZogd8p+F0RuYQQrLeRUzIQhueQTTBy/F+a40uS7OFKxnkRvmvFQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz"; + sha512 = "UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA=="; }; }; - "@babel/plugin-transform-arrow-functions-7.10.4" = { + "@babel/plugin-transform-arrow-functions-7.12.1" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz"; - sha512 = "9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"; + sha512 = "5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A=="; }; }; - "@babel/plugin-transform-async-to-generator-7.10.4" = { + "@babel/plugin-transform-async-to-generator-7.12.1" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz"; - sha512 = "F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"; + sha512 = "SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.10.4" = { + "@babel/plugin-transform-block-scoped-functions-7.12.1" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz"; - sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"; + sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA=="; }; }; - "@babel/plugin-transform-block-scoping-7.11.1" = { + "@babel/plugin-transform-block-scoping-7.12.1" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.11.1"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"; - sha512 = "00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz"; + sha512 = "zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w=="; }; }; - "@babel/plugin-transform-classes-7.10.4" = { + "@babel/plugin-transform-classes-7.12.1" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz"; - sha512 = "2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"; + sha512 = "/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog=="; }; }; - "@babel/plugin-transform-computed-properties-7.10.4" = { + "@babel/plugin-transform-computed-properties-7.12.1" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz"; - sha512 = "JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"; + sha512 = "vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg=="; }; }; - "@babel/plugin-transform-destructuring-7.10.4" = { + "@babel/plugin-transform-destructuring-7.12.1" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz"; - sha512 = "+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"; + sha512 = "fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw=="; }; }; - "@babel/plugin-transform-dotall-regex-7.10.4" = { + "@babel/plugin-transform-dotall-regex-7.12.1" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz"; - sha512 = "ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"; + sha512 = "B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.10.4" = { + "@babel/plugin-transform-duplicate-keys-7.12.1" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz"; - sha512 = "GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"; + sha512 = "iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.10.4" = { + "@babel/plugin-transform-exponentiation-operator-7.12.1" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz"; - sha512 = "S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"; + sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug=="; }; }; - "@babel/plugin-transform-for-of-7.10.4" = { + "@babel/plugin-transform-for-of-7.12.1" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz"; - sha512 = "ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"; + sha512 = "Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg=="; }; }; - "@babel/plugin-transform-function-name-7.10.4" = { + "@babel/plugin-transform-function-name-7.12.1" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz"; - sha512 = "OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"; + sha512 = "JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw=="; }; }; - "@babel/plugin-transform-literals-7.10.4" = { + "@babel/plugin-transform-literals-7.12.1" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz"; - sha512 = "Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"; + sha512 = "+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.10.4" = { + "@babel/plugin-transform-member-expression-literals-7.12.1" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz"; - sha512 = "0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"; + sha512 = "1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg=="; }; }; - "@babel/plugin-transform-modules-amd-7.10.5" = { + "@babel/plugin-transform-modules-amd-7.12.1" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz"; - sha512 = "elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"; + sha512 = "tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.10.4" = { + "@babel/plugin-transform-modules-commonjs-7.12.1" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz"; - sha512 = "Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"; + sha512 = "dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.10.5" = { + "@babel/plugin-transform-modules-systemjs-7.12.1" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz"; - sha512 = "f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"; + sha512 = "Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q=="; }; }; - "@babel/plugin-transform-modules-umd-7.10.4" = { + "@babel/plugin-transform-modules-umd-7.12.1" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz"; - sha512 = "mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"; + sha512 = "aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.10.4" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.12.1" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz"; - sha512 = "V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"; + sha512 = "tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q=="; }; }; - "@babel/plugin-transform-new-target-7.10.4" = { + "@babel/plugin-transform-new-target-7.12.1" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz"; - sha512 = "YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"; + sha512 = "+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw=="; }; }; - "@babel/plugin-transform-object-super-7.10.4" = { + "@babel/plugin-transform-object-super-7.12.1" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz"; - sha512 = "5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"; + sha512 = "AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw=="; }; }; - "@babel/plugin-transform-parameters-7.10.5" = { + "@babel/plugin-transform-parameters-7.12.1" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz"; - sha512 = "xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"; + sha512 = "xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg=="; }; }; - "@babel/plugin-transform-property-literals-7.10.4" = { + "@babel/plugin-transform-property-literals-7.12.1" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz"; - sha512 = "ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"; + sha512 = "6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ=="; }; }; - "@babel/plugin-transform-regenerator-7.10.4" = { + "@babel/plugin-transform-regenerator-7.12.1" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz"; - sha512 = "3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"; + sha512 = "gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng=="; }; }; - "@babel/plugin-transform-reserved-words-7.10.4" = { + "@babel/plugin-transform-reserved-words-7.12.1" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz"; - sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"; + sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.10.4" = { + "@babel/plugin-transform-shorthand-properties-7.12.1" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz"; - sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"; + sha512 = "GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw=="; }; }; - "@babel/plugin-transform-spread-7.11.0" = { + "@babel/plugin-transform-spread-7.12.1" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"; - sha512 = "UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"; + sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng=="; }; }; - "@babel/plugin-transform-sticky-regex-7.10.4" = { + "@babel/plugin-transform-sticky-regex-7.12.1" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz"; - sha512 = "Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz"; + sha512 = "CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ=="; }; }; - "@babel/plugin-transform-template-literals-7.10.5" = { + "@babel/plugin-transform-template-literals-7.12.1" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz"; - sha512 = "V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"; + sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.10.4" = { + "@babel/plugin-transform-typeof-symbol-7.12.1" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz"; - sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz"; + sha512 = "EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q=="; }; }; - "@babel/plugin-transform-typescript-7.11.0" = { + "@babel/plugin-transform-typescript-7.12.1" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz"; - sha512 = "edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz"; + sha512 = "VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.10.4" = { + "@babel/plugin-transform-unicode-escapes-7.12.1" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz"; - sha512 = "y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"; + sha512 = "I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q=="; }; }; - "@babel/plugin-transform-unicode-regex-7.10.4" = { + "@babel/plugin-transform-unicode-regex-7.12.1" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz"; - sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"; + sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg=="; }; }; - "@babel/preset-env-7.11.5" = { + "@babel/preset-env-7.12.1" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.11.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz"; - sha512 = "kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz"; + sha512 = "H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg=="; }; }; "@babel/preset-modules-0.1.4" = { @@ -850,22 +859,22 @@ let sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; }; }; - "@babel/preset-typescript-7.10.4" = { + "@babel/preset-typescript-7.12.1" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.10.4.tgz"; - sha512 = "SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.1.tgz"; + sha512 = "hNK/DhmoJPsksdHuI/RVrcEws7GN5eamhi28JkO52MqIxU8Z0QpmiSOQxZHWOHV7I3P4UjHV97ay4TcamMA6Kw=="; }; }; - "@babel/runtime-7.11.2" = { + "@babel/runtime-7.12.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.11.2"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz"; - sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz"; + sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA=="; }; }; "@babel/template-7.10.4" = { @@ -877,22 +886,22 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.11.5" = { + "@babel/traverse-7.12.1" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.11.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz"; - sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz"; + sha512 = "MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw=="; }; }; - "@babel/types-7.11.5" = { + "@babel/types-7.12.1" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.11.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"; - sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz"; + sha512 = "BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -922,13 +931,13 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; - "@eslint/eslintrc-0.1.3" = { + "@eslint/eslintrc-0.2.1" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.1.3"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz"; - sha512 = "4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz"; + sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA=="; }; }; "@istanbuljs/load-nyc-config-1.1.0" = { @@ -949,112 +958,112 @@ let sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; }; }; - "@jest/console-26.3.0" = { + "@jest/console-26.6.1" = { name = "_at_jest_slash_console"; packageName = "@jest/console"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-26.3.0.tgz"; - sha512 = "/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w=="; + url = "https://registry.npmjs.org/@jest/console/-/console-26.6.1.tgz"; + sha512 = "cjqcXepwC5M+VeIhwT6Xpi/tT4AiNzlIx8SMJ9IihduHnsSrnWNvTBfKIpmqOOCNOPqtbBx6w2JqfoLOJguo8g=="; }; }; - "@jest/core-26.4.2" = { + "@jest/core-26.6.1" = { name = "_at_jest_slash_core"; packageName = "@jest/core"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/core/-/core-26.4.2.tgz"; - sha512 = "sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg=="; + url = "https://registry.npmjs.org/@jest/core/-/core-26.6.1.tgz"; + sha512 = "p4F0pgK3rKnoS9olXXXOkbus1Bsu6fd8pcvLMPsUy4CVXZ8WSeiwQ1lK5hwkCIqJ+amZOYPd778sbPha/S8Srw=="; }; }; - "@jest/environment-26.3.0" = { + "@jest/environment-26.6.1" = { name = "_at_jest_slash_environment"; packageName = "@jest/environment"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/environment/-/environment-26.3.0.tgz"; - sha512 = "EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA=="; + url = "https://registry.npmjs.org/@jest/environment/-/environment-26.6.1.tgz"; + sha512 = "GNvHwkOFJtNgSwdzH9flUPzF9AYAZhUg124CBoQcwcZCM9s5TLz8Y3fMtiaWt4ffbigoetjGk5PU2Dd8nLrSEw=="; }; }; - "@jest/fake-timers-26.3.0" = { + "@jest/fake-timers-26.6.1" = { name = "_at_jest_slash_fake-timers"; packageName = "@jest/fake-timers"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.3.0.tgz"; - sha512 = "ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A=="; + url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.1.tgz"; + sha512 = "T/SkMLgOquenw/nIisBRD6XAYpFir0kNuclYLkse5BpzeDUukyBr+K31xgAo9M0hgjU9ORlekAYPSzc0DKfmKg=="; }; }; - "@jest/globals-26.4.2" = { + "@jest/globals-26.6.1" = { name = "_at_jest_slash_globals"; packageName = "@jest/globals"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/globals/-/globals-26.4.2.tgz"; - sha512 = "Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow=="; + url = "https://registry.npmjs.org/@jest/globals/-/globals-26.6.1.tgz"; + sha512 = "acxXsSguuLV/CeMYmBseefw6apO7NuXqpE+v5r3yD9ye2PY7h1nS20vY7Obk2w6S7eJO4OIAJeDnoGcLC/McEQ=="; }; }; - "@jest/reporters-26.4.1" = { + "@jest/reporters-26.6.1" = { name = "_at_jest_slash_reporters"; packageName = "@jest/reporters"; - version = "26.4.1"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.4.1.tgz"; - sha512 = "aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ=="; + url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.1.tgz"; + sha512 = "J6OlXVFY3q1SXWJhjme5i7qT/BAZSikdOK2t8Ht5OS32BDo6KfG5CzIzzIFnAVd82/WWbc9Hb7SJ/jwSvVH9YA=="; }; }; - "@jest/source-map-26.3.0" = { + "@jest/source-map-26.5.0" = { name = "_at_jest_slash_source-map"; packageName = "@jest/source-map"; - version = "26.3.0"; + version = "26.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/source-map/-/source-map-26.3.0.tgz"; - sha512 = "hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ=="; + url = "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz"; + sha512 = "jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g=="; }; }; - "@jest/test-result-26.3.0" = { + "@jest/test-result-26.6.1" = { name = "_at_jest_slash_test-result"; packageName = "@jest/test-result"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.3.0.tgz"; - sha512 = "a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg=="; + url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.1.tgz"; + sha512 = "wqAgIerIN2gSdT2A8WeA5+AFh9XQBqYGf8etK143yng3qYd0mF0ie2W5PVmgnjw4VDU6ammI9NdXrKgNhreawg=="; }; }; - "@jest/test-sequencer-26.4.2" = { + "@jest/test-sequencer-26.6.1" = { name = "_at_jest_slash_test-sequencer"; packageName = "@jest/test-sequencer"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz"; - sha512 = "83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog=="; + url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.1.tgz"; + sha512 = "0csqA/XApZiNeTIPYh6koIDCACSoR6hi29T61tKJMtCZdEC+tF3PoNt7MS0oK/zKC6daBgCbqXxia5ztr/NyCQ=="; }; }; - "@jest/transform-26.3.0" = { + "@jest/transform-26.6.1" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-26.3.0.tgz"; - sha512 = "Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-26.6.1.tgz"; + sha512 = "oNFAqVtqRxZRx6vXL3I4bPKUK0BIlEeaalkwxyQGGI8oXDQBtYQBpiMe5F7qPs4QdvvFYB42gPGIMMcxXaBBxQ=="; }; }; - "@jest/types-25.5.0" = { + "@jest/types-26.6.1" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "25.5.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz"; - sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; + url = "https://registry.npmjs.org/@jest/types/-/types-26.6.1.tgz"; + sha512 = "ywHavIKNpAVrStiRY5wiyehvcktpijpItvGiK72RAn5ctqmzvPk8OvKnvHeBqa1XdQr959CTWAJMqxI8BTibyg=="; }; }; - "@jest/types-26.3.0" = { - name = "_at_jest_slash_types"; - packageName = "@jest/types"; - version = "26.3.0"; + "@nicolo-ribaudo/chokidar-2-2.1.8" = { + name = "_at_nicolo-ribaudo_slash_chokidar-2"; + packageName = "@nicolo-ribaudo/chokidar-2"; + version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz"; - sha512 = "BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ=="; + url = "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8.tgz"; + sha512 = "FohwULwAebCUKi/akMFyGi7jfc7JXTeMHzKxuP3umRd9mK/2Y7/SMBSI2jX+YLopPXi+PF9l307NmpfxTdCegA=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -1084,31 +1093,31 @@ let sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; }; }; - "@serialport/binding-abstract-9.0.1" = { + "@serialport/binding-abstract-9.0.2" = { name = "_at_serialport_slash_binding-abstract"; packageName = "@serialport/binding-abstract"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.0.1.tgz"; - sha512 = "ncUFSRyVdpyCRuah2dzrs99UfEWWMAhV31ae2FT6j4f8TypQ8OgAF8KkcHiD4M3wORDh3UKCCTS7n8aJWge1RA=="; + url = "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.0.2.tgz"; + sha512 = "kyMX6usn+VLpidt0YsDq5JwztIan9TPCX6skr0XcalOxI8I7w+/2qVZJzjgo2fSqDnPRcU2jMWTytwzEXFODvQ=="; }; }; - "@serialport/binding-mock-9.0.1" = { + "@serialport/binding-mock-9.0.2" = { name = "_at_serialport_slash_binding-mock"; packageName = "@serialport/binding-mock"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.1.tgz"; - sha512 = "C01T6iX+nNKB7S6BhQEy5nfk4lUk/CkdFEfen9DDPYhtFtIsm5GCGvRB3Fjnp+8oDrGWJOrZfxFf3kWOOx665A=="; + url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.2.tgz"; + sha512 = "HfrvJ/LXULHk8w63CGxwDNiDidFgDX8BnadY+cgVS6yHMHikbhLCLjCmUKsKBWaGKRqOznl0w+iUl7TMi1lkXQ=="; }; }; - "@serialport/bindings-9.0.1" = { + "@serialport/bindings-9.0.2" = { name = "_at_serialport_slash_bindings"; packageName = "@serialport/bindings"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.1.tgz"; - sha512 = "O5QuwCdnHuZygBKw7tVq2wHysfOnCbOyKtR/k9T9zHqptd89Tzy6xJQNtnrcbV/2D22noKX6yWj+1wqvNe6NRA=="; + url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.2.tgz"; + sha512 = "kQ3co4aGwwbUqkRdJ7UfdlbLB5dUQwNfSglexC8iv65D5HXfjSBR1bE0XUH8PH/v/6Dh6CSnwf6OP0I3H5vMWQ=="; }; }; "@serialport/parser-byte-length-9.0.1" = { @@ -1165,13 +1174,13 @@ let sha512 = "BHTV+Lkl+J8hSecFtDRENaR4fgA6tw44J+dmA1vEKEyum0iDN4bihbu8yvztYyo4PhBGUKDfm/PnD5EkJm0dPA=="; }; }; - "@serialport/stream-9.0.1" = { + "@serialport/stream-9.0.2" = { name = "_at_serialport_slash_stream"; packageName = "@serialport/stream"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.1.tgz"; - sha512 = "S1xaf99vygbrMDNS/9GHYZYskWJHXJy6dCksW+ME2dzNXEXpz64vF0iug1tC1EIAhME9oD/s3ky2C9CUAd/GUg=="; + url = "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.2.tgz"; + sha512 = "0RkVe+gvwZu/PPfbb7ExQ+euGoCTGKD/B8TQ5fuhe+eKk1sh73RwjKmu9gp6veSNqx9Zljnh1dF6mhdEKWZpSA=="; }; }; "@sinonjs/commons-1.8.1" = { @@ -1192,13 +1201,13 @@ let sha512 = "MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA=="; }; }; - "@types/babel__core-7.1.10" = { + "@types/babel__core-7.1.11" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.10"; + version = "7.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz"; - sha512 = "x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.11.tgz"; + sha512 = "E5nSOzrjnvhURYnbOR2dClTqcyhPbPvtEwLHf7JJADKedPbcZsoJVfP+I2vBNfBjz4bnZIuhL/tNmRi5nJ7Jlw=="; }; }; "@types/babel__generator-7.6.2" = { @@ -1228,13 +1237,13 @@ let sha512 = "Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A=="; }; }; - "@types/color-name-1.1.1" = { - name = "_at_types_slash_color-name"; - packageName = "@types/color-name"; - version = "1.1.1"; + "@types/debounce-1.2.0" = { + name = "_at_types_slash_debounce"; + packageName = "@types/debounce"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz"; - sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="; + url = "https://registry.npmjs.org/@types/debounce/-/debounce-1.2.0.tgz"; + sha512 = "bWG5wapaWgbss9E238T0R6bfo5Fh3OkeoSt245CM7JJwVwpw6MEBCbIxLq5z8KzsE3uJhzcIuQkyiZmzV3M/Dw=="; }; }; "@types/debug-4.1.5" = { @@ -1246,13 +1255,13 @@ let sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ=="; }; }; - "@types/graceful-fs-4.1.3" = { + "@types/graceful-fs-4.1.4" = { name = "_at_types_slash_graceful-fs"; packageName = "@types/graceful-fs"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz"; - sha512 = "AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ=="; + url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.4.tgz"; + sha512 = "mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg=="; }; }; "@types/istanbul-lib-coverage-2.0.3" = { @@ -1273,15 +1282,6 @@ let sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg=="; }; }; - "@types/istanbul-reports-1.1.2" = { - name = "_at_types_slash_istanbul-reports"; - packageName = "@types/istanbul-reports"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz"; - sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; - }; - }; "@types/istanbul-reports-3.0.0" = { name = "_at_types_slash_istanbul-reports"; packageName = "@types/istanbul-reports"; @@ -1291,13 +1291,13 @@ let sha512 = "nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA=="; }; }; - "@types/jest-26.0.14" = { + "@types/jest-26.0.15" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "26.0.14"; + version = "26.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz"; - sha512 = "Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.15.tgz"; + sha512 = "s2VMReFXRg9XXxV+CW9e5Nz8fH2K1aEhwgjUqPPbQd7g95T0laAcvLv032EhFHIa5GHsZ8W7iJEQVaJq6k3Gog=="; }; }; "@types/json-schema-7.0.6" = { @@ -1318,13 +1318,13 @@ let sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw=="; }; }; - "@types/node-14.11.2" = { + "@types/node-14.14.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.11.2"; + version = "14.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz"; - sha512 = "jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.6.tgz"; + sha512 = "6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw=="; }; }; "@types/normalize-package-data-2.4.0" = { @@ -1336,13 +1336,13 @@ let sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; }; }; - "@types/prettier-2.1.1" = { + "@types/prettier-2.1.5" = { name = "_at_types_slash_prettier"; packageName = "@types/prettier"; - version = "2.1.1"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.1.tgz"; - sha512 = "2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ=="; + url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.5.tgz"; + sha512 = "UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ=="; }; }; "@types/serialport-8.0.1" = { @@ -1354,22 +1354,22 @@ let sha512 = "IcKHq6b/ynKSF/x4al/Ce8+a0hpbYIEaIcK9Z3l4koLvQqAPSODZ37/hgemQx8dTu7fPZDMHN4bKmu89B3UaGA=="; }; }; - "@types/stack-utils-1.0.1" = { + "@types/stack-utils-2.0.0" = { name = "_at_types_slash_stack-utils"; packageName = "@types/stack-utils"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz"; - sha512 = "l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw=="; + url = "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz"; + sha512 = "RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw=="; }; }; - "@types/yargs-15.0.7" = { + "@types/yargs-15.0.9" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.7"; + version = "15.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz"; - sha512 = "Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz"; + sha512 = "HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g=="; }; }; "@types/yargs-parser-15.0.0" = { @@ -1381,67 +1381,67 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; - "@typescript-eslint/eslint-plugin-4.2.0" = { + "@typescript-eslint/eslint-plugin-4.6.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.2.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.2.0.tgz"; - sha512 = "zBNRkzvLSwo6y5TG0DVcmshZIYBHKtmzD4N+LYnfTFpzc4bc79o8jNRSb728WV7A4Cegbs+MV5IRAj8BKBgOVQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.6.0.tgz"; + sha512 = "1+419X+Ynijytr1iWI+/IcX/kJryc78YNpdaXR1aRO1sU3bC0vZrIAF1tIX7rudVI84W7o7M4zo5p1aVt70fAg=="; }; }; - "@typescript-eslint/experimental-utils-4.2.0" = { + "@typescript-eslint/experimental-utils-4.6.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.2.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.2.0.tgz"; - sha512 = "5BBj6BjgHEndBaQQpUVzRIPERz03LBc0MCQkHwUaH044FJFL08SwWv/sQftk7gf0ShZ2xZysz0LTwCwNt4Xu3w=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.6.0.tgz"; + sha512 = "pnh6Beh2/4xjJVNL+keP49DFHk3orDHHFylSp3WEjtgW3y1U+6l+jNnJrGlbs6qhAz5z96aFmmbUyKhunXKvKw=="; }; }; - "@typescript-eslint/parser-4.2.0" = { + "@typescript-eslint/parser-4.6.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.2.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.2.0.tgz"; - sha512 = "54jJ6MwkOtowpE48C0QJF9iTz2/NZxfKVJzv1ha5imigzHbNSLN9yvbxFFH1KdlRPQrlR8qxqyOvLHHxd397VA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.6.0.tgz"; + sha512 = "Dj6NJxBhbdbPSZ5DYsQqpR32MwujF772F2H3VojWU6iT4AqL4BKuoNWOPFCoSZvCcADDvQjDpa6OLDAaiZPz2Q=="; }; }; - "@typescript-eslint/scope-manager-4.2.0" = { + "@typescript-eslint/scope-manager-4.6.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.2.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.2.0.tgz"; - sha512 = "Tb402cxxObSxWIVT+PnBp5ruT2V/36yj6gG4C9AjkgRlZpxrLAzWDk3neen6ToMBGeGdxtnfFLoJRUecGz9mYQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.6.0.tgz"; + sha512 = "uZx5KvStXP/lwrMrfQQwDNvh2ppiXzz5TmyTVHb+5TfZ3sUP7U1onlz3pjoWrK9konRyFe1czyxObWTly27Ang=="; }; }; - "@typescript-eslint/types-4.2.0" = { + "@typescript-eslint/types-4.6.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.2.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.2.0.tgz"; - sha512 = "xkv5nIsxfI/Di9eVwN+G9reWl7Me9R5jpzmZUch58uQ7g0/hHVuGUbbn4NcxcM5y/R4wuJIIEPKPDb5l4Fdmwg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.6.0.tgz"; + sha512 = "5FAgjqH68SfFG4UTtIFv+rqYJg0nLjfkjD0iv+5O27a0xEeNZ5rZNDvFGZDizlCD1Ifj7MAbSW2DPMrf0E9zjA=="; }; }; - "@typescript-eslint/typescript-estree-4.2.0" = { + "@typescript-eslint/typescript-estree-4.6.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.2.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.2.0.tgz"; - sha512 = "iWDLCB7z4MGkLipduF6EOotdHNtgxuNKnYD54nMS/oitFnsk4S3S/TE/UYXQTra550lHtlv9eGmp+dvN9pUDtA=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.6.0.tgz"; + sha512 = "s4Z9qubMrAo/tw0CbN0IN4AtfwuehGXVZM0CHNMdfYMGBDhPdwTEpBrecwhP7dRJu6d9tT9ECYNaWDHvlFSngA=="; }; }; - "@typescript-eslint/visitor-keys-4.2.0" = { + "@typescript-eslint/visitor-keys-4.6.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.2.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.2.0.tgz"; - sha512 = "WIf4BNOlFOH2W+YqGWa6YKLcK/EB3gEj2apCrqLw6mme1RzBy0jtJ9ewJgnrZDB640zfnv8L+/gwGH5sYp/rGw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.6.0.tgz"; + sha512 = "38Aa9Ztl0XyFPVzmutHXqDMCu15Xx8yKvUo38Gu3GhsuckCh3StPI5t2WIO9LHEsOH7MLmlGfKUisU8eW1Sjhg=="; }; }; "abab-2.0.5" = { @@ -1453,13 +1453,13 @@ let sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; }; }; - "acorn-7.4.0" = { + "acorn-7.4.1" = { name = "acorn"; packageName = "acorn"; - version = "7.4.0"; + version = "7.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz"; - sha512 = "+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w=="; + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; "acorn-globals-6.0.0" = { @@ -1489,22 +1489,22 @@ let sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; }; }; - "agent-base-6.0.1" = { + "agent-base-6.0.2" = { name = "agent-base"; packageName = "agent-base"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz"; - sha512 = "01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg=="; + url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; - "ajv-6.12.5" = { + "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; - version = "6.12.5"; + version = "6.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz"; - sha512 = "lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; "ansi-colors-4.1.1" = { @@ -1561,13 +1561,13 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; - "ansi-styles-4.2.1" = { + "ansi-styles-4.3.0" = { name = "ansi-styles"; packageName = "ansi-styles"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz"; - sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA=="; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; "anymatch-2.0.0" = { @@ -1750,31 +1750,31 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.10.1" = { + "aws4-1.11.0" = { name = "aws4"; packageName = "aws4"; - version = "1.10.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz"; - sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; + sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; - "axios-0.20.0" = { + "axios-0.21.0" = { name = "axios"; packageName = "axios"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz"; - sha512 = "ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz"; + sha512 = "fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw=="; }; }; - "babel-jest-26.3.0" = { + "babel-jest-26.6.1" = { name = "babel-jest"; packageName = "babel-jest"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.3.0.tgz"; - sha512 = "sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.1.tgz"; + sha512 = "duMWEOKrSBYRVTTNpL2SipNIWnZOjP77auOBMPQ3zXAdnDbyZQWU8r/RxNWpUf9N6cgPFecQYelYLytTVXVDtA=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -1795,31 +1795,31 @@ let sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; }; - "babel-plugin-jest-hoist-26.2.0" = { + "babel-plugin-jest-hoist-26.5.0" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "26.2.0"; + version = "26.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz"; - sha512 = "B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA=="; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz"; + sha512 = "ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw=="; }; }; - "babel-preset-current-node-syntax-0.1.3" = { + "babel-preset-current-node-syntax-0.1.4" = { name = "babel-preset-current-node-syntax"; packageName = "babel-preset-current-node-syntax"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz"; - sha512 = "uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ=="; + url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz"; + sha512 = "5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w=="; }; }; - "babel-preset-jest-26.3.0" = { + "babel-preset-jest-26.5.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "26.3.0"; + version = "26.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz"; - sha512 = "5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw=="; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz"; + sha512 = "F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA=="; }; }; "balanced-match-1.0.0" = { @@ -1867,6 +1867,15 @@ let sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; + "binary-extensions-2.1.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz"; + sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="; + }; + }; "bindings-1.5.0" = { name = "bindings"; packageName = "bindings"; @@ -1939,13 +1948,22 @@ let sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; }; }; - "buffer-5.6.0" = { + "buffer-5.7.0" = { name = "buffer"; packageName = "buffer"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz"; - sha512 = "/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.0.tgz"; + sha512 = "cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg=="; + }; + }; + "buffer-crc32-0.2.13" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; }; }; "buffer-from-1.1.1" = { @@ -1966,6 +1984,15 @@ let sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; }; + "call-bind-1.0.0" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz"; + sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w=="; + }; + }; "callback-stream-1.1.0" = { name = "callback-stream"; packageName = "callback-stream"; @@ -1993,22 +2020,22 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; - "camelcase-6.0.0" = { + "camelcase-6.2.0" = { name = "camelcase"; packageName = "camelcase"; - version = "6.0.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz"; - sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; + sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; }; }; - "caniuse-lite-1.0.30001137" = { + "caniuse-lite-1.0.30001154" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001137"; + version = "1.0.30001154"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz"; - sha512 = "54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz"; + sha512 = "y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org=="; }; }; "capture-exit-2.0.0" = { @@ -2038,15 +2065,6 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; - "chalk-3.0.0" = { - name = "chalk"; - packageName = "chalk"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; - sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; - }; - }; "chalk-4.1.0" = { name = "chalk"; packageName = "chalk"; @@ -2074,6 +2092,15 @@ let sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; }; }; + "chokidar-3.4.3" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz"; + sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; + }; + }; "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; @@ -2092,6 +2119,15 @@ let sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; }; + "cjs-module-lexer-0.4.3" = { + name = "cjs-module-lexer"; + packageName = "cjs-module-lexer"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.4.3.tgz"; + sha512 = "5RLK0Qfs0PNDpEyBXIr3bIT1Muw3ojSlvpw6dAmkUcO0+uTrsBn7GuEIgx40u+OzbCBLDta7nvmud85P4EmTsQ=="; + }; + }; "class-utils-0.3.6" = { name = "class-utils"; packageName = "class-utils"; @@ -2191,13 +2227,13 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.5.3" = { + "color-string-1.5.4" = { name = "color-string"; packageName = "color-string"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz"; - sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz"; + sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw=="; }; }; "colors-1.4.0" = { @@ -2263,13 +2299,13 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "concat-stream-1.6.2" = { + "concat-stream-2.0.0" = { name = "concat-stream"; packageName = "concat-stream"; - version = "1.6.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz"; + sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; }; }; "console-control-strings-1.1.0" = { @@ -2362,15 +2398,6 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "d-1.0.1" = { - name = "d"; - packageName = "d"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; - sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -2425,13 +2452,13 @@ let sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; }; }; - "decimal.js-10.2.0" = { + "decimal.js-10.2.1" = { name = "decimal.js"; packageName = "decimal.js"; - version = "10.2.0"; + version = "10.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz"; - sha512 = "vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw=="; + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz"; + sha512 = "KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw=="; }; }; "decode-uri-component-0.2.0" = { @@ -2569,22 +2596,13 @@ let sha512 = "TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="; }; }; - "diff-sequences-25.2.6" = { + "diff-sequences-26.5.0" = { name = "diff-sequences"; packageName = "diff-sequences"; - version = "25.2.6"; + version = "26.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz"; - sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; - }; - }; - "diff-sequences-26.3.0" = { - name = "diff-sequences"; - packageName = "diff-sequences"; - version = "26.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.3.0.tgz"; - sha512 = "5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig=="; + url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz"; + sha512 = "ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q=="; }; }; "dir-glob-3.0.1" = { @@ -2641,22 +2659,22 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.573" = { + "electron-to-chromium-1.3.585" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.573"; + version = "1.3.585"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.573.tgz"; - sha512 = "oypaNmexr8w0m2GX67fGLQ0Xgsd7uXz7GcwaHZ9eW3ZdQ8uA2+V/wXmLdMTk3gcacbqQGAN7CXWG3fOkfKYftw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.585.tgz"; + sha512 = "xoeqjMQhgHDZM7FiglJAb2aeOxHZWFruUc3MbAGTgE7GB8rr5fTn1Sdh5THGuQtndU3GuXlu91ZKqRivxoCZ/A=="; }; }; - "emittery-0.7.1" = { + "emittery-0.7.2" = { name = "emittery"; packageName = "emittery"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz"; - sha512 = "d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ=="; + url = "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz"; + sha512 = "A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ=="; }; }; "emoji-regex-7.0.3" = { @@ -2722,94 +2740,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.17.6" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz"; - sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; - }; - }; - "es-abstract-1.18.0-next.0" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.18.0-next.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz"; - sha512 = "elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ=="; - }; - }; - "es-to-primitive-1.2.1" = { - name = "es-to-primitive"; - packageName = "es-to-primitive"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; - }; - }; - "es5-ext-0.10.53" = { - name = "es5-ext"; - packageName = "es5-ext"; - version = "0.10.53"; - src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; - sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; - }; - }; - "es6-iterator-2.0.3" = { - name = "es6-iterator"; - packageName = "es6-iterator"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; - sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; - }; - }; - "es6-map-0.1.5" = { - name = "es6-map"; - packageName = "es6-map"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; - sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; - }; - }; - "es6-set-0.1.5" = { - name = "es6-set"; - packageName = "es6-set"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; - sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; - }; - }; - "es6-symbol-3.1.1" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; - }; - }; - "es6-symbol-3.1.3" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"; - sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; - }; - }; - "escalade-3.1.0" = { + "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz"; - sha512 = "mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; }; "escape-html-1.0.3" = { @@ -2848,13 +2785,13 @@ let sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; }; }; - "eslint-7.10.0" = { + "eslint-7.12.1" = { name = "eslint"; packageName = "eslint"; - version = "7.10.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz"; - sha512 = "BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz"; + sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg=="; }; }; "eslint-config-google-0.14.0" = { @@ -2866,13 +2803,13 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-plugin-jest-24.0.2" = { + "eslint-plugin-jest-24.1.0" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "24.0.2"; + version = "24.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.0.2.tgz"; - sha512 = "DSBLNpkKDOpUJQkTGSs5sVJWsu0nDyQ2rYxkr0Eh7nrkc5bMUr/dlDbtTj3l8y6UaCVsem6rryF1OZrKnz1S5g=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.1.0.tgz"; + sha512 = "827YJ+E8B9PvXu/0eiVSNFfxxndbKv+qE/3GSMhdorCaeaOehtqHGX2YDW9B85TEOre9n/zscledkFW/KbnyGg=="; }; }; "eslint-scope-5.1.1" = { @@ -2983,15 +2920,6 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "event-emitter-0.3.5" = { - name = "event-emitter"; - packageName = "event-emitter"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; - sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; - }; - }; "eventemitter3-4.0.7" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -3019,13 +2947,13 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-4.0.3" = { + "execa-4.1.0" = { name = "execa"; packageName = "execa"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz"; - sha512 = "WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A=="; + url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"; + sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; }; }; "exit-0.1.2" = { @@ -3055,22 +2983,13 @@ let sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; }; - "expect-26.4.2" = { + "expect-26.6.1" = { name = "expect"; packageName = "expect"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-26.4.2.tgz"; - sha512 = "IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA=="; - }; - }; - "ext-1.4.0" = { - name = "ext"; - packageName = "ext"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; - sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; + url = "https://registry.npmjs.org/expect/-/expect-26.6.1.tgz"; + sha512 = "BRfxIBHagghMmr1D2MRY0Qv5d3Nc8HCqgbDwNXw/9izmM5eBb42a2YjLKSbsqle76ozGkAEPELQX4IdNHAKRNA=="; }; }; "extend-3.0.2" = { @@ -3163,13 +3082,13 @@ let sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; - "fastq-1.8.0" = { + "fastq-1.9.0" = { name = "fastq"; packageName = "fastq"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz"; - sha512 = "SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz"; + sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w=="; }; }; "fb-watchman-2.0.1" = { @@ -3406,13 +3325,13 @@ let sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; - "gensync-1.0.0-beta.1" = { + "gensync-1.0.0-beta.2" = { name = "gensync"; packageName = "gensync"; - version = "1.0.0-beta.1"; + version = "1.0.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz"; - sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; + url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; "get-caller-file-2.0.5" = { @@ -3424,6 +3343,15 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; + "get-intrinsic-1.0.1" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; + sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg=="; + }; + }; "get-package-type-0.1.0" = { name = "get-package-type"; packageName = "get-package-type"; @@ -3694,13 +3622,13 @@ let sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "highlight.js-10.2.0" = { + "highlight.js-10.3.2" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.2.0"; + version = "10.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.2.0.tgz"; - sha512 = "OryzPiqqNCfO/wtFo619W+nPYALM6u7iCQkum4bqRmmlcTikOkmlL06i009QelynBPAlNByTQU6cBB2cOBQtCw=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.2.tgz"; + sha512 = "3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw=="; }; }; "hosted-git-info-2.8.8" = { @@ -3775,13 +3703,13 @@ let sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; }; }; - "humanize-duration-3.23.1" = { + "humanize-duration-3.24.0" = { name = "humanize-duration"; packageName = "humanize-duration"; - version = "3.23.1"; + version = "3.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.23.1.tgz"; - sha512 = "aoOEkomAETmVuQyBx4E7/LfPlC9s8pAA/USl7vFRQpDjepo3aiyvFfOhtXSDqPowdBVPFUZ7onG/KyuolX0qPg=="; + url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.24.0.tgz"; + sha512 = "B3udnqisaDeRsvUSb+5n2hjxhABI9jotB+i1IEhgHhguTeM5LxIUKoVIu7UpeyaPOygr/Fnv7UhOi45kYYG+tg=="; }; }; "iconv-lite-0.4.24" = { @@ -3793,13 +3721,13 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; - "ieee754-1.1.13" = { + "ieee754-1.2.1" = { name = "ieee754"; packageName = "ieee754"; - version = "1.1.13"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; - sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; }; "ignore-4.0.6" = { @@ -3883,15 +3811,6 @@ let sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; }; }; - "invariant-2.2.4" = { - name = "invariant"; - packageName = "invariant"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; - sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; - }; - }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -3955,6 +3874,15 @@ let sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; }; }; + "is-binary-path-2.1.0" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; + }; + }; "is-buffer-1.1.6" = { name = "is-buffer"; packageName = "is-buffer"; @@ -3964,15 +3892,6 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-callable-1.2.2" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz"; - sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="; - }; - }; "is-ci-2.0.0" = { name = "is-ci"; packageName = "is-ci"; @@ -3982,6 +3901,15 @@ let sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; }; + "is-core-module-2.0.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz"; + sha512 = "jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw=="; + }; + }; "is-data-descriptor-0.1.4" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; @@ -4000,15 +3928,6 @@ let sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; - "is-date-object-1.0.2" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; - }; - }; "is-descriptor-0.1.6" = { name = "is-descriptor"; packageName = "is-descriptor"; @@ -4126,15 +4045,6 @@ let sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; }; }; - "is-negative-zero-2.0.0" = { - name = "is-negative-zero"; - packageName = "is-negative-zero"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; - sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; - }; - }; "is-number-3.0.0" = { name = "is-number"; packageName = "is-number"; @@ -4171,15 +4081,6 @@ let sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; }; }; - "is-regex-1.1.1" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz"; - sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="; - }; - }; "is-relative-1.0.0" = { name = "is-relative"; packageName = "is-relative"; @@ -4207,15 +4108,6 @@ let sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; }; - "is-symbol-1.0.3" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; - }; - }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -4342,58 +4234,49 @@ let sha512 = "9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw=="; }; }; - "jest-26.4.2" = { + "jest-26.6.1" = { name = "jest"; packageName = "jest"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-26.4.2.tgz"; - sha512 = "LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw=="; + url = "https://registry.npmjs.org/jest/-/jest-26.6.1.tgz"; + sha512 = "f+ahfqw3Ffy+9vA7sWFGpTmhtKEMsNAZiWBVXDkrpIO73zIz22iimjirnV78kh/eWlylmvLh/0WxHN6fZraZdA=="; }; }; - "jest-changed-files-26.3.0" = { + "jest-changed-files-26.6.1" = { name = "jest-changed-files"; packageName = "jest-changed-files"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.3.0.tgz"; - sha512 = "1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g=="; + url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.1.tgz"; + sha512 = "NhSdZ5F6b/rIN5V46x1l31vrmukD/bJUXgYAY8VtP1SknYdJwjYDRxuLt7Z8QryIdqCjMIn2C0Cd98EZ4umo8Q=="; }; }; - "jest-cli-26.4.2" = { + "jest-cli-26.6.1" = { name = "jest-cli"; packageName = "jest-cli"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.4.2.tgz"; - sha512 = "zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw=="; + url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.1.tgz"; + sha512 = "aPLoEjlwFrCWhiPpW5NUxQA1X1kWsAnQcQ0SO/fHsCvczL3W75iVAcH9kP6NN+BNqZcHNEvkhxT5cDmBfEAh+w=="; }; }; - "jest-config-26.4.2" = { + "jest-config-26.6.1" = { name = "jest-config"; packageName = "jest-config"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-config/-/jest-config-26.4.2.tgz"; - sha512 = "QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A=="; + url = "https://registry.npmjs.org/jest-config/-/jest-config-26.6.1.tgz"; + sha512 = "mtJzIynIwW1d1nMlKCNCQiSgWaqFn8cH/fOSNY97xG7Y9tBCZbCSuW2GTX0RPmceSJGO7l27JgwC18LEg0Vg+g=="; }; }; - "jest-diff-25.5.0" = { + "jest-diff-26.6.1" = { name = "jest-diff"; packageName = "jest-diff"; - version = "25.5.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz"; - sha512 = "z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A=="; - }; - }; - "jest-diff-26.4.2" = { - name = "jest-diff"; - packageName = "jest-diff"; - version = "26.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.4.2.tgz"; - sha512 = "6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.1.tgz"; + sha512 = "BBNy/zin2m4kG5In126O8chOBxLLS/XMTuuM2+YhgyHk87ewPzKTuTJcqj3lOWOi03NNgrl+DkMeV/exdvG9gg=="; }; }; "jest-docblock-26.0.0" = { @@ -4405,40 +4288,31 @@ let sha512 = "RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w=="; }; }; - "jest-each-26.4.2" = { + "jest-each-26.6.1" = { name = "jest-each"; packageName = "jest-each"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-each/-/jest-each-26.4.2.tgz"; - sha512 = "p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA=="; + url = "https://registry.npmjs.org/jest-each/-/jest-each-26.6.1.tgz"; + sha512 = "gSn8eB3buchuq45SU7pLB7qmCGax1ZSxfaWuEFblCyNMtyokYaKFh9dRhYPujK6xYL57dLIPhLKatjmB5XWzGA=="; }; }; - "jest-environment-jsdom-26.3.0" = { + "jest-environment-jsdom-26.6.1" = { name = "jest-environment-jsdom"; packageName = "jest-environment-jsdom"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz"; - sha512 = "zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA=="; + url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.1.tgz"; + sha512 = "A17RiXuHYNVlkM+3QNcQ6n5EZyAc6eld8ra9TW26luounGWpku4tj03uqRgHJCI1d4uHr5rJiuCH5JFRtdmrcA=="; }; }; - "jest-environment-node-26.3.0" = { + "jest-environment-node-26.6.1" = { name = "jest-environment-node"; packageName = "jest-environment-node"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.3.0.tgz"; - sha512 = "c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw=="; - }; - }; - "jest-get-type-25.2.6" = { - name = "jest-get-type"; - packageName = "jest-get-type"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz"; - sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig=="; + url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.1.tgz"; + sha512 = "YffaCp6h0j1kbcf1NVZ7umC6CPgD67YS+G1BeornfuSkx5s3xdhuwG0DCxSiHPXyT81FfJzA1L7nXvhq50OWIg=="; }; }; "jest-get-type-26.3.0" = { @@ -4450,58 +4324,58 @@ let sha512 = "TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="; }; }; - "jest-haste-map-26.3.0" = { + "jest-haste-map-26.6.1" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.3.0.tgz"; - sha512 = "DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.1.tgz"; + sha512 = "9kPafkv0nX6ta1PrshnkiyhhoQoFWncrU/uUBt3/AP1r78WSCU5iLceYRTwDvJl67H3RrXqSlSVDDa/AsUB7OQ=="; }; }; - "jest-jasmine2-26.4.2" = { + "jest-jasmine2-26.6.1" = { name = "jest-jasmine2"; packageName = "jest-jasmine2"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz"; - sha512 = "z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA=="; + url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.1.tgz"; + sha512 = "2uYdT32o/ZzSxYAPduAgokO8OlAL1YdG/9oxcEY138EDNpIK5XRRJDaGzTZdIBWSxk0aR8XxN44FvfXtHB+Fiw=="; }; }; - "jest-leak-detector-26.4.2" = { + "jest-leak-detector-26.6.1" = { name = "jest-leak-detector"; packageName = "jest-leak-detector"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz"; - sha512 = "akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA=="; + url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.1.tgz"; + sha512 = "j9ZOtJSJKlHjrs4aIxWjiQUjyrffPdiAQn2Iw0916w7qZE5Lk0T2KhIH6E9vfhzP6sw0Q0jtnLLb4vQ71o1HlA=="; }; }; - "jest-matcher-utils-26.4.2" = { + "jest-matcher-utils-26.6.1" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz"; - sha512 = "KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.1.tgz"; + sha512 = "9iu3zrsYlUnl8pByhREF9rr5eYoiEb1F7ymNKg6lJr/0qD37LWS5FSW/JcoDl8UdMX2+zAzabDs7sTO+QFKjCg=="; }; }; - "jest-message-util-26.3.0" = { + "jest-message-util-26.6.1" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.3.0.tgz"; - sha512 = "xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.1.tgz"; + sha512 = "cqM4HnqncIebBNdTKrBoWR/4ufHTll0pK/FWwX0YasK+TlBQEMqw3IEdynuuOTjDPFO3ONlFn37280X48beByw=="; }; }; - "jest-mock-26.3.0" = { + "jest-mock-26.6.1" = { name = "jest-mock"; packageName = "jest-mock"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.3.0.tgz"; - sha512 = "PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q=="; + url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.1.tgz"; + sha512 = "my0lPTBu1awY8iVG62sB2sx9qf8zxNDVX+5aFgoB8Vbqjb6LqIOsfyFA8P1z6H2IsqMbvOX9oCJnK67Y3yUIMA=="; }; }; "jest-pnp-resolver-1.2.2" = { @@ -4522,94 +4396,94 @@ let sha512 = "Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A=="; }; }; - "jest-resolve-26.4.0" = { + "jest-resolve-26.6.1" = { name = "jest-resolve"; packageName = "jest-resolve"; - version = "26.4.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.4.0.tgz"; - sha512 = "bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg=="; + url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.1.tgz"; + sha512 = "hiHfQH6rrcpAmw9xCQ0vD66SDuU+7ZulOuKwc4jpbmFFsz0bQG/Ib92K+9/489u5rVw0btr/ZhiHqBpmkbCvuQ=="; }; }; - "jest-resolve-dependencies-26.4.2" = { + "jest-resolve-dependencies-26.6.1" = { name = "jest-resolve-dependencies"; packageName = "jest-resolve-dependencies"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz"; - sha512 = "ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ=="; + url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.1.tgz"; + sha512 = "MN6lufbZJ3RBfTnJesZtHu3hUCBqPdHRe2+FhIt0yiqJ3fMgzWRqMRQyN/d/QwOE7KXwAG2ekZutbPhuD7s51A=="; }; }; - "jest-runner-26.4.2" = { + "jest-runner-26.6.1" = { name = "jest-runner"; packageName = "jest-runner"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.4.2.tgz"; - sha512 = "FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g=="; + url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.1.tgz"; + sha512 = "DmpNGdgsbl5s0FGkmsInmqnmqCtliCSnjWA2TFAJS1m1mL5atwfPsf+uoZ8uYQ2X0uDj4NM+nPcDnUpbNTRMBA=="; }; }; - "jest-runtime-26.4.2" = { + "jest-runtime-26.6.1" = { name = "jest-runtime"; packageName = "jest-runtime"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.4.2.tgz"; - sha512 = "4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ=="; + url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.1.tgz"; + sha512 = "7uOCNeezXDWgjEyzYbRN2ViY7xNZzusNVGAMmU0UHRUNXuY4j4GBHKGMqPo/cBPZA9bSYp+lwK2DRRBU5Dv6YQ=="; }; }; - "jest-serializer-26.3.0" = { + "jest-serializer-26.5.0" = { name = "jest-serializer"; packageName = "jest-serializer"; - version = "26.3.0"; + version = "26.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.3.0.tgz"; - sha512 = "IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow=="; + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz"; + sha512 = "+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA=="; }; }; - "jest-snapshot-26.4.2" = { + "jest-snapshot-26.6.1" = { name = "jest-snapshot"; packageName = "jest-snapshot"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.4.2.tgz"; - sha512 = "N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg=="; + url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.1.tgz"; + sha512 = "JA7bZp7HRTIJYAi85pJ/OZ2eur2dqmwIToA5/6d7Mn90isGEfeF9FvuhDLLEczgKP1ihreBzrJ6Vr7zteP5JNA=="; }; }; - "jest-util-26.3.0" = { + "jest-util-26.6.1" = { name = "jest-util"; packageName = "jest-util"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-26.3.0.tgz"; - sha512 = "4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-26.6.1.tgz"; + sha512 = "xCLZUqVoqhquyPLuDXmH7ogceGctbW8SMyQVjD9o+1+NPWI7t0vO08udcFLVPLgKWcvc+zotaUv/RuaR6l8HIA=="; }; }; - "jest-validate-26.4.2" = { + "jest-validate-26.6.1" = { name = "jest-validate"; packageName = "jest-validate"; - version = "26.4.2"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.4.2.tgz"; - sha512 = "blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ=="; + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.1.tgz"; + sha512 = "BEFpGbylKocnNPZULcnk+TGaz1oFZQH/wcaXlaXABbu0zBwkOGczuWgdLucUouuQqn7VadHZZeTvo8VSFDLMOA=="; }; }; - "jest-watcher-26.3.0" = { + "jest-watcher-26.6.1" = { name = "jest-watcher"; packageName = "jest-watcher"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.3.0.tgz"; - sha512 = "XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ=="; + url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.1.tgz"; + sha512 = "0LBIPPncNi9CaLKK15bnxyd2E8OMl4kJg0PTiNOI+MXztXw1zVdtX/x9Pr6pXaQYps+eS/ts43O4+HByZ7yJSw=="; }; }; - "jest-worker-26.3.0" = { + "jest-worker-26.6.1" = { name = "jest-worker"; packageName = "jest-worker"; - version = "26.3.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz"; - sha512 = "Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.1.tgz"; + sha512 = "R5IE3qSGz+QynJx8y+ICEkdI2OJ3RJjRQVEyCcFAd3yVhQSEtquziPO29Mlzgn07LOVE8u8jhJ1FqcwegiXWOw=="; }; }; "js-tokens-4.0.0" = { @@ -4720,13 +4594,13 @@ let sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; - "jsonfile-6.0.1" = { + "jsonfile-6.1.0" = { name = "jsonfile"; packageName = "jsonfile"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz"; - sha512 = "jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg=="; + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; }; }; "jsprim-1.4.1" = { @@ -4810,15 +4684,6 @@ let sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; }; }; - "levenary-1.1.1" = { - name = "levenary"; - packageName = "levenary"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz"; - sha512 = "mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ=="; - }; - }; "levn-0.3.0" = { name = "levn"; packageName = "levn"; @@ -4882,15 +4747,6 @@ let sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; }; }; - "loose-envify-1.4.0" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; - sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; - }; - }; "lunr-2.3.9" = { name = "lunr"; packageName = "lunr"; @@ -4945,13 +4801,13 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; - "marked-1.1.1" = { + "marked-1.2.2" = { name = "marked"; packageName = "marked"; - version = "1.1.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz"; - sha512 = "mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.2.tgz"; + sha512 = "5jjKHVl/FPo0Z6ocP3zYhKiJLzkwJAw4CZoLjv57FkvbUuwOX4LIBBGGcXjAY6ATcd1q9B8UTj5T9Umauj0QYQ=="; }; }; "merge-stream-2.0.0" = { @@ -5098,22 +4954,22 @@ let sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; }; - "moment-2.29.0" = { + "moment-2.29.1" = { name = "moment"; packageName = "moment"; - version = "2.29.0"; + version = "2.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz"; - sha512 = "z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"; + sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; }; }; - "mqtt-4.2.1" = { + "mqtt-4.2.4" = { name = "mqtt"; packageName = "mqtt"; - version = "4.2.1"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.1.tgz"; - sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.4.tgz"; + sha512 = "g3tJt5UOS1Wqn/xntl4JhlJW51OM8CvgEmY8cwZ1zecE5G7uuwjSUUvgGeVDiEMWJ5vXCfZz2VMCQGNvKhzfEQ=="; }; }; "mqtt-packet-6.6.0" = { @@ -5152,13 +5008,13 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; - "nan-2.14.1" = { + "nan-2.14.2" = { name = "nan"; packageName = "nan"; - version = "2.14.1"; + version = "2.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz"; - sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="; + url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz"; + sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; }; }; "nanomatch-1.2.13" = { @@ -5197,15 +5053,6 @@ let sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; - "next-tick-1.0.0" = { - name = "next-tick"; - packageName = "next-tick"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; - sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; - }; - }; "nice-try-1.0.5" = { name = "nice-try"; packageName = "nice-try"; @@ -5251,13 +5098,13 @@ let sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA=="; }; }; - "node-releases-1.1.61" = { + "node-releases-1.1.65" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.61"; + version = "1.1.65"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz"; - sha512 = "DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.65.tgz"; + sha512 = "YpzJOe2WFIW0V4ZkJQd/DGR/zdVwc/pI4Nl1CZrBO19FdRcSTmsuhdttw9rsTzzJLrNcSloLiBbEYx1C4f6gpA=="; }; }; "noop-logger-0.1.1" = { @@ -5377,15 +5224,6 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-inspect-1.8.0" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; - sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; - }; - }; "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; @@ -5404,13 +5242,13 @@ let sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; - "object.assign-4.1.1" = { + "object.assign-4.1.2" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz"; - sha512 = "VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA=="; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; }; }; "object.pick-1.3.0" = { @@ -5692,13 +5530,13 @@ let sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; }; - "prebuild-install-5.3.5" = { + "prebuild-install-5.3.6" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "5.3.5"; + version = "5.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.5.tgz"; - sha512 = "YmMO7dph9CYKi5IR/BzjOJlRzpxGGVo1EsLSUZ0mt/Mq0HWZIHOKHHcHdT69yG54C9m6i45GpItwRHpk0Py7Uw=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz"; + sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; }; }; "prelude-ls-1.1.2" = { @@ -5719,22 +5557,13 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "pretty-format-25.5.0" = { + "pretty-format-26.6.1" = { name = "pretty-format"; packageName = "pretty-format"; - version = "25.5.0"; + version = "26.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz"; - sha512 = "kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="; - }; - }; - "pretty-format-26.4.2" = { - name = "pretty-format"; - packageName = "pretty-format"; - version = "26.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.2.tgz"; - sha512 = "zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.1.tgz"; + sha512 = "MeqqsP5PYcRBbGMvwzsyBdmAJ4EFX7pWFyl7x4+dMVg5pE0ZDdBIvEH2ergvIO+Gvwv1wh64YuOY9y5LuyY/GA=="; }; }; "process-nextick-args-2.0.1" = { @@ -5755,13 +5584,13 @@ let sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; }; - "prompts-2.3.2" = { + "prompts-2.4.0" = { name = "prompts"; packageName = "prompts"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz"; - sha512 = "Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA=="; + url = "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz"; + sha512 = "awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ=="; }; }; "psl-1.8.0" = { @@ -5836,13 +5665,13 @@ let sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; - "react-is-16.13.1" = { + "react-is-17.0.1" = { name = "react-is"; packageName = "react-is"; - version = "16.13.1"; + version = "17.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"; - sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; + url = "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz"; + sha512 = "NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA=="; }; }; "read-pkg-5.2.0" = { @@ -5890,6 +5719,15 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; + "readdirp-3.5.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; + sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; + }; + }; "rechoir-0.6.2" = { name = "rechoir"; packageName = "rechoir"; @@ -6070,13 +5908,13 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "resolve-1.17.0" = { + "resolve-1.18.1" = { name = "resolve"; packageName = "resolve"; - version = "1.17.0"; + version = "1.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; - sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz"; + sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA=="; }; }; "resolve-cwd-3.0.0" = { @@ -6160,13 +5998,13 @@ let sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="; }; }; - "run-parallel-1.1.9" = { + "run-parallel-1.1.10" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; - sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz"; + sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="; }; }; "safe-buffer-5.1.2" = { @@ -6268,13 +6106,13 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; - "serialport-9.0.1" = { + "serialport-9.0.2" = { name = "serialport"; packageName = "serialport"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-9.0.1.tgz"; - sha512 = "35Ms8dqjtAb73lptfEZG2l/nFZOxHt3hUjCHvl+g3Mu737gzFLDpSBrRywBJw4G4eS5ozZ3YcthwYnop1WO+ng=="; + url = "https://registry.npmjs.org/serialport/-/serialport-9.0.2.tgz"; + sha512 = "N++EVrc2F3kUJ6aCE6BLxHwTrelFAZM3LFw4lo8TV0fDtfrwTc3+aoDpSsvfQg3DxrRf3shCtA6WYEH4g8kapw=="; }; }; "serve-static-1.14.1" = { @@ -6691,24 +6529,6 @@ let sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; - "string.prototype.trimend-1.0.1" = { - name = "string.prototype.trimend"; - packageName = "string.prototype.trimend"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; - }; - }; - "string.prototype.trimstart-1.0.1" = { - name = "string.prototype.trimstart"; - packageName = "string.prototype.trimstart"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; - }; - }; "string_decoder-1.1.1" = { name = "string_decoder"; packageName = "string_decoder"; @@ -7033,13 +6853,13 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "tslib-1.13.0" = { + "tslib-1.14.1" = { name = "tslib"; packageName = "tslib"; - version = "1.13.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"; - sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; + url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; "tsutils-3.17.1" = { @@ -7069,24 +6889,6 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "type-1.2.0" = { - name = "type"; - packageName = "type"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz"; - sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; - }; - }; - "type-2.1.0" = { - name = "type"; - packageName = "type"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.1.0.tgz"; - sha512 = "G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA=="; - }; - }; "type-check-0.3.2" = { name = "type-check"; packageName = "type-check"; @@ -7177,13 +6979,13 @@ let sha512 = "Y4Lf+qIb9NTydrexlazAM46SSLrmrQRqWiD52593g53SsmUFioAsMWt8m834J6qsp+7wHRjxCXSZeiiW5cMUdw=="; }; }; - "typedoc-plugin-markdown-3.0.3" = { + "typedoc-plugin-markdown-3.0.11" = { name = "typedoc-plugin-markdown"; packageName = "typedoc-plugin-markdown"; - version = "3.0.3"; + version = "3.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.0.3.tgz"; - sha512 = "cVa9BUkJw5IeadihNDlTy4e5yq1T0ZpNXzc+/vkgxdVJwgt1BQVQHSZYUNDa2R8nrlYmP9yt3ZQDxG9nIg4++A=="; + url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.0.11.tgz"; + sha512 = "/BE/PqnIVbQJ525czM+T3CVaA1gVN9X1Le100z8TV/Lze8LZVkuAUiHRIgw9BKYFm9IQaB88W55k4EV6uUVwYQ=="; }; }; "typedoc-plugin-no-inherit-1.2.0" = { @@ -7204,22 +7006,22 @@ let sha512 = "xHq9DzkoQywS7FyPneMm2/Hr9GRoCpjSQXkVN0W6SCJKP7fguqg2tasgh+8l5/mW6YSYvqCqEbkSYLbuD4Y6gA=="; }; }; - "typescript-4.0.3" = { + "typescript-4.0.5" = { name = "typescript"; packageName = "typescript"; - version = "4.0.3"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz"; - sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz"; + sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ=="; }; }; - "uglify-js-3.10.4" = { + "uglify-js-3.11.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.4"; + version = "3.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz"; - sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.4.tgz"; + sha512 = "FyYnoxVL1D6+jDGQpbK5jW6y/2JlVfRfEeQ67BPCUg5wfCjaKOpr2XeceE4QL+MkhxliLtf5EbrMDZgzpt2CNw=="; }; }; "unc-path-regex-0.1.2" = { @@ -7294,6 +7096,15 @@ let sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="; }; }; + "universalify-2.0.0" = { + name = "universalify"; + packageName = "universalify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; + }; + }; "unix-dgram-2.0.3" = { name = "unix-dgram"; packageName = "unix-dgram"; @@ -7375,31 +7186,31 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "uuid-8.3.0" = { + "uuid-8.3.1" = { name = "uuid"; packageName = "uuid"; - version = "8.3.0"; + version = "8.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz"; - sha512 = "fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="; + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz"; + sha512 = "FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg=="; }; }; - "v8-compile-cache-2.1.1" = { + "v8-compile-cache-2.2.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz"; - sha512 = "8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ=="; + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; + sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q=="; }; }; - "v8-to-istanbul-5.0.1" = { + "v8-to-istanbul-6.0.1" = { name = "v8-to-istanbul"; packageName = "v8-to-istanbul"; - version = "5.0.1"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz"; - sha512 = "mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q=="; + url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-6.0.1.tgz"; + sha512 = "PzM1WlqquhBvsV+Gco6WSFeg1AGdD53ccMRkFeyHRE/KRZaVacPOmQYP3EeVgDBtKD2BJ8kgynBQ5OtKiHCH+w=="; }; }; "validate-npm-package-license-3.0.4" = { @@ -7483,13 +7294,13 @@ let sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; }; }; - "whatwg-url-8.2.2" = { + "whatwg-url-8.4.0" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "8.2.2"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz"; - sha512 = "PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz"; + sha512 = "vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw=="; }; }; "which-1.3.1" = { @@ -7681,95 +7492,87 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; - "zigbee-herdsman-0.13.11" = { + "zigbee-herdsman-0.13.26" = { name = "zigbee-herdsman"; packageName = "zigbee-herdsman"; - version = "0.13.11"; + version = "0.13.26"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.11.tgz"; - sha512 = "VgsTcYE9lHyXCaHYgzo0Jbtx69YV34YshfqRrcmst59pMmcGN3Vco3TG9FW7SVIJrsZKtVNKTLaUsxzM/9VcIg=="; + url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.26.tgz"; + sha512 = "NNPNmcqP7SaSdwzPGF4IjXczBnwX6rHXwB89t9faLDOLxAJgNU4EtFnLQXVrKi1t6ItMMfWzE9YtNdopSWicig=="; }; }; - "zigbee-herdsman-converters-12.0.194" = { + "zigbee-herdsman-converters-12.0.224" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "12.0.194"; + version = "12.0.224"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.194.tgz"; - sha512 = "0g4hZHKGKIgVNxYZ967tbmijMX/GAKt67dUXizFuMlt3bLTJbzDSfSG4b3XMRfvnDVbFU8gyEs841l7UbO1NzA=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.224.tgz"; + sha512 = "Iej1T5biRrXuKOdC6bsT8HDpayZSao/I4DWNstYlSyJhpa3QM0vZLbS4QexVmkG35gebrs1MSC7RVT4kUqizrw=="; }; }; - "zigbee2mqtt-frontend-0.2.17" = { + "zigbee2mqtt-frontend-0.2.68" = { name = "zigbee2mqtt-frontend"; packageName = "zigbee2mqtt-frontend"; - version = "0.2.17"; + version = "0.2.68"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.2.17.tgz"; - sha512 = "t5Alx8m2aLq5lVWKzY3qc7+YwSE1noRyVTjVBTKL/DgbdwCsKZ/D1J1ZdKyAMAPM2GUsqgBGQU+XmDXZ5TDf8A=="; + url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.2.68.tgz"; + sha512 = "i89/EG+wQZ4m+O8I9VPuIgsAOxtft/e1pH5qqZeFcDvQg2iRuvRWR7CuEFJ4FnbakjOXU62eGldfzqsoq/m9Tw=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.15.0"; + version = "1.16.0"; src = ./.; dependencies = [ sources."@dabh/diagnostics-2.0.2" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."argparse-1.0.10" sources."async-3.2.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bindings-1.5.0" - (sources."bl-4.0.3" // { + sources."bl-4.0.3" + sources."brace-expansion-1.1.11" + sources."buffer-5.7.0" + sources."buffer-from-1.1.1" + (sources."callback-stream-1.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" ]; }) - sources."brace-expansion-1.1.11" - sources."buffer-5.6.0" - sources."buffer-from-1.1.1" - sources."callback-stream-1.1.0" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.3" + sources."color-string-1.5.4" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."commist-1.1.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" + sources."concat-stream-2.0.0" sources."core-util-is-1.0.2" - sources."d-1.0.1" sources."debounce-1.2.0" sources."debug-2.6.9" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."duplexify-3.7.1" + (sources."duplexify-3.7.1" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."ee-first-1.1.1" sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."es5-ext-0.10.53" - sources."es6-iterator-2.0.3" - sources."es6-map-0.1.5" - (sources."es6-set-0.1.5" // { - dependencies = [ - sources."es6-symbol-3.1.1" - ]; - }) - sources."es6-symbol-3.1.3" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" - sources."event-emitter-0.3.5" sources."eventemitter3-4.0.7" - (sources."ext-1.4.0" // { - dependencies = [ - sources."type-2.1.0" - ]; - }) sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" @@ -7784,13 +7587,19 @@ let sources."git-last-commit-1.0.0" sources."glob-7.1.6" sources."glob-parent-3.1.0" - sources."glob-stream-6.1.0" + (sources."glob-stream-6.1.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."glossy-0.1.7" sources."help-me-1.1.0" sources."http-errors-1.7.3" sources."http-proxy-1.18.1" - sources."humanize-duration-3.23.1" - sources."ieee754-1.1.13" + sources."humanize-duration-3.24.0" + sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-absolute-1.0.0" @@ -7817,8 +7626,8 @@ let sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdir-recursive-0.4.0" - sources."moment-2.29.0" - (sources."mqtt-4.2.1" // { + sources."moment-2.29.1" + (sources."mqtt-4.2.4" // { dependencies = [ sources."debug-4.2.0" sources."ms-2.1.2" @@ -7831,13 +7640,18 @@ let ]; }) sources."ms-2.0.0" - sources."nan-2.14.1" - sources."next-tick-1.0.0" + sources."nan-2.14.2" sources."object-assign-deep-0.4.0" sources."on-finished-2.3.0" sources."once-1.4.0" sources."one-time-1.0.0" - sources."ordered-read-streams-1.0.1" + (sources."ordered-read-streams-1.0.1" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."parseurl-1.3.3" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" @@ -7850,12 +7664,12 @@ let }) sources."punycode-2.1.1" sources."range-parser-1.2.1" - sources."readable-stream-2.3.7" + sources."readable-stream-3.6.0" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" sources."requires-port-1.0.0" sources."rimraf-3.0.2" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.1" sources."semver-7.3.2" (sources."send-0.17.1" // { dependencies = [ @@ -7865,23 +7679,24 @@ let sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" sources."simple-swizzle-0.2.2" - (sources."split2-3.2.2" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) + sources."split2-3.2.2" sources."sprintf-js-1.0.3" sources."stack-trace-0.0.10" sources."statuses-1.5.0" sources."stream-shift-1.0.1" - sources."string_decoder-1.1.1" + sources."string_decoder-1.3.0" sources."text-hex-1.0.0" - sources."through2-2.0.5" + (sources."through2-2.0.5" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."through2-filter-3.0.0" sources."to-absolute-glob-2.0.2" sources."toidentifier-1.0.0" sources."triple-beam-1.3.0" - sources."type-1.2.0" sources."typedarray-0.0.6" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" @@ -7889,65 +7704,68 @@ let sources."unpipe-1.0.0" sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" - (sources."winston-3.3.3" // { + sources."winston-3.3.3" + sources."winston-syslog-2.4.4" + (sources."winston-transport-4.4.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" ]; }) - sources."winston-syslog-2.4.4" - sources."winston-transport-4.4.0" sources."wrappy-1.0.2" sources."ws-7.3.1" sources."xtend-4.0.2" - (sources."zigbee-herdsman-0.13.11" // { + (sources."zigbee-herdsman-0.13.26" // { dependencies = [ - sources."@babel/cli-7.11.6" + sources."@babel/cli-7.12.1" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.11.0" - sources."@babel/core-7.11.6" - sources."@babel/generator-7.11.6" + sources."@babel/compat-data-7.12.1" + sources."@babel/core-7.12.3" + sources."@babel/generator-7.12.1" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.10.4" - sources."@babel/helper-create-class-features-plugin-7.10.5" - sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-compilation-targets-7.12.1" + sources."@babel/helper-create-class-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.1" sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.11.4" + sources."@babel/helper-explode-assignable-expression-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" - sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.11.0" + sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.11.4" - sources."@babel/helper-replace-supers-7.10.4" - sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-remap-async-to-generator-7.12.1" + sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-wrap-function-7.10.4" - sources."@babel/helpers-7.10.4" + sources."@babel/helper-validator-option-7.12.1" + sources."@babel/helper-wrap-function-7.12.3" + sources."@babel/helpers-7.12.1" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.5" - sources."@babel/plugin-proposal-async-generator-functions-7.10.5" - sources."@babel/plugin-proposal-class-properties-7.10.4" - sources."@babel/plugin-proposal-dynamic-import-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.10.4" - sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" - sources."@babel/plugin-proposal-numeric-separator-7.10.4" - sources."@babel/plugin-proposal-object-rest-spread-7.11.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.11.0" - sources."@babel/plugin-proposal-private-methods-7.10.4" - sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" + sources."@babel/parser-7.12.3" + sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/plugin-proposal-dynamic-import-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.1" + sources."@babel/plugin-proposal-json-strings-7.12.1" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-object-rest-spread-7.12.1" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.1" + sources."@babel/plugin-proposal-private-methods-7.12.1" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" - sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-class-properties-7.12.1" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" @@ -7958,51 +7776,51 @@ let sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.10.4" - sources."@babel/plugin-syntax-typescript-7.10.4" - sources."@babel/plugin-transform-arrow-functions-7.10.4" - sources."@babel/plugin-transform-async-to-generator-7.10.4" - sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.11.1" - sources."@babel/plugin-transform-classes-7.10.4" - sources."@babel/plugin-transform-computed-properties-7.10.4" - sources."@babel/plugin-transform-destructuring-7.10.4" - sources."@babel/plugin-transform-dotall-regex-7.10.4" - sources."@babel/plugin-transform-duplicate-keys-7.10.4" - sources."@babel/plugin-transform-exponentiation-operator-7.10.4" - sources."@babel/plugin-transform-for-of-7.10.4" - sources."@babel/plugin-transform-function-name-7.10.4" - sources."@babel/plugin-transform-literals-7.10.4" - sources."@babel/plugin-transform-member-expression-literals-7.10.4" - sources."@babel/plugin-transform-modules-amd-7.10.5" - sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.10.5" - sources."@babel/plugin-transform-modules-umd-7.10.4" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" - sources."@babel/plugin-transform-new-target-7.10.4" - sources."@babel/plugin-transform-object-super-7.10.4" - sources."@babel/plugin-transform-parameters-7.10.5" - sources."@babel/plugin-transform-property-literals-7.10.4" - sources."@babel/plugin-transform-regenerator-7.10.4" - sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.11.0" - sources."@babel/plugin-transform-sticky-regex-7.10.4" - sources."@babel/plugin-transform-template-literals-7.10.5" - sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-typescript-7.11.0" - sources."@babel/plugin-transform-unicode-escapes-7.10.4" - sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.5" + sources."@babel/plugin-syntax-top-level-await-7.12.1" + sources."@babel/plugin-syntax-typescript-7.12.1" + sources."@babel/plugin-transform-arrow-functions-7.12.1" + sources."@babel/plugin-transform-async-to-generator-7.12.1" + sources."@babel/plugin-transform-block-scoped-functions-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-classes-7.12.1" + sources."@babel/plugin-transform-computed-properties-7.12.1" + sources."@babel/plugin-transform-destructuring-7.12.1" + sources."@babel/plugin-transform-dotall-regex-7.12.1" + sources."@babel/plugin-transform-duplicate-keys-7.12.1" + sources."@babel/plugin-transform-exponentiation-operator-7.12.1" + sources."@babel/plugin-transform-for-of-7.12.1" + sources."@babel/plugin-transform-function-name-7.12.1" + sources."@babel/plugin-transform-literals-7.12.1" + sources."@babel/plugin-transform-member-expression-literals-7.12.1" + sources."@babel/plugin-transform-modules-amd-7.12.1" + sources."@babel/plugin-transform-modules-commonjs-7.12.1" + sources."@babel/plugin-transform-modules-systemjs-7.12.1" + sources."@babel/plugin-transform-modules-umd-7.12.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" + sources."@babel/plugin-transform-new-target-7.12.1" + sources."@babel/plugin-transform-object-super-7.12.1" + sources."@babel/plugin-transform-parameters-7.12.1" + sources."@babel/plugin-transform-property-literals-7.12.1" + sources."@babel/plugin-transform-regenerator-7.12.1" + sources."@babel/plugin-transform-reserved-words-7.12.1" + sources."@babel/plugin-transform-shorthand-properties-7.12.1" + sources."@babel/plugin-transform-spread-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.1" + sources."@babel/plugin-transform-template-literals-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-typescript-7.12.1" + sources."@babel/plugin-transform-unicode-escapes-7.12.1" + sources."@babel/plugin-transform-unicode-regex-7.12.1" + sources."@babel/preset-env-7.12.1" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.10.4" - sources."@babel/runtime-7.11.2" + sources."@babel/preset-typescript-7.12.1" + sources."@babel/runtime-7.12.1" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.5" - sources."@babel/types-7.11.5" + sources."@babel/traverse-7.12.1" + sources."@babel/types-7.12.1" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" - (sources."@eslint/eslintrc-0.1.3" // { + (sources."@eslint/eslintrc-0.2.1" // { dependencies = [ sources."globals-12.4.0" sources."ignore-4.0.6" @@ -8011,11 +7829,9 @@ let }) sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.2" - (sources."@jest/console-26.3.0" // { + (sources."@jest/console-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -8024,12 +7840,10 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/core-26.4.2" // { + (sources."@jest/core-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."braces-3.0.2" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8045,47 +7859,12 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."@jest/environment-26.3.0" // { + sources."@jest/environment-26.6.1" + sources."@jest/fake-timers-26.6.1" + sources."@jest/globals-26.6.1" + (sources."@jest/reporters-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."@jest/fake-timers-26.3.0" // { - dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."@jest/globals-26.4.2" // { - dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."@jest/reporters-26.4.1" // { - dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -8095,29 +7874,16 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/source-map-26.3.0" // { + (sources."@jest/source-map-26.5.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@jest/test-result-26.3.0" // { + sources."@jest/test-result-26.6.1" + sources."@jest/test-sequencer-26.6.1" + (sources."@jest/transform-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."@jest/test-sequencer-26.4.2" - (sources."@jest/transform-26.3.0" // { - dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."braces-3.0.2" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8132,72 +7898,77 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."@jest/types-25.5.0" // { + (sources."@jest/types-26.6.1" // { dependencies = [ - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; }) + (sources."@nicolo-ribaudo/chokidar-2-2.1.8" // { + dependencies = [ + sources."chokidar-2.1.8" + ]; + }) sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" - sources."@serialport/binding-abstract-9.0.1" - sources."@serialport/binding-mock-9.0.1" - sources."@serialport/bindings-9.0.1" + sources."@serialport/binding-abstract-9.0.2" + sources."@serialport/binding-mock-9.0.2" + sources."@serialport/bindings-9.0.2" sources."@serialport/parser-byte-length-9.0.1" sources."@serialport/parser-cctalk-9.0.1" sources."@serialport/parser-delimiter-9.0.1" sources."@serialport/parser-readline-9.0.1" sources."@serialport/parser-ready-9.0.1" sources."@serialport/parser-regex-9.0.1" - sources."@serialport/stream-9.0.1" + sources."@serialport/stream-9.0.2" sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" - sources."@types/babel__core-7.1.10" + sources."@types/babel__core-7.1.11" sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.0.3" sources."@types/babel__traverse-7.0.15" - sources."@types/color-name-1.1.1" + sources."@types/debounce-1.2.0" sources."@types/debug-4.1.5" - sources."@types/graceful-fs-4.1.3" + sources."@types/graceful-fs-4.1.4" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" - sources."@types/istanbul-reports-1.1.2" - sources."@types/jest-26.0.14" + sources."@types/istanbul-reports-3.0.0" + sources."@types/jest-26.0.15" sources."@types/json-schema-7.0.6" sources."@types/nedb-1.8.11" - sources."@types/node-14.11.2" + sources."@types/node-14.14.6" sources."@types/normalize-package-data-2.4.0" - sources."@types/prettier-2.1.1" + sources."@types/prettier-2.1.5" sources."@types/serialport-8.0.1" - sources."@types/stack-utils-1.0.1" - sources."@types/yargs-15.0.7" + sources."@types/stack-utils-2.0.0" + sources."@types/yargs-15.0.9" sources."@types/yargs-parser-15.0.0" - (sources."@typescript-eslint/eslint-plugin-4.2.0" // { + (sources."@typescript-eslint/eslint-plugin-4.6.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/experimental-utils-4.2.0" - sources."@typescript-eslint/parser-4.2.0" - sources."@typescript-eslint/scope-manager-4.2.0" - sources."@typescript-eslint/types-4.2.0" - (sources."@typescript-eslint/typescript-estree-4.2.0" // { + sources."@typescript-eslint/experimental-utils-4.6.0" + sources."@typescript-eslint/parser-4.6.0" + sources."@typescript-eslint/scope-manager-4.6.0" + sources."@typescript-eslint/types-4.6.0" + (sources."@typescript-eslint/typescript-estree-4.6.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/visitor-keys-4.2.0" + sources."@typescript-eslint/visitor-keys-4.6.0" sources."abab-2.0.5" - sources."acorn-7.4.0" + sources."acorn-7.4.1" sources."acorn-globals-6.0.0" sources."acorn-jsx-5.3.1" sources."acorn-walk-7.2.0" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.1" // { dependencies = [ @@ -8228,12 +7999,10 @@ let sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" - (sources."babel-jest-26.3.0" // { + sources."aws4-1.11.0" + (sources."babel-jest-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -8244,9 +8013,9 @@ let }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-26.2.0" - sources."babel-preset-current-node-syntax-0.1.3" - sources."babel-preset-jest-26.3.0" + sources."babel-plugin-jest-hoist-26.5.0" + sources."babel-preset-current-node-syntax-0.1.4" + sources."babel-preset-jest-26.5.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -8276,19 +8045,34 @@ let sources."browser-process-hrtime-1.0.0" sources."browserslist-4.14.5" sources."bser-2.1.1" - sources."buffer-5.6.0" + sources."buffer-5.7.0" sources."buffer-from-1.1.1" sources."cache-base-1.0.1" + sources."call-bind-1.0.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001137" + sources."caniuse-lite-1.0.30001154" sources."capture-exit-2.0.0" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."char-regex-1.0.2" - sources."chokidar-2.1.8" + (sources."chokidar-3.4.3" // { + dependencies = [ + sources."anymatch-3.1.1" + sources."binary-extensions-2.1.0" + sources."braces-3.0.2" + sources."fill-range-7.0.1" + sources."fsevents-2.1.3" + sources."glob-parent-5.1.1" + sources."is-binary-path-2.1.0" + sources."is-number-7.0.0" + sources."readdirp-3.5.0" + sources."to-regex-range-5.0.1" + ]; + }) sources."chownr-1.1.4" sources."ci-info-2.0.0" + sources."cjs-module-lexer-0.4.3" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -8331,9 +8115,10 @@ let }) sources."dashdash-1.14.1" sources."data-urls-2.0.0" + sources."debounce-1.2.0" sources."debug-4.2.0" sources."decamelize-1.2.0" - sources."decimal.js-10.2.0" + sources."decimal.js-10.2.1" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" @@ -8351,7 +8136,7 @@ let sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."detect-newline-3.1.0" - sources."diff-sequences-25.2.6" + sources."diff-sequences-26.5.0" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" (sources."domexception-2.0.1" // { @@ -8360,15 +8145,13 @@ let ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.573" - sources."emittery-0.7.1" + sources."electron-to-chromium-1.3.585" + sources."emittery-0.7.2" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.0" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.0" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" (sources."escodegen-1.14.3" // { dependencies = [ @@ -8379,15 +8162,14 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-7.10.0" // { + (sources."eslint-7.12.1" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."eslint-visitor-keys-1.3.0" sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."has-flag-4.0.0" @@ -8439,17 +8221,11 @@ let ]; }) sources."expand-template-2.0.3" - (sources."expect-26.4.2" // { + (sources."expect-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-4.1.0" + sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."jest-get-type-26.3.0" - sources."supports-color-7.2.0" ]; }) sources."extend-3.0.2" @@ -8481,7 +8257,7 @@ let }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."fb-watchman-2.0.1" sources."file-entry-cache-5.0.1" sources."file-uri-to-path-1.0.0" @@ -8505,8 +8281,9 @@ let sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."gauge-2.7.4" - sources."gensync-1.0.0-beta.1" + sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.0.1" sources."get-package-type-0.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -8543,14 +8320,14 @@ let sources."kind-of-4.0.0" ]; }) - sources."highlight.js-10.2.0" + sources."highlight.js-10.3.2" sources."hosted-git-info-2.8.8" sources."html-encoding-sniffer-2.0.1" sources."html-escaper-2.0.2" sources."http-signature-1.2.0" sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."ignore-5.1.8" (sources."import-fresh-3.2.1" // { dependencies = [ @@ -8563,7 +8340,6 @@ let sources."inherits-2.0.4" sources."ini-1.3.5" sources."interpret-1.4.0" - sources."invariant-2.2.4" sources."ip-regex-2.1.0" (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ @@ -8573,14 +8349,13 @@ let sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" sources."is-ci-2.0.0" + sources."is-core-module-2.0.0" (sources."is-data-descriptor-0.1.4" // { dependencies = [ sources."kind-of-3.2.2" ]; }) - sources."is-date-object-1.0.2" (sources."is-descriptor-0.1.6" // { dependencies = [ sources."kind-of-5.1.0" @@ -8592,7 +8367,6 @@ let sources."is-fullwidth-code-point-1.0.0" sources."is-generator-fn-2.1.0" sources."is-glob-4.0.1" - sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -8600,9 +8374,7 @@ let }) sources."is-plain-object-2.0.4" sources."is-potential-custom-element-name-1.0.0" - sources."is-regex-1.1.1" sources."is-stream-1.1.0" - sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" @@ -8630,46 +8402,33 @@ let ]; }) sources."istanbul-reports-3.0.2" - (sources."jest-26.4.2" // { + (sources."jest-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-cli-26.4.2" + sources."jest-cli-26.6.1" sources."supports-color-7.2.0" ]; }) - (sources."jest-changed-files-26.3.0" // { + (sources."jest-changed-files-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."execa-4.0.3" + sources."execa-4.1.0" sources."get-stream-5.2.0" - sources."has-flag-4.0.0" sources."is-stream-2.0.0" sources."npm-run-path-4.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."supports-color-7.2.0" sources."which-2.0.2" ]; }) - (sources."jest-config-26.4.2" // { + (sources."jest-config-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."braces-3.0.2" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8677,17 +8436,15 @@ let sources."fill-range-7.0.1" sources."has-flag-4.0.0" sources."is-number-7.0.0" - sources."jest-get-type-26.3.0" sources."micromatch-4.0.2" - sources."pretty-format-26.4.2" sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" ]; }) - (sources."jest-diff-25.5.0" // { + (sources."jest-diff-26.6.1" // { dependencies = [ - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -8695,26 +8452,9 @@ let ]; }) sources."jest-docblock-26.0.0" - (sources."jest-each-26.4.2" // { + (sources."jest-each-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."jest-get-type-26.3.0" - sources."pretty-format-26.4.2" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-environment-jsdom-26.3.0" // { - dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -8722,89 +8462,44 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-environment-node-26.3.0" // { + sources."jest-environment-jsdom-26.6.1" + sources."jest-environment-node-26.6.1" + sources."jest-get-type-26.3.0" + (sources."jest-haste-map-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-get-type-25.2.6" - (sources."jest-haste-map-26.3.0" // { - dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."braces-3.0.2" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."fill-range-7.0.1" sources."fsevents-2.1.3" - sources."has-flag-4.0.0" sources."is-number-7.0.0" sources."micromatch-4.0.2" - sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" ]; }) - (sources."jest-jasmine2-26.4.2" // { + (sources."jest-jasmine2-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."pretty-format-26.4.2" sources."supports-color-7.2.0" ]; }) - (sources."jest-leak-detector-26.4.2" // { + sources."jest-leak-detector-26.6.1" + (sources."jest-matcher-utils-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-get-type-26.3.0" - sources."pretty-format-26.4.2" sources."supports-color-7.2.0" ]; }) - (sources."jest-matcher-utils-26.4.2" // { + (sources."jest-message-util-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."diff-sequences-26.3.0" - sources."has-flag-4.0.0" - sources."jest-diff-26.4.2" - sources."jest-get-type-26.3.0" - sources."pretty-format-26.4.2" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-message-util-26.3.0" // { - dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."braces-3.0.2" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8818,25 +8513,12 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."jest-mock-26.3.0" // { - dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."jest-mock-26.6.1" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-26.0.0" - (sources."jest-resolve-26.4.0" // { + (sources."jest-resolve-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -8845,11 +8527,10 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-resolve-dependencies-26.4.2" // { + sources."jest-resolve-dependencies-26.6.1" + (sources."jest-runner-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -8857,23 +8538,9 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-runner-26.4.2" // { + (sources."jest-runtime-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-runtime-26.4.2" // { - dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -8882,30 +8549,21 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-serializer-26.3.0" - (sources."jest-snapshot-26.4.2" // { + sources."jest-serializer-26.5.0" + (sources."jest-snapshot-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."diff-sequences-26.3.0" sources."has-flag-4.0.0" - sources."jest-diff-26.4.2" - sources."jest-get-type-26.3.0" - sources."pretty-format-26.4.2" sources."semver-7.3.2" sources."supports-color-7.2.0" ]; }) - (sources."jest-util-26.3.0" // { + (sources."jest-util-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."braces-3.0.2" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -8918,27 +8576,10 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."jest-validate-26.4.2" // { + (sources."jest-validate-26.6.1" // { dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" - sources."camelcase-6.0.0" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."jest-get-type-26.3.0" - sources."pretty-format-26.4.2" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-watcher-26.3.0" // { - dependencies = [ - sources."@jest/types-26.3.0" - sources."@types/istanbul-reports-3.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" + sources."camelcase-6.2.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -8946,7 +8587,17 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-worker-26.3.0" // { + (sources."jest-watcher-26.6.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."jest-worker-26.6.1" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -8963,24 +8614,26 @@ let sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json5-2.1.3" - sources."jsonfile-6.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."jsprim-1.4.1" sources."kind-of-6.0.3" sources."kleur-3.0.3" sources."leven-3.1.0" - sources."levenary-1.1.1" sources."levn-0.4.1" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."lodash.sortby-4.7.0" - sources."loose-envify-1.4.0" sources."lunr-2.3.9" sources."make-dir-2.1.0" sources."makeerror-1.0.11" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."marked-1.1.1" + sources."marked-1.2.2" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-3.1.10" @@ -8994,7 +8647,7 @@ let sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" - sources."nan-2.14.1" + sources."nan-2.14.2" sources."nanomatch-1.2.13" sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" @@ -9009,7 +8662,7 @@ let sources."which-2.0.2" ]; }) - sources."node-releases-1.1.61" + sources."node-releases-1.1.65" sources."noop-logger-0.1.1" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" @@ -9025,10 +8678,9 @@ let sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -9054,25 +8706,25 @@ let sources."pirates-4.0.1" sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" - sources."prebuild-install-5.3.5" + sources."prebuild-install-5.3.6" sources."prelude-ls-1.2.1" - (sources."pretty-format-25.5.0" // { + (sources."pretty-format-26.6.1" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" ]; }) sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."prompts-2.3.2" + sources."prompts-2.4.0" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."rc-1.2.8" - sources."react-is-16.13.1" + sources."react-is-17.0.1" (sources."read-pkg-5.2.0" // { dependencies = [ sources."type-fest-0.6.0" @@ -9112,7 +8764,7 @@ let }) sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" @@ -9120,14 +8772,14 @@ let sources."reusify-1.0.4" sources."rimraf-2.6.3" sources."rsvp-4.8.5" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sane-4.1.0" sources."saxes-5.0.1" sources."semver-5.7.1" - sources."serialport-9.0.1" + sources."serialport-9.0.2" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -9203,16 +8855,6 @@ let ]; }) sources."string-width-1.0.2" - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.6" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.6" - ]; - }) sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-4.0.0" @@ -9256,7 +8898,7 @@ let sources."to-regex-range-2.1.1" sources."tough-cookie-3.0.1" sources."tr46-2.0.2" - sources."tslib-1.13.0" + sources."tslib-1.14.1" sources."tsutils-3.17.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -9270,11 +8912,11 @@ let ]; }) sources."typedoc-default-themes-0.11.4" - sources."typedoc-plugin-markdown-3.0.3" + sources."typedoc-plugin-markdown-3.0.11" sources."typedoc-plugin-no-inherit-1.2.0" sources."typedoc-plugin-sourcefile-url-1.0.6" - sources."typescript-4.0.3" - sources."uglify-js-3.10.4" + sources."typescript-4.0.5" + sources."uglify-js-3.11.4" sources."unicode-canonical-property-names-ecmascript-1.0.4" sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.2.0" @@ -9296,9 +8938,9 @@ let sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-8.3.0" - sources."v8-compile-cache-2.1.1" - (sources."v8-to-istanbul-5.0.1" // { + sources."uuid-8.3.1" + sources."v8-compile-cache-2.2.0" + (sources."v8-to-istanbul-6.0.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -9311,7 +8953,7 @@ let sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.2.2" + sources."whatwg-url-8.4.0" sources."which-1.3.1" sources."which-module-2.0.0" sources."which-pm-runs-1.0.0" @@ -9321,7 +8963,7 @@ let (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-8.0.0" @@ -9349,41 +8991,41 @@ let sources."yargs-parser-18.1.3" ]; }) - (sources."zigbee-herdsman-converters-12.0.194" // { + (sources."zigbee-herdsman-converters-12.0.224" // { dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.11.6" // { + (sources."@babel/core-7.12.3" // { dependencies = [ sources."semver-5.7.1" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.11.6" // { + (sources."@babel/generator-7.12.1" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" - sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.11.0" + sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-replace-supers-7.10.4" - sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helpers-7.10.4" + sources."@babel/helpers-7.12.1" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.11.5" + sources."@babel/parser-7.12.3" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" - sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-class-properties-7.12.1" sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" @@ -9393,73 +9035,68 @@ let sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.11.5" // { + (sources."@babel/traverse-7.12.1" // { dependencies = [ sources."globals-11.12.0" ]; }) - sources."@babel/types-7.11.5" + sources."@babel/types-7.12.1" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" - sources."@eslint/eslintrc-0.1.3" + sources."@eslint/eslintrc-0.2.1" (sources."@istanbuljs/load-nyc-config-1.1.0" // { dependencies = [ sources."resolve-from-5.0.0" ]; }) sources."@istanbuljs/schema-0.1.2" - sources."@jest/console-26.3.0" - (sources."@jest/core-26.4.2" // { + sources."@jest/console-26.6.1" + (sources."@jest/core-26.6.1" // { dependencies = [ sources."rimraf-3.0.2" ]; }) - sources."@jest/environment-26.3.0" - sources."@jest/fake-timers-26.3.0" - sources."@jest/globals-26.4.2" - sources."@jest/reporters-26.4.1" - sources."@jest/source-map-26.3.0" - sources."@jest/test-result-26.3.0" - sources."@jest/test-sequencer-26.4.2" - sources."@jest/transform-26.3.0" - sources."@jest/types-26.3.0" + sources."@jest/environment-26.6.1" + sources."@jest/fake-timers-26.6.1" + sources."@jest/globals-26.6.1" + sources."@jest/reporters-26.6.1" + sources."@jest/source-map-26.5.0" + sources."@jest/test-result-26.6.1" + sources."@jest/test-sequencer-26.6.1" + sources."@jest/transform-26.6.1" + sources."@jest/types-26.6.1" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" - sources."@types/babel__core-7.1.10" + sources."@types/babel__core-7.1.11" sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.0.3" sources."@types/babel__traverse-7.0.15" - sources."@types/color-name-1.1.1" - sources."@types/graceful-fs-4.1.3" + sources."@types/graceful-fs-4.1.4" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.0" sources."@types/json-schema-7.0.6" - sources."@types/node-14.11.2" + sources."@types/node-14.14.6" sources."@types/normalize-package-data-2.4.0" - sources."@types/prettier-2.1.1" - sources."@types/stack-utils-1.0.1" - sources."@types/yargs-15.0.7" + sources."@types/prettier-2.1.5" + sources."@types/stack-utils-2.0.0" + sources."@types/yargs-15.0.9" sources."@types/yargs-parser-15.0.0" - sources."@typescript-eslint/experimental-utils-4.2.0" - sources."@typescript-eslint/scope-manager-4.2.0" - sources."@typescript-eslint/types-4.2.0" - sources."@typescript-eslint/typescript-estree-4.2.0" - (sources."@typescript-eslint/visitor-keys-4.2.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.0.0" - ]; - }) + sources."@typescript-eslint/experimental-utils-4.6.0" + sources."@typescript-eslint/scope-manager-4.6.0" + sources."@typescript-eslint/types-4.6.0" + sources."@typescript-eslint/typescript-estree-4.6.0" + sources."@typescript-eslint/visitor-keys-4.6.0" sources."abab-2.0.5" - sources."acorn-7.4.0" + sources."acorn-7.4.1" sources."acorn-globals-6.0.0" sources."acorn-jsx-5.3.1" sources."acorn-walk-7.2.0" - sources."agent-base-6.0.1" - sources."ajv-6.12.5" + sources."agent-base-6.0.2" + sources."ajv-6.12.6" sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.1" // { dependencies = [ @@ -9482,13 +9119,13 @@ let sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" - sources."axios-0.20.0" - sources."babel-jest-26.3.0" + sources."aws4-1.11.0" + sources."axios-0.21.0" + sources."babel-jest-26.6.1" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-26.2.0" - sources."babel-preset-current-node-syntax-0.1.3" - sources."babel-preset-jest-26.3.0" + sources."babel-plugin-jest-hoist-26.5.0" + sources."babel-preset-current-node-syntax-0.1.4" + sources."babel-preset-jest-26.5.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -9505,7 +9142,8 @@ let sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" sources."bser-2.1.1" - sources."buffer-5.6.0" + sources."buffer-5.7.0" + sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" sources."cache-base-1.0.1" sources."callsites-3.1.0" @@ -9514,7 +9152,7 @@ let sources."caseless-0.12.0" (sources."chalk-4.1.0" // { dependencies = [ - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -9523,6 +9161,7 @@ let }) sources."char-regex-1.0.2" sources."ci-info-2.0.0" + sources."cjs-module-lexer-0.4.3" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -9561,7 +9200,7 @@ let sources."data-urls-2.0.0" sources."debug-4.2.0" sources."decamelize-1.2.0" - sources."decimal.js-10.2.0" + sources."decimal.js-10.2.1" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" sources."deepmerge-4.2.2" @@ -9574,7 +9213,7 @@ let }) sources."delayed-stream-1.0.0" sources."detect-newline-3.1.0" - sources."diff-sequences-26.3.0" + sources."diff-sequences-26.5.0" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" (sources."domexception-2.0.1" // { @@ -9583,7 +9222,7 @@ let ]; }) sources."ecc-jsbn-0.1.2" - sources."emittery-0.7.1" + sources."emittery-0.7.2" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -9597,13 +9236,21 @@ let sources."type-check-0.3.2" ]; }) - sources."eslint-7.10.0" + sources."eslint-7.12.1" sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-24.0.2" + sources."eslint-plugin-jest-24.1.0" sources."eslint-scope-5.1.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."espree-7.3.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.0.0" + (sources."espree-7.3.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ @@ -9637,9 +9284,9 @@ let sources."ms-2.0.0" ]; }) - (sources."expect-26.4.2" // { + (sources."expect-26.6.1" // { dependencies = [ - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" ]; @@ -9664,7 +9311,7 @@ let sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."fb-watchman-2.0.1" sources."file-entry-cache-5.0.1" sources."fill-range-7.0.1" @@ -9679,8 +9326,9 @@ let sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" + sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."gensync-1.0.0-beta.1" + sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-package-type-0.1.0" sources."get-stream-4.1.0" @@ -9698,6 +9346,7 @@ let sources."growly-1.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -9717,7 +9366,7 @@ let sources."https-proxy-agent-5.0.0" sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."ignore-4.0.6" sources."import-fresh-3.2.1" sources."import-local-3.0.2" @@ -9733,6 +9382,7 @@ let sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" + sources."is-core-module-2.0.0" (sources."is-data-descriptor-0.1.4" // { dependencies = [ sources."kind-of-3.2.2" @@ -9774,48 +9424,48 @@ let }) sources."istanbul-lib-source-maps-4.0.0" sources."istanbul-reports-3.0.2" - (sources."jest-26.4.2" // { + (sources."jest-26.6.1" // { dependencies = [ - sources."jest-cli-26.4.2" + sources."jest-cli-26.6.1" ]; }) - (sources."jest-changed-files-26.3.0" // { + (sources."jest-changed-files-26.6.1" // { dependencies = [ - sources."execa-4.0.3" + sources."execa-4.1.0" sources."get-stream-5.2.0" sources."is-stream-2.0.0" sources."npm-run-path-4.0.1" ]; }) - sources."jest-config-26.4.2" - sources."jest-diff-26.4.2" + sources."jest-config-26.6.1" + sources."jest-diff-26.6.1" sources."jest-docblock-26.0.0" - sources."jest-each-26.4.2" - sources."jest-environment-jsdom-26.3.0" - sources."jest-environment-node-26.3.0" + sources."jest-each-26.6.1" + sources."jest-environment-jsdom-26.6.1" + sources."jest-environment-node-26.6.1" sources."jest-get-type-26.3.0" - sources."jest-haste-map-26.3.0" - sources."jest-jasmine2-26.4.2" - sources."jest-leak-detector-26.4.2" - sources."jest-matcher-utils-26.4.2" - sources."jest-message-util-26.3.0" - sources."jest-mock-26.3.0" + sources."jest-haste-map-26.6.1" + sources."jest-jasmine2-26.6.1" + sources."jest-leak-detector-26.6.1" + sources."jest-matcher-utils-26.6.1" + sources."jest-message-util-26.6.1" + sources."jest-mock-26.6.1" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-26.0.0" - sources."jest-resolve-26.4.0" - sources."jest-resolve-dependencies-26.4.2" - sources."jest-runner-26.4.2" - sources."jest-runtime-26.4.2" - sources."jest-serializer-26.3.0" - sources."jest-snapshot-26.4.2" - sources."jest-util-26.3.0" - (sources."jest-validate-26.4.2" // { + sources."jest-resolve-26.6.1" + sources."jest-resolve-dependencies-26.6.1" + sources."jest-runner-26.6.1" + sources."jest-runtime-26.6.1" + sources."jest-serializer-26.5.0" + sources."jest-snapshot-26.6.1" + sources."jest-util-26.6.1" + (sources."jest-validate-26.6.1" // { dependencies = [ - sources."camelcase-6.0.0" + sources."camelcase-6.2.0" ]; }) - sources."jest-watcher-26.3.0" - (sources."jest-worker-26.3.0" // { + sources."jest-watcher-26.6.1" + (sources."jest-worker-26.6.1" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -9914,20 +9564,20 @@ let sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" sources."prelude-ls-1.2.1" - (sources."pretty-format-26.4.2" // { + (sources."pretty-format-26.6.1" // { dependencies = [ - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" ]; }) sources."progress-2.0.3" - sources."prompts-2.3.2" + sources."prompts-2.4.0" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."react-is-16.13.1" + sources."react-is-17.0.1" (sources."read-pkg-5.2.0" // { dependencies = [ sources."type-fest-0.6.0" @@ -9954,7 +9604,7 @@ let }) sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" (sources."resolve-cwd-3.0.0" // { dependencies = [ sources."resolve-from-5.0.0" @@ -9966,7 +9616,7 @@ let sources."reusify-1.0.4" sources."rimraf-2.6.3" sources."rsvp-4.8.5" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -10090,7 +9740,7 @@ let sources."to-regex-range-5.0.1" sources."tough-cookie-3.0.1" sources."tr46-2.0.2" - sources."tslib-1.13.0" + sources."tslib-1.14.1" sources."tsutils-3.17.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -10113,9 +9763,9 @@ let sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-8.3.0" - sources."v8-compile-cache-2.1.1" - (sources."v8-to-istanbul-5.0.1" // { + sources."uuid-8.3.1" + sources."v8-compile-cache-2.2.0" + (sources."v8-to-istanbul-6.0.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -10128,13 +9778,13 @@ let sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.2.2" + sources."whatwg-url-8.4.0" sources."which-2.0.2" sources."which-module-2.0.0" sources."word-wrap-1.2.3" (sources."wrap-ansi-6.2.0" // { dependencies = [ - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-8.0.0" @@ -10159,7 +9809,7 @@ let sources."yargs-parser-18.1.3" ]; }) - sources."zigbee2mqtt-frontend-0.2.17" + sources."zigbee2mqtt-frontend-0.2.68" ]; buildInputs = globalBuildInputs; meta = { From e4865130cf41d9b703dabf1a58f952230a70c97d Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 29 Oct 2020 16:01:23 +0100 Subject: [PATCH 075/228] nixos/tests/prometheus: remove invalid thanos config flag Upstream has apparently changed the configuration format and is now throwing an error when the `encrypt_sse` option is set. According to the current version of the documentation encryption moved to the `sse_config` option that (is optional and) offers all the features we do not use or care about for this test. --- nixos/tests/prometheus.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index de1d10aa7ca9..6881c659e6d0 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -19,7 +19,6 @@ let secret_key = s3.secretKey; insecure = true; signature_version2 = false; - encrypt_sse = false; put_user_metadata = {}; http_config = { idle_conn_timeout = "0s"; From f4c229b2d6860d4c63abe0302735c367a2d697aa Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Wed, 28 Oct 2020 23:04:41 +0000 Subject: [PATCH 076/228] tmuxPlugins.continuum: unstable-2018-02-23 -> unstable-2020-10-16 --- pkgs/misc/tmux-plugins/default.nix | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 8efa0000da7b..315b76a7f925 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -66,14 +66,32 @@ in rec { continuum = mkDerivation { pluginName = "continuum"; - version = "unstable-2018-02-23"; + version = "unstable-2020-10-16"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-continuum"; - rev = "1531b3770a7cf7373d15fedd239c5331b99342d1"; - sha256 = "1w3f7gzvv1k25yfr6d1snr2z88p8f87cahrbaslmyphdxpy0fa4m"; + rev = "26eb5ffce0b559d682b9f98c8d4b6c370ecb639b"; + sha256 = "1glwa89bv2r92qz579a49prk3jf612cpd5hw46j4wfb35xhnj3ab"; }; dependencies = [ resurrect ]; + meta = { + homepage = "https://github.com/tmux-plugins/tmux-continuum"; + description = "continous saving of tmux environment"; + longDescription = + '' + Features: + * continuous saving of tmux environment + * automatic tmux start when computer/server is turned on + * automatic restore when tmux is started + + Together, these features enable uninterrupted tmux usage. No matter the + computer or server restarts, if the machine is on, tmux will be there how + you left it off the last time it was used. + ''; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ ronanmacf ]; + }; }; copycat = mkDerivation { From 90fd158c7998b04fd125d288badd1565bc7ea9ae Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Wed, 28 Oct 2020 23:10:21 +0000 Subject: [PATCH 077/228] tmuxPlugins.resurrect: unstable-2020-03-21 -> unstable-2020-09-18 --- pkgs/misc/tmux-plugins/default.nix | 32 +++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 315b76a7f925..d47ab09e3c56 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -284,12 +284,38 @@ in rec { resurrect = mkDerivation { pluginName = "resurrect"; - version = "unstable-2020-03-21"; + version = "unstable-2020-09-18"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-resurrect"; - rev = "327c0481ad20c429b4e692e092659f8b3346b08f"; - sha256 = "0nxfqazww36wwv49dzd39kq4jfls20834hf1458sf5pvmv5cmbyw"; + rev = "e4825055c92e54b0c6ec572afc9b6c4723aba6c8"; + sha256 = "0a96drkx1kpadkbxabcnvb542p75xdh2dbizvlq2lac5ldpb4hmx"; + }; + meta = { + homepage = "https://github.com/tmux-plugins/tmux-resurrect"; + description = "Restore tmux environment after system restart"; + longDescription = + '' + This plugin goes to great lengths to save and restore all the details + from your tmux environment. Here's what's been taken care of: + + * all sessions, windows, panes and their order + * current working directory for each pane + * exact pane layouts within windows (even when zoomed) + * active and alternative session + * active and alternative window for each session + * windows with focus + * active pane for each window + * "grouped sessions" (useful feature when using tmux with multiple monitors) + * programs running within a pane! More details in the restoring programs doc. + + Optional: + * restoring vim and neovim sessions + * restoring pane contents + ''; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ ronanmacf ]; }; }; From c6b754a67bf1408966509dcdb404c3dad43d2190 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 1 Nov 2020 14:27:03 +0100 Subject: [PATCH 078/228] pysideApiextractor: refactor to use python3 Also took the opportunity to split it to multiple outputs (cherry picked from commit 2cd5cf624ae19fd7633a22ea3a3f7986dfb611af) --- .../python-modules/pyside/apiextractor.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index 452320e1d71c..07ddfb69fa0f 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, cmake, libxml2, libxslt, python2, qt4 }: +{ stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }: # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. let - pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]); + pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]); in stdenv.mkDerivation { name = "pyside-apiextractor-0.10.10"; @@ -13,7 +13,14 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake qt4 pythonEnv libxml2 libxslt ]; + outputs = [ "out" "dev" ]; + + preConfigure = '' + cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") + ''; + + nativeBuildInputs = [ cmake pythonEnv ]; + buildInputs = [ qt4 libxml2 libxslt ]; meta = { description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; From 550389392a54a81e750aabb54b69a77c9e5d18af Mon Sep 17 00:00:00 2001 From: Daniel Gorin Date: Mon, 29 Jun 2020 21:25:16 +0100 Subject: [PATCH 079/228] kakoune: rework plugin support The previous implementation of plugin-support for the kakoune derivation was based on generating, at build time, a `plugins.kak` file that would source all .kak files in the list of plugins, and wrap the `kak` binary in a script that would add some command-line arguments so that this file gets loaded on start-up. The main problem with this approach is that the plugins' code get executed *after* the user's configuration file is loaded, so effectively one cannot automatically activate/configure these plugins. The idiomatic way of loading plugins is ensuring they end up installed somwhere under `share/kak/autoload`. Because plugins are already being packaged to have their code in `share/kak/autoload/plugins/`, we can obtain a derivation that includes the plugins simply by doing a `symlinkJoin` of `kakoune-unwrapped` and all the requested plugins. For this to work, we need to fix two issues: 1. By default, kakoune makes `share/kak/autoload` a symbolic link to `share/kak/rc`, which contains all builtin definitions. We need to patch this to put the symlink under `share/kak/autoload/rc`, so that the join works. 2. By default kakoune expects the `autoload` directory to be in `../share/kak/autoload` relative to the location of the `kak` binary. We need to set the `KAKOUNE_RUNTIME` to point the symlinked share/kak for this to work. --- doc/builders/packages/kakoune.xml | 4 +- pkgs/applications/editors/kakoune/default.nix | 9 ++++ pkgs/applications/editors/kakoune/wrapper.nix | 54 ++++++------------- pkgs/applications/editors/kakoune/wrapper.sh | 30 ----------- pkgs/top-level/all-packages.nix | 6 ++- 5 files changed, 31 insertions(+), 72 deletions(-) delete mode 100644 pkgs/applications/editors/kakoune/wrapper.sh diff --git a/doc/builders/packages/kakoune.xml b/doc/builders/packages/kakoune.xml index 728d40dacc92..045dbd0a653b 100644 --- a/doc/builders/packages/kakoune.xml +++ b/doc/builders/packages/kakoune.xml @@ -6,9 +6,7 @@ Kakoune can be built to autoload plugins: (kakoune.override { - configure = { - plugins = with pkgs.kakounePlugins; [ parinfer-rust ]; - }; + plugins = with pkgs.kakounePlugins; [ parinfer-rust ]; }) diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index eec14f286ba7..f1f811066597 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -30,6 +30,15 @@ stdenv.mkDerivation rec { $out/bin/kak -ui json -E "kill 0" ''; + postInstall = '' + # make share/kak/autoload a directory, so we can use symlinkJoin with plugins + cd "$out/share/kak" + autoload_target=$(readlink autoload) + rm autoload + mkdir autoload + ln -s --relative "$autoload_target" autoload + ''; + meta = { homepage = "http://kakoune.org/"; description = "A vim inspired text editor"; diff --git a/pkgs/applications/editors/kakoune/wrapper.nix b/pkgs/applications/editors/kakoune/wrapper.nix index b4cc823880e7..6d6e23f1dac9 100644 --- a/pkgs/applications/editors/kakoune/wrapper.nix +++ b/pkgs/applications/editors/kakoune/wrapper.nix @@ -1,44 +1,24 @@ -{ stdenv, bash }: -with stdenv.lib; - -kakoune: +{ symlinkJoin, makeWrapper, kakoune, plugins ? [], configure ? {} }: let - getPlugins = { plugins ? [] }: plugins; + # "plugins" is the preferred way, but some configurations may be + # using "configure.plugins", so accept both + requestedPlugins = plugins ++ (configure.plugins or []); - wrapper = { configure ? {} }: - stdenv.mkDerivation rec { - pname = "kakoune"; - version = getVersion kakoune; +in + symlinkJoin { + name = "kakoune-${kakoune.version}"; - src = ./.; - buildCommand = '' - mkdir -p $out/share/kak - for plugin in ${strings.escapeShellArgs (getPlugins configure)}; do - if [[ -d $plugin/share/kak/autoload ]]; then - find "$plugin/share/kak/autoload" -type f -name '*.kak'| while read rcfile; do - printf 'source "%s"\n' "$rcfile" - done - fi - done >>$out/share/kak/plugins.kak + buildInputs = [ makeWrapper ]; - mkdir -p $out/bin - substitute ${src}/wrapper.sh $out/bin/kak \ - --subst-var-by bash "${bash}" \ - --subst-var-by kakoune "${kakoune}" \ - --subst-var-by out "$out" - chmod +x $out/bin/kak + paths = [ kakoune ] ++ requestedPlugins; + + postBuild = '' + # location of kak binary is used to find ../share/kak/autoload, + # unless explicitly overriden with KAKOUNE_RUNTIME + rm "$out/bin/kak" + makeWrapper "${kakoune}/bin/kak" "$out/bin/kak" --set KAKOUNE_RUNTIME "$out/share/kak" ''; - preferLocalBuild = true; - buildInputs = [ bash kakoune ]; - passthru = { unwrapped = kakoune; }; - - meta = kakoune.meta // { - # prefer wrapper over the package - priority = (kakoune.meta.priority or 0) - 1; - hydraPlatforms = []; - }; - }; -in - makeOverridable wrapper + meta = kakoune.meta // { priority = (kakoune.meta.priority or 0) - 1; }; + } diff --git a/pkgs/applications/editors/kakoune/wrapper.sh b/pkgs/applications/editors/kakoune/wrapper.sh deleted file mode 100644 index 48a971a10c6e..000000000000 --- a/pkgs/applications/editors/kakoune/wrapper.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!@bash@/bin/bash - -# We use the -E option to load plugins. This only makes sense when we are -# starting a new session, so we detect that. Also, Kakoune can only handle -# one -E option, so we prepend loading plugins to an existing one. -args=( "$@" ) -loadPlugins=true -EValueOffset=-1 -pluginScript='@out@/share/kak/plugins.kak' - -for (( i = 0; i < ${#args[@]}; i++ )); do - case "${args[i]}" in - -n|-c|-l|-p|-clear|-version) loadPlugins=false;; - -E) EValueOffset=$(( i + 1 ));; - --) break;; - esac - case "${args[i]}" in - -E|-c|-e|-s|-p|-f|-i|-ui|-debug) i=$(( i + 1 ));; - esac -done - -if [[ $loadPlugins = true ]]; then - if (( EValueOffset >= 0 )); then - args[EValueOffset]="source '$pluginScript'"$'\n'"${args[EValueOffset]}" - else - args=( "-E" "source '$pluginScript'" "${args[@]}" ) - fi -fi - -exec @kakoune@/bin/kak "${args[@]}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4226f35c7fa6..eba6da07d07c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4905,10 +4905,12 @@ in kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { }; - wrapKakoune = callPackage ../applications/editors/kakoune/wrapper.nix { }; + wrapKakoune = kakoune: attrs: callPackage ../applications/editors/kakoune/wrapper.nix (attrs // { inherit kakoune; }); kakounePlugins = callPackage ../applications/editors/kakoune/plugins { }; kakoune-unwrapped = callPackage ../applications/editors/kakoune { }; - kakoune = wrapKakoune kakoune-unwrapped { }; + kakoune = wrapKakoune kakoune-unwrapped { + plugins = [ ]; # override with the list of desired plugins + }; kak-lsp = callPackage ../tools/misc/kak-lsp { }; From 464804b43f6e414d4a6eadcf220a43040640cc34 Mon Sep 17 00:00:00 2001 From: Daniel Gorin Date: Sun, 18 Oct 2020 16:19:09 +0100 Subject: [PATCH 080/228] kakoune: Fix :doc when using plugins So, kakoune takes the documentation shown for `:doc` from `$KAKOUNE_RUNTIME/share/kak/doc`. Unfortunately, it seems that it will ignore files that are symlinks. This is arguably a bug in kakoune, we workaround it for now by copying the content of the docfiles. --- pkgs/applications/editors/kakoune/wrapper.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/editors/kakoune/wrapper.nix b/pkgs/applications/editors/kakoune/wrapper.nix index 6d6e23f1dac9..7ac56d9cb1e0 100644 --- a/pkgs/applications/editors/kakoune/wrapper.nix +++ b/pkgs/applications/editors/kakoune/wrapper.nix @@ -18,6 +18,13 @@ in # unless explicitly overriden with KAKOUNE_RUNTIME rm "$out/bin/kak" makeWrapper "${kakoune}/bin/kak" "$out/bin/kak" --set KAKOUNE_RUNTIME "$out/share/kak" + + # currently kakoune ignores doc files if they are symlinks, so workaround by + # copying doc files over, so they become regular files... + mkdir "$out/DELETE_ME" + mv "$out/share/kak/doc" "$out/DELETE_ME" + cp -r --dereference "$out/DELETE_ME/doc" "$out/share/kak" + rm -Rf "$out/DELETE_ME" ''; meta = kakoune.meta // { priority = (kakoune.meta.priority or 0) - 1; }; From 335d21df857a02dbc2fc768bb2bdeee2957becdf Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 1 Nov 2020 15:20:17 +0100 Subject: [PATCH 081/228] pysideGeneratorrunner: refactor to use python3 --- .../python-modules/pyside/generatorrunner.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 7cb132c1ad70..8fc505a89fc4 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, cmake, pysideApiextractor, python2, qt4 }: +{ stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }: # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. let - pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]); + pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]); pname = "pyside-generatorrunner"; version = "0.6.16"; in stdenv.mkDerivation { @@ -15,7 +15,14 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake pysideApiextractor qt4 pythonEnv ]; + outputs = [ "out" "dev" ]; + + preConfigure = '' + cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") + ''; + + nativeBuildInputs = [ cmake pythonEnv ]; + buildInputs = [ pysideApiextractor qt4 ]; meta = { description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; From a3e20b8dbc6c20349c0bf64e79adf20591eae6b1 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 1 Nov 2020 16:22:00 +0100 Subject: [PATCH 082/228] python3Packages.pysideShiboken: refactor to use multiple outputs --- pkgs/development/python-modules/pyside/shiboken.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index b0c3368e070b..cf7192f92ffb 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -33,7 +33,10 @@ buildPythonPackage rec { buildInputs = [ python libxml2 libxslt ]; + outputs = [ "out" "dev" ]; + preConfigure = '' + cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") echo "preConfigure: Fixing shiboken_generator install target." substituteInPlace generator/CMakeLists.txt --replace \ \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ From 5a03f8ba8054a1af6bf79857cc08d3a967815570 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 1 Nov 2020 16:22:13 +0100 Subject: [PATCH 083/228] python3Packages.pysideTools: refactor to use multiple outputs --- pkgs/development/python-modules/pyside/tools.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index 9698c09f3478..cc52a0502f28 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -12,6 +12,12 @@ buildPythonPackage rec { sha256 = "017i2yxgjrisaifxqnl3ym8ijl63l2yl6a3474dsqhlyqz2nx2ll"; }; + outputs = [ "out" "dev" ]; + + preConfigure = '' + cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ qt4 ]; From b6a2387ddc9676db294bc657b3a8d495740851dc Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 1 Nov 2020 16:22:29 +0100 Subject: [PATCH 084/228] python3Packages.pyside: refactor to use multiple outputs --- pkgs/development/python-modules/pyside/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 8eae5034a4f8..2bbeb7a1233f 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -13,6 +13,12 @@ buildPythonPackage rec { enableParallelBuilding = true; + outputs = [ "out" "dev" ]; + + preConfigure = '' + cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") + ''; + nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ]; buildInputs = [ mesa libGL ]; From 49bdf0daceb9035f96e267b12adc01f28928edc4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 31 Oct 2020 09:09:57 +0100 Subject: [PATCH 085/228] ocamlPackages.mirage-profile: init at 0.9.1 --- .../ocaml-modules/mirage-profile/default.nix | 26 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mirage-profile/default.nix diff --git a/pkgs/development/ocaml-modules/mirage-profile/default.nix b/pkgs/development/ocaml-modules/mirage-profile/default.nix new file mode 100644 index 000000000000..d4cf621ed118 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-profile/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildDunePackage +, ppx_cstruct +, cstruct, lwt +}: + +buildDunePackage rec { + pname = "mirage-profile"; + version = "0.9.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-profile/releases/download/v${version}/mirage-profile-v${version}.tbz"; + sha256 = "0lh3591ad4v7nxpd410b75idmgdq668mqdilvkg4avrwqw1wzdib"; + }; + + buildInputs = [ ppx_cstruct ]; + propagatedBuildInputs = [ cstruct lwt ]; + + meta = { + description = "Collect runtime profiling information in CTF format"; + homepage = "https://github.com/mirage/mirage-profile"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 55658e70af9a..b623d65bb8b5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -569,6 +569,8 @@ let mirage-net = callPackage ../development/ocaml-modules/mirage-net { }; + mirage-profile = callPackage ../development/ocaml-modules/mirage-profile { }; + mirage-protocols = callPackage ../development/ocaml-modules/mirage-protocols { }; mirage-random = callPackage ../development/ocaml-modules/mirage-random { }; From c386d3d211518e7bb6711333c44241496196a129 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 31 Oct 2020 14:43:59 +0100 Subject: [PATCH 086/228] Update pkgs/development/ocaml-modules/mirage-profile/default.nix Co-authored-by: Sandro --- pkgs/development/ocaml-modules/mirage-profile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-profile/default.nix b/pkgs/development/ocaml-modules/mirage-profile/default.nix index d4cf621ed118..c6ca730bf3c5 100644 --- a/pkgs/development/ocaml-modules/mirage-profile/default.nix +++ b/pkgs/development/ocaml-modules/mirage-profile/default.nix @@ -17,10 +17,10 @@ buildDunePackage rec { buildInputs = [ ppx_cstruct ]; propagatedBuildInputs = [ cstruct lwt ]; - meta = { + meta = with lib; { description = "Collect runtime profiling information in CTF format"; homepage = "https://github.com/mirage/mirage-profile"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.vbgl ]; + license = licenses.bsd2; + maintainers = with maintainers; [ vbgl ]; }; } From 73c60d64a2c55520e742fde18065885f9f7d8740 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Nov 2020 07:49:29 +0100 Subject: [PATCH 087/228] ocamlPackages.imagelib: use Dune 2 --- pkgs/development/ocaml-modules/imagelib/default.nix | 3 +++ pkgs/development/ocaml-modules/imagelib/unix.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix index 12b8a757e16f..46bd4b962681 100644 --- a/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -4,6 +4,9 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; version = "20191011"; pname = "imagelib"; + + useDune2 = true; + src = fetchFromGitHub { owner = "rlepigre"; repo = "ocaml-imagelib"; diff --git a/pkgs/development/ocaml-modules/imagelib/unix.nix b/pkgs/development/ocaml-modules/imagelib/unix.nix index 48986b15a8f8..a188165a48fa 100644 --- a/pkgs/development/ocaml-modules/imagelib/unix.nix +++ b/pkgs/development/ocaml-modules/imagelib/unix.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "imagelib-unix"; - inherit (imagelib) version src meta; + inherit (imagelib) version src useDune2 meta; propagatedBuildInputs = [ imagelib ]; } From 371dce30240d769aea575d98718684efd6c9b953 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Nov 2020 07:49:39 +0100 Subject: [PATCH 088/228] ocamlPackages.decompress: use Dune 2 --- pkgs/development/ocaml-modules/decompress/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index 753f894e0850..a3bf3456ed0d 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { version = "0.9.0"; pname = "decompress"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh"; From 99ebf5ba5bfb936ea21d91e828736d8c473467e2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Nov 2020 07:49:44 +0100 Subject: [PATCH 089/228] =?UTF-8?q?ocamlPackages.checkseum:=200.1.1=20?= =?UTF-8?q?=E2=86=92=200.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/checkseum/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix index 731dd476c5d7..810099810470 100644 --- a/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/pkgs/development/ocaml-modules/checkseum/default.nix @@ -1,19 +1,21 @@ -{ lib, fetchurl, buildDunePackage +{ lib, fetchurl, buildDunePackage, dune-configurator , bigarray-compat, optint -, cmdliner, fmt, rresult +, fmt, rresult , alcotest }: buildDunePackage rec { - version = "0.1.1"; + version = "0.2.1"; pname = "checkseum"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-v${version}.tbz"; - sha256 = "0aa2r1l65a5hcgciw6n8r5ij4gpgg0cf9k24isybxiaiz63k94d3"; + sha256 = "1swb44c64pcs4dh9ka9lig6d398qwwkd3kkiajicww6qk7jbh3n5"; }; - buildInputs = [ cmdliner fmt rresult ]; + buildInputs = [ dune-configurator fmt rresult ]; propagatedBuildInputs = [ bigarray-compat optint ]; checkInputs = lib.optionals doCheck [ alcotest ]; From 86c6683e6208103224da74ace3d89031b3e10ab1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Oct 2020 06:27:59 +0100 Subject: [PATCH 090/228] ocamlPackages.google-drive-ocamlfuse: disable for OCaml < 4.06 --- pkgs/applications/networking/google-drive-ocamlfuse/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index b9b1c1f54a95..72ff8bd8b4be 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -8,6 +8,8 @@ buildDunePackage rec { useDune2 = true; + minimumOCamlVersion = "4.06"; + src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; From 15812e11364ac8905cfc8b6804413143ae875e5b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Oct 2020 06:11:02 +0100 Subject: [PATCH 091/228] =?UTF-8?q?ocamlPackages.gapi=5Focaml:=200.3.19=20?= =?UTF-8?q?=E2=86=92=200.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/gapi-ocaml/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index b01d4b4a04c2..348a70a0da9f 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchFromGitHub, buildDunePackage -, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm +{ lib, fetchFromGitHub, buildDunePackage, ocaml +, cryptokit, ocamlnet, ocurl, yojson +, ounit }: buildDunePackage rec { pname = "gapi-ocaml"; - version = "0.3.19"; + version = "0.4.1"; + + useDune2 = true; minimumOCamlVersion = "4.02"; @@ -12,16 +15,18 @@ buildDunePackage rec { owner = "astrada"; repo = pname; rev = "v${version}"; - sha256 = "04arif1p1vj5yr24cwicj70b7yx17hrgf4pl47vqg8ngcrdh71v9"; + sha256 = "0riax23grjnq9pczmp1yv02ji0svvs2kbiqskj6f6yjviamnpa31"; }; - propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib ocamlnet yojson ]; - buildInputs = [ xmlm ]; + propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ]; + + doCheck = lib.versionAtLeast ocaml.version "4.04"; + checkInputs = [ ounit ]; meta = { description = "OCaml client for google services"; homepage = "http://gapi-ocaml.forge.ocamlcore.org"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bennofs ]; }; } From c311bf1eb581145ced44436e76079a96f6de9f15 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 25 Jul 2020 14:50:18 +0000 Subject: [PATCH 092/228] ocamlPackages.bitstring: 3.0.0 -> 3.1.1 --- pkgs/development/ocaml-modules/bitstring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index 2f413d37352c..386503039e05 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "bitstring"; - version = "3.0.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "xguerin"; repo = pname; rev = "v${version}"; - sha256 = "0r49qax7as48jgknzaq6p9rbpmrvnmlic713wzz5bj60j5h0396f"; + sha256 = "1ys8xx174jf8v5sm0lbxvzhdlcs5p0fhy1gvf58gad2g4gvgpvxc"; }; buildInputs = [ ppx_tools_versioned ounit ]; From 546ef7afd7fc9a78f2eb3164d0815ce892b73fb9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 30 Oct 2020 06:24:37 +0100 Subject: [PATCH 093/228] =?UTF-8?q?ocamlPackages.lacaml:=2011.0.6=20?= =?UTF-8?q?=E2=86=92=2011.0.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/lacaml/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index 23b38e469b4b..b7f5cb44818b 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -1,31 +1,31 @@ -{ stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, lapack, blas }: +{ stdenv, fetchurl, darwin, buildDunePackage, dune-configurator +, lapack, blas +}: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0"; assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-lacaml"; - version = "11.0.6"; +buildDunePackage rec { + pname = "lacaml"; + version = "11.0.8"; - src = fetchFromGitHub { - owner = "mmottl"; - repo = "lacaml"; - rev = version; - sha256 = "1vn5441fg45d0ni9x87dhz2x4jrmvg3w7qk3vvcrd436snvh07g0"; + useDune2 = true; + + minimumOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/mmottl/lacaml/releases/download/${version}/lacaml-${version}.tbz"; + sha256 = "1i47wqnd9iy6ndbi9zfahpb592gahp6im26rgpwch13vgzk3kifd"; }; - buildInputs = [ ocaml findlib dune base stdio ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ lapack blas ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; - inherit (dune) installPhase; - meta = with stdenv.lib; { - homepage = "http://mmottl.github.io/lacaml"; + homepage = "https://mmottl.github.io/lacaml"; description = "OCaml bindings for BLAS and LAPACK"; license = licenses.lgpl21Plus; - platforms = ocaml.meta.platforms or []; - maintainers = [ maintainers.rixed ]; + maintainers = [ maintainers.vbgl ]; }; } From eae298212386bfd73c9c5c5b6fbccc2c64c566f7 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 1 Nov 2020 19:40:42 +0300 Subject: [PATCH 094/228] mame: 0.225 -> 0.226 (#102329) --- pkgs/misc/emulators/mame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index 3033ce8dc7b1..ddf0a129ab82 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -7,7 +7,7 @@ with stdenv; let majorVersion = "0"; - minorVersion = "225"; + minorVersion = "226"; desktopItem = makeDesktopItem { name = "MAME"; @@ -26,7 +26,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "0ln5z8xp81j2af2s94dixnk9n68qpi6b3plynp3pharg6dd55yac"; + sha256 = "0pnsvz4vkjkqb1ac5wzwz31vx0iknyg5ffly90nhl13kcr656jrj"; }; hardeningDisable = [ "fortify" ]; From 70bddcf122d59de984366d7d9ff861c8a078d362 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Oct 2020 23:34:36 +0000 Subject: [PATCH 095/228] python37Packages.css-parser: 1.0.5 -> 1.0.6 --- pkgs/development/python-modules/css-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/css-parser/default.nix b/pkgs/development/python-modules/css-parser/default.nix index 3874300cde94..7791c2b9a237 100644 --- a/pkgs/development/python-modules/css-parser/default.nix +++ b/pkgs/development/python-modules/css-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "css-parser"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { inherit pname version; - sha256 = "665b7965bef0c9b86955be7a3383ca44e519b46affc7c6bca5002cbdbd0bf19f"; + sha256 = "4ed448a8a5622edb1d30d616bbc4bd3d30f11be922343d7a92d7e418e324af2e"; }; # Test suite not included in tarball yet From 5dfc33cb3cd150a790262ead692cd2c65c81155f Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 31 Oct 2020 23:02:46 +0100 Subject: [PATCH 096/228] google-app-engine-go-sdk: refactor to use python3 --- .../tools/google-app-engine-go-sdk/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix index 001edf5c038e..485b2c3625fb 100644 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, python27, python27Packages, makeWrapper }: +{ stdenv, fetchzip, python3Packages, makeWrapper }: -with python27Packages; +with python3Packages; stdenv.mkDerivation rec { pname = "google-app-engine-go-sdk"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0s8sqyc72lnc7dxd4cl559gyfx83x71jjpsld3i3nbp3mwwamczp"; }; - buildInputs = [python27 makeWrapper]; + buildInputs = [ python makeWrapper ]; installPhase = '' mkdir -p $out/bin $out/share/ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # create wrappers with correct env for i in goapp go-app-stager *.py; do makeWrapper "$out/share/go_appengine/$i" "$out/bin/$i" \ - --prefix PATH : "${python27}/bin" \ + --prefix PATH : "${python}/bin" \ --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl})" done ''; From 718d8bf9761ba56e9d4a3187e47f40f9fa7f42a5 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 31 Oct 2020 23:03:55 +0100 Subject: [PATCH 097/228] google-cloud-sdk: refactor to use python3 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4226f35c7fa6..05b06564456d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4231,7 +4231,9 @@ in google-authenticator = callPackage ../os-specific/linux/google-authenticator { }; - google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; + google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { + python = python3; + }; google-cloud-sdk-gce = google-cloud-sdk.override { with-gce = true; }; google-fonts = callPackage ../data/fonts/google-fonts { }; From 4fe0ea478a0ce98ebd919ffa62506c6151ac7a98 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 31 Oct 2020 23:04:28 +0100 Subject: [PATCH 098/228] google-compute-engine: refactor to use python3 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05b06564456d..8ec8bcecef2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4240,7 +4240,7 @@ in google-clasp = callPackage ../development/misc/google-clasp { }; - google-compute-engine = python2.pkgs.google-compute-engine; + google-compute-engine = with python3.pkgs; toPythonApplication google-compute-engine; google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { }; From 295948f40fea63cc7de2f37693dbda16d49ddeb1 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 1 Nov 2020 18:50:37 +0100 Subject: [PATCH 099/228] neovim: dont wrap when is null restore previous behavior --- pkgs/applications/editors/neovim/utils.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 15d3f214057f..d3af8ca5d59a 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -148,8 +148,9 @@ let in wrapNeovimUnstable neovim (res // { wrapperArgs = lib.escapeShellArgs ( - res.wrapperArgs ++ [ "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}" ]) - + " " + extraMakeWrapperArgs + res.wrapperArgs ++ lib.optionals (configure != {}) [ + "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}" + ]) + " " + extraMakeWrapperArgs ; }); in From d7a1f5e2016ebff780dc3ab86922b90d11160bac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Nov 2020 18:08:41 +0100 Subject: [PATCH 100/228] youtube-dl: 2020-09-20 -> 2020.11.01.1 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index e3b64939a0a4..7de5f2369bc0 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.09.20"; + version = "2020.11.01.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1pkw3hnkddk1kqv0in152q1k4jjgbmf2xvc9j3r5nd38z6f7j6mc"; + sha256 = "06lhba4b9bm6f5yqrb5xvdr0l5shwd95djf9nlpg86prr5xihqks"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From e98e29ed3a00f1e4e9bba4f6b2be184a262949bd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 1 Nov 2020 08:57:57 -0800 Subject: [PATCH 101/228] glslviewer: 2019-04-22 -> 1.6.8, use python3 --- pkgs/development/tools/glslviewer/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index b9e46ca41e17..84b3d2a6b1ee 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -1,28 +1,28 @@ { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi -, libX11, libGLU, python2Packages, ensureNewerSourcesForZipFilesHook +, libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook , Cocoa }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "glslviewer"; - version = "2019-04-22"; + version = "1.6.8"; src = fetchFromGitHub { owner = "patriciogonzalezvivo"; repo = "glslViewer"; - rev = "fa3e2ed4810927d189e480b704366cca22f281f3"; - sha256 = "1888jxi84f2nnc0kpzqrn2cada1z4zqyq8ss4ppb5y3wy7d87qjn"; + rev = version; + sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7"; }; - nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook ]; + nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook python3Packages.six ]; buildInputs = [ glfw libGLU glfw libXrandr libXdamage libXext libXrender libXinerama libXcursor libXxf86vm libXi libX11 - ] ++ (with python2Packages; [ python setuptools wrapPython ]) + ] ++ (with python3Packages; [ python setuptools wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin Cocoa; - pythonPath = with python2Packages; [ requests ]; + pythonPath = with python3Packages; [ pyyaml requests ]; # Makefile has /usr/local/bin hard-coded for 'make install' preConfigure = '' @@ -31,6 +31,7 @@ stdenv.mkDerivation { --replace '/usr/bin/clang++' 'clang++' substituteInPlace Makefile \ --replace 'python setup.py install' "python setup.py install --prefix=$out" + 2to3 -w bin/* ''; preInstall = '' From 36758a34a8d754b20d931e48e070aae5b4a7a786 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 31 Oct 2020 17:49:31 +0100 Subject: [PATCH 102/228] uutils-coreutils: Use Python3 sphinx for docs --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ec8bcecef2d..9ee31bbe6bd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3516,7 +3516,7 @@ in uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { - inherit (pythonPackages) sphinx; + inherit (python3Packages) sphinx; inherit (darwin.apple_sdk.frameworks) Security; }; From ec4c848751339ba0d0694bdd1bd356d665f6c09d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 31 Oct 2020 18:02:42 +0100 Subject: [PATCH 103/228] ndn-cxx: 0.6.3 -> 0.7.1 --- .../development/libraries/ndn-cxx/default.nix | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index d461535ecef0..893f82a6d526 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -1,24 +1,36 @@ -{ stdenv, fetchFromGitHub, openssl, doxygen -, boost, sqlite, pkgconfig, python, pythonPackages, wafHook }: -let - version = "0.6.3"; -in -stdenv.mkDerivation { +{ stdenv +, fetchFromGitHub +, doxygen +, pkg-config +, python3 +, python3Packages +, wafHook +, boost +, openssl +, sqlite +}: + +stdenv.mkDerivation rec { pname = "ndn-cxx"; - inherit version; + version = "0.7.1"; + src = fetchFromGitHub { owner = "named-data"; repo = "ndn-cxx"; - rev = "a3bf4319ed483a4a6fe2c96b79ec4491d7217f00"; - sha256 = "076jhrjigisqz5n8dgxwd5fhimg69zhm834m7w9yvf9afgzrr50h"; + rev = "${pname}-${version}"; + sha256 = "1lcaqc79n3d9sip7knddblba17sz18b0w7nlxmj3fz3lb3z9qd51"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; - buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx]; + + nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; + + buildInputs = [ boost openssl sqlite ]; + wafConfigureFlags = [ "--with-openssl=${openssl.dev}" "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" ]; + meta = with stdenv.lib; { homepage = "http://named-data.net/"; description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; @@ -36,7 +48,7 @@ stdenv.mkDerivation { and consuming less resources overall. ''; license = licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ maintainers.sjmackenzie ]; + platforms = platforms.unix; + maintainers = with maintainers; [ sjmackenzie ]; }; } From 9122b454f629558cdc97602a906bce3c97fc3ba3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 1 Nov 2020 10:31:36 -0800 Subject: [PATCH 104/228] csv_fast_export: use python3 --- .../version-management/cvs-fast-export/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 0592f6e545d8..cbd630094f0e 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, makeWrapper, flex, bison, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt, - python27, rcs, cvs, git, + python3, rcs, cvs, git, coreutils, rsync}: with stdenv; with lib; mkDerivation rec { @@ -22,7 +22,7 @@ mkDerivation rec { buildInputs = [ flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt - python27 rcs cvs git makeWrapper + python3 rcs cvs git makeWrapper ]; postPatch = "patchShebangs ."; From 78d51ab4786871ce2072528cc11594ee3a49c23f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 1 Nov 2020 20:57:40 +0200 Subject: [PATCH 105/228] tectonic: 0.2.0 -> 0.3.0 --- pkgs/tools/typesetting/tectonic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index c46f5560fc77..e1af4ba81d77 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; - sha256 = "+kHp5qy0lzT5sLoxC1tlW6oaKZ11vQF+30zW0wXlQBU="; + sha256 = "yJzfymA4elyyeVR8FzTJe8wgs+vm3RWwcOh7IlmBYPE="; }; - cargoSha256 = "bsuNHqr/8OTG3LXd+PYPKsXEBpbcwxP4A7SEqLYNKU0="; + cargoSha256 = "7zqr54H6GemiM/xuHOH6+s669IG2orj1neoqAH+wnV4="; nativeBuildInputs = [ pkgconfig ]; From 07cb3351254e660479f0146e36fa4d34bda0c0d9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 1 Nov 2020 20:56:15 +0200 Subject: [PATCH 106/228] musescore: 3.5.0 -> 3.5.2 Use fetchFromGitHub as it seems the only way to get the source now. Also use libsForQt5 as it works. --- pkgs/applications/audio/musescore/default.nix | 13 +++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 71c639ca4068..c9a1f44ec639 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib, fetchzip, cmake, pkgconfig +{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects , qtquickcontrols2, qtscript, qtsvg, qttools @@ -7,12 +7,13 @@ mkDerivation rec { pname = "musescore"; - version = "3.5.0"; + version = "3.5.2"; - src = fetchzip { - url = "https://github.com/musescore/MuseScore/releases/download/v3.5/MuseScore-${version}.zip"; - sha256 = "0m598xh0s4f5m4l2ymy7g44bbvc14bcfi4gifhjnrg091rsk57c9"; - stripRoot = false; + src = fetchFromGitHub { + owner = "musescore"; + repo = "MuseScore"; + rev = "v${version}"; + sha256 = "VA0+npLUUXQJHalD01pmFTTum2Re7FiiyAwU1XvR93s="; }; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ec8bcecef2d..6730af2124ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22374,7 +22374,7 @@ in if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } else - libsForQt514.callPackage ../applications/audio/musescore { }; + libsForQt5.callPackage ../applications/audio/musescore { }; mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; From e8b6c6780c4f1afcb3d9e5c776f23c4b10801cd2 Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Sun, 1 Nov 2020 20:20:18 +0100 Subject: [PATCH 107/228] nix-prefetch-github: v3.0 -> v4.0 --- .../python-modules/nix-prefetch-github/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 67873f929ad4..d4307c659804 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "3.0"; + version = "4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EN+EbVXUaf+id5UsK4EBm/9k9FYaH79g08kblvW60XA="; + sha256 = "sha256-STUyMUCWAHfDA6dkpiOqSRBL3/tubedUbWa94Kp/764="; }; propagatedBuildInputs = [ From 955926a6207b42b08afd8b2dd3a40e3583fc1f34 Mon Sep 17 00:00:00 2001 From: Masanori Ogino <167209+omasanori@users.noreply.github.com> Date: Wed, 28 Oct 2020 18:41:42 +0900 Subject: [PATCH 108/228] mrsh: 2020-01-08 -> 2020-07-27 etc. - `doCheck` is enabled now. - It marked as broken on Darwin due to [build failures][macos-issue]. [macos-issue]: https://github.com/NixOS/nixpkgs/pull/101910#issuecomment-719923175 Reference: https://github.com/emersion/mrsh/compare/ef21854fc9..0da902c0ee Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com> --- pkgs/shells/mrsh/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix index bbd56e510b7d..cc7e3e27be6d 100644 --- a/pkgs/shells/mrsh/default.nix +++ b/pkgs/shells/mrsh/default.nix @@ -2,23 +2,26 @@ stdenv.mkDerivation rec { pname = "mrsh"; - version = "2020-01-08"; + version = "2020-07-27"; src = fetchFromGitHub { owner = "emersion"; repo = "mrsh"; - rev = "ef21854fc9ce172fb1f7f580b19a89d030d67c65"; - sha256 = "1iyxmwl61p2x9v9b22416n4lnrlwjqyxybq35x8bcbjxkwypp943"; + rev = "0da902c0ee6f443fe703498e60f266af7f12537e"; + sha256 = "1yr09ln5p1s48aj8xv2d6dy0pahqvd86fkiwyc6zrjfq80igxf05"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ readline ]; + doCheck = true; + meta = with stdenv.lib; { description = "A minimal POSIX shell"; homepage = "https://mrsh.sh"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } From 0d8f43c402360cbe6ea105d3e0c98d589fd396cf Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 31 Oct 2020 18:07:42 +0100 Subject: [PATCH 109/228] python3Packages.ovito: 3.0.0 -> 3.3.1 --- .../python-modules/ovito/default.nix | 39 ++++++++++++------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix index c5dddd68fcf1..24af3a51255d 100644 --- a/pkgs/development/python-modules/ovito/default.nix +++ b/pkgs/development/python-modules/ovito/default.nix @@ -1,23 +1,33 @@ -{ stdenv, fetchgit +{ stdenv +, fetchFromGitLab , cmake -, libav, netcdf, qscintilla, zlib, boost, git, fftw, hdf5, libssh -, pythonPackages +, ffmpeg +, netcdf +, qscintilla +, zlib +, boost +, git +, fftw +, hdf5 +, libssh +, qt5 +, python }: -stdenv.mkDerivation { - # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40 - # This is not the "released" 3.0.0 just a commit - version = "3.0.0"; +stdenv.mkDerivation rec { + version = "3.3.1"; pname = "ovito"; - src = fetchgit { - url = "https://gitlab.com/stuko/ovito"; - rev = "a28c28182a879d2a1b511ec56f9845306dd8a4db"; - sha256 = "1vqzv3gzwf8r0g05a7fj8hdyvnzq2h3wdfck7j6n1av6rvp7hi5r"; + src = fetchFromGitLab { + owner = "stuko"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "0rm1qxa0fanaaqg0idr6rf2s2xlbyn1dzjzwh3rddy9mgl60lj2h"; }; - buildInputs = [ cmake libav netcdf qscintilla zlib boost zlib git fftw hdf5 libssh ]; - propagatedBuildInputs = with pythonPackages; [ sphinx numpy sip pyqt5 matplotlib ase ]; + buildInputs = [ cmake ffmpeg netcdf qscintilla zlib boost zlib git fftw hdf5 libssh qt5.qtbase qt5.qtsvg ]; + + propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ]; enableParallelBuilding = true; @@ -25,10 +35,9 @@ stdenv.mkDerivation { description = "Scientific visualization and analysis software for atomistic simulation data"; homepage = "https://www.ovito.org"; license = licenses.gpl3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; # ensures not built on hydra # https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048 hydraPlatforms = [ ]; - broken = true; # cmake unable to find Qt5Core and other dependencies }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47c9f2f60c1a..d209c34bdd8f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4272,7 +4272,7 @@ in { ovh = callPackage ../development/python-modules/ovh { }; - ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); + ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { inherit python; }); owslib = callPackage ../development/python-modules/owslib { }; From 488251496048a0a70beb046f70dafc728aeffba3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 1 Nov 2020 22:30:44 +0200 Subject: [PATCH 110/228] tectonic: Install desktop file. --- pkgs/tools/typesetting/tectonic/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index e1af4ba81d77..965624a50987 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -19,6 +19,11 @@ rustPlatform.buildRustPackage rec { buildInputs = [ fontconfig harfbuzz openssl ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); + postInstall = stdenv.lib.optionalString stdenv.isLinux '' + install -D dist/appimage/tectonic.desktop -t $out/share/applications/ + install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/ + ''; + doCheck = true; meta = with stdenv.lib; { From e87f9b1ee6380be5890dcaaecd76ff9d1a45cad8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 05:13:47 +0000 Subject: [PATCH 111/228] ansible-lint: 4.3.5 -> 4.3.6 --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index bef31d1c1e58..2c324bc42710 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "4.3.5"; + version = "4.3.6"; # pip is not able to import version info on raumel.yaml disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0mjn0drw3cx4pfl9qll5j7wib5r8msihs5yl8ri9fkfcbz7k1hmy"; + sha256 = "1fn7mdykm4id78k4faibi92q9yxbjbyxb90ww0by03c31m8z5348"; }; format = "pyproject"; From 214d9cd72b53a6ae2c2c17409da00c2eff331c3b Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Sun, 1 Nov 2020 20:21:30 +0000 Subject: [PATCH 112/228] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 54 ++++++++++++++--------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e3680918fd15..f4fd509b752b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -389,12 +389,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-10-30"; + version = "2020-11-01"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "a8a3cf41638e5b7b128086888e2dead665407beb"; - sha256 = "19a3blvfzqjzd5y3l4g03h3c8yxfl9fsdvc6mir0n76krpnk647l"; + rev = "eb10e21721ee527d86cbc4422d4cdc5d53ea65fd"; + sha256 = "10qgca7hncxmlmbcd0d9rmkdjd22qp88llz0dlsgm6ckng46nbpn"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -461,12 +461,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-10-28"; + version = "2020-11-01"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "ad1793dce0a59afcf8b324b45a1168c032deb162"; - sha256 = "1khmmvba6cg0pff37nkbm7zmp3mnvpc889pql6dm6xjqrhpqsda7"; + rev = "2adc879786ca65c3fdc3dd94743acbbed3f54465"; + sha256 = "1j4kjxflm0ldaa0pgjm081x95hqxhhanv45mwwnmcg2lkpd6lnq5"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -570,12 +570,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2020-10-17"; + version = "2020-11-01"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "0e63269e176232cdd9f1c20d94dfd3b8ad5702a1"; - sha256 = "0ixryjfszx09g27awdaqf5xrc7yjb5mlpc57ph3w61hdv65yps7b"; + rev = "a4c31e1c0136e943fa7dd48ecc11849158d3554e"; + sha256 = "0xvz1s3lx75k9fgn319b0q6d8vj7cpw6mj2xkh73qmaqvvx3bni1"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1836,12 +1836,12 @@ let lean-vim = buildVimPluginFrom2Nix { pname = "lean-vim"; - version = "2020-10-10"; + version = "2020-11-01"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean.vim"; - rev = "c3a99f34a92af8a86e162134276222309e01e896"; - sha256 = "09kz4iy0flwdawhd0phy6jl6zkxp3qdyhl8snl0n12sbskzq7i1b"; + rev = "d1b3037680be79f114a87620844117e20ca7efcf"; + sha256 = "0x3cz4is30jsrp7dym4rz4xngv9mimybl4kqnry9x0nkqzn55910"; }; meta.homepage = "https://github.com/leanprover/lean.vim/"; }; @@ -2580,12 +2580,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-10-30"; + version = "2020-10-31"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "dd7900fc44b9cc6773bd4f8b5c0175887991520c"; - sha256 = "0nfdvmlzqfga596n5awdhz9mc6gwnys73ixxkqi49f2g9x215ksd"; + rev = "9327b113c2360d503ab183718c57e3e1b0819887"; + sha256 = "1xgw0464563rc6wnjhf9m2f25wii80d78laa8ifjbjivrv4b0y1k"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3385,12 +3385,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2020-10-30"; + version = "2020-11-01"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "telescope.nvim"; - rev = "37c4f1b355d843e95ba41f2a73d83de58fb74dae"; - sha256 = "0ly9vcnmf1b881fh1r5v4231h5n8kld2k9q1bxzvy87p2wsfb5sn"; + rev = "54ef9d90d5a032906bfb007113930dac0f665f72"; + sha256 = "0zh6dpxfibm0clafs2zsnb4ffmh3438qiccc60md2s7hwhzynvyq"; }; meta.homepage = "https://github.com/nvim-lua/telescope.nvim/"; }; @@ -4814,12 +4814,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-10-19"; + version = "2020-11-01"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "a5e2535d31aa1d7c0fa8a4e77ee96b92ad185be5"; - sha256 = "0ixpy4vvvh7kgwq4wvyiw8cm3aj89mql2phf49rmi60d9kli3kn9"; + rev = "35ea9acf5fc409d1eed341333789f18c2d135c66"; + sha256 = "0n6yj1ql2c2kq9y407zr9d6pkpwp7jjzssbd0fyl68cb9rxzg3j8"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6015,12 +6015,12 @@ let vim-prosession = buildVimPluginFrom2Nix { pname = "vim-prosession"; - version = "2020-10-12"; + version = "2020-11-01"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "e735468710a5cd6037b6d4c0e4c8c2bc1353cf4b"; - sha256 = "0ava297hpm1cf8j18ypfrziwavqcv982hisvh1d8yjxal521pam1"; + rev = "1be0c069a2b362369913ffaeed5293ffe1932ef6"; + sha256 = "0hqfwlkz64kkh8w6w5k7gw2i0x7spddbgixjcrp1lr6n6bslkj2d"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -7385,12 +7385,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-10-30"; + version = "2020-11-01"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "2c1dce274988814102aafc57c4e0675c2d130e6c"; - sha256 = "10kzqzm587nz1qgscgwrvjs77vk6grck28g5z1lhrxhpn1jng943"; + rev = "fc97ad973a2bbf932dffb74c5560e97f60d21ce7"; + sha256 = "07gx88vapcb579nvmkbmps16spvd1y8kvmi28955lw31rxi1n7b3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; From 6330a9a998ea822ea72e0ba208f86a38db5f543a Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Sun, 1 Nov 2020 20:22:08 +0000 Subject: [PATCH 113/228] vimPlugins.vim-LanguageTool: init at 2020-10-29 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index f4fd509b752b..80f27fd87ae1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5281,6 +5281,18 @@ let meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; + vim-LanguageTool = buildVimPluginFrom2Nix { + pname = "vim-LanguageTool"; + version = "2020-10-29"; + src = fetchFromGitHub { + owner = "dpelle"; + repo = "vim-LanguageTool"; + rev = "d1f94ef917dddfd8c82589957b7aa6a55f382964"; + sha256 = "1y2y3rkhnj6xhzkm0snfkb08h6jmyjiicmk4j8lw2vhszsfgz6ns"; + }; + meta.homepage = "https://github.com/dpelle/vim-LanguageTool/"; + }; + vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; version = "2020-01-20"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index de4cd959dee4..8af0e8cb1b8c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -83,6 +83,7 @@ digitaltoad/vim-pug direnv/direnv.vim dleonard0/pony-vim-syntax dmix/elvish.vim +dpelle/vim-LanguageTool dracula/vim as dracula-vim drewtempelmeyer/palenight.vim drmingdrmer/xptemplate From 7698197323bca022727730b1e25c141237db6901 Mon Sep 17 00:00:00 2001 From: Caleb Land Date: Sun, 1 Nov 2020 16:55:14 -0500 Subject: [PATCH 114/228] xmlsec: fix build on macOS (#101319) * xmlsec: fix build on macOS xmlsec detects the Darwin platform and uses the -D flag with base64, but nix uses GNU base64 which requires -d. This patch removes the platform test and always uses the -d flag. --- pkgs/development/libraries/xmlsec/default.nix | 2 +- .../xmlsec/remove_bsd_base64_decode_flag.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 0d6fd9611c4e..6b3468e5d57c 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { patches = [ ./lt_dladdsearchdir.patch - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ]; postPatch = '' substituteAllInPlace src/dl.c ''; diff --git a/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch b/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch new file mode 100644 index 000000000000..700fad7e3dd4 --- /dev/null +++ b/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch @@ -0,0 +1,12 @@ +--- a/tests/testEnc.sh 2020-04-20 14:30:32.000000000 -0400 ++++ b/tests/testEnc.sh 2020-10-21 22:09:25.000000000 -0400 +@@ -405,9 +405,6 @@ + else + # generate binary file out of base64 + DECODE="-d" +- if [ "`uname`" = "Darwin" ]; then +- DECODE="-D" +- fi + cat "$topfolder/$base_test_name.data" | base64 $DECODE > $tmpfile.3 + execEncTest "$res_success" \ + "" \ From 13ba2bc228491e07f62dcba0d867a365ea7f809e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Nov 2020 22:58:43 +0100 Subject: [PATCH 115/228] homeassistant: 0.117.1 -> 0.117.2 --- 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 cc3736ac7de6..140d6841681d 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 = "0.117.1"; + version = "0.117.2"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 31b48060b4f6..9302a38f79e6 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.117.1"; + hassVersion = "0.117.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1ifkxgsdm6bvrf573z75ry7vvrb3zi67x5j2nlsb44igfmk0nj1v"; + sha256 = "1mpvskr0zjvl065ldw05kc0x5yvibwfm2nmv478wznw3vwmbqrzn"; }; postPatch = '' From 016bfce7d266ac9c8e44c776c86e8394474281a8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 1 Nov 2020 17:53:43 +0100 Subject: [PATCH 116/228] kdenlive: avoid double wrapping --- pkgs/applications/kde/kdenlive.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 795ba87ad5b5..8be6ef88e64a 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -84,12 +84,20 @@ mkDerivation { sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|' substituteAllInPlace src/kdenlivesettings.kcfg ''; + + dontWrapGApps = true; + # Frei0r path needs to be set too or Kdenlive will complain. See: # https://github.com/NixOS/nixpkgs/issues/83885 # https://github.com/NixOS/nixpkgs/issues/29614#issuecomment-488849325 qtWrapperArgs = [ "--set FREI0R_PATH ${frei0r}/lib/frei0r-1" ]; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = { license = with lib.licenses; [ gpl2Plus ]; }; From 2ff2ef1a52acb7264f014e6f77bfe2c4776a78e4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 1 Nov 2020 17:54:20 +0100 Subject: [PATCH 117/228] kdenlive: depend on qtmultimedia instead of unsupported qtwebkit --- pkgs/applications/kde/kdenlive.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 8be6ef88e64a..b2abee579396 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -25,9 +25,9 @@ , frei0r , phonon-backend-gstreamer , qtdeclarative +, qtmultimedia , qtquickcontrols2 , qtscript -, qtwebkit , rttr , kpurpose , kdeclarative @@ -60,9 +60,9 @@ mkDerivation { mlt phonon-backend-gstreamer qtdeclarative + qtmultimedia qtquickcontrols2 qtscript - qtwebkit shared-mime-info libv4l ffmpeg-full From c3d017eee3976e283874fbe614054dc8d78fabb6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 1 Nov 2020 17:55:34 +0100 Subject: [PATCH 118/228] libsForQt515.mlt: is not broken --- pkgs/development/libraries/mlt/qt-5.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 3dcbda68135f..f1ed04aa9bca 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -69,6 +69,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; - broken = versionAtLeast qtbase.version "5.15"; }; } From 94364575423c7be57ef63d0e477797433679c56b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 1 Nov 2020 15:22:55 +0100 Subject: [PATCH 119/228] digikam: fix double wrapping --- pkgs/applications/graphics/digikam/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 52de023e1681..0654a2ed1a8d 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -118,9 +118,12 @@ mkDerivation rec { "-DENABLE_QWEBENGINE=on" ]; + dontWrapGApps = true; + preFixup = '' - gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]}) - gappsWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname}) + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]}) + qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname}) substituteInPlace $out/bin/digitaglinktree \ --replace "/usr/bin/perl" "${perl}/bin/perl" \ --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" From e7b7e617f0c899c18f7b5ebd6849fd71ec25d88f Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 31 Oct 2020 20:50:33 +0100 Subject: [PATCH 120/228] wal_e: 0.6.10 -> 1.1.1 Also refactor to use python3 And add support for google-cloud-storage --- pkgs/tools/backup/wal-e/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index af1506bff6e9..a6d5b6b48010 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchurl, pythonPackages, lzop, postgresql, pv }: +{ stdenv, fetchurl, python3Packages, lzop, postgresql, pv }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "wal-e"; - version = "0.6.10"; + version = "1.1.1"; namePrefix = ""; src = fetchurl { url = "https://github.com/wal-e/wal-e/archive/v${version}.tar.gz"; - sha256 = "1hms24xz7wx3b91vv56fhcc3j0cszwqwnmwhka4yl90202hvdir2"; + sha256 = "5TTd7NTO73+MCJf3dHIcNojjHdoaKJ1T051iW7Kt9Ow="; }; # needs tox doCheck = false; - propagatedBuildInputs = [ - pythonPackages.boto - pythonPackages.gevent + propagatedBuildInputs = (with python3Packages; [ + boto + gevent + google_cloud_storage + ]) ++ [ postgresql lzop pv From 8bb3603932122bbf09c6139d3e3a236e4c6f76fb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Oct 2020 01:16:36 +0000 Subject: [PATCH 121/228] clipgrab: 3.8.14 -> 3.8.15 --- pkgs/applications/video/clipgrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index f8b74a175474..d53c189986d7 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ mkDerivation rec { pname = "clipgrab"; - version = "3.8.14"; + version = "3.8.15"; src = fetchurl { - sha256 = "19337qjxwlkpdnnh6q0y4b8askk17a8zb88gifznllrk06a6pgyf"; + sha256 = "1anp8hhwbkirsvc7mn11k272f0d85vzb5ppiw3gg9ss2hdai563n"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; From ee3acf3aa458463e2d8faf8367f49f711fd00ad4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 23:38:12 +0000 Subject: [PATCH 122/228] calligra: 3.2.0 -> 3.2.1 --- pkgs/applications/office/calligra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 40c4b77f1b6b..a8ca37df36ad 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -15,11 +15,11 @@ mkDerivation rec { pname = "calligra"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-flViKGZdeeZ8Bi/RFz1mdvCw187v3W4bC8+aeB6nCVE="; + sha256 = "0iqi6z6gkck2afgy200dacgcspq7i7887alcj0pklm08hbmsdy5i"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; From 50b663773f4bd23dc87720720ce13aac31f23422 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 18:44:45 +0000 Subject: [PATCH 123/228] gensio: 2.1.4 -> 2.1.7 --- pkgs/development/libraries/gensio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index daca5fc0bdb1..e1da5a44ff08 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.1.4"; + version = "2.1.7"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0c44qhhrknjl7sp94q34z7nv7bvnlqs8wzm385661liy4mnfn4dc"; + sha256 = "07m8rbdk05biarc9xskwcx9lghj0dff1msxasfc6hi3jywc3xaih"; }; configureFlags = [ From b3bd7bfe28fb44ec377a3b90f0de28a554ae5c1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 20:32:11 +0000 Subject: [PATCH 124/228] flexibee: 2020.2.3.1 -> 2020.2.6 --- pkgs/applications/office/flexibee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/applications/office/flexibee/default.nix index f33eb98a48b4..52e58c5c9ccb 100644 --- a/pkgs/applications/office/flexibee/default.nix +++ b/pkgs/applications/office/flexibee/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: let - version = "2020.2.3.1"; + version = "2020.2.6"; majorVersion = builtins.substring 0 6 version; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz"; - sha256 = "05wzg7f6mzz7r6azzb8k2g5fakkqh6762y4q9qkmrzbixvxh4lz9"; + sha256 = "0vscz24sabk9xafywnx41rqhq6300ddsw1x95ibc7ghsgbkq80ja"; }; nativeBuildInputs = [ makeWrapper ]; From 468d0130436afa8482da0e22dcec20a60d993e3a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 19:45:09 +0000 Subject: [PATCH 125/228] fetchmail: 6.4.12 -> 6.4.13 --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index fab83b75e7c9..83d4103bc0c1 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.12"; + version = "6.4.13"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "11s83af63gs9nnrjb66yq58xriyvi8hzj4ykxp3kws5z3nby111b"; + sha256 = "1qablzgwx3a516vdhckx3pv716x9r7nyfyr6fbncif861c3cya3x"; }; buildInputs = [ openssl ]; From a27100c77bdb7cebe6a6745fc8ce36418f96cda5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 18:56:08 +0000 Subject: [PATCH 126/228] fwts: 20.08.00 -> 20.09.00 --- pkgs/os-specific/linux/fwts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 5de0eea0beac..58d4bdbae855 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "20.08.00"; + version = "20.09.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "098vxj5sd2nm88jmj6cxzcvid8w81m8fxdz881iki0pi7ysixa5q"; + sha256 = "1vzzlb7xdrk8rhi27jdw9baskild4dmk7g5d0hhfh6z3fx4lfhgk"; stripRoot = false; }; From 9d5b01eb5700c45f72c93b56e7d76a1ed2507f46 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 1 Nov 2020 14:45:03 -0800 Subject: [PATCH 127/228] python3Packages.google_cloud_pubsub: disable tests tests fail due to file handle issues, then just loops in an invalid state until timing out on hydra https://hydra.nixos.org/build/129081889 --- .../python-modules/google_cloud_pubsub/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix index b1e4eae52ad2..56a956928469 100644 --- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/pkgs/development/python-modules/google_cloud_pubsub/default.nix @@ -20,10 +20,14 @@ buildPythonPackage rec { checkInputs = [ pytest mock ]; propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + # tests don't clean up file descriptors correctly + doCheck = false; checkPhase = '' pytest tests/unit ''; + pythonImportsCheck = [ "google.cloud.pubsub" ]; + meta = with stdenv.lib; { description = "Google Cloud Pub/Sub API client library"; homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; From 816ba1ec7f0fce64097668e467880ef5b0c99557 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 22:15:52 +0000 Subject: [PATCH 128/228] flmsg: 4.0.14 -> 4.0.17 --- pkgs/applications/radio/flmsg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index e437dffa4856..fa3f175fcc56 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.14"; + version = "4.0.17"; pname = "flmsg"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "0s1prawkpvr7xr7h8w7r0ly90ya3n8h6qsii0x6laqrkgjn9w9iy"; + sha256 = "09xf3f65d3qi69frznf4fdznbfbc7kmgxw716q2c7ccsmh9c5q44"; }; buildInputs = [ From 6404b2571436f18b89d2b3601614de59fda46e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 2 Nov 2020 01:35:47 +0100 Subject: [PATCH 129/228] dnsdist: Replace myself with SuperSandro2000 --- pkgs/servers/dns/dnsdist/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index b15b0bcd19fa..61fa164010e7 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "DNS Loadbalancer"; homepage = "https://dnsdist.org"; license = licenses.gpl2; - maintainers = with maintainers; [ das_j ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From ae55d235b1128ead1e0e28649d5edaa1badd3930 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 14:34:04 +0000 Subject: [PATCH 130/228] dgraph: 20.07.1 -> 20.07.2 --- pkgs/servers/dgraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index e23a1865209a..02c19e22e748 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dgraph"; - version = "20.07.1"; + version = "20.07.2"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "0vkkzckk6095vkyl5yqhxqbjmvw7jzars8ymgv2zi55n26qzzvf0"; + sha256 = "0cx2qqn8b7v0qvhrwzjqghymm8r2a0v86pyfgqxmmyfghjhykax4"; }; - vendorSha256 = "17bfavirx0lpy6ca86y2gm6kf8m388xbpda65dd2w71csbzbc2mi"; + vendorSha256 = "111lixpqp8p2q4kg9342220i00dcp2lwp2j3hasdvwdrrf0971by"; doCheck = false; From eed13da0ae5dece46e973e42bbd26322b5e26a3a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 18:11:26 +0000 Subject: [PATCH 131/228] drumkv1: 0.9.16 -> 0.9.18 --- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 7a6acb25e802..82a47b8173a2 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "drumkv1"; - version = "0.9.16"; + version = "0.9.18"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "1r55575w9r0ifysw9mgxjvv0fszvx8ykjgim3zczf3mb5s9ngavv"; + sha256 = "1bzkaz7sqx1pvirja8zm7i2ckzl5ad6xspr4840389ik3l8qpnr5"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; From 417457fd35a5ff9e0b042b425f2b3340f5003a36 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 19:38:25 +0000 Subject: [PATCH 132/228] frostwire-bin: 6.8.5 -> 6.8.7 --- pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index d38e9dc73365..b9ee526bbe50 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.8.5"; + version = "6.8.7"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "1zdas93w1yqg9yx8wlk7pxpdmwvg4ykg54ai7iyq9ir1zha8fyif"; + sha256 = "1m9v4abm8jbyz46hin63vi6irs32n1xzg85bdyb48vpdxh6iwv04"; }; nativeBuildInputs = [ makeWrapper ]; From 4205938c6e09a8fc18059568a565de909d52c935 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 22:40:07 +0000 Subject: [PATCH 133/228] tridactyl-native: 1.20.1 -> 1.20.2 --- pkgs/tools/networking/tridactyl-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index f0d2cd9a0df6..c0a132b481e1 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "108zx2x5q23cq0fzxmix31xcw62k3r1wlb55612c15ilz9c5xm32"; + sha256 = "0yz1vbqa3sppkjmny5ipnspsdi5gnix7wb6hzvdkm9h1rj2kb8ci"; }; sourceRoot = "source/native"; From 036cec187c1f079566c456d390c97c1deb412b42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 20:07:21 +0000 Subject: [PATCH 134/228] ginac: 1.7.9 -> 1.8.0 --- pkgs/applications/science/math/ginac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 701445f90100..3c129e8033bd 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: stdenv.mkDerivation rec { - name = "ginac-1.7.9"; + name = "ginac-1.8.0"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "08cqc87qq4w6z3l053x5gfqsa4zkgkicq8skxsbsj39nli1zzkb7"; + sha256 = "0l9byzfxq3f9az5pcdldnl95ws8mpirkqky46f973mvxi5541d24"; }; propagatedBuildInputs = [ cln ]; From c6edffbbe8205eb3229c57cd1733bda8bbc51a7b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 00:02:58 +0000 Subject: [PATCH 135/228] gphoto2: 2.5.23 -> 2.5.26 --- pkgs/applications/misc/gphoto2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 1235a41ffc7b..cdfbe3f6dc1f 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.23"; + name = "gphoto2-2.5.26"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "1laqwhxr0xhbykmp0dhd3j4rr2lhj5y228s31afnqxp700hhk1yz"; + sha256 = "0bxbcn31xalsvjp8fra324hf2105y3ps7zlyfz11v71j0lxj2lvn"; }; nativeBuildInputs = [ pkgconfig gettext libtool ]; From 0b0edb46c2426d604bdaa92baea2c1407e436bfb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 14:26:53 +0000 Subject: [PATCH 136/228] exodus: 20.8.28 -> 20.10.23 --- pkgs/applications/blockchains/exodus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 0c0b6a243010..c48cd7bb49c7 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: stdenv.mkDerivation rec { pname = "exodus"; - version = "20.8.28"; + version = "20.10.23"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "fde9165f71f0d641f6892ddce3ec26d200e8095a383f2b4c8f924de4041d65ef"; + sha256 = "083hcxljqg36ilpy6xa4j455ngpc775qgam0dbj26kg7sh33dz2c"; }; sourceRoot = "."; From 7afb8feb40aa65d8c86a1e682eac00746227af19 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 13:34:45 +0000 Subject: [PATCH 137/228] dolt: 0.21.0 -> 0.21.1 --- pkgs/servers/sql/dolt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 0ee6bd26c240..8d4e92551354 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "0w9k48jxklhaql8qbbm9ay0md5nia6x3wr0zz3w44pw3gl5kvxyw"; + sha256 = "03fg91r6lxfq58c5843vysaw8hbagiq4r2qxc4nh9w1b3mc71h7v"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "16xh4s7zmar0r3kwps5bbl168imyx252lvz9s3snvxzz5kd8wlnm"; + vendorSha256 = "19755xbjxxva574mj0sc7kqqmr4k22bbvf4aj3d0hhcfjpyhn434"; doCheck = false; From bb2ce89f3a4bf5aa9a7227617d9da8198a9f85f1 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Mon, 2 Nov 2020 02:31:26 +0100 Subject: [PATCH 138/228] plasma5.kdecoration: unbreak --- pkgs/desktops/plasma-5/kdecoration.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix index 3f2e9be462d8..569da3c70349 100644 --- a/pkgs/desktops/plasma-5/kdecoration.nix +++ b/pkgs/desktops/plasma-5/kdecoration.nix @@ -2,11 +2,7 @@ mkDerivation { name = "kdecoration"; - meta = { - broken = builtins.compareVersions qtbase.version "5.12.0" < 0; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ki18n ]; outputs = [ "out" "dev" ]; - broken = true; } From af68adba47da1fff1bb67071a186fe8e19834a86 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 1 Nov 2020 20:41:32 -0500 Subject: [PATCH 139/228] zeek: 3.2.1 -> 3.2.2 (#102404) https://github.com/zeek/zeek/releases/tag/v3.2.2 --- pkgs/applications/networking/ids/zeek/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index a6189da7ee3e..713156a66214 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -21,11 +21,11 @@ let in stdenv.mkDerivation rec { pname = "zeek"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "0rybs79h0sq12vsayah8dixqac404z84rlvqynvzf3dh2lwcgg0y"; + sha256 = "00cxz7ad7p62s2glcagzcvwbnsivrv4bmz6rl1vij907jb24hmvc"; }; nativeBuildInputs = [ cmake flex bison file ]; From f848ac2010e6883360bb0799973c57ec6ccf2ac0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 01:51:54 +0000 Subject: [PATCH 140/228] f3: 7.2 -> 8.0 --- pkgs/tools/filesystems/f3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index e8d60f835bf0..b9817ecb05c0 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "f3"; - version = "7.2"; + version = "8.0"; src = fetchFromGitHub { owner = "AltraMayor"; repo = pname; rev = "v${version}"; - sha256 = "1iwdg0r4wkgc8rynmw1qcqz62l0ldgc8lrazq33msxnk5a818jgy"; + sha256 = "17l5vspfcgfbkqg7bakp3gql29yb05gzawm8n3im30ilzdr53678"; }; postPatch = '' From 0e17599e8e6c38373c27ea2b2088f3c2604b5e69 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Mon, 2 Nov 2020 02:58:54 +0100 Subject: [PATCH 141/228] liquidwar5: 5.6.4 -> 5.6.5, unbreak --- pkgs/games/liquidwar/5.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index 5c42b8ecaab2..3d8cf3840f8b 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, allegro }: stdenv.mkDerivation rec { - version = "5.6.4"; + version = "5.6.5"; pname = "liquidwar5"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz"; - sha256 = "18wkbfzp07yckg05b5gjy67rw06z9lxp0hzg0zwj7rz8i12jxi9j"; + url = "http://www.ufoot.org/download/liquidwar/v5/${version}/liquidwar-${version}.tar.gz"; + sha256 = "2tCqhN1BbK0FVCHtm0DfOe+ueNPfdZwFg8ZMVPfy/18="; }; buildInputs = [ allegro ]; @@ -20,6 +20,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; license = licenses.gpl2Plus; platforms = platforms.linux; - broken = true; }; } From 209fbcb12193f6c99f3b00b49e44b2c16ba2964e Mon Sep 17 00:00:00 2001 From: freezeboy Date: Mon, 2 Nov 2020 03:10:24 +0100 Subject: [PATCH 142/228] unarj: remove (broken since 2016, insecure since 2015) --- pkgs/tools/archivers/unarj/default.nix | 23 ----------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/tools/archivers/unarj/default.nix diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix deleted file mode 100644 index 61e60996e759..000000000000 --- a/pkgs/tools/archivers/unarj/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "unarj"; - version = "2.65"; - - src = fetchurl { - sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p"; - url = "https://src.fedoraproject.org/repo/pkgs/unarj/${pname}-${version}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${pname}-${version}.tar.gz"; - }; - - preInstall = '' - mkdir -p $out/bin - sed -i -e s,/usr/local/bin,$out/bin, Makefile - ''; - - meta = with stdenv.lib; { - description = "Unarchiver of ARJ files"; - license = licenses.free; - # Vulnerable to CVE-2015-0557 & possibly CVE-2015-0556, CVE-2015-2782: - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a27ffd3e8229..65bd8a70d91d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8120,8 +8120,6 @@ in unar = callPackage ../tools/archivers/unar { stdenv = clangStdenv; }; - unarj = callPackage ../tools/archivers/unarj { }; - unp = callPackage ../tools/archivers/unp { }; unshield = callPackage ../tools/archivers/unshield { }; From 8be87d0f992fb43492345e85864540965faed0ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 17:42:44 +0000 Subject: [PATCH 143/228] enet: 1.3.15 -> 1.3.16 --- pkgs/development/libraries/enet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index e1172870ede7..8a264d73b621 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "enet-1.3.15"; + name = "enet-1.3.16"; src = fetchurl { url = "http://enet.bespin.org/download/${name}.tar.gz"; - sha256 = "1yxxf9bkx6dx3j8j70fj17c05likyfibb1419ls74hp58qrzdgas"; + sha256 = "1lggc82rbzscci057dqqyhkbq4j6mr5k01hbrvn06jkzc2xpxdxv"; }; meta = { From 613adb0e8809c51e02e6361c2e88068b6ec079bb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 1 Nov 2020 14:05:38 -0800 Subject: [PATCH 144/228] kernel/linuxManualConfig: add variant metadata --- pkgs/os-specific/linux/kernel/manual-config.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 7a91705b617c..961bdab12b58 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -34,6 +34,13 @@ in { randstructSeed ? "", # Use defaultMeta // extraMeta extraMeta ? {}, + + # for module compatibility + isXen ? features.xen_dom0 or false, + isZen ? false, + isLibre ? false, + isHardened ? false, + # Whether to utilize the controversial import-from-derivation feature to parse the config allowImportFromDerivation ? false, # ignored @@ -86,6 +93,9 @@ let passthru = { inherit version modDirVersion config kernelPatches configfile moduleBuildDependencies stdenv; + inherit isXen isZen isHardened isLibre; + kernelOlder = stdenv.lib.versionOlder version; + kernelAtLeast = stdenv.lib.versionAtLeast version; }; inherit src; From c6afa8820b528cec7e889e462cbcab84c0313b41 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 1 Nov 2020 14:08:37 -0800 Subject: [PATCH 145/228] anbox: kernel.features can be null --- pkgs/os-specific/linux/anbox/kmod.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix index 6eb74ca25f6b..896beaf3056e 100644 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { homepage = "https://github.com/anbox/anbox-modules"; license = licenses.gpl2; platforms = platforms.linux; - broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity); + broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity or false); maintainers = with maintainers; [ edwtjo ]; }; From 2ada9b38063bf3bd1e90b6e2bab4732f98e86709 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 2 Nov 2020 04:20:00 +0000 Subject: [PATCH 146/228] vault: add passthru.tests --- pkgs/tools/security/vault/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index b8fa53a057e1..b51542a8edde 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, installShellFiles }: +{ stdenv, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }: buildGoPackage rec { pname = "vault"; @@ -24,6 +24,8 @@ buildGoPackage rec { installShellCompletion vault.bash ''; + passthru.tests.vault = nixosTests.vault; + meta = with stdenv.lib; { homepage = "https://www.vaultproject.io/"; description = "A tool for managing secrets"; From 8c43d7e6e721646ef9ea1a7a20d1c2338ce44220 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 2 Nov 2020 04:20:00 +0000 Subject: [PATCH 147/228] vault-bin: add passthru.tests --- pkgs/tools/security/vault/vault-bin.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 6cc6e170302c..4960fe8fb018 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, nixosTests }: let version = "1.5.5"; @@ -44,6 +44,8 @@ in stdenv.mkDerivation { echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault ''; + passthru.tests.vault = nixosTests.vault; + meta = with stdenv.lib; { homepage = "https://www.vaultproject.io"; description = "A tool for managing secrets, this binary includes the UI"; From f33e4b4a0c72acd92b05ba687193a92eb2436ff5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 05:40:00 +0000 Subject: [PATCH 148/228] groonga: 10.0.6 -> 10.0.8 --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index a1fd39152075..2a937e27d2fb 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.6"; + version = "10.0.8"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "1q3xx6jc967nj7h8gvnrqxn8657dn3qy9j802rjzcg6iwlpjack9"; + sha256 = "0ppjxgq7bwhzzlrl2jn7ybc132c8rg95yhwshxqgccbhbs8s6c29"; }; buildInputs = with stdenv.lib; From 73e3b14503c7bc438f754b754619582aa41070e4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 05:48:03 +0000 Subject: [PATCH 149/228] gitAndTools.git-filter-repo: 2.28.0 -> 2.29.0 --- .../git-and-tools/git-filter-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix index 5a7e5bd32afb..c642f062c7b6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-filter-repo"; - version = "2.28.0"; + version = "2.29.0"; src = fetchurl { url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0sa6h6k1mnhx8p8w5d88gx7cqbnxaazfj1dv47c107fk70hqvvpx"; + sha256 = "00nn7k9jqrybb762486fmigsnbcn9lbvimgpfvvarz4ikdp9y9pb"; }; buildInputs = [ pythonPackages.python ]; From a5c0ebbd19435104405a961b19f8d851eb487002 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 06:17:40 +0000 Subject: [PATCH 150/228] python27Packages.hg-evolve: 10.0.2 -> 10.1.0 --- pkgs/development/python-modules/hg-evolve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 14cace859e92..434c6ffba2b9 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.0.2"; + version = "10.1.0"; src = fetchPypi { inherit pname version; - sha256 = "75892623258339613528df45dcd1004786bf73e8d95407886d79bc4567fbde4d"; + sha256 = "a386e6ee2d9a0e332a49f1cb210c4c11ba9844bcd52808270f48e688314783d8"; }; doCheck = false; From 49531d9f6eccdffc8309cd128627cdf4db4ab257 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 06:33:01 +0000 Subject: [PATCH 151/228] k9s: 0.22.1 -> 0.23.3 --- pkgs/applications/networking/cluster/k9s/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 575bc5a50623..f26697f05611 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.22.1"; + version = "0.23.3"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "1qyibpvfbd8yahfmci431qd0zy4wwz03gwj1ak8rn3qxpv1cdbmk"; + sha256 = "0jdrjsv6miprw0bj964rgkbci4xdwfi536z3px93i2n9zrhhawpn"; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "1432ppgd3lc0h83i6vzklfhp95s2xwaf41mv4xfryzzszjfndmvl"; + vendorSha256 = "105vmy8agl3ppgi28wg7djx0jrfam7nxfvvlps9ycgyrv2qpjh2n"; doCheck = false; From 0f65faec308d38bb7051e95d30e8ade93a489683 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 06:42:51 +0000 Subject: [PATCH 152/228] jackett: 0.16.1883 -> 0.16.1964 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 3058ef5a4a62..27f816b269ac 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.16.1883"; + version = "0.16.1964"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1l16zzjyvwq6rd4q6dg4m0a81fiw50c7naksa43g3yhv7wg7wfll"; + sha256 = "06mj9pahziwm77nqjiqcbg3zfxkjy7sp15h84iqcxp0lpz0w2z55"; }; nativeBuildInputs = [ makeWrapper ]; From 2c931312ce6c7baf91ec98e164bef0241fc20aa6 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 1 Nov 2020 23:39:49 +0100 Subject: [PATCH 153/228] treewide: simplify rev/repo arguments in src + use fetchFromGithub where possible --- pkgs/applications/audio/bchoppr/default.nix | 2 +- pkgs/applications/audio/bsequencer/default.nix | 2 +- pkgs/applications/audio/bslizr/default.nix | 2 +- pkgs/applications/editors/marker/default.nix | 2 +- pkgs/applications/graphics/drawpile/default.nix | 2 +- pkgs/applications/misc/ausweisapp2/default.nix | 2 +- pkgs/applications/misc/batsignal/default.nix | 2 +- .../misc/chewing-editor/default.nix | 4 ++-- pkgs/applications/misc/dupeguru/default.nix | 2 +- pkgs/applications/misc/effitask/default.nix | 4 ++-- pkgs/applications/misc/fuzzel/default.nix | 2 +- .../keepass-plugins/keepasshttp/default.nix | 2 +- pkgs/applications/misc/pwsafe/default.nix | 2 +- pkgs/applications/misc/solaar/default.nix | 2 +- .../networking/cluster/kubeval/default.nix | 2 +- .../instant-messengers/quaternion/default.nix | 2 +- .../networking/trebleshot/default.nix | 2 +- .../science/electronics/flatcam/default.nix | 2 +- .../science/logic/potassco/clingcon.nix | 2 +- .../git-and-tools/bump2version/default.nix | 6 +++--- .../git-and-tools/ghorg/default.nix | 2 +- pkgs/data/icons/zafiro-icons/default.nix | 2 +- pkgs/data/themes/orion/default.nix | 14 ++++++++------ .../gnome-3/games/aisleriot/default.nix | 4 ++-- pkgs/development/compilers/llvm/11/default.nix | 2 +- pkgs/development/interpreters/acl2/default.nix | 2 +- .../interpreters/clojurescript/lumo/default.nix | 2 +- .../interpreters/wasmtime/default.nix | 2 +- pkgs/development/libraries/gensio/default.nix | 2 +- pkgs/development/libraries/libmkv/default.nix | 7 ++++--- .../libraries/pcaudiolib/default.nix | 2 +- pkgs/development/libraries/wiiuse/default.nix | 2 +- pkgs/development/libraries/x265/default.nix | 2 +- .../ocaml-modules/dispatch/default.nix | 2 +- .../ocaml-modules/lua-ml/default.nix | 2 +- .../ocaml-modules/webmachine/default.nix | 2 +- .../django-postgresql-netfields/default.nix | 2 +- .../python-modules/hawkauthlib/default.nix | 7 ++++--- .../python-modules/ovito/default.nix | 2 +- .../python-modules/pa-ringbuffer/default.nix | 2 +- .../python-modules/pyfcm/default.nix | 2 +- .../python-modules/pykka/default.nix | 7 ++++--- .../python-modules/pyramid_hawkauth/default.nix | 9 +++++---- .../python-modules/rtmixer/default.nix | 2 +- .../python-modules/sacremoses/default.nix | 2 +- .../python-modules/signedjson/default.nix | 7 ++++--- .../tensorflow-probability/default.nix | 2 +- .../python-modules/tokenlib/default.nix | 7 ++++--- .../python-modules/unpaddedbase64/default.nix | 7 ++++--- .../tools/analysis/cargo-tarpaulin/default.nix | 2 +- .../tools/analysis/retdec/default.nix | 3 +-- pkgs/development/tools/eclipse-mat/default.nix | 2 +- pkgs/development/tools/misc/argbash/default.nix | 2 +- .../tools/misc/editorconfig-checker/default.nix | 2 +- pkgs/development/tools/misc/fujprog/default.nix | 2 +- pkgs/development/tools/sourcetrail/default.nix | 2 +- pkgs/development/tools/swiftformat/default.nix | 2 +- pkgs/games/cockatrice/default.nix | 2 +- pkgs/games/eidolon/default.nix | 2 +- pkgs/games/mari0/default.nix | 2 +- pkgs/games/the-butterfly-effect/default.nix | 7 ++++--- pkgs/games/wyvern/default.nix | 2 +- pkgs/misc/emulators/mednaffe/default.nix | 2 +- pkgs/servers/monitoring/do-agent/default.nix | 2 +- .../servers/monitoring/prometheus/promscale.nix | 2 +- pkgs/servers/ser2net/default.nix | 2 +- pkgs/servers/web-apps/dokuwiki/default.nix | 2 +- pkgs/servers/web-apps/jirafeau/default.nix | 2 +- pkgs/servers/web-apps/rss-bridge/default.nix | 2 +- pkgs/tools/X11/xwinmosaic/default.nix | 9 +++++---- pkgs/tools/backup/stenc/default.nix | 2 +- pkgs/tools/misc/ddate/default.nix | 17 ++++++++++------- pkgs/tools/misc/eva/default.nix | 2 +- pkgs/tools/misc/nix-direnv/default.nix | 2 +- pkgs/tools/misc/rpcsvc-proto/default.nix | 2 +- pkgs/tools/networking/goimapnotify/default.nix | 2 +- .../network-manager/dmenu/default.nix | 2 +- pkgs/tools/networking/nfstrace/default.nix | 2 +- .../package-management/cargo-about/default.nix | 2 +- pkgs/tools/package-management/gx/default.nix | 10 +++++----- pkgs/tools/package-management/gx/go/default.nix | 10 +++++----- pkgs/tools/security/crackxls/default.nix | 9 +++++---- pkgs/tools/security/honggfuzz/default.nix | 2 +- pkgs/tools/security/rbw/default.nix | 2 +- pkgs/tools/security/rustscan/default.nix | 2 +- pkgs/tools/text/ledger2beancount/default.nix | 2 +- 86 files changed, 148 insertions(+), 134 deletions(-) diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index 7d4d53408d28..33827287712a 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sjaehn"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j"; }; diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix index 2c9217183e4a..093e9450de8b 100644 --- a/pkgs/applications/audio/bsequencer/default.nix +++ b/pkgs/applications/audio/bsequencer/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sjaehn"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29"; }; diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix index 5a2675187c02..e239a89b8995 100644 --- a/pkgs/applications/audio/bslizr/default.nix +++ b/pkgs/applications/audio/bslizr/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sjaehn"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0"; }; diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix index 758cb0c30eba..19ffdbd2c2c1 100644 --- a/pkgs/applications/editors/marker/default.nix +++ b/pkgs/applications/editors/marker/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fabiocolacio"; repo = "Marker"; - rev = "${version}"; + rev = version; fetchSubmodules = true; sha256 = "1iy7izyprf050bix8am1krqivgyxnhx3jm775v8f80cgbqxy7m5r"; }; diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index e210d03406b7..cf37512ad9f5 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -74,7 +74,7 @@ in mkDerivation rec { src = fetchFromGitHub { owner = "drawpile"; repo = "drawpile"; - rev = "${version}"; + rev = version; sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM="; }; diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 9f157798a7d2..911a30ccf611 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -8,7 +8,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; - rev = "${version}"; + rev = version; sha256 = "1vibk3wmn54qr2mwz537hrr959y0r1zabp0gsijhzj2mk68g9pnb"; }; diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 77eb32166fe4..18dbcc9ce26a 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; - rev = "${version}"; + rev = version; sha256 = "12hj0j18db34x0xzgj6xmhvxm966d05z0rl3d9rlrcd2q96lilwf"; }; diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix index b70f9a2e7d80..3a89773b8587 100644 --- a/pkgs/applications/misc/chewing-editor/default.nix +++ b/pkgs/applications/misc/chewing-editor/default.nix @@ -7,8 +7,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "chewing"; - repo = "${pname}"; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w"; }; diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 41bfdb3fc5d9..51e1b77096d2 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "arsenetar"; repo = "dupeguru"; - rev = "${version}"; + rev = version; sha256 = "0ma4f1c6vmpz8gi4sdy43x1ik7wh42wayvk1iq520d3i714kfcpy"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/applications/misc/effitask/default.nix index 4f3255551c21..26008c133b82 100644 --- a/pkgs/applications/misc/effitask/default.nix +++ b/pkgs/applications/misc/effitask/default.nix @@ -13,8 +13,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "sanpii"; - repo = "${pname}"; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "09bffxdp43s8b1rpmsgqr2kyz3i4jbd2yrwbxw21fj3sf3mwb9ig"; }; diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 717d4a3aab3f..337d68b4b20d 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://codeberg.org/dnkl/fuzzel"; - rev = "${version}"; + rev = version; sha256 = "0c0p9spklzmy9f7abz3mvw0vp6zgnk3ns1i6ks95ljjb3kqy9vs2"; }; diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix index f9dbf14624f7..10e6996873a0 100644 --- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix @@ -8,7 +8,7 @@ let src = fetchFromGitHub { owner = "pfn"; repo = "keepasshttp"; - #rev = "${version}"; + # rev = version; # for 1.8.4.2 the tag is at the wrong commit (they fixed stuff # afterwards and didn't move the tag), hence reference by commitid rev = "c2c4eb5388a02169400cba7a67be325caabdcc37"; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 26bc6cc0a0bb..91f23f662af9 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "${version}"; + rev = version; sha256 = "0nh5jnf5yls2qv5hpfhm6i854zsknyh7d93c987a0cg14sg820fv"; }; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 83a7e9d62165..f92fe87b9481 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; - rev = "${version}"; + rev = version; sha256 = "0k5z9dap6rawiafkg1x7zjx51ala7wra6j6lvc2nn0y8r79yp7a9"; }; diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 72dfe3ecc33f..d26f8ed5dc67 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "instrumenta"; repo = "kubeval"; - rev = "${version}"; + rev = version; sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0"; }; diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index b1577a37844d..c031615a90bf 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -10,7 +10,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; - rev = "${version}"; + rev = version; sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv"; }; diff --git a/pkgs/applications/networking/trebleshot/default.nix b/pkgs/applications/networking/trebleshot/default.nix index 56ebe1873ae6..82f91ddef8b4 100644 --- a/pkgs/applications/networking/trebleshot/default.nix +++ b/pkgs/applications/networking/trebleshot/default.nix @@ -10,7 +10,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "genonbeta"; repo = "TrebleShot-Desktop"; - rev = "${version}"; + rev = version; sha256 = "1k8wagw6arsi1lqkhn1nl6j11mb122vi1qs0q2np6nznwfy7pn1k"; }; diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index 360c6df7fe60..b8a80c5e9c11 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromBitbucket { owner = "jpcgt"; - repo = "${pname}"; + repo = pname; rev = "533afd6a1772857cb633c011b5e0a15b60b1e92e"; # 8.5 with Red Hat packaging. sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m"; }; diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix index 1203822d86e9..b74583ca1a2c 100644 --- a/pkgs/applications/science/logic/potassco/clingcon.nix +++ b/pkgs/applications/science/logic/potassco/clingcon.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "potassco"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; fetchSubmodules = true; sha256 = "1q7517h10jfvjdk2czq8d6y57r8kr1j1jj2k2ip2qxkpyfigk4rs"; diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix index 69b44625f95a..eb44f6d412b5 100644 --- a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix @@ -7,7 +7,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "c4urself"; - repo = "${pname}"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja"; }; @@ -16,12 +16,12 @@ buildPythonApplication rec { # X's in pytest are git tests which won't run in sandbox checkPhase = '' pytest tests/ -k 'not usage_string_fork' - ''; + ''; meta = with stdenv.lib; { description = "Version-bump your software with a single command"; longDescription = '' - A small command line tool to simplify releasing software by updating + A small command line tool to simplify releasing software by updating all version strings in your source code by the correct increment. ''; homepage = "https://github.com/c4urself/bump2version"; diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index fc2e660fa7a7..30049e845877 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; - rev = "${version}"; + rev = version; sha256 = "0diwndkckv6fga45j9zngizycn5m71r67cziv0zrx6c66ssbj49w"; }; diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index a8dc4539a7dd..d406ae50e1c3 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zayronxio"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv"; }; diff --git a/pkgs/data/themes/orion/default.nix b/pkgs/data/themes/orion/default.nix index b44cc857c629..740b34889227 100644 --- a/pkgs/data/themes/orion/default.nix +++ b/pkgs/data/themes/orion/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchgit, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: -stdenv.mkDerivation { - name = "orion-1.5"; +stdenv.mkDerivation rec { + pname = "orion"; + version = "1.5"; - src = fetchgit { - url = "https://github.com/shimmerproject/Orion.git"; - rev = "refs/tags/v1.5"; + src = fetchFromGitHub { + owner = "shimmerproject"; + repo = "Orion"; + rev = "refs/tags/v${version}"; sha256 = "1116yawv3fspkiq1ykk2wj0gza3l04b5nhldy0bayzjaj0y6fd89"; }; diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index 9ea68b02ea87..d58e608c9576 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { version = "3.22.11"; src = fetchFromGitLab { + domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - domain = "gitlab.gnome.org"; - rev = "${version}"; + rev = version; sha256 = "1asm0y6485xqsysdg586y3hzz8bhxqwnc82k6vhfnxpxz7l62qa1"; }; diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index a404d1606957..e6765ec68990 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -7,7 +7,7 @@ let release_version = "11.0.0"; - version = "${release_version}"; # differentiating these (variables) is important for RCs + version = release_version; # differentiating these (variables) is important for RCs targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 9ad95645240b..83b54e442aa3 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "acl2-devel"; repo = "acl2-devel"; - rev = "${version}"; + rev = version; sha256 = "0c0wimaf16nrr3d6cxq6p7nr7rxffvpmn66hkpwc1m6zpcipf0y5"; }; diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index 122831e80cc0..61fd94c09bf4 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -145,7 +145,7 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/anmonteiro/lumo.git"; - rev = "${version}"; + rev = version; sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p"; }; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index b725c3e6e503..75a022de912f 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "bytecodealliance"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "01k1fpk2qp4kv0xr4f0xmrjkr98j5ws48r1aks8l80mffs4ynqfr"; fetchSubmodules = true; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index e1da5a44ff08..b3bf33f0e881 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cminyard"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "07m8rbdk05biarc9xskwcx9lghj0dff1msxasfc6hi3jywc3xaih"; }; diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix index 190c573577a5..9a754eda592f 100644 --- a/pkgs/development/libraries/libmkv/default.nix +++ b/pkgs/development/libraries/libmkv/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchgit, libtool, autoconf, automake }: +{ stdenv, fetchFromGitHub, libtool, autoconf, automake }: stdenv.mkDerivation rec { pname = "libmkv"; version = "0.6.5.1"; - src = fetchgit { - url = "https://github.com/saintdev/libmkv.git"; + src = fetchFromGitHub { + owner = "saintdev"; + repo = pname; rev = "refs/tags/${version}"; sha256 = "0pr9q7yprndl8d15ir7i7cznvmf1yqpvnsyivv763n6wryssq6dl"; }; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 952987447b22..12def747361b 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rhdunn"; repo = "pcaudiolib"; - rev = "${version}"; + rev = version; sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0"; }; diff --git a/pkgs/development/libraries/wiiuse/default.nix b/pkgs/development/libraries/wiiuse/default.nix index 4dcc8a47105e..738c6a430084 100644 --- a/pkgs/development/libraries/wiiuse/default.nix +++ b/pkgs/development/libraries/wiiuse/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wiiuse"; repo = "wiiuse"; - rev = "${version}"; + rev = version; sha256 = "05gc3s0wxx7ga4g32yyibyxdh46rm9bbslblrc72ynrjxq98sg13"; }; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 9d501f47c3b1..3ad200cfc637 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -30,7 +30,7 @@ let src = fetchFromBitbucket { owner = "multicoreware"; repo = "x265_git"; - rev = "${version}"; + rev = version; sha256 = "1jzgv2hxhcwmsdf6sbgyzm88a46dp09ll1fqj92g9vckvh9a7dsn"; }; diff --git a/pkgs/development/ocaml-modules/dispatch/default.nix b/pkgs/development/ocaml-modules/dispatch/default.nix index 5de61169c365..03f2afbd3141 100644 --- a/pkgs/development/ocaml-modules/dispatch/default.nix +++ b/pkgs/development/ocaml-modules/dispatch/default.nix @@ -7,7 +7,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "inhabitedtype"; repo = "ocaml-dispatch"; - rev = "${version}"; + rev = version; sha256 = "05kb9zcihk50r2haqz8vrlr7kmaka6vrs4j1z500lmnl877as6qr"; }; diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix index 6e69bc1e5c50..38ccaea65eba 100644 --- a/pkgs/development/ocaml-modules/lua-ml/default.nix +++ b/pkgs/development/ocaml-modules/lua-ml/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lindig"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044"; }; diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix index afb26cfb354b..14b1d2d2321f 100644 --- a/pkgs/development/ocaml-modules/webmachine/default.nix +++ b/pkgs/development/ocaml-modules/webmachine/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "inhabitedtype"; repo = "ocaml-webmachine"; - rev = "${version}"; + rev = version; sha256 = "1zi1vsm589y2njwzsqkmdbxvs9s4xlgbd62xqw2scp60mccp09nk"; }; diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index 993647c3f232..73c15850d33c 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jimfunk"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "1rrh38f3zl3jk5ijs6g75dxxvxygf4lczbgc7ahrgzf58g4a48lm"; }; diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix index a819bca362db..1a8ddacdd690 100644 --- a/pkgs/development/python-modules/hawkauthlib/default.nix +++ b/pkgs/development/python-modules/hawkauthlib/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchgit +, fetchFromGitHub , requests , webob }: @@ -9,8 +9,9 @@ buildPythonPackage rec { pname = "hawkauthlib"; version = "0.1.1"; - src = fetchgit { - url = "https://github.com/mozilla-services/hawkauthlib.git"; + src = fetchFromGitHub { + owner = "mozilla-services"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "0mr1mpx4j9q7sch9arwfvpysnpf2p7ijy7072wilxm8pnj0bwvsi"; }; diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix index 24af3a51255d..5e5847dce033 100644 --- a/pkgs/development/python-modules/ovito/default.nix +++ b/pkgs/development/python-modules/ovito/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "stuko"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "0rm1qxa0fanaaqg0idr6rf2s2xlbyn1dzjzwh3rddy9mgl60lj2h"; }; diff --git a/pkgs/development/python-modules/pa-ringbuffer/default.nix b/pkgs/development/python-modules/pa-ringbuffer/default.nix index fd05e7e8052e..466d3937a1fb 100644 --- a/pkgs/development/python-modules/pa-ringbuffer/default.nix +++ b/pkgs/development/python-modules/pa-ringbuffer/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spatialaudio"; repo = "python-pa-ringbuffer"; - rev = "${version}"; + rev = version; sha256 = "0afpydy1l20hd1xncjppjhqa2c8dj5h9nlv4z8m55cs9hc9h1mxv"; }; diff --git a/pkgs/development/python-modules/pyfcm/default.nix b/pkgs/development/python-modules/pyfcm/default.nix index 22afc793cde9..8fdb051a4846 100644 --- a/pkgs/development/python-modules/pyfcm/default.nix +++ b/pkgs/development/python-modules/pyfcm/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "olucurious"; repo = "pyfcm"; - rev = "${version}"; + rev = version; sha256 = "0aj10yvjsc04j15zbn403i83j7ra5yg35pi3ywkyakk8n1s0s3qg"; }; diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index a787b8695275..6f76ca9850fe 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -1,14 +1,15 @@ { stdenv , buildPythonPackage -, fetchgit +, fetchFromGitHub }: buildPythonPackage rec { pname = "pykka"; version = "2.0.1"; - src = fetchgit { - url = "https://github.com/jodal/pykka.git"; + src = fetchFromGitHub { + owner = "jodal"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "011rvv3vzj9rpwaq6vfpz9hfwm6gx1jmad4iri6z12g8nnlpydhs"; }; diff --git a/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/pkgs/development/python-modules/pyramid_hawkauth/default.nix index ff966d906c88..fc76d9af68d9 100644 --- a/pkgs/development/python-modules/pyramid_hawkauth/default.nix +++ b/pkgs/development/python-modules/pyramid_hawkauth/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchgit +, fetchFromGitHub , pyramid , hawkauthlib , tokenlib @@ -8,11 +8,12 @@ }: buildPythonPackage rec { - pname = "pyramidhawkauth"; + pname = "pyramid_hawkauth"; version = "0.1.0"; - src = fetchgit { - url = "https://github.com/mozilla-services/pyramid_hawkauth.git"; + src = fetchFromGitHub { + owner = "mozilla-services"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h"; }; diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix index e1115bd81800..1d9b8114df7b 100644 --- a/pkgs/development/python-modules/rtmixer/default.nix +++ b/pkgs/development/python-modules/rtmixer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spatialaudio"; repo = "python-rtmixer"; - rev = "${version}"; + rev = version; sha256 = "1bvgzzxiypvvb3qacbcry6761x9sk3dnx7jga7pli63f69vakg4y"; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix index 3785ebcf86cf..f5c0ee715c3a 100644 --- a/pkgs/development/python-modules/sacremoses/default.nix +++ b/pkgs/development/python-modules/sacremoses/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alvations"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "1gzr56w8yx82mn08wax5m0xyg15ym4ri5l80gmagp8r53443j770"; }; diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index 6916b704fcd4..69f7a93f509d 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchgit +, fetchFromGitHub , canonicaljson , unpaddedbase64 , pynacl @@ -11,8 +11,9 @@ buildPythonPackage rec { pname = "signedjson"; version = "1.1.0"; - src = fetchgit { - url = "https://github.com/matrix-org/python-signedjson.git"; + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "python-${pname}"; rev = "refs/tags/v${version}"; sha256 = "18s388hm3babnvakbbgfqk0jzq25nnznvhygywd3azp9b4yzmd5c"; }; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 763679190592..a89c6fa307ea 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -31,7 +31,7 @@ let src = fetchFromGitHub { owner = "tensorflow"; repo = "probability"; - rev = "${version}"; + rev = version; sha256 = "07cm8zba8n0ihzdm3k4a4rsg5v62xxsfvcw4h0niz91c0parqjqy"; }; diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix index 0ffb5ce0cb73..7c8e99cc399a 100644 --- a/pkgs/development/python-modules/tokenlib/default.nix +++ b/pkgs/development/python-modules/tokenlib/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchgit +, fetchFromGitHub , requests , webob }: @@ -9,8 +9,9 @@ buildPythonPackage rec { pname = "tokenlib"; version = "0.3.1"; - src = fetchgit { - url = "https://github.com/mozilla-services/tokenlib.git"; + src = fetchFromGitHub { + owner = "mozilla-services"; + repo = pname; rev = "refs/tags/${version}"; sha256 = "0bq6dqyfwh29pg8ngmrm4mx4q27an9lsj0p9l79p9snn4g2rxzc8"; }; diff --git a/pkgs/development/python-modules/unpaddedbase64/default.nix b/pkgs/development/python-modules/unpaddedbase64/default.nix index bcb902e5bfdb..386478cbb752 100644 --- a/pkgs/development/python-modules/unpaddedbase64/default.nix +++ b/pkgs/development/python-modules/unpaddedbase64/default.nix @@ -1,14 +1,15 @@ { stdenv , buildPythonPackage -, fetchgit +, fetchFromGitHub }: buildPythonPackage rec { pname = "unpaddedbase64"; version = "1.1.0"; - src = fetchgit { - url = "https://github.com/matrix-org/python-unpaddedbase64.git"; + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "python-${pname}"; rev = "refs/tags/v${version}"; sha256 = "0if3fjfxga0bwdq47v77fs9hrcqpmwdxry2i2a7pdqsp95258nxd"; }; diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 099837fbafa2..d2ad97141ca7 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; - rev = "${version}"; + rev = version; sha256 = "0ga2zfq4365hxvr3wd3isc146ibivy3bfcy24rb6cq3av3b90a8k"; }; diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index 55c077f932d9..b0e5319df2d6 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -135,8 +135,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "avast-tl"; - repo = "retdec"; - name = "retdec-${version}"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "0chky656lsddn20bnm3pmz6ix20y4a0y8swwr42hrhi01vkhmzrp"; }; diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index 44411d0db72c..600b2b0e56ce 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -31,7 +31,7 @@ let in stdenv.mkDerivation rec { pname = "eclipse-mat"; - version = "${pVersion}"; + version = pVersion; src = fetchurl { url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; diff --git a/pkgs/development/tools/misc/argbash/default.nix b/pkgs/development/tools/misc/argbash/default.nix index 0c0511ec7922..3efff5009439 100644 --- a/pkgs/development/tools/misc/argbash/default.nix +++ b/pkgs/development/tools/misc/argbash/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "matejak"; repo = "argbash"; - rev = "${version}"; + rev = version; sha256 = "1xdhpbnc0xjv6ydcm122hhdjcl77jhiqnccjfqjp3cd1lfmzvg8v"; }; diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 741854a507dd..401bbdbee6ef 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; - rev = "${version}"; + rev = version; sha256 = "18gz94h2x1z6g6r7v9cdixkbcaigd7cl08af6smlkaa89j0aki32"; }; diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix index e15e48b0f2a9..e5cd2e0e2ddf 100644 --- a/pkgs/development/tools/misc/fujprog/default.nix +++ b/pkgs/development/tools/misc/fujprog/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kost"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "08kzkzd5a1wfd1aycywdynxh3qy6n7z9i8lihkahmb4xac3chmz5"; }; diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index e6b86e4a85c1..91653d3773e1 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "CoatiSoftware"; repo = "Sourcetrail"; - rev = "${version}"; + rev = version; sha256 = "0jp9y86xzkcxikc1cn4f6gqgg6zdssck08677ldagw25p1zadvzw"; }; diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/development/tools/swiftformat/default.nix index c47955695f5c..cb3ed5217f08 100644 --- a/pkgs/development/tools/swiftformat/default.nix +++ b/pkgs/development/tools/swiftformat/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; - rev = "${version}"; + rev = version; sha256 = "0zajvbaf3r02k53lv5zdxf13apc6chnjmj69zkyac48lpnpbcxq6"; }; diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index 848bf2ab8851..ac31de4e4c24 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -9,7 +9,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "Cockatrice"; repo = "Cockatrice"; - rev = "${version}"; + rev = version; sha256 = "1yaxm7q0ja3rgx197hh8ynjc6ncc4hm0qdn9v7f0l4fbv0bdpv34"; }; diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix index e982c95c4d66..4ae64df41437 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchgit { url = "https://git.sr.ht/~nicohman/eidolon"; - rev = "${version}"; + rev = version; sha256 = "1yn3k569pxzw43mmsk97088xpkdc714rks3ncchbb6ccx25kgxrr"; }; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix index b8c4ea281dfd..c3fb66208b80 100644 --- a/pkgs/games/mari0/default.nix +++ b/pkgs/games/mari0/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "Stabyourself"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "1zqaq4w599scsjvy1rsb21fd2r8j3srx9vym4ir9bh666dp36gxa"; }; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 14d51ee87bd1..99599b92dfa0 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -1,11 +1,12 @@ -{ stdenv, mkDerivation, fetchgit, qt5, box2d, which, cmake, gettext }: +{ stdenv, mkDerivation, fetchFromGitHub, qt5, box2d, which, cmake, gettext }: mkDerivation rec { pname = "tbe"; version = "0.9.3.1"; - src = fetchgit { - url = "https://github.com/kaa-ching/tbe"; + src = fetchFromGitHub { + owner = "kaa-ching"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "1ag2cp346f9bz9qy6za6q54id44d2ypvkyhvnjha14qzzapwaysj"; }; diff --git a/pkgs/games/wyvern/default.nix b/pkgs/games/wyvern/default.nix index 4723a6c52fa7..dcf81bc0985f 100644 --- a/pkgs/games/wyvern/default.nix +++ b/pkgs/games/wyvern/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { src = fetchgit { url = "https://git.sr.ht/~nicohman/wyvern"; - rev = "${version}"; + rev = version; sha256 = "1sl3yhash1527amc8rs4374fd7jbgnkyy7qpw94ms2gs80sdv3s5"; }; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index 7e231c5edd3a..60b0bfe1223b 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "AmatCoder"; repo = "mednaffe"; - rev = "${version}"; + rev = version; sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7"; }; diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index d7c7e042981f..c2527acc1cd4 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; - rev = "${version}"; + rev = version; sha256 = "16mmh1kz6zbncfisd9qnb3ssgpkcb4hb7700jlzbdjqxyjmy0qsf"; }; diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index 37e3ec0375cb..25ad49e7c8a8 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "timescale"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "sha256:00mhkp3nf6h2zsvmmwyza1lahvmm05isfi7rqkx24c0dmkmif3x9"; }; diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index ef592420b118..466f07052b8c 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cminyard"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "01w82nrgffsfz2c80p4cyppg3bz56d90jm6i6356j0nva3784haw"; }; diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix index 8177e1d22262..2cb20e4932f5 100644 --- a/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/pkgs/servers/web-apps/dokuwiki/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "splitbrain"; - repo = "${pname}"; + repo = pname; rev = "release_stable_${version}"; sha256 = "09swcqyd06l3481k190gmlr3b33dlv1lw1kk9nyh5b4sa5p3k7kk"; }; diff --git a/pkgs/servers/web-apps/jirafeau/default.nix b/pkgs/servers/web-apps/jirafeau/default.nix index 1f3dd2e90124..33cde2c5922c 100644 --- a/pkgs/servers/web-apps/jirafeau/default.nix +++ b/pkgs/servers/web-apps/jirafeau/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "mojo42"; repo = "Jirafeau"; - rev = "${version}"; + rev = version; sha256 = "09gq5zhynygpqj0skq7ifnn9yjjg7qnc6kjvaas7f53av2707z4c"; }; diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/servers/web-apps/rss-bridge/default.nix index 432f59564060..73c2fcce3476 100644 --- a/pkgs/servers/web-apps/rss-bridge/default.nix +++ b/pkgs/servers/web-apps/rss-bridge/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; - rev = "${version}"; + rev = version; sha256 = "075k4bylx9308d083ry5a9q4629ccnrnndqqdqp1g42rzlqrw79q"; }; diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index 7b30e5c58155..7bd0c3e6dcd4 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, gtk2, cmake, pkgconfig, libXdamage }: +{ stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }: stdenv.mkDerivation rec { version = "0.4.2"; pname = "xwinmosaic"; - src = fetchgit { - url = "https://github.com/soulthreads/xwinmosaic/"; - rev = "refs/tags/v0.4.2"; + src = fetchFromGitHub { + owner = "soulthreads"; + repo = pname; + rev = "refs/tags/v${version}"; sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr"; }; diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/tools/backup/stenc/default.nix index 11859c4f8be4..af5a33c2a6ee 100644 --- a/pkgs/tools/backup/stenc/default.nix +++ b/pkgs/tools/backup/stenc/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "scsitape"; repo = "stenc"; - rev = "${version}"; + rev = version; sha256 = "1778m1zcyzyf42k5m496yqh0gv6kqhb0sq5983dhky1fccjl905k"; }; diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/tools/misc/ddate/default.nix index 0987fb6d286f..04a89ec3dd0f 100644 --- a/pkgs/tools/misc/ddate/default.nix +++ b/pkgs/tools/misc/ddate/default.nix @@ -1,10 +1,13 @@ -{stdenv, fetchgit, cmake} : +{stdenv, fetchFromGitHub, cmake} : -stdenv.mkDerivation { - name = "ddate-0.2.2"; - src = fetchgit { - url = "https://github.com/bo0ts/ddate"; - rev = "refs/tags/v0.2.2"; +stdenv.mkDerivation rec { + pname = "ddate"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "bo0ts"; + repo = pname; + rev = "refs/tags/v${version}"; sha256 = "1qchxnxvghbma6gp1g78wnjxsri0b72ha9axyk31cplssl7yn73f"; }; @@ -14,7 +17,7 @@ stdenv.mkDerivation { homepage = "https://github.com/bo0ts/ddate"; description = "Discordian version of the date program"; license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [kovirobi]; + maintainers = with stdenv.lib.maintainers; [ kovirobi ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index e59c2387a3ce..a40913343308 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "NerdyPepper"; - repo = "${pname}"; + repo = pname; rev = "6ce0fc0212a34ffb647b24d9d903029ac4518165"; sha256 = "10242vnq2ph0g3p2hdacs4lmx3f474xm04nadplxbpv9xh4nbag3"; }; diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index d92f2346563c..11cb0dcf554b 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; - rev = "${version}"; + rev = version; sha256 = "sha256-xMz6e0OLeB3eltGrLV3Hew0lMjH5LSgqJ1l7JT2Ho/M="; }; diff --git a/pkgs/tools/misc/rpcsvc-proto/default.nix b/pkgs/tools/misc/rpcsvc-proto/default.nix index 12885172080c..925dfde13a36 100644 --- a/pkgs/tools/misc/rpcsvc-proto/default.nix +++ b/pkgs/tools/misc/rpcsvc-proto/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "thkukuk"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "006l1f824r9bcbwn1s1vbs33cdwhs66jn6v97yas597y884y40z9"; }; diff --git a/pkgs/tools/networking/goimapnotify/default.nix b/pkgs/tools/networking/goimapnotify/default.nix index fb64ff65cc15..4232a5a4fedd 100644 --- a/pkgs/tools/networking/goimapnotify/default.nix +++ b/pkgs/tools/networking/goimapnotify/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; - rev = "${version}"; + rev = version; sha256 = "1d42gd3m2rkvy985d181dbcm5i3f7xsg2z8z6s4bpvw24pfnzs42"; }; diff --git a/pkgs/tools/networking/network-manager/dmenu/default.nix b/pkgs/tools/networking/network-manager/dmenu/default.nix index 4b46d63ced5b..e17d4ebc0719 100644 --- a/pkgs/tools/networking/network-manager/dmenu/default.nix +++ b/pkgs/tools/networking/network-manager/dmenu/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "firecat53"; repo = "networkmanager-dmenu"; - rev = "${version}"; + rev = version; sha256 = "1liidqh8c33pxyb07qyj0jkd0fdak73g9r2iwiq62vfzrpik09k0"; }; diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix index 2cb819caee98..6377f276af3f 100644 --- a/pkgs/tools/networking/nfstrace/default.nix +++ b/pkgs/tools/networking/nfstrace/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "epam"; repo = "nfstrace"; - rev = "${version}"; + rev = version; sha256 = "1djsyn7i3xp969rnmsdaf5vwjiik9wylxxrc5nm7by00i76c1vsg"; }; diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index c4d9aae267e7..3f61fdd583ec 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; - rev = "${version}"; + rev = version; sha256 = "00ing1v6vjqfvirp3mbayn8rwvxf72wnhz9249k2iifw8bl2r2hd"; }; diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 791dfe755ee4..f9b996b27761 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -1,16 +1,16 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gx"; version = "0.14.1"; - rev = "refs/tags/v${version}"; goPackagePath = "github.com/whyrusleeping/gx"; - src = fetchgit { - inherit rev; - url = "https://github.com/whyrusleeping/gx"; + src = fetchFromGitHub { + owner = "whyrusleeping"; + repo = pname; + rev = "refs/tags/v${version}"; sha256 = "0pfx2p59xdbmqzfbgaf8xvlnzh8m05hkg596glq5kvl8ib65i4ha"; }; diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 652edf95e550..8579ef574d55 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -1,18 +1,18 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit +{ stdenv, buildGoPackage, fetchFromGitHub , gx }: buildGoPackage rec { pname = "gx-go"; version = "1.9.0"; - rev = "refs/tags/v${version}"; goPackagePath = "github.com/whyrusleeping/gx-go"; - src = fetchgit { - inherit rev; - url = "https://github.com/whyrusleeping/gx-go"; + src = fetchFromGitHub { + owner = "whyrusleeping"; + repo = pname; + rev = "refs/tags/v${version}"; sha256 = "0fdy4b3ymqw6hzvvjwq37mfrdmizc8lxm53axw93n3x6118na9jc"; }; diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index e861d70f7252..aff6bbd028ad 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, pkgconfig, autoconf, automake, openssl, libgsf, gmp }: +{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, openssl, libgsf, gmp }: stdenv.mkDerivation rec { pname = "crackxls"; version = "0.4"; - src = fetchgit { - url = "https://github.com/GavinSmith0123/crackxls2003.git"; - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + owner = "GavinSmith0123"; + repo = "crackxls2003"; + rev = "v${version}"; sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; }; diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index 71146b15ea3d..a46acef81d75 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -10,7 +10,7 @@ let src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "0dcl5a5jykgfmnfj42vl7kah9k26wg38l2g6yfh5pssmlf0nax33"; }; diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index 9e778a636c15..e8c4b1f541bd 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; - crateName = "${pname}"; + crateName = pname; sha256 = "0p37kwkp153mkns4bh7k7gnksk6c31214wlw3faf42daav32mmgw"; }; diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index 4d154bbc96ff..f36565479512 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "RustScan"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "0dhy7b73ipsxsr7wlc3r5yy39i3cjrdszhsw9xwjj31692s3b605"; }; diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/tools/text/ledger2beancount/default.nix index 00cc996ed60c..8a521b751d4d 100644 --- a/pkgs/tools/text/ledger2beancount/default.nix +++ b/pkgs/tools/text/ledger2beancount/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zacchiro"; repo = "ledger2beancount"; - rev = "${version}"; + rev = version; sha256 = "0w88jb1x0w02jwwf6ipx3cxr89kzffrrdqws3556zrvvs01bh84j"; }; From 3c20b670dbe7c93e7f3ba8a3a2dfeef38776d508 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 07:07:25 +0000 Subject: [PATCH 154/228] istioctl: 1.7.3 -> 1.7.4 --- pkgs/applications/networking/cluster/istioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index f6619c9f19f7..053035e629ea 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "1w0ddz2am053bpi0jrn5v3b76jf2z4nl7zv0i1z2v9xcx59bxkac"; + sha256 = "1vy6y6gk7ljnrb7cxxaa60i4ycylsrd2yszbly1aaz5vnh1vsfz9"; }; - vendorSha256 = "02l13hzk5aikpylalsm35v27cljcl4z0qka9a4m125bc4rj2kp7k"; + vendorSha256 = "0f2n8mwnj9i4qifs0f63jrgr61mjs3c1arxnny723i5pialj3zdl"; doCheck = false; From 138f9de4d502690a5f7d3eb7273e487ee8830b76 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 07:13:19 +0000 Subject: [PATCH 155/228] hikari: 2.1.2 -> 2.2.2 --- pkgs/applications/window-managers/hikari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 9bf68adaef42..d23d6c07af0e 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -12,7 +12,7 @@ let pname = "hikari"; - version = "2.1.2"; + version = "2.2.2"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "1qzbwc8dgsvp5jb4faapcrg9npsl11gq8jvhbbk2h7hj52c5lgmv"; + sha256 = "0sln1n5f67i3vxkybfi6xhzplb45djqyg272vqkv64m72rmm8875"; }; nativeBuildInputs = [ pkgconfig bmake ]; From 9217752561ec1f1d4d4c386cf355ffabd367d69a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 07:30:15 +0000 Subject: [PATCH 156/228] imagemagick7: 7.0.10-27 -> 7.0.10-35 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index bd4fa4b531be..a1e39cfebe0e 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-27"; - sha256 = "1fqwbg2ws6ix3bymx7ncb4k4f6bg8q44n9xnlvngjapflnrmhcph"; + version = "7.0.10-35"; + sha256 = "0hcqvn3n3ip2fia48d1nb1m4r5ir00vbaa62xqni30kglh3n2sfh"; patches = []; }; in From 71f4f9ac1e9776ca22332c0cf083c8e210a626ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 08:04:05 +0000 Subject: [PATCH 157/228] jx: 2.1.138 -> 2.1.149 --- pkgs/applications/networking/cluster/jx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 72b365d01b47..1f1eb3e8548f 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jx"; - version = "2.1.138"; + version = "2.1.149"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "1i45gzaql6rfplliky56lrzwjnm2qzv25kgyq7gvn9c7hjaaq65b"; + sha256 = "0jgny09wpfab8mkxkhv9swp1baqx3lxsx75a5i78cypkj6xadc69"; }; - vendorSha256 = "1wvggarakshpw7m8h0x2zvd6bshd2kzbrjynfa113z90pgksvjng"; + vendorSha256 = "1fswrf14nwjm0z8qqgdx236w7w1m451lyfinhx9pyp89fw2h5mv6"; doCheck = false; From a48b783061748b4b214e687545152d5ad3889ad5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 09:02:28 +0000 Subject: [PATCH 158/228] jamulus: 3.5.10 -> 3.6.0 --- pkgs/applications/audio/jamulus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index 7a5887d4f92b..1839aa9c7ada 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.5.10"; + version = "3.6.0"; src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "0bw2v40csjmlkvkhr3dh0g1a7mfqrs1xkqjsii61yfzy2ckbsi82"; + sha256 = "06x9b2kjsgk8kddhif0x59nwzhnwjmq40x3w5nrphqaimqlrhlcf"; }; nativeBuildInputs = [ pkg-config qmake ]; From 657c6d38756da4ba7b47faa1a3f8a32c04115605 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 09:12:23 +0000 Subject: [PATCH 159/228] i3lock: 2.12 -> 2.13 --- pkgs/applications/window-managers/i3/lock.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 2bca01eeefa7..7a2812c2cfe0 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "i3lock"; - version = "2.12"; + version = "2.13"; src = fetchurl { url = "https://i3wm.org/i3lock/${pname}-${version}.tar.bz2"; - sha256 = "02dwaqxpclcwiwvpvq7zwz4sxcv9c15dbf17ifalj1p8djls3cnh"; + sha256 = "02szjsaz7rqrdkd0r2nwgwa85c4hwfrcskxw7ryk695kmjcfhzv3"; }; nativeBuildInputs = [ pkgconfig ]; From 8fdbffdb92c0fc51785d80b443388d76bcf042f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 09:37:15 +0000 Subject: [PATCH 160/228] hitch: 1.6.0 -> 1.7.0 --- pkgs/servers/hitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix index d049317c031a..1576d940a7a6 100644 --- a/pkgs/servers/hitch/default.nix +++ b/pkgs/servers/hitch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, docutils, libev, openssl, pkgconfig, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.0"; + version = "1.7.0"; pname = "hitch"; src = fetchurl { url = "https://hitch-tls.org/source/${pname}-${version}.tar.gz"; - sha256 = "01n70yf8hx42jb801jv5q1xhrpqxyjnqhd98hjf81lvxpd5fnisf"; + sha256 = "1i75giwyr66ip8xsvk3gg5xdbxnmcabgxz8dqi06c58mw7qzhzn9"; }; nativeBuildInputs = [ pkgconfig ]; From 8ef46be2a4a5dddd94e622021d3e173ca32bbd3c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 10:16:32 +0000 Subject: [PATCH 161/228] igv: 2.8.9 -> 2.8.11 --- pkgs/applications/science/biology/igv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index bc4f1677fc98..0b990dc541b5 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.8.9"; + version = "2.8.11"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip"; - sha256 = "1874w1xprv91caz1ymfxilq6inhj36xzx8j9m0mcyp0qfvfvyjp7"; + sha256 = "1hiwnrrh42qzc7kdc7bypgcgn488pz8g462xzchbhgx7jjdbbwhm"; }; installPhase = '' From b174be956ee298bafcff4cc8cb080cf2985055e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 10:41:43 +0000 Subject: [PATCH 162/228] haproxy: 2.2.2 -> 2.2.4 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 91112a2628e2..16670ea175f8 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.2.2"; + version = "2.2.4"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1mjld865p4f7i465fcc5c4jclih1c3345a3ylriql8668rd7071r"; + sha256 = "1qhvaixns0xgxgd095kvqid0pi6jxsld9ghvnr60khwdzzadk947"; }; buildInputs = [ openssl zlib ] From 92781c27bd16862e50f6e9b65a01d12d843cca59 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Nov 2020 12:22:47 +0100 Subject: [PATCH 163/228] citrix_workspace: add pcsclite to `runtimeDependencies` According to the vendor's documentation this is needed to enable smartcard support[1]. [1] https://developer-docs.citrix.com/projects/workspace-app-for-linux-oem-guide/en/latest/customize/#smart-cards --- .../networking/remote/citrix-workspace/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 35085d422f26..c0dc438daacd 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -3,7 +3,7 @@ , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin -, libpulseaudio +, libpulseaudio, pcsclite , homepage, version, prefix, hash @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ glib + pcsclite xorg.libX11 xorg.libXScrnSaver From 8e4be5cb2fb9e2a4554912778d01210142f264d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 11:35:17 +0000 Subject: [PATCH 164/228] hr: 1.2 -> 1.3 --- pkgs/applications/misc/hr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 91a66bc73781..a0555f9032e9 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hr"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "LuRsT"; repo = "hr"; rev = version; - sha256 = "162vkip2772jl59lschpinimpg4ssiyg7fq0va5cx4d7wldpqmks"; + sha256 = "068kq37lbqfjzh28rlvkprni38ii991naawylwvq6d43y9dpzs2b"; }; dontBuild = true; From 3d40283367b16c5433d77327dc19b56107015a43 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 12:07:07 +0000 Subject: [PATCH 165/228] jmol: 14.31.3 -> 14.31.14 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 6545472a5295..cba3f1d09463 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.3"; + version = "14.31.14"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "067051wp9kgkgcy3mvqwxhim0h1qfcf4jk8vrbzd3y9pwmjismzy"; + sha256 = "1qmy4iqn5xgd4m9hs4w9cn9rzkwmpgdb5azd93cypp05s4nmjsnm"; }; patchPhase = '' From 33cf4f0e8eea945984486d747cdf7c35b89ccf51 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 20 Oct 2020 14:06:37 +0000 Subject: [PATCH 166/228] nginx: factor out the generation of basic auth generation --- .../services/web-servers/nginx/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index c0c2f27a00ef..ee1053698636 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -261,10 +261,7 @@ let ssl_trusted_certificate ${vhost.sslTrustedCertificate}; ''} - ${optionalString (vhost.basicAuthFile != null || vhost.basicAuth != {}) '' - auth_basic secured; - auth_basic_user_file ${if vhost.basicAuthFile != null then vhost.basicAuthFile else mkHtpasswd vhostName vhost.basicAuth}; - ''} + ${mkBasicAuth vhostName vhost} ${mkLocations vhost.locations} @@ -295,7 +292,16 @@ let ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"} } '') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations))); - mkHtpasswd = vhostName: authDef: pkgs.writeText "${vhostName}.htpasswd" ( + + mkBasicAuth = name: zone: optionalString (zone.basicAuthFile != null || zone.basicAuth != {}) (let + auth_file = if zone.basicAuthFile != null + then zone.basicAuthFile + else mkHtpasswd name zone.basicAuth; + in '' + auth_basic secured; + auth_basic_user_file ${auth_file}; + ''); + mkHtpasswd = name: authDef: pkgs.writeText "${name}.htpasswd" ( concatStringsSep "\n" (mapAttrsToList (user: password: '' ${user}:{PLAIN}${password} '') authDef) From c7bf3828f04e512a6ef2691f7e48d527961f3692 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 20 Oct 2020 14:11:21 +0000 Subject: [PATCH 167/228] nginx: add basic auth support for locations --- .../services/web-servers/nginx/default.nix | 1 + .../web-servers/nginx/location-options.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index ee1053698636..e9630d379f36 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -290,6 +290,7 @@ let ${optionalString (config.return != null) "return ${config.return};"} ${config.extraConfig} ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"} + ${mkBasicAuth "sublocation" config} } '') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations))); diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix index 3d9e391ecf20..793f29f09fb1 100644 --- a/nixos/modules/services/web-servers/nginx/location-options.nix +++ b/nixos/modules/services/web-servers/nginx/location-options.nix @@ -9,6 +9,31 @@ with lib; { options = { + basicAuth = mkOption { + type = types.attrsOf types.str; + default = {}; + example = literalExample '' + { + user = "password"; + }; + ''; + description = '' + Basic Auth protection for a vhost. + + WARNING: This is implemented to store the password in plain text in the + nix store. + ''; + }; + + basicAuthFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Basic Auth password file for a vhost. + Can be created via: htpasswd -c <filename> <username> + ''; + }; + proxyPass = mkOption { type = types.nullOr types.str; default = null; From a4b86b2bf5bd85f1695a8b47bd07657758de1722 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 20 Oct 2020 16:05:41 +0000 Subject: [PATCH 168/228] nginx: test basic auth --- nixos/tests/all-tests.nix | 1 + nixos/tests/nginx-auth.nix | 47 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 nixos/tests/nginx-auth.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9ffeba27a7fe..4e4d8b5e6894 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -242,6 +242,7 @@ in nfs4 = handleTest ./nfs { version = 4; }; nghttpx = handleTest ./nghttpx.nix {}; nginx = handleTest ./nginx.nix {}; + nginx-auth = handleTest ./nginx-auth.nix {}; nginx-etag = handleTest ./nginx-etag.nix {}; nginx-pubhtml = handleTest ./nginx-pubhtml.nix {}; nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {}; diff --git a/nixos/tests/nginx-auth.nix b/nixos/tests/nginx-auth.nix new file mode 100644 index 000000000000..c0d24a20ddbc --- /dev/null +++ b/nixos/tests/nginx-auth.nix @@ -0,0 +1,47 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "nginx-auth"; + + nodes = { + webserver = { pkgs, lib, ... }: { + services.nginx = let + root = pkgs.runCommand "testdir" {} '' + mkdir "$out" + echo hello world > "$out/index.html" + ''; + in { + enable = true; + + virtualHosts.lockedroot = { + inherit root; + basicAuth.alice = "jane"; + }; + + virtualHosts.lockedsubdir = { + inherit root; + locations."/sublocation/" = { + alias = "${root}/"; + basicAuth.bob = "john"; + }; + }; + }; + }; + }; + + testScript = '' + webserver.wait_for_unit("nginx") + webserver.wait_for_open_port(80) + + webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot") + webserver.succeed( + "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:jane@lockedroot" + ) + + webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir") + webserver.fail( + "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html" + ) + webserver.succeed( + "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:john@lockedsubdir/sublocation/index.html" + ) + ''; +}) From 3361a037b9c29254b611de76dbc14bded60a3bd8 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 2 Nov 2020 08:15:28 -0500 Subject: [PATCH 169/228] nginx: add a warning that nginx's basic auth isn't very good. --- .../services/web-servers/nginx/location-options.nix | 7 +++++-- nixos/modules/services/web-servers/nginx/vhost-options.nix | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix index 793f29f09fb1..f2fc07255725 100644 --- a/nixos/modules/services/web-servers/nginx/location-options.nix +++ b/nixos/modules/services/web-servers/nginx/location-options.nix @@ -21,7 +21,7 @@ with lib; Basic Auth protection for a vhost. WARNING: This is implemented to store the password in plain text in the - nix store. + Nix store. ''; }; @@ -30,7 +30,10 @@ with lib; default = null; description = '' Basic Auth password file for a vhost. - Can be created via: htpasswd -c <filename> <username> + Can be created via: htpasswd -c <filename> <username>. + + WARNING: The generate file contains the users' passwords in a + non-cryptographically-securely hashed way. ''; }; diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 455854e2a965..cf211ea9a71b 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -198,7 +198,7 @@ with lib; Basic Auth protection for a vhost. WARNING: This is implemented to store the password in plain text in the - nix store. + Nix store. ''; }; @@ -207,7 +207,10 @@ with lib; default = null; description = '' Basic Auth password file for a vhost. - Can be created via: htpasswd -c <filename> <username> + Can be created via: htpasswd -c <filename> <username>. + + WARNING: The generate file contains the users' passwords in a + non-cryptographically-securely hashed way. ''; }; From a41a6a8bb7abb65844c37920a01203456410178f Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Mon, 2 Nov 2020 14:22:01 +0100 Subject: [PATCH 170/228] intel-media-sdk: 20.2.1 -> 20.3.1 --- .../libraries/intel-media-sdk/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 90f6b4d49b84..e59015832314 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11 +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11 , libXau, libXdmcp, libpthreadstubs }: stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "20.2.1"; + version = "20.3.1"; - src = fetchurl { - url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz"; - sha256 = "0m3ipfdknpgrdwiywlinl4sfkfrvyv7wmq1j83pmbr54z067sgg1"; + src = fetchFromGitHub { + owner = "Intel-Media-SDK"; + repo = "MediaSDK"; + rev = "intel-mediasdk-${version}"; + sha256 = "13b698zp9b228x81yly0qx3zvj821niz3yad74b229i3z7rf8wzd"; }; nativeBuildInputs = [ cmake pkgconfig ]; From e0dfa4f786a6c1b9e3aef758f912ff1231955b26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 15:44:31 +0000 Subject: [PATCH 171/228] kpt: 0.35.0 -> 0.36.1 --- pkgs/applications/networking/cluster/kpt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index 9b43f143bdc9..e50f6e3462c1 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.35.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "0pk4j809hh4hkr58wx42vyzcn2g7l2lb60f4j1837hkk3rwrxkpm"; + sha256 = "0j9a7lxspgw63xzz1f8r5fb67jxm5isdvfi5450v20virxch9afi"; }; - vendorSha256 = "0c5ycyjhzz18ny544ddrag39la0fl0d3zrbbv8szb5jx87jx67jj"; + vendorSha256 = "06kx85bf8mjmyhz5gp0la4fr8psnfz6i2rchc22sz2pgmsng1dfr"; subPackages = [ "." ]; From 4b6ad1bdf2f32f304c28683e53c4eede1e74ce70 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Oct 2020 00:01:04 +0000 Subject: [PATCH 172/228] omnisharp-roslyn: 1.37.1 -> 1.37.3 --- pkgs/development/tools/omnisharp-roslyn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index c435d80b08fc..24631481fde2 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.37.1"; + version = "1.37.3"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "04pyychzwhhcv0js0qyramz6nd0wz03qqqgvz1j9m9wxyiz0dv3c"; + sha256 = "09h4yxswrpxw9w4wscarbv2gypk9bwwsmpqyjfp6b5bh1frx2i67"; }; nativeBuildInputs = [ makeWrapper ]; From ea2535cb8bb32509ec5c78b6c04383b5c3b73e25 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 11:23:25 +0000 Subject: [PATCH 173/228] clevis: 14 -> 15 --- pkgs/tools/security/clevis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index 878e4fc9febf..0b8f50c11901 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "clevis"; - version = "14"; + version = "15"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - sha256 = "1j8id67jk3ikim2xh7vjg7j2ayrpm1a4n8v3n8r8pnr4rhqy76fd"; + sha256 = "0wfgd2v1r47ckh5qp60b903191fx0fa27zyadxlsb8riqszhmwvz"; }; nativeBuildInputs = [ meson ninja pkgconfig asciidoc ]; From 4a8bbb98b49088228cc90d98b285acdb120c8e0c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 23:13:36 +0000 Subject: [PATCH 174/228] nix-build-uncached: 1.0.0 -> 1.0.1 --- pkgs/development/tools/misc/nix-build-uncached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix index eca2dc966624..6f7c146558c1 100644 --- a/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nix-build-uncached"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-build-uncached"; rev = "v${version}"; - sha256 = "106k4234gpi8mr0n0rfsgwk4z7v0b2gim0r5bhjvg2v566j67g02"; + sha256 = "1gfnlqh7ky0ynd6jwks2g3y04by10cad58chkddk1waq23j0a24v"; }; vendorSha256 = null; From 3f1cd94a2431ad4dfa1bc2dbb373c30234d8b475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 Oct 2020 06:08:11 +0100 Subject: [PATCH 175/228] nix-build-uncached: 1.0.1 -> 1.0.2 --- pkgs/development/tools/misc/nix-build-uncached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix index 6f7c146558c1..6450ee433857 100644 --- a/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nix-build-uncached"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-build-uncached"; rev = "v${version}"; - sha256 = "1gfnlqh7ky0ynd6jwks2g3y04by10cad58chkddk1waq23j0a24v"; + sha256 = "0hjx2gdwzg02fzxhsf7akp03vqj2s7wmcv9xfqn765zbqnljz14v"; }; vendorSha256 = null; From d1ca65eb68e106dc7ba6471cdac866b0a0838fdc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Oct 2020 01:33:35 +0000 Subject: [PATCH 176/228] openxr-loader: 1.0.11 -> 1.0.12 --- pkgs/development/libraries/openxr-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index e03752872f9a..9e38f1e828df 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.11"; + version = "1.0.12"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "0f3x5h0hdjiqgjf5mzzlprbhrbyabxllrjmlzgc9fv5rgqyyphj5"; + sha256 = "0xcra2hcsm88rfd7zf52hccx3nvg9j65a595z7c0lrzv6jz04676"; }; nativeBuildInputs = [ cmake python3 ]; From 079523587df0c1c03f6d484c37ab6ed3883785ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 06:45:48 +0000 Subject: [PATCH 177/228] python37Packages.telethon-session-sqlalchemy: 0.2.15 -> 0.2.16 --- .../python-modules/telethon-session-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index ccacb9157e21..20fa793a8a63 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "telethon-session-sqlalchemy"; - version = "0.2.15"; + version = "0.2.16"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2ba603d95d5be6ddecd8ecaeaffba00b75b49dd80eb77f6228dd7b793ca67fd2"; + sha256 = "f847c57302a102eb88e29ed95b8f4efa69582db2966fd806c21376b9a66ad4a8"; }; propagatedBuildInputs = [ From 8b56e9daf5fc6f39b73026eddb5c639a2022a370 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 11:45:04 +0000 Subject: [PATCH 178/228] codeql: 2.3.1 -> 2.3.2 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 811c2b2463f1..ba50f643ab40 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.3.1"; + version = "2.3.2"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "1wbqccvj2a31b3h44rfanjrcv9gm4jl60a66mpxrbfjpmkd5hl35"; + sha256 = "1fzybh21jw02gdmqkh54gin4chqxj5r5alkrqk1wcryhf73brsbb"; }; nativeBuildInputs = [ From 0b8ca5644aa61a185b0e6dc5f44286338f6c878e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 24 Oct 2020 19:44:42 +0000 Subject: [PATCH 179/228] cproto: 4.7p -> 4.7q --- pkgs/development/tools/misc/cproto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index ef0e2cab7771..e18196fe595f 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "cproto"; - version = "4.7p"; + version = "4.7q"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # No version listings and apparently no versioned tarball over http(s). "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz" ]; - sha256 = "0vm1784yw8gax1r7bzgq0chjgfzwxvmkala2awghmd3zyi7k60nj"; + sha256 = "138n5j6lkanbbdcs63irzxny4nfgp0zk66z621xjbnybf920svpk"; }; # patch made by Joe Khoobyar copied from gentoo bugs From dac94664e24a2eee86a32f3ffe8d20c0448bb500 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 21:09:36 +0000 Subject: [PATCH 180/228] minder: 1.9.2 -> 1.11.3 --- pkgs/applications/misc/minder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index 14b9ebfe4c7d..bf94ac429947 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.9.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "0lhwwx515f0ycpinkhgbjnik7dj2c7fckikbgzwkzzs25xqp9ayj"; + sha256 = "137kyf82n5a2v0cm9q02rhv8rmbjgnj60h64prq90h0d42prj3gd"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; From de53dd6d6b646430d47d566fba9f0ab8a19e7246 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 17:10:52 +0000 Subject: [PATCH 181/228] leatherman: 1.12.1 -> 1.12.2 --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 4623e5ca70ef..75cb2db4f1b5 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { - sha256 = "1mgd7jqfg6f0y2yrh2m1njlwrpd15kas88776jdd5fsl7gvb5khn"; + sha256 = "1iz8w0q4m7dqshjqfbwxwrasabs4j8jlil4w3kxdr3v9ldkl4v3d"; rev = version; repo = "leatherman"; owner = "puppetlabs"; From 9190daba45c50e7c704aedcfb7438ef4938c0343 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 16:05:31 +0000 Subject: [PATCH 182/228] i3-gaps: 4.18.2 -> 4.18.3 --- pkgs/applications/window-managers/i3/gaps.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index fa1c97c14c1d..755ceb42161c 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,11 +3,11 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.18.2"; + version = "4.18.3"; src = fetchurl { url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2"; - sha256 = "0lz08wf4b0yprzqsmymn94kiyg885dcwmh0p64v2rnf52s165g2g"; + sha256 = "1hcakwyz78lgp8mhqv7pw86jlb3m415pfql1q19rkijnhm3fn3ci"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; From 1955ef11c937f731bb744307a553c7b866253d6c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 20:18:51 +0000 Subject: [PATCH 183/228] mandelbulber: 2.22 -> 2.23 --- pkgs/applications/graphics/mandelbulber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix index a3ab52ba8715..384ddac5b4c5 100644 --- a/pkgs/applications/graphics/mandelbulber/default.nix +++ b/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.22"; + version = "2.23"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "011y2nl0jakf29cxprjmj1ifqc9iva61q5f4kk47b03gq7jw8sl4"; + sha256 = "08izphj7jyk3wsq3qbzaf2fplys80vr39wliqc1i4c5cr90nrq1l"; }; nativeBuildInputs = [ From 4f1639bc516f59e62be6b381e9cdbf7fdbdc55ac Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Sun, 27 Sep 2020 21:21:55 +0200 Subject: [PATCH 184/228] shotcut: 20.09.13 -> 20.10.31 see https://github.com/mltframework/shotcut/releases also disable upgrade prompt as suggested by @ddennedy in https://github.com/NixOS/nixpkgs/issues/99851 --- pkgs/applications/video/shotcut/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index f1d77fb7d147..188d49a791ec 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -9,13 +9,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.22.1"; mkDerivation rec { pname = "shotcut"; - version = "20.09.13"; + version = "20.10.31"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1q7ba6j3b2yzn3y5z9s5ldh15wrvhi6vymhwm910nqa5379dcc21"; + sha256 = "16ypq1v396pibhh33nm78p6hr5fz3h74l0ykg9f72b8whw23jyz6"; }; enableParallelBuilding = true; @@ -27,7 +27,11 @@ mkDerivation rec { ]; NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt"; - qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" "SHOTCUT_VERSION=${version}" ]; + qmakeFlags = [ + "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + "SHOTCUT_VERSION=${version}" + "DEFINES+=SHOTCUT_NOUPGRADE" + ]; prePatch = '' sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp From c8f952fe546308470bc6d44e9b2cb75cb298d44a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 01:15:05 +0000 Subject: [PATCH 185/228] plex-mpv-shim: 1.8.0 -> 1.9.0 --- pkgs/applications/video/plex-mpv-shim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index 16e6cd826ec8..e25c101b5dfb 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "plex-mpv-shim"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; rev = "v${version}"; - sha256 = "0fi0glnl7nr6754r9jk7d7dsnjbdm7civvhcj2l009yxiv2rxzj3"; + sha256 = "06i6pp4jg0f9h6ash60fj1l5mbsdw3zyx7c6anbsrn86802i7paa"; }; propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; From 51a5874231698a0d471b7a42f0be577113a91775 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Oct 2020 13:30:32 +0000 Subject: [PATCH 186/228] byacc: 20200330 -> 20200910 --- pkgs/development/tools/parsing/byacc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index be526085b757..60e6796850c2 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20200330"; + version = "20200910"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "1c0zyn6v286i09jlc8gx6jyaa5438qyy985rqsd76kb8ibfy56g0"; + sha256 = "0c6gbvlgzi6yflri22w7fa2w3k5m3jk0xb5a43f3vwpa783hcn8a"; }; configureFlags = [ From 56d0b47ae7417320b8b05064a849aab16ed59ca9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 21:25:36 +0000 Subject: [PATCH 187/228] minio-client: 2020-08-08T02-33-58Z -> 2020-10-03T02-54-56Z --- pkgs/tools/networking/minio-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 505ecc4c2224..ba715571000f 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2020-08-08T02-33-58Z"; + version = "2020-10-03T02-54-56Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "15bkl3q0jidrwy04l0cdmha43r9wlxmlqkhmwz98b57rjrq6grql"; + sha256 = "0pc08w0xdkk9w8xya0q7d1601wprshq852419pwpi8hd7y3q381h"; }; - vendorSha256 = "1fsx8zl2qkyf1gx3s6giccd86xawx9d1h4jdnyn1m36clsq9jkpc"; + vendorSha256 = "0bkidqcdfjyqjlzxy9w564c6s3vw850wgq6ksx5y1p8f5r4plzxs"; doCheck = false; From e6e6578623306610aa370ec5b5df883d9e68a278 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 16:13:59 +0000 Subject: [PATCH 188/228] keepalived: 2.1.3 -> 2.1.5 --- pkgs/tools/networking/keepalived/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 11ebe228be88..b773e116d8be 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "keepalived"; - version = "2.1.3"; + version = "2.1.5"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "1zdfvicpll7a5iw6p12pmdcg8y30mr0j5miycn0nhjp8yzi9hdc5"; + sha256 = "0zdh3g491mlc0x4g8q09vq62a7pb8n13a39jnfdgrm9k29khn0sj"; }; buildInputs = [ From 974d291dea06cd609a650f72030b58332b656f15 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 18:24:30 +0000 Subject: [PATCH 189/228] libp11: 0.4.10 -> 0.4.11 --- pkgs/development/libraries/libp11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index 4bf0b020118d..a1e6d05440c0 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libp11"; - version = "0.4.10"; + version = "0.4.11"; src = fetchFromGitHub { owner = "OpenSC"; repo = "libp11"; rev = "${pname}-${version}"; - sha256 = "1m4aw45bqichhx7cn78d8l1r1v0ccvwzlfj09fay2l9rfic5jgfz"; + sha256 = "0hcl706i04nw5c1sj7l6sj6m0yjq6qijz345v498jll58fp5wif8"; }; configureFlags = [ From d3a12ae060d0e5c9e242ae0489e659525c7bf89f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 06:30:47 +0000 Subject: [PATCH 190/228] python37Packages.sshtunnel: 0.1.5 -> 0.2.1 --- pkgs/development/python-modules/sshtunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index ff9d77bc7820..f37ba1545748 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.1.5"; + version = "0.2.1"; pname = "sshtunnel"; src = fetchPypi { inherit pname version; - sha256 = "0jcjppp6mdfsqrbfc3ddfxg1ybgvkjv7ri7azwv3j778m36zs4y8"; + sha256 = "ce28bf9abe6c6b00c5d10343a68c1325f8409ebfb9bf1c1d863a31afa3983cd7"; }; propagatedBuildInputs = [ paramiko ]; From dd67766f543441efa13771fdcdac258554ac9d14 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 2 Nov 2020 08:11:17 -0800 Subject: [PATCH 191/228] azure-cli: pin sshtunnel --- pkgs/tools/admin/azure-cli/python-packages.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index f13e37d89e97..ca094137d7f8 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -411,6 +411,17 @@ let }; }); + sshtunnel = super.sshtunnel.overridePythonAttrs(oldAttrs: rec { + name = "sshtunnel-${version}"; + version = "0.1.5"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "0jcjppp6mdfsqrbfc3ddfxg1ybgvkjv7ri7azwv3j778m36zs4y8"; + }; + }); + websocket_client = super.websocket_client.overridePythonAttrs(oldAttrs: rec { version = "0.56.0"; From 2702aced5e9cfd404c1592555ceda0499f52762f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 11:06:29 +0000 Subject: [PATCH 192/228] charliecloud: 0.19 -> 0.20 --- pkgs/applications/virtualization/charliecloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index a7e8260765fe..d6cbc25d883b 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.19"; + version = "0.20"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "1rmvm0s1jdpzfg32b3hwsbdkzws7gsy4xq227hmzv3n2dv64svm6"; + sha256 = "15ihffwhpjnzgz0ir5vc9la4fwkqj91vmrcsb2r58ikq7h9sk45j"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; From 41e1c236bf7281c72b135fe037b1528d0f834761 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 12:55:33 +0000 Subject: [PATCH 193/228] cytoscape: 3.8.1 -> 3.8.2 --- pkgs/applications/science/misc/cytoscape/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 12cdeb453d7a..647492bbe318 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.8.1"; + version = "3.8.2"; src = fetchurl { url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz"; - sha256 = "006g0w29sccg5h0zlrxdp3lx4vx1bfdhx2cms6aah85r5b82wgkf"; + sha256 = "0zgsq9qnyvmq96pgf7372r16rm034fd0r4qa72xi9zbd4f2r7z8w"; }; patches = [ From 3b70b694767d2a342a80b79a713cba7f3774e449 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Oct 2020 13:40:18 +0000 Subject: [PATCH 194/228] catch2: 2.12.3 -> 2.13.2 --- pkgs/development/libraries/catch2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 49b2e9be02ca..6d6282debf97 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.12.3"; + version = "2.13.2"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="0rp30754frp88wbl17ksr40mmffw5xibq73blgx9jj42d7nl891x"; + sha256="100r0kmra8jmra2hv92lzvwcmphpaiccwvq3lpdsa5b7hailhach"; }; nativeBuildInputs = [ cmake ]; From f06af68d0f531aa8d822172f0616e0a181470eae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 12:03:37 +0000 Subject: [PATCH 195/228] coredns: 1.7.1 -> 1.8.0 --- pkgs/servers/dns/coredns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 6b3d35e36389..ff0211d37e7c 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "0ggkpdlwrmyaicn61qyx4m5svmw7px0gfwl8mhhif8dfmjznfkir"; + sha256 = "04hkz70s5i7ndwyg39za3k83amvmi90rkjm8qp3w3a8fbmq4q4y6"; }; - vendorSha256 = "0fzgqgfmyqfyap0j81ihag0319cq34k3y0a9rxkg9cg23hn1d5gf"; + vendorSha256 = "1zwrf2pshb9r3yvp7mqali47163nqhvs9ghflczfpigqswd1m0p0"; doCheck = false; From d390372c1964fdc5e18676ead1c87b646b2d4b58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 15:08:22 +0000 Subject: [PATCH 196/228] fluent-bit: 1.6.0 -> 1.6.2 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 174c0f42684f..51b58a8102de 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1m8ly2h52mw67kqc7qqpf7sxxnyk4fnw2qavjpj6zgw3i6dhj0p1"; + sha256 = "0v2n43mn6n4nn6r2d4ksp98793xkx334xp078vhvgi01nsmd60x7"; }; nativeBuildInputs = [ cmake flex bison ]; From e99270812fe82647c214543901025713789aaaf6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Oct 2020 12:48:33 +0000 Subject: [PATCH 197/228] cutelyst: 2.12.0 -> 2.13.0 --- pkgs/development/libraries/cutelyst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index d5e83f0410c4..1befa89c7d05 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "cutelyst"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "1ngacc7ackp08hajby0xvzpvnqahwm2dbxmisw7j7qs1lqrx9k3n"; + sha256 = "1xbw8ag3iwm69dhrsg54anrlzvvflj6pwsj42z6hrl0yckabn99z"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; From ccabae32dd3ee4afab4d3dba3b469034d5c6a31b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 01:18:05 +0000 Subject: [PATCH 198/228] gtkwave: 3.3.106 -> 3.3.107 --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 36cc19142d19..ad5e9e55c575 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.106"; + version = "3.3.107"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "0ma53s27735x16dq5qi91kvlypkiwkxh2jhw0gziyccnk1mkdsji"; + sha256 = "0ma30jyc94iid3v3m8aw4i2lyiqfxkpsdvdmmaibynk400cbzivl"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; From b4ca4631eb31ef180721c3e6f1634a7b97a9b874 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 16:30:59 +0000 Subject: [PATCH 199/228] kpcli: 3.4 -> 3.6 --- pkgs/tools/security/kpcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 09916f85f9e6..12e2bb03d38d 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - version = "3.4"; + version = "3.6"; pname = "kpcli"; src = fetchurl { url = "mirror://sourceforge/kpcli/${pname}-${version}.pl"; - sha256 = "0s46cni16ph93havmkrlai3k13mdppyca1s2bqm751a6rirmsgj0"; + sha256 = "1srd6vrqgjlf906zdyxp4bg6gihkxn62cpzyfv0zzpsqsj13iwh1"; }; buildInputs = [ makeWrapper perl ]; From 426e0fbe9c19e96f7b62e7a28aba787f22f423b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 00:55:20 +0000 Subject: [PATCH 200/228] intel-gmmlib: 20.2.5 -> 20.3.2 --- pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 89305baaee80..d271313f95de 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "20.2.5"; + version = "20.3.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "0jg3kc74iqmbclx77a6dp4h85va8wi210x4zf5jypiq35c57r8hh"; + sha256 = "0727pr7sknqi859gb5z472kgbbwx40574iyls8fgirm7lcz6gbd9"; }; nativeBuildInputs = [ cmake ]; From 9f9bc40e5770bc8b4b5442995578c86ca992642f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 16:41:45 +0000 Subject: [PATCH 201/228] keepass: 2.45 -> 2.46 --- pkgs/applications/misc/keepass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 23f80eaa9cab..6164a60d6a86 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -3,11 +3,11 @@ with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.45"; + version = "2.46"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "07wyp3k2kiprr47mc4vxb7vmh7g5kshcqw0gq3qr87gi78c9i66m"; + sha256 = "0zyclydgyg8nhwxrzw7x4f82975cqdmp12py33k6sballx6jhgiy"; }; sourceRoot = "."; From a60aff6cb6e3f2f4b032e6353ee59d5624c3cd40 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 16:47:50 +0000 Subject: [PATCH 202/228] knightos-kpack: 1.1.0 -> 1.1.1 --- pkgs/development/tools/knightos/kpack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/knightos/kpack/default.nix b/pkgs/development/tools/knightos/kpack/default.nix index c1ecb963d243..657a1712ed24 100644 --- a/pkgs/development/tools/knightos/kpack/default.nix +++ b/pkgs/development/tools/knightos/kpack/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "kpack"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "KnightOS"; repo = "kpack"; rev = version; - sha256 = "0kakfbzdvq5ldv1gdzl473j73c9nfdyx4xzfkriglkrqmksqc329"; + sha256 = "1l6bm2j45946i80qgwhrixg9sckazwb5x4051s76d3mapq9bara8"; }; nativeBuildInputs = [ cmake ]; From 7c1ff55c77d7432a21aea1577244b7c5c3e0cca9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 17:25:51 +0000 Subject: [PATCH 203/228] libfabric: 1.11.0 -> 1.11.1 --- pkgs/os-specific/linux/libfabric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix index 52de79e1f2df..1911391c935c 100644 --- a/pkgs/os-specific/linux/libfabric/default.nix +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.11.0"; + version = "1.11.1"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "1wgn6gsiy64rb76i46dsqlvp687lwqzxwg5lgj1y5y7lyqbq96wp"; + sha256 = "17qq96mlfhbkbmsvbazhxzkjnh6x37xlh3r0ngp0rfqbl05z2pcr"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] ; From 6a8da1147b4fa43e15a25cdfcdcf78f2c2fc13f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Nov 2020 01:30:23 +0000 Subject: [PATCH 204/228] libgnurl: 7.70.0 -> 7.72.0 --- pkgs/development/libraries/libgnurl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 25917c44bd02..5daeba2c06e6 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgnurl"; - version = "7.70.0"; + version = "7.72.0"; src = fetchurl { url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; - sha256 = "0px9la8v4bj1dzxb95fx3yxk0rcjqjrxpj733ga27cza45wwzkqa"; + sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi"; }; nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; From ceacafafbd1458b714d35a17db1725f8472a4e8b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 2 Nov 2020 10:00:23 -0800 Subject: [PATCH 205/228] libsForQt.kpeoplevcard: fix homepage --- pkgs/development/libraries/kpeoplevcard/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kpeoplevcard/default.nix b/pkgs/development/libraries/kpeoplevcard/default.nix index c405532e4363..d2244a252347 100644 --- a/pkgs/development/libraries/kpeoplevcard/default.nix +++ b/pkgs/development/libraries/kpeoplevcard/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { meta = with lib; { description = "Pulseaudio bindings for Qt"; - homepage = "KPeople VCard Support"; + homepage = "https://github.com/KDE/kpeoplevcard"; license = with licenses; [ lgpl2 ]; maintainers = with maintainers; [ doronbehar ]; }; From 693f2aa17a5891b560e28c3f266084d6aaeeb9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 2 Nov 2020 13:56:46 +0100 Subject: [PATCH 206/228] python3Packages.srsly: 2.3.0 -> 2.3.1 Changelog: https://github.com/explosion/srsly/releases/tag/v2.3.1 --- pkgs/development/python-modules/srsly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 0565973da40d..77bd9cdf5847 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.3.0"; + version = "2.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f994a266f6e547c8ffe803cb90baed7ca566831f924e0491402564ba0d185e66"; + sha256 = "3dcce93c69ff18e8a8d7decfdfdf8e1fd44c4446cdee8d0e5d545d6b172dc377"; }; nativeBuildInputs = [ cython ]; From 20d24d0b15dfb24975d88b0a19b2a7ecea624705 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Nov 2020 19:33:35 +0100 Subject: [PATCH 207/228] python3Packages.pyserial-asyncio: propagate pyserial Fixes errors like this: ERROR: Could not find a version that satisfies the requirement pyserial (from pyserial-asyncio>=0.4->pysml==0.0.2) (from versions: none) --- pkgs/development/python-modules/pyserial-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyserial-asyncio/default.nix b/pkgs/development/python-modules/pyserial-asyncio/default.nix index c299ad8acae5..cf90275cd19c 100644 --- a/pkgs/development/python-modules/pyserial-asyncio/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { disabled = !isPy3k; # Doesn't support python older than 3.4 - buildInputs = [ pyserial ]; - src = fetchPypi { inherit pname version; sha256 = "1vlsb0d03krxlj7vpvyhpinnyxyy8s3lk5rs8ba2932dhyl7f1n4"; }; + propagatedBuildInputs = [ pyserial ]; + meta = with stdenv.lib; { description = "asyncio extension package for pyserial"; homepage = "https://github.com/pyserial/pyserial-asyncio"; From 844665bdf353759d2a75df2393cec0636261b110 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 2 Nov 2020 19:15:37 +0100 Subject: [PATCH 208/228] tdesktop: 2.4.5 -> 2.4.6 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- .../instant-messengers/telegram/tdesktop/tg_owt.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index ed1b643960c9..a754e544bc07 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -22,12 +22,12 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "2.4.5"; + version = "2.4.6"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0nhzypgc45f5gqy53azj7mljnj7p9p0m7bil02f9cih1dg5sdxx5"; + sha256 = "190k9ik678br5k892gj26bx4rbj5rn5ks4qgf2nrlgww0z59fvrc"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 4695e61f7d5b..48499bf9f2c7 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -3,8 +3,8 @@ }: let - rev = "1d4f7d74ff1a627db6e45682efd0e3b85738e426"; - sha256 = "1w03xmjn693ff489pg368jv21478vr4ldxyya4lsrx87fn88caj3"; + rev = "e8fcae73947445db3d418fb7c20b964b59e14706"; + sha256 = "0s2dd41r71aixhvympiqfks1liv7x78y60n0i87vmyxyfx449b5h"; in stdenv.mkDerivation { pname = "tg_owt"; From da5d8f384d1f774f1079f87210e5ca0b5be45dfa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 18:59:50 +0000 Subject: [PATCH 209/228] libfprint: 1.90.2 -> 1.90.3 --- pkgs/development/libraries/libfprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 7c6168c3d3e4..cc4e7dfefeef 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.90.2"; + version = "1.90.3"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "0g890y49anqd7yfz86iyvywxgbfmfmj6813fy58m5n8jain7iy1b"; + sha256 = "1fs0qrfrqnvc6kcsg81l5p89n8jnsx9dr1pzxpb8ghwas8c9v52i"; }; nativeBuildInputs = [ From 85df0592c9a2c04b65033a3ea29e0a75f2186a88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 19:12:45 +0000 Subject: [PATCH 210/228] libhdhomerun: 20200521 -> 20200907 --- pkgs/development/libraries/libhdhomerun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 73d53bdccd73..577457afdbf8 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20200521"; + version = "20200907"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "0s0683bwyd10n3r2sanlyd07ii3fmi3vl9w9a2rwlpcclzq3h456"; + sha256 = "1v80jk056ii2iv2w7sq24i3prjrbhxql5vqhafs7vq54qmwvgbnb"; }; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' From fb3d7972427875e9a550e4819476d24dd6c68793 Mon Sep 17 00:00:00 2001 From: luc65r Date: Wed, 28 Oct 2020 12:03:48 +0100 Subject: [PATCH 211/228] convimg: init at 8.3 --- pkgs/tools/misc/convimg/default.nix | 43 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/misc/convimg/default.nix diff --git a/pkgs/tools/misc/convimg/default.nix b/pkgs/tools/misc/convimg/default.nix new file mode 100644 index 000000000000..f9de88cb01e5 --- /dev/null +++ b/pkgs/tools/misc/convimg/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "convimg"; + version = "8.3"; + + src = fetchFromGitHub { + owner = "mateoconlechuga"; + repo = pname; + rev = "v${version}"; + sha256 = "1k2fkzfg08y2gcm8jabmb2plgqmgw6y30m73ys4mmbskxgy7hc3s"; + fetchSubmodules = true; + }; + + makeFlags = [ "CC=cc" ]; + + checkPhase = '' + pushd test + patchShebangs test.sh + ./test.sh + popd + ''; + + doCheck = true; + + installPhase = '' + install -Dm755 bin/convimg $out/bin/convimg + ''; + + meta = with stdenv.lib; { + description = "Image palette quantization"; + longDescription = '' + This program is used to convert images to other formats, + specifically for the TI84+CE and related calculators. + ''; + homepage = "https://github.com/mateoconlechuga/convimg"; + license = licenses.bsd3; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cb0ac859007..97cd5391cca0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3074,6 +3074,8 @@ in convbin = callPackage ../tools/misc/convbin { }; + convimg = callPackage ../tools/misc/convimg { }; + convmv = callPackage ../tools/misc/convmv { }; convoy = callPackage ../tools/filesystems/convoy { }; From 448729ea16c179ab1e9cb69eb949d2f62ab2a0c1 Mon Sep 17 00:00:00 2001 From: luc65r Date: Wed, 28 Oct 2020 12:04:04 +0100 Subject: [PATCH 212/228] convfont: init at 1.0 --- pkgs/tools/misc/convfont/default.nix | 29 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/convfont/default.nix diff --git a/pkgs/tools/misc/convfont/default.nix b/pkgs/tools/misc/convfont/default.nix new file mode 100644 index 000000000000..0cc181082a4f --- /dev/null +++ b/pkgs/tools/misc/convfont/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "convfont"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "drdnar"; + repo = pname; + rev = "v20190438"; + sha256 = "1lj24yq5gj9hxhy1srk73521q95zyqzkws0q4v271hf5wmqaxa2f"; + }; + + makeFlags = [ "CC=cc" ]; + + installPhase = '' + install -Dm755 convfont $out/bin/convfont + ''; + + meta = with stdenv.lib; { + description = "Converts font for use with FontLibC"; + homepage = "https://github.com/drdnar/convfont"; + license = licenses.wtfpl; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97cd5391cca0..89fd39148de7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3076,6 +3076,8 @@ in convimg = callPackage ../tools/misc/convimg { }; + convfont = callPackage ../tools/misc/convfont { }; + convmv = callPackage ../tools/misc/convmv { }; convoy = callPackage ../tools/filesystems/convoy { }; From 5e4b485d865033cfbaeb98716588f8499f752fc3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 19:42:21 +0000 Subject: [PATCH 213/228] libratbag: 0.14 -> 0.15 --- pkgs/os-specific/linux/libratbag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index 48ee5d16c5c0..e9f090255f92 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libratbag"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "libratbag"; repo = "libratbag"; rev = "v${version}"; - sha256 = "1fpwp2sj8mf98bqasq2h8qwgprxi7k3iw33gcfid3d1lbyiacw0x"; + sha256 = "0z6ps5aqwjmbdvahs80fh9cdgcvp4q4w3kfycmzv4kzgzihjki7b"; }; nativeBuildInputs = [ From 94bf1da7e5911c4c085d51d32fe3aa3915cbfc69 Mon Sep 17 00:00:00 2001 From: Diego Rodriguez Date: Mon, 2 Nov 2020 12:46:09 -0700 Subject: [PATCH 214/228] aws-okta: 1.0.5 -> 1.0.6 --- pkgs/tools/security/aws-okta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 7349f00e5b80..d4abe12d664c 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "aws-okta"; - version = "1.0.5"; + version = "1.0.6"; goPackagePath = "github.com/segmentio/aws-okta"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "segmentio"; repo = "aws-okta"; rev = "v${version}"; - sha256 = "1xd73j6rbbdrnzj0m8dqwcvn62cz6bygdpxsx8g7117qbdzz2lj1"; + sha256 = "1nhcqj3vhdgk0a0smmyqphjw2slcvqbb8xd8bx506j8h8x84p6yf"; }; buildFlags = [ "--tags" "release" ]; From 1e9d2d2f12c2f7367f744107a9e68b64beb6beb0 Mon Sep 17 00:00:00 2001 From: luc65r Date: Thu, 29 Oct 2020 19:58:28 +0100 Subject: [PATCH 215/228] keystone: init at 0.9.2 --- .../libraries/keystone/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/keystone/default.nix diff --git a/pkgs/development/libraries/keystone/default.nix b/pkgs/development/libraries/keystone/default.nix new file mode 100644 index 000000000000..dc83209c1479 --- /dev/null +++ b/pkgs/development/libraries/keystone/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, cmake +, python3 +}: + +stdenv.mkDerivation rec { + pname = "keystone"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "keystone-engine"; + repo = pname; + rev = version; + sha256 = "020d1l1aqb82g36l8lyfn2j8c660mm6sh1nl4haiykwgdl9xnxfa"; + }; + + nativeBuildInputs = [ + pkg-config + cmake + python3 + ]; + + meta = with stdenv.lib; { + description = "Lightweight multi-platform, multi-architecture assembler framework"; + homepage = "https://www.keystone-engine.org"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a37fab7ec3db..111ed500554c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1651,6 +1651,8 @@ in capstone = callPackage ../development/libraries/capstone { }; unicorn-emu = callPackage ../development/libraries/unicorn-emu { }; + keystone = callPackage ../development/libraries/keystone { }; + casync = callPackage ../applications/networking/sync/casync { sphinx = python3Packages.sphinx; }; From f4f9f307a458a1f6b6c2383f7309408f2c4dab63 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 2 Nov 2020 16:02:59 -0500 Subject: [PATCH 216/228] nixUnstable: 3.0pre20201020_e0ca98c -> 2.4pre20201102_550e11f --- pkgs/tools/package-management/nix/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 791780ae0951..2762a3df7381 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -32,8 +32,8 @@ common = inherit name src; version = lib.getVersion name; - is30 = lib.versionAtLeast version "3.0pre"; - isExactly30 = lib.versionAtLeast version "2.3" && lib.versionOlder version "3.0"; + is24 = lib.versionAtLeast version "2.4pre"; + isExactly24 = lib.versionAtLeast version "2.4" && lib.versionOlder version "2.4"; VERSION_SUFFIX = suffix; @@ -41,7 +41,7 @@ common = nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals is30 + ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex @@ -54,7 +54,7 @@ common = brotli boost editline ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is30 [ libarchive gmock ] + ++ lib.optionals is24 [ libarchive gmock ] ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS ((aws-sdk-cpp.override { @@ -93,9 +93,9 @@ common = patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} '' + - # For Nix 3.0, patch around an issue where the Nix configure step pulls in the + # For Nix 2.4, patch around an issue where the Nix configure step pulls in the # build system's bash and other utilities when cross-compiling - lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly30) '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly24) '' mkdir tmp/ substitute corepkgs/config.nix.in tmp/config.nix.in \ --subst-var-by bash ${bash}/bin/bash \ @@ -198,14 +198,14 @@ in rec { }); nixUnstable = lib.lowPrio (callPackage common rec { - name = "nix-3.0${suffix}"; - suffix = "pre20201020_e0ca98c"; + name = "nix-2.4${suffix}"; + suffix = "pre20201102_550e11f"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "e0ca98c2071b815578470e280df8fdb750c7e23b"; - hash = "sha256-KVS/Z6FzMBOl5XCyOLwfiVoX7G2LQRa9HMGNnJRPCoo="; + rev = "550e11f077ae508abde5a33998a9d4029880e7b2"; + sha256 = "186grfxsfqg7r92wgwbma66xc7p3iywn43ff7s59m4g6bvb0qgcl"; }; inherit storeDir stateDir confDir boehmgc; From 42cc40ddc8109e682a31ad1971c2f0450c5dd839 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 2 Nov 2020 21:59:00 +0100 Subject: [PATCH 217/228] neovim: fix nodejs and ruby generation These were not translated correctly in the new wrapper. --- pkgs/applications/editors/neovim/utils.nix | 7 ++++--- pkgs/applications/editors/neovim/wrapper.nix | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index d3af8ca5d59a..906a726924f9 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -24,7 +24,7 @@ let withPython2 ? false /* the function you would have passed to python.withPackages */ , extraPython2Packages ? (_: [ ]) - , withPython3 ? true + , withPython3 ? true /* the function you would have passed to python3.withPackages */ , extraPython3Packages ? (_: [ ]) , withNodeJs ? false @@ -45,7 +45,6 @@ let ''; }; - requiredPlugins = vimUtils.requiredPlugins configure; getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ])); @@ -104,9 +103,11 @@ let wrapperArgs = makeWrapperArgs; inherit neovimRcContent; inherit manifestRc; - inherit rubyEnv; inherit python2Env; inherit python3Env; + inherit withNodeJs; + } // lib.optionalAttrs withRuby { + inherit rubyEnv; }; genProviderSettings = prog: withProg: diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index d18d13a050fe..71bc38eadcfb 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -18,8 +18,8 @@ let , manifestRc ? null , withPython2 ? true, python2Env ? null , withPython3 ? true, python3Env ? null - , withNodeJs? false - , withRuby ? true, rubyEnv ? null + , withNodeJs ? false + , rubyEnv ? null , vimAlias ? false , viAlias ? false , ... @@ -52,7 +52,7 @@ let + optionalString withPython3 '' makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH '' - + optionalString withRuby '' + + optionalString (rubyEnv != null) '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby '' + optionalString withNodeJs '' From 89dd2293cc325592072bdf8007b58721dc10e39c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 23:35:04 +0000 Subject: [PATCH 218/228] libjcat: 0.1.3 -> 0.1.4 --- pkgs/development/libraries/libjcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index bbf0db233821..1eca110f8cb5 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.3"; + version = "0.1.4"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "157bi1v9qqk45rkq7lg08l7g3bxwacl4h89vnr7msjmg0hri36kc"; + sha256 = "156sykcdzdfmd7va59qld4gyzhbf2yk1dfgifi494g6i99zyigfh"; }; patches = [ From 76acdc7bf4bbfc809306e07bb4e68cb102f16222 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Nov 2020 00:23:10 +0000 Subject: [PATCH 219/228] kubeseal: 0.12.6 -> 0.13.1 --- pkgs/applications/networking/cluster/kubeseal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 51b53ed8fa18..51ae1202a378 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.12.6"; + version = "0.13.1"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "0h8v751jf8hws8zcai6vfsk5vmq6f9kwz2dg79l6xa0dfc2rv4zf"; + sha256 = "1hlj7i7pjyvrf9cpx6s41sdn7wjwfk7c0akx45kw662vrxcqcgf2"; }; vendorSha256 = null; From b55e44549444a676376ef3b2fc317be70659529f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Nov 2020 00:30:15 +0000 Subject: [PATCH 220/228] libgpiod: 1.5.2 -> 1.6 --- pkgs/development/libraries/libgpiod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 68078bbc9a03..25eb4290e511 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.5.2"; + version = "1.6"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "1bknh7kn5gxc8xwf913lsdm9zgn1bwj42nsnp6kbkyn6ip7s6c4r"; + sha256 = "0xcwrg4p4w925lijmz4ci4500z83kj5gs1n501q4vhi54bdzn2k5"; }; buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; From 573dde99db5a973b4caa07970741e73f70e13e70 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Nov 2020 00:54:29 +0000 Subject: [PATCH 221/228] libavif: 0.8.1 -> 0.8.2 --- pkgs/development/libraries/libavif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 7b6d1ecfbb27..e8fdc6eb206b 100644 --- a/pkgs/development/libraries/libavif/default.nix +++ b/pkgs/development/libraries/libavif/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libavif"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "1fs222cn1d60pv5fjsr92axk5dival70b6yqw0wng5ikk9zsdkhy"; + sha256 = "0f0l8ywz2jhc9mkfrzdxdvr3q39a404yn9wcyvqshfbkbprsan4p"; }; # reco: encode libaom slowest but best, decode dav1d fastest From e2b32e0567551ca43471e1bf1923bb8c928ae6fa Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 2 Nov 2020 17:48:26 -0800 Subject: [PATCH 222/228] .github/CODEOWNERS: add jonringer to neovim --- .github/CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7d6d7205a144..0da1e4c91a77 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -176,6 +176,9 @@ /pkgs/applications/editors/emacs @adisbladis /pkgs/top-level/emacs-packages.nix @adisbladis +# Neovim +/pkgs/applications/editors/neovim @jonringer + # VimPlugins /pkgs/misc/vim-plugins @jonringer @softinio From 76ff5a73c7ce67eab69258e0a31d907eb1d3a48b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 2 Nov 2020 22:00:00 -0500 Subject: [PATCH 223/228] gitAndTools.git-absorb: 0.6.5 -> 0.6.6 --- .../git-and-tools/git-absorb/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 46a6f817417f..d8e34f570058 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -2,23 +2,27 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "tummychow"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "12ih0gm07ddi86jy612f029nzav345v57pjajyy9lw017g6n6mjb"; + sha256 = "04v10bn24acify34vh5ayymsr1flcyb05f3az9k1s2m6nlxy5gb9"; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "0x2zcw0bpwqimvbb5xj8xawvl4jcvk5lj0y2mm5ncbdapzyqdsb2"; + cargoSha256 = "0h0vlz4qd8i9bf1mgjr618zbdwfp6bmy7ql9a1xzjmfdpkl3cgk9"; postInstall = '' installManPage Documentation/git-absorb.1 + for shell in bash zsh fish; do + $out/bin/git-absorb --gen-completions $shell > git-absorb.$shell + installShellCompletion git-absorb.$shell + done ''; meta = with stdenv.lib; { From 428701ba392d7edf97b40a08516bd4663f8b2f80 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 13:31:57 +0000 Subject: [PATCH 224/228] krename: 5.0.0 -> 5.0.1 --- pkgs/applications/misc/krename/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 578c56a748a7..c1e031b7277d 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -7,14 +7,14 @@ let pname = "krename"; - version = "5.0.0"; + version = "5.0.1"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "136j1dkqrhv458rjh5v3vzjhvq6dhz7k79zk6mmx8zvqacc7cq8a"; + sha256 = "0zbadxjp13jqxgb58wslhm0wy2lhpdq1bgbvyhyn21mssfppib6a"; }; buildInputs = [ taglib exiv2 podofo ]; From 1c63f359933b97e00dfc27478d669513ee836637 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Nov 2020 07:13:06 +0000 Subject: [PATCH 225/228] memcached: 1.6.6 -> 1.6.8 --- pkgs/servers/memcached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index b6c6031f1509..182ca6bcd90e 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.6"; + version = "1.6.8"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "1xrj7vy05nc6bky4wnrmrbxfibvk5vq4dp2fwk4jk4amzbn0x3wh"; + sha256 = "0fbrrn7mkhv5xci4cffxxb8qzr9c0n3y58jymq2aqlpzyq8klfz2"; }; configureFlags = [ From 74dcd27d780f3d57f5083c0f7c8ae9b6b562d9c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Nov 2020 07:55:26 +0000 Subject: [PATCH 226/228] mpd: 0.22.1 -> 0.22.2 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index d994ba99dfc3..c025da8752de 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -115,13 +115,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.22.1"; + version = "0.22.2"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "16cdmr5w1ikz4ih1nwxnynfdf8qiz4k8bak1sazkkhyavzl3jrl4"; + sha256 = "1pg3h3bvrsp24pv53yvwl5kr4m2csaxffdbrj5rm3b7w6pbqpfix"; }; buildInputs = [ From 86d7ed8d107042fa577e5975f37e372998e56fd9 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 3 Nov 2020 09:26:59 +0100 Subject: [PATCH 227/228] neovim: take into account vi(m)Alias restore feature broken by compatibility layer --- pkgs/applications/editors/neovim/utils.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 906a726924f9..d992ccd3f6a4 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -35,7 +35,7 @@ let # for forward compability, when adding new environments, haskell etc. , ... - }: + }@args: let rubyEnv = bundlerEnv { name = "neovim-ruby-env"; @@ -99,7 +99,7 @@ let manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; }); neovimRcContent = vimUtils.vimrcContent configure; in - { + args // { wrapperArgs = makeWrapperArgs; inherit neovimRcContent; inherit manifestRc; @@ -142,8 +142,7 @@ let extraPythonPackages = compatFun extraPythonPackages; inherit withPython3; extraPython3Packages = compatFun extraPython3Packages; - inherit withNodeJs withRuby; - + inherit withNodeJs withRuby viAlias vimAlias; inherit configure; }; in From cd6040869a9e785da28a7b592eb892b959c4d4f8 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 3 Nov 2020 09:38:14 +0100 Subject: [PATCH 228/228] .github/CODEOWNERS: add teto to neovim --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0da1e4c91a77..3ce1e940e5d5 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -178,6 +178,7 @@ # Neovim /pkgs/applications/editors/neovim @jonringer +/pkgs/applications/editors/neovim @teto # VimPlugins /pkgs/misc/vim-plugins @jonringer @softinio