From a9f7c1022ee16629db62d0442fda5191f479f3aa Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 12 May 2020 07:03:39 +0200 Subject: [PATCH 001/463] asciidoctor: fix dangling ascidoctor-safe symlink as such a binary does not appear to be in the gem --- pkgs/tools/typesetting/asciidoctor/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index f875cc26311..7a01dc2ff0a 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -12,7 +12,6 @@ let exes = [ "asciidoctor" "asciidoctor-pdf" - "asciidoctor-safe" "asciidoctor-epub3" ]; From 2e0542ebacb2b8cb938d848ab743ca9df702f56e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 21 Jun 2020 23:55:14 +0200 Subject: [PATCH 002/463] seeks: remove, upstream unmaintained --- nixos/modules/misc/ids.nix | 4 +- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 2 + nixos/modules/services/networking/seeks.nix | 75 --------------------- pkgs/tools/networking/p2p/seeks/default.nix | 69 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 7 files changed, 5 insertions(+), 151 deletions(-) delete mode 100644 nixos/modules/services/networking/seeks.nix delete mode 100644 pkgs/tools/networking/p2p/seeks/default.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 3409e7ba22e..4615d9b04ab 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -184,7 +184,7 @@ in consul = 145; mailpile = 146; redmine = 147; - seeks = 148; + #seeks = 148; # removed 2020-06-21 prosody = 149; i2pd = 150; systemd-network = 152; @@ -496,7 +496,7 @@ in #consul = 145; # unused mailpile = 146; redmine = 147; - seeks = 148; + #seeks = 148; # removed 2020-06-21 prosody = 149; i2pd = 150; systemd-network = 152; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0dba92f60c7..d25c3e1f1d7 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -713,7 +713,6 @@ ./services/networking/rxe.nix ./services/networking/sabnzbd.nix ./services/networking/searx.nix - ./services/networking/seeks.nix ./services/networking/skydns.nix ./services/networking/shadowsocks.nix ./services/networking/shairport-sync.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1dc7f853317..9d945cb7dbd 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -61,6 +61,8 @@ with lib; to handle FIDO security tokens, so this isn't necessary anymore. '') + (mkRemovedOptionModule [ "services" "seeks" ] "") + # Do NOT add any option renames here, see top of the file ]; } diff --git a/nixos/modules/services/networking/seeks.nix b/nixos/modules/services/networking/seeks.nix deleted file mode 100644 index 40729225b6d..00000000000 --- a/nixos/modules/services/networking/seeks.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.seeks; - - confDir = cfg.confDir; - - seeks = pkgs.seeks.override { seeks_confDir = confDir; }; - -in - -{ - - ###### interface - - options = { - - services.seeks = { - - enable = mkOption { - default = false; - type = types.bool; - description = " - Whether to enable the Seeks server. - "; - }; - - confDir = mkOption { - default = ""; - type = types.str; - description = " - The Seeks server configuration. If it is not specified, - a default configuration is used. - "; - }; - - }; - - }; - - - ###### implementation - - config = mkIf config.services.seeks.enable { - - users.users.seeks = - { uid = config.ids.uids.seeks; - description = "Seeks user"; - createHome = true; - home = "/var/lib/seeks"; - }; - - users.groups.seeks = - { gid = config.ids.gids.seeks; - }; - - systemd.services.seeks = - { - description = "Seeks server, the p2p search engine."; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "seeks"; - ExecStart = "${seeks}/bin/seeks"; - }; - }; - - environment.systemPackages = [ seeks ]; - - }; - -} diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix deleted file mode 100644 index eccf38f39fd..00000000000 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ fetchgit, stdenv, zlib, bzip2, docbook2x, pcre, curl, libxml2, libevent, perl -, pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv, autoconf, automake -, libtool, seeks_confDir ? "" -}: - -stdenv.mkDerivation { - name = "seeks-0.4.1"; - - src = fetchgit { - url = "git://github.com/beniz/seeks.git"; - rev = "1168b3a2f3111c3fca31dd961135194c3e8df5fd"; - sha256 = "18s2pxal9a2aayv63hc19vnkx5a5y9rhbipdpvkinbni5283iiar"; - }; - - buildInputs = - [ zlib bzip2 docbook2x pcre curl libxml2 libevent perl pkgconfig - protobuf tokyocabinet tokyotyrant opencv autoconf automake libtool - ]; - - configureFlags = - [ # Enable the built-in web server providing a web search interface. - "--enable-httpserv-plugin=yes" - "--with-libevent=${libevent.dev}" - ]; - - preConfigure = '' - ./autogen.sh - ''; - - postInstall = stdenv.lib.optionalString (seeks_confDir != "") '' - ln -svf ${seeks_confDir}/config $out/etc/seeks/config - ln -svf ${seeks_confDir}/cf-config $out/etc/seeks/cf-config - ln -svf ${seeks_confDir}/httpserv-config $out/etc/seeks/httpserv-config - ln -svf ${seeks_confDir}/img-websearch-config $out/etc/seeks/img-websearch-config - ln -svf ${seeks_confDir}/lsh-config $out/etc/seeks/lsh-config - ln -svf ${seeks_confDir}/query-capture-config $out/etc/seeks/query-capture-config - ln -svf ${seeks_confDir}/udb-service-config $out/etc/seeks/udb-service-config - ln -svf ${seeks_confDir}/uri-capture-config $out/etc/seeks/uri-capture-config - ln -svf ${seeks_confDir}/websearch-config $out/etc/seeks/websearch-config - ''; - - # FIXME: Test suite needs . - doCheck = false; - - meta = { - description = "Seeks, a social web search engine"; - - longDescription = - '' Seeks is a free and open technical design and application for - enabling social websearch. Its specific purpose is to regroup users - whose queries are similar so they can share both the query results - and their experience on these results. On this basis, Seeks allows - for true real-time, decentralized, websearch to emerge. - - In the long term, there is no need for web crawlers and third-party - web indexes as users can push content directly to search groups. - ''; - - license = stdenv.lib.licenses.agpl3Plus; - - homepage = "http://www.seeks-project.info/"; - - maintainers = [ - stdenv.lib.maintainers.matejc - ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice - broken = true; # 2018-04-11 - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 64392f49a52..b3fffdd2495 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -503,6 +503,7 @@ mapAliases ({ scim = sc-im; # added 2016-01-22 scollector = bosun; # added 2018-04-25 sdlmame = mame; # added 2019-10-30 + seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # added 2020-06-21 seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)"; shared_mime_info = shared-mime-info; # added 2018-02-25 skrooge2 = skrooge; # added 2017-02-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f858168781..2524e1c9950 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22042,10 +22042,6 @@ in seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; - seeks = callPackage ../tools/networking/p2p/seeks { - protobuf = protobuf3_1; - }; - sent = callPackage ../applications/misc/sent { }; seq24 = callPackage ../applications/audio/seq24 { }; From 8975b7b0e2f7b02af03175ca4552f74c668b77ca Mon Sep 17 00:00:00 2001 From: cfhammill Date: Mon, 13 Jul 2020 17:20:14 -0400 Subject: [PATCH 003/463] singularity-tools: Check for /bin/sh existence before symlink Fixes the case where the user has bashInteractive in the container contents --- pkgs/build-support/singularity-tools/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 54749e416ea..cf234abb55f 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -86,7 +86,9 @@ rec { done # Create runScript and link shell - ln -s ${runtimeShell} bin/sh + if [ ! -e bin/sh ]; then + ln -s ${runtimeShell} bin/sh + fi mkdir -p .singularity.d ln -s ${runScriptFile} .singularity.d/runscript From f34f25957957ef329e87c8effad6dd07c445daf1 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 1 Aug 2020 14:03:05 +0200 Subject: [PATCH 004/463] gomp: init at 1.1.0 --- .../version-management/gomp/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/version-management/gomp/default.nix diff --git a/pkgs/applications/version-management/gomp/default.nix b/pkgs/applications/version-management/gomp/default.nix new file mode 100644 index 00000000000..efdef3b967f --- /dev/null +++ b/pkgs/applications/version-management/gomp/default.nix @@ -0,0 +1,23 @@ +{ lib +, python3Packages + }: + +python3Packages.buildPythonApplication rec { + pname = "gomp"; + version = "1.1.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "11nq40igqbyfiygdzb1zyxx1n6d9xkv8vlmprbbi75mq54gfihhb"; + }; + + doCheck = false; # tests require interactive terminal + + meta = with lib; { + description = "A tool for comparing Git branches"; + homepage = "https://github.com/MarkForged/GOMP"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6666377f767..494838ee76a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17015,6 +17015,8 @@ in gmailctl = callPackage ../applications/networking/gmailctl {}; + gomp = callPackage ../applications/version-management/gomp { }; + gpm = callPackage ../servers/gpm { ncurses = null; # Keep curses disabled for lack of value }; From 1127b73eee169ee67b7e34655bcff3047ec732a3 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 6 Aug 2020 02:16:35 -0400 Subject: [PATCH 005/463] gnomeExtensions.timepp: unstable-2019-03-30 -> unstable-2020-03-15 --- pkgs/desktops/gnome-3/extensions/timepp/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix index f9fc68b548a..f1c53eda6bd 100644 --- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-timepp"; - version = "unstable-2019-03-30"; + version = "unstable-2020-03-15"; src = fetchFromGitHub { owner = "zagortenay333"; repo = "timepp__gnome"; - rev = "f90fb5573b37ac89fb57bf62e07d6d3bdb6a2c63"; - sha256 = "0p6rsbm6lf61vzly775qkwc2rcjjl38bkqdxnv4sccqmw2wwclnp"; + rev = "34ae477a51267cc1e85992a80cf85a1a7b7005c1"; + sha256 = "1v0xbrp0x5dwizscxh7h984pax4n92bj8iyw3qvjk27ynpxq8ag1"; }; uuid = "timepp@zagortenay333"; @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/zagortenay333/timepp__gnome"; license = licenses.gpl3; maintainers = with maintainers; [ svsdep ]; - broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Dosen't support 3.34 https://github.com/zagortenay333/timepp__gnome/issues/113 }; } From fd91482df5ecfade0327e691b68bc6ccf6ad5e34 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Aug 2020 19:45:58 +0000 Subject: [PATCH 006/463] liquibase: 3.10.2 -> 4.0.0 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 104b1c46e09..553f9ce9280 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.10.2"; + version = "4.0.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "19wdflkp4n0pds4lkliagg8l5kf9db5f5bn39akhwasc4yj0g7j2"; + sha256 = "06wpvqyv7w749l3ndvzg1p774rv1apbmbpwbdlad57pih4nqa7mm"; }; buildInputs = [ jre makeWrapper ]; From 48ad50b15e351ca9c6b6a44771b846fe78b408ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 09:02:03 +0000 Subject: [PATCH 007/463] heimer: 1.18.0 -> 1.19.0 --- pkgs/applications/misc/heimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 1626fc440e9..19034c1dc76 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "16p18svfcp201gd624wzmf0gpdvywybxp8539igin6s70k6rpc97"; + sha256 = "18paabqfxz49fahdi4fs5z870aynmyfj3xw8q768qffgc26zhl3m"; }; nativeBuildInputs = [ cmake ]; From f8b3bdb0666c7a37991634e6dfdfe7624fc8663e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 26 Aug 2020 15:16:12 +0200 Subject: [PATCH 008/463] snowsql: 1.2.5 -> 1.2.9 --- pkgs/applications/misc/snowsql/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index a860b555b59..720ee5f6799 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -8,20 +8,17 @@ stdenv.mkDerivation rec { pname = "snowsql"; - version = "1.2.5"; + majorVersion = "1.2"; + version = "${majorVersion}.9"; src = fetchurl { - url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/1.2/linux_x86_64/snowflake-snowsql-1.2.5-1.x86_64.rpm"; - sha256 = "c66e2044640197f4a5b5a16b89e8e7c6a816aa539004a0fb016aab185795f2d5"; + url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/${majorVersion}/linux_x86_64/snowflake-snowsql-${version}-1.x86_64.rpm"; + sha256 = "1k9dyr4vyqivpg054kbvs0jdwhbqbmlp9lsyxgazdsviw8ch70c8"; }; nativeBuildInputs = [ rpmextract makeWrapper ]; - libPath = - stdenv.lib.makeLibraryPath - [ - openssl - ]; + libPath = stdenv.lib.makeLibraryPath [ openssl ]; buildCommand = '' mkdir -p $out/bin/ @@ -37,7 +34,6 @@ stdenv.mkDerivation rec { makeWrapper $out/lib64/snowflake/snowsql/snowsql $out/bin/snowsql \ --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/lib64/snowflake/snowsql \ - ''; meta = with stdenv.lib; { From c29cb3a585d9391222882c974b32339b85e5f22b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 26 Aug 2020 19:58:53 +0000 Subject: [PATCH 009/463] openvswitch: 2.13.0 -> 2.14.0 --- pkgs/os-specific/linux/openvswitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index f0fb0a834ff..33b252a0225 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,12 +8,12 @@ let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.13.0"; + version = "2.14.0"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0cd5vmfr6zwgcnkwys6rag6cmz68v0librpaplianv734xs74pyx"; + sha256 = "0q52k6mq1jfsv0ix55mjd5ljlalhklhqfrma3l61dzhgihmfawa1"; }; kernel = optional (_kernel != null) _kernel.dev; From 33cf7bc739d464e2dc4a335e6fee76524dbbf993 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 29 Aug 2020 20:12:03 +0200 Subject: [PATCH 010/463] i2pd: 2.32.1 -> 2.33.0 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index b686ea4d04f..d57a24894fe 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.32.1"; + version = "2.33.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "15ng2c7i3jxmhpc2q0dl8arc72qbsq9y9paz5hgln907yy7dqx7c"; + sha256 = "1zsp4pml5pq8p1ipvarnlcfwcscch13iz1gzza5qm0yl01dl9qpk"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] From 6a6f02a25c8d471578d5e8401f1aadbc67242fd5 Mon Sep 17 00:00:00 2001 From: Jacquin Mininger Date: Sun, 30 Aug 2020 15:32:10 -0400 Subject: [PATCH 011/463] adobe-reader: add gkd-pixbuf-xlib based on issue: #96683 --- pkgs/applications/misc/adobe-reader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index b67e514ce54..31e950186df 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib -, gdk-pixbuf }: +, gdk-pixbuf, gdk-pixbuf-xlib }: assert stdenv.hostPlatform.system == "i686-linux"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { # versions. libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf ]; + [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ]; passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; From 69027b0c95f1c6573171e96acfee14bd1e9a46e1 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Tue, 1 Sep 2020 23:41:10 +0200 Subject: [PATCH 012/463] netbeans: 12.0 -> 12.1 --- pkgs/applications/editors/netbeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 7a5630bb9ba..718b1b8dcb6 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "12.0"; + version = "12.1"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - sha512 = "91030c9628a08acd85f1a58a7f71eec2e57dc85841c1c475cc6311335b5d8cdc10c1198274b9668b7f61a28d04b07661247dc1c3e36b8e29214aec3748e499e4"; + sha512 = "ad4bb5b191c784ed144b0b4831a8b95e0707c362917833c279d3f6fad11d7b3fb1f004f30121a941b694fc2ce323974b15072aa31cb5449111bc5d33d0d77103"; }; buildCommand = '' From ad64c682b7144cc5bc374e2218a554df6be0194c Mon Sep 17 00:00:00 2001 From: Lana Black Date: Tue, 25 Aug 2020 21:43:29 +0000 Subject: [PATCH 013/463] wire-desktop: Add libdbusmenu dependency Allows using global menu in various desktop environments. --- .../networking/instant-messengers/wire-desktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 48eb1ef202c..a07afc18116 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -10,6 +10,7 @@ , wrapGAppsHook , cpio , xar +, libdbusmenu }: let @@ -109,6 +110,7 @@ let runtimeDependencies = [ (lib.getLib udev) + libdbusmenu ]; postFixup = '' From 0e79ce07517f0553abeff40abd052af6e3f4bf96 Mon Sep 17 00:00:00 2001 From: Evils Date: Thu, 3 Sep 2020 14:53:46 +0200 Subject: [PATCH 014/463] openocd: 0.10.0 -> 2020-09-02 latest release is 3.5 years old but the project is still active --- .../tools/misc/openocd/default.nix | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 0d6bcd959eb..47212e9967d 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,24 +1,17 @@ -{ stdenv, lib, fetchurl, fetchpatch, libftdi1, libusb1, pkgconfig, hidapi }: +{ stdenv, lib, fetchgit, libftdi1, libusb1, pkgconfig, hidapi, autoreconfHook }: stdenv.mkDerivation rec { pname = "openocd"; - version = "0.10.0"; + version = "2020-09-02"; - src = fetchurl { - url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; - sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk"; + src = fetchgit { + url = "https://git.code.sf.net/p/openocd/code"; + rev = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3"; + sha256 = "1256qqhn3pxmijfk1x0y5b5kc5ar88ivykkvx0h1m7pdwqfs6zm9"; + fetchSubmodules = true; }; - patches = [ - # Fix FTDI channel configuration for SheevaPlug - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837989 - (fetchpatch { - url = "https://salsa.debian.org/electronics-team/openocd/raw/9a94335daa332a37a51920f87afbad4d36fad2d5/debian/patches/fix-sheeva.patch"; - sha256 = "01x021fagwvgxdpzk7psap7ryqiya4m4mi4nqr27asbmb3q46g5r"; - }) - ]; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ libftdi1 libusb1 hidapi ]; configureFlags = [ @@ -34,14 +27,9 @@ stdenv.mkDerivation rec { "--enable-remote-bitbang" ]; - NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - "-Wno-implicit-fallthrough" - "-Wno-format-truncation" - "-Wno-format-overflow" - "-Wno-error=tautological-compare" - "-Wno-error=array-bounds" + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=cpp" - ]); + ]; postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d" @@ -64,7 +52,7 @@ stdenv.mkDerivation rec { "remote target" for source-level debugging of embedded systems using the GNU GDB program. ''; - homepage = "http://openocd.sourceforge.net/"; + homepage = "https://openocd.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; From 10e5003d200f4763ccd3122b22be3706cdfb74b9 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Mon, 24 Aug 2020 23:57:20 -0400 Subject: [PATCH 015/463] flatcam: init at 8.5 --- .../science/electronics/flatcam/default.nix | 56 +++++++++++++++++++ .../science/electronics/flatcam/release.patch | 13 +++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 71 insertions(+) create mode 100644 pkgs/applications/science/electronics/flatcam/default.nix create mode 100644 pkgs/applications/science/electronics/flatcam/release.patch diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix new file mode 100644 index 00000000000..247f99485bb --- /dev/null +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -0,0 +1,56 @@ +{ lib +, python3Packages +, fetchFromBitbucket +, fetchpatch +}: + +python3Packages.buildPythonApplication rec { + pname = "flatcam"; + version = "8.5"; + + src = fetchFromBitbucket { + owner = "jpcgt"; + repo = "${pname}"; + rev = "533afd6a1772857cb633c011b5e0a15b60b1e92e"; # 8.5 with Red Hat packaging. + sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m"; + }; + + propagatedBuildInputs = with python3Packages; [ + matplotlib + numpy + pyqt4 + Rtree + scipy + setuptools + shapely + simplejson + six + svg-path + ]; + + packaging_fix_pull_request_patch = fetchpatch { + name = "packaging_fix_pull_request.patch"; + url = "https://bitbucket.org/trepetti/flatcam/commits/5591ed889d1f48a5190fe237b562cb932cb5876c/raw"; + sha256 = "19rhjdrf1n1q29cgpcry6pl2kl90zq0d613hhkwdir9bhq5bkknp"; + }; + + patches = [ + packaging_fix_pull_request_patch + ./release.patch + ]; + + # Only non-GUI tests can be run deterministically in the Nix build environment. + checkPhase = '' + python -m unittest tests.test_excellon + python -m unittest tests.test_gerber_buffer + python -m unittest tests.test_paint + python -m unittest tests.test_pathconnect + ''; + + meta = with lib; { + description = "2-D post processing for PCB fabrication on CNC routers."; + homepage = "https://bitbucket.org/jpcgt/flatcam"; + license = licenses.mit; + maintainers = with maintainers; [ trepetti ]; + }; +} diff --git a/pkgs/applications/science/electronics/flatcam/release.patch b/pkgs/applications/science/electronics/flatcam/release.patch new file mode 100644 index 00000000000..945228e35ba --- /dev/null +++ b/pkgs/applications/science/electronics/flatcam/release.patch @@ -0,0 +1,13 @@ +diff --git a/FlatCAMVersion.py b/FlatCAMVersion.py +index ba9e04a5..2c64d5a6 100644 +--- a/FlatCAMVersion.py ++++ b/FlatCAMVersion.py +@@ -16,7 +16,7 @@ version = { + "number": 8.5, + "date": (2016, 7, 1), # Year, Month, Day + "name": None, +- "release": False, ++ "release": True, + } + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c6d61f7099..e51b84c3f5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25829,6 +25829,8 @@ in csxcad = callPackage ../applications/science/electronics/csxcad { }; + flatcam = callPackage ../applications/science/electronics/flatcam { }; + fparser = callPackage ../applications/science/electronics/fparser { }; geda = callPackage ../applications/science/electronics/geda { From 10abcfb717babaf186fda5ddbc68a8aeba6cfd15 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Thu, 3 Sep 2020 20:49:16 +0200 Subject: [PATCH 016/463] crcpp: init at 1.0.1.0 --- pkgs/development/libraries/crcpp/default.nix | 30 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/crcpp/default.nix diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/development/libraries/crcpp/default.nix new file mode 100644 index 00000000000..c26578804ba --- /dev/null +++ b/pkgs/development/libraries/crcpp/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "crcpp"; + version = "1.0.1.0"; + + src = fetchFromGitHub { + owner = "d-bahr"; + repo = "CRCpp"; + rev = "release-${version}"; + sha256 = "138w97kfxnv8rcnvggba6fcxgbgq8amikkmy3jhqfn6xzy6zaimh"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/include + cp inc/CRC.h $out/include + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/d-bahr/CRCpp"; + description = "Easy to use and fast C++ CRC library"; + platforms = platforms.all; + maintainers = [ maintainers.ivar ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c0846b90fc..42c4b1e6588 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -962,6 +962,8 @@ in crc32c = callPackage ../development/libraries/crc32c { }; + crcpp = callPackage ../development/libraries/crcpp { }; + cudd = callPackage ../development/libraries/cudd { }; cue = callPackage ../development/tools/cue { }; From 489a130885a40e5e5f74aacc1928d4c0d3e7fd72 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 3 Sep 2020 23:53:05 -0400 Subject: [PATCH 017/463] keycloak: 10.0.2 -> 11.0.2 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 10b74f6b791..614eb2a4679 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "10.0.2"; + version = "11.0.2"; src = fetchzip { url = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip"; - sha256 = "1fn8yd02m0bnvwkbrfxrdnxfab30s0wzm3zxpy63wf3vak7nacma"; + sha256 = "0ayg6cl6mff64qs36djnfs3is4x0pzhk7zwb27cbln77q3icc0j0"; }; nativeBuildInputs = [ makeWrapper ]; From 4374811fd2f6377873323fcbc6552a2565e8aec0 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 4 Sep 2020 00:25:00 -0400 Subject: [PATCH 018/463] kopia: 0.6.2 -> 0.6.4 --- pkgs/tools/backup/kopia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 4c338eed4b0..889598b0798 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kopia"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1wz4sqjcih1m4bjxxdrsggai931q72zz8ikf2rwkp4alz12wr355"; + sha256 = "1mq3vx8vrvvh3jrdqhrkbnnfkjsjw5ipw15d0602i1x05fxah4v4"; }; vendorSha256 = "1npxr7gp59xv38zdx1diilfxij6lb0cmvsnzvjx6n8g0326gf2ii"; From ae82f81bfaf8691e49a0de9c01c29c72a411bfb3 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Fri, 14 Aug 2020 21:06:00 +1200 Subject: [PATCH 019/463] dockerTools.streamLayeredImage: Store the customisation layer as a tarball This fixes as issue described here[1], where permissions set by 'extraCommands' were ignored by Nix. [1] https://github.com/NixOS/nixpkgs/pull/91084#issuecomment-669834938 --- nixos/tests/docker-tools.nix | 9 +-- pkgs/build-support/docker/default.nix | 60 +++++++++------ pkgs/build-support/docker/examples.nix | 13 +--- .../docker/stream_layered_image.py | 76 ++++++++----------- 4 files changed, 73 insertions(+), 85 deletions(-) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 2543801ae8b..edb9aec62db 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -219,18 +219,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { ) with subtest("Ensure correct behavior when no store is needed"): - # This check tests two requirements simultaneously - # 1. buildLayeredImage can build images that don't need a store. - # 2. Layers of symlinks are eliminated by the customization layer. - # + # This check tests that buildLayeredImage can build images that don't need a store. docker.succeed( "docker load --input='${pkgs.dockerTools.examples.no-store-paths}'" ) - # Busybox will not recognize argv[0] and print an error message with argv[0], - # but it confirms that the custom-true symlink is present. - docker.succeed("docker run --rm no-store-paths custom-true |& grep custom-true") - # This check may be loosened to allow an *empty* store rather than *no* store. docker.succeed("docker run --rm no-store-paths ls /") docker.fail("docker run --rm no-store-paths ls /nix/store") diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index bf815af6f7c..b2c132afd74 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -718,28 +718,41 @@ rec { architecture = buildPackages.go.GOARCH; os = "linux"; }); - customisationLayer = runCommand "${name}-customisation-layer" { inherit extraCommands; } '' - cp -r ${contentsEnv}/ $out - if [[ -n $extraCommands ]]; then - chmod u+w $out - (cd $out; eval "$extraCommands") - fi - ''; - contentsEnv = symlinkJoin { - name = "${name}-bulk-layers"; - paths = if builtins.isList contents - then contents - else [ contents ]; + contentsList = if builtins.isList contents then contents else [ contents ]; + + # We store the customisation layer as a tarball, to make sure that + # things like permissions set on 'extraCommands' are not overriden + # by Nix. Then we precompute the sha256 for performance. + customisationLayer = symlinkJoin { + name = "${name}-customisation-layer"; + paths = contentsList; + inherit extraCommands; + postBuild = '' + mv $out old_out + (cd old_out; eval "$extraCommands" ) + + mkdir $out + + tar \ + --owner 0 --group 0 --mtime "@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + -C old_out \ + -cf $out/layer.tar . + + sha256sum $out/layer.tar \ + | cut -f 1 -d ' ' \ + > $out/checksum + ''; }; - # NOTE: the `closures` parameter is a list of closures to include. - # The TOP LEVEL store paths themselves will never be present in the - # resulting image. At this time (2020-06-18) none of these layers - # are appropriate to include, as they are all created as - # implementation details of dockerTools. - closures = [ baseJson contentsEnv ]; - overallClosure = writeText "closure" (lib.concatStringsSep " " closures); + closureRoots = [ baseJson ] ++ contentsList; + overallClosure = writeText "closure" (lib.concatStringsSep " " closureRoots); + + # These derivations are only created as implementation details of docker-tools, + # so they'll be excluded from the created images. + unnecessaryDrvs = [ baseJson overallClosure ]; + conf = runCommand "${name}-conf.json" { inherit maxLayers created; imageName = lib.toLower name; @@ -751,9 +764,6 @@ rec { paths = referencesByPopularity overallClosure; buildInputs = [ jq ]; } '' - paths() { - cat $paths ${lib.concatMapStringsSep " " (path: "| (grep -v ${path} || true)") (closures ++ [ overallClosure ])} - } ${if (tag == null) then '' outName="$(basename "$out")" outHash=$(echo "$outName" | cut -d - -f 1) @@ -768,6 +778,12 @@ rec { created="$(date -Iseconds -d "$created")" fi + paths() { + cat $paths ${lib.concatMapStringsSep " " + (path: "| (grep -v ${path} || true)") + unnecessaryDrvs} + } + # Create $maxLayers worth of Docker Layers, one layer per store path # unless there are more paths than $maxLayers. In that case, create # $maxLayers-1 for the most popular layers, and smush the remainaing diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index bc107471762..4a611add8a1 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -298,21 +298,10 @@ rec { name = "no-store-paths"; tag = "latest"; extraCommands = '' - chmod a+w bin - # This removes sharing of busybox and is not recommended. We do this # to make the example suitable as a test case with working binaries. cp -r ${pkgs.pkgsStatic.busybox}/* . ''; - contents = [ - # This layer has no dependencies and its symlinks will be dereferenced - # when creating the customization layer. - (pkgs.runCommand "layer-to-flatten" {} '' - mkdir -p $out/bin - ln -s /bin/true $out/bin/custom-true - '' - ) - ]; }; nixLayered = pkgs.dockerTools.buildLayeredImageWithNixDb { @@ -415,7 +404,7 @@ rec { pkgs.dockerTools.buildLayeredImage { name = "bash-layered-with-user"; tag = "latest"; - contents = [ pkgs.bash pkgs.coreutils (nonRootShadowSetup { uid = 999; user = "somebody"; }) ]; + contents = [ pkgs.bash pkgs.coreutils ] ++ nonRootShadowSetup { uid = 999; user = "somebody"; }; }; } diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index ffb6ba0ade4..cbae0f723f9 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -33,7 +33,6 @@ function does all this. import io import os -import re import sys import json import hashlib @@ -45,21 +44,14 @@ from datetime import datetime, timezone from collections import namedtuple -def archive_paths_to(obj, paths, mtime, add_nix, filter=None): +def archive_paths_to(obj, paths, mtime): """ Writes the given store paths as a tar file to the given stream. obj: Stream to write to. Should have a 'write' method. paths: List of store paths. - add_nix: Whether /nix and /nix/store directories should be - prepended to the archive. - filter: An optional transformation to be applied to TarInfo - objects. Should take a single TarInfo object and return - another one. Defaults to identity. """ - filter = filter if filter else lambda i: i - # gettarinfo makes the paths relative, this makes them # absolute again def append_root(ti): @@ -72,7 +64,7 @@ def archive_paths_to(obj, paths, mtime, add_nix, filter=None): ti.gid = 0 ti.uname = "root" ti.gname = "root" - return filter(ti) + return ti def nix_root(ti): ti.mode = 0o0555 # r-xr-xr-x @@ -85,11 +77,9 @@ def archive_paths_to(obj, paths, mtime, add_nix, filter=None): with tarfile.open(fileobj=obj, mode="w|") as tar: # To be consistent with the docker utilities, we need to have - # these directories first when building layer tarballs. But - # we don't need them on the customisation layer. - if add_nix: - tar.addfile(apply_filters(nix_root(dir("/nix")))) - tar.addfile(apply_filters(nix_root(dir("/nix/store")))) + # these directories first when building layer tarballs. + tar.addfile(apply_filters(nix_root(dir("/nix")))) + tar.addfile(apply_filters(nix_root(dir("/nix/store")))) for path in paths: path = pathlib.Path(path) @@ -136,7 +126,7 @@ class ExtractChecksum: LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"]) -def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): +def add_layer_dir(tar, paths, mtime): """ Appends given store paths to a TarFile object as a new layer. @@ -144,11 +134,6 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): paths: List of store paths. mtime: 'mtime' of the added files and the layer tarball. Should be an integer representing a POSIX time. - add_nix: Whether /nix and /nix/store directories should be - added to a layer. - filter: An optional transformation to be applied to TarInfo - objects inside the layer. Should take a single TarInfo - object and return another one. Defaults to identity. Returns: A 'LayerInfo' object containing some metadata of the layer added. @@ -164,8 +149,6 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): extract_checksum, paths, mtime=mtime, - add_nix=add_nix, - filter=filter ) (checksum, size) = extract_checksum.extract() @@ -182,8 +165,6 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): write, paths, mtime=mtime, - add_nix=add_nix, - filter=filter ) write.close() @@ -199,29 +180,38 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): return LayerInfo(size=size, checksum=checksum, path=path, paths=paths) -def add_customisation_layer(tar, path, mtime): +def add_customisation_layer(target_tar, customisation_layer, mtime): """ - Adds the contents of the store path as a new layer. This is different - than the 'add_layer_dir' function defaults in the sense that the contents - of a single store path will be added to the root of the layer. eg (without - the /nix/store prefix). + Adds the customisation layer as a new layer. This is layer is structured + differently; given store path has the 'layer.tar' and corresponding + sha256sum ready. tar: 'tarfile.TarFile' object for the new layer to be added to. - path: A store path. - mtime: 'mtime' of the added files and the layer tarball. Should be an - integer representing a POSIX time. + customisation_layer: Path containing the layer archive. + mtime: 'mtime' of the added layer tarball. """ - def filter(ti): - ti.name = re.sub("^/nix/store/[^/]*", "", ti.name) - return ti - return add_layer_dir( - tar, - [path], - mtime=mtime, - add_nix=False, - filter=filter - ) + checksum_path = os.path.join(customisation_layer, "checksum") + with open(checksum_path) as f: + checksum = f.read().strip() + assert len(checksum) == 64, f"Invalid sha256 at ${checksum_path}." + + layer_path = os.path.join(customisation_layer, "layer.tar") + + path = f"{checksum}/layer.tar" + tarinfo = target_tar.gettarinfo(layer_path) + tarinfo.name = path + tarinfo.mtime = mtime + + with open(layer_path, "rb") as f: + target_tar.addfile(tarinfo, f) + + return LayerInfo( + size=None, + checksum=checksum, + path=path, + paths=[customisation_layer] + ) def add_bytes(tar, path, content, mtime): From 62b3b82dbd9f19807af84f03bdf1820e87559118 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 05:47:43 +0000 Subject: [PATCH 020/463] checksec: 2.2.2 -> 2.2.3 --- pkgs/os-specific/linux/checksec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index f94e6d72d59..5a66e536956 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "checksec"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "slimm609"; repo = "checksec.sh"; rev = version; - sha256 = "0gm438sfh84bif5d40wvaqrfl4dh3fxjvnjk9ab33al8ws3afpsj"; + sha256 = "0hw8bd7dj71m1ml9zvfab2j87jacs542z7a89nziapckmg6kmh6f"; }; patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ]; From b90e74cb8a203bf9e53ed7e51c95836537235bfe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 06:45:04 +0000 Subject: [PATCH 021/463] checkstyle: 8.35 -> 8.36 --- 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 8ea63aa155e..5dba30e7663 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.35"; + version = "8.36"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1jvm49cbwyqxmz8zb9f6wim4rnna2dg1yk95123h46vl6s5cxcc0"; + sha256 = "1f8g330akx3sdc35dgvy6kksr7y3dnnj7029qrpn745bd9fh92hh"; }; nativeBuildInputs = [ makeWrapper ]; From 145ebb7be90deb82b8566c562858b74cfc18698f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 08:07:03 +0000 Subject: [PATCH 022/463] clevis: 13 -> 14 --- 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 daeb5e0d39c..878e4fc9feb 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 = "13"; + version = "14"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - sha256 = "1p522jjksxmdwjjxa32z2ij1g81ygpkmcx998d07g8pb6rfnknjy"; + sha256 = "1j8id67jk3ikim2xh7vjg7j2ayrpm1a4n8v3n8r8pnr4rhqy76fd"; }; nativeBuildInputs = [ meson ninja pkgconfig asciidoc ]; From bc134692c5e7dd5640529c17cd0a0d0f314f7737 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 09:41:46 +0000 Subject: [PATCH 023/463] crawl: 0.25.0 -> 0.25.1 --- pkgs/games/crawl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index eeb8bd7f9db..20e31c979e6 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "0swcl8cxz64yw8dl9macz8ar1ccwrkwz89j7s1f60inb5jlxifqm"; + sha256 = "0i1cvwzwmcb07ynz1nk2svprfhsgcqmagvj5jfzayvcb1a2ww23b"; }; # Patch hard-coded paths and remove force library builds From e82cdb4575922f911d533b79bcae6cb561d4454f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 10:14:00 +0000 Subject: [PATCH 024/463] cutelyst: 2.11.0 -> 2.12.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 94d9776b54d..d5e83f0410c 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.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "1c4cjzx6jkqlblcfc7pkx66py43576y6rky19j7rjiap724q2yk9"; + sha256 = "1ngacc7ackp08hajby0xvzpvnqahwm2dbxmisw7j7qs1lqrx9k3n"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; From 04b2a20122e39245bfe5136e61267fcf26c56685 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 11:37:18 +0000 Subject: [PATCH 025/463] dolt: 0.18.3 -> 0.19.0 --- 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 e8f9923a87b..9e4eadf72da 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.18.3"; + version = "0.19.0"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "0mgawr3nkyna22sqhskvvk7h9c8ivag959liji2qcdfwgfqp0l6z"; + sha256 = "1rfwhh62phz75kariqgpkxi4wzll1crzc34x0ybihxllpjf998zx"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "0rqkqyvf8mjl7b62ng7vzi6as6qw3sg3lzj2mcg1aiw3h7ikr6hw"; + vendorSha256 = "1bq8z31yxff0nybzjs7jz7rg61hgqz6l2scbab7062j8whg8wybb"; doCheck = false; From 939211bfafa9c7baf1ba701e259e35d603e6794c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 11:58:12 +0000 Subject: [PATCH 026/463] duckdb: 0.1.8 -> 0.2.1 --- pkgs/development/libraries/duckdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 05961bce89c..dde0806add4 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.1.8"; + version = "0.2.1"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "15qn967q9v23l0sgb2jqb77z4qdkyn1zwdpj4b0rd9zk5h3fzj55"; + sha256 = "18l4qdzfm8k9ggn49r3h99cbcmmq01byzkxps3pvmq8q246hb55x"; }; nativeBuildInputs = [ cmake ]; From d618cd80d2f0f9c491882ffa5c45d79396238be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 4 Sep 2020 13:40:18 -0300 Subject: [PATCH 027/463] theme-obsidian2: 2.13 -> 2.14 --- pkgs/data/themes/obsidian2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 79c27a8c6e9..a19845b0d3a 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.13"; + version = "2.14"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-obsidian-2"; rev = "v${version}"; - sha256 = "1chbz1cbkbfzk8835x1dywk38d7wjh90myajgk5f7v2zgnvbya23"; + sha256 = "0i5lrj45zswd3rmclvywpk7x30bvib5zldhmfl38gbj477ag8ng8"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnome theme, based upon Adwaita-Maia dark skin"; homepage = "https://github.com/madmaxms/theme-obsidian-2"; - license = with licenses; [ gpl3 ]; + license = with licenses; [ gpl3Only ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; From 3355e6c3132739c54d5807cb3b17677db4a72cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 4 Sep 2020 13:55:48 -0300 Subject: [PATCH 028/463] theme-obsidian2: include theme variants --- pkgs/data/themes/obsidian2/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index a19845b0d3a..cb6cd686aca 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine }: +{ stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "theme-obsidian2"; version = "2.14"; - src = fetchFromGitHub { - owner = "madmaxms"; - repo = "theme-obsidian-2"; - rev = "v${version}"; - sha256 = "0i5lrj45zswd3rmclvywpk7x30bvib5zldhmfl38gbj477ag8ng8"; + src = fetchurl { + url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; + sha256 = "0q713s6fwdvbiirzkm91y9xdpc7x7ay432km0fx90vn4s24p718y"; }; + sourceRoot = "."; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; installPhase = '' runHook preInstall mkdir -p $out/share/themes - cp -a Obsidian-2 $out/share/themes + cp -a Obsidian-2* $out/share/themes runHook postInstall ''; From 540c20a78fa0e124f80b5a104f168308225fd019 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Fri, 4 Sep 2020 22:51:01 +0200 Subject: [PATCH 029/463] omnisharp-roslyn: 1.35.2 -> 1.37.1 --- 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 3c51779c566..c435d80b08f 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.35.2"; + version = "1.37.1"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "0k4crybddqpcg1vi1ax1s85w4hlknz6kaqn4cvv279dkm9aqxbp8"; + sha256 = "04pyychzwhhcv0js0qyramz6nd0wz03qqqgvz1j9m9wxyiz0dv3c"; }; nativeBuildInputs = [ makeWrapper ]; From 48ae44b3a2e1ef160fa9e8dbf8c5ce6195d0d29e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 4 Sep 2020 22:56:43 +0100 Subject: [PATCH 030/463] pythonPackages.duckdb: patch out attempted use of git replace with `false` as its use here is pointless anyway. --- pkgs/development/python-modules/duckdb/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index c839dea3d1a..ea6dfe32fda 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -13,6 +13,13 @@ buildPythonPackage rec { pname = "duckdb"; inherit (duckdb) version src; + # build attempts to use git to figure out its own version. don't want to add + # the dependency for something pointless. + postPatch = '' + substituteInPlace scripts/package_build.py --replace \ + "'git'" "'false'" + ''; + postConfigure = '' cd tools/pythonpkg export SETUPTOOLS_SCM_PRETEND_VERSION=${version} From 6d7f0bca40abb35d393f67eb47304a4f0e4e6c63 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Thu, 27 Aug 2020 17:50:58 -0700 Subject: [PATCH 031/463] linuxPackages.system76: init at 1.0.9 --- pkgs/os-specific/linux/system76/default.nix | 42 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/os-specific/linux/system76/default.nix diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix new file mode 100644 index 00000000000..be6c1f6c3ad --- /dev/null +++ b/pkgs/os-specific/linux/system76/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, kernel }: +let + version = "1.0.9"; + sha256 = "0i4825y2vd679kdjv30ifzj1i1066d3x37z4lgk39hx16993k162"; +in +stdenv.mkDerivation { + name = "system76-module-${version}-${kernel.version}"; + + passthru.moduleName = "system76"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "system76-dkms"; + rev = version; + inherit sha256; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + buildFlags = [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -D system76.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76.ko + ''; + + meta = with stdenv.lib; { + maintainers = [ maintainers.khumba ]; + license = [ licenses.gpl2Plus ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + broken = versionOlder kernel.version "4.14"; + description = "System76 DKMS driver"; + homepage = "https://github.com/pop-os/system76-dkms"; + longDescription = '' + The System76 DKMS driver. On newer System76 laptops, this driver controls + some of the hotkeys and allows for custom fan control. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 043cd123261..15b30eecc2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17804,6 +17804,8 @@ in systemtap = callPackage ../development/tools/profiling/systemtap { }; + system76 = callPackage ../os-specific/linux/system76 { }; + tmon = callPackage ../os-specific/linux/tmon { }; tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; From 649b00db5b7cd488fa8279f979b2baaf7967e8e5 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Thu, 27 Aug 2020 17:51:13 -0700 Subject: [PATCH 032/463] linuxPackages.system76-acpi: init at 1.0.1 --- .../linux/system76-acpi/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/os-specific/linux/system76-acpi/default.nix diff --git a/pkgs/os-specific/linux/system76-acpi/default.nix b/pkgs/os-specific/linux/system76-acpi/default.nix new file mode 100644 index 00000000000..e97e17784cb --- /dev/null +++ b/pkgs/os-specific/linux/system76-acpi/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, kernel }: +let + version = "1.0.1"; + sha256 = "0jmm9h607f7k20yassm6af9mh5l00yih5248wwv4i05bd68yw3p5"; +in +stdenv.mkDerivation { + name = "system76-acpi-module-${version}-${kernel.version}"; + + passthru.moduleName = "system76_acpi"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "system76-acpi-dkms"; + rev = version; + inherit sha256; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + buildFlags = [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -D system76_acpi.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76_acpi.ko + ''; + + meta = with stdenv.lib; { + maintainers = [ maintainers.khumba ]; + license = [ licenses.gpl2Only ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + broken = versionOlder kernel.version "4.14"; + description = "System76 ACPI Driver (DKMS)"; + homepage = "https://github.com/pop-os/system76-acpi-dkms"; + longDescription = '' + This provides the system76_acpi in-tree driver for systems missing it. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15b30eecc2b..d4c3acee668 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17806,6 +17806,8 @@ in system76 = callPackage ../os-specific/linux/system76 { }; + system76-acpi = callPackage ../os-specific/linux/system76-acpi { }; + tmon = callPackage ../os-specific/linux/tmon { }; tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; From 8ea0979284f503b5ab9583052cedf1ab05210006 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Thu, 27 Aug 2020 17:51:40 -0700 Subject: [PATCH 033/463] linuxPackages.system76-io: init at 1.0.1 --- .../os-specific/linux/system76-io/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/os-specific/linux/system76-io/default.nix diff --git a/pkgs/os-specific/linux/system76-io/default.nix b/pkgs/os-specific/linux/system76-io/default.nix new file mode 100644 index 00000000000..dac1e2db1e3 --- /dev/null +++ b/pkgs/os-specific/linux/system76-io/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, kernel }: +let + version = "1.0.1"; + sha256 = "0qkgkkjy1isv6ws6hrcal75dxjz98rpnvqbm7agdcc6yv0c17wwh"; +in +stdenv.mkDerivation { + name = "system76-io-module-${version}-${kernel.version}"; + + passthru.moduleName = "system76_io"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "system76-io-dkms"; + rev = version; + inherit sha256; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + buildFlags = [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -D system76-io.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76-io.ko + ''; + + meta = with stdenv.lib; { + maintainers = [ maintainers.khumba ]; + license = [ licenses.gpl2Plus ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + broken = versionOlder kernel.version "4.14"; + description = "DKMS module for controlling System76 I/O board"; + homepage = "https://github.com/pop-os/system76-io-dkms"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4c3acee668..16d3ef02916 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17808,6 +17808,8 @@ in system76-acpi = callPackage ../os-specific/linux/system76-acpi { }; + system76-io = callPackage ../os-specific/linux/system76-io { }; + tmon = callPackage ../os-specific/linux/tmon { }; tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; From c7ac3f119e85be49d06ca0bc022c35a988ea188a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Sep 2020 13:54:15 +0000 Subject: [PATCH 034/463] pcm: 202007 -> 202008 --- pkgs/os-specific/linux/pcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index 06126a92958..3c49e53d800 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "202007"; + version = "202008"; pname = "pcm"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - sha256 = "1qqp51mvi52jvf6zf4g1fzv6nh9p37y0i7r2y273gwcdygbidzma"; + sha256 = "1paxwq0p39vp2ma0rg7dkalc3r28wzj77sm3alavvk2vxgvxi0ig"; }; installPhase = '' From adcaba3809756f16281f7dde60619002bcc058c6 Mon Sep 17 00:00:00 2001 From: Milan Svoboda Date: Sun, 6 Sep 2020 12:14:27 +0200 Subject: [PATCH 035/463] airscan: 0.99.8 -> 0.99.16 --- .../graphics/sane/backends/airscan/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/airscan/default.nix b/pkgs/applications/graphics/sane/backends/airscan/default.nix index bd4a5ac9ad9..3cce81ef8af 100644 --- a/pkgs/applications/graphics/sane/backends/airscan/default.nix +++ b/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg, libpng +{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg, libpng, gnutls , sane-backends, meson, ninja }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.8"; + version = "0.99.16"; nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ avahi libsoup libjpeg libpng sane-backends ]; + buildInputs = [ avahi libsoup libjpeg libpng gnutls sane-backends ]; src = fetchFromGitHub { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "0sdlnbzhnfn4i5mkqhc8zmjywbbjqkbnsiz2gpqhy6fypshryahz"; + sha256 = "00lgcdbpns0shwlpkvrpfm4z05s7v5q3al4kcw6ii7xnkzmv1721"; }; meta = with lib; { From bc067235a072906edd614e3934ce1a01899518f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 6 Sep 2020 13:09:33 -0300 Subject: [PATCH 036/463] marwaita-manjaro: 2020-08-29 -> 1.5 --- pkgs/data/themes/marwaita-manjaro/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/marwaita-manjaro/default.nix b/pkgs/data/themes/marwaita-manjaro/default.nix index 3217175ebd7..539d1a937bf 100644 --- a/pkgs/data/themes/marwaita-manjaro/default.nix +++ b/pkgs/data/themes/marwaita-manjaro/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-manjaro"; - version = "2020-08-29"; + version = "1.5"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = "d97e852931732ae5134784d11b332eadd71b6bbf"; - sha256 = "1qa2mlc6k82i4fkgbkahjz3fhghcf8rx1ayxw0r4xl21mkna7bfy"; + rev = version; + sha256 = "0gd6dk7bfhnzmdsmdafc6f0kspnvzpvcmlb8h6q36ifvv0yg3jw4"; }; buildInputs = [ From dfae3421e57ef26919bfecdd23448615be1cbfc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 6 Sep 2020 21:40:38 -0300 Subject: [PATCH 037/463] marwaita-peppermint: init at 0.3 --- .../themes/marwaita-peppermint/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/data/themes/marwaita-peppermint/default.nix diff --git a/pkgs/data/themes/marwaita-peppermint/default.nix b/pkgs/data/themes/marwaita-peppermint/default.nix new file mode 100644 index 00000000000..1822c36f077 --- /dev/null +++ b/pkgs/data/themes/marwaita-peppermint/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "marwaita-peppermint"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = pname; + rev = version; + sha256 = "0g1n84px69wjjxclw76d59v8ccs4bkml71kzkvh12s9jcjw4zkc6"; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Marwaita* $out/share/themes + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Marwaita GTK theme with Peppermint Os Linux style"; + homepage = "https://www.pling.com/p/1399569/"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 535a2da50d4..2036a02ce06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18922,6 +18922,8 @@ in marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; + marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { }; + matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; From 31fed01d543539a8858097a7cecc2c92d95086cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 28 Mar 2020 12:49:07 +0100 Subject: [PATCH 038/463] vdr-epgsearch: 2.4.0 -> 20191202 --- pkgs/applications/video/vdr/plugins.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 2ae4cbac4d7..ad02254e3d3 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -129,11 +129,12 @@ in { epgsearch = stdenv.mkDerivation rec { pname = "vdr-epgsearch"; - version = "2.4.0"; + version = "20191202"; - src = fetchurl { - url = "https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${version}.tar.bz2"; - sha256 = "0xfgn17vicyjwdf0rbkrik4q16mnfi305d4wmi8f0qk825pa0z3y"; + src = fetchgit { + url = "git://projects.vdr-developer.org/vdr-plugin-epgsearch.git"; + sha256 = "18kskwnnscr4rb4yzfikw1la318zjgraf340cl7n9z77chi2gi8m"; + rev = "602d66c55964998ce25c6c57b302949a9517f149"; }; postPatch = '' From 73653fe54777d83aad20d0a205fc97a45e391af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 17 Nov 2019 16:56:29 +0100 Subject: [PATCH 039/463] vdr-vaapidevice: 0.7.0 -> 20190526 --- pkgs/applications/video/vdr/plugins.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 2ae4cbac4d7..d7ce832620d 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -49,7 +49,8 @@ in { vaapidevice = stdenv.mkDerivation { - name = "vdr-vaapidevice-0.7.0"; + pname = "vdr-vaapidevice"; + version = "20190525"; buildInputs = [ vdr libxcb xcbutilwm ffmpeg_3 @@ -61,14 +62,14 @@ in { makeFlags = [ "DESTDIR=$(out)" ]; postPatch = '' - substituteInPlace softhddev.c --replace /usr/bin/X ${xorgserver}/bin/X + substituteInPlace vaapidev.c --replace /usr/bin/X ${xorgserver}/bin/X ''; src = fetchFromGitHub { owner = "pesintta"; repo = "vdr-plugin-vaapidevice"; - sha256 = "072y61fpkh3i2dragg0nsd4g3malgwxkwpdrb1ykdljyzf52s5hs"; - rev = "c99afc23a53e6d91f9afaa99af59b30e68e626a8"; + sha256 = "1gwjp15kjki9x5742fhaqk3yc2bbma74yp2vpn6wk6kj46nbnwp6"; + rev = "d19657bae399e79df107e316ca40922d21393f80"; }; meta = with stdenv.lib; { From 9db2ca30ac8141c776ac2c6e170c848698de22e8 Mon Sep 17 00:00:00 2001 From: Jonas Carpay Date: Wed, 9 Sep 2020 15:21:20 +0900 Subject: [PATCH 040/463] gambatte: add alsa dependency, 2016-05-03 -> 2020-03-14 --- pkgs/games/gambatte/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix index ac099e21d56..b2a2f0a3f92 100644 --- a/pkgs/games/gambatte/default.nix +++ b/pkgs/games/gambatte/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, scons, qt4 }: +{ stdenv, fetchFromGitHub, scons, qt4, alsaLib }: stdenv.mkDerivation { pname = "gambatte"; - version = "2016-05-03"; + version = "2020-03-14"; src = fetchFromGitHub { owner = "sinamas"; repo = "gambatte"; - rev = "f8a810b103c4549f66035dd2be4279c8f0d95e77"; - sha256 = "1arv4zkh3fhrghsykl4blazc9diw09m44pyff1059z5b98smxy3v"; + rev = "56e3371151b5ee86dcdcf4868324ebc6de220bc9"; + sha256 = "0cc6zcvxpvi5hgcssb1zy0fkj9nk7n0d2xm88a4v05kpm5zw7sh2"; }; - buildInputs = [ scons qt4 ]; + buildInputs = [ scons qt4 alsaLib ]; patches = [ ./fix-scons-paths.patch ]; From ea88ca29cc8ac79dac83e349186fb2a4add07fee Mon Sep 17 00:00:00 2001 From: Badi Abdul-Wahid Date: Wed, 9 Sep 2020 10:33:44 -0500 Subject: [PATCH 041/463] vivaldi: 3.1.1929.45-1 -> 3.3.2022.39-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 2fe4c638929..38989e70390 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.1.1929.45-1"; + version = "3.3.2022.39-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0pg16zs9fcr6b360igszpkia3i8i5xf4m0hs1b2a17lf8vkldix9"; + sha256 = "1d49556l067zilndm1381n1y22076qgww4n6nkscwchik2mj79sy"; }; unpackPhase = '' From bbd7ba6a1cbe0606bb73bba163f81689a2863f1b Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 9 Sep 2020 20:13:57 +0200 Subject: [PATCH 042/463] linuxPackages.exfat-nofuse: 2019-09-06 -> 2020-04-15 add assertion for newer linux kernels which come with native exfat support --- pkgs/os-specific/linux/exfat/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 59f9c709e5f..a92754bba7d 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -3,16 +3,18 @@ # Upstream build for kernel 4.1 is broken, 3.12 and below seems to be working assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.version "4.0"; +# linux kernel above 5.7 comes with its own exfat implementation https://github.com/arter97/exfat-linux/issues/27 +assert lib.versionOlder kernel.version "5.8"; stdenv.mkDerivation rec { name = "exfat-nofuse-${version}-${kernel.version}"; - version = "2019-09-06"; + version = "2020-04-15"; src = fetchFromGitHub { - owner = "AdrianBan"; + owner = "barrybingo"; repo = "exfat-nofuse"; - rev = "5536f067373c196f152061f5000fe0032dc07c48"; - sha256 = "00mhadsv2iw8z00a6170hwbvk3afx484nn3irmd5f5kmhs34sw7k"; + rev = "297a5739cd4a942a1d814d05a9cd9b542e7b8fc8"; + sha256 = "14jahy7n6pr482fjfrlf9ck3f2rkr5ds0n5r85xdfsla37ria26d"; }; hardeningDisable = [ "pic" ]; From 264693f9d7e9f2404f4be879caced3574f8aacd9 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 10 Sep 2020 02:06:07 +0200 Subject: [PATCH 043/463] firefox-esr-68: drop --- .../networking/browsers/firefox/common.nix | 40 +++++-------------- .../firefox/no-buildconfig-ffx65.patch | 24 ----------- .../networking/browsers/firefox/packages.nix | 28 ------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 5 files changed, 12 insertions(+), 83 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 1f1831d3c91..78ee2134908 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -7,8 +7,8 @@ , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libXdamage, libevent, libstartup_notification -, libvpx, libvpx_1_8 -, icu, icu67, libpng, jemalloc, glib +, libvpx_1_8 +, icu67, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages , rust-cbindgen, nodejs, nasm, fetchpatch , debugBuild ? false @@ -112,17 +112,13 @@ stdenv.mkDerivation ({ xorg.libXext unzip makeWrapper libevent libstartup_notification /* cairo */ libpng jemalloc glib - nasm + nasm icu67 libvpx_1_8 # >= 66 requires nasm for the AV1 lib dav1d # yasm can potentially be removed in future versions # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ nspr nss ] - ++ lib.optionals (lib.versionOlder ffversion "75") [ libvpx sqlite ] - ++ lib.optional (lib.versionAtLeast ffversion "75.0") libvpx_1_8 - ++ lib.optional (lib.versionOlder ffversion "78") icu - ++ lib.optional (lib.versionAtLeast ffversion "78.0") icu67 ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 @@ -132,12 +128,10 @@ stdenv.mkDerivation ({ AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ]; - NIX_CFLAGS_COMPILE = toString ([ + NIX_CFLAGS_COMPILE = toString [ "-I${glib.dev}/include/gio-unix-2.0" "-I${nss.dev}/include/nss" - ] - ++ lib.optional (pname == "firefox-esr" && lib.versionOlder ffversion "69") - "-Wno-error=format-security"); + ]; postPatch = '' rm -rf obj-x86_64-pc-linux-gnu @@ -228,16 +222,7 @@ stdenv.mkDerivation ({ "--with-system-nspr" "--with-system-nss" ] - ++ lib.optionals (lib.versionOlder ffversion "78") [ - "--with-system-bz2" - "--enable-startup-notification" - "--disable-gconf" - ] - ++ lib.optional (lib.versionOlder ffversion "75") "--enable-system-sqlite" ++ lib.optional (stdenv.isDarwin) "--disable-xcode-checks" - ++ lib.optionals (lib.versionOlder ffversion "69") [ - "--enable-webrender=build" - ] ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" @@ -305,16 +290,13 @@ stdenv.mkDerivation ({ inherit execdir; inherit browserName; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; -} // -lib.optionalAttrs (lib.versionAtLeast ffversion "74") { - hardeningDisable = [ "format" ]; # -Werror=format-security -} // -# the build system verifies checksums of the bundled rust sources -# ./third_party/rust is be patched by our libtool fixup code in stdenv -# unfortunately we can't just set this to `false` when we do not want it. -# See https://github.com/NixOS/nixpkgs/issues/77289 for more details -lib.optionalAttrs (lib.versionAtLeast ffversion "72") { + hardeningDisable = [ "format" ]; # -Werror=format-security + + # the build system verifies checksums of the bundled rust sources + # ./third_party/rust is be patched by our libtool fixup code in stdenv + # unfortunately we can't just set this to `false` when we do not want it. + # See https://github.com/NixOS/nixpkgs/issues/77289 for more details # Ideally we would figure out how to tell the build system to not # care about changed hashes as we are already doing that when we # fetch the sources. Any further modifications of the source tree diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch deleted file mode 100644 index 1380c7dc9a2..00000000000 --- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch +++ /dev/null @@ -1,24 +0,0 @@ -Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. -diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp ---- firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:48:28.988747428 +0100 -+++ firefox-65.0/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:51:13.378188397 +0100 -@@ -67,8 +67,6 @@ - {"about", "chrome://global/content/aboutAbout.xhtml", 0}, - {"addons", "chrome://mozapps/content/extensions/extensions.xul", - nsIAboutModule::ALLOW_SCRIPT}, -- {"buildconfig", "chrome://global/content/buildconfig.html", -- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, - {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT}, -diff -ur firefox-65.0-orig/toolkit/content/jar.mn firefox-65.0/toolkit/content/jar.mn ---- firefox-65.0-orig/toolkit/content/jar.mn 2019-01-23 00:48:35.033372506 +0100 -+++ firefox-65.0/toolkit/content/jar.mn 2019-01-23 00:50:45.126565924 +0100 -@@ -36,7 +36,6 @@ - content/global/plugins.css - content/global/browser-child.js - content/global/browser-content.js --* content/global/buildconfig.html - content/global/buildconfig.css - content/global/contentAreaUtils.js - content/global/datepicker.xhtml diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index a438c37ac2b..a024fc359d8 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -61,32 +61,4 @@ rec { versionKey = "ffversion"; }; }; - - firefox-esr-68 = (common rec { - pname = "firefox-esr"; - ffversion = "68.12.0esr"; - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "169y4prlb4mi31jciz89kp35rpb1p2gxrk93qkwfzdk4imi9hk8mi2yvxknpr0rni3bn2x0zgrrc6ccr8swv5895sqvv1sc5r1056w3"; - }; - - patches = [ - ./no-buildconfig-ffx65.patch - ]; - - meta = firefox.meta // { - description = "A web browser built from Firefox Extended Support Release source tree"; - }; - updateScript = callPackage ./update.nix { - attrPath = "firefox-esr-68-unwrapped"; - versionSuffix = "esr"; - versionKey = "ffversion"; - }; - }).override { - # Mozilla unfortunately doesn't support building with latest NSS anymore; - # instead they provide ESR releases for NSS: - # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases - nss = nss_3_44; - }; - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a9832c6841e..8972f146a74 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -130,6 +130,7 @@ mapAliases ({ fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; ffadoFull = ffado; # added 2018-05-01 + firefox-esr-68 = throw "Firefox 68 ESR reached end of life with its final release 68.12esr on 2020-08-25 and was therefore removed from nixpkgs"; firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 firefoxWrapper = firefox; # 2015-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a34dadf6399..567c2e9c15d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20539,11 +20539,9 @@ in }); firefox-unwrapped = firefoxPackages.firefox; - firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68; firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78; firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; - firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { }; firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { }; firefox-esr = firefox-esr-78; From 1966a0a4e1c1e07991406e3b90e3b088df252aea Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 10 Sep 2020 00:00:00 -0500 Subject: [PATCH 044/463] opencv: enable videoio on darwin --- pkgs/development/libraries/opencv/4.x.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index a2cd75093ce..adeab6b4494 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -31,7 +31,7 @@ , enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 +, AVFoundation, Cocoa, VideoDecodeAcceleration, CoreMedia, MediaToolbox, bzip2 }: assert blas.implementation == "openblas" && lapack.implementation == "openblas"; @@ -217,7 +217,7 @@ stdenv.mkDerivation { ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb ++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ] - ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ] + ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -255,7 +255,6 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" - "-DBUILD_opencv_videoio=OFF" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30889e14d57..0a4a112efba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14567,7 +14567,7 @@ in }; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox; }; opencv = opencv4; From 62eed9ab29ab21b9e89a5519f85b6216e646d32c Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Wed, 19 Aug 2020 14:29:23 +0200 Subject: [PATCH 045/463] claws-mail: patch mailto handling The "Mailto: Me Your Secrets"[0] paper describes vulnerabilities in multiple email clients regarding the undocumented "attach" field of a mailto URI. This might allow the inclusion of sensitive data in an outgoing email. Pull request #95758 addresses this issue on a more general level. Claws Mail unfortunately also has problems with mailto URIs[1][2]. Referring to the paper, problems for "attach" and "insert" were found and fixed. These patches, which are not included in a release yet, are hereby added. [0]:https://www.nds.ruhr-uni-bochum.de/media/nds/veroeffentlichungen/2020/08/15/mailto-paper.pdf [1]:https://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=4373 [2]:https://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=4374 --- .../networking/mailreaders/claws-mail/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index a000cad4708..08acda3adb7 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,4 +1,4 @@ -{ config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook +{ config, fetchurl, fetchpatch, stdenv, wrapGAppsHook, autoreconfHook , curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager , openldap, perl, pkgconfig, poppler, python, shared-mime-info @@ -39,7 +39,17 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - patches = [ ./mime.patch ]; + patches = [ + ./mime.patch + + # Backports a mitigation to the "mailto vulnerability". This patch is + # included in the next release and must therefore be removed. + (fetchpatch { + name = "fix-4373-4374.patch"; + url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=4c9d15b4b37cdc57edfa16df550a0a881a156153"; + sha256 = "0sp0vxr6pk2fv5ydpcakb50rmn2w2nma98apgfsgcgan82qmwk7n"; + }) + ]; preConfigure = '' # autotools check tries to dlopen libpython as a requirement for the python plugin From 90f01b1c5522347f32ad950fb198dbd9a62e1da0 Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 9 Sep 2020 20:48:12 +0200 Subject: [PATCH 046/463] bcachefs-tools: disable tests Tests were failing because they require the bcachefs module to be loaded on the builder Many tests were skipped anyways and Bcachefs is still tested via its nixos test --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 26158b0361d..2c5cdf17c31 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { zstd lz4 python3Packages.pytest ] ++ stdenv.lib.optional fuseSupport fuse3; - doCheck = true; + doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" From 920441f96e44772fb955ad8067ce4894c2792717 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 17 Aug 2020 11:53:08 +0200 Subject: [PATCH 047/463] bcachefs-tools: 2020-04-04 -> 2020-08-25 --- .../filesystems/bcachefs-tools/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 2c5cdf17c31..ee2af363a56 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils -, liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages +{ stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils +, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages , fuseSupport ? false, fuse3 ? null }: assert fuseSupport -> fuse3 != null; stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "2020-04-04"; + version = "2020-08-25"; - src = fetchgit { - url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d"; - sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g"; + src = fetchFromGitHub { + owner = "koverstreet"; + repo = "bcachefs-tools"; + rev = "487ddeb03c574e902c5b749b4307e87e2150976a"; + sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid"; }; postPatch = '' @@ -29,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ libuuid libscrypt libsodium keyutils liburcu zlib libaio - zstd lz4 python3Packages.pytest + zstd lz4 python3Packages.pytest udev valgrind ] ++ stdenv.lib.optional fuseSupport fuse3; doCheck = false; # needs bcachefs module loaded on builder From 3cc3e864b3d78c73f953f912554c5d3bf18a93df Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 9 Sep 2020 19:47:20 +0200 Subject: [PATCH 048/463] linux_testing_bcachefs: 5.3 -> 5.8 versioning scheme: major.minor.YYYY.MM.DD -> major.minor.patch-YYYY.MM.DD Makes a lot more sense imho --- .../linux/kernel/linux-testing-bcachefs.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 456913c5e6d..81dcb5d4563 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,14 @@ -{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: +{ stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { - version = "5.3.2020.04.04"; - modDirVersion = "5.3.0"; + version = "5.8.0-2020.09.07"; + modDirVersion = "5.8.0"; - src = fetchgit { - url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "a27d7265e75f6d65c2b972ce4ac27abfc153c230"; - sha256 = "0wnjl4xs7073d5ipcsplv5qpcxb7zpfqd5gqvh3mhqc5j3qn816x"; + src = fetchFromGitHub { + owner = "koverstreet"; + repo = "bcachefs"; + rev = "fb2821e72648f35d3cff61ac26041d634fd1dacf"; + sha256 = "0f9hx6fz27rm8h1lk9868v727klvyzcbw6hcgm5mypbfq1nqirdy"; }; extraConfig = "BCACHEFS_FS m"; From d284d3203a1a2273a049d22f25d6e35ff3aa66b9 Mon Sep 17 00:00:00 2001 From: superherointj Date: Wed, 9 Sep 2020 19:14:39 -0300 Subject: [PATCH 049/463] nixos/dmidecode: added recommended patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- pkgs/os-specific/linux/dmidecode/default.nix | 46 +++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index 97ad75851a6..7d0990d9f81 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "dmidecode-3.2"; @@ -8,6 +8,50 @@ stdenv.mkDerivation rec { sha256 = "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07"; }; + patches = [ + # suggested patches for 3.2 according to https://www.nongnu.org/dmidecode/ + (fetchpatch { + name = "0001-fix_redfish_hostname_print_length.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=fde47bb227b8fa817c88d7e10a8eb771c46de1df"; + sha256 = "133nd0c72p68hnqs5m714167761r1pp6bd3kgbsrsrwdx40jlc3m"; + }) + (fetchpatch { + name = "0002-add_logical_non-volatile_device_to_memory_device_types.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=74dfb854b8199ddb0a27e89296fa565f4706cb9d"; + sha256 = "0wdpmlcwmqdyyrsmyis8jb7cx3q6fnqpdpc5xly663dj841jcvwh"; + }) + (fetchpatch { + name = "0003-only-scan-devmem-for-entry-point-on-x86.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=e12ec26e19e02281d3e7258c3aabb88a5cf5ec1d"; + sha256 = "1y2858n98bfa49syjinx911vza6mm7aa6xalvzjgdlyirhccs30i"; + }) + (fetchpatch { + name = "0004-fix_formatting_of_tpm_table_output.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=1d0db85949a5bdd96375f6131d393a11204302a6"; + sha256 = "11s8jciw7xf2668v79qcq2c9w2gwvm3dkcik8dl9v74p654y1nr8"; + }) + (fetchpatch { + name = "0005-fix_system-slot_information_for_pcie_ssd.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=fd08479625b5845e4d725ab628628f7ebfccc407"; + sha256 = "07l61wvsw1d8g14zzf6zm7l0ri9kkqz8j5n4h116qwhg1p2k49y4"; + }) + (fetchpatch { + name = "0006-print_type_33_name_unconditionally.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=65438a7ec0f4cddccf810136da6f280bd148af71"; + sha256 = "0gqz576ccxys0c8217spf1qmw9lxi9xalw85jjqwsi2bj1k6vy4n"; + }) + (fetchpatch { + name = "0007-dont_choke_on_invalid_processor_voltage.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=5bb7eb173b72256f70c6b3f3916d7a444be93340"; + sha256 = "1dkg4lq9kn2g1w5raz1gssn6zqk078zjqbnh9i32f822f727syhp"; + }) + (fetchpatch { + name = "0008-fix_the_alignment_of_type_25_name.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=557c3c373a9992d45d4358a6a2ccf53b03276f39"; + sha256 = "18hc91pk7civyqrlilg3kn2nmp2warhh49xlbzrwqi7hgipyf12z"; + }) + ]; + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { From 69c19c89fb9081a662752bec3ee548e76f9321c8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 11 Sep 2020 04:20:00 +0000 Subject: [PATCH 050/463] zeek: 3.2.0 -> 3.2.1 https://github.com/zeek/zeek/releases/tag/v3.2.1 --- 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 a0e6433a202..7a6d82cd28e 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "zeek"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "0ky4485z0gpaj1z75y7jr5bn9wr8x8w3v637aqq4v9a0a5iyagmg"; + sha256 = "0rybs79h0sq12vsayah8dixqac404z84rlvqynvzf3dh2lwcgg0y"; }; nativeBuildInputs = [ cmake flex bison file ]; From 5262662d80cc05fc99bfd22eac44eda06b1366ef Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 11 Sep 2020 12:57:51 +0300 Subject: [PATCH 051/463] qpdf: 9.1.1 -> 10.0.1 Use fetchFromGitHub. Remove 1 patchShebangs hook now unneeded. --- pkgs/development/libraries/qpdf/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index b324bfed5aa..9405e18edab 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, libjpeg, zlib, perl }: +{ stdenv, fetchFromGitHub, libjpeg, zlib, perl }: -let version = "9.1.1"; -in stdenv.mkDerivation rec { pname = "qpdf"; - inherit version; + version = "10.0.1"; - src = fetchurl { - url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz"; - sha256 = "0dj27wb9xg6pg95phbflfvy9rwxn1gh3kc4n175g0pf41r0zrim2"; + src = fetchFromGitHub { + owner = "qpdf"; + repo = "qpdf"; + rev = "release-qpdf-${version}"; + sha256 = "0g3rqf4wd1n9cms7ra1jnszsgw5bygv37jq2l20d8z5fajckhyyi"; }; nativeBuildInputs = [ perl ]; buildInputs = [ zlib libjpeg ]; - postPatch = '' - patchShebangs qpdf/fix-qdf - ''; - preCheck = '' patchShebangs qtest/bin/qtest-driver ''; From b75887a4b1c35d3689888fe104066be204d2767b Mon Sep 17 00:00:00 2001 From: midchildan Date: Sun, 21 Oct 2018 03:14:34 +0900 Subject: [PATCH 052/463] epgstation: init at 1.7.4 --- .../applications/video/epgstation/default.nix | 84 + .../video/epgstation/epgstation.1 | 52 + .../applications/video/epgstation/generate.sh | 28 + .../video/epgstation/package.json | 101 + .../use-mysql-over-domain-socket.patch | 17 + pkgs/development/node-packages/default.nix | 8 + .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 4384 ++++++++++++----- pkgs/top-level/all-packages.nix | 2 + 9 files changed, 3471 insertions(+), 1206 deletions(-) create mode 100644 pkgs/applications/video/epgstation/default.nix create mode 100644 pkgs/applications/video/epgstation/epgstation.1 create mode 100755 pkgs/applications/video/epgstation/generate.sh create mode 100644 pkgs/applications/video/epgstation/package.json create mode 100644 pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix new file mode 100644 index 00000000000..6464effc560 --- /dev/null +++ b/pkgs/applications/video/epgstation/default.nix @@ -0,0 +1,84 @@ +{ stdenv, fetchFromGitHub, makeWrapper, bash, nodejs, nodePackages, gzip }: + +let + workaround-opencollective-buildfailures = stdenv.mkDerivation { + # FIXME: This should be removed when a complete fix is available + # https://github.com/svanderburg/node2nix/issues/145 + name = "workaround-opencollective-buildfailures"; + phases = [ "installPhase" ]; + installPhase = '' + mkdir -p $out/bin + touch $out/bin/opencollective-postinstall + chmod +x $out/bin/opencollective-postinstall + ''; + }; +in +nodePackages.epgstation.override (drv: { + src = fetchFromGitHub { + owner = "l3tnun"; + repo = "EPGStation"; + rev = "v${drv.version}"; # version specified in ./generate.sh + sha256 = "15z1kdbamj97frp3dfnbm0h8krihmv2xdab4id0rxin29ibrw1k2"; + }; + + buildInputs = [ bash ]; + nativeBuildInputs = [ + workaround-opencollective-buildfailures + makeWrapper + nodePackages.node-pre-gyp + ]; + + preRebuild = '' + # Fix for not being able to connect to mysql using domain sockets. + patch -p1 ${./use-mysql-over-domain-socket.patch} + ''; + + postInstall = let + runtimeDeps = [ nodejs bash ]; + in + '' + mkdir -p $out/{bin,libexec,share/doc/epgstation,share/man/man1} + + pushd $out/lib/node_modules/EPGStation + + npm run build + + mv config/{enc.sh,enc.js} $out/libexec + mv LICENSE Readme.md $out/share/doc/epgstation + mv doc/* $out/share/doc/epgstation + sed 's/@DESCRIPTION@/${drv.meta.description}/g' ${./epgstation.1} \ + | ${gzip}/bin/gzip > $out/share/man/man1/epgstation.1.gz + rm -rf doc + + # just log to stdout and let journald do its job + rm -rf logs + + # Replace the existing configuration and runtime state directories with + # symlinks. Without this, they would all be non-writable because they reside + # in the Nix store. Note that the source path won't be accessible at build + # time. + rm -r config data recorded thumbnail + ln -sfT /etc/epgstation config + ln -sfT /var/lib/epgstation data + ln -sfT /var/lib/epgstation/recorded recorded + ln -sfT /var/lib/epgstation/thumbnail thumbnail + + makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \ + --run "cd $out/lib/node_modules/EPGStation" \ + --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps} + + popd + ''; + + meta = with stdenv.lib; drv.meta // { + maintainers = with maintainers; [ midchildan ]; + + # nodePackages.epgstation is a stub package to fetch npm dependencies and + # is marked as broken to prevent users from installing it directly. This + # technique ensures epgstation can share npm packages with the rest of + # nixpkgs while still allowing us to heavily customize the build. It also + # allows us to provide devDependencies for the epgstation build process + # without doing the same for all the other node packages. + broken = false; + }; +}) diff --git a/pkgs/applications/video/epgstation/epgstation.1 b/pkgs/applications/video/epgstation/epgstation.1 new file mode 100644 index 00000000000..bb5c0238137 --- /dev/null +++ b/pkgs/applications/video/epgstation/epgstation.1 @@ -0,0 +1,52 @@ +.Dd $Mdocdate$ +.Dt EPGSTATION 1 +.Os +.Sh NAME +.Nm epgstation +.Nd @DESCRIPTION@ +.Sh SYNOPSIS +.Nm +.Bk -words +.Op Ar command Op Ar args +.Ek +.Sh DESCRIPTION +.Nm +is a wrapper command for EPGStation provided by Nix. It's actually a thin +wrapper around the +.Xr npm 1 +command line tool which you can use to invoke npm commands from the EPGStation +project directory. The command line arguments are simply passed as-is to +.Xr npm 1 . +.Pp +On NixOS, it is strongly recommended that you enable the epgstation module +instead of invoking this command directly to launch EPGStation. On other +platforms, run +.Pp +.Dl $ epgstation start +.Pp +to start EPGStation. +.Sh FILES +.Bl -tag -width Ds -compact +.It Pa /etc/epgstation/config.json +.Nm +configuration file. +.El +.Sh EXAMPLES +Start EPGStation. +.Pp +.Dl $ epgstation start +.Pp +Start EPGStation in development mode. +.Pp +.Dl $ epgstation run dev-start +.Pp +Backup the EPGstation database. +.Pp +.Dl $ epgstation run backup /path/to/dst +.Pp +Restore the EPGstation database. +.Pp +.Dl $ epgstation run restore /path/to/src +.Pp +.Sh SEE ALSO +.Xr npm 1 diff --git a/pkgs/applications/video/epgstation/generate.sh b/pkgs/applications/video/epgstation/generate.sh new file mode 100755 index 00000000000..55dcf744c0c --- /dev/null +++ b/pkgs/applications/video/epgstation/generate.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +# Script to generate the Nix package definition for EPGStation. Run this script +# when bumping the package version. + +VERSION="1.7.4" +URL="https://raw.githubusercontent.com/l3tnun/EPGStation/v$VERSION/package.json" +JQ_BIN="$(nix-build ../../../.. --no-out-link -A jq)/bin/jq" + +set -eu -o pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +main() { + # update package.json + curl -sSfL "$URL" \ + | jq '. + {"dependencies": (.devDependencies + .dependencies)} | del(.devDependencies)' \ + > package.json + + # regenerate node packages to update the actual Nix package + cd ../../../development/node-packages \ + && ./generate.sh +} + +jq() { + "$JQ_BIN" "$@" +} + +main "@" diff --git a/pkgs/applications/video/epgstation/package.json b/pkgs/applications/video/epgstation/package.json new file mode 100644 index 00000000000..96525ec809e --- /dev/null +++ b/pkgs/applications/video/epgstation/package.json @@ -0,0 +1,101 @@ +{ + "name": "EPGStation", + "version": "1.7.4", + "description": "DTV Software in Japan.", + "main": "dist/server/index.js", + "scripts": { + "start": "node dist/server/index.js", + "dev-start": "node dist/server/index.js --env development", + "clean": "gulp clean", + "build": "gulp build --max_old_space_size=768 --env production", + "dev-build": "gulp build --max_old_space_size=512 --env development", + "test": "echo \"Error: no test specified\" && exit 1", + "task": "gulp --max_old_space_size=512", + "install-win-service": "winser -i -a", + "uninstall-win-service": "winser -r -x", + "backup": "node dist/server/DBTools.js -m backup -o", + "restore": "node dist/server/DBTools.js -m restore -o", + "move-log": "node dist/server/LogFileMoveTools.js", + "convert-str": "node dist/server/ConvertDBStrTools.js" + }, + "repository": { + "type": "git", + "url": "https://github.com/l3tnun/EPGStation.git" + }, + "author": "l3tnun", + "license": "MIT", + "bugs": { + "url": "https://github.com/l3tnun/EPGStation/issues" + }, + "homepage": "https://github.com/l3tnun/EPGStation#readme", + "engines": { + "node": "^10.x.x < 11 || ^12.14.0 < 13 || ^14.5.0 < 15" + }, + "dependencies": { + "@types/basic-auth": "1.1.3", + "@types/body-parser": "1.19.0", + "@types/chart.js": "2.9.23", + "@types/express": "4.17.7", + "@types/hls.js": "0.13.0", + "@types/js-yaml": "3.12.5", + "@types/lodash": "4.14.158", + "@types/material-design-lite": "1.1.16", + "@types/minimist": "1.2.0", + "@types/mithril": "2.0.3", + "@types/mkdirp": "1.0.1", + "@types/multer": "1.4.3", + "@types/mysql": "2.15.15", + "@types/node": "14.0.26", + "@types/pg": "7.14.4", + "@types/request": "2.48.5", + "@types/socket.io": "2.1.10", + "@types/socket.io-client": "1.4.33", + "@types/sqlite3": "3.1.6", + "@types/url-join": "4.0.0", + "del": "5.1.0", + "gulp": "4.0.2", + "gulp-clean-css": "4.3.0", + "gulp-concat": "2.6.1", + "gulp-dart-sass": "1.0.2", + "gulp-plumber": "1.2.1", + "gulp-sourcemaps": "2.6.5", + "gulp-tslint": "8.1.4", + "gulp-typescript": "5.0.1", + "terser-webpack-plugin": "3.0.7", + "ts-loader": "8.0.1", + "tslint": "6.1.2", + "typescript": "3.9.7", + "webpack": "4.44.0", + "webpack-stream": "5.2.1", + "aribts": "^2.1.12", + "b24.js": "1.0.3", + "basic-auth": "2.0.1", + "body-parser": "1.19.0", + "chart.js": "2.9.3", + "css-ripple-effect": "1.0.5", + "diskusage": "1.1.3", + "express": "4.17.1", + "express-openapi": "7.0.0", + "fs-extra": "9.0.1", + "hls-b24.js": "0.12.3", + "js-yaml": "3.14.0", + "lodash": "4.17.19", + "log4js": "6.3.0", + "material-design-icons": "3.0.1", + "material-design-lite": "1.3.0", + "minimist": "1.2.5", + "mirakurun": "3.2.0", + "mithril": "2.0.4", + "mkdirp": "1.0.4", + "multer": "1.4.2", + "mysql": "2.18.1", + "openapi-types": "7.0.0", + "pg": "8.3.0", + "request": "2.88.2", + "socket.io": "2.3.0", + "socket.io-client": "2.3.0", + "sqlite3": "5.0.0", + "swagger-ui-dist": "3.30.2", + "url-join": "4.0.1" + } +} diff --git a/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch b/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch new file mode 100644 index 00000000000..48640f2ba08 --- /dev/null +++ b/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch @@ -0,0 +1,17 @@ +diff --git a/src/server/ConfigInterface.ts b/src/server/ConfigInterface.ts +index d23badd..1dd2b98 100644 +--- a/src/server/ConfigInterface.ts ++++ b/src/server/ConfigInterface.ts +@@ -11,9 +11,10 @@ interface ConfigInterface { + dbPath: string; + dbInfoPath: string; + mysql: { +- host: string; ++ host?: string; ++ socketPath?: string; + user: string; +- password: string; ++ password?: string; + database: string; + connectTimeout: number; + connectionLimit: number; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index faebe18e310..71b9bd77411 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -39,6 +39,14 @@ let meta.broken = since "12"; }; + # NOTE: this is a stub package to fetch npm dependencies for + # ../../applications/video/epgstation + epgstation = super."epgstation-../../applications/video/epgstation".override (drv: { + meta = drv.meta // { + broken = true; # not really broken, see the comment above + }; + }); + bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: { name = "bitwarden-cli-${drv.version}"; }); diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index df5d4e68a54..986a44dfe79 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -66,6 +66,7 @@ , "elm-oracle" , "emoj" , "emojione" +, {"epgstation": "../../applications/video/epgstation"} , "escape-string-regexp" , "eslint" , "eslint_d" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index db00f42aa05..f531c61feb9 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "VHRggJbRY8vHIADWVwbq9cZux0L9LdmlN31XA3daVAI4gMkKdQEocxB7KqGDt6SfIJ3NYi/qh1nRJGooYmTBiA=="; }; }; - "@angular-devkit/architect-0.1001.0" = { + "@angular-devkit/architect-0.1001.1" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1001.0"; + version = "0.1001.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.0.tgz"; - sha512 = "mJYy9tqy7ZfqAJYlQPgcHVUiaAxWnxEEpiTAftsKz/yqdO45YFkzehYXJfCqbAXYr4r7hYY3KqKMgj41ixkS8Q=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.1.tgz"; + sha512 = "2jRO7L/k9gNxHVJxPoUMVvtf/KzsSXNT7akbAbb8CkBJxjx3NC3Y9NssPD9E78kyiXogO6IvkwyalBGrWvOPBQ=="; }; }; "@angular-devkit/core-10.0.7" = { @@ -67,13 +67,13 @@ let sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw=="; }; }; - "@angular-devkit/core-10.1.0" = { + "@angular-devkit/core-10.1.1" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "10.1.0"; + version = "10.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.0.tgz"; - sha512 = "oNRwAX+5uEwgheS3UUc1W+AerbimqGojCOTdWWcq5XtSviZnBCp1FeMZV+eB6XgUWfbmbWBu39S3sCYmXVHLwg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.1.tgz"; + sha512 = "0ZmknL5I177JO+iOz2gDSqHtPK3zGGwyz4ix9IIu172eFRX53sdbl1vDiMikovyvZWx5fXqU3Vazf7CUeGA28w=="; }; }; "@angular-devkit/core-9.1.12" = { @@ -94,13 +94,13 @@ let sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg=="; }; }; - "@angular-devkit/schematics-10.1.0" = { + "@angular-devkit/schematics-10.1.1" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "10.1.0"; + version = "10.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.0.tgz"; - sha512 = "5Vl32bHpcB/oj0oNR8nPLXF7DwPVuzrJjosch8G+sPG2gAG6OpwjUhQjY1U6E4xJGDR6j7fX8jw+TwC2cMgUbQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.1.tgz"; + sha512 = "4UrBbDkuzGmBN1YDG3+GBJ21C+X29vxO0k2EDGrFFjQROsDeogeyWJoUP789v4JCCz9DHF2TRmdhQiEBctZXMg=="; }; }; "@angular-devkit/schematics-9.1.12" = { @@ -301,22 +301,13 @@ let sha512 = "XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ=="; }; }; - "@arcanis/slice-ansi-1.0.2" = { - name = "_at_arcanis_slash_slice-ansi"; - packageName = "@arcanis/slice-ansi"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@arcanis/slice-ansi/-/slice-ansi-1.0.2.tgz"; - sha512 = "lDL63z0W/L/WTgqrwVOuNyMAsTv+pvjybd21z9SWdStmQoXT59E/iVWwat3gYjcdTNBf6oHAMoyFm8dtjpXEYw=="; - }; - }; - "@ardatan/aggregate-error-0.0.1" = { + "@ardatan/aggregate-error-0.0.6" = { name = "_at_ardatan_slash_aggregate-error"; packageName = "@ardatan/aggregate-error"; - version = "0.0.1"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@ardatan/aggregate-error/-/aggregate-error-0.0.1.tgz"; - sha512 = "UQ9BequOTIavs0pTHLMwQwKQF8tTV1oezY/H2O9chA+JNPFZSua55xpU5dPSjAU9/jLJ1VwU+HJuTVN8u7S6Fg=="; + url = "https://registry.npmjs.org/@ardatan/aggregate-error/-/aggregate-error-0.0.6.tgz"; + sha512 = "vyrkEHG1jrukmzTPtyWB4NLPauUw5bQeg4uhn8f+1SSynmrOcyvlb1GKQjjgoBzElLdfXCRYX8UnBlhklOHYRQ=="; }; }; "@azu/format-text-1.0.1" = { @@ -355,13 +346,13 @@ let sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; }; }; - "@babel/core-7.11.5" = { + "@babel/core-7.11.6" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.11.5"; + version = "7.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.11.5.tgz"; - sha512 = "fsEANVOcZHzrsV6dMVWqpSeXClq3lNbYrfFGme6DE25FQWe7pyeYpXyx9guqUnpy466JLzZ8z4uwSr2iv60V5Q=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz"; + sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg=="; }; }; "@babel/generator-7.11.4" = { @@ -373,13 +364,13 @@ let sha512 = "Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g=="; }; }; - "@babel/generator-7.11.5" = { + "@babel/generator-7.11.6" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.11.5"; + version = "7.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.5.tgz"; - sha512 = "9UqHWJ4IwRTy4l0o8gq2ef8ws8UPzvtMkVKjTLAiRmza9p9V6Z+OfuNd9fB1j5Q67F+dVJtPC2sZXI8NM9br4g=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz"; + sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -1354,22 +1345,22 @@ let sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="; }; }; - "@bugsnag/browser-7.3.3" = { + "@bugsnag/browser-7.3.4" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.3.3.tgz"; - sha512 = "P3oQU/abDsDqSuuxVFDBp3XNIYeGLsbtGWwCM+iEg1ZGAUk/yP7NfRLqotMheZ0uC8a+4PSIS+U3+slZF7LCJw=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.3.4.tgz"; + sha512 = "2Og0IxymqJV5oeOuVHs/EJ0xR0V84GLcd6nZDHYSAcVU93wyb8722qfcIVx+CQRzYzoeeMmOb4n3xuuu+Svx+A=="; }; }; - "@bugsnag/core-7.3.3" = { + "@bugsnag/core-7.3.4" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.3.3.tgz"; - sha512 = "DjAwzxQtyKgQxPGLmM+cZZZVkVsecUDowliguvcGojHHmdeIEDIBpu5LrZBQtLNk83SjM1RIyAEPdzaiHGWbzg=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.3.4.tgz"; + sha512 = "eEm4oMw77oOvBf8lHEhWbMYrQJPc9CncVrnVmgZoWYBMeQQQ9sTMKBPEmaO1RJwyWUv/TQc5bPCpDGlGarA3qg=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1381,22 +1372,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.3.3" = { + "@bugsnag/js-7.3.4" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.3.3.tgz"; - sha512 = "4++QE1cebYVI87smjc9IsyIJWtNjL5WG4jp7htd+HEtT0QkhbokIbRH2b4MpN6+l4Y7GzyzMBNDOr1qDdBluBw=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.3.4.tgz"; + sha512 = "00jqmlvDASwCV8g0ynfWkPobSacy78yysSWhSxrwZee0C2/ewzMUjWuaRg/iwCsoTV44O09est0qWgvmK4WArA=="; }; }; - "@bugsnag/node-7.3.3" = { + "@bugsnag/node-7.3.4" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.3.3.tgz"; - sha512 = "quyJXiqcMDVMdDqO0kW1277K3osdI/XgHKtY0K/4EcN2u4Qlg0crBNw5dQo+DCL4yllDQcWRfeuFv718QW4xlQ=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.3.4.tgz"; + sha512 = "G/yL7FGXnkDRDxBR0aEhDX8iZoiGIRGX4dc5CHmpKrS0fbhszIS7ApCT4p5TnXMvZadJTYqTW5ZST2gl0khbNQ=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1534,6 +1525,15 @@ let sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; }; }; + "@emmetio/extract-abbreviation-0.2.0" = { + name = "_at_emmetio_slash_extract-abbreviation"; + packageName = "@emmetio/extract-abbreviation"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@emmetio/extract-abbreviation/-/extract-abbreviation-0.2.0.tgz"; + sha512 = "eWIRoybKwQ0LkZw7aSULPFS+r2kp0+HdJlnw0HaE6g3AKbMNL4Ogwm2OTA9gNWZ5zdp6daOAOHFqjDqqhE5y/g=="; + }; + }; "@emotion/is-prop-valid-0.8.8" = { name = "_at_emotion_slash_is-prop-valid"; packageName = "@emotion/is-prop-valid"; @@ -1633,13 +1633,13 @@ let sha512 = "W98NvvOe/Med3o66xTO03pd7a2omZebH79PV64gSE+ceDdU8uxQhFTa7ISiD1kseyqyOrMyW5/MNdsGEU02i3Q=="; }; }; - "@fluentui/date-time-utilities-7.7.0" = { + "@fluentui/date-time-utilities-7.8.0" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "7.7.0"; + version = "7.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.7.0.tgz"; - sha512 = "rgtGX5x1AeYUfilfkgP6ag+ZKx41BJcUs16k6iSxXxd/mt00DAPOGY8ODGikKFpjGKcUwjKfYBssyKkVHDucfA=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.8.0.tgz"; + sha512 = "qzlTp3t+PghebJsLK9JwZr91qBRZ/fOml8TQCIjdtsEn4mH6/ciCwir7Fj8iOEkwwTC0iKsEr1jfsITtJKWSmA=="; }; }; "@fluentui/keyboard-key-0.2.11" = { @@ -1651,22 +1651,22 @@ let sha512 = "4iG5vNlRD3PrLaMfDTimHNOP1x6V3Dad0fXOwtvBBMsfdySPE9zlY+G+0aqCFcgjymOriFOk0ANZVBpK7XrnTg=="; }; }; - "@fluentui/react-7.134.1" = { + "@fluentui/react-7.137.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.134.1"; + version = "7.137.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.134.1.tgz"; - sha512 = "UMnf1pfTwuphU3lJAfwVsWZULu7MoJmxg/vJyirOvXa/+lQqGQr/SfXthqlkE0DPRMRr2qqtc9iNCfZxi7dfCg=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.137.1.tgz"; + sha512 = "u9qlBobDBjqwOK3vN7N7NoS53RuPXvcpVMOaK5oPRBMdCTsEDcK9pZj/OrKDSGVKmnPRGpoAdNAgsx34QaOfyQ=="; }; }; - "@fluentui/react-focus-7.15.0" = { + "@fluentui/react-focus-7.16.0" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.15.0"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.15.0.tgz"; - sha512 = "xbxB0cbyEoUfQZ19pAqBeWCYJ/4IOu1FG4bhVjDimqSD7qKwJbLlJSDNwmHr05SWprdhmqJe23KOwsHMgyvnrw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.0.tgz"; + sha512 = "TwB4Av7ID70ejisDIGkCZGKOxlquSazr6W+9Jv1JQAvsBLuj5XOspFJH4/Igjniw1LeO9QmAvFZeh/XRShiObw=="; }; }; "@fluentui/react-icons-0.3.0" = { @@ -1714,94 +1714,112 @@ let sha512 = "oJZb4PScX25ZGObpw9n7/bJBE7R0oF6hJ4ABe+WvMqSCI3kxaReMTgJJNIrxpmbXscxWM8U1ndLefP5IjPcU7Q=="; }; }; - "@graphql-tools/delegate-6.2.0" = { + "@graphql-tools/delegate-6.2.1" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.0.tgz"; - sha512 = "jYwg6MuErovAHXhyReTSgRTzdvPB60VEO02KGZskaD5WPqCQy6oqYBetXOp1yG6PBwJvxCTpMKuZvyPVLRM9ww=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.1.tgz"; + sha512 = "IsmrZ+aiT00V567PfawxvdjwMf8RrfjSuyOy7LvqJ6ABUlpcjZejYMFIl82ZjHf8m3OU1xF5Wier8G6XFYzPYw=="; }; }; - "@graphql-tools/graphql-file-loader-6.2.0" = { + "@graphql-tools/graphql-file-loader-6.2.1" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.0.tgz"; - sha512 = "anl/fc2KTLF2Eu5Fd9fRYy+N22QBZskP2uKAqyiaJFPiIAOXWAUjK/WJ4uWAAjkGhEnseK0M8hUudgW36w8Smg=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.1.tgz"; + sha512 = "HfM6kC48KTDhVizeuJVOmh+nJD8s1SefK8aZgFBvnXVWW+HdPx2+T5MH6sSVvqgMrlCxLxuyuwcPIcXqpvYvxA=="; }; }; - "@graphql-tools/import-6.2.0" = { + "@graphql-tools/import-6.2.1" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.0.tgz"; - sha512 = "fYLyzAW3RKKfyPO+0nEA86yUP2V2uctdsZVZEamJ9MtjW+UhZf9kbR+NBuX/FbFAQR+F7UMe5GSPjUTKC13CEg=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.1.tgz"; + sha512 = "10mMCB8x4s0P010n8HHiUExg5m2NMr3Hm30WRSoP3P0m8Q0l8AmwXVwHUtykEaWhu+4xvFZ5Hl3fS+Wm0f7jdg=="; }; }; - "@graphql-tools/json-file-loader-6.2.0" = { + "@graphql-tools/json-file-loader-6.2.1" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.0.tgz"; - sha512 = "kpvYLGuxcq3V9cr996YOCAkw7F/4pC1JY1KxvI3360G0mYVVZcA8Q/XcxcwPwPZrBHDJMHhXvTRZD+svQ49Rxw=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.1.tgz"; + sha512 = "WQ4qIl8dBOg6fLh7GZZ2YzSTelBiTPZlohVCBJ8iuqzS1Tryty6c/FAbMBfscNlQ4nb4y3zb4LR0F0pbq2urcQ=="; }; }; - "@graphql-tools/load-6.2.0" = { + "@graphql-tools/load-6.2.1" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.0.tgz"; - sha512 = "ZsxPXMpLOjNh88Q2XtDmMTP65tQfknZjCgWm9vq+FxlUh//7Z8q6WiChogIEJ9g8G0+XKmLEcA+Vi4L45QX9GA=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.1.tgz"; + sha512 = "PkM2xv/bBFQIkmgCX0LsZnHBuJY5YhDrpsljdD+0mXw2b9w0zUG2qIqBoMBLfG3ncjduE9Hwl1oKSBhFUPJmyA=="; }; }; - "@graphql-tools/merge-6.2.0" = { + "@graphql-tools/merge-6.2.1" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.0.tgz"; - sha512 = "q2bnFhdw6ssBzIlTkyUGPzBThLHgwuTVCRvjjCepegQCKGzwDypve0n+EMBUnoaOcJ3JRgQHR3eStP2x/S0AYw=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.1.tgz"; + sha512 = "GJyMOYM2JyZhvMlVwpUZUv5ocvWCh+/KdPCCzXqo3Va/kOO1ntm8lKGNf3JZpQDgpC5FvaQfsu/b5pE7TBFxyw=="; }; }; - "@graphql-tools/schema-6.2.0" = { + "@graphql-tools/schema-6.2.1" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.0.tgz"; - sha512 = "wlAIgN6pMgRaruiJqlZLIe+FM834ZYif/P7evCbG71sm7Ou8t0n+dkpf8+qZAa7D+PWO9G96BF1l2NPUlM+KvA=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.1.tgz"; + sha512 = "SKoZmxlLwOq08/NZ8Y5aShgEHneTJ8Ksw4gU1WBSWVJGf64ROoxIxN4Uc47F0cZxwOBqVqUy/EdXWZ8Jt97uQQ=="; }; }; - "@graphql-tools/url-loader-6.2.0" = { + "@graphql-tools/url-loader-6.2.1" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.0.tgz"; - sha512 = "bPktwMT42tvsPIlJYQ4bwjnQKhOSwCsV/R81T0tsoh+UbKR2/QxccSQCoNJAUIxP6hXfR+Sc1wMXUw7m8/akrg=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.1.tgz"; + sha512 = "6NTibFENUn02oI53VhW2Dcas0QdHYDyqRD5yxk0D+rQUP558t4eoYLJ8/hhdqbJ5t+2/lBRkzVU/5oJkZQosMQ=="; }; }; - "@graphql-tools/utils-6.2.0" = { + "@graphql-tools/utils-6.2.1" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.0.tgz"; - sha512 = "Z5ONje6tGNvBzGwo/8eIafr98mwuvWpi3IwPp8CKHKjTBAKlUxY8hlwSn+bEMPyuA9uH/7nHWz4lamRQQEHAhg=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.1.tgz"; + sha512 = "DZ6a2bjOH4sWKhNUachvYy+3ocXDvDcTtComOD/z7ncszdlZPU6RXNOgBTxh/bMVHBPqlEh/VjCVMwBysZRbJw=="; }; }; - "@graphql-tools/wrap-6.2.0" = { + "@graphql-tools/wrap-6.2.1" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.0.tgz"; - sha512 = "I7EAvY6x6cBB92j+IrZLE3meYUdmHNK8r/TvHXJ8SmgMJGlt4z8bjOr7WmYdMPufyVdHBSGwECqjWcxOhSxLsA=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.1.tgz"; + sha512 = "bjmN2Xh3haRp5tMDNPpUDV/9IlvFfmG9umsAOb3WFRJBoVi/dX0YwWIyucM3WBVix4ory8Op5eT4KkoKeaFSMw=="; + }; + }; + "@gulp-sourcemaps/identity-map-1.0.2" = { + name = "_at_gulp-sourcemaps_slash_identity-map"; + packageName = "@gulp-sourcemaps/identity-map"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz"; + sha512 = "ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ=="; + }; + }; + "@gulp-sourcemaps/map-sources-1.0.0" = { + name = "_at_gulp-sourcemaps_slash_map-sources"; + packageName = "@gulp-sourcemaps/map-sources"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz"; + sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; "@hapi/address-2.1.4" = { @@ -2551,13 +2569,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.82" = { + "@microsoft/load-themed-styles-1.10.89" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.82"; + version = "1.10.89"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.82.tgz"; - sha512 = "p92TRErd5xpYkSy7TjNDs+0LmxDBSusmLSgnWCv7xZf9DGXZCW08ZiUVlbsaj3e49kGskOaWQvarMDejm2b+FQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.89.tgz"; + sha512 = "nCL/fosGrCzDbr23cd9snWnRJZ3Hzy/0VmoOOqr3DH1mKqdE4EUmRE9GXn9CBSoqy9rK3+dFG5KOgxOIutylng=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -2578,13 +2596,13 @@ let sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg=="; }; }; - "@nestjs/schematics-7.1.1" = { + "@nestjs/schematics-7.1.2" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.1.1.tgz"; - sha512 = "W7FW8GwIwh3bI1BCmr3jF15zEPPd7noHlOWZ9PlSOJMydGynKA3UG1SFohCkeik447N0ZvLEGHJFLRg7SUXfmg=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.1.2.tgz"; + sha512 = "iUszxXz5cFEZFKKFQGyjx0+U5Emj7ix1rhXmHw1v63xhazlgTbT6XPxf247CTP0uyVkcflWkiVi+JawWWix16A=="; }; }; "@netflix/nerror-1.1.3" = { @@ -2947,13 +2965,13 @@ let sha512 = "jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ=="; }; }; - "@octokit/endpoint-6.0.5" = { + "@octokit/endpoint-6.0.6" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.5"; + version = "6.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.5.tgz"; - sha512 = "70K5u6zd45ItOny6aHQAsea8HHQjlQq85yqOMe+Aj8dkhN2qSJ9T+Q3YjUjEYfPRBcuUWNgMn62DQnP/4LAIiQ=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.6.tgz"; + sha512 = "7Cc8olaCoL/mtquB7j/HTbPM+sY6Ebr4k2X2y4JoXpVKQ7r5xB4iGQE0IoO58wIPsUk4AzoT65AMEpymSbWTgQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -2992,13 +3010,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.7" = { + "@octokit/request-5.4.8" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.7"; + version = "5.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.7.tgz"; - sha512 = "FN22xUDP0i0uF38YMbOfx6TotpcENP5W8yJM1e/LieGXn6IoRxDMnBf7tx5RKSW4xuUZ/1P04NFZy5iY3Rax1A=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.8.tgz"; + sha512 = "mWbxjsARJzAq5xp+ZrQfotc+MHFz3/Am2qATJwflv4PZ1TjhgIJnr60PCVdZT9Z/tl+uPXooaVgeviy1KkDlLQ=="; }; }; "@octokit/request-error-1.2.1" = { @@ -3244,13 +3262,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-10.1.0" = { + "@schematics/angular-10.1.1" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "10.1.0"; + version = "10.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.0.tgz"; - sha512 = "kQ925yMmOwiSITY+FhuTvrl3HuEIEUrdByBNB0NlvY+DyJwPlngEOo6Iu0cYWaJcoxM1JscOWL59ZR6W7YCFIg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.1.tgz"; + sha512 = "U+5CfLlMqgkfRWZpmA3yzr+Axj1D42k0+tkfuaBrJTJUf5j7+JyULONPvzUh4Pi1c4EZJt+RuCE+AxtUZO/hug=="; }; }; "@schematics/schematics-0.1000.7" = { @@ -3262,13 +3280,13 @@ let sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw=="; }; }; - "@schematics/update-0.1001.0" = { + "@schematics/update-0.1001.1" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1001.0"; + version = "0.1001.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.0.tgz"; - sha512 = "LRGwo37akHe/BUl5FHj74mJ/xhM0Z7W8pWMWJ6zGihs+HNXjTgfYVgGA1TgN0amqQODa3AxxLL6aLj+hVYZi+g=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.1.tgz"; + sha512 = "71PyE0pTW2u3PPkNBdCXO0gH9pwTgZCfsHNNOWsIsslDDHYHGknJagN0JM/X1YAJ0nVZPgvMC0GSJ/xtIoCZmA=="; }; }; "@serverless/cli-1.5.2" = { @@ -3289,13 +3307,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.34.9" = { + "@serverless/components-3.1.2" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.34.9"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.34.9.tgz"; - sha512 = "qFjIeGgR4SjS32Tbl4BvoxOtLpv3Vx4s/81HdmmpdIrMPe7ePGUfkBVBu3axxAXHf4ajlb4WC1HmhTmZAHHSLQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.1.2.tgz"; + sha512 = "qkelIDlMMRRioY1iijRl7RA/ojoYZ/4Kh2EqcQRcQQzPz7yKICKpOuqA0Juq/ZW3zX2V18MXRvemJ/tNwPPZrQ=="; }; }; "@serverless/core-1.1.2" = { @@ -3307,13 +3325,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.8.2" = { + "@serverless/enterprise-plugin-4.0.2" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.8.2"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.8.2.tgz"; - sha512 = "tJqvVBHOQk110UXEO/RVeZIUh/tyBlxalaNnGRiTsbT2kRsq0s/OfznfMufANmlKaKPcoOXxHEW8oaAV4N1XyA=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.0.2.tgz"; + sha512 = "jad3tvY6N89Pm35cKjjG56usXIs+Txg9UBMCWAZ/b64hdJ2gXrAzKM3qrS/7CoRj0yI1cefxKKzj04AihDNimg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -3334,13 +3352,13 @@ let sha512 = "2c5A6HSWwXluknPNJ2s+Z4WfBwP7Kn6kgsEKD+5xlXpDpBFsRku/xJyO9eqRCwxTM41stgHNC6TRsZ03+wH/rw=="; }; }; - "@serverless/platform-client-1.1.8" = { + "@serverless/platform-client-1.1.10" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "1.1.8"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.1.8.tgz"; - sha512 = "DmU71Lh0ALOMumGD7k2HfO6WwaFpJCA4ech1S9Kd8AQvpKZrT8fyUl9Ymc/E6GJLRC4s3a5wzcsLbu5AiDNyHA=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.1.10.tgz"; + sha512 = "vMCYRdDaqQjPDlny3+mVNy0lr1P6RJ7hVkR2w9Bk783ZB894hobtMrTm8V8OQPwOvlAypmLnQsLPXwRNM+AMsw=="; }; }; "@serverless/platform-client-china-1.0.37" = { @@ -3955,13 +3973,13 @@ let sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; }; }; - "@types/babel__traverse-7.0.13" = { + "@types/babel__traverse-7.0.14" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.0.13"; + version = "7.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.13.tgz"; - sha512 = "i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.14.tgz"; + sha512 = "8w9szzKs14ZtBVuP6Wn7nMLRJ0D6dfB0VEBEyRgxrZ/Ln49aNMykrghM2FaNn4FJRzNppCSa0Rv9pBRM5Xc3wg=="; }; }; "@types/babylon-6.16.5" = { @@ -3973,6 +3991,15 @@ let sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w=="; }; }; + "@types/basic-auth-1.1.3" = { + name = "_at_types_slash_basic-auth"; + packageName = "@types/basic-auth"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/basic-auth/-/basic-auth-1.1.3.tgz"; + sha512 = "W3rv6J0IGlxqgE2eQ2pTb0gBjaGtejQpJ6uaCjz3UQ65+TFTPC5/lAE+POfx1YLdjtxvejJzsIAfd3MxWiVmfg=="; + }; + }; "@types/body-parser-1.19.0" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -4009,6 +4036,15 @@ let sha512 = "1zzPV9FDe1I/WHhRkf9SNgqtRJWZqrBWgu7JGveuHmmyR9CnAPCie2N/x+iHrgnpYBIcCJWHBoMRv2TRWktsvw=="; }; }; + "@types/chart.js-2.9.23" = { + name = "_at_types_slash_chart.js"; + packageName = "@types/chart.js"; + version = "2.9.23"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.23.tgz"; + sha512 = "4QQNE/b+digosu3mnj4E7aNQGKnlpzXa9JvQYPtexpO7v9gnDeqwc1DxF8vLJWLDCNoO6hH0EgO8K/7PtJl8wg=="; + }; + }; "@types/color-name-1.1.1" = { name = "_at_types_slash_color-name"; packageName = "@types/color-name"; @@ -4099,13 +4135,13 @@ let sha512 = "kM2g9Fdk/du24fKuuQhA/LBleFR4Z4JP2MVKpLxQQSzofF1uJ06D+c05zfLDAkkDO55aEeNwJih0gHrE/Ci20A=="; }; }; - "@types/emscripten-1.39.4" = { - name = "_at_types_slash_emscripten"; - packageName = "@types/emscripten"; - version = "1.39.4"; + "@types/engine.io-3.1.4" = { + name = "_at_types_slash_engine.io"; + packageName = "@types/engine.io"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/emscripten/-/emscripten-1.39.4.tgz"; - sha512 = "k3LLVMFrdNA9UCvMDPWMbFrGPNb+GcPyw29ktJTo1RCN7RmxFG5XzPZcPKRlnLuLT/FRm8wp4ohvDwNY7GlROQ=="; + url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.4.tgz"; + sha512 = "98rXVukLD6/ozrQ2O80NAlWDGA4INg+tqsEReWJldqyi2fulC9V7Use/n28SWgROXKm6003ycWV4gZHoF8GA6w=="; }; }; "@types/eslint-visitor-keys-1.0.0" = { @@ -4153,6 +4189,15 @@ let sha512 = "EaEdY+Dty1jEU7U6J4CUWwxL+hyEGMkO5jan5gplfegUgCUsIUWqXxqw47uGjimeT4Qgkz/XUfwoau08+fgvKA=="; }; }; + "@types/fancy-log-1.3.0" = { + name = "_at_types_slash_fancy-log"; + packageName = "@types/fancy-log"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/fancy-log/-/fancy-log-1.3.0.tgz"; + sha512 = "mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw=="; + }; + }; "@types/fs-capacitor-2.0.0" = { name = "_at_types_slash_fs-capacitor"; packageName = "@types/fs-capacitor"; @@ -4189,13 +4234,22 @@ let sha512 = "AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ=="; }; }; - "@types/graphql-upload-8.0.3" = { + "@types/graphql-upload-8.0.4" = { name = "_at_types_slash_graphql-upload"; packageName = "@types/graphql-upload"; - version = "8.0.3"; + version = "8.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.3.tgz"; - sha512 = "hmLg9pCU/GmxBscg8GCr1vmSoEmbItNNxdD5YH2TJkXm//8atjwuprB+xJBK714JG1dkxbbhp5RHX+Pz1KsCMA=="; + url = "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.4.tgz"; + sha512 = "0TRyJD2o8vbkmJF8InppFcPVcXKk+Rvlg/xvpHBIndSJYpmDWfmtx/ZAtl4f3jR2vfarpTqYgj8MZuJssSoU7Q=="; + }; + }; + "@types/hls.js-0.13.0" = { + name = "_at_types_slash_hls.js"; + packageName = "@types/hls.js"; + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.0.tgz"; + sha512 = "zeW+kWWUvMF7x8/M1kLRCX6C41UcKyDZC/Xy6biGqLhd+rkpv2juVO+tCwPSQPQuqL1VtseoQYdONCOxUZ38Sw=="; }; }; "@types/hosted-git-info-2.7.0" = { @@ -4360,6 +4414,15 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; + "@types/lodash-4.14.158" = { + name = "_at_types_slash_lodash"; + packageName = "@types/lodash"; + version = "4.14.158"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.158.tgz"; + sha512 = "InCEXJNTv/59yO4VSfuvNrZHt7eeNtWQEgnieIA+mIC+MOWM9arOWG2eQ8Vhk6NbOre6/BidiXhkZYeDY9U35w=="; + }; + }; "@types/lodash-4.14.161" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; @@ -4378,6 +4441,15 @@ let sha512 = "5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="; }; }; + "@types/material-design-lite-1.1.16" = { + name = "_at_types_slash_material-design-lite"; + packageName = "@types/material-design-lite"; + version = "1.1.16"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/material-design-lite/-/material-design-lite-1.1.16.tgz"; + sha512 = "559S2XW9YMwHznROJ4WFhZJOerJPuxLfqOX+LIKukyLo2NbVgpULwXUsrBlCwhZ4+ACHgVAE23CC3RS52lFxwA=="; + }; + }; "@types/mime-2.0.3" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; @@ -4405,6 +4477,15 @@ let sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; }; }; + "@types/mithril-2.0.3" = { + name = "_at_types_slash_mithril"; + packageName = "@types/mithril"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mithril/-/mithril-2.0.3.tgz"; + sha512 = "cZHOdO2IiXYeyjeDYdbOisSdfaJRzfmRo3zVzgu33IWTMA0KEQObp9fdvqcuYdPz93iJ1yCl19GcEjo/9yv+yA=="; + }; + }; "@types/mkdirp-0.5.2" = { name = "_at_types_slash_mkdirp"; packageName = "@types/mkdirp"; @@ -4414,6 +4495,15 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; + "@types/mkdirp-1.0.1" = { + name = "_at_types_slash_mkdirp"; + packageName = "@types/mkdirp"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.1.tgz"; + sha512 = "HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q=="; + }; + }; "@types/mocha-7.0.2" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; @@ -4423,13 +4513,31 @@ let sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; - "@types/node-10.17.29" = { + "@types/multer-1.4.3" = { + name = "_at_types_slash_multer"; + packageName = "@types/multer"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.3.tgz"; + sha512 = "tWsKbF5LYtXrJ7eOfI0aLBgEv9B7fnJe1JRXTj5+Z6EMfX0yHVsRFsNGnKyN8Bs0gtDv+JR37xAqsPnALyVTqg=="; + }; + }; + "@types/mysql-2.15.15" = { + name = "_at_types_slash_mysql"; + packageName = "@types/mysql"; + version = "2.15.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.15.tgz"; + sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw=="; + }; + }; + "@types/node-10.17.31" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.29"; + version = "10.17.31"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.29.tgz"; - sha512 = "zLo9rjUeQ5+QVhOufDwrb3XKyso31fJBJnk9wUUQIBDExF/O4LryvpOfozfUaxgqifTnlt7FyqsAPXUq5yFZSA=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.31.tgz"; + sha512 = "AiazLSnsm7GfTxr08GrqeqMxygR/yV78RDk5gaw+S7pOP70BIqUbTFl9vZRyUC/XubcwIqkiiHxbJNFAGvSoOw=="; }; }; "@types/node-12.7.12" = { @@ -4441,22 +4549,31 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.16" = { + "@types/node-13.13.18" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.16"; + version = "13.13.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.16.tgz"; - sha512 = "dJ9vXxJ8MEwzNn4GkoAGauejhXoKuJyYKegsA6Af25ZpEDXomeVXt5HUWUNVHk5UN7+U0f6ghC6otwt+7PdSDg=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.18.tgz"; + sha512 = "nru5D2PxzwzWyo3ocADAkzbc5H1KxVJMmX8oco9Fe5c+4vv6+MMp93wPq6ADqwHAwDtNH55eTCNGVaIZHZsAFQ=="; }; }; - "@types/node-14.6.3" = { + "@types/node-14.0.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.6.3"; + version = "14.0.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.6.3.tgz"; - sha512 = "pC/hkcREG6YfDfui1FBmj8e20jFU5Exjw4NYDm8kEdrW+mOh0T1Zve8DWKnS7ZIZvgncrctcNCXF4Q2I+loyww=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.0.26.tgz"; + sha512 = "W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA=="; + }; + }; + "@types/node-14.10.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "14.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-14.10.0.tgz"; + sha512 = "SOIyrdADB4cq6eY1F+9iU48iIomFAPltu11LCvA9PKcyEwHadjCFzNVPotAR+oEJA0bCP4Xvvgy+vwu1ZjVh8g=="; }; }; "@types/node-6.14.11" = { @@ -4513,6 +4630,24 @@ let sha512 = "kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw=="; }; }; + "@types/pg-7.14.4" = { + name = "_at_types_slash_pg"; + packageName = "@types/pg"; + version = "7.14.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/pg/-/pg-7.14.4.tgz"; + sha512 = "yCKVMCcFPZSFHGg+8qjY368uf3ruyDBPjxvOU2ZcGa/vRFo5Ti5Y6z6vl+2hxtwm9VMWUGb6TWkIk3cIV8C0Cw=="; + }; + }; + "@types/pg-types-1.11.5" = { + name = "_at_types_slash_pg-types"; + packageName = "@types/pg-types"; + version = "1.11.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-1.11.5.tgz"; + sha512 = "L8ogeT6vDzT1vxlW3KITTCt+BVXXVkLXfZ/XNm6UqbcJgxf+KPO7yjWx7dQQE8RW07KopL10x2gNMs41+IkMGQ=="; + }; + }; "@types/q-1.5.4" = { name = "_at_types_slash_q"; packageName = "@types/q"; @@ -4612,6 +4747,24 @@ let sha512 = "7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="; }; }; + "@types/socket.io-2.1.10" = { + name = "_at_types_slash_socket.io"; + packageName = "@types/socket.io"; + version = "2.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.10.tgz"; + sha512 = "1fQMaDU/x2LPljEI/QI5IKl8sBYHM/zv32YYKvNrVEor7/1+MLqMqmWt8Bb8Vpf+PlIPBiTTC0BnrRx7ju3xOw=="; + }; + }; + "@types/socket.io-client-1.4.33" = { + name = "_at_types_slash_socket.io-client"; + packageName = "@types/socket.io-client"; + version = "1.4.33"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.33.tgz"; + sha512 = "m4LnxkljsI9fMsjwpW5QhRpMixo2BeeLpFmg0AE+sS4H1pzAd/cs/ftTiL60FLZgfFa8PFRPx5KsHu8O0bADKQ=="; + }; + }; "@types/source-list-map-0.1.2" = { name = "_at_types_slash_source-list-map"; packageName = "@types/source-list-map"; @@ -4621,6 +4774,15 @@ let sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; }; }; + "@types/sqlite3-3.1.6" = { + name = "_at_types_slash_sqlite3"; + packageName = "@types/sqlite3"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/sqlite3/-/sqlite3-3.1.6.tgz"; + sha512 = "OBsK0KIGUICExQ/ZvnPY4cKx5Kz4NcrVyGTIvOL5y4ajXu7r++RfBajfpGfGDmDVCKcoCDX1dO84/oeyeITnxA=="; + }; + }; "@types/superagent-3.8.2" = { name = "_at_types_slash_superagent"; packageName = "@types/superagent"; @@ -4675,6 +4837,15 @@ let sha512 = "FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ=="; }; }; + "@types/url-join-4.0.0" = { + name = "_at_types_slash_url-join"; + packageName = "@types/url-join"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.0.tgz"; + sha512 = "awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw=="; + }; + }; "@types/vfile-3.0.2" = { name = "_at_types_slash_vfile"; packageName = "@types/vfile"; @@ -4693,13 +4864,13 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vscode-1.48.0" = { + "@types/vscode-1.49.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.48.0"; + version = "1.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.48.0.tgz"; - sha512 = "sZJKzsJz1gSoFXcOJWw3fnKl2sseUgZmvB4AJZS+Fea+bC/jfGPVhmFL/FfQHld/TKtukVONsmoD3Pkyx9iadg=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.49.0.tgz"; + sha512 = "wfNQmLmm1VdMBr6iuNdprWmC1YdrgZ9dQzadv+l2eSjJlElOdJw8OTm4RU4oGTBcfvG6RZI2jOcppkdSS18mZw=="; }; }; "@types/webpack-4.41.21" = { @@ -4783,13 +4954,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@types/zen-observable-0.8.0" = { + "@types/zen-observable-0.8.1" = { name = "_at_types_slash_zen-observable"; packageName = "@types/zen-observable"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz"; - sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; + url = "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.1.tgz"; + sha512 = "wmk0xQI6Yy7Fs/il4EpOcflG4uonUpYGqvZARESLc2oy4u69fkatFLbJOeW4Q6awO15P4rduAe6xkwHevpXcUQ=="; }; }; "@typescript-eslint/eslint-plugin-3.10.1" = { @@ -4882,13 +5053,13 @@ let sha512 = "805WIbN7lAJATXKxZjjRbIgN7raRMwWYWeDkJJ52PCPuCesOvbpdr0GkH8rC6GQ7EB0MB7YM2i6Fiye7SFewbw=="; }; }; - "@uifabric/react-hooks-7.11.0" = { + "@uifabric/react-hooks-7.13.0" = { name = "_at_uifabric_slash_react-hooks"; packageName = "@uifabric/react-hooks"; - version = "7.11.0"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.11.0.tgz"; - sha512 = "iU7c+JR+rY5kBTPmrF8F6iJBQw309MX/MvOx6ElhmNceBaa8BqDuqR9+TVfkH+Bxp37bmZnCaQF5w4+QWHZ81g=="; + url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.0.tgz"; + sha512 = "A7K0YFHHr10hB/txsqpPX6PhNhHEv8U7JpY3O81oqlZwSsHroJklQdd897JkAYJUUR+gWe2kQyXkkcaMDdqXjg=="; }; }; "@uifabric/set-version-7.0.22" = { @@ -4918,40 +5089,40 @@ let sha512 = "m4Yeyn4gyW7xS8LvOnCesokPModYS2YuE9GQmO++MDZ/vC5RRNlvlyktUZDuxCZ84cNCiXyTQ8nImBaPGnxHVQ=="; }; }; - "@vue/cli-shared-utils-4.5.4" = { + "@vue/cli-shared-utils-4.5.6" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.5.4"; + version = "4.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.4.tgz"; - sha512 = "7ZwAvGxl5szGuaJCc4jdPy/2Lb7oJvG847MDF+7pZ7FVl6bURwbUJjiUwL6DTxvpC4vch6B4tXfVvZFjzVP/bw=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.6.tgz"; + sha512 = "p6ePDlEa7Xc0GEt99KDOCwPZtR7UnoEaZLMfwPYU5LAWkdCmtAw8HPAY/WWcjtoiaAkY4k9tz7ZehQasZ9mJxg=="; }; }; - "@vue/cli-ui-4.5.4" = { + "@vue/cli-ui-4.5.6" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.5.4"; + version = "4.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.4.tgz"; - sha512 = "1FXRes+Xl/018OdF8pSZKxQzT+NwUpBm5/DbKkNxcxJOSgEE/sIUGmQjyQPWyYyFs6hugbIsNpEJgdYumUUjbQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.6.tgz"; + sha512 = "AmirESDgjeeTIvFc/OgQeNtYh1cfollyFdF3JSGaAy27rJJlbWfYRgHJoPFp7SD61FQQuqE+TOyiNjplHHt/Rg=="; }; }; - "@vue/cli-ui-addon-webpack-4.5.4" = { + "@vue/cli-ui-addon-webpack-4.5.6" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.5.4"; + version = "4.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.4.tgz"; - sha512 = "J5yYNdrcBvDboYwX+I9KEpv2QdV39X+YoZl2x+mYAgc4d+Forf2mmGipBarnAOgR58d/yapFRrtQLK1dUNpk9A=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.6.tgz"; + sha512 = "wjgzU4+cl93YXDrnSdZQmYRHyvCSgq24wPQFsfdXrobfP6a76wx+QedrLm7o2o0/BCHNCkDrTQLHxHvPiVm9PA=="; }; }; - "@vue/cli-ui-addon-widgets-4.5.4" = { + "@vue/cli-ui-addon-widgets-4.5.6" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.5.4"; + version = "4.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.4.tgz"; - sha512 = "/7R3dMrv/tEP4AM22hBDPfXPF24OE/2ddR3cTF1c1fSoHT/LcUvqrlHIb8SlVgl3S7WvF9Prrunp+KzkHW9bSA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.6.tgz"; + sha512 = "4Lpf59lr0pycIzKdTlZsgubJxCHDkAqcc4I60Gp6rggueksuhz2q3rAp7kfxwCzaZlAXXsqy6hoeyj+3sukqDQ=="; }; }; "@vue/compiler-core-3.0.0-rc.10" = { @@ -5404,42 +5575,6 @@ let sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; }; - "@yarnpkg/core-2.2.2" = { - name = "_at_yarnpkg_slash_core"; - packageName = "@yarnpkg/core"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/core/-/core-2.2.2.tgz"; - sha512 = "TQ0wqQjbZQDrf31N5v4NtE4Juw1c16hYu9QwNloUxRgY/Z+AQIuqa6Jgv9BbAghchZkSIXDWp6bFGD7C+q7cuA=="; - }; - }; - "@yarnpkg/fslib-2.2.1" = { - name = "_at_yarnpkg_slash_fslib"; - packageName = "@yarnpkg/fslib"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.2.1.tgz"; - sha512 = "7SzLP/RHt8lEOaCTg6hMMrnxc2/Osbu3+UPwLZiZiGtLpYqwtTgtWTlAqddS3+MESXOZhc+3gKLX0lfqm6oWuw=="; - }; - }; - "@yarnpkg/json-proxy-2.1.0" = { - name = "_at_yarnpkg_slash_json-proxy"; - packageName = "@yarnpkg/json-proxy"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/json-proxy/-/json-proxy-2.1.0.tgz"; - sha512 = "rOgCg2DkyviLgr80mUMTt9vzdf5RGOujQB26yPiXjlz4WNePLBshKlTNG9rKSoKQSOYEQcw6cUmosfOKDatrCw=="; - }; - }; - "@yarnpkg/libzip-2.2.0" = { - name = "_at_yarnpkg_slash_libzip"; - packageName = "@yarnpkg/libzip"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.2.0.tgz"; - sha512 = "/YRSPJbPAvHeCJxcXJrUV4eRP9hER6YB6LyZxsFlpyF++eqdOzNu0WsuXRRJxfqYt3hl7SiGFkL23qB9jqC6cw=="; - }; - }; "@yarnpkg/lockfile-1.1.0" = { name = "_at_yarnpkg_slash_lockfile"; packageName = "@yarnpkg/lockfile"; @@ -5449,33 +5584,6 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-2.2.0" = { - name = "_at_yarnpkg_slash_parsers"; - packageName = "@yarnpkg/parsers"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-2.2.0.tgz"; - sha512 = "k1XZaWYRHl7wCj04hcbtzKfPAZbKbsEi7xsB1Ka8obdS6DRnAw7n0gZPvvGjOoqkH95IqWf+Vi7vV5RhlGz63Q=="; - }; - }; - "@yarnpkg/pnp-2.2.1" = { - name = "_at_yarnpkg_slash_pnp"; - packageName = "@yarnpkg/pnp"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/pnp/-/pnp-2.2.1.tgz"; - sha512 = "jrwJ3Q6M+nMs4n0O/GgxayU1Bq9mpLoZW2Mb8Nt2fs5whB0CeCr1/pGl9+yiCSjirv9jjp51TVFqF7OPvXy+gA=="; - }; - }; - "@yarnpkg/shell-2.2.0" = { - name = "_at_yarnpkg_slash_shell"; - packageName = "@yarnpkg/shell"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/shell/-/shell-2.2.0.tgz"; - sha512 = "IuOZhYxTydNySqP2HlKkfm1QjgCAgVBUZz5O5rXXxpS4vTNSa0q6fwqvNUSrHSWGKH/jAmJS23YbJqislj5wjg=="; - }; - }; "@zeit/schemas-2.6.0" = { name = "_at_zeit_slash_schemas"; packageName = "@zeit/schemas"; @@ -5746,13 +5854,13 @@ let sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; - "acorn-jsx-5.2.0" = { + "acorn-jsx-5.3.1" = { name = "acorn-jsx"; packageName = "acorn-jsx"; - version = "5.2.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; - sha512 = "HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ=="; + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; }; }; "acorn-loose-6.1.0" = { @@ -6223,6 +6331,15 @@ let sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; + "ansi-cyan-0.1.1" = { + name = "ansi-cyan"; + packageName = "ansi-cyan"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz"; + sha1 = "538ae528af8982f28ae30d86f2f17456d2609873"; + }; + }; "ansi-diff-1.1.1" = { name = "ansi-diff"; packageName = "ansi-diff"; @@ -7042,6 +7159,24 @@ let sha512 = "fvDR4iYpZkbMqMbTfKynPGfpXDhFTxzZWSS7C3c70xQ8ElmFkjwVrg/NLcEA+R3s4Jz6mVrz/1vOLEAI+ycrSQ=="; }; }; + "aribts-2.1.12" = { + name = "aribts"; + packageName = "aribts"; + version = "2.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/aribts/-/aribts-2.1.12.tgz"; + sha512 = "kY0YXa72/R7ruTxDqMHCDHnhW9pYvDT+46hQ7tnVDJUb+kp9BJcnOeiRIDheKp4Kn6z630UVywIgiK+4mYgJfA=="; + }; + }; + "arr-diff-1.1.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz"; + sha1 = "687c32758163588fef7de7b36fabe495eb1a399a"; + }; + }; "arr-diff-2.0.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -7087,6 +7222,15 @@ let sha1 = "3a77345ffc1cf35e2a91825601f9e58f2e24cac4"; }; }; + "arr-union-2.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz"; + sha1 = "20f9eab5ec70f5c7d215b1077b1c39161d292c7d"; + }; + }; "arr-union-3.1.0" = { name = "arr-union"; packageName = "arr-union"; @@ -7330,6 +7474,15 @@ let sha1 = "7ea4882a356b4bca5f545e0b6e52eaf6d971557a"; }; }; + "array-slice-0.2.3" = { + name = "array-slice"; + packageName = "array-slice"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"; + sha1 = "dd3cfb80ed7973a75117cdac69b0b99ec86186f5"; + }; + }; "array-slice-1.1.0" = { name = "array-slice"; packageName = "array-slice"; @@ -8014,13 +8167,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.745.0" = { + "aws-sdk-2.750.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.745.0"; + version = "2.750.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.745.0.tgz"; - sha512 = "YTmDvxb0foJC/iZOSsn+MdO4g9nPnlyRdhIpFqvPUkrFzWn5rP4mPtDJan2Eu0j4R02pdwfDhmvr82ckH2w7OQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.750.0.tgz"; + sha512 = "eARIyZSd9j197XIMT0jk+4iYSh717AN0VyoAu8ir2IgkpbcB6pSEZPWPP0iuHEUbar+xqBHc4lfjegmMCbsxDw=="; }; }; "aws-sign2-0.6.0" = { @@ -8077,6 +8230,15 @@ let sha512 = "pMfGJ6gAQ7LRKTHgiRF+8iaUUeGAI0c8puLaqHLc7B8AR7W6GJLozK9RFeUHFjEGybC9/EB3r67WPd7e46zQ8w=="; }; }; + "b24.js-1.0.3" = { + name = "b24.js"; + packageName = "b24.js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/b24.js/-/b24.js-1.0.3.tgz"; + sha512 = "j2hHu0asf6HxacVmGJKFSsrfoG8nC0JEjujIpsmRVkr74nC6o5gs6YF6AQD3e7YyJ8PaKuA7k2uSL9A2mAG9Og=="; + }; + }; "babel-code-frame-6.26.0" = { name = "babel-code-frame"; packageName = "babel-code-frame"; @@ -8896,6 +9058,15 @@ let sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; + "bignumber.js-9.0.0" = { + name = "bignumber.js"; + packageName = "bignumber.js"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz"; + sha512 = "t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="; + }; + }; "bigspinner-3.1.0" = { name = "bigspinner"; packageName = "bigspinner"; @@ -9688,13 +9859,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.14.0" = { + "browserslist-4.14.2" = { name = "browserslist"; packageName = "browserslist"; - version = "4.14.0"; + version = "4.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz"; - sha512 = "pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz"; + sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; "bser-2.1.1" = { @@ -9886,6 +10057,15 @@ let sha1 = "3d253fe2f0ab70e851d728712e8cd6f914a8c002"; }; }; + "buffer-writer-2.0.0" = { + name = "buffer-writer"; + packageName = "buffer-writer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz"; + sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; + }; + }; "buffer-xor-1.0.3" = { name = "buffer-xor"; packageName = "buffer-xor"; @@ -10435,13 +10615,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001123" = { + "caniuse-lite-1.0.30001125" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001123"; + version = "1.0.30001125"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001123.tgz"; - sha512 = "03dJDoa4YC4332jq0rqwiM+Hw6tA5RJtrnZKvOQy7ASoIUv8CinkcmGhYpCvCjedvkBQrrKnkcELxrUSW/XwNQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001125.tgz"; + sha512 = "9f+r7BW8Qli917mU3j0fUaTweT3f3vnX/Lcs+1C73V+RADmFme+Ih0Br8vONQi3X0lseOe6ZHfsZLCA8MSjxUA=="; }; }; "capital-case-1.0.3" = { @@ -10768,6 +10948,33 @@ let sha512 = "6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg=="; }; }; + "chart.js-2.9.3" = { + name = "chart.js"; + packageName = "chart.js"; + version = "2.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chart.js/-/chart.js-2.9.3.tgz"; + sha512 = "+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw=="; + }; + }; + "chartjs-color-2.4.1" = { + name = "chartjs-color"; + packageName = "chartjs-color"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz"; + sha512 = "haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w=="; + }; + }; + "chartjs-color-string-0.6.0" = { + name = "chartjs-color-string"; + packageName = "chartjs-color-string"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz"; + sha512 = "TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A=="; + }; + }; "charwise-3.0.1" = { name = "charwise"; packageName = "charwise"; @@ -11452,15 +11659,6 @@ let sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; }; }; - "clipanion-2.5.0" = { - name = "clipanion"; - packageName = "clipanion"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clipanion/-/clipanion-2.5.0.tgz"; - sha512 = "VYOMl0h/mZXQC2BWq7oBto1zY1SkPWUaJjt+cuIred1HrmrcX1I2N+LNyNoRy8Iwu9r6vUxJwS/tWLwhQW4tPw=="; - }; - }; "clipboard-2.0.6" = { name = "clipboard"; packageName = "clipboard"; @@ -12496,6 +12694,15 @@ let sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; }; }; + "concat-with-sourcemaps-1.1.0" = { + name = "concat-with-sourcemaps"; + packageName = "concat-with-sourcemaps"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz"; + sha512 = "4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg=="; + }; + }; "concordance-4.0.0" = { name = "concordance"; packageName = "concordance"; @@ -13622,6 +13829,15 @@ let sha1 = "a468ee667c16d81ccf05c58c38d2a97c780dbfd4"; }; }; + "css-ripple-effect-1.0.5" = { + name = "css-ripple-effect"; + packageName = "css-ripple-effect"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/css-ripple-effect/-/css-ripple-effect-1.0.5.tgz"; + sha1 = "6963b752aaf59babbd3fea3ec0da5d44e9122efb"; + }; + }; "css-select-1.2.0" = { name = "css-select"; packageName = "css-select"; @@ -14405,6 +14621,15 @@ let sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; }; }; + "debug-fabulous-1.1.0" = { + name = "debug-fabulous"; + packageName = "debug-fabulous"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz"; + sha512 = "GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg=="; + }; + }; "debuglog-1.0.1" = { name = "debuglog"; packageName = "debuglog"; @@ -15080,6 +15305,15 @@ let sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; }; + "detect-newline-2.1.0" = { + name = "detect-newline"; + packageName = "detect-newline"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz"; + sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; + }; + }; "detect-newline-3.1.0" = { name = "detect-newline"; packageName = "detect-newline"; @@ -15296,13 +15530,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.1.12" = { + "diff2html-3.1.13" = { name = "diff2html"; packageName = "diff2html"; - version = "3.1.12"; + version = "3.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.12.tgz"; - sha512 = "iUFPcwhsb2e6ng7ct9VGntOomhCb5qRy1tuSCz2RpTk/3Y0fRjfySHEeL95rYvWqawfGrj/7OjPR/kGOTIT/9w=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.13.tgz"; + sha512 = "Gs4NbtynANYqkPbbGqZN6zwWJq6JofAb5it76xnEUTpFjWJndaCCjFVUoD7yFjEPB36MtwTtT/ptWcKyD9Vw9g=="; }; }; "diff3-0.0.3" = { @@ -15440,6 +15674,15 @@ let sha512 = "vkg0bv+FUwSuPxBWzdNPQVNmXQlIbvz1Ygi+A1XefNUhEzfmM+RNndjtjlDgxD/ZUhFir9PX7Hw9iIDVujsOoA=="; }; }; + "diskusage-1.1.3" = { + name = "diskusage"; + packageName = "diskusage"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/diskusage/-/diskusage-1.1.3.tgz"; + sha512 = "EAyaxl8hy4Ph07kzlzGTfpbZMNAAAHXSZtNEMwdlnSd1noHzvA6HsgKt4fEMSvaEXQYLSphe5rPMxN4WOj0hcQ=="; + }; + }; "dispensary-0.52.0" = { name = "dispensary"; packageName = "dispensary"; @@ -15854,13 +16097,13 @@ let sha512 = "l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ=="; }; }; - "dot-prop-5.2.0" = { + "dot-prop-5.3.0" = { name = "dot-prop"; packageName = "dot-prop"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz"; - sha512 = "uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A=="; + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; }; }; "dot-qs-0.2.0" = { @@ -16259,13 +16502,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.560" = { + "electron-to-chromium-1.3.565" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.560"; + version = "1.3.565"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.560.tgz"; - sha512 = "0cEFfOA3sNXfSxo0FIClBhrLVSe/QO9LBiqmmYPm3N/IYyt41NRTa2EhvOMWAOKpjd91t/rq062yhnJzfVMKkQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.565.tgz"; + sha512 = "me5dGlHFd8Q7mKhqbWRLIYnKjw4i0fO6hmW0JBxa7tM87fBfNEjWokRnDF7V+Qme/9IYpwhfMn+soWs40tXWqg=="; }; }; "elegant-spinner-1.0.1" = { @@ -16485,15 +16728,6 @@ let sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }; }; - "end-of-stream-1.1.0" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz"; - sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07"; - }; - }; "end-of-stream-1.4.1" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -17520,15 +17754,6 @@ let sha512 = "HnSYx1BsJ87/p6swwzv+2v6B4X+uxUteoDfRxsAb1S1BePzQqOLevVmkdA15GHJVd9A9Ok6wygUR18Hu0YeV9g=="; }; }; - "event-loop-spinner-1.1.0" = { - name = "event-loop-spinner"; - packageName = "event-loop-spinner"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/event-loop-spinner/-/event-loop-spinner-1.1.0.tgz"; - sha512 = "YVFs6dPpZIgH665kKckDktEVvSBccSYJmoZUfhNUdv5d3Xv+Q+SKF4Xis1jolq9aBzuW1ZZhQh/m/zU/TPdDhw=="; - }; - }; "event-loop-spinner-2.0.0" = { name = "event-loop-spinner"; packageName = "event-loop-spinner"; @@ -17610,6 +17835,24 @@ let sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; }; }; + "eventemitter3-2.0.3" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz"; + sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; + }; + }; + "eventemitter3-3.1.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz"; + sha512 = "ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="; + }; + }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -17952,6 +18195,15 @@ let sha512 = "WQGmghzn+loQsIQUEnLZ0HVKCLhIBVcURvrAhyt6mOqsFsG2tBYhaNKX728EOz2aMXRhEQhkQ+RXQsIFpbS6IA=="; }; }; + "express-openapi-7.0.0" = { + name = "express-openapi"; + packageName = "express-openapi"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.0.0.tgz"; + sha512 = "ryjUF/MuYEh13jXKNOD7kw/o6n1MTywDP08n5/BqFRd9IaTX33vZEKhk9NlsvGfD63lNre/84CN0hPLvWEe7qQ=="; + }; + }; "express-session-1.17.1" = { name = "express-session"; packageName = "express-session"; @@ -18033,6 +18285,15 @@ let sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; + "extend-shallow-1.1.4" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz"; + sha1 = "19d6bf94dfc09d76ba711f39b872d21ff4dd9071"; + }; + }; "extend-shallow-2.0.1" = { name = "extend-shallow"; packageName = "extend-shallow"; @@ -19734,6 +19995,15 @@ let sha512 = "oITW9GoYFZwYWR2aMDdUvr6W9O5mtzSizIVEUdeCQaFD6+BylwPSEP2+ZFWv1UYpE9kiPS3Hb0knh2PmFJcj6A=="; }; }; + "fs-routes-7.0.1" = { + name = "fs-routes"; + packageName = "fs-routes"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-routes/-/fs-routes-7.0.1.tgz"; + sha512 = "kSAfx/P8oLSi5+tblecTETcJJ/Q+qL+xzGx4hns/+gHXMkTOZEzG73/2dBDW1FFy5+ZW080XoMaBAN2kCN55aQ=="; + }; + }; "fs-write-stream-atomic-1.0.10" = { name = "fs-write-stream-atomic"; packageName = "fs-write-stream-atomic"; @@ -20427,6 +20697,15 @@ let sha512 = "GPsfwticcu52WQ+eHp0IYkAyaOASgYdtsQDIt4rUp6GbiNt1P9ddrh3O0kQB0eD4UJZszVqNT3+9Zwcg40fywA=="; }; }; + "git-url-parse-11.2.0" = { + name = "git-url-parse"; + packageName = "git-url-parse"; + version = "11.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.2.0.tgz"; + sha512 = "KPoHZg8v+plarZvto4ruIzzJLFQoRx+sUs5DQSr07By9IBKguVd+e6jwrFR6/TP6xrCJlNV1tPqLO1aREc7O2g=="; + }; + }; "gitconfiglocal-1.0.0" = { name = "gitconfiglocal"; packageName = "gitconfiglocal"; @@ -20959,13 +21238,13 @@ let sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww=="; }; }; - "got-11.6.0" = { + "got-11.6.2" = { name = "got"; packageName = "got"; - version = "11.6.0"; + version = "11.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-11.6.0.tgz"; - sha512 = "ErhWb4IUjQzJ3vGs3+RR12NWlBDDkRciFpAkQ1LPUxi6OnwhGj07gQxjPsyIk69s7qMihwKrKquV6VQq7JNYLA=="; + url = "https://registry.npmjs.org/got/-/got-11.6.2.tgz"; + sha512 = "/21qgUePCeus29Jk7MEti8cgQUNXFSWfIevNIk4H7u1wmXNDrGPKPY6YsPY+o9CIT/a2DjCjRz0x1nM9FtS2/A=="; }; }; "got-6.7.1" = { @@ -21247,6 +21526,24 @@ let sha512 = "cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ=="; }; }; + "gulp-4.0.2" = { + name = "gulp"; + packageName = "gulp"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz"; + sha512 = "dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA=="; + }; + }; + "gulp-clean-css-4.3.0" = { + name = "gulp-clean-css"; + packageName = "gulp-clean-css"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz"; + sha512 = "mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg=="; + }; + }; "gulp-cli-2.3.0" = { name = "gulp-cli"; packageName = "gulp-cli"; @@ -21256,6 +21553,24 @@ let sha512 = "zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A=="; }; }; + "gulp-concat-2.6.1" = { + name = "gulp-concat"; + packageName = "gulp-concat"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz"; + sha1 = "633d16c95d88504628ad02665663cee5a4793353"; + }; + }; + "gulp-dart-sass-1.0.2" = { + name = "gulp-dart-sass"; + packageName = "gulp-dart-sass"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-dart-sass/-/gulp-dart-sass-1.0.2.tgz"; + sha512 = "8fLttA824mbuc0jRVlGs00zWYZXBckat6INawx5kp66Eqsz5srNWTA51t0mbfB4C8a/a/GZ9muYLwXGklgAHlw=="; + }; + }; "gulp-eslint-3.0.1" = { name = "gulp-eslint"; packageName = "gulp-eslint"; @@ -21265,6 +21580,42 @@ let sha1 = "04e57e3e18c6974267c12cf6855dc717d4a313bd"; }; }; + "gulp-plumber-1.2.1" = { + name = "gulp-plumber"; + packageName = "gulp-plumber"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.2.1.tgz"; + sha512 = "mctAi9msEAG7XzW5ytDVZ9PxWMzzi1pS2rBH7lA095DhMa6KEXjm+St0GOCc567pJKJ/oCvosVAZEpAey0q2eQ=="; + }; + }; + "gulp-sourcemaps-2.6.5" = { + name = "gulp-sourcemaps"; + packageName = "gulp-sourcemaps"; + version = "2.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz"; + sha512 = "SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg=="; + }; + }; + "gulp-tslint-8.1.4" = { + name = "gulp-tslint"; + packageName = "gulp-tslint"; + version = "8.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-8.1.4.tgz"; + sha512 = "wBoZIEMJRz9urHwolsvQpngA9l931p6g/Liwz1b/KrsVP6jEBFZv/o0NS1TFCQZi/l8mXxz8+v3twhf4HOXxPQ=="; + }; + }; + "gulp-typescript-5.0.1" = { + name = "gulp-typescript"; + packageName = "gulp-typescript"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-5.0.1.tgz"; + sha512 = "YuMMlylyJtUSHG1/wuSVTrZp60k1dMEFKYOvDf7OvbAJWrDtxxD4oZon4ancdWwzjj30ztiidhe4VXJniF0pIQ=="; + }; + }; "gulp-util-3.0.8" = { name = "gulp-util"; packageName = "gulp-util"; @@ -21940,6 +22291,15 @@ let sha1 = "6f36e770769275113a57ae1a6007001af771cff6"; }; }; + "hls-b24.js-0.12.3" = { + name = "hls-b24.js"; + packageName = "hls-b24.js"; + version = "0.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hls-b24.js/-/hls-b24.js-0.12.3.tgz"; + sha512 = "C8nwzS33zKvR7grYIoHvp8wPxBvk9sEJ6dsh3Bx+T/4jNNhDksqLS73NIWqHvInjRiOsrXgEY4+h/NjNbzzh0g=="; + }; + }; "hmac-drbg-1.0.1" = { name = "hmac-drbg"; packageName = "hmac-drbg"; @@ -23732,13 +24092,13 @@ let sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="; }; }; - "is-callable-1.2.0" = { + "is-callable-1.2.1" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz"; - sha512 = "pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz"; + sha512 = "wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg=="; }; }; "is-canonical-base64-1.1.1" = { @@ -24398,13 +24758,13 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-plain-object-4.1.1" = { + "is-plain-object-5.0.0" = { name = "is-plain-object"; packageName = "is-plain-object"; - version = "4.1.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-4.1.1.tgz"; - sha512 = "5Aw8LLVsDlZsETVMhoMXzqsXwQqr/0vlnBYzIXJbYo2F4yYlhLHs+Ez7Bod7IIQKWkJbJfxrWD7pA1Dw1TKrwA=="; + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; }; }; "is-posix-bracket-0.1.1" = { @@ -24911,15 +25271,6 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "iso8601-duration-1.2.0" = { - name = "iso8601-duration"; - packageName = "iso8601-duration"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/iso8601-duration/-/iso8601-duration-1.2.0.tgz"; - sha512 = "ErTBd++b17E8nmWII1K1uZtBgD1E8RjyvwmxlCjPHNqHMD7gmcMHOw0E8Ro/6+QT4PhHRSnnMo7bxa1vFPkwhg=="; - }; - }; "isobject-2.1.0" = { name = "isobject"; packageName = "isobject"; @@ -25208,6 +25559,15 @@ let sha512 = "/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw=="; }; }; + "jest-worker-26.3.0" = { + name = "jest-worker"; + packageName = "jest-worker"; + version = "26.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz"; + sha512 = "Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw=="; + }; + }; "jetpack-id-1.0.0" = { name = "jetpack-id"; packageName = "jetpack-id"; @@ -25541,15 +25901,6 @@ let sha512 = "FD/SedD78LCdSvJaOUQAXseT8oQBb5z6IVYaQaCrVUlu9zOAr1BDdKyVYQaSD/GDsAMrXpKcOyBD4LIl8nfjHw=="; }; }; - "json-file-plus-3.3.1" = { - name = "json-file-plus"; - packageName = "json-file-plus"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-file-plus/-/json-file-plus-3.3.1.tgz"; - sha512 = "wo0q1UuiV5NsDPQDup1Km8IwEeqe+olr8tkWxeJq9Bjtcp7DZ0l+yrg28fSC3DEtrE311mhTZ54QGS6oiqnZEA=="; - }; - }; "json-merge-patch-0.2.3" = { name = "json-merge-patch"; packageName = "json-merge-patch"; @@ -26298,6 +26649,15 @@ let sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="; }; }; + "kind-of-1.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz"; + sha1 = "140a3d2d41a36d2efcfa9377b62c24f8495a5c44"; + }; + }; "kind-of-3.2.2" = { name = "kind-of"; packageName = "kind-of"; @@ -26964,13 +27324,13 @@ let sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; }; }; - "link-check-4.5.0" = { + "link-check-4.5.1" = { name = "link-check"; packageName = "link-check"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/link-check/-/link-check-4.5.0.tgz"; - sha512 = "7PWHakA/+O5uaZ9yD290fiG2PUK9weoHAMgtoH3VPllL8ukYHe1YEbwgK9jjnUSE7Xa3zgT41mg+7TnZAPLxkQ=="; + url = "https://registry.npmjs.org/link-check/-/link-check-4.5.1.tgz"; + sha512 = "g0tu3Nkj/rpl1b6rQHRlaaSZ16iRqRDNP30jLUfRK0uNN98H56YVZlJXLjWcyjsj4f2+xZdxqeV398dx38MzfQ=="; }; }; "linkify-it-2.2.0" = { @@ -27207,6 +27567,15 @@ let sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777"; }; }; + "lodash-4.17.19" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz"; + sha512 = "JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="; + }; + }; "lodash-4.17.20" = { name = "lodash"; packageName = "lodash"; @@ -28467,15 +28836,6 @@ let sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; }; }; - "logic-solver-2.0.1" = { - name = "logic-solver"; - packageName = "logic-solver"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/logic-solver/-/logic-solver-2.0.1.tgz"; - sha1 = "e9fa47002eb5d8cda7616d41639b97552eb674be"; - }; - }; "loglevel-1.7.0" = { name = "loglevel"; packageName = "loglevel"; @@ -29187,13 +29547,13 @@ let sha512 = "/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA=="; }; }; - "markdown-it-deflist-2.0.3" = { + "markdown-it-deflist-2.1.0" = { name = "markdown-it-deflist"; packageName = "markdown-it-deflist"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-deflist/-/markdown-it-deflist-2.0.3.tgz"; - sha512 = "/BNZ8ksW42bflm1qQLnRI09oqU2847Z7MVavrR0MORyKLtiUYOMpwtlAfMSZAQU9UCvaUZMpgVAqoS3vpToJxw=="; + url = "https://registry.npmjs.org/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz"; + sha512 = "3OuqoRUlSxJiuQYu0cWTLHNhhq2xtoSFqsZK8plANg91+RJQU1ziQ6lA2LzmFAEes18uPBsHZpcX6We5l76Nzg=="; }; }; "markdown-it-emoji-1.4.0" = { @@ -29295,13 +29655,13 @@ let sha512 = "UhD2Oj6cZV3ycYPoelt4hTkwKIK3zbPP1wjjdpCq7UGtWQOFalDFDv1s2zBYV6aR2gMs/X8kpJcOYsQmUbiXDw=="; }; }; - "markdown-link-extractor-1.2.3" = { + "markdown-link-extractor-1.2.6" = { name = "markdown-link-extractor"; packageName = "markdown-link-extractor"; - version = "1.2.3"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.2.3.tgz"; - sha512 = "BGgBPPNjRpwKzkMxuY5YG2ntPmSL8UMnGiYxRR/9etK3ABLv9SsKHt70PUxv6MaBSC3TnpRsvcIOmnCFWvjcRA=="; + url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.2.6.tgz"; + sha512 = "WDiwWTzR/zk0n0As7q1KCB1Jd/T7nJ7IEr6E1QKZR1Agd/xRmB0FjM2IrtC7IZ1ZwxflBE0aLe4pkX8d+rzV8w=="; }; }; "markdown-serve-0.3.3" = { @@ -29376,6 +29736,15 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; + "marked-1.1.1" = { + name = "marked"; + packageName = "marked"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz"; + sha512 = "mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw=="; + }; + }; "marked-terminal-4.1.0" = { name = "marked-terminal"; packageName = "marked-terminal"; @@ -29457,6 +29826,24 @@ let sha512 = "YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g=="; }; }; + "material-design-icons-3.0.1" = { + name = "material-design-icons"; + packageName = "material-design-icons"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz"; + sha1 = "9a71c48747218ebca51e51a66da682038cdcb7bf"; + }; + }; + "material-design-lite-1.3.0" = { + name = "material-design-lite"; + packageName = "material-design-lite"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/material-design-lite/-/material-design-lite-1.3.0.tgz"; + sha1 = "d004ce3fee99a1eeb74a78b8a325134a5f1171d3"; + }; + }; "math-random-1.0.4" = { name = "math-random"; packageName = "math-random"; @@ -30519,6 +30906,15 @@ let sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; }; + "mirakurun-3.2.0" = { + name = "mirakurun"; + packageName = "mirakurun"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.2.0.tgz"; + sha512 = "zRMza+rxE5XUgUDy8lbt1qAKA9TKcApnwmP+06chBZXinxwEiaRbto7vE8is7ky6+qCS9Q7Erf91kbhAsLwydw=="; + }; + }; "mired-0.0.0" = { name = "mired"; packageName = "mired"; @@ -30555,6 +30951,15 @@ let sha1 = "53d500266cbd09cda9d94c4cf392e60589b5b324"; }; }; + "mithril-2.0.4" = { + name = "mithril"; + packageName = "mithril"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mithril/-/mithril-2.0.4.tgz"; + sha512 = "mgw+DMZlhMS4PpprF6dl7ZoeZq5GGcAuWnrg5e12MvaGauc4jzWsDZtVGRCktsiQczOEUr2K5teKbE5k44RlOg=="; + }; + }; "mixin-deep-1.3.2" = { name = "mixin-deep"; packageName = "mixin-deep"; @@ -31284,6 +31689,15 @@ let sha1 = "37585555a4ff1985309edac7c2a045a466be6c32"; }; }; + "mysql-2.18.1" = { + name = "mysql"; + packageName = "mysql"; + version = "2.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz"; + sha512 = "Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig=="; + }; + }; "mz-2.7.0" = { name = "mz"; packageName = "mz"; @@ -32042,6 +32456,15 @@ let sha512 = "8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="; }; }; + "node-fetch-2.6.1" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz"; + sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; + }; + }; "node-fetch-h2-2.3.0" = { name = "node-fetch-h2"; packageName = "node-fetch-h2"; @@ -32321,13 +32744,13 @@ let sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg=="; }; }; - "node-releases-1.1.60" = { + "node-releases-1.1.61" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.60"; + version = "1.1.61"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz"; - sha512 = "gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz"; + sha512 = "DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g=="; }; }; "node-source-walk-4.2.0" = { @@ -33204,13 +33627,13 @@ let sha512 = "BfWfuAwuhdH1bhMG5EG90WE/eckkBhBvnke8eSEkCDXoLE9Jk5JwYGTbCx1ehGwV48HvBkn62VukPBdlMUOY9w=="; }; }; - "object-treeify-1.1.26" = { + "object-treeify-1.1.28" = { name = "object-treeify"; packageName = "object-treeify"; - version = "1.1.26"; + version = "1.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.26.tgz"; - sha512 = "0WTfU7SGM8umY4YPpOg+oHXL66E6dPVCr+sMR6KitPmvg8CkVrHUUZYEFtx0+5Wb0HjFEsBwBYXyGRNeX7c/oQ=="; + url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.28.tgz"; + sha512 = "FoBGZexpq9jJr6mDgV8wv711vreKyzRcw65TKeXzHh98+TNmPZfGYznpel3WceM869WsnSCyUuK46rPUG9+Rpg=="; }; }; "object-visit-1.0.1" = { @@ -33357,13 +33780,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.134.1" = { + "office-ui-fabric-react-7.137.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.134.1"; + version = "7.137.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.134.1.tgz"; - sha512 = "yQhPdt5kQfzI/MQnqQMu9lf2mgdHSogEfVIYgfOjbvfMJoUzqA/hH3X2Z7RbncdJ/ca2H+GXVp5GvSgahCOs6g=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.137.1.tgz"; + sha512 = "6m1M9m5psaJqhWwroVp1L0G8q66scLMsQRi+gQ/fY3f75ipGSABGeQ86d4P0ilKaYcLVYIzosocPIZKLbBVpnQ=="; }; }; "omggif-1.0.10" = { @@ -33618,6 +34041,15 @@ let sha512 = "2ZNlX1B/J9Q/bsM/vZKh8alC0Pn04KtDGbMN30qLRu3GkaOJH3dDMKxqJzCpYj8BOAa8G3BEsQq6kqWzkEsM7A=="; }; }; + "openapi-default-setter-7.0.1" = { + name = "openapi-default-setter"; + packageName = "openapi-default-setter"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.0.1.tgz"; + sha512 = "O9jhaZPEEJzI1HSG3Yw5rOIC0EpZ9PjRJgtksXKuSMyEoxUDnl7zQ27LuFRR1ykSMVhMt8vHMrQBQIwLW8S0yQ=="; + }; + }; "openapi-framework-0.26.0" = { name = "openapi-framework"; packageName = "openapi-framework"; @@ -33627,6 +34059,15 @@ let sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; }; }; + "openapi-framework-7.0.1" = { + name = "openapi-framework"; + packageName = "openapi-framework"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.0.1.tgz"; + sha512 = "ENQHf+tEqeGp6vykUYiw0uHvMEM3Oqi0SaBs8JlciEuo/fhhqrPmNzNa45xPFYWKYRJ5KpdFWcDlOIYf9gRkog=="; + }; + }; "openapi-jsonschema-parameters-1.2.0" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; @@ -33636,6 +34077,15 @@ let sha512 = "i2vBBFiRbOwYSvt5OG9hayJ7WUe/nl9Y151Ki1QtHb8M0zdYs2wkDhywVJnapq4/gPlrD1vmSVsYDrAjcBRJTQ=="; }; }; + "openapi-jsonschema-parameters-7.0.1" = { + name = "openapi-jsonschema-parameters"; + packageName = "openapi-jsonschema-parameters"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.0.1.tgz"; + sha512 = "PuzKYEILBg4mu9uyoHn7wUGPrx3ds9YJr8t0yvOhAkNITWmXCjuh/HgfoOi+6MUu2Rapj+6tk6lYfeVPcgqi3g=="; + }; + }; "openapi-request-coercer-2.4.0" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; @@ -33645,6 +34095,15 @@ let sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ=="; }; }; + "openapi-request-coercer-7.0.1" = { + name = "openapi-request-coercer"; + packageName = "openapi-request-coercer"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.0.1.tgz"; + sha512 = "nKSRnLX7KQ3Iu1TTZ+1PdEoz0Ke47vH4EcZIM9EOkdqadCFj2pSG/6oMcyqipCs2X7oMFi9Df/UGDRnTdzmPog=="; + }; + }; "openapi-request-validator-4.2.0" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; @@ -33654,6 +34113,15 @@ let sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg=="; }; }; + "openapi-request-validator-7.0.1" = { + name = "openapi-request-validator"; + packageName = "openapi-request-validator"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.0.1.tgz"; + sha512 = "qQBI3iiQ2JFokg3tdIOLo38ny7xRNzJZgcMwAS13WFSrUE9kcA6JAHI2cC5x3Q0EPpOtxWnzOaXwiZUJJ7MDOQ=="; + }; + }; "openapi-response-validator-4.0.0" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; @@ -33663,6 +34131,15 @@ let sha512 = "bIG8bpHT/vE+Dtz4aVyfQnweXtUdvxvJf5/D6Uu98UGf3T42Ez940ctwnlmDCQxTPqdu0yLFbMoiNf/A3jYCIg=="; }; }; + "openapi-response-validator-7.0.1" = { + name = "openapi-response-validator"; + packageName = "openapi-response-validator"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.0.1.tgz"; + sha512 = "Fxr9YdQ6s7/SIvvM888iWnc1GUn/fFxTaMFqHkUv0/eNCYoBfOwAKj9aptaRfL+BJXlsVdXWCJd3GWkwn8sIJA=="; + }; + }; "openapi-sampler-1.0.0-beta.14" = { name = "openapi-sampler"; packageName = "openapi-sampler"; @@ -33681,6 +34158,15 @@ let sha512 = "KKpeNEvAmpy6B2JCfyrM4yWjL6vggDCVbBoR8Yfkj0Jltc6PCW+dBbcg+1yrTCuDv80qBQJ6w0ejA71DlOFegA=="; }; }; + "openapi-schema-validator-7.0.1" = { + name = "openapi-schema-validator"; + packageName = "openapi-schema-validator"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.0.1.tgz"; + sha512 = "P/dmF14xWbyaFVcoS1Fs2tUP4AhJO+eEnZV+jbApeo3569/Z2fiki6Mb6Rs7cfi0ewNnV4L4HiYH+HPZaKWnjQ=="; + }; + }; "openapi-security-handler-2.0.4" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; @@ -33690,6 +34176,15 @@ let sha512 = "blz/UftEqYQLAByuEVITePUI9hV5Rd91CEK8yrsKDUaf3zk6cmIMafJ2qvagHqjXRRtL7fOqvsSKIeFrai+HfQ=="; }; }; + "openapi-security-handler-7.0.1" = { + name = "openapi-security-handler"; + packageName = "openapi-security-handler"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.0.1.tgz"; + sha512 = "fiRJE2Z5F0tY9QBssBX9g8Txtr0oj1BOU0nOZ6QHHXQdCYxebszGgcXD63uy0UJQwzwVOMs/AlCnKNVS/yMSEg=="; + }; + }; "openapi-to-graphql-2.1.0" = { name = "openapi-to-graphql"; packageName = "openapi-to-graphql"; @@ -33717,6 +34212,24 @@ let sha512 = "11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="; }; }; + "openapi-types-7.0.0" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.0.0.tgz"; + sha512 = "AikFLY/joHpJz+6OcyWUfXR0xjsh0jXR+oxcB1oosjH3YFZI3uPTJcmuf7koBFQyjd9GYmClmCSK8mGZ7thsOQ=="; + }; + }; + "openapi-types-7.0.1" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.0.1.tgz"; + sha512 = "6pi4/Fw+JIW1HHda2Ij7LRJ5QJ8f6YzaXnsRA6m44BJz8nLq/j5gVFzPBKJo+uOFhAeHqZC/3uzhTpYPga3Q/A=="; + }; + }; "opencollective-1.0.3" = { name = "opencollective"; packageName = "opencollective"; @@ -33960,6 +34473,15 @@ let sha512 = "s26qdWqke2kjN/wC4dy+IQPBIMWBJlSU/0JZhk30ZDBLelW25rv66yutUWARMigpGPzcXHb+Nac5pNhN/WsARw=="; }; }; + "ora-5.1.0" = { + name = "ora"; + packageName = "ora"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-5.1.0.tgz"; + sha512 = "9tXIMPvjZ7hPTbk8DFq1f7Kow/HU/pQYB60JbNq+QnGwcyhWVZaQ4hM9zQDEsPxw/muLpgiHSaumUZxCAmod/w=="; + }; + }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -34500,6 +35022,15 @@ let sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17"; }; }; + "packet-reader-1.0.0" = { + name = "packet-reader"; + packageName = "packet-reader"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz"; + sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; + }; + }; "packet-stream-2.0.5" = { name = "packet-stream"; packageName = "packet-stream"; @@ -35517,6 +36048,69 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; + "pg-8.3.0" = { + name = "pg"; + packageName = "pg"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg/-/pg-8.3.0.tgz"; + sha512 = "jQPKWHWxbI09s/Z9aUvoTbvGgoj98AU7FDCcQ7kdejupn/TcNpx56v2gaOTzXkzOajmOEJEdi9eTh9cA2RVAjQ=="; + }; + }; + "pg-connection-string-2.3.0" = { + name = "pg-connection-string"; + packageName = "pg-connection-string"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.3.0.tgz"; + sha512 = "ukMTJXLI7/hZIwTW7hGMZJ0Lj0S2XQBCJ4Shv4y1zgQ/vqVea+FLhzywvPj0ujSuofu+yA4MYHGZPTsgjBgJ+w=="; + }; + }; + "pg-int8-1.0.1" = { + name = "pg-int8"; + packageName = "pg-int8"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz"; + sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; + }; + }; + "pg-pool-3.2.1" = { + name = "pg-pool"; + packageName = "pg-pool"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.1.tgz"; + sha512 = "BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA=="; + }; + }; + "pg-protocol-1.2.5" = { + name = "pg-protocol"; + packageName = "pg-protocol"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.5.tgz"; + sha512 = "1uYCckkuTfzz/FCefvavRywkowa6M5FohNMF5OjKrqo9PSR8gYc8poVmwwYQaBxhmQdBjhtP514eXy9/Us2xKg=="; + }; + }; + "pg-types-2.2.0" = { + name = "pg-types"; + packageName = "pg-types"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz"; + sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; + }; + }; + "pgpass-1.0.2" = { + name = "pgpass"; + packageName = "pgpass"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz"; + sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306"; + }; + }; "phantomjs-prebuilt-2.1.16" = { name = "phantomjs-prebuilt"; packageName = "phantomjs-prebuilt"; @@ -35823,6 +36417,24 @@ let sha1 = "868aae2e0df8989b026562b35cbc19cfd8bb780d"; }; }; + "plugin-error-0.1.2" = { + name = "plugin-error"; + packageName = "plugin-error"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz"; + sha1 = "3b9bb3335ccf00f425e07437e19276967da47ace"; + }; + }; + "plugin-error-1.0.1" = { + name = "plugin-error"; + packageName = "plugin-error"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz"; + sha512 = "L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA=="; + }; + }; "plur-2.1.2" = { name = "plur"; packageName = "plur"; @@ -36499,6 +37111,42 @@ let sha512 = "3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ=="; }; }; + "postgres-array-2.0.0" = { + name = "postgres-array"; + packageName = "postgres-array"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz"; + sha512 = "VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="; + }; + }; + "postgres-bytea-1.0.0" = { + name = "postgres-bytea"; + packageName = "postgres-bytea"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; + sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; + }; + }; + "postgres-date-1.0.7" = { + name = "postgres-date"; + packageName = "postgres-date"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz"; + sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="; + }; + }; + "postgres-interval-1.2.0" = { + name = "postgres-interval"; + packageName = "postgres-interval"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz"; + sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; + }; + }; "posthtml-0.11.6" = { name = "posthtml"; packageName = "posthtml"; @@ -36661,6 +37309,15 @@ let sha512 = "TtYxuFUMVxudJTSnPScaBqHZm/48ndvX3KLFzhejJYbRzRybmM9RdBfn9YzgN0itfPrYxCesIZGJqyXXZJOR2w=="; }; }; + "prettier-eslint-11.0.0" = { + name = "prettier-eslint"; + packageName = "prettier-eslint"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-11.0.0.tgz"; + sha512 = "ACjL7T8m10HCO7DwYdXwhNWuZzQv86JkZAhVpzFV9brTMWi3i6LhqoELFaXf6RetDngujz89tnbDmGyvDl+rzA=="; + }; + }; "prettier-eslint-8.8.2" = { name = "prettier-eslint"; packageName = "prettier-eslint"; @@ -36949,15 +37606,6 @@ let sha512 = "W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="; }; }; - "promise-deferred-2.0.3" = { - name = "promise-deferred"; - packageName = "promise-deferred"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-deferred/-/promise-deferred-2.0.3.tgz"; - sha512 = "n10XaoznCzLfyPFOlEE8iurezHpxrYzyjgq/1eW9Wk1gJwur/N7BdBmjJYJpqMeMcXK4wEbzo2EvZQcqjYcKUQ=="; - }; - }; "promise-inflight-1.0.1" = { name = "promise-inflight"; packageName = "promise-inflight"; @@ -37012,15 +37660,6 @@ let sha512 = "UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg=="; }; }; - "promiseback-2.0.3" = { - name = "promiseback"; - packageName = "promiseback"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/promiseback/-/promiseback-2.0.3.tgz"; - sha512 = "VZXdCwS0ppVNTIRfNsCvVwJAaP2b+pxQF7lM8DMWfmpNWyTxB6O5YNbzs+8z0ki/KIBHKHk308NTIl4kJUem3w=="; - }; - }; "promised-temp-0.1.0" = { name = "promised-temp"; packageName = "promised-temp"; @@ -40333,13 +40972,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.26.9" = { + "rollup-2.26.11" = { name = "rollup"; packageName = "rollup"; - version = "2.26.9"; + version = "2.26.11"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.26.9.tgz"; - sha512 = "XIiWYLayLqV+oY4S2Lub/shJq4uk/QQLwWToYCL4LjZbYHbFK3czea4UDVRUJu+zNmKmxq5Zb/OG7c5HSvH2TQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.26.11.tgz"; + sha512 = "xyfxxhsE6hW57xhfL1I+ixH8l2bdoIMaAecdQiWF3N7IgJEMu99JG+daBiSZQjnBpzFxa0/xZm+3pbCdAQehHw=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -40630,6 +41269,15 @@ let sha512 = "BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg=="; }; }; + "rxjs-6.6.3" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz"; + sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ=="; + }; + }; "s.color-0.0.13" = { name = "s.color"; packageName = "s.color"; @@ -40783,13 +41431,22 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-formatter-0.4.13" = { + "sass-1.26.10" = { + name = "sass"; + packageName = "sass"; + version = "1.26.10"; + src = fetchurl { + url = "https://registry.npmjs.org/sass/-/sass-1.26.10.tgz"; + sha512 = "bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw=="; + }; + }; + "sass-formatter-0.4.14" = { name = "sass-formatter"; packageName = "sass-formatter"; - version = "0.4.13"; + version = "0.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.13.tgz"; - sha512 = "EhNMkRZSZHcHrg/w0XgBoW96pcY11SBJ69mCI2S3Eo2sce2CSd66AqxAS05eC8yoc4BVg/Fr2KZty5B3gt6xGw=="; + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.14.tgz"; + sha512 = "F8d4v4Gn8rtpICDvoUL7PaHj29713Qssul0aICt6dsHhf4+fjab5qa0p4dM7sJUrTuMDdjUeM6V+MGe9LYM69Q=="; }; }; "sax-0.5.8" = { @@ -40999,6 +41656,15 @@ let sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; }; }; + "semver-4.3.2" = { + name = "semver"; + packageName = "semver"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz"; + sha1 = "c7a07158a80bedd052355b770d82d6640f803be7"; + }; + }; "semver-4.3.6" = { name = "semver"; packageName = "semver"; @@ -42169,22 +42835,22 @@ let sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-cpp-plugin-1.4.1" = { + "snyk-cpp-plugin-1.4.3" = { name = "snyk-cpp-plugin"; packageName = "snyk-cpp-plugin"; - version = "1.4.1"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-1.4.1.tgz"; - sha512 = "akhVFsuGBD5yyQtTNoItzG8M6k7dd6A16cHBSoTsP8TgnQdm0QIJMrE2zj0Ak1wgyTCiZeGkI6NE9TDwvvfKLw=="; + url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-1.4.3.tgz"; + sha512 = "dHnYm6SVk+LGDqXaVwZqg6+0dMNjjPgJ3S3XUhjTWtGHqvokAdK5iGqSvwbQbJGOikEqt0rjnkorsgnGD/TbjQ=="; }; }; - "snyk-docker-plugin-3.18.1" = { + "snyk-docker-plugin-3.20.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.18.1"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.18.1.tgz"; - sha512 = "cuFv5nfVpnbUy9dCMJ2YDh7gnKMUUMGF665BUHcx2UyJASvnYt5GFf/fyrm652Va/qb3dIYaugg+Hv9EMeZTVw=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.20.0.tgz"; + sha512 = "E2aZW3CWeb4tJrQF9DgeJQsDHwRikkUkJh1eTmkksBBDH/wj0gjab9fRE8N0Lu04OQa8LRA4CW7VRdo/QjLjUA=="; }; }; "snyk-go-parser-1.4.1" = { @@ -42241,31 +42907,31 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.19.1" = { + "snyk-mvn-plugin-2.19.3" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.19.1"; + version = "2.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.19.1.tgz"; - sha512 = "VXYJSdhUmOQAyxdsv5frAKbi3UOcHPabWEQxQ9wxhVBEEmx2lP5ajv1a+ntxwWwL7u3jdc+rnCIKHpLlQJ5nyw=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.19.3.tgz"; + sha512 = "h+znUdd/UsDuJcCkbfcKinM4jqiID0jQmMSN59pIvmWEUf8Az4B+z6O89blgvmeTPB8LRW1LDs9nB8xNgwvJfw=="; }; }; - "snyk-nodejs-lockfile-parser-1.22.0" = { + "snyk-nodejs-lockfile-parser-1.28.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.22.0"; + version = "1.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.22.0.tgz"; - sha512 = "l6jLoJxqcIIkQopSdQuAstXdMw5AIgLu+uGc5CYpHyw8fYqOwna8rawwofNeGuwJAAv4nEiNiexeYaR88OCq6Q=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.28.0.tgz"; + sha512 = "C7sLR2vmOp7sNOzxKgEmCOEDgSGE2TikqpIY/G0yD0PFDofbcicF0iG179Bn0Eo4TlNVLWEEP9Uizea8G5nvcA=="; }; }; - "snyk-nodejs-lockfile-parser-1.27.0" = { + "snyk-nodejs-lockfile-parser-1.28.1" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.27.0"; + version = "1.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.27.0.tgz"; - sha512 = "s1yEqEC8uxELzEXqXmnWKpoOIn0rM8StMjuy0X5U+FmxGvO3jRtFDU5hcVw9cAULLfrQYBHRowrO/5FaR79fxA=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.28.1.tgz"; + sha512 = "0zbmtidYLI2ia/DQD4rZm2YKrhfHLvHlVBdF2cMAGPwhOoKW5ovG9eBO4wNQdvjxNi7b4VeUyAj8SfuhjDraDQ=="; }; }; "snyk-nuget-plugin-1.18.1" = { @@ -42475,13 +43141,13 @@ let sha512 = "o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA=="; }; }; - "socks-2.4.2" = { + "socks-2.4.4" = { name = "socks"; packageName = "socks"; - version = "2.4.2"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.4.2.tgz"; - sha512 = "cE6P9R+/CET9XhIMvqhRgaNT1GXKIahioMjwwhgYOd+8UQWP50rrFm+faqG/4xkZsjTdVeBYr0Tb246BSC9/fg=="; + url = "https://registry.npmjs.org/socks/-/socks-2.4.4.tgz"; + sha512 = "7LmHN4IHj1Vpd/k8D872VGCHJ6yIVyeFkfIBExRmGPYQ/kdUkpdg9eKh9oOzYYYKQhuxavayJHTnmBG+EzluUA=="; }; }; "socks-proxy-agent-4.0.2" = { @@ -43150,6 +43816,15 @@ let sha512 = "rjvqHFUaSGnzxDy2AHCwhHy6Zp6MNJzCPGYju4kD8yi6bze4d1/zMTg6C7JI49b7/EM7jKMTvyfN/4ylBKdwfw=="; }; }; + "sqlstring-2.3.1" = { + name = "sqlstring"; + packageName = "sqlstring"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz"; + sha1 = "475393ff9e91479aea62dcaf0ca3d14983a7fb40"; + }; + }; "srt2vtt-1.3.1" = { name = "srt2vtt"; packageName = "srt2vtt"; @@ -43204,13 +43879,13 @@ let sha512 = "UF+4+khFXILLBqtu9HfrpUwYnDXIdAyJe3u9X4GrApuoakxuSKwaUGakUxLPyo6COyV2brMqufUgf+fDOI8Ftw=="; }; }; - "ssb-config-3.4.4" = { + "ssb-config-3.4.5" = { name = "ssb-config"; packageName = "ssb-config"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-config/-/ssb-config-3.4.4.tgz"; - sha512 = "J3fsWb5nS6PqObZLW2tclEz/bkRQ5pcF9goXanYGVsoH71F6W4f5sOnck9szeubI8srNaiL9pa0kPRv/lojHiw=="; + url = "https://registry.npmjs.org/ssb-config/-/ssb-config-3.4.5.tgz"; + sha512 = "DyCrGIsl01GkdHreAkkaDUorV7SAgRSqKn/htg4ZwbvH6g0NAdOi84x/8ehzDuojPev78hbkWjZXgIqi+/Jo0g=="; }; }; "ssb-db-20.3.0" = { @@ -43438,13 +44113,13 @@ let sha512 = "/QX6+DJkghqq1ZTbgYpOvaI+gx2O7ee1TRUM9yiOlVjh1XAQBevcBj0zO+W3TsNllX86urqBrySd/AEfFfUpIw=="; }; }; - "ssb-ref-2.14.0" = { + "ssb-ref-2.14.2" = { name = "ssb-ref"; packageName = "ssb-ref"; - version = "2.14.0"; + version = "2.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.14.0.tgz"; - sha512 = "RQfeGpgiRBuJePyG/1wRp2KrPXS9Ue0z/HU/svlECto+EVcQ77tFz9s/KYWKBt2Z7cem03uBrQ2GF/n2Ed+4Ig=="; + url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.14.2.tgz"; + sha512 = "pPkwNX/Rrr0bV/8d8dC/f+T/LcKA9ZF1SGHrUuVpoqo8iE3gLMu0Zz5TRoUReXKW6+ehNzUzIjcpYTw+wWeZkA=="; }; }; "ssb-replicate-1.3.2" = { @@ -43465,13 +44140,13 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; - "ssb-validate-4.1.2" = { + "ssb-validate-4.1.3" = { name = "ssb-validate"; packageName = "ssb-validate"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.2.tgz"; - sha512 = "dDINHOWMpKfMr/o0OlqCQouKKeqYsODHn9VDUPOpWa82vSW6bnEXmfSNXjFc7Sf7pzCDrUsYlJ81+UUr27CvsA=="; + url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.3.tgz"; + sha512 = "g7tOs4nCwHk+G/FZ1N2RmaCkaTNS9hoh/BBP12EH8Jf1PWlkOJtTCak78FHjSTAGFCq/i8Y1ZFQXPNKSK7p3wg=="; }; }; "ssb-ws-6.2.3" = { @@ -43834,15 +44509,6 @@ let sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; }; }; - "stream-buffers-3.0.2" = { - name = "stream-buffers"; - packageName = "stream-buffers"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz"; - sha512 = "DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ=="; - }; - }; "stream-collector-1.0.1" = { name = "stream-collector"; packageName = "stream-collector"; @@ -43987,15 +44653,6 @@ let sha512 = "PS6wT2ZyyR38Cy+lE6PBEI1ZmO2HdzZoLeDGG0zZbYikCZd0dh8FUoSeFzgWLItpBYw1WJmPVRLpykRV+lAWLQ=="; }; }; - "stream-to-promise-2.2.0" = { - name = "stream-to-promise"; - packageName = "stream-to-promise"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-to-promise/-/stream-to-promise-2.2.0.tgz"; - sha1 = "b1edb2e1c8cb11289d1b503c08d3f2aef51e650f"; - }; - }; "stream-to-promise-3.0.0" = { name = "stream-to-promise"; packageName = "stream-to-promise"; @@ -44482,6 +45139,15 @@ let sha512 = "0ApK3iAkHv6WbgLICw/J4nhwHeDZsBxIIsOD+gHgZICL6SeJ0S9f/WZqemka9cjkTyMN5geId6e8U5WGFAn3cQ=="; }; }; + "strip-bom-string-1.0.0" = { + name = "strip-bom-string"; + packageName = "strip-bom-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz"; + sha1 = "e5211e9224369fbb81d633a2f00044dc8cedad92"; + }; + }; "strip-dirs-2.1.0" = { name = "strip-dirs"; packageName = "strip-dirs"; @@ -44653,13 +45319,13 @@ let sha1 = "7958c793e47e32e07d2b5cafe5c0bf8e12e77902"; }; }; - "styled-components-5.1.1" = { + "styled-components-5.2.0" = { name = "styled-components"; packageName = "styled-components"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/styled-components/-/styled-components-5.1.1.tgz"; - sha512 = "1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg=="; + url = "https://registry.npmjs.org/styled-components/-/styled-components-5.2.0.tgz"; + sha512 = "9qE8Vgp8C5cpGAIdFaQVAl89Zgx1TDM4Yf4tlHbO9cPijtpSXTMLHy9lmP0lb+yImhgPFb1AmZ1qMUubmg3HLg=="; }; }; "stylehacks-4.0.3" = { @@ -44788,13 +45454,13 @@ let sha512 = "LFLshqEwm1bXd3fEl0STYXZzEHbAz8HwsyItA8vvxhMZrIo+CpB7RrtLvor6mk+7SdfgJhmV3RdIdDIcPAJTTg=="; }; }; - "suf-regex-0.0.22" = { + "suf-regex-0.0.23" = { name = "suf-regex"; packageName = "suf-regex"; - version = "0.0.22"; + version = "0.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.22.tgz"; - sha512 = "6pArSj93hCItDrV+FC8tkf18M5p1tqWjf3T9b/LSYv/V9MeaN3JUqFPU/JMcBkUl2ny7BzTk+bJW4IGzORThNQ=="; + url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.23.tgz"; + sha512 = "Rupps+hO04fiskhx5YwBaiB8Bbwsy8fsqDfT8FED6DWkumWClb3em+yukbNgmAvUIbLAm7ibJoN+2Pl4golkQw=="; }; }; "sugarss-1.0.1" = { @@ -45058,13 +45724,22 @@ let sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb"; }; }; - "swagger-ui-dist-3.32.5" = { + "swagger-ui-dist-3.30.2" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.32.5"; + version = "3.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.32.5.tgz"; - sha512 = "3SKHv8UVqsKKknivtACHbFDGcn297jkoZN2h6zAZ7b2yoaJNMaRadQpC3qFw3GobZTGzqHCgHph4ZH9NkaCjrQ=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.30.2.tgz"; + sha512 = "hAu/ig5N8i0trXXbrC7rwbXV4DhpEAsZhYXDs1305OjmDgjGC0thINbb0197idy3Pp+B6w7u426SUM43GAP7qw=="; + }; + }; + "swagger-ui-dist-3.33.0" = { + name = "swagger-ui-dist"; + packageName = "swagger-ui-dist"; + version = "3.33.0"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.33.0.tgz"; + sha512 = "IIF2OFr2+nFNDvQtQ/ZxC+qVQhFguV7UztD6nzdfkN4P7nOuM0amEa/8er7MKSFArc4rKGH4WkihUQczbBfUag=="; }; }; "swagger2openapi-5.4.0" = { @@ -45383,13 +46058,13 @@ let sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A=="; }; }; - "tar-stream-2.1.3" = { + "tar-stream-2.1.4" = { name = "tar-stream"; packageName = "tar-stream"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz"; - sha512 = "Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA=="; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz"; + sha512 = "o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw=="; }; }; "taskkill-3.1.0" = { @@ -45599,6 +46274,15 @@ let sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="; }; }; + "terser-webpack-plugin-3.0.7" = { + name = "terser-webpack-plugin"; + packageName = "terser-webpack-plugin"; + version = "3.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.7.tgz"; + sha512 = "5JqibUOctE6Ou4T00IVGYTQJBOhu24jz0PpqYeitQJJ3hlZY2ZKSwzzuqjmBH8MzbdWMgIefpmHwTkvwm6Q4CQ=="; + }; + }; "test-exclude-6.0.0" = { name = "test-exclude"; packageName = "test-exclude"; @@ -45797,6 +46481,15 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; + "through2-3.0.1" = { + name = "through2"; + packageName = "through2"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"; + sha512 = "M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww=="; + }; + }; "through2-3.0.2" = { name = "through2"; packageName = "through2"; @@ -46697,6 +47390,15 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; + "ts-loader-8.0.1" = { + name = "ts-loader"; + packageName = "ts-loader"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.1.tgz"; + sha512 = "I9Nmly0ufJoZRMuAT9d5ijsC2B7oSPvUnOJt/GhgoATlPGYfa17VicDKPcqwUCrHpOkCxr/ybLYwbnS4cOxmvQ=="; + }; + }; "ts-log-2.1.4" = { name = "ts-log"; packageName = "ts-log"; @@ -46778,6 +47480,15 @@ let sha512 = "EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg=="; }; }; + "tslint-6.1.2" = { + name = "tslint"; + packageName = "tslint"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz"; + sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA=="; + }; + }; "tsscmp-1.0.6" = { name = "tsscmp"; packageName = "tsscmp"; @@ -47138,6 +47849,15 @@ let sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="; }; }; + "typescript-4.0.2" = { + name = "typescript"; + packageName = "typescript"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz"; + sha512 = "e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -47228,13 +47948,13 @@ let sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; }; }; - "uglify-js-3.10.3" = { + "uglify-js-3.10.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.3"; + version = "3.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.3.tgz"; - sha512 = "Lh00i69Uf6G74mvYpHCI9KVVXLcHW/xu79YTvH7Mkc9zyKUeSPz0owW0dguj0Scavns3ZOh3wY63J0Zb97Za2g=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz"; + sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw=="; }; }; "uglify-js-3.4.10" = { @@ -48344,6 +49064,15 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; + "url-toolkit-2.2.0" = { + name = "url-toolkit"; + packageName = "url-toolkit"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.0.tgz"; + sha512 = "Rde0c9S4fJK3FaHim3DSgdQ8IFrSXcZCpAJo9T7/FA+BoQGhK0ow3mpwGQLJCPYsNn6TstpW7/7DzMpSpz9F9w=="; + }; + }; "urlencode-1.1.0" = { name = "urlencode"; packageName = "urlencode"; @@ -49091,6 +49820,15 @@ let sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16"; }; }; + "vinyl-sourcemaps-apply-0.2.1" = { + name = "vinyl-sourcemaps-apply"; + packageName = "vinyl-sourcemaps-apply"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"; + sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705"; + }; + }; "vlc-command-1.2.0" = { name = "vlc-command"; packageName = "vlc-command"; @@ -49109,13 +49847,13 @@ let sha512 = "DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow=="; }; }; - "vls-0.4.2" = { + "vls-0.5.2" = { name = "vls"; packageName = "vls"; - version = "0.4.2"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.4.2.tgz"; - sha512 = "iH1MUOMaLwv5Lewkt/mYppy/UdBLh8MonL4CSiKh4GNj0GfEJHQfk2s8d0WixVooD++UGCa/dzpGB8CRzGnBtA=="; + url = "https://registry.npmjs.org/vls/-/vls-0.5.2.tgz"; + sha512 = "MHYOWogdwHCvP3jKZOg+oeLlg8uCEeGvCfE3pTIQ6Mg6q3RiHXU+MJdJRdnjhNPcMSyO1oIamHnrs3Zpm27BHw=="; }; }; "vm-browserify-1.1.2" = { @@ -49163,6 +49901,15 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; + "vscode-css-languageservice-4.1.0" = { + name = "vscode-css-languageservice"; + packageName = "vscode-css-languageservice"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.0.tgz"; + sha512 = "iTX3dTp0Y0RFWhIux5jasI8r9swdiWVB1Z3OrZ10iDHxzkETjVPxAQ5BEQU4ag0Awc8TTg1C7sJriHQY2LO14g=="; + }; + }; "vscode-css-languageservice-4.3.3" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; @@ -49181,6 +49928,15 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; + "vscode-emmet-helper-2.0.0" = { + name = "vscode-emmet-helper"; + packageName = "vscode-emmet-helper"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.0.0.tgz"; + sha512 = "ytR+Ajxs6zeYI0b4bPsl+nPU8xm852piJUtIwO1ajp1Pw7lwn3VeR+f4ynmxOl9IjfOdF2kW9T/qIkeFbKLwYw=="; + }; + }; "vscode-html-languageservice-2.1.12" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; @@ -49784,6 +50540,15 @@ let sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; }; }; + "webpack-4.44.0" = { + name = "webpack"; + packageName = "webpack"; + version = "4.44.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-4.44.0.tgz"; + sha512 = "wAuJxK123sqAw31SpkPiPW3iKHgFUiKvO7E7UZjtdExcsRe3fgav4mvoMM7vvpjLHVoJ6a0Mtp2fzkoA13e0Zw=="; + }; + }; "webpack-4.44.1" = { name = "webpack"; packageName = "webpack"; @@ -49847,6 +50612,15 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; + "webpack-stream-5.2.1" = { + name = "webpack-stream"; + packageName = "webpack-stream"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-stream/-/webpack-stream-5.2.1.tgz"; + sha512 = "WvyVU0K1/VB1NZ7JfsaemVdG0PXAQUqbjUNW4A58th4pULvKMQxG+y33HXTL02JvD56ko2Cub+E2NyPwrLBT/A=="; + }; + }; "websocket-1.0.32" = { name = "websocket"; packageName = "websocket"; @@ -49928,13 +50702,13 @@ let sha512 = "9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="; }; }; - "whatwg-fetch-3.4.0" = { + "whatwg-fetch-3.4.1" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.0.tgz"; - sha512 = "rsum2ulz2iuZH08mJkT0Yi6JnKhwdw4oeyMjokgxd+mmqYSd9cPpOQf01TIWgjxG/U4+QR+AwKq6lSbXVxkyoQ=="; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"; + sha512 = "sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ=="; }; }; "whatwg-mimetype-2.3.0" = { @@ -50973,13 +51747,13 @@ let sha512 = "3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw=="; }; }; - "xstream-11.12.0" = { + "xstream-11.13.0" = { name = "xstream"; packageName = "xstream"; - version = "11.12.0"; + version = "11.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/xstream/-/xstream-11.12.0.tgz"; - sha512 = "rceZqhyRPJdmDNh8hyFEnOacNrL4pTVkNZzoLvFqOVaIZHbM3bS15ycqI5V9eJXCRMfgEapwzcNzPjkIRUkv2Q=="; + url = "https://registry.npmjs.org/xstream/-/xstream-11.13.0.tgz"; + sha512 = "IiTO53rJ+Y5Jj7qMq0f3nwWU1KsajkJkzudTXJa/f3DQ1ifw5O6z/IFZuYF4osfPKhU85jyGaSfY3zqdiMNTVw=="; }; }; "xtend-2.1.2" = { @@ -51537,17 +52311,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "10.1.0"; + version = "10.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.0.tgz"; - sha512 = "sWGEVeQQ5PXKuu517fRFEQQ5qopzoWeW+8qBUTrmJt8FztiL2ASyu412iJse56wyGxZvqwUmtzpti5kWHR9XIw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.1.tgz"; + sha512 = "u1Dd2Qe4ShFFef8cehaHoEKOrWo6QONj7yJrlvIIyzcnXWUb3jQmyZoILTv759lRdYF0GrgBx5jCKxzok0jTww=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1001.0" - sources."@angular-devkit/core-10.1.0" - sources."@angular-devkit/schematics-10.1.0" - sources."@schematics/angular-10.1.0" - sources."@schematics/update-0.1001.0" + sources."@angular-devkit/architect-0.1001.1" + sources."@angular-devkit/core-10.1.1" + sources."@angular-devkit/schematics-10.1.1" + sources."@schematics/angular-10.1.1" + sources."@schematics/update-0.1001.1" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" @@ -51670,7 +52444,7 @@ in sources."ini-1.3.5" sources."inquirer-7.3.3" sources."ip-1.1.5" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -52198,7 +52972,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.10.3" + sources."uglify-js-3.10.4" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -52347,7 +53121,7 @@ in sources."request-promise-native-1.0.9" sources."restore-cursor-2.0.0" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."saxes-3.1.11" @@ -52425,7 +53199,7 @@ in sources."chalk-2.4.2" ]; }) - (sources."@nestjs/schematics-7.1.1" // { + (sources."@nestjs/schematics-7.1.2" // { dependencies = [ sources."@angular-devkit/core-9.1.12" sources."@angular-devkit/schematics-9.1.12" @@ -52438,7 +53212,7 @@ in sources."@types/color-name-1.1.1" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -52752,7 +53526,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."supports-color-7.2.0" ]; }) @@ -53163,17 +53937,17 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.5.4"; + version = "4.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.4.tgz"; - sha512 = "UFhxsmiKtXxZwvuW0HB+35bEIovAjYg9oiA9uyOMkDh3ZTf90FmyPre09xKviLn0B+0WnzD35P+ZB/bgJZ/HOA=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.6.tgz"; + sha512 = "S3CToCDtuqkcUyPrPTYKdic9aiOsVairCP8dEydyYjvLUIYVVK3GWJqBfThkNdaMjeB/fVPt8qlYjGqvSs55GQ=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" sources."@apollo/federation-0.20.0" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.29" + sources."@types/node-10.17.31" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -53188,12 +53962,11 @@ in sources."semver-5.7.1" ]; }) - (sources."@babel/core-7.11.5" // { + (sources."@babel/core-7.11.6" // { dependencies = [ - sources."@babel/generator-7.11.5" + sources."@babel/generator-7.11.6" sources."@babel/types-7.11.5" sources."semver-5.7.1" - sources."source-map-0.6.1" ]; }) (sources."@babel/generator-7.11.4" // { @@ -53332,9 +54105,8 @@ in sources."@babel/template-7.10.4" (sources."@babel/traverse-7.11.5" // { dependencies = [ - sources."@babel/generator-7.11.5" + sources."@babel/generator-7.11.6" sources."@babel/types-7.11.5" - sources."source-map-0.6.1" ]; }) sources."@babel/types-7.10.4" @@ -53450,7 +54222,11 @@ in sources."@types/express-serve-static-core-4.17.12" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" - sources."@types/graphql-upload-8.0.3" + (sources."@types/graphql-upload-8.0.4" // { + dependencies = [ + sources."graphql-15.3.0" + ]; + }) sources."@types/http-assert-1.5.1" sources."@types/http-errors-1.8.0" sources."@types/inquirer-6.5.0" @@ -53467,7 +54243,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -53479,15 +54255,15 @@ in sources."@types/serve-static-1.13.5" sources."@types/through-0.0.30" sources."@types/ws-7.2.6" - sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-4.5.4" - (sources."@vue/cli-ui-4.5.4" // { + sources."@types/zen-observable-0.8.1" + sources."@vue/cli-shared-utils-4.5.6" + (sources."@vue/cli-ui-4.5.6" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.5.4" - sources."@vue/cli-ui-addon-widgets-4.5.4" + sources."@vue/cli-ui-addon-webpack-4.5.6" + sources."@vue/cli-ui-addon-widgets-4.5.6" (sources."@vue/compiler-core-3.0.0-rc.10" // { dependencies = [ sources."source-map-0.6.1" @@ -53684,7 +54460,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.14.0" + sources."browserslist-4.14.2" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -53711,7 +54487,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001123" + sources."caniuse-lite-1.0.30001125" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -53919,7 +54695,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.560" + sources."electron-to-chromium-1.3.565" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -54191,7 +54967,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -54393,7 +55169,7 @@ in sources."nice-try-1.0.5" sources."no-case-3.0.3" sources."node-dir-0.1.17" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."node-ipc-9.1.1" sources."node-modules-regexp-1.0.0" (sources."node-notifier-6.0.0" // { @@ -54401,7 +55177,7 @@ in sources."is-wsl-2.2.0" ]; }) - sources."node-releases-1.1.60" + sources."node-releases-1.1.61" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" @@ -54438,7 +55214,7 @@ in sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-path-0.11.4" - sources."object-treeify-1.1.26" + sources."object-treeify-1.1.28" sources."object-visit-1.0.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.0" @@ -54619,7 +55395,7 @@ in sources."rss-parser-3.9.0" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -55108,7 +55884,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/generator-7.11.5" + sources."@babel/generator-7.11.6" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" sources."@babel/parser-7.11.5" @@ -55139,7 +55915,7 @@ in sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."lodash-4.17.20" - sources."source-map-0.6.1" + sources."source-map-0.5.7" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" ]; @@ -55193,8 +55969,16 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.11.5" - sources."@babel/generator-7.11.5" + (sources."@babel/core-7.11.6" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + (sources."@babel/generator-7.11.6" // { + 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" @@ -55311,7 +56095,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -55851,7 +56635,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.16" + sources."@types/node-13.13.18" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.4" @@ -56286,10 +57070,10 @@ in coc-css = nodeEnv.buildNodePackage { name = "coc-css"; packageName = "coc-css"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.4.tgz"; - sha512 = "SvYsSjLJHHESTORGLsPI/QPiA5zB2z+cC9eaJ638yhh6qTZIwFHM0p5v1ZfflK+FUdJgiDz87oyWnUKVP1wZ7Q=="; + url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.5.tgz"; + sha512 = "Khii6e43VV1JqSNd/UGMDmenBkFYcFKEr0WM6a8isOOWxSX8Vly/YAjVq7rbErD3mYOeJ+rxcH5/faUqIDj/9A=="; }; buildInputs = globalBuildInputs; meta = { @@ -56326,10 +57110,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.2.7"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.2.7.tgz"; - sha512 = "an8yOGLe0t7RT3LFSSDYP7oEqeYmQHTDU9yEeaVXy42W+4MYVsf771F2t1BMvjg3AjkpF9WA7ztM9lKck6DBMA=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.3.0.tgz"; + sha512 = "V3yyEXLi+XAFPSvA1WiA+qkBytEqLvEsqfwquyZfXkpOAcG4b2PtA+MLou6OFSpJeYpe4d2Xr3sY8ThBCoxx3g=="; }; buildInputs = globalBuildInputs; meta = { @@ -56343,10 +57127,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "1.8.3"; + version = "1.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-1.8.3.tgz"; - sha512 = "wXUzr9EvZ4booUhGSXbuvwiRivQ8CJd/TtEpff/XHQTxGrst6t7Kevs1PAf8q7tKioH2Nu+T0FWw30tN9PTXuQ=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-1.8.8.tgz"; + sha512 = "pfhUukcsILhwBdxd3PKQsE1VKeS/WNQc0QQ24V4G+9uKesxcIV6bHGaLMC57Vjx6h05AfVBupL5M/BGGEbV+EA=="; }; buildInputs = globalBuildInputs; meta = { @@ -56361,14 +57145,14 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-0.10.0.tgz"; - sha512 = "BBx3JsU9SLXnRrNy+2a5gFKNu0g8r2uKHlfKLmcFpc7x4PW0RS7gTgW3DGL2ye2tXUcFfcOvXkkTQd5urY+M4Q=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-0.11.0.tgz"; + sha512 = "W27x1U6WlKiFKsiTRxc5neFFJKx1AXFYZ8OxELX4tubCptNa64RTBqSTk9Iv0zHFwEs1xLJ56CE7NO3wTmKVKw=="; }; dependencies = [ sources."isexe-2.0.0" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."tslib-2.0.1" sources."which-2.0.2" ]; @@ -56384,10 +57168,10 @@ in coc-highlight = nodeEnv.buildNodePackage { name = "coc-highlight"; packageName = "coc-highlight"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-1.2.5.tgz"; - sha512 = "fGWz30toD5ORdRpH7WOSbMvNOqzdorCSClTfwIdcb3vJoKPA31wOxFzEMfzR7jlXvusjBaUr1GvTQyu3eOKomw=="; + url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-1.2.6.tgz"; + sha512 = "aKzZ86GVnZgZV2EAf62SDpTXzGYHD7PTSB+HgytTvdubgFgssQitrIUvWCPnlvagPixtM1XqTlh8AKusnrtSOg=="; }; buildInputs = globalBuildInputs; meta = { @@ -56457,10 +57241,10 @@ in coc-jest = nodeEnv.buildNodePackage { name = "coc-jest"; packageName = "coc-jest"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.0.3.tgz"; - sha512 = "ZxgOP00URYcmIUnl1yjxonxbwb4QHEk2JJxxcYyCHo2wJPCVQWB+WYVYzHb0pzrZdDcsj5hk6wXWnLXM5EkRjA=="; + url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.0.4.tgz"; + sha512 = "cqNvWTS27HrT3+zthsb7zPokPwvrCJkGnmQkktfDDnUET5d6lbMhJaqZ8DlYxKKtoaPZ5QzwnaoowChhh8M9WA=="; }; buildInputs = globalBuildInputs; meta = { @@ -56510,10 +57294,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.2.tgz"; - sha512 = "zfDFLxwOI6MSR/DIXWRUBtdcllVCduQPnCL7J5PIZX8y+TALshGwsSJCv2TY1wrRB9gxuVhaoBwr0kb2WRS8JA=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.3.tgz"; + sha512 = "HrD1Mryqkw4IO0IA//GHBvUiI6jqxAhoWPP1/FjYXcTZDOcB7x4CTW3Azg8YiucgbeJTwZgMmg/j+z7ArYdQ/w=="; }; dependencies = [ sources."@chemzqm/neovim-5.1.9" @@ -56577,7 +57361,7 @@ in ]; }) sources."ncp-2.0.0" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."node-int64-0.4.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -56654,7 +57438,7 @@ in sources."@typescript-eslint/typescript-estree-3.10.1" sources."@typescript-eslint/visitor-keys-3.10.1" sources."acorn-7.4.0" - sources."acorn-jsx-5.2.0" + sources."acorn-jsx-5.3.1" sources."ajv-6.12.4" sources."ajv-keywords-3.5.2" (sources."ansi-align-2.0.0" // { @@ -56715,7 +57499,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001123" + sources."caniuse-lite-1.0.30001125" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -56810,9 +57594,9 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.560" + sources."electron-to-chromium-1.3.565" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -57332,7 +58116,7 @@ in sources."ret-0.1.15" sources."rimraf-2.6.3" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -57699,10 +58483,10 @@ in coc-solargraph = nodeEnv.buildNodePackage { name = "coc-solargraph"; packageName = "coc-solargraph"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.1.6.tgz"; - sha512 = "Vkl4IYCgexGQ038betmYJ4Ht2OqbVJDFrQn8h+OCvVUHAEGsQTYj8sIIq3qohW/FuJJXvUdRoGEYQUZCtw96OQ=="; + url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.1.7.tgz"; + sha512 = "+oaGgco/4VuQIAp7MqvwrMPnKXViap/W894pFodstK1FkCUpP3qc04Kt7B/8IqRTFrd5b6tAn7Nrsf5g4RffTw=="; }; buildInputs = globalBuildInputs; meta = { @@ -57723,16 +58507,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.11.5" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - (sources."@babel/generator-7.11.5" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."@babel/core-7.11.6" + sources."@babel/generator-7.11.6" 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" @@ -57753,7 +58529,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -57796,7 +58572,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.14.0" + sources."browserslist-4.14.2" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -57804,7 +58580,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001123" + sources."caniuse-lite-1.0.30001125" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -57863,8 +58639,8 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.560" + sources."dot-prop-5.3.0" + sources."electron-to-chromium-1.3.565" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -58046,7 +58822,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."nanomatch-1.2.13" - sources."node-releases-1.1.60" + sources."node-releases-1.1.61" sources."normalize-package-data-2.5.0" sources."normalize-range-0.1.2" sources."normalize-selector-0.2.0" @@ -58430,16 +59206,16 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.12.tgz"; - sha512 = "QKMD9vPxzTfP1CxSZW3lWxb6ABL06eoYRGs9bq3uwXn1qIAfOOp7JkmsdehD6H8hVP5dbFsudjahb27bvw/OpA=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.13.tgz"; + sha512 = "RVjVqe3CiT+XCSupp8UrUeEGFPLfSrHl4yTxhizqV5SdovxWQ3UOTrDgLvH6HyKiMNphKRhTyknpHyDE6LtdZQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@emmetio/extract-abbreviation-0.1.6" + sources."@emmetio/extract-abbreviation-0.2.0" (sources."@eslint/eslintrc-0.1.3" // { dependencies = [ sources."debug-4.2.0" @@ -58483,7 +59259,7 @@ in sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -58500,7 +59276,7 @@ in sources."@typescript-eslint/visitor-keys-3.10.1" sources."abbrev-1.1.1" sources."acorn-7.4.0" - sources."acorn-jsx-5.2.0" + sources."acorn-jsx-5.3.1" (sources."aggregate-error-3.1.0" // { dependencies = [ sources."indent-string-4.0.0" @@ -58635,6 +59411,7 @@ in sources."config-chain-1.1.12" sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" + sources."core-js-3.6.5" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" @@ -58948,7 +59725,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-2.1.3" - sources."jsonc-parser-1.0.3" + sources."jsonc-parser-2.3.0" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" @@ -59009,7 +59786,7 @@ in sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."nopt-5.0.0" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" @@ -59090,7 +59867,7 @@ in sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" sources."prettier-2.1.1" - (sources."prettier-eslint-10.1.1" // { + (sources."prettier-eslint-11.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" (sources."cross-spawn-6.0.5" // { @@ -59107,12 +59884,12 @@ in sources."levn-0.3.0" sources."optionator-0.8.3" sources."prelude-ls-1.1.2" - sources."prettier-1.19.1" sources."regexpp-2.0.1" sources."semver-6.3.0" sources."strip-ansi-5.2.0" sources."strip-json-comments-3.1.1" sources."type-check-0.3.2" + sources."typescript-3.9.7" ]; }) sources."prettier-tslint-0.4.2" @@ -59182,12 +59959,12 @@ in sources."rimraf-2.6.3" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."s.color-0.0.13" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-formatter-0.4.13" + sources."sass-formatter-0.4.14" sources."sax-1.2.4" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -59312,9 +60089,13 @@ in ]; }) sources."stylus-supremacy-2.14.5" - sources."suf-cli-0.1.1" + (sources."suf-cli-0.1.1" // { + dependencies = [ + sources."typescript-3.9.7" + ]; + }) sources."suf-node-1.2.1" - sources."suf-regex-0.0.22" + sources."suf-regex-0.0.23" sources."supports-color-5.5.0" sources."symbol-0.2.3" (sources."table-5.4.6" // { @@ -59352,7 +60133,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."typescript-3.9.7" + sources."typescript-4.0.2" sources."unherit-1.1.3" (sources."unified-7.1.0" // { dependencies = [ @@ -59423,13 +60204,9 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - sources."vls-0.4.2" - (sources."vscode-css-languageservice-4.3.3" // { - dependencies = [ - sources."vscode-languageserver-types-3.16.0-next.2" - ]; - }) - sources."vscode-emmet-helper-1.2.17" + sources."vls-0.5.2" + sources."vscode-css-languageservice-4.1.0" + sources."vscode-emmet-helper-2.0.0" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.15.3" @@ -59853,7 +60630,7 @@ in sources."detect-indent-6.0.0" sources."detect-newline-3.1.0" sources."dir-glob-3.0.1" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."editor-1.0.0" @@ -60106,7 +60883,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -60236,7 +61013,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -60604,7 +61381,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -60729,7 +61506,7 @@ in ]; }) sources."which-1.3.1" - sources."xstream-11.12.0" + sources."xstream-11.13.0" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -60823,7 +61600,7 @@ in sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -60880,10 +61657,10 @@ in create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.5.0.tgz"; - sha512 = "Q/V11lyflnkhWEkMImgTvG0iRx9q2K2c1Ko/NnP7XOl63JvQ/hlvaoyxYE85vM0fIJyWXO8qTSf2Uen+8oUTTA=="; + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.5.1.tgz"; + sha512 = "TeaEDgfOSJ3cVilXKeIG2590IjjnSWPvhUUE6xGl3Aqys9O2JQNDyVbC1stnqlbyUgxm8KCOP0piLOk+MXUlZA=="; }; buildInputs = globalBuildInputs; meta = { @@ -61639,7 +62416,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.745.0" + sources."aws-sdk-2.750.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."base64-js-1.3.1" @@ -61783,8 +62560,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.11.5" - sources."@babel/generator-7.11.5" + sources."@babel/core-7.11.6" + sources."@babel/generator-7.11.6" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" sources."@babel/helper-builder-react-jsx-experimental-7.11.5" @@ -61818,7 +62595,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -61886,7 +62663,7 @@ in ]; }) sources."defer-to-connect-2.0.0" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -61903,7 +62680,7 @@ in sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globals-11.12.0" - sources."got-11.6.0" + sources."got-11.6.2" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" @@ -62054,7 +62831,7 @@ in sources."color-name-1.1.4" ]; }) - sources."source-map-0.6.1" + sources."source-map-0.5.7" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -62123,6 +62900,1531 @@ in bypassCache = true; reconstructLock = true; }; + "epgstation-../../applications/video/epgstation" = nodeEnv.buildNodePackage { + name = "EPGStation"; + packageName = "EPGStation"; + version = "1.7.4"; + src = ../../applications/video/epgstation; + dependencies = [ + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@fluentui/date-time-utilities-7.8.0" + sources."@fluentui/keyboard-key-0.2.11" + sources."@fluentui/react-7.137.1" + sources."@fluentui/react-focus-7.16.0" + sources."@fluentui/react-icons-0.3.0" + sources."@fluentui/react-window-provider-0.3.0" + sources."@fluentui/theme-0.2.0" + (sources."@gulp-sourcemaps/identity-map-1.0.2" // { + dependencies = [ + sources."normalize-path-2.1.1" + sources."source-map-0.6.1" + ]; + }) + (sources."@gulp-sourcemaps/map-sources-1.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."@microsoft/load-themed-styles-1.10.89" + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" + sources."@npmcli/move-file-1.0.1" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/basic-auth-1.1.3" + sources."@types/body-parser-1.19.0" + sources."@types/caseless-0.12.2" + sources."@types/chart.js-2.9.23" + sources."@types/connect-3.4.33" + sources."@types/engine.io-3.1.4" + sources."@types/express-4.17.7" + sources."@types/express-serve-static-core-4.17.12" + sources."@types/fancy-log-1.3.0" + sources."@types/glob-7.1.3" + sources."@types/hls.js-0.13.0" + sources."@types/js-yaml-3.12.5" + sources."@types/json-schema-7.0.6" + sources."@types/lodash-4.14.158" + sources."@types/material-design-lite-1.1.16" + sources."@types/mime-2.0.3" + sources."@types/minimatch-3.0.3" + sources."@types/minimist-1.2.0" + sources."@types/mithril-2.0.3" + sources."@types/mkdirp-1.0.1" + sources."@types/multer-1.4.3" + sources."@types/mysql-2.15.15" + sources."@types/node-14.0.26" + sources."@types/pg-7.14.4" + sources."@types/pg-types-1.11.5" + sources."@types/qs-6.9.4" + sources."@types/range-parser-1.2.3" + sources."@types/request-2.48.5" + sources."@types/serve-static-1.13.5" + sources."@types/socket.io-2.1.10" + sources."@types/socket.io-client-1.4.33" + sources."@types/sqlite3-3.1.6" + sources."@types/tough-cookie-4.0.0" + sources."@types/url-join-4.0.0" + sources."@uifabric/foundation-7.9.0" + sources."@uifabric/icons-7.5.0" + sources."@uifabric/merge-styles-7.18.0" + sources."@uifabric/react-hooks-7.13.0" + sources."@uifabric/set-version-7.0.22" + sources."@uifabric/styling-7.16.0" + sources."@uifabric/utilities-7.31.0" + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."abbrev-1.1.1" + sources."accepts-1.3.7" + sources."acorn-5.7.4" + sources."after-0.8.2" + sources."aggregate-error-3.1.0" + sources."ajv-6.12.4" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.5.2" + sources."ansi-colors-1.1.0" + sources."ansi-cyan-0.1.1" + sources."ansi-escapes-1.4.0" + sources."ansi-gray-0.1.1" + sources."ansi-red-0.1.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" + sources."ansi-wrap-0.1.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."to-regex-range-2.1.1" + ]; + }) + sources."append-buffer-1.0.2" + sources."append-field-1.0.0" + sources."aproba-1.2.0" + sources."archy-1.0.0" + sources."are-we-there-yet-1.1.5" + sources."argparse-1.0.10" + sources."aribts-2.1.12" + sources."arr-diff-4.0.0" + sources."arr-filter-1.1.2" + sources."arr-flatten-1.1.0" + sources."arr-map-2.0.2" + sources."arr-union-3.1.0" + sources."array-each-1.0.1" + sources."array-flatten-1.1.1" + (sources."array-initial-1.1.0" // { + dependencies = [ + sources."is-number-4.0.0" + ]; + }) + (sources."array-last-1.3.0" // { + dependencies = [ + sources."is-number-4.0.0" + ]; + }) + sources."array-slice-1.1.0" + (sources."array-sort-1.0.0" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."array-union-2.1.0" + sources."array-unique-0.3.2" + sources."arraybuffer.slice-0.0.7" + sources."asn1-0.2.4" + (sources."asn1.js-5.4.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."assert-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) + sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."async-done-1.3.2" + sources."async-each-1.0.3" + sources."async-limiter-1.0.1" + sources."async-settle-1.0.0" + sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" + sources."atob-2.1.2" + sources."aws-sign2-0.7.0" + sources."aws4-1.10.1" + sources."b24.js-1.0.3" + sources."babel-polyfill-6.23.0" + (sources."babel-runtime-6.26.0" // { + dependencies = [ + sources."regenerator-runtime-0.11.1" + ]; + }) + sources."bach-1.2.0" + sources."backo2-1.0.2" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base64-arraybuffer-0.1.5" + sources."base64-js-1.3.1" + sources."base64id-2.0.0" + sources."basic-auth-2.0.1" + sources."bcrypt-pbkdf-1.0.2" + sources."better-assert-1.0.2" + sources."big.js-5.2.2" + sources."bignumber.js-9.0.0" + sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" + sources."blob-0.0.5" + sources."block-stream-0.0.9" + sources."bluebird-3.7.2" + sources."bn.js-5.1.3" + sources."body-parser-1.19.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."brorand-1.1.0" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.2" + (sources."browserify-rsa-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."browserify-sign-4.2.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + ]; + }) + sources."browserify-zlib-0.2.0" + sources."buffer-4.9.2" + sources."buffer-equal-1.0.0" + sources."buffer-from-1.1.1" + sources."buffer-writer-2.0.0" + sources."buffer-xor-1.0.3" + sources."builtin-modules-1.1.1" + sources."builtin-status-codes-3.0.0" + (sources."busboy-0.2.14" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."bytes-3.1.0" + (sources."cacache-15.0.5" // { + dependencies = [ + sources."p-map-4.0.0" + ]; + }) + sources."cache-base-1.0.1" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + sources."pump-3.0.0" + ]; + }) + sources."callsite-1.0.0" + sources."camelcase-3.0.0" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."chardet-0.4.2" + sources."chart.js-2.9.3" + sources."chartjs-color-2.4.1" + sources."chartjs-color-string-0.6.0" + (sources."chokidar-2.1.8" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."to-regex-range-2.1.1" + ]; + }) + sources."chownr-2.0.0" + sources."chrome-trace-event-1.0.2" + sources."cipher-base-1.0.4" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."clean-css-4.2.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."clean-stack-2.2.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.1" + sources."cliui-3.2.0" + sources."clone-2.1.2" + sources."clone-buffer-1.0.0" + sources."clone-response-1.0.2" + sources."clone-stats-1.0.0" + sources."cloneable-readable-1.1.3" + sources."code-point-at-1.1.0" + sources."collection-map-1.0.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-support-1.1.3" + sources."colors-1.4.0" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."commondir-1.0.1" + sources."component-bind-1.0.0" + sources."component-emitter-1.3.0" + sources."component-inherit-0.0.3" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + (sources."concat-with-sourcemaps-1.1.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."console-browserify-1.2.0" + sources."console-control-strings-1.1.0" + sources."constants-browserify-1.0.0" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."convert-source-map-1.7.0" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + (sources."copy-concurrently-1.0.5" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + ]; + }) + sources."copy-descriptor-0.1.1" + sources."copy-props-2.0.4" + sources."core-js-2.6.11" + sources."core-util-is-1.0.2" + (sources."crc-3.8.0" // { + dependencies = [ + sources."buffer-5.6.0" + ]; + }) + (sources."create-ecdh-4.0.4" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."crypto-browserify-3.12.0" + (sources."css-2.2.4" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."css-ripple-effect-1.0.5" + sources."cyclist-1.0.1" + sources."d-1.0.1" + sources."dashdash-1.14.1" + sources."date-format-3.0.0" + sources."debug-2.6.9" + (sources."debug-fabulous-1.1.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + (sources."default-compare-1.0.0" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."default-resolution-2.0.0" + sources."defer-to-connect-1.1.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."del-5.1.0" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."des.js-1.0.1" + sources."destroy-1.0.4" + sources."detect-file-1.0.0" + sources."detect-libc-1.0.3" + sources."detect-newline-2.1.0" + (sources."dicer-0.2.5" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."diff-4.0.2" + (sources."diffie-hellman-5.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."difunc-0.0.4" + sources."dir-glob-3.0.1" + sources."diskusage-1.1.3" + sources."domain-browser-1.2.0" + sources."dotenv-8.2.0" + sources."duplexer3-0.1.4" + sources."duplexify-3.7.1" + sources."each-props-1.3.2" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + (sources."elliptic-6.5.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."emojis-list-3.0.0" + sources."encodeurl-1.0.2" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.2" + ]; + }) + sources."end-of-stream-1.4.4" + (sources."engine.io-3.4.2" // { + dependencies = [ + sources."cookie-0.3.1" + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) + (sources."engine.io-client-3.4.3" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + sources."ws-6.1.4" + ]; + }) + sources."engine.io-parser-2.2.0" + sources."enhanced-resolve-4.3.0" + sources."errno-0.1.7" + sources."error-ex-1.3.2" + sources."es5-ext-0.10.53" + sources."es6-iterator-2.0.3" + sources."es6-promise-4.2.8" + sources."es6-symbol-3.1.3" + sources."es6-weak-map-2.0.3" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."eslint-scope-4.0.3" + sources."esprima-4.0.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + sources."estraverse-4.3.0" + sources."etag-1.8.1" + sources."event-emitter-0.3.5" + sources."eventemitter3-2.0.3" + sources."events-3.2.0" + sources."evp_bytestokey-1.0.3" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."expand-tilde-2.0.2" + sources."express-4.17.1" + sources."express-normalize-query-params-middleware-0.5.1" + sources."express-openapi-7.0.0" + (sources."ext-1.4.0" // { + dependencies = [ + sources."type-2.1.0" + ]; + }) + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-2.2.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extsprintf-1.3.0" + sources."fancy-log-1.3.3" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.4" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-1.1.4" + sources."fastq-1.8.0" + sources."figgy-pudding-3.5.2" + sources."figures-2.0.0" + sources."file-uri-to-path-1.0.0" + sources."fill-range-7.0.1" + sources."finalhandler-1.1.2" + sources."find-cache-dir-3.3.1" + sources."find-up-1.1.2" + (sources."findup-sync-3.0.0" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."fined-1.2.0" + sources."flagged-respawn-1.0.1" + sources."flatted-2.0.2" + sources."flush-write-stream-1.1.1" + sources."for-in-1.0.2" + sources."for-own-1.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.5.1" + sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from2-2.3.0" + sources."fs-extra-9.0.1" + sources."fs-minipass-2.1.0" + sources."fs-mkdirp-stream-1.0.0" + sources."fs-routes-7.0.1" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-1.2.13" + (sources."fstream-1.0.12" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + ]; + }) + sources."function-bind-1.1.1" + sources."gauge-2.7.4" + sources."get-caller-file-1.0.3" + (sources."get-stream-4.1.0" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" + (sources."glob-stream-6.1.0" // { + dependencies = [ + sources."glob-parent-3.1.0" + sources."is-glob-3.1.0" + ]; + }) + sources."glob-watcher-5.0.5" + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" + sources."globby-10.0.2" + sources."glogg-1.0.2" + sources."got-9.6.0" + sources."graceful-fs-4.2.4" + sources."gulp-4.0.2" + (sources."gulp-clean-css-4.3.0" // { + dependencies = [ + sources."through2-3.0.1" + ]; + }) + sources."gulp-cli-2.3.0" + sources."gulp-concat-2.6.1" + (sources."gulp-dart-sass-1.0.2" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + (sources."gulp-plumber-1.2.1" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."arr-diff-1.1.0" + sources."arr-union-2.1.0" + sources."array-slice-0.2.3" + sources."chalk-1.1.3" + sources."extend-shallow-1.1.4" + sources."kind-of-1.1.0" + sources."plugin-error-0.1.2" + sources."supports-color-2.0.0" + ]; + }) + (sources."gulp-sourcemaps-2.6.5" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."gulp-tslint-8.1.4" + (sources."gulp-typescript-5.0.1" // { + dependencies = [ + sources."ansi-colors-3.2.4" + sources."source-map-0.7.3" + sources."through2-3.0.2" + ]; + }) + sources."gulplog-1.0.0" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-ansi-2.0.0" + (sources."has-binary2-1.0.3" // { + dependencies = [ + sources."isarray-2.0.1" + ]; + }) + sources."has-cors-1.1.0" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" + sources."has-unicode-2.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + ]; + }) + sources."hash.js-1.1.7" + (sources."hls-b24.js-0.12.3" // { + dependencies = [ + sources."eventemitter3-3.1.0" + ]; + }) + sources."hmac-drbg-1.0.1" + sources."homedir-polyfill-1.0.3" + sources."hosted-git-info-2.8.8" + sources."http-cache-semantics-4.1.0" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-signature-1.2.0" + sources."https-browserify-1.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" + sources."iferr-0.1.5" + sources."ignore-5.1.8" + sources."ignore-walk-3.0.3" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."indexof-0.0.1" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + (sources."inquirer-3.0.6" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."is-fullwidth-code-point-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + sources."interpret-1.4.0" + sources."invert-kv-1.0.0" + sources."ip-1.1.5" + sources."ipaddr.js-1.9.1" + sources."is-absolute-1.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-dir-1.0.0" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-4.0.1" + sources."is-negated-glob-1.0.0" + sources."is-number-7.0.0" + sources."is-path-cwd-2.2.0" + sources."is-path-inside-3.0.2" + sources."is-plain-object-2.0.4" + sources."is-promise-2.2.2" + sources."is-relative-1.0.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-unc-path-1.0.0" + sources."is-utf8-0.2.1" + sources."is-valid-glob-1.0.0" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + (sources."jest-worker-26.3.0" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.0" + sources."jsbn-0.1.1" + sources."json-buffer-3.0.0" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."json5-1.0.1" + sources."jsonfile-6.0.1" + sources."jsprim-1.4.1" + sources."just-debounce-1.0.0" + sources."keyv-3.1.0" + sources."kind-of-6.0.3" + sources."last-run-1.1.1" + sources."latest-version-5.1.0" + sources."lazystream-1.0.0" + sources."lcid-1.0.0" + sources."lead-1.0.0" + sources."liftoff-3.1.0" + sources."load-json-file-1.1.0" + sources."loader-runner-2.4.0" + sources."loader-utils-1.4.0" + sources."locate-path-5.0.0" + sources."lodash-4.17.19" + sources."lodash.clone-4.5.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.merge-4.6.2" + sources."lodash.some-4.6.0" + (sources."log4js-6.3.0" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) + sources."loose-envify-1.4.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" + sources."lru-queue-0.1.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."make-iterator-1.0.1" + sources."map-cache-0.2.2" + sources."map-stream-0.0.7" + sources."map-visit-1.0.0" + (sources."matchdep-2.0.0" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."findup-sync-2.0.0" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."material-design-icons-3.0.1" + sources."material-design-lite-1.3.0" + sources."md5.js-1.3.5" + sources."media-typer-0.3.0" + sources."memoizee-0.4.14" + sources."memory-fs-0.5.0" + sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" + sources."methods-1.1.2" + sources."micromatch-4.0.2" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."mime-1.6.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."mimic-fn-1.2.0" + sources."mimic-response-1.0.1" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minipass-3.1.3" + sources."minipass-collect-1.0.2" + sources."minipass-flush-1.0.5" + sources."minipass-pipeline-1.2.4" + sources."minizlib-2.1.2" + (sources."mirakurun-3.2.0" // { + dependencies = [ + sources."aribts-1.3.5" + sources."eventemitter3-4.0.7" + sources."express-openapi-6.0.0" + sources."fs-routes-2.0.0" + sources."openapi-default-setter-2.1.0" + sources."openapi-framework-0.26.0" + sources."openapi-jsonschema-parameters-1.2.0" + sources."openapi-request-coercer-2.4.0" + sources."openapi-request-validator-4.2.0" + sources."openapi-response-validator-4.0.0" + (sources."openapi-schema-validator-3.0.3" // { + dependencies = [ + sources."openapi-types-1.3.4" + ]; + }) + (sources."openapi-security-handler-2.0.4" // { + dependencies = [ + sources."openapi-types-1.3.4" + ]; + }) + sources."openapi-types-1.3.5" + sources."readable-stream-3.6.0" + sources."semver-7.3.2" + sources."stream-http-3.1.1" + ]; + }) + (sources."mississippi-3.0.0" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) + sources."mithril-2.0.4" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-1.0.4" + sources."moment-2.27.0" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) + (sources."move-concurrently-1.0.1" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + ]; + }) + sources."ms-2.0.0" + (sources."multer-1.4.2" // { + dependencies = [ + sources."mkdirp-0.5.5" + ]; + }) + sources."munin-plugin-0.0.9" + sources."mute-stdout-1.0.1" + sources."mute-stream-0.0.7" + sources."mysql-2.18.1" + sources."nan-2.14.1" + sources."nanomatch-1.2.13" + (sources."needle-2.5.2" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."negotiator-0.6.2" + sources."neo-async-2.6.2" + sources."next-tick-1.0.0" + sources."node-addon-api-2.0.0" + sources."node-fetch-1.6.3" + (sources."node-gyp-3.8.0" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."nopt-3.0.6" + sources."rimraf-2.7.1" + sources."semver-5.3.0" + sources."tar-2.2.2" + ]; + }) + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + (sources."node-pre-gyp-0.11.0" // { + dependencies = [ + sources."chownr-1.1.4" + sources."fs-minipass-1.2.7" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + sources."tar-4.4.13" + sources."yallist-3.1.1" + ]; + }) + sources."nopt-4.0.3" + sources."normalize-package-data-2.5.0" + sources."normalize-path-3.0.0" + sources."normalize-url-4.5.0" + sources."now-and-later-2.0.1" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-1.4.8" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."object-component-0.0.3" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.defaults-1.1.0" + sources."object.map-1.0.1" + sources."object.pick-1.3.0" + sources."object.reduce-1.0.1" + sources."office-ui-fabric-react-7.137.1" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."onetime-2.0.1" + (sources."openapi-default-setter-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-framework-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-jsonschema-parameters-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-request-coercer-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-request-validator-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-response-validator-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-schema-validator-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-security-handler-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + sources."openapi-types-7.0.0" + (sources."opencollective-1.0.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."minimist-1.2.0" + sources."supports-color-2.0.0" + ]; + }) + sources."opencollective-postinstall-2.0.3" + sources."opn-4.0.2" + sources."ordered-read-streams-1.0.1" + sources."os-browserify-0.3.0" + sources."os-homedir-1.0.2" + sources."os-locale-1.4.0" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-cancelable-1.1.0" + sources."p-limit-3.0.2" + (sources."p-locate-4.1.0" // { + dependencies = [ + sources."p-limit-2.3.0" + ]; + }) + sources."p-map-3.0.0" + sources."p-try-2.2.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."packet-reader-1.0.0" + sources."pako-1.0.11" + sources."parallel-transform-1.2.0" + sources."parse-asn1-5.1.6" + sources."parse-filepath-1.0.2" + sources."parse-json-2.2.0" + sources."parse-node-version-1.0.1" + sources."parse-passwd-1.0.0" + sources."parseqs-0.0.5" + sources."parseuri-0.0.5" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.1" + sources."path-dirname-1.0.2" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" + sources."path-root-0.1.1" + sources."path-root-regex-0.1.2" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" + sources."pbkdf2-3.1.1" + sources."performance-now-2.1.0" + (sources."pg-8.3.0" // { + dependencies = [ + sources."semver-4.3.2" + ]; + }) + sources."pg-connection-string-2.3.0" + sources."pg-int8-1.0.1" + sources."pg-pool-3.2.1" + sources."pg-protocol-1.2.5" + sources."pg-types-2.2.0" + sources."pgpass-1.0.2" + sources."picomatch-2.2.2" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + (sources."pkg-dir-4.2.0" // { + dependencies = [ + sources."find-up-4.1.0" + sources."path-exists-4.0.0" + ]; + }) + sources."plugin-error-1.0.1" + sources."posix-character-classes-0.1.1" + sources."postgres-array-2.0.0" + sources."postgres-bytea-1.0.0" + sources."postgres-date-1.0.7" + sources."postgres-interval-1.2.0" + sources."prepend-http-2.0.0" + sources."pretty-hrtime-1.0.3" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."promise-inflight-1.0.1" + sources."promise-queue-2.2.5" + sources."prop-types-15.7.2" + sources."proxy-addr-2.0.6" + sources."prr-1.0.1" + sources."psl-1.8.0" + (sources."public-encrypt-4.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."pump-2.0.1" + sources."pumpify-1.5.1" + sources."punycode-2.1.1" + sources."qs-6.7.0" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."rc-1.2.8" + sources."react-16.13.1" + sources."react-dom-16.13.1" + sources."react-is-16.13.1" + (sources."read-pkg-1.1.0" // { + dependencies = [ + sources."path-type-1.1.0" + ]; + }) + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.7" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."rechoir-0.6.2" + sources."regenerator-runtime-0.10.5" + sources."regex-not-1.0.2" + sources."registry-auth-token-4.2.0" + sources."registry-url-5.1.0" + sources."remove-bom-buffer-3.0.0" + sources."remove-bom-stream-1.2.0" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."replace-ext-1.0.1" + sources."replace-homedir-1.0.0" + (sources."request-2.88.2" // { + dependencies = [ + sources."form-data-2.3.3" + sources."qs-6.5.2" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.17.0" + sources."resolve-dir-1.0.1" + sources."resolve-options-1.1.0" + sources."resolve-url-0.2.1" + sources."responselike-1.0.2" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."reusify-1.0.4" + sources."rfdc-1.1.4" + sources."rimraf-3.0.2" + sources."ripemd160-2.0.2" + sources."run-async-2.4.1" + sources."run-parallel-1.1.9" + sources."run-queue-1.0.3" + sources."rx-4.1.0" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sass-1.26.10" + sources."sax-1.2.4" + sources."scheduler-0.19.1" + sources."schema-utils-2.7.1" + sources."semver-5.7.1" + sources."semver-greatest-satisfied-range-1.1.0" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serialize-javascript-4.0.0" + sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setimmediate-1.0.5" + sources."setprototypeof-1.1.1" + sources."sha.js-2.4.11" + sources."sift-7.0.1" + sources."signal-exit-3.0.3" + sources."slash-3.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."socket.io-2.3.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) + sources."socket.io-adapter-1.1.2" + (sources."socket.io-client-2.3.0" // { + dependencies = [ + sources."component-emitter-1.2.1" + sources."debug-4.1.1" + sources."isarray-2.0.1" + sources."ms-2.1.2" + (sources."socket.io-parser-3.3.0" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) + ]; + }) + (sources."socket.io-parser-3.4.1" // { + dependencies = [ + sources."component-emitter-1.2.1" + sources."debug-4.1.1" + sources."isarray-2.0.1" + sources."ms-2.1.2" + ]; + }) + sources."source-list-map-2.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + (sources."source-map-support-0.5.19" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."source-map-url-0.4.0" + sources."sparkles-1.0.1" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.5" + sources."split-1.0.1" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."sqlite3-5.0.0" + sources."sqlstring-2.3.1" + sources."sshpk-1.16.1" + sources."ssri-8.0.0" + sources."stack-trace-0.0.10" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."statuses-1.5.0" + sources."stream-browserify-2.0.2" + sources."stream-each-1.2.3" + sources."stream-exhaust-1.0.2" + sources."stream-http-2.8.3" + sources."stream-shift-1.0.1" + (sources."streamroller-2.2.4" // { + dependencies = [ + sources."date-format-2.1.0" + sources."debug-4.2.0" + sources."fs-extra-8.1.0" + sources."jsonfile-4.0.0" + sources."ms-2.1.2" + sources."universalify-0.1.2" + ]; + }) + sources."streamsearch-0.1.2" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-bom-string-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-5.5.0" + sources."sver-compat-1.5.0" + sources."swagger-schema-official-2.0.0-bab6bed" + sources."swagger-ui-dist-3.30.2" + sources."tail-2.0.4" + sources."tapable-1.1.3" + sources."tar-6.0.5" + (sources."terser-4.8.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."terser-webpack-plugin-3.0.7" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."through-2.3.8" + sources."through2-2.0.5" + sources."through2-filter-3.0.0" + sources."time-stamp-1.1.0" + sources."timers-browserify-2.0.11" + sources."timers-ext-0.1.7" + sources."tmp-0.0.33" + sources."to-absolute-glob-2.0.2" + sources."to-array-0.1.4" + sources."to-arraybuffer-1.0.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-readable-stream-1.0.0" + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."to-through-2.0.0" + sources."toidentifier-1.0.0" + sources."tough-cookie-2.5.0" + (sources."ts-loader-8.0.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."ts-log-2.1.4" + sources."tslib-1.13.0" + (sources."tslint-6.1.2" // { + dependencies = [ + sources."mkdirp-0.5.5" + ]; + }) + sources."tsutils-2.29.0" + sources."tty-browserify-0.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-1.2.0" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."typescript-3.9.7" + sources."unc-path-regex-0.1.2" + sources."undertaker-1.3.0" + sources."undertaker-registry-1.0.1" + sources."union-value-1.0.1" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."unique-stream-2.3.1" + sources."universalify-1.0.0" + sources."unpipe-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."upath-1.2.0" + sources."uri-js-4.4.0" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-join-4.0.1" + sources."url-parse-lax-3.0.0" + sources."url-toolkit-2.2.0" + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."v8flags-3.2.0" + sources."validate-npm-package-license-3.0.4" + sources."value-or-function-3.0.0" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."vinyl-2.2.0" + sources."vinyl-fs-3.0.3" + (sources."vinyl-sourcemap-1.1.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."vinyl-sourcemaps-apply-0.2.1" + sources."vm-browserify-1.1.2" + (sources."watchpack-1.7.4" // { + dependencies = [ + sources."anymatch-3.1.1" + sources."binary-extensions-2.1.0" + sources."chokidar-3.4.2" + sources."fsevents-2.1.3" + sources."is-binary-path-2.1.0" + sources."readdirp-3.4.0" + ]; + }) + sources."watchpack-chokidar2-2.0.0" + (sources."webpack-4.44.0" // { + dependencies = [ + sources."acorn-6.4.1" + sources."braces-2.3.2" + sources."cacache-12.0.4" + sources."chownr-1.1.4" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."locate-path-3.0.0" + sources."lru-cache-5.1.1" + sources."make-dir-2.1.0" + sources."memory-fs-0.4.1" + sources."micromatch-3.1.10" + sources."mkdirp-0.5.5" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."pify-4.0.1" + sources."pkg-dir-3.0.0" + sources."rimraf-2.7.1" + sources."schema-utils-1.0.0" + sources."source-map-0.6.1" + sources."ssri-6.0.1" + sources."terser-webpack-plugin-1.4.5" + sources."to-regex-range-2.1.1" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + ]; + }) + (sources."webpack-sources-1.4.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."webpack-stream-5.2.1" // { + dependencies = [ + sources."memory-fs-0.4.1" + ]; + }) + sources."which-1.3.1" + sources."which-module-1.0.0" + sources."wide-align-1.1.3" + sources."worker-farm-1.7.0" + sources."wrap-ansi-2.1.0" + sources."wrappy-1.0.2" + sources."ws-7.3.1" + sources."xmlhttprequest-ssl-1.5.5" + sources."xtend-4.0.2" + sources."y18n-3.2.1" + sources."yallist-4.0.0" + sources."yargs-7.1.1" + sources."yargs-parser-5.0.0-security.0" + sources."yeast-0.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "DTV Software in Japan."; + homepage = "https://github.com/l3tnun/EPGStation#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; escape-string-regexp = nodeEnv.buildNodePackage { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -62160,7 +64462,7 @@ in sources."@eslint/eslintrc-0.1.3" sources."@types/color-name-1.1.1" sources."acorn-7.4.0" - sources."acorn-jsx-5.2.0" + sources."acorn-jsx-5.3.1" sources."ajv-6.12.4" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" @@ -62287,10 +64589,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "9.1.1"; + version = "9.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-9.1.1.tgz"; - sha512 = "+y3ULQemuvoxWgfV/VGzlYJS84V9GmvyzIxZFGUA3kgUpaJkuqXn/nm21Z/nYYNmfiySXy6RU1ery0A8cztZRw=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-9.1.2.tgz"; + sha512 = "HJ7n92z+gSBLPP/en2pse1SLsFfwOXb8aqHn3FyXwYaE+J5wSM+raBbSmvE9Ttq20IF6Rq/dXxjhiIjuxAUjpw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -62303,7 +64605,7 @@ in sources."@eslint/eslintrc-0.1.3" sources."@types/color-name-1.1.1" sources."acorn-7.4.0" - sources."acorn-jsx-5.2.0" + sources."acorn-jsx-5.3.1" sources."ajv-6.12.4" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" @@ -62764,7 +65066,7 @@ in sources."resolve-1.17.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."shebang-command-2.0.0" @@ -62971,7 +65273,7 @@ in sources."is-arguments-1.0.4" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -63220,7 +65522,7 @@ in sources."has-flag-3.0.0" sources."iterall-1.3.0" sources."minimist-1.2.5" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."supports-color-5.5.0" ]; buildInputs = globalBuildInputs; @@ -63387,7 +65689,7 @@ in sources."separator-escape-0.0.0" sources."sha.js-2.4.5" sources."smart-buffer-4.1.0" - sources."socks-2.4.2" + sources."socks-2.4.4" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -63402,7 +65704,7 @@ in sources."ssb-caps-1.1.0" (sources."ssb-client-4.9.0" // { dependencies = [ - sources."ssb-config-3.4.4" + sources."ssb-config-3.4.5" ]; }) sources."ssb-config-2.3.9" @@ -63423,7 +65725,7 @@ in }) sources."ssb-msgs-5.2.0" sources."ssb-pull-requests-1.0.0" - sources."ssb-ref-2.14.0" + sources."ssb-ref-2.14.2" (sources."stream-to-pull-stream-1.7.3" // { dependencies = [ sources."looper-3.0.0" @@ -63545,7 +65847,7 @@ in sources."deep-extend-0.6.0" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" @@ -63629,7 +65931,7 @@ in sources."minimist-1.2.5" sources."minimist-options-4.1.0" sources."mute-stream-0.0.8" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -63643,7 +65945,7 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."ora-5.0.0" + sources."ora-5.1.0" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" @@ -63685,7 +65987,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safer-buffer-2.1.2" sources."semver-7.3.2" (sources."semver-diff-3.1.1" // { @@ -63750,7 +66052,7 @@ in sha512 = "O3UHyNJ3nYBNfgC+R5hvJPADiZztZHgWoYfdX0vAtXf0yWyqNgtJQzkcY3RufW1Yi+Bq2Yo8ptyYr2i573GPTQ=="; }; dependencies = [ - sources."@ardatan/aggregate-error-0.0.1" + sources."@ardatan/aggregate-error-0.0.6" sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" (sources."@babel/highlight-7.10.4" // { @@ -63767,32 +66069,32 @@ in sources."@exodus/schemasafe-1.0.0-rc.2" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" - sources."@graphql-tools/delegate-6.2.0" - (sources."@graphql-tools/graphql-file-loader-6.2.0" // { + sources."@graphql-tools/delegate-6.2.1" + (sources."@graphql-tools/graphql-file-loader-6.2.1" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/import-6.2.0" // { + (sources."@graphql-tools/import-6.2.1" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/json-file-loader-6.2.0" // { + (sources."@graphql-tools/json-file-loader-6.2.1" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - sources."@graphql-tools/load-6.2.0" - sources."@graphql-tools/merge-6.2.0" - sources."@graphql-tools/schema-6.2.0" - (sources."@graphql-tools/url-loader-6.2.0" // { + sources."@graphql-tools/load-6.2.1" + sources."@graphql-tools/merge-6.2.1" + sources."@graphql-tools/schema-6.2.1" + (sources."@graphql-tools/url-loader-6.2.1" // { dependencies = [ sources."cross-fetch-3.0.5" ]; }) - sources."@graphql-tools/utils-6.2.0" - sources."@graphql-tools/wrap-6.2.0" + sources."@graphql-tools/utils-6.2.1" + sources."@graphql-tools/wrap-6.2.1" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -63800,7 +66102,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -63993,7 +66295,7 @@ in sources."is-arrayish-0.2.1" sources."is-bigint-1.0.0" sources."is-boolean-object-1.0.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" @@ -64162,7 +66464,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - (sources."rxjs-6.6.2" // { + (sources."rxjs-6.6.3" // { dependencies = [ sources."tslib-1.13.0" ]; @@ -65487,7 +67789,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.10.3" + sources."uglify-js-3.10.4" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -65768,7 +68070,7 @@ in sources."async-limiter-1.0.1" sources."chrome-remote-interface-0.27.2" sources."commander-2.11.0" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."semver-5.7.1" sources."source-map-0.7.3" sources."ws-6.2.1" @@ -66068,7 +68370,7 @@ in sources."rimraf-3.0.2" sources."rsvp-3.6.2" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -66645,10 +68947,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.166"; + version = "1.0.167"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.166.tgz"; - sha512 = "+wZT9vcD+fIFL3E4kkSKHhaphKq6sDrrFbVoiCyZRoY9+3sGvBedzYOPEoZpiF83YbbPR+WUSM54naB5q8xOYw=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.0.167.tgz"; + sha512 = "NPJhXp8zoT3o/5K7DIYJSUiGSd5a++ZdHA8XkoQY6Ke8jGfGLsk59B7mfQxxZ7zmCEkq8bkg2gaBi7fBiAtyPw=="; }; dependencies = [ sources."@cronvel/get-pixels-3.4.0" @@ -66697,7 +68999,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.745.0" // { + (sources."aws-sdk-2.750.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -66994,6 +69296,7 @@ in sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" + sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-1.0.0" (sources."is-number-3.0.0" // { @@ -67007,6 +69310,7 @@ in sources."is-typedarray-1.0.0" sources."is-unc-path-0.1.2" sources."is-windows-0.2.0" + sources."is-wsl-2.2.0" (sources."is2-0.0.9" // { dependencies = [ sources."deep-is-0.1.2" @@ -67066,7 +69370,7 @@ in }) sources."markdown-it-abbr-1.0.4" sources."markdown-it-anchor-5.3.0" - sources."markdown-it-deflist-2.0.3" + sources."markdown-it-deflist-2.1.0" sources."markdown-it-emoji-1.4.0" sources."markdown-it-expand-tabs-1.0.13" sources."markdown-it-footnote-3.0.2" @@ -67162,6 +69466,7 @@ in sources."object.pick-1.3.0" sources."omggif-1.0.10" sources."once-1.4.0" + sources."open-7.2.1" sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -67364,7 +69669,7 @@ in ]; }) sources."tar-fs-2.1.0" - sources."tar-stream-2.1.3" + sources."tar-stream-2.1.4" (sources."tcp-port-used-0.1.2" // { dependencies = [ sources."debug-0.7.4" @@ -67819,7 +70124,7 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" @@ -68052,10 +70357,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-5.2.1.tgz"; - sha512 = "+/AO2fWL7kC3aWTx/lHjtKXfOqh0O+KLtTy4BLQ/b/eciHR4VTHHdPhdrn9sDBQskgDieaBZ+sAKzlldc4GW/Q=="; + url = "https://registry.npmjs.org/karma/-/karma-5.2.2.tgz"; + sha512 = "rB3Ua5yDxmIupTj67r3Q8itz7TxJzRE6DmVcOfV20D509Uu9AoBKlVwbZhND4kcm6BqLfbHtv4DZC9QJfrUY+w=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -68214,7 +70519,7 @@ in sources."ms-2.1.2" ]; }) - sources."source-map-0.7.3" + sources."source-map-0.6.1" sources."statuses-1.5.0" (sources."streamroller-2.2.4" // { dependencies = [ @@ -68713,9 +71018,9 @@ in sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@octokit/auth-token-2.4.2" - (sources."@octokit/endpoint-6.0.5" // { + (sources."@octokit/endpoint-6.0.6" // { dependencies = [ - sources."is-plain-object-4.1.1" + sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) @@ -68731,10 +71036,10 @@ in sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.7" // { + (sources."@octokit/request-5.4.8" // { dependencies = [ sources."@octokit/request-error-2.0.2" - sources."is-plain-object-4.1.1" + sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) @@ -68748,7 +71053,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -68851,7 +71156,7 @@ in sources."combined-stream-1.0.8" (sources."compare-func-2.0.0" // { dependencies = [ - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."is-obj-2.0.0" ]; }) @@ -69086,7 +71391,7 @@ in ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.1.3" + sources."git-url-parse-11.2.0" sources."gitconfiglocal-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -69152,7 +71457,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -69269,7 +71574,7 @@ in sources."nanomatch-1.2.13" sources."neo-async-2.6.2" sources."nice-try-1.0.5" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."node-fetch-npm-2.0.4" (sources."node-gyp-5.1.1" // { dependencies = [ @@ -69420,7 +71725,7 @@ in sources."rimraf-2.7.1" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -69551,7 +71856,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.10.3" + sources."uglify-js-3.10.4" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -70534,8 +72839,8 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.11.0" - sources."@babel/core-7.11.5" - sources."@babel/generator-7.11.5" + sources."@babel/core-7.11.6" + sources."@babel/generator-7.11.6" 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" @@ -70638,12 +72943,16 @@ in sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.2" - sources."@jest/transform-25.5.1" + (sources."@jest/transform-25.5.1" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."@jest/types-25.5.0" sources."@types/babel__core-7.1.9" sources."@types/babel__generator-7.6.1" sources."@types/babel__template-7.0.2" - sources."@types/babel__traverse-7.0.13" + sources."@types/babel__traverse-7.0.14" sources."@types/color-name-1.1.1" sources."@types/estree-0.0.45" sources."@types/graceful-fs-4.1.3" @@ -70651,7 +72960,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -70813,7 +73122,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.14.0" + sources."browserslist-4.14.2" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -70828,7 +73137,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001123" + sources."caniuse-lite-1.0.30001125" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -70881,7 +73190,6 @@ in (sources."combine-source-map-0.8.0" // { dependencies = [ sources."convert-source-map-1.1.3" - sources."source-map-0.5.7" ]; }) sources."combined-stream-1.0.8" @@ -70951,7 +73259,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.560" + sources."electron-to-chromium-1.3.565" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -71113,11 +73421,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inline-source-map-0.6.2" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) + sources."inline-source-map-0.6.2" sources."insert-module-globals-7.2.0" sources."interpret-1.4.0" sources."invariant-2.2.4" @@ -71248,7 +73552,7 @@ in sources."ncp-2.0.0" sources."neo-async-2.6.2" sources."nice-try-1.0.5" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."node-int64-0.4.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ @@ -71263,7 +73567,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.60" + sources."node-releases-1.1.61" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" @@ -71450,7 +73754,6 @@ in sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" sources."ms-2.0.0" - sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -71464,9 +73767,13 @@ in ]; }) sources."source-list-map-0.1.8" - sources."source-map-0.6.1" + sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.19" + (sources."source-map-support-0.5.19" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."source-map-url-0.4.0" sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.1" @@ -71516,15 +73823,20 @@ in sources."supports-color-5.5.0" sources."syntax-error-1.4.0" sources."tapable-1.1.3" - (sources."tar-stream-2.1.3" // { + (sources."tar-stream-2.1.4" // { dependencies = [ sources."readable-stream-3.6.0" ]; }) - sources."terser-4.8.0" + (sources."terser-4.8.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ sources."schema-utils-1.0.0" + sources."source-map-0.6.1" ]; }) sources."test-exclude-6.0.0" @@ -71631,6 +73943,7 @@ in (sources."webpack-sources-1.4.3" // { dependencies = [ sources."source-list-map-2.0.1" + sources."source-map-0.6.1" ]; }) sources."which-2.0.2" @@ -71702,10 +74015,10 @@ in markdown-link-check = nodeEnv.buildNodePackage { name = "markdown-link-check"; packageName = "markdown-link-check"; - version = "3.8.1"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.1.tgz"; - sha512 = "R6k8ytdJZePDAdb8NT0NvrNvu6n25IwLPIoJ4guHWC5yqyTlnUpRT7j3XE4ioBXwqOhG/LlUcuckD621kZkl4w=="; + url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.3.tgz"; + sha512 = "Q9LTCwBjWcQR9dd6LNMXg9GFewkRiVEaU/+Y2ZcCbOb0lVqIfeJworWYGakG7bFj8HJQILBTRnAnEK9DDKfdPA=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -71723,7 +74036,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."commander-5.1.0" + sources."commander-6.1.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -71749,10 +74062,10 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."link-check-4.5.0" + sources."link-check-4.5.1" sources."lodash-4.17.20" - sources."markdown-link-extractor-1.2.3" - sources."marked-0.8.2" + sources."markdown-link-extractor-1.2.6" + sources."marked-1.1.1" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."ms-2.1.2" @@ -72139,20 +74452,20 @@ in sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-7.7.0" + sources."@fluentui/date-time-utilities-7.8.0" sources."@fluentui/keyboard-key-0.2.11" - sources."@fluentui/react-7.134.1" - sources."@fluentui/react-focus-7.15.0" + sources."@fluentui/react-7.137.1" + sources."@fluentui/react-focus-7.16.0" sources."@fluentui/react-icons-0.3.0" sources."@fluentui/react-window-provider-0.3.0" sources."@fluentui/theme-0.2.0" - sources."@microsoft/load-themed-styles-1.10.82" + sources."@microsoft/load-themed-styles-1.10.89" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@uifabric/foundation-7.9.0" sources."@uifabric/icons-7.5.0" sources."@uifabric/merge-styles-7.18.0" - sources."@uifabric/react-hooks-7.11.0" + sources."@uifabric/react-hooks-7.13.0" sources."@uifabric/set-version-7.0.22" sources."@uifabric/styling-7.16.0" sources."@uifabric/utilities-7.31.0" @@ -72281,7 +74594,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.134.1" + sources."office-ui-fabric-react-7.137.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -72380,7 +74693,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.32.5" + sources."swagger-ui-dist-3.33.0" sources."tail-2.0.4" sources."through-2.3.8" sources."tmp-0.0.33" @@ -72472,7 +74785,7 @@ in sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -72701,10 +75014,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.61.0"; + version = "2.62.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.61.0.tgz"; - sha512 = "IGB8m/Cb0LB84K9wXSv3KbGJ29RzPTRt8CfHdH6mBMW5hWk3TfCGIIXl1xjqVR7am4ZxbGlKUcDDiMGGwF+/JQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.62.0.tgz"; + sha512 = "fjMziW+anU8VUQCZmNJAb+yN6n9O+gTqKXgHRT7lVYCpSyBzQP9dCVNBu8x+kwAR1rfPuQE15h/BfG5O1WuU/w=="; }; dependencies = [ sources."@analytics/cookie-utils-0.2.3" @@ -72714,11 +75027,11 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" sources."@babel/parser-7.11.5" - sources."@bugsnag/browser-7.3.3" - sources."@bugsnag/core-7.3.3" + sources."@bugsnag/browser-7.3.4" + sources."@bugsnag/core-7.3.4" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.3.3" - sources."@bugsnag/node-7.3.3" + sources."@bugsnag/js-7.3.4" + sources."@bugsnag/node-7.3.4" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" @@ -72862,9 +75175,9 @@ in }) sources."@oclif/screen-1.0.4" sources."@octokit/auth-token-2.4.2" - (sources."@octokit/endpoint-6.0.5" // { + (sources."@octokit/endpoint-6.0.6" // { dependencies = [ - sources."is-plain-object-4.1.1" + sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) @@ -72879,10 +75192,10 @@ in sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.7" // { + (sources."@octokit/request-5.4.8" // { dependencies = [ sources."@octokit/request-error-2.0.2" - sources."is-plain-object-4.1.1" + sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) @@ -72912,7 +75225,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" sources."@types/semver-5.5.0" @@ -72920,6 +75233,7 @@ in sources."@types/yargs-parser-15.0.0" sources."@typescript-eslint/typescript-estree-2.34.0" sources."accepts-1.3.7" + sources."agent-base-6.0.1" sources."aggregate-error-3.1.0" sources."analytics-0.5.5" sources."analytics-utils-0.2.2" @@ -72971,7 +75285,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.745.0" // { + (sources."aws-sdk-2.750.0" // { dependencies = [ sources."buffer-4.9.2" sources."uuid-3.3.2" @@ -73219,7 +75533,7 @@ in ]; }) sources."dlv-1.1.3" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."dotenv-8.2.0" (sources."download-7.1.0" // { dependencies = [ @@ -73474,6 +75788,7 @@ in sources."to-regex-range-5.0.1" ]; }) + sources."https-proxy-agent-5.0.0" sources."human-signals-1.1.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" @@ -73517,7 +75832,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -73709,7 +76024,7 @@ in }) sources."netlify-redirector-0.2.0" sources."nice-try-1.0.5" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."node-source-walk-4.2.0" sources."noop2-2.0.0" (sources."normalize-package-data-2.5.0" // { @@ -73741,7 +76056,7 @@ in }) sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object-treeify-1.1.26" + sources."object-treeify-1.1.28" sources."object-visit-1.0.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.0" @@ -73902,7 +76217,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-join-0.1.3" sources."safe-json-stringify-1.2.0" @@ -74056,7 +76371,7 @@ in }) ]; }) - sources."tar-stream-2.1.3" + sources."tar-stream-2.1.4" sources."temp-dir-1.0.0" (sources."tempy-0.3.0" // { dependencies = [ @@ -75482,7 +77797,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" @@ -75615,10 +77930,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "8.0.5"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-8.0.5.tgz"; - sha512 = "EZ3DIFvKFNZzwV9OdEYITTAY6fmuD7evItEmf9XyntG4p29n8JpFaGrf9uCQIR0Hx3G5RFNsdCeURHzF6YXIAw=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-9.0.0.tgz"; + sha512 = "BR3OkfpY06KziYHp1CoOJZO6h3067NCZWEBcszkI4LiND4sSC8qAPbpkVZ2gNr+q5Zu4IfN0m4TM8q9xoMo62g=="; }; dependencies = [ sources."@npmcli/ci-detect-1.3.0" @@ -75707,7 +78022,7 @@ in sources."delegates-1.0.0" sources."depd-1.1.2" sources."dezalgo-1.0.3" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" @@ -75913,7 +78228,7 @@ in sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" sources."smart-buffer-4.1.0" - sources."socks-2.4.2" + sources."socks-2.4.4" sources."socks-proxy-agent-5.0.0" sources."spawn-please-0.4.1" sources."sprintf-js-1.0.3" @@ -76202,12 +78517,17 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.11.0" - (sources."@babel/core-7.11.5" // { + (sources."@babel/core-7.11.6" // { dependencies = [ sources."json5-2.1.3" + sources."source-map-0.5.7" + ]; + }) + (sources."@babel/generator-7.11.6" // { + dependencies = [ + sources."source-map-0.5.7" ]; }) - sources."@babel/generator-7.11.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" @@ -76404,7 +78724,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.14.0" + sources."browserslist-4.14.2" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -76420,7 +78740,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001123" + sources."caniuse-lite-1.0.30001125" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -76548,13 +78868,13 @@ in sources."domexception-1.0.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."dotenv-5.0.1" sources."dotenv-expand-5.1.0" sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.560" + sources."electron-to-chromium-1.3.565" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -76688,7 +79008,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-color-stop-1.1.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ @@ -76810,7 +79130,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.60" + sources."node-releases-1.1.61" sources."normalize-html-whitespace-1.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" @@ -77399,7 +79719,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.10.3" + sources."uglify-js-3.10.4" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.0" @@ -77566,7 +79886,7 @@ in sources."ipaddr.js-2.0.0" sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -78082,7 +80402,7 @@ in sources."statuses-1.5.0" sources."string2compact-1.3.0" sources."string_decoder-1.1.1" - sources."tar-stream-2.1.3" + sources."tar-stream-2.1.4" sources."thirty-two-0.0.2" sources."thunky-1.1.0" sources."to-array-0.1.4" @@ -78132,10 +80452,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.5.10"; + version = "5.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.5.10.tgz"; - sha512 = "lHaae4Xiiz2I6+1czn/3AvvM+O7sHDoiEiBW4UK0NPuWJdCBGuu6qcuneuo02cmo5Hur3KuqgGmUdkMKq7gMnw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.5.12.tgz"; + sha512 = "LtQFpX08J25meH8bLo1yuCzfkpWdGxpFsytfCnqlzzTbr3ajh31drlIQHtGIEQdMVpEeqplLseNWTjrSPLxShQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -78618,13 +80938,15 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.13.7"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.13.7.tgz"; - sha512 = "TFOuSw0boZkT8q96QJyY/LJfEZ0DWD86xKdwOe2td04TAzBZVUvwu7143XCzKnewf38qv4tHzCLlVPe4a+HXdA=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.14.0.tgz"; + sha512 = "tx8p1CIBNLO8f3Z0+MfiVIBzfKDQh0CykaFnlvWfGMH5Q0JPjF9egR4F4YI6FHXUfRi9tccMSXeIR/ZV423Wnw=="; }; dependencies = [ sources."isexe-2.0.0" + sources."shell-quote-1.7.2" + sources."uuid-3.4.0" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.15.3" @@ -78682,10 +81004,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.66"; + version = "1.1.70"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.66.tgz"; - sha512 = "DbtdoFKrg3JrGAEG9bUjN4dNQQeoj7a/vy61Ppi/6KeA1sEclA/sUFFH8Yyb56UDUEXYg2U1dw78zr6mRw+Cog=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.70.tgz"; + sha512 = "YASHI2IsIh4gVugf9+CK/e26uuH76HNSu2g0h89NkILwaEXnsqqeSAHjwYln9eRHBv9vk3A5WM5f8idJQm6oVA=="; }; buildInputs = globalBuildInputs; meta = { @@ -78737,7 +81059,7 @@ in sources."is-arguments-1.0.4" sources."is-bigint-1.0.0" sources."is-boolean-object-1.0.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-map-2.0.1" sources."is-negative-zero-2.0.0" @@ -78864,7 +81186,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/generator-7.11.5" + (sources."@babel/generator-7.11.6" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" @@ -79179,7 +81505,7 @@ in sources."string_decoder-1.3.0" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" - sources."styled-components-5.1.1" + sources."styled-components-5.2.0" sources."supports-color-5.5.0" (sources."swagger2openapi-5.4.0" // { dependencies = [ @@ -79193,7 +81519,7 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.0.1" sources."tty-browserify-0.0.0" - sources."uglify-js-3.10.3" + sources."uglify-js-3.10.4" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -79273,10 +81599,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.26.9"; + version = "2.26.11"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.26.9.tgz"; - sha512 = "XIiWYLayLqV+oY4S2Lub/shJq4uk/QQLwWToYCL4LjZbYHbFK3czea4UDVRUJu+zNmKmxq5Zb/OG7c5HSvH2TQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.26.11.tgz"; + sha512 = "xyfxxhsE6hW57xhfL1I+ixH8l2bdoIMaAecdQiWF3N7IgJEMu99JG+daBiSZQjnBpzFxa0/xZm+3pbCdAQehHw=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -79318,7 +81644,7 @@ in sources."@types/node-12.7.12" sources."@types/node-fetch-2.5.7" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.48.0" + sources."@types/vscode-1.49.0" (sources."@typescript-eslint/eslint-plugin-3.10.1" // { dependencies = [ sources."semver-7.3.2" @@ -79334,7 +81660,7 @@ in }) sources."@typescript-eslint/visitor-keys-3.10.1" sources."acorn-7.4.0" - sources."acorn-jsx-5.2.0" + sources."acorn-jsx-5.3.1" sources."agent-base-4.3.0" sources."ajv-6.12.4" sources."ansi-colors-4.1.1" @@ -79479,7 +81805,7 @@ in sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -79533,7 +81859,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."natural-compare-1.4.0" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."nth-check-1.0.2" sources."object-inspect-1.8.0" @@ -79576,7 +81902,7 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.26.9" + sources."rollup-2.26.11" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" @@ -79943,14 +82269,13 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.81.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.81.1.tgz"; - sha512 = "CaNAEFDc1V7egtIcJcF5A7ba6ipD9FG0ZPbHr0M4m8IMsmfWAewdhhj1BdlcpaD16mNZH9bjXYT28z+mHKZ4/w=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.0.0.tgz"; + sha512 = "VC4VaZ4vDlV7PZ0pknUNCEGAEadr/NkkFjSl2or89tngb5Y2A/Y/vwoCIXOqshR5bT6xIcPZuP7Oq573KeEXLQ=="; }; dependencies = [ sources."2-thenable-1.0.0" - sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -79966,7 +82291,7 @@ in sources."@protobufjs/utf8-1.1.0" sources."@serverless/cli-1.5.2" sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-2.34.9" // { + (sources."@serverless/components-3.1.2" // { dependencies = [ sources."globby-10.0.2" sources."semver-7.3.2" @@ -79977,10 +82302,10 @@ in sources."fs-extra-7.0.1" ]; }) - sources."@serverless/enterprise-plugin-3.8.2" + sources."@serverless/enterprise-plugin-4.0.2" sources."@serverless/event-mocks-1.1.1" sources."@serverless/inquirer-1.1.2" - sources."@serverless/platform-client-1.1.8" + sources."@serverless/platform-client-1.1.10" (sources."@serverless/platform-client-china-1.0.37" // { dependencies = [ sources."archiver-4.0.2" @@ -80009,7 +82334,7 @@ in sources."@types/lodash-4.14.161" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/object-assign-4.0.30" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -80060,21 +82385,14 @@ in ]; }) sources."argparse-1.0.10" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" sources."array-union-2.1.0" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."assign-symbols-1.0.0" sources."async-2.6.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - sources."atob-2.1.2" - (sources."aws-sdk-2.745.0" // { + (sources."aws-sdk-2.750.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -80086,11 +82404,6 @@ in sources."axios-0.19.2" sources."backo2-1.0.2" sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) sources."base64-arraybuffer-0.1.5" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -80099,10 +82412,15 @@ in sources."bl-4.0.3" sources."blob-0.0.5" sources."bluebird-3.7.2" - (sources."boxen-3.2.0" // { + (sources."boxen-4.2.0" // { dependencies = [ - sources."string-width-3.1.0" - sources."type-fest-0.3.1" + sources."ansi-regex-5.0.0" + sources."chalk-3.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."type-fest-0.8.1" ]; }) sources."brace-expansion-1.1.11" @@ -80114,7 +82432,6 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."builtin-modules-3.1.0" - sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -80122,10 +82439,8 @@ in ]; }) sources."cachedir-2.3.0" - sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -80136,31 +82451,8 @@ in ]; }) sources."chardet-0.7.0" - (sources."child-process-ext-2.1.1" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."semver-5.7.1" - ]; - }) + sources."child-process-ext-2.1.1" sources."chokidar-3.4.2" - sources."ci-info-1.6.0" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."cli-boxes-2.2.1" (sources."cli-color-2.0.0" // { dependencies = [ @@ -80170,7 +82462,6 @@ in sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" sources."clone-response-1.0.2" - sources."collection-visit-1.0.0" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -80193,20 +82484,20 @@ in }) sources."concat-map-0.0.1" sources."config-chain-1.1.12" - sources."configstore-3.1.5" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) sources."cookiejar-2.1.2" - sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."crc-3.8.0" sources."crc32-stream-3.0.1" - sources."create-error-class-3.0.2" - sources."cross-spawn-5.1.0" - sources."crypto-random-string-1.0.0" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) (sources."d-1.0.1" // { dependencies = [ sources."type-1.2.0" @@ -80250,12 +82541,10 @@ in sources."defer-to-connect-1.1.3" sources."deferred-0.7.11" sources."define-properties-1.1.3" - sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."diagnostics-1.1.1" sources."dijkstrajs-1.0.1" sources."dir-glob-3.0.1" - sources."dot-prop-4.2.1" sources."dot-qs-0.2.0" sources."dotenv-8.2.0" (sources."download-7.1.0" // { @@ -80312,46 +82601,11 @@ in sources."essentials-1.1.1" sources."event-emitter-0.3.5" sources."events-1.1.1" - (sources."execa-0.7.0" // { - dependencies = [ - sources."get-stream-3.0.0" - ]; - }) - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."ext-1.4.0" sources."ext-list-2.2.2" sources."ext-name-5.0.0" sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."external-editor-3.1.0" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.4" @@ -80375,11 +82629,9 @@ in sources."find-requires-1.0.0" sources."flat-5.0.2" sources."follow-redirects-1.5.10" - sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."formidable-1.2.2" - sources."fragment-cache-0.2.1" (sources."from2-2.3.0" // { dependencies = [ sources."isarray-1.0.0" @@ -80397,47 +82649,10 @@ in sources."get-proxy-2.1.0" sources."get-stdin-6.0.0" sources."get-stream-4.1.0" - sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."glob-to-regexp-0.3.0" - sources."global-dirs-0.1.1" - (sources."globby-9.2.0" // { - dependencies = [ - sources."@nodelib/fs.stat-1.1.3" - sources."array-union-1.0.2" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."dir-glob-2.2.2" - sources."fast-glob-2.2.7" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."glob-parent-3.1.0" - sources."ignore-4.0.6" - sources."is-glob-3.1.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."micromatch-3.1.10" - (sources."path-type-3.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."pify-4.0.1" - sources."slash-2.0.0" - sources."to-regex-range-2.1.1" - ]; - }) + sources."globby-11.0.1" sources."got-9.6.0" sources."graceful-fs-4.2.4" sources."graphlib-2.1.8" @@ -80448,17 +82663,6 @@ in sources."has-flag-4.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { @@ -80472,7 +82676,6 @@ in sources."ieee754-1.1.13" sources."ignore-5.1.8" sources."immediate-3.0.6" - sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indexof-0.0.1" sources."inflight-1.0.6" @@ -80490,33 +82693,20 @@ in ]; }) sources."into-stream-3.1.0" - sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" - sources."is-buffer-1.1.6" - sources."is-ci-1.2.1" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" sources."is-docker-1.1.0" - sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-installed-globally-0.1.0" sources."is-natural-number-4.0.1" - sources."is-npm-1.0.0" sources."is-number-7.0.0" - sources."is-obj-1.0.1" sources."is-object-1.0.1" - sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" - sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-windows-1.0.2" (sources."is-wsl-2.2.0" // { dependencies = [ sources."is-docker-2.1.1" @@ -80524,8 +82714,6 @@ in }) sources."isarray-2.0.1" sources."isexe-2.0.0" - sources."iso8601-duration-1.2.0" - sources."isobject-3.0.1" (sources."isomorphic-fetch-2.2.1" // { dependencies = [ sources."node-fetch-1.7.3" @@ -80547,7 +82735,6 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.8.3" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" (sources."jszip-3.5.0" // { @@ -80560,20 +82747,7 @@ in }) sources."jwt-decode-2.2.0" sources."keyv-3.1.0" - sources."kind-of-6.0.3" sources."kuler-1.0.1" - (sources."latest-version-3.1.0" // { - dependencies = [ - sources."get-stream-3.0.0" - sources."got-6.7.1" - sources."package-json-4.0.1" - sources."prepend-http-1.0.4" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" - sources."semver-5.7.1" - sources."url-parse-lax-1.0.0" - ]; - }) (sources."lazystream-1.0.0" // { dependencies = [ sources."isarray-1.0.0" @@ -80601,15 +82775,12 @@ in }) sources."long-4.0.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" sources."lru-queue-0.1.0" (sources."make-dir-1.3.0" // { dependencies = [ sources."pify-3.0.0" ]; }) - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" sources."memoizee-0.4.14" sources."merge2-1.4.1" sources."methods-1.1.2" @@ -80621,23 +82792,17 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."mkdirp-0.5.5" sources."moment-2.27.0" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nanoid-2.1.11" - sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" sources."ncjsm-4.1.0" sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-dir-0.1.17" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" (sources."npm-conf-1.1.3" // { @@ -80645,27 +82810,11 @@ in sources."pify-3.0.0" ]; }) - sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-component-0.0.3" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) sources."object-hash-2.0.3" sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" sources."once-1.4.0" sources."one-time-0.0.4" sources."onetime-2.0.1" @@ -80691,10 +82840,7 @@ in sources."pako-1.0.11" sources."parseqs-0.0.5" sources."parseuri-0.0.5" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-loader-1.0.10" sources."path-type-4.0.0" @@ -80704,7 +82850,6 @@ in sources."pify-5.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" sources."prettyoutput-1.2.0" sources."process-nextick-args-2.0.1" @@ -80712,10 +82857,9 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.10.1" // { dependencies = [ - sources."@types/node-13.13.16" + sources."@types/node-13.13.18" ]; }) - sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -80727,11 +82871,8 @@ in sources."readable-stream-3.6.0" sources."readdirp-3.4.0" sources."regenerator-runtime-0.13.7" - sources."regex-not-1.0.2" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" sources."replaceall-0.1.6" (sources."request-2.88.2" // { dependencies = [ @@ -80740,32 +82881,19 @@ in }) sources."request-promise-core-1.1.4" sources."request-promise-native-1.0.9" - sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" - sources."ret-0.1.15" sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" - sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."seek-bzip-1.0.6" sources."semver-6.3.0" - (sources."semver-diff-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) sources."semver-regex-2.0.0" sources."set-immediate-shim-1.0.1" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shortid-2.2.15" @@ -80778,36 +82906,6 @@ in }) sources."simple-swizzle-0.2.2" sources."slash-3.0.0" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) (sources."socket.io-client-2.3.0" // { dependencies = [ sources."debug-4.1.1" @@ -80818,32 +82916,12 @@ in sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."source-map-0.6.1" - sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.19" - sources."source-map-url-0.4.0" - sources."split-string-3.1.0" sources."split2-3.2.2" sources."sprintf-js-1.0.3" sources."sprintf-kit-2.0.0" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."stealthy-require-1.1.1" sources."stream-promise-3.2.0" sources."stream-shift-1.0.1" @@ -80859,7 +82937,6 @@ in sources."string_decoder-1.3.0" sources."strip-ansi-5.2.0" sources."strip-dirs-2.1.0" - sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" (sources."superagent-3.8.3" // { @@ -80877,8 +82954,8 @@ in sources."ms-2.1.2" ]; }) - sources."tar-stream-2.1.3" - sources."term-size-1.2.0" + sources."tar-stream-2.1.4" + sources."term-size-2.2.0" sources."text-hex-1.0.0" sources."through-2.3.8" sources."timed-out-4.0.1" @@ -80886,13 +82963,7 @@ in sources."tmp-0.0.33" sources."to-array-0.1.4" sources."to-buffer-1.1.1" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."to-readable-stream-1.0.0" - sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."traverse-0.6.6" @@ -80904,32 +82975,9 @@ in sources."type-2.1.0" sources."type-fest-0.11.0" sources."unbzip2-stream-1.4.3" - sources."union-value-1.0.1" - sources."unique-string-1.0.0" sources."universalify-0.1.2" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - sources."isarray-1.0.0" - ]; - }) sources."untildify-3.0.3" - sources."unzip-response-2.0.1" - (sources."update-notifier-2.5.0" // { - dependencies = [ - sources."ansi-align-2.0.0" - sources."boxen-1.3.0" - sources."camelcase-4.1.0" - sources."cli-boxes-1.0.0" - ]; - }) sources."uri-js-4.4.0" - sources."urix-0.1.0" (sources."url-0.10.3" // { dependencies = [ sources."punycode-1.3.2" @@ -80938,13 +82986,20 @@ in sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."urlencode-1.1.0" - sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."whatwg-fetch-3.4.0" + sources."whatwg-fetch-3.4.1" sources."which-1.3.1" - sources."widest-line-2.0.1" + (sources."widest-line-3.1.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."winston-3.2.1" (sources."winston-transport-4.4.0" // { dependencies = [ @@ -80957,12 +83012,10 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."ws-7.3.1" - sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" - sources."yallist-2.1.2" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" sources."yargs-parser-18.1.3" @@ -81607,16 +83660,12 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.388.0"; + version = "1.393.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.388.0.tgz"; - sha512 = "Oe4aDzp3iyBNpZCYxAxNWaN7l5aAB7dAVd3MLuJ3jdbJXcucMwc3MAfoZ91dmVb4SMO2qsOpiq6+qO6W8nuASA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.393.0.tgz"; + sha512 = "WaFgmZF657i2fXkkdmqJwQ7JGu8eUsimit7cNCwmwcfre4ku2EVVJCT4BcBcL0h1ss47wlVsBmmu8L9yv0o0MQ=="; }; dependencies = [ - sources."@arcanis/slice-ansi-1.0.2" - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" sources."@sindresorhus/is-2.1.1" (sources."@snyk/cli-interface-2.9.0" // { dependencies = [ @@ -81665,48 +83714,15 @@ in sources."@types/cacheable-request-6.0.1" sources."@types/color-name-1.1.1" sources."@types/debug-4.1.5" - sources."@types/emscripten-1.39.4" sources."@types/hosted-git-info-2.7.0" sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/node-13.13.16" + sources."@types/node-14.10.0" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.5" - (sources."@yarnpkg/core-2.2.2" // { - dependencies = [ - sources."ansi-styles-4.2.1" - sources."camelcase-5.3.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cross-spawn-7.0.3" - sources."has-flag-4.0.0" - sources."mkdirp-0.5.5" - sources."path-key-3.1.1" - sources."semver-7.3.2" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."supports-color-7.2.0" - sources."which-2.0.2" - ]; - }) - sources."@yarnpkg/fslib-2.2.1" - sources."@yarnpkg/json-proxy-2.1.0" - sources."@yarnpkg/libzip-2.2.0" sources."@yarnpkg/lockfile-1.1.0" - sources."@yarnpkg/parsers-2.2.0" - sources."@yarnpkg/pnp-2.2.1" - (sources."@yarnpkg/shell-2.2.0" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) sources."abbrev-1.1.1" sources."agent-base-4.3.0" (sources."ansi-align-3.0.0" // { @@ -81718,10 +83734,8 @@ in sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" - sources."any-promise-1.3.0" sources."archy-1.0.0" sources."argparse-1.0.10" - sources."array-union-2.1.0" sources."asap-2.0.6" sources."asn1-0.2.4" (sources."ast-types-0.14.1" // { @@ -81757,7 +83771,6 @@ in ]; }) sources."brace-expansion-1.1.11" - sources."braces-3.0.2" sources."browserify-zlib-0.1.4" sources."buffer-5.6.0" sources."buffer-from-1.1.1" @@ -81777,7 +83790,6 @@ in sources."cli-cursor-2.1.0" sources."cli-spinner-0.2.10" sources."cli-width-2.2.1" - sources."clipanion-2.5.0" (sources."cliui-3.2.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -81812,7 +83824,6 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."defer-to-connect-2.0.0" - sources."define-properties-1.1.3" (sources."degenerator-1.0.4" // { dependencies = [ sources."esprima-3.1.3" @@ -81820,7 +83831,6 @@ in }) sources."depd-1.1.2" sources."diff-4.0.2" - sources."dir-glob-3.0.1" (sources."docker-modem-2.1.3" // { dependencies = [ sources."readable-stream-3.6.0" @@ -81829,7 +83839,7 @@ in ]; }) sources."dockerfile-ast-0.0.30" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."dotnet-deps-parser-4.10.0" sources."duplexer3-0.1.4" sources."duplexify-3.7.1" @@ -81848,12 +83858,9 @@ in sources."execa-1.0.0" sources."extend-3.0.2" sources."external-editor-3.1.0" - sources."fast-glob-3.2.4" sources."fast-levenshtein-2.0.6" - sources."fastq-1.8.0" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" - sources."fill-range-7.0.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" (sources."ftp-0.3.10" // { @@ -81861,7 +83868,6 @@ in sources."readable-stream-1.1.14" ]; }) - sources."function-bind-1.1.1" sources."get-stream-4.1.0" (sources."get-uri-2.0.4" // { dependencies = [ @@ -81870,16 +83876,12 @@ in ]; }) sources."glob-7.1.6" - sources."glob-parent-5.1.1" sources."global-dirs-2.0.1" - sources."globby-11.0.1" sources."got-11.4.0" sources."graceful-fs-4.2.4" - sources."grapheme-splitter-1.0.4" + sources."graphlib-2.1.8" sources."gunzip-maybe-1.4.2" - sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" sources."has-yarn-2.1.0" (sources."hosted-git-info-3.0.5" // { dependencies = [ @@ -81903,7 +83905,6 @@ in }) sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" - sources."ignore-5.1.8" sources."immediate-3.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -81912,18 +83913,13 @@ in sources."ini-1.3.5" sources."invert-kv-1.0.0" sources."ip-1.1.5" - sources."is-3.3.0" - sources."is-callable-1.2.0" sources."is-ci-2.0.0" sources."is-deflate-1.0.0" sources."is-docker-2.1.1" - sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.1" sources."is-gzip-1.0.0" sources."is-installed-globally-0.3.2" sources."is-npm-4.0.0" - sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-stream-1.1.0" @@ -81934,7 +83930,6 @@ in sources."isexe-2.0.0" sources."js-yaml-3.14.0" sources."json-buffer-3.0.1" - sources."json-file-plus-3.3.1" (sources."jszip-3.5.0" // { dependencies = [ sources."pako-1.0.11" @@ -81973,13 +83968,10 @@ in sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.values-4.3.0" - sources."logic-solver-2.0.1" sources."lowercase-keys-2.0.0" sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."make-dir-3.1.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.2" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -81995,13 +83987,10 @@ in }) sources."netmask-1.0.6" sources."nice-try-1.0.5" - sources."node.extend-2.0.2" sources."normalize-url-4.5.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."object-hash-2.0.3" - sources."object-keys-1.1.1" - sources."object.assign-4.1.0" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-7.2.1" @@ -82011,9 +84000,7 @@ in sources."os-tmpdir-1.0.2" sources."p-cancelable-2.0.0" sources."p-finally-1.0.0" - sources."p-limit-2.3.0" sources."p-map-2.1.0" - sources."p-try-2.2.0" sources."pac-proxy-agent-3.0.1" sources."pac-resolver-3.0.0" (sources."package-json-6.5.0" // { @@ -82040,18 +84027,12 @@ in sources."parse-link-header-1.0.1" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-type-4.0.0" sources."peek-stream-1.1.3" - sources."picomatch-2.2.2" - sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."pretty-bytes-5.4.1" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-7.3.1" - sources."promise-deferred-2.0.3" - sources."promiseback-2.0.3" sources."proxy-agent-3.1.1" sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" @@ -82076,11 +84057,9 @@ in sources."resolve-alpn-1.0.0" sources."responselike-2.0.0" sources."restore-cursor-2.0.0" - sources."reusify-1.0.4" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."run-parallel-1.1.9" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -82092,20 +84071,24 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" - sources."slash-3.0.0" sources."smart-buffer-4.1.0" sources."snyk-config-3.1.0" - (sources."snyk-cpp-plugin-1.4.1" // { + (sources."snyk-cpp-plugin-1.4.3" // { dependencies = [ + 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."tslib-2.0.1" ]; }) - (sources."snyk-docker-plugin-3.18.1" // { + (sources."snyk-docker-plugin-3.20.0" // { dependencies = [ sources."rimraf-3.0.2" - (sources."snyk-nodejs-lockfile-parser-1.22.0" // { + (sources."snyk-nodejs-lockfile-parser-1.28.1" // { dependencies = [ - sources."event-loop-spinner-1.1.0" sources."uuid-3.4.0" ]; }) @@ -82134,7 +84117,7 @@ in ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.19.1" // { + (sources."snyk-mvn-plugin-2.19.3" // { dependencies = [ sources."@snyk/cli-interface-2.8.1" (sources."@snyk/dep-graph-1.19.0" // { @@ -82146,7 +84129,7 @@ in sources."tslib-1.11.1" ]; }) - sources."snyk-nodejs-lockfile-parser-1.27.0" + sources."snyk-nodejs-lockfile-parser-1.28.0" (sources."snyk-nuget-plugin-1.18.1" // { dependencies = [ sources."jszip-3.3.0" @@ -82214,15 +84197,7 @@ in sources."ssh2-0.8.9" sources."ssh2-streams-0.4.10" sources."statuses-1.5.0" - sources."stream-buffers-3.0.2" sources."stream-shift-1.0.1" - sources."stream-to-array-2.3.0" - (sources."stream-to-promise-2.2.0" // { - dependencies = [ - sources."end-of-stream-1.1.0" - sources."once-1.3.3" - ]; - }) sources."streamsearch-0.1.2" (sources."string-width-2.1.1" // { dependencies = [ @@ -82238,7 +84213,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - (sources."tar-stream-2.1.3" // { + (sources."tar-stream-2.1.4" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -82258,17 +84233,14 @@ in sources."thunkify-2.1.2" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" - sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."toml-3.0.0" sources."tree-kill-1.2.2" sources."tslib-1.13.0" - sources."tunnel-0.0.6" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" - sources."underscore-1.11.0" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-4.1.1" // { @@ -82843,7 +84815,7 @@ in sources."is-binary-path-1.0.1" sources."is-boolean-object-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-canonical-base64-1.1.1" (sources."is-data-descriptor-1.0.0" // { dependencies = [ @@ -83229,7 +85201,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.4.2" + sources."socks-2.4.4" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -83247,7 +85219,7 @@ in sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" - sources."ssb-config-3.4.4" + sources."ssb-config-3.4.5" (sources."ssb-db-20.3.0" // { dependencies = [ sources."glob-7.1.6" @@ -83286,10 +85258,10 @@ in sources."ssb-plugins-1.0.4" sources."ssb-private1-1.0.1" sources."ssb-query-2.4.5" - sources."ssb-ref-2.14.0" + sources."ssb-ref-2.14.2" sources."ssb-replicate-1.3.2" sources."ssb-unix-socket-1.0.0" - sources."ssb-validate-4.1.2" + sources."ssb-validate-4.1.3" sources."ssb-ws-6.2.3" sources."stack-0.1.0" (sources."static-extend-0.1.2" // { @@ -83489,7 +85461,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.745.0" // { + (sources."aws-sdk-2.750.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -84299,7 +86271,7 @@ in sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" @@ -84906,7 +86878,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.10.3" + sources."uglify-js-3.10.4" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -85033,7 +87005,7 @@ in sources."module-alias-2.2.2" sources."moment-2.27.0" sources."ms-2.1.2" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."oauth-sign-0.9.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" @@ -85220,7 +87192,7 @@ in sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-decimal-1.0.4" sources."is-file-1.0.0" @@ -85403,7 +87375,7 @@ in sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" @@ -85517,7 +87489,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."duplexer-0.1.2" sources."duplexer3-0.1.4" sources."emoji-regex-7.0.3" @@ -85988,7 +87960,7 @@ in sources."has-1.0.3" sources."has-symbols-1.0.1" sources."inherits-2.0.4" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" @@ -86040,7 +88012,7 @@ in sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" @@ -86136,7 +88108,7 @@ in sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-capitalized-1.0.0" sources."is-date-object-1.0.2" sources."is-regex-1.1.1" @@ -86215,7 +88187,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.0" @@ -87131,10 +89103,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.3"; + version = "3.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.3.tgz"; - sha512 = "Lh00i69Uf6G74mvYpHCI9KVVXLcHW/xu79YTvH7Mkc9zyKUeSPz0owW0dguj0Scavns3ZOh3wY63J0Zb97Za2g=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz"; + sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw=="; }; buildInputs = globalBuildInputs; meta = { @@ -87160,7 +89132,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -87222,7 +89194,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-4.0.2" - sources."diff2html-3.1.12" + sources."diff2html-3.1.13" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -87817,7 +89789,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."seek-bzip-1.0.6" @@ -87859,7 +89831,7 @@ in sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.10.3" + sources."uglify-js-3.10.4" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -87918,13 +89890,13 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" sources."acorn-6.4.1" - sources."acorn-jsx-5.2.0" + sources."acorn-jsx-5.3.1" sources."ajv-6.12.4" sources."ajv-keywords-2.1.1" (sources."ansi-align-3.0.0" // { @@ -88547,7 +90519,7 @@ in sources."run-async-2.4.1" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -88873,10 +90845,10 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."JSONSelect-0.2.1" sources."acorn-7.4.0" - sources."acorn-jsx-5.2.0" + sources."acorn-jsx-5.3.1" sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" @@ -89097,7 +91069,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.5.1" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."dtrace-provider-0.8.8" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" @@ -89273,7 +91245,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -90675,7 +92647,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."accepts-1.3.7" sources."ajv-6.12.4" sources."ajv-errors-1.0.1" @@ -90917,7 +92889,7 @@ in sources."is-arguments-1.0.4" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -91385,7 +93357,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.16" + sources."@types/node-13.13.18" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -91797,7 +93769,7 @@ in sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.6.3" + sources."@types/node-14.10.0" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -92396,7 +94368,7 @@ in sources."root-check-1.0.0" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51b07ef28c7..58d73d4b984 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20232,6 +20232,8 @@ in epeg = callPackage ../applications/graphics/epeg { }; + epgstation = callPackage ../applications/video/epgstation { }; + inherit (gnome3) epiphany; ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; From 090305169db02ff88493828fbeb6c59175f099c9 Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 24 Aug 2020 22:07:08 +0900 Subject: [PATCH 053/463] nixos/mirakurun: expose setting 'unixSocket' and improve documentation along the way --- nixos/modules/services/video/mirakurun.nix | 24 +++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/video/mirakurun.nix b/nixos/modules/services/video/mirakurun.nix index 675b67f6ebf..ce1dabe6bfa 100644 --- a/nixos/modules/services/video/mirakurun.nix +++ b/nixos/modules/services/video/mirakurun.nix @@ -18,7 +18,8 @@ in type = with types; nullOr port; default = 40772; description = '' - Port to listen on. If null, it won't listen on any port. + Port to listen on. If null, it won't listen on + any port. ''; }; @@ -27,6 +28,23 @@ in default = false; description = '' Open ports in the firewall for Mirakurun. + + + + Exposing Mirakurun to the open internet is generally advised + against. Only use it inside a trusted local network, or + consider putting it behind a VPN if you want remote access. + + + ''; + }; + + unixSocket = mkOption { + type = with types; nullOr path; + default = "/var/run/mirakurun/mirakurun.sock"; + description = '' + Path to unix socket to listen on. If null, it + won't listen on any unix sockets. ''; }; @@ -121,8 +139,8 @@ in services.mirakurun.serverSettings = { logLevel = mkDefault 2; - path = mkDefault "/var/run/mirakurun/mirakurun.sock"; - port = mkIf (cfg.port != null) (mkDefault cfg.port); + path = mkIf (cfg.unixSocket != null) cfg.unixSocket; + port = mkIf (cfg.port != null) cfg.port; }; systemd.tmpfiles.rules = [ From 36c16fa7e310af0c94aad4d5d438632057717cac Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 10 Aug 2020 23:45:08 +0900 Subject: [PATCH 054/463] nixos/epgstation: add module --- nixos/modules/module-list.nix | 1 + .../services/video/epgstation/default.nix | 295 ++++++++++++++++++ .../services/video/epgstation/generate | 31 ++ .../services/video/epgstation/streaming.json | 119 +++++++ .../applications/video/epgstation/default.nix | 1 + .../applications/video/epgstation/generate.sh | 8 +- 6 files changed, 454 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/video/epgstation/default.nix create mode 100755 nixos/modules/services/video/epgstation/generate create mode 100644 nixos/modules/services/video/epgstation/streaming.json diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c54bc6098d3..95314358e42 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -838,6 +838,7 @@ ./services/ttys/gpm.nix ./services/ttys/kmscon.nix ./services/wayland/cage.nix + ./services/video/epgstation/default.nix ./services/video/mirakurun.nix ./services/web-apps/atlassian/confluence.nix ./services/web-apps/atlassian/crowd.nix diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix new file mode 100644 index 00000000000..8d6d431fa55 --- /dev/null +++ b/nixos/modules/services/video/epgstation/default.nix @@ -0,0 +1,295 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.epgstation; + + username = config.users.users.epgstation.name; + groupname = config.users.users.epgstation.group; + + settingsFmt = pkgs.formats.json {}; + settingsTemplate = settingsFmt.generate "config.json" cfg.settings; + preStartScript = pkgs.writeScript "epgstation-prestart" '' + #!${pkgs.runtimeShell} + + PASSWORD="$(head -n1 "${cfg.basicAuth.passwordFile}")" + DB_PASSWORD="$(head -n1 "${cfg.database.passwordFile}")" + + # setup configuration + touch /etc/epgstation/config.json + chmod 640 /etc/epgstation/config.json + sed \ + -e "s,@password@,$PASSWORD,g" \ + -e "s,@dbPassword@,$DB_PASSWORD,g" \ + ${settingsTemplate} > /etc/epgstation/config.json + chown "${username}:${groupname}" /etc/epgstation/config.json + + # NOTE: Use password authentication, since mysqljs does not yet support auth_socket + if [ ! -e /var/lib/epgstation/db-created ]; then + ${pkgs.mysql}/bin/mysql -e \ + "GRANT ALL ON \`${cfg.database.name}\`.* TO '${username}'@'localhost' IDENTIFIED by '$DB_PASSWORD';" + touch /var/lib/epgstation/db-created + fi + ''; + + streamingConfig = builtins.fromJSON (builtins.readFile ./streaming.json); + logConfig = { + appenders.stdout.type = "stdout"; + categories = { + default = { appenders = [ "stdout" ]; level = "info"; }; + system = { appenders = [ "stdout" ]; level = "info"; }; + access = { appenders = [ "stdout" ]; level = "info"; }; + stream = { appenders = [ "stdout" ]; level = "info"; }; + }; + }; + + defaultPassword = "INSECURE_GO_CHECK_CONFIGURATION_NIX\n"; +in +{ + options.services.epgstation = { + enable = mkEnableOption pkgs.epgstation.meta.description; + + usePreconfiguredStreaming = mkOption { + type = types.bool; + default = true; + description = '' + Use preconfigured default streaming options. + + Upstream defaults: + + ''; + }; + + port = mkOption { + type = types.port; + default = 20772; + description = '' + HTTP port for EPGStation to listen on. + ''; + }; + + socketioPort = mkOption { + type = types.port; + default = cfg.port + 1; + description = '' + Socket.io port for EPGStation to listen on. + ''; + }; + + clientSocketioPort = mkOption { + type = types.port; + default = cfg.socketioPort; + description = '' + Socket.io port that the web client is going to connect to. This may be + different from if EPGStation is hidden + behind a reverse proxy. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports in the firewall for the EPGStation web interface. + + + + Exposing EPGStation to the open internet is generally advised + against. Only use it inside a trusted local network, or consider + putting it behind a VPN if you want remote access. + + + ''; + }; + + basicAuth = { + user = mkOption { + type = with types; nullOr str; + default = null; + example = "epgstation"; + description = '' + Basic auth username for EPGStation. If null, basic + auth will be disabled. + + + + Basic authentication has known weaknesses, the most critical being + that it sends passwords over the network in clear text. Use this + feature to control access to EPGStation within your family and + friends, but don't rely on it for security. + + + ''; + }; + + passwordFile = mkOption { + type = types.path; + default = pkgs.writeText "epgstation-password" defaultPassword; + example = "/run/keys/epgstation-password"; + description = '' + A file containing the password for . + ''; + }; + }; + + database = { + name = mkOption { + type = types.str; + default = "epgstation"; + description = '' + Name of the MySQL database that holds EPGStation's data. + ''; + }; + + passwordFile = mkOption { + type = types.path; + default = pkgs.writeText "epgstation-db-password" defaultPassword; + example = "/run/keys/epgstation-db-password"; + description = '' + A file containing the password for the database named + . + ''; + }; + }; + + settings = mkOption { + description = '' + Options to add to config.json. + + Documentation: + + ''; + + default = {}; + example = { + recPriority = 20; + conflictPriority = 10; + }; + + type = types.submodule { + freeformType = settingsFmt.type; + + options.readOnlyOnce = mkOption { + type = types.bool; + default = false; + description = "Don't reload configuration files at runtime."; + }; + + options.mirakurunPath = mkOption (let + sockPath = config.services.mirakurun.unixSocket; + in { + type = types.str; + default = "http+unix://${replaceStrings ["/"] ["%2F"] sockPath}"; + example = "http://localhost:40772"; + description = "URL to connect to Mirakurun."; + }); + + options.encode = mkOption { + type = with types; listOf attrs; + description = "Encoding presets for recorded videos."; + default = [ + { name = "H264"; + cmd = "${pkgs.epgstation}/libexec/enc.sh main"; + suffix = ".mp4"; + default = true; } + { name = "H264-sub"; + cmd = "${pkgs.epgstation}/libexec/enc.sh sub"; + suffix = "-sub.mp4"; } + ]; + }; + }; + }; + }; + + config = mkIf cfg.enable { + environment.etc = { + "epgstation/operatorLogConfig.json".text = builtins.toJSON logConfig; + "epgstation/serviceLogConfig.json".text = builtins.toJSON logConfig; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = with cfg; [ port socketioPort ]; + }; + + users.users.epgstation = { + description = "EPGStation user"; + group = config.users.groups.epgstation.name; + isSystemUser = true; + }; + + users.groups.epgstation = {}; + + services.mirakurun.enable = mkDefault true; + + services.mysql = { + enable = mkDefault true; + package = mkDefault pkgs.mysql; + ensureDatabases = [ cfg.database.name ]; + # FIXME: enable once mysqljs supports auth_socket + # ensureUsers = [ { + # name = username; + # ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; + # } ]; + }; + + services.epgstation.settings = let + defaultSettings = { + serverPort = cfg.port; + socketioPort = cfg.socketioPort; + clientSocketioPort = cfg.clientSocketioPort; + + dbType = mkDefault "mysql"; + mysql = { + user = username; + database = cfg.database.name; + socketPath = mkDefault "/run/mysqld/mysqld.sock"; + password = mkDefault "@dbPassword@"; + connectTimeout = mkDefault 1000; + connectionLimit = mkDefault 10; + }; + + basicAuth = mkIf (cfg.basicAuth.user != null) { + user = mkDefault cfg.basicAuth.user; + password = mkDefault "@password@"; + }; + + ffmpeg = mkDefault "${pkgs.ffmpeg-full}/bin/ffmpeg"; + ffprobe = mkDefault "${pkgs.ffmpeg-full}/bin/ffprobe"; + + fileExtension = mkDefault ".m2ts"; + maxEncode = mkDefault 2; + maxStreaming = mkDefault 2; + }; + in + mkMerge [ + defaultSettings + (mkIf cfg.usePreconfiguredStreaming streamingConfig) + ]; + + systemd.tmpfiles.rules = [ + "d '/var/lib/epgstation/streamfiles' - ${username} ${groupname} - -" + "d '/var/lib/epgstation/recorded' - ${username} ${groupname} - -" + "d '/var/lib/epgstation/thumbnail' - ${username} ${groupname} - -" + ]; + + systemd.services.epgstation = { + description = pkgs.epgstation.meta.description; + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + ] ++ optional config.services.mirakurun.enable "mirakurun.service" + ++ optional config.services.mysql.enable "mysql.service"; + + serviceConfig = { + ExecStart = "${pkgs.epgstation}/bin/epgstation start"; + ExecStartPre = "+${preStartScript}"; + User = username; + Group = groupname; + StateDirectory = "epgstation"; + LogsDirectory = "epgstation"; + ConfigurationDirectory = "epgstation"; + }; + }; + }; +} diff --git a/nixos/modules/services/video/epgstation/generate b/nixos/modules/services/video/epgstation/generate new file mode 100755 index 00000000000..2940768b6d2 --- /dev/null +++ b/nixos/modules/services/video/epgstation/generate @@ -0,0 +1,31 @@ +#!/usr/bin/env -S nix-build --no-out-link + +# Script to generate default streaming configurations for EPGStation. There's +# no need to run this script directly since generate.sh in the EPGStation +# package directory would run this script for you. +# +# Usage: ./generate | xargs cat > streaming.json + +{ pkgs ? (import ../../../../.. {}) }: + +let + sampleConfigPath = "${pkgs.epgstation.src}/config/config.sample.json"; + sampleConfig = builtins.fromJSON (builtins.readFile sampleConfigPath); + streamingConfig = { + inherit (sampleConfig) + mpegTsStreaming + mpegTsViewer + liveHLS + liveMP4 + liveWebM + recordedDownloader + recordedStreaming + recordedViewer + recordedHLS; + }; +in +pkgs.runCommand "streaming.json" { nativeBuildInputs = [ pkgs.jq ]; } '' + jq . <<<'${builtins.toJSON streamingConfig}' > $out +'' + +# vim:set ft=nix: diff --git a/nixos/modules/services/video/epgstation/streaming.json b/nixos/modules/services/video/epgstation/streaming.json new file mode 100644 index 00000000000..37957f6cb6a --- /dev/null +++ b/nixos/modules/services/video/epgstation/streaming.json @@ -0,0 +1,119 @@ +{ + "liveHLS": [ + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%", + "name": "720p" + }, + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%", + "name": "480p" + }, + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 48k -ac 2 -c:v libx264 -vf yadif,scale=-2:180 -b:v 100k -preset veryfast -maxrate 110k -bufsize 1000k -flags +loop-global_header %OUTPUT%", + "name": "180p" + } + ], + "liveMP4": [ + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", + "name": "720p" + }, + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", + "name": "480p" + } + ], + "liveWebM": [ + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", + "name": "720p" + }, + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", + "name": "480p" + } + ], + "mpegTsStreaming": [ + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1", + "name": "720p" + }, + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1", + "name": "480p" + }, + { + "name": "Original" + } + ], + "mpegTsViewer": { + "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end", + "ios": "vlc-x-callback://x-callback-url/stream?url=http://ADDRESS" + }, + "recordedDownloader": { + "android": "intent://ADDRESS#Intent;package=com.dv.adm;type=video;scheme=http;end", + "ios": "vlc-x-callback://x-callback-url/download?url=http://ADDRESS&filename=FILENAME" + }, + "recordedHLS": [ + { + "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%", + "name": "720p" + }, + { + "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%", + "name": "480p" + }, + { + "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_type fmp4 -hls_fmp4_init_filename stream%streamNum%-init.mp4 -hls_segment_filename stream%streamNum%-%09d.m4s -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx265 -vf yadif,scale=-2:480 -b:v 350k -preset veryfast -tag:v hvc1 %OUTPUT%", + "name": "480p(h265)" + } + ], + "recordedStreaming": { + "mp4": [ + { + "ab": "192k", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", + "name": "720p", + "vb": "3000k" + }, + { + "ab": "128k", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", + "name": "360p", + "vb": "1500k" + } + ], + "mpegTs": [ + { + "ab": "192k", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", + "name": "720p (H.264)", + "vb": "3000k" + }, + { + "ab": "128k", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", + "name": "360p (H.264)", + "vb": "1500k" + } + ], + "webm": [ + { + "ab": "192k", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", + "name": "720p", + "vb": "3000k" + }, + { + "ab": "128k", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", + "name": "360p", + "vb": "1500k" + } + ] + }, + "recordedViewer": { + "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end", + "ios": "infuse://x-callback-url/play?url=http://ADDRESS" + } +} diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index 6464effc560..e57f46c8c6a 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -42,6 +42,7 @@ nodePackages.epgstation.override (drv: { pushd $out/lib/node_modules/EPGStation npm run build + npm prune --production mv config/{enc.sh,enc.js} $out/libexec mv LICENSE Readme.md $out/share/doc/epgstation diff --git a/pkgs/applications/video/epgstation/generate.sh b/pkgs/applications/video/epgstation/generate.sh index 55dcf744c0c..d193a015064 100755 --- a/pkgs/applications/video/epgstation/generate.sh +++ b/pkgs/applications/video/epgstation/generate.sh @@ -17,8 +17,14 @@ main() { > package.json # regenerate node packages to update the actual Nix package - cd ../../../development/node-packages \ + pushd ../../../development/node-packages \ && ./generate.sh + popd + + # generate default streaming settings for EPGStation + pushd ../../../../nixos/modules/services/video/epgstation \ + && cat "$(./generate)" > streaming.json + popd } jq() { From 5bcc37d79ed3be6f1c6bc6a1d5df96753c4a625b Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 11 Sep 2020 03:13:07 +0900 Subject: [PATCH 055/463] thunderbird: 78.2.1 -> 78.2.2 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 7a10c7f1d2a..e6b279fd35c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -69,13 +69,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.2.1"; + version = "78.2.2"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "2iya9a5qaini524wrdrnxx6wsrgb8fa2b1m42mlypskxjjgb7n66vpxlbpi9x9mqzc63ca2ag36fjpbpsvbv5ppxvpfwk2j1zbfvb5w"; + "2cbpyx9jn23kc289z8ikzx3035g5z6p076izvld50mj3kqc0v4n3igih3rv1lsdwysik8c0ax5w3pa037lnrp6ridgbnix34gxr4nw6"; }; nativeBuildInputs = [ From eff618541ea0c404253871b4827c78c25a877942 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 12 Sep 2020 00:43:44 +0900 Subject: [PATCH 056/463] thunderbird-bin: 78.2.1 -> 78.2.2 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 86dbf80a6e1..a2ff6ce9636 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.2.1"; + version = "78.2.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/af/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/af/thunderbird-78.2.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "de73b113e488e76caca47b90abb4fa3f1c4d6ce04885d036f2e6aed81fe34038"; + sha256 = "12d8b417fe101e45460b66faa04e0c99bacd454b563c96b7bd7d5b77cabb8f2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ar/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ar/thunderbird-78.2.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "d6eeb95b1bd8e53663bd48570a0c2a03f570f906ca715ddf1d9f2cb8de37f3b7"; + sha256 = "1fa7a01cd370114ce9dc65c2d48e001d6969f953ba138fc4005329b2fce7f1fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ast/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ast/thunderbird-78.2.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "f244c41515a2382d15697a47b88781120c649e319d86a1c6350fd20cade25809"; + sha256 = "c002ba6b4cded5b085abfad61daccad36a7936af40eacf77e4378caff42f9138"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/be/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/be/thunderbird-78.2.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "188c8850324bbc04535d4a1dfe1ef1f2e52de8cc2e1df7432623f6afcf8dbf1f"; + sha256 = "17021647dd58eb851f99e8f63e9d4a6ec302a7a7a1f5a0e561fe96bc63abb5f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/bg/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/bg/thunderbird-78.2.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "3e7ab29fc795b577aa3bd2ac3df872c31a7ed22960e987d9bca6f348becb69a3"; + sha256 = "e813d46a0ba8dccec07a1bc5201da859a8c23b1cb9140420d902ed9f3fa6f7fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/br/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/br/thunderbird-78.2.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c1138c59275149aaa6071cf128e7b480b7f74fa0d8f237552a5c54ce1ae573e0"; + sha256 = "0bc12e80e5923271973a3037a26a2fd2702118deba326ab98a8a9d776d25c9ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ca/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ca/thunderbird-78.2.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4d18b0b11710ab3427bf917ebe17cdf5e98508f517cf5cc4c97822d42a019dd1"; + sha256 = "f8e6abea863956613d646af01ca09f53311e325d6006a28319cb3f9932a03eaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cak/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/cak/thunderbird-78.2.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "5231c3b6c9b57ab528905184b740dd23de470f8bc4814a13000c8fc1fe4877cc"; + sha256 = "c7603bc86b2d86a9ceddc55a44f9a8a116ec67d1b23ea659f705ad78ecfc02e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cs/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/cs/thunderbird-78.2.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "04d1614000f1854b5d82e0d1740beb43ed9bef440b43f7bedce32cccec48fd59"; + sha256 = "058405304cf6523cbcb1d217ebb393a66067b5cbf839d0b588930b59c828d700"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cy/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/cy/thunderbird-78.2.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0ef895fdc1878b77650846d2ea4624a50d06838a3c51a91523019bb4d00a1322"; + sha256 = "e6af1a50954e495bd3145513dd7b7c5b3129862cbe5aa2622229855133233e6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/da/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/da/thunderbird-78.2.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e909f7ba1890cebcac435c2cfaab7db1791785e6b5b1e8b205ee3b9962624c8d"; + sha256 = "39a61048e47af6d96242291581ca29d016f4b667ff373167e7de9d5629f4e4d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/de/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/de/thunderbird-78.2.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "cce1e0acc3c61a66e5eaa065e81e01edb298b6dbf07a2376bf5a96ad2c1e784d"; + sha256 = "9ab3e2dc60662d37ab7623fafc8dc586c9baa13819c753331539879463bd6b63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/dsb/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/dsb/thunderbird-78.2.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "a5acad173a15e77e21057e7450d997387f88a608dd602df7509fa13743758445"; + sha256 = "114cd0d19683c0b8c7a5ff0d258d2cf01304eb26f4c7dc466b895c460b129e5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/el/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/el/thunderbird-78.2.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "7cb4dd233037415d9de96e0c292bd0a288ea62bc875b79a138aaf9639a8f8896"; + sha256 = "011bb98710b5c6c371e122ada559ec010aa9b965da54bfbc73aef14681f39f97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-CA/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/en-CA/thunderbird-78.2.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "158547432a7f38ab87ac5334b891921ef54f199896fe459cf65c81344d900edc"; + sha256 = "ff39f524ffd7f455940df65c42a40c045cdae4ead311de5dae8c3d563e0e77fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-GB/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/en-GB/thunderbird-78.2.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "1f434d2aa74143eb8695fe54f031fdc7270b1dfe7365896b08f9a55c9dcc8197"; + sha256 = "ce353fc8e6e8e8d2ec1378f76879c0bebb55f867f39488fe48a1995685c85b00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-US/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/en-US/thunderbird-78.2.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f5004ba1ac64911aec7dec3ec60a415500adfb0bfd566197f0f4fb139c71ff2a"; + sha256 = "e3af4f4b1eaf21c3137047cb5190780fd51e4d27a620efeb6157ffab5ecca950"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/es-AR/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/es-AR/thunderbird-78.2.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "49063e6e19b9c4ee1cd63826fda1c969d9739759a57ffabba5e2f93fc11de06a"; + sha256 = "30ba14c91750200fc8f4bb8c031fc7b9ecd3efc2d658d9debcafbe8f4b44ad22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/es-ES/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/es-ES/thunderbird-78.2.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "216fe2514dc21190532b19af814b825d8a39c7dfe91a120848491f98c49f8ec4"; + sha256 = "0e3d5f0a0f6f505b52d958cf34f26ea98e716516a7f06664aa3806fb1ade55db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/et/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/et/thunderbird-78.2.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5a89262ffbdc536abf9d780d5d30ce7d0c626a4cf75bfe957689640f94323a34"; + sha256 = "32acee8023857d5ed54ceb72acb0f5a621ce1884ecf114760f670a3166e7eea9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/eu/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/eu/thunderbird-78.2.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "f59c050361c617e4b2ca92f8e7081a135e976bb99ea4b650b80064aedef2c698"; + sha256 = "8827e24c546ccf27c8a02e61794675e675c475a833621840152bc840964bce56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fa/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fa/thunderbird-78.2.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b9764595b4cb08584ccce801c08fa19dbbced21c3f89045800d83d531b0c825a"; + sha256 = "9b072f89cc4288443eb986cb6798d35e08ff003c73d0bbf54a2ccdfea1866d17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fi/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fi/thunderbird-78.2.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "98169b3018a61ae6c2303300c1942c7d1d14a5318147a08a883b5a7b7042eba6"; + sha256 = "9ba017f70955a1aa9c8ff2c94653be569ff0dcdd4784e8ea21e425e5e29140f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fr/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fr/thunderbird-78.2.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "49563e87d9543c52d33b7168c78adaab0483f14ceef22759541e927c13620657"; + sha256 = "7eea9eb22bd47467740e1fa22977dcddd326ca7e9ad7adc8cf7964b9db5da6ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fy-NL/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fy-NL/thunderbird-78.2.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "1f3444faf91c24f8608ec59a4f705b42c7520079e4ad6756e693e92cdc8b142d"; + sha256 = "c0987516569372c9f98d5c8b6b90ad9a1468c4ed8a4b543130a023c25affbeb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ga-IE/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ga-IE/thunderbird-78.2.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "28b27f73016f0a4d53a6c47248c26458ca2bdceb46ae231f16086b8cabed5210"; + sha256 = "344122ad4b549ce1610ce409e7f3ef2ab0144abb3c5ef1fe98a3e499ed292441"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/gd/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/gd/thunderbird-78.2.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "b81b247ebecd1727d27b64f96ba08b08cf59921e9b2e8ae732407b27e233c971"; + sha256 = "7dc155a4a6bbf1b92822e23a7454e6021a3aa29b807bf9fb16327ecfb627b68f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/gl/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/gl/thunderbird-78.2.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ea019d11fed7d87173b218d86fcee0dea7d4e20200bc73171fa8c1bc8f7288fe"; + sha256 = "c99e642618e273f96ef102bafd61c8bd10b626c3ee2d7072c1bb4264a9653fd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/he/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/he/thunderbird-78.2.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6308a7e4e2cc35e48bbd67a1a7b8ab37112f47ab228c703a6db681ac7af79cb6"; + sha256 = "bbf0acf24c1f8e14833b801512b57d80cf5a07662cbfec841a6b7fa3de6facfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hr/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hr/thunderbird-78.2.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "3fb27f1e001817260981567fdb9949ad2f34818e9c919bd16fa0e939cf993cb4"; + sha256 = "22237f9fa29556853af1d70343d6087f11b677a3648f521e215ffddf0a583407"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hsb/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hsb/thunderbird-78.2.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2240e34fd713b39b410b584a8a6d06525f6abe0db2ee7b76b740a7252ec85e36"; + sha256 = "2ed485f1cf5e431cfa561bd266624fdf7e14c725e36fa89f653f71a4a1249eda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hu/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hu/thunderbird-78.2.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f303a1f1219c7b23d71471a00174e6084cee3773af72e855faa63a5384b08aee"; + sha256 = "8e3b4ad2fdbdd5f84be3a8c77e8c0f4ce09449190eb0d54fe693f5a619d27562"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hy-AM/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hy-AM/thunderbird-78.2.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "3e74775e459ebdca2661e2e2f55307429dcc4d4a6623bbb8447946a75c94dd20"; + sha256 = "bdd7a97b027d30804b60d86559b15b0bfde2f688bc166677d3762887020e2a1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/id/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/id/thunderbird-78.2.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0c9baf8cff28193f774e13c3a49cfd0ebcf27d8ef73ade151d2371ea69cbafac"; + sha256 = "259e8fd126c426d8c5bb7c120ccfe28d41183551f41d49f20767e98f8f28d728"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/is/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/is/thunderbird-78.2.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5c505948333d9259d87aa5f2b53f33ade1bbbfd29b9d5438c2688d34891e29bf"; + sha256 = "1c74ec8e38bad9396faac387321608efb3463f539a91782db620ca73dfb26efd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/it/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/it/thunderbird-78.2.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "a99896e8ccf8d01099834ee502601cb9de993fd7101e426cb87c240a744f2f88"; + sha256 = "659fca198575c52c5d90de4456368ea995b2e0dbf7dcb7578e310457142a2421"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ja/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ja/thunderbird-78.2.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "83be10be5e946b785ac61e9a51c7054357c69af0a8e7bca524e27961dea4eef8"; + sha256 = "b9464e9364241e94f4e40286f1b0ffdbeb392d9986b9a9cb18c41f5b96baac6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ka/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ka/thunderbird-78.2.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "585a1d805663225b1c154e27b54aa1aa5d8a1b96576c0f8ea36bde7844921474"; + sha256 = "7c73eb7efdca2e7648383c25ec3d0e2a4250b87908c9644e220eb16e1f5a0219"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/kab/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/kab/thunderbird-78.2.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "85128be7e4c28a526d0a395e38e86e5e85dc6c154be6b16fb2df6675effe3d0d"; + sha256 = "d4d44ccb61058423ed42767d519215bd169dd022d8aa460df7622091522300dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/kk/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/kk/thunderbird-78.2.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "09538c022bbcfcb2a77a7ab11b5569eb56b483817d199cfd0ede68ad556601d0"; + sha256 = "3b8af8f7eed6da665baf1ed477d5f5f1b797baf8c63f3af6ecdc257d66e446e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ko/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ko/thunderbird-78.2.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3e6f472e69d40d46f388096e1d13bc6735860021fc655e3efd4e5b93b1a83240"; + sha256 = "4129db882fde4040e1e87b4aa724b055dadeee98c46e201d24e9f485f3c2b31a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/lt/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/lt/thunderbird-78.2.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8b85c0874306afd3a39d8cf851d378f5f1bfce74129b16b02230c516001adc92"; + sha256 = "fb1d9fc89edbe4434ecfe18d7ccdeb33c4ced3ad5adb1853baf5b115a784a120"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ms/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ms/thunderbird-78.2.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "b14e7baa06a2d4f98313a7f363b0d998f902164abad13a992878812cc5a0b6c3"; + sha256 = "b6498d8ba9fbf63cd61cc968f375b0ecc50e3fadff993fa5070a249b679855da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nb-NO/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/nb-NO/thunderbird-78.2.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c3718581db153ad8b171b3c454e9d156e3d55ff0969217ac36435d13ac0c7c3a"; + sha256 = "1d931fad5ca59c3eb29cb8155cbb15a578de28b365cb680e6aab3dc51274078b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nl/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/nl/thunderbird-78.2.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "802417acdc722e34c21936f840cd347ae86cf5ac8ad2ae05bd1e1ae078c4518c"; + sha256 = "1378867782f5e0b9cb9efbcc78e5ce9c28d89baca0f353a027fc6878cbb6de58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nn-NO/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/nn-NO/thunderbird-78.2.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "5034f1fe526cab8de8091d5f20851a678e742ed37fa80e8491f3891ed89c43a8"; + sha256 = "bbe5f3cc81eac55401ac4a3a2498906077b1e831d369f7f40a4ddca4dfc146bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pa-IN/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pa-IN/thunderbird-78.2.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "01ae1e84d990433b7cbb12dc637deec37b32998803cb60f5834d386e080505f7"; + sha256 = "ea617550d8e2aa0b99d81ec8e39c587194a0b7978b3444261caf12fcc7a5b172"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pl/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pl/thunderbird-78.2.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "84b877dba77c8be4400f4fc76128a85878781c4d8ff7845d265225211092674e"; + sha256 = "84b15d310cb1fb7217f21891ee24654b13effa4f004315811d3bb221a8fc54c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pt-BR/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pt-BR/thunderbird-78.2.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "4daabc0cad02b878d8e17af4402b6b52fdd7783f89192909a43bed09f8aae196"; + sha256 = "2e5682b09d8c6f6d260dd47b2ac7ab0f710103b0b28755c58375ccb132aea464"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pt-PT/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pt-PT/thunderbird-78.2.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "6ce92a7a1ea62398d22ee4e4fbdc383daa5d35d38c83cf1852953757563d17ba"; + sha256 = "8a7f90d4ce1b9bdc2d117fabd19fd4f6ca362b89138c5470f7d76f7ec456df54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/rm/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/rm/thunderbird-78.2.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "d876eb51534d8a5796b486f22f9602bcb9c4cd9c99042583f95c4464f7ee99f8"; + sha256 = "c5a04ab8644dea990c938ab462eb8610471de524f78e09a2293ee9c79260339a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ro/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ro/thunderbird-78.2.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "ab4bfaea0914401188d486554963c9ab3014237e7116afdf274dce6e55725cae"; + sha256 = "84b555842d0502dffa99e388bcc6d90355ac4731b66876c279c84c8735a78fd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ru/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ru/thunderbird-78.2.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e722a13113896bde97dd72d0c7182c26734d7d546d8fe210bbce900854ac925c"; + sha256 = "d5bdde6bd4e155d78ef4fbc91718468406afc3888a80ab751647163aa087bef5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/si/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/si/thunderbird-78.2.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "595588d25de16c3781c85a9ed5e3c767d4df85f0820d4503770468b1669e9411"; + sha256 = "0311422b20df0b1081e889aa6301bb8930accd1c5b9b2e0e9850f4565f0ac5c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sk/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sk/thunderbird-78.2.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "f30929cad216539754842c0d938b4d5b8ec5f4e813b3ff0d5108d9c4a0fc6df2"; + sha256 = "b91e58219d46ab7770958ec34a54323b5f7af0cf2548be93de786b76fa92db45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sl/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sl/thunderbird-78.2.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "65d716b3fb5cad93d17704b62fd035a86ef6838cfff6ad95e571cedbb9e0974d"; + sha256 = "e993d4c974b00452696dc68037537e18c550c3b6a634cc2da3cd28014594934f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sq/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sq/thunderbird-78.2.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "38c652f6aae768ab7a8b0c1e975c676a3724ae22f5f7e3ffc6224ee032a9dc47"; + sha256 = "6b18bc35ad9127b6fb149aa71b7e93b556506820e661ddd3a1b9ab298c56ae14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sr/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sr/thunderbird-78.2.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7f73bcc8efb4452fedb0f9707c5e2b1d0db936fda4c6b9582207043aeddf8747"; + sha256 = "8fee447a4212f399645923c35de17d882a815adb81bd0b11f9fb1869b5dfaf39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sv-SE/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sv-SE/thunderbird-78.2.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "221974d62563b49f6c030b7a1f6307a71e60ce2a0e107b551363621320bba485"; + sha256 = "2500816667416a3e4af77098451b98b3e975a1f30e3f393c4e8ebf36ca7495bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/th/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/th/thunderbird-78.2.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "a8641ee0dc5bcd40ec84a4d4640e74e44710b5ac10d629ea0dd42ad2370e8d3b"; + sha256 = "b035f9424db935281a57a181ac1116e8fa137c27a31b9bfb515bb3fef4ca4c0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/tr/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/tr/thunderbird-78.2.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1d80d967b5ef98f0e642390c55618d454f2d82acec36bfd56db21e872490ff66"; + sha256 = "c1cd6f9a2ebe163b8de18d26ecef4fe4beafe8e7212365c2aa71bba3b9fe0967"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/uk/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/uk/thunderbird-78.2.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "fcc24a9885db5511c0b2859e6472d436769da2670573177f7bf332fb363a3ee3"; + sha256 = "de843a0f9c09bc9d37b5d1bb1925075b80efdbe678f5009cd237cb91bc423b55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/uz/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/uz/thunderbird-78.2.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "b0f62e8fc5c6da398ad2e1a3488ddb37f0075c90ad54e6028293be7cfcd2f6f0"; + sha256 = "770bfd792effc548a619deeb0385f9c8cf6475d1233ce79e83028cfed8e41859"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/vi/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/vi/thunderbird-78.2.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "0e38a1b645894ff81a481250ed434157fa2b70792b423c31dab61288612a82f2"; + sha256 = "8183106b59c8999dc3054ead72dad3a14eabe3827ce3211278a35b20656efd62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/zh-CN/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/zh-CN/thunderbird-78.2.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "04f37793bd17df88573d9d3f8c8412c26cfb3332395689a06f5fca6efb02b2ad"; + sha256 = "c35ec93bd0e24f2cafb6948546a46ccde62677e6f73e2afa1e378ed040582544"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/zh-TW/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/zh-TW/thunderbird-78.2.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "6c1e5b71bb2a9e005971050c9643c52090828e1ecb3910d66d2d0dbaa107011c"; + sha256 = "444861cc1fa351dce587725d67eec87eecb56a581ce94f812ccd4dbc4ae198bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/af/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/af/thunderbird-78.2.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "2601d98ad27a2ed7277f673876c2a7d206fe1cfd8c7c8febdead85884031a416"; + sha256 = "05eb2e50d4129c39eb28e22f7b3922868d87d310261b765a4a2c721c4ed7c04a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ar/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ar/thunderbird-78.2.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "5d126b1152b42b6bd6c29ac602b59ab88f3491b0b6f2a69aa1e6ae3d9ded04d6"; + sha256 = "264e3f57fed68ced27fb89bf8a1e5b715c465fc70a6fbaf8f161e69f80f46c68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ast/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ast/thunderbird-78.2.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "7b22fbd980df00d6b1a2c0f14d68a3a7daf06dcb6a13033ca2619371b098445c"; + sha256 = "5bfbefd9be834682cc144c063f6bffd56a09d2ea7ec9e83f78f0e984350a4006"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/be/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/be/thunderbird-78.2.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "bd59d2a9e70944a736e8e5db100b2cbe937fb8021577fdd912087e2cbe38723f"; + sha256 = "fa1b7c0432320aa293f89529f23321066e2c4e0e474313d267650bba8b39ed90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/bg/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/bg/thunderbird-78.2.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "ce3906cafce8ce00c4b69f2b1b584f7e4148d2d40ac12916f1108f78d7d3cdae"; + sha256 = "1d3f1a298d6ebda804e0aa2a9ad5491c0211dae96ec96e16a8816e5d3e202f63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/br/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/br/thunderbird-78.2.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "2f41237e0dd3dff4e0e4b196f8d02b988d7e5db3ac1984ea5577ce5052d43514"; + sha256 = "d7f71155d8696d9c17c4cb0e66b987652815761137578819fb4a137c32170347"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ca/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ca/thunderbird-78.2.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "0ec94acd77cca38d37dd23fb240c3c9e3840defccb491704d01072c1cab1f543"; + sha256 = "44e651bcd4010a00212ea3e295cc6e3e6e7de9e118078d5631c59158a132126c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cak/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/cak/thunderbird-78.2.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "1c77ebb51a83c57c7d81ef278f9fceae07f98330a8ccf8f863c2f0b613141e23"; + sha256 = "8f7849d17ae9a0d7f1b85b128a542d092c49b2b552369ce7de70ed108e4dc07e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cs/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/cs/thunderbird-78.2.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "adf8c11ff60e697fc5087698088c42c95a15766ccebf24d77141a53dc255c366"; + sha256 = "0426981c8c381227ec2dd19b59cc2c3a62b91f26541dbb8e57bc97b8f4cf3578"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cy/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/cy/thunderbird-78.2.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "9b7c51652714c116c9bb22fab4f0fc6dcbce6ad2133cc860067898841d01b5b7"; + sha256 = "12629cfeafc74a979a621c0c8f4ebee0aa6f35dfd6fbda8a59f26e0a63311c17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/da/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/da/thunderbird-78.2.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "e7245ea0909efccaa9b94701061410437f16273c935484dd3638f5f4fa65aad9"; + sha256 = "b280271248e99a68c2d38293275fb7ee5631bd96e7a2f67c96c60280e5148f13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/de/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/de/thunderbird-78.2.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "302394d24f919b0a24dc574001458b265bfc90024bf21b3d98a43b31ae50adf7"; + sha256 = "1caeeaa0b096378b3cab2e41d832a5c60da4e0a3cf9f84230bfe65edde106536"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/dsb/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/dsb/thunderbird-78.2.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "18ea8d27387581d49dd156957a089f1dbbe05f2772811aeddb1ebe81d26961e6"; + sha256 = "d1822f534ee3d2e95cc412a7f51eabcdf3f56955650da8806f4acd5e48d19d83"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/el/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/el/thunderbird-78.2.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "bcec06d4b01268ca90d99a98a45c2ef5927ae4152b6b2d356332f3690de08f62"; + sha256 = "7ec20a9b566728041394245ef5875be10b70fd04a58419fdf2150168aa86abad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-CA/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/en-CA/thunderbird-78.2.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "475a1393917665c17bc5e787ef29dd886f1480d544f55d1caacb2a89503da685"; + sha256 = "62f31fd438ec2e33d5a1d72c57769cea3323d318ed8ad82ebf01050f4ca84fa2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-GB/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/en-GB/thunderbird-78.2.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "dda5664fd8d843f3f29b85b855d54e00d15188c57e80c01d79a8be0a2eaa0be1"; + sha256 = "e857efaa39cd409de86be87934896ecdf82d4e74dd615022995f708d18119a9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-US/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/en-US/thunderbird-78.2.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "b299267b8a113dcd325bc6a928c561fe872535e1e876518e3075b85043aa7b23"; + sha256 = "54589215c44e291a11e2cb2b2a3de682d4c48367fa8bdac59035b550a07551b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/es-AR/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/es-AR/thunderbird-78.2.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e3e7cb829b07b7db95cad09c8887b9c91123665cd4601b685e3c7a7b0036992d"; + sha256 = "b4075d697d141aa13cbcefce1e7082752588d2fc3ba00074550d6e8c1156c5d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/es-ES/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/es-ES/thunderbird-78.2.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "be8428e1cce22aff5000bdc11f632adfc4c1096060a7456d36230ebd6040d12d"; + sha256 = "7d5f59720037153e0fbf059b0b8aea0dbb5dd20f616deea7744de87ab183023d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/et/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/et/thunderbird-78.2.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "deb81a63704b12ad2a945f5f0dcec878c3b7ec46f551f2d0122c03c52c031f73"; + sha256 = "9c999d231cb404fcaf3614483e6c74801cd52f9c2ba7988cab50e1d690bc3551"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/eu/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/eu/thunderbird-78.2.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "8a2935dd5f83854b4d98bdab67e7b376a7e1d19a2ff790234516ba8211ed7345"; + sha256 = "79a74421f364e5d9a5db182d54058eb6c243418a1960b4a653f554584ecd05da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fa/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fa/thunderbird-78.2.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "c39189bc1f740a1e5a372eaf3c6e99090f04ed8b1e86016c54ed25612d16f341"; + sha256 = "db6835853ceb2f597330c9e65c09df48ac308ab01d7320006b9943e3a10b471e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fi/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fi/thunderbird-78.2.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "4f23c9941975e67e6e40d7a504a24e4058a27786c5989dd3e25cfc4fab4c4c0e"; + sha256 = "e96ea32da9cfd941b037d0a6bf95d4a293be6f3f9800e4008c62088f06bdcf6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fr/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fr/thunderbird-78.2.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "4de9885664bf4828355d09ceae11fc7cfb603d4514255b4de464c0653ddd45b0"; + sha256 = "dd6dacbffa7968596666615f52cac80e776f75b4e1943e218856ab80f902f950"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fy-NL/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fy-NL/thunderbird-78.2.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "82ae68d970a02ad57aa9c3dfb6c1ef7783c25211e9228c0bad515c3fef385f88"; + sha256 = "ed009214b863fa44048514870f835682944df010fcd5e1e1c149ec544fbfdaa8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ga-IE/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ga-IE/thunderbird-78.2.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "e6035d81bfa5c58ab79e71b9895638f23e47e8ab2990794786c5e9f590bb70e2"; + sha256 = "fad826ef9820facc37bbd278c2bed11802f6b44b70416c803dc6b8fe50220c6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/gd/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/gd/thunderbird-78.2.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2c628c5ed8ad0c00c42b384f8b925887e624f6a6dee69c86800a9b5137f04886"; + sha256 = "cccfdd4c3170969ca3f47c0a8398a257650fae0c64ecc375ab044eef969bfa8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/gl/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/gl/thunderbird-78.2.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "49b8e22610f8e602a3870f541209251b61da8cb81df7f0a762d01002fef568e2"; + sha256 = "dd40efa2751705b0f023a98c01b030c04eb6101fe43062b3607421b1efc462aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/he/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/he/thunderbird-78.2.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "5bb7193eb498d1edd713e18bbac630ba881b0a9b7fca9b05c9b8e4dd1ea1edbf"; + sha256 = "ff94efe5cd1fae04401d3d6fe364c309c24424c54b0e3787ad080ee1f468443e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hr/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hr/thunderbird-78.2.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "c31022ae9a1665cc0b22ab0e911730ccf5cd0dd24614fbd8d3bd51624760baa3"; + sha256 = "4109b3a8da687d2c4b8e9f6539f40e51475b43243ff1fcb19b78b5d6f6d7594d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hsb/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hsb/thunderbird-78.2.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "3e286b3ccf66300ead4d6b98a88a370fa1bac96244b143005c4974f075ceca92"; + sha256 = "58fd8901df13d7f7fed552326553ce632d36d07f1a0eed63f1e8b671cf519e5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hu/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hu/thunderbird-78.2.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "6d0c88c46d0f4ffb296638e4e8217041d8fdaec3abaa6bda7b7cf97c4bcabc2a"; + sha256 = "5145b3b137f6a905721a0cafe7b574b66f70891e75187fa082b852b67e195f03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hy-AM/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hy-AM/thunderbird-78.2.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "aac23dfa8c299623bca2e3b0501a636c630fbf3f5b08689911569a568b3ad060"; + sha256 = "7c1e163a78dc5a0791a4a5a730a3ec9d58f24619f5274ce4d4b0197ca4936e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/id/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/id/thunderbird-78.2.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "5bd5597cb6e91613a39c288d694f3af4f5686dcab1573e3b58c04dce3d1de865"; + sha256 = "57254afb187662b15338b0133afa378432c9018af4d843ea2f81c1ab40ab4940"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/is/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/is/thunderbird-78.2.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "bcd926c704177945aa7b917fe12940e058d12e6cf8a3eedbf1ab205fb9c41b80"; + sha256 = "ca0066237afa76925d294eb714bceeb7aaed0a512b9320ace604fcbe2d443f2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/it/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/it/thunderbird-78.2.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "04ca02a4fed6e8d904173d9ce52c16e47d7e9b3d16f5483d986f8188ec79d65c"; + sha256 = "5c29da94a9408220824f4ab11a0f4e46bfa38230eaf1fef266372620ad9c4220"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ja/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ja/thunderbird-78.2.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "1dbdc30ec3a06f2e7e7d38d9036fb90a2fdaad42356e9386ecc710d9a51f94b3"; + sha256 = "ab4685eae09e25018ab2a227d13642a47a0c0e8e6258975967449754bc16697a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ka/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ka/thunderbird-78.2.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "2db1fa86ac87e0b8001b99c0eea30589db515c58e10548565533014481b1be9a"; + sha256 = "152394685517d4e3e2ddb39ac6e297d14b4ead115ead325175797bf85d88bedd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/kab/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/kab/thunderbird-78.2.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "8499d0d8a0372617800b039c9198cc372783b8ff4ce385fc692e39b1dca22576"; + sha256 = "2f3e1b7db83247add30da0372d1c1c125231e689b5005ed5a06359a02aed4180"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/kk/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/kk/thunderbird-78.2.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "29b228042a7f06c22300b123cc0fcdf7a86005d0d4c3c282c97635ebc25ce826"; + sha256 = "d0d2caffb144d6f64cd73780267cea99dc54f4ae63a0fbcb5a86fc917674d0c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ko/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ko/thunderbird-78.2.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a7af79975107cb32b408c7dd26827793c3c11f998705bc711c60f3dd6b7a1173"; + sha256 = "f42bda1eb1f4a422d4f60345c7e6cda1b7bc57ac3d0899ab32fac16b394e4953"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/lt/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/lt/thunderbird-78.2.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "7a5010761d0af24a6852f32b1ebd6b543b1e1011888ded3f4a4297fc35f455b5"; + sha256 = "da55137e808a9c64cd6534afe8579b9077b3cfaccce918fca34f07ae2d74e6d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ms/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ms/thunderbird-78.2.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "8573dc35bd69ff20d05aa06484a2243f5a35ec78c1c31dbccc067f0cb9e6617a"; + sha256 = "65a44f52ae326b7ad777f4e66d29825f3cb7aae5e18e2c645b5889d664889f2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nb-NO/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/nb-NO/thunderbird-78.2.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "722c0a4ce2a0d774f8971707ff553d9f2e62af10267ef491e670b020a2d8a49c"; + sha256 = "6d3abd2b862d3fb1e0285eb6851388a079c129d3132865eb424191f8064798c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nl/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/nl/thunderbird-78.2.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "63a08123e795ab8e51a2c98f33b0b6424c1f5f2c09a5d1683585f9762813afaf"; + sha256 = "90f78511b8ecee01c8e441c4c18cb1b40f7f9e2de0350be365dc317d8c06415f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nn-NO/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/nn-NO/thunderbird-78.2.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "8968de35faf9fe304631ece4e08a9944342a08dc518ac1eec0ba2d5c1ff268ed"; + sha256 = "2ec0103d3a89c3a57731542bd82e28e0da0b54c62ee0ab7755e395d991dfa5c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pa-IN/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pa-IN/thunderbird-78.2.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "57685a05321195019ef4d3c489dbb14ac0f1bd5ce51fda1f7573392de215e4e3"; + sha256 = "d169f161bdb32a2ce6e25df9d5a643de9ac4e1345dc90cf1a54560b12bfb03ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pl/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pl/thunderbird-78.2.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "d98967c9d54f9314faae53472b9d1506576761cd3de09747d3b407e1f26931e4"; + sha256 = "5e7fbd12291d16f98f996eb0d3660902c9cddf9849e7082a1963b73afe0e4ec2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pt-BR/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pt-BR/thunderbird-78.2.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "14fa89b2d8f659a90e19068130ce1a2da83137b7fb9a5a009d2363ccc2415009"; + sha256 = "eed9d4a6378496dac0fefdf70f3c2f98d56c4daa1300bc041a3974d03303a0f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pt-PT/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pt-PT/thunderbird-78.2.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "279f325e75157e0cedffe6a455e731373b077078f70b89bba76e12e2439350d8"; + sha256 = "7fef461f1a2b0239c2825a9fdd2dc5237b5b5b0cffa0c9675451449a9e69372c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/rm/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/rm/thunderbird-78.2.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "7432093e7516625957c3dcb90e8668fab1e22c0edba0411e3e2106d49e052fdf"; + sha256 = "f3cf46324d1f1e5ab7e858fb3f203ac6762ba98986f510486146fb745535123e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ro/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ro/thunderbird-78.2.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "f5d5f564cf56c66d1f2f9717df7c7f021532dc1912384c9921ca286030f7d82c"; + sha256 = "921285ad32ed408229b07d34d358cc6dd78bc519cb60370fff01525a7cb0e96e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ru/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ru/thunderbird-78.2.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "4c4e31e74c4d10d88044fc49c24b3ae3ffb0b18e4a23295b60ac2d38d723753a"; + sha256 = "37f28db57fc4d101df92ff5f2ca1ed800de35ecc6b3b00480bc8ee67805f47d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/si/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/si/thunderbird-78.2.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "689be324633f6a872a09d6498d8772562dceca9bca96f7029830c965ad2e4138"; + sha256 = "96d2ff616eae7bba706bd3af8fa5de0dc2444c0b57b612775e61b0e23007404c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sk/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sk/thunderbird-78.2.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "194ff5a23a3a40ba98fb1968965c79f99246c6d93b81254d11df5d22530f1d86"; + sha256 = "5f3ba3d2bcf1437373df7553dd4296511ea4845b87e0c02e7714f9838cadf281"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sl/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sl/thunderbird-78.2.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "9746db435fe3dbf5ab51603780d52862a6afda0e40c1ebc915b309ac93e75e25"; + sha256 = "f00c798638bc88a107f4ebb0feb0156f2d7667a040ef8fe9104340997df83741"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sq/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sq/thunderbird-78.2.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "86f675921cdf0de41855d5e2c3d2d56c163d915ac8a0f8cc9678d1a55f87e069"; + sha256 = "42e2fb9ed08ce138d50e0fdddfc67d9feccbf6e5aa4cfd50d81f2ed493cb2dee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sr/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sr/thunderbird-78.2.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "587e4c867dd43621c8e5e04461c4a2dcf2b0f256476b5b72d8fc6722e573e347"; + sha256 = "72dc5e5f0024c17e4e1b30b3990d1cd1f1fd240da5c32ca4ddf2737290fa4bac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sv-SE/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sv-SE/thunderbird-78.2.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "a46294d3dafc8bfaaa7f5376c2db2402f31f24664e73045c653ea8660079b879"; + sha256 = "2f3c882db2034adf74d638fc7a6055bb421fe08f890ac6d3c89433a818b06ca3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/th/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/th/thunderbird-78.2.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6105278c11c3e586240d50c9612730e75caecd08765b5b5cfe010f37d71c971d"; + sha256 = "3830e09d6aab98fddec1e60fea92ec3c5ba51dee63225c219010a37bc80f633a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/tr/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/tr/thunderbird-78.2.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "4bdd2c91e8f361d1b2ade88cec06accb244adf3d7f1d714feea3e4004ed31968"; + sha256 = "bdf2cf1a6a0c6cb8ae6d598adf30d84d1f43f399a2135cb041a17329fab78f73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/uk/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/uk/thunderbird-78.2.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "40e2012a5b5dc05cb887a6c4cbb0c8f7bbc25cebd2de1247e5e8dc355cad78fe"; + sha256 = "4bd587d7bfcd2ec6bc7516b48199c92dac1f6feac4c66779cae231a7fd436df3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/uz/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/uz/thunderbird-78.2.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "15f4aafba6b2bcb102683d9a665d208ab21c5767cf6d59c45d996fa26ef1e12a"; + sha256 = "5326d6b4f0dc90925bd26c3300ab5441a0edf706229cbde7121cfadeb6b1457f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/vi/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/vi/thunderbird-78.2.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "32640a1c8e42cc79774a3b75539010dfb65e32c703992001eb03916d4fb46e91"; + sha256 = "ea8db723cb46c60182c4fd557fbb72872cd112c707af66fae20b59a50c595d80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/zh-CN/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/zh-CN/thunderbird-78.2.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "09b52b6ebf0033738444bacfb53b84b1c98f7d3e10b32c001356083afbe4e89e"; + sha256 = "f2d5b1463c426dad638480782473442b6208cefe8fdd0eb74a6e01f75fbe6a52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/zh-TW/thunderbird-78.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/zh-TW/thunderbird-78.2.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "606e416a158023f674eda141bf67f9b3956e3e231ba85605173d73cad0d22a59"; + sha256 = "3a0bff43f1b6b158ee8f5a80e5457fa17da09ba2270d84089a948b677f228ca7"; } ]; } From c1e96ff74f8abf0453f76bdffc827f15c887190d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 11 Sep 2020 18:20:35 +0200 Subject: [PATCH 057/463] release*: Support nixpkgsArgs for all release-*.nix files This is a bit dirty because there's no easy way to propagate these function arguments while still allowing --arg from the command line --- pkgs/top-level/release-cross.nix | 4 +++- pkgs/top-level/release-python.nix | 4 +++- pkgs/top-level/release-small.nix | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index af4dab5d263..df476db0a7a 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -5,9 +5,11 @@ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] , # Strip most of attributes when evaluating to spare memory usage scrubJobs ? true +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: -with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; +with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; let nativePlatforms = all; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 8b7240e21a3..48541035604 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -5,9 +5,11 @@ { # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" ] +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: -with import ./release-lib.nix {inherit supportedSystems; }; +with import ./release-lib.nix {inherit supportedSystems nixpkgsArgs; }; with lib; let diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 7f84f02f006..41aa86a8c46 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -3,9 +3,11 @@ { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: -with import ./release-lib.nix { inherit supportedSystems; }; +with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; { From fa6064ad86a020f52a75219bff044714f2a9ebbd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 11 Sep 2020 23:36:10 +0200 Subject: [PATCH 058/463] top-level: fix nix-shell eval w/nixUnstable For a full description of the underlying issue please read https://github.com/NixOS/nix/issues/4003 --- pkgs/top-level/impure.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index 3ba6c08a140..88440f711d3 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -81,7 +81,7 @@ in # not be passed. assert args ? localSystem -> !(args ? system || args ? platform); -import ./. (builtins.removeAttrs args [ "system" "platform" ] // { +import ./. (builtins.removeAttrs args [ "system" "platform" "inNixShell" ] // { inherit config overlays crossSystem crossOverlays; # Fallback: Assume we are building packages on the current (build, in GNU # Autotools parlance) system. From e2fd022d633127cf9349333ad40e507387a859bf Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sat, 12 Sep 2020 09:10:06 +0200 Subject: [PATCH 059/463] nixos/spice-usb-redirection: init Fixes #39618 --- nixos/modules/module-list.nix | 1 + .../virtualisation/spice-usb-redirection.nix | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 nixos/modules/virtualisation/spice-usb-redirection.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b516b178519..c7343e47ead 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1026,6 +1026,7 @@ ./virtualisation/podman.nix ./virtualisation/qemu-guest-agent.nix ./virtualisation/railcar.nix + ./virtualisation/spice-usb-redirection.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix ./virtualisation/vmware-guest.nix diff --git a/nixos/modules/virtualisation/spice-usb-redirection.nix b/nixos/modules/virtualisation/spice-usb-redirection.nix new file mode 100644 index 00000000000..39bfa0e6047 --- /dev/null +++ b/nixos/modules/virtualisation/spice-usb-redirection.nix @@ -0,0 +1,21 @@ +{ config, pkgs, lib, ... }: +{ + options.virtualisation.spiceUSBRedirection.enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Install the SPICE USB redirection helper with setuid + privileges. This allows unprivileged users to pass USB devices + connected to this machine to libvirt VMs, both local and + remote. Note that this allows users arbitrary access to USB + devices. + ''; + }; + + config = lib.mkIf config.virtualisation.spiceUSBRedirection.enable { + environment.systemPackages = [ pkgs.spice_gtk ]; + security.wrappers.spice-client-glib-usb-acl-helper.source = "${pkgs.spice_gtk}/bin/spice-client-glib-usb-acl-helper"; + }; + + meta.maintainers = [ lib.maintainers.lheckemann ]; +} From 4ed3c35fd9c0a5290eab7c0f88b0123ea1b7cf2d Mon Sep 17 00:00:00 2001 From: Markus Kohlhase Date: Fri, 11 Sep 2020 11:39:09 +0200 Subject: [PATCH 060/463] microserver: init at 0.1.8 --- pkgs/servers/microserver/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/servers/microserver/default.nix diff --git a/pkgs/servers/microserver/default.nix b/pkgs/servers/microserver/default.nix new file mode 100644 index 00000000000..9132ef9672b --- /dev/null +++ b/pkgs/servers/microserver/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "microserver"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "robertohuertasm"; + repo = "microserver"; + rev = "v${version}"; + sha256 = "1i9689ra5jnmhkxabrx4zcp5f422w9ql9m4xzldqwmpnckm736v6"; + }; + + cargoSha256 = "1yn3xmmhpixiviayicl2szlzfjx5crffp3pq75d5nz6ky3miai9l"; + + meta = with stdenv.lib; { + homepage = "https://github.com/robertohuertasm/microserver"; + description = "Simple ad-hoc server with SPA support"; + maintainers = with maintainers; [ flosse ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 246bcaa8688..95e25841e1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5432,6 +5432,8 @@ in microcom = callPackage ../applications/misc/microcom { }; + microserver = callPackage ../servers/microserver { }; + midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; mikutter = callPackage ../applications/networking/instant-messengers/mikutter { }; From 9092c6140fd78c13a876a7069105bb7e5f1b22d0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 9 Sep 2020 11:31:13 +0300 Subject: [PATCH 061/463] nginxModules.naxsi: 2020.08.15 -> 2020.09.10 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 983e0f41ee9..8617763334e 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -229,8 +229,8 @@ in name = "naxsi"; owner = "nbs-system"; repo = "naxsi"; - rev = "07a056ccd36bc3c5c40dc17991db226cb8cf6241"; - sha256 = "1kdqy7by6ha2pl9lkkjxh4qrwcsrj2alm8fl129831h5y5xy8qx2"; + rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7"; + sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3"; } + "/naxsi_src"; }; From 6f32af17e961be623ce030c9ee52c6c9cff2d8ea Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 9 Sep 2020 11:34:00 +0300 Subject: [PATCH 062/463] nginxModules.opentracing: v0.9.0 -> v0.10.0 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 8617763334e..0f9fda0e7a5 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -240,8 +240,8 @@ in name = "opentracing"; owner = "opentracing-contrib"; repo = "nginx-opentracing"; - rev = "v0.9.0"; - sha256 = "02rf1909grbhvs9mjxrv7pwgbf7b8rpjw7j8rpwxag2rgvlsic3g"; + rev = "v0.10.0"; + sha256 = "1q234s3p55xv820207dnh4fcxkqikjcq5rs02ai31ylpmfsf0kkb"; }; in "${src'}/opentracing"; inputs = [ pkgs.opentracing-cpp ]; From 96311ca1c35196c6887aebcf950a4c4ff51a2a03 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 9 Sep 2020 11:37:33 +0300 Subject: [PATCH 063/463] nginxModules.shibboleth: 2020.08.12 -> 2020.09.04 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 0f9fda0e7a5..5d34bf80c64 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -335,8 +335,8 @@ in name = "shibboleth"; owner = "nginx-shib"; repo = "nginx-http-shibboleth"; - rev = "5eadab80b2f5940d8873398bca000d93d3f0cf27"; - sha256 = "1l0h3ic9mfsci89d0k5q3igkfpzq052ia25xj5hc8fq388yrhpap"; + rev = "3f5ff4212fa12de23cb1acae8bf3a5a432b3f43b"; + sha256 = "136zjipaz7iikgcgqwdv1mrh3ya996zyzbkdy6d4k07s2h9g7hy6"; }; }; From 79906c49080302272f713db2d1ff58299f5c3195 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 9 Sep 2020 11:39:37 +0300 Subject: [PATCH 064/463] nginxModules.aws-auth: fix warning message --- pkgs/servers/http/nginx/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 5d34bf80c64..ae658a7fdd4 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -20,7 +20,7 @@ in { fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge"; - ngx_aws_auth = throw "fastcgi-cache-purge was renamed to aws-auth"; + ngx_aws_auth = throw "ngx_aws_auth was renamed to aws-auth"; aws-auth = { src = fetchFromGitHub { From 2724f7be543ebc57a01f7fc4fa42efb0a13e24cc Mon Sep 17 00:00:00 2001 From: Calvin Kim Date: Tue, 11 Aug 2020 02:49:20 +0900 Subject: [PATCH 065/463] nbxplorer: init at 2.1.42 --- .../blockchains/nbxplorer/default.nix | 54 + .../blockchains/nbxplorer/deps.nix | 1072 +++++++++++++++++ .../blockchains/nbxplorer/update.sh | 6 + .../blockchains/nbxplorer/util/create-deps.sh | 45 + .../nbxplorer/util/update-common.sh | 51 + pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 1231 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/blockchains/nbxplorer/default.nix create mode 100644 pkgs/applications/blockchains/nbxplorer/deps.nix create mode 100755 pkgs/applications/blockchains/nbxplorer/update.sh create mode 100755 pkgs/applications/blockchains/nbxplorer/util/create-deps.sh create mode 100755 pkgs/applications/blockchains/nbxplorer/util/update-common.sh diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix new file mode 100644 index 00000000000..76ca21ef9aa --- /dev/null +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, + dotnetPackages, dotnetCorePackages +}: + +let + deps = import ./deps.nix { + fetchNuGet = { name, version, sha256 }: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + }; + dotnetSdk = dotnetCorePackages.sdk_3_1; +in + +stdenv.mkDerivation rec { + pname = "nbxplorer"; + version = "2.1.42"; + + src = fetchFromGitHub { + owner = "dgarage"; + repo = "NBXplorer"; + rev = "v${version}"; + sha256 = "01q6n7095rrha00xs3l7igzfb9rd743z8crxa2dcz4q5srapfzpi"; + }; + + nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; + + buildPhase = '' + export HOME=$TMP/home + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + nuget sources Add -Name tmpsrc -Source $TMP/nuget + nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget + + dotnet restore --source $TMP/nuget NBXplorer/NBXplorer.csproj + dotnet publish --no-restore --output $out/share/$pname -c Release NBXplorer/NBXplorer.csproj + ''; + + installPhase = '' + makeWrapper $out/share/$pname/NBXplorer $out/bin/$pname \ + --set DOTNET_ROOT "${dotnetSdk}" + ''; + + dontStrip = true; + + meta = with lib; { + description = "Minimalist UTXO tracker for HD Cryptocurrency Wallets"; + maintainers = with maintainers; [ kcalvinalvin earvstedt ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix new file mode 100644 index 00000000000..65afa6b72c4 --- /dev/null +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -0,0 +1,1072 @@ +{ fetchNuGet }: [ + (fetchNuGet { + name = "DBTrie"; + version = "1.0.38"; + sha256 = "09n9f2j0pha2np9cpbgjfs19jwvfmrglws89izarq71gl8jia6d9"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.JsonPatch"; + version = "3.1.5"; + sha256 = "0agcp9c8zf59bliybjfg5whby7k1i1xc4sccyyyj3qcx1snf6lfx"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; + version = "3.1.5"; + sha256 = "1n76xr3jn4bcxm9f3lk8k76zn39mhyqcj5b0dqhi2xykyvvrqjgc"; + }) + (fetchNuGet { + name = "Microsoft.Azure.Amqp"; + version = "2.4.2"; + sha256 = "0pfgl6fnw3apwasfg1dp5pvi5h0z0vmznhn2bfsgwndn1xlfw1g9"; + }) + (fetchNuGet { + name = "Microsoft.Azure.ServiceBus"; + version = "4.1.3"; + sha256 = "1mj21nal3hv8b5678rah808521c5rkb0yh6hrlqirsdgxwnl6z6g"; + }) + (fetchNuGet { + name = "Microsoft.Azure.Services.AppAuthentication"; + version = "1.0.3"; + sha256 = "0as64agcsilwgbvwx7iw3abdxyp9cbfpczbagjz49mqmmgnqp899"; + }) + (fetchNuGet { + name = "Microsoft.CodeCoverage"; + version = "16.6.1"; + sha256 = "01ffm4nflqdb93vq4xl0j3377x360fgx6c6h12mpkcy85ixbv3rl"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.3.0"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.7.0"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.1.0"; + sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; + version = "2.1.0"; + sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.FileExtensions"; + version = "2.1.0"; + sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Ini"; + version = "2.1.0"; + sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "2.1.0"; + sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.1.0"; + sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Physical"; + version = "2.1.0"; + sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileSystemGlobbing"; + version = "2.1.0"; + sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "1.0.0"; + sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.1.0"; + sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.1.0"; + sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.Clients.ActiveDirectory"; + version = "3.14.2"; + sha256 = "0g9a2z1qjxd71lqqghp0a542xk9jkvz951bbnnnw43is4hlnqncq"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.JsonWebTokens"; + version = "5.4.0"; + sha256 = "0a5fn0p10dmkwa7vvbq28xw78aq33xm7c82l7vhla95n0lr178n8"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.Logging"; + version = "5.4.0"; + sha256 = "1idlpyg3q3syam6aflfbnsa7iql685mjralr1cnfpryf00lm59v0"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.Tokens"; + version = "5.4.0"; + sha256 = "0gpdh5rs0p97zm41pphha8n3ccd50b1iszikj3917f111khpw8l0"; + }) + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.6.1"; + sha256 = "0jjdg468jc6pv2z764f3xc19lcr772nzjm9cjfqq3bqw8vkpzmhv"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.0.2"; + sha256 = "17rrj0awknxx6rpdxr7yijdxqdmbbpdlcf2nsadjbd4d2gw7dck0"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.ObjectModel"; + version = "16.6.1"; + sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.TestHost"; + version = "16.6.1"; + sha256 = "0anzvb2mda548swb2ll1hv65knb8gwjm01hwbl0pzzr607my3lix"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.3.0"; + sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; + }) + (fetchNuGet { + name = "NBitcoin.Altcoins"; + version = "2.0.19"; + sha256 = "12a3bf1pi6sq78z6h3clyczvycx7cjry8fby4fyi748wjwljjizz"; + }) + (fetchNuGet { + name = "NBitcoin.TestFramework"; + version = "2.0.11"; + sha256 = "09jrbq9p5k67kdic2038s7q299y2nc8ij6m55m3m8hys7jdrrv05"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.54"; + sha256 = "0mx2gr8j8bc4mf1vi1fvqj3672qalxvzvincc61if79p46cik24b"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.3"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Bson"; + version = "1.0.2"; + sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "10.0.3"; + sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "11.0.1"; + sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) + (fetchNuGet { + name = "NicolasDorier.CommandLine.Configuration"; + version = "1.0.0.3"; + sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg"; + }) + (fetchNuGet { + name = "NicolasDorier.CommandLine"; + version = "1.0.0.2"; + sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy"; + }) + (fetchNuGet { + name = "NicolasDorier.StandardConfiguration"; + version = "1.0.0.18"; + sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; + }) + (fetchNuGet { + name = "NuGet.Frameworks"; + version = "5.0.0"; + sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + }) + (fetchNuGet { + name = "RabbitMQ.Client"; + version = "5.1.2"; + sha256 = "195nxmnva1z2p0ahvn0kswv4d39f5bdy2sl3cxcvfziamc21xrmd"; + }) + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Security"; + version = "4.3.0"; + sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.3.0"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.4.0"; + sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.5.0"; + sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.3.0"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; + }) + (fetchNuGet { + name = "System.Collections.Specialized"; + version = "4.3.0"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "System.ComponentModel.Primitives"; + version = "4.3.0"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; + }) + (fetchNuGet { + name = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) + (fetchNuGet { + name = "System.Console"; + version = "4.3.0"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.5.1"; + sha256 = "1j8dgilsgd0n7y87wq1cdlnwck96wijhbyhdp4d01l1gzm3074c1"; + }) + (fetchNuGet { + name = "System.Diagnostics.Process"; + version = "4.3.0"; + sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.0.1"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "System.IdentityModel.Tokens.Jwt"; + version = "5.4.0"; + sha256 = "05f91fjn054bwphmbbg7c38ipl4i81v73j232jgcq6y16dx6ifyc"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.3.0"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.3.0"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.0"; + sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.3.0"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }) + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.3.0"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) + (fetchNuGet { + name = "System.Net.Security"; + version = "4.3.0"; + sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.3.0"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }) + (fetchNuGet { + name = "System.Net.WebHeaderCollection"; + version = "4.0.1"; + sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; + }) + (fetchNuGet { + name = "System.Net.WebHeaderCollection"; + version = "4.3.0"; + sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; + }) + (fetchNuGet { + name = "System.Net.WebSockets.Client"; + version = "4.0.2"; + sha256 = "0p8m9h94h9za8281hngpi6awka6v26s1gkk0npmxzqq4ilas6b4s"; + }) + (fetchNuGet { + name = "System.Net.WebSockets.Client"; + version = "4.3.2"; + sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; + }) + (fetchNuGet { + name = "System.Net.WebSockets"; + version = "4.0.0"; + sha256 = "04jdhq9dp43x1m6hddn06sq74skc50i1yk6hip0224pj6fwxa4k2"; + }) + (fetchNuGet { + name = "System.Net.WebSockets"; + version = "4.3.0"; + sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; + }) + (fetchNuGet { + name = "System.Numerics.Vectors"; + version = "4.4.0"; + sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + (fetchNuGet { + name = "System.Private.DataContractSerialization"; + version = "4.1.1"; + sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; + }) + (fetchNuGet { + name = "System.Private.DataContractSerialization"; + version = "4.3.0"; + sha256 = "06fjipqvjp559rrm825x6pll8gimdj9x1n3larigh5hsm584gndw"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.0"; + sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Formatters"; + version = "4.3.0"; + sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Json"; + version = "4.0.2"; + sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.3.0"; + sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Xml"; + version = "4.3.0"; + sha256 = "1b2cxl2h7s8cydbhbmxhvvq071n9ck61g08npg4gyw7nvg37rfni"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "System.Security.Claims"; + version = "4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "System.Threading.Channels"; + version = "4.7.1"; + sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "System.Threading.Thread"; + version = "4.3.0"; + sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.3.0"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.0.1"; + sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + (fetchNuGet { + name = "System.Xml.XmlSerializer"; + version = "4.0.11"; + sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; + }) + (fetchNuGet { + name = "System.Xml.XmlSerializer"; + version = "4.3.0"; + sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; + }) + (fetchNuGet { + name = "xunit.abstractions"; + version = "2.0.3"; + sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; + }) + (fetchNuGet { + name = "xunit.analyzers"; + version = "0.10.0"; + sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; + }) + (fetchNuGet { + name = "xunit.assert"; + version = "2.4.1"; + sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; + }) + (fetchNuGet { + name = "xunit.core"; + version = "2.4.1"; + sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; + }) + (fetchNuGet { + name = "xunit.extensibility.core"; + version = "2.4.1"; + sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; + }) + (fetchNuGet { + name = "xunit.extensibility.execution"; + version = "2.4.1"; + sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; + }) + (fetchNuGet { + name = "xunit.runner.visualstudio"; + version = "2.4.2"; + sha256 = "0fi85h43nyrhfc5jzg07znh01r7cpb7bpjdc6mzb9z1pm14ppfm6"; + }) + (fetchNuGet { + name = "xunit"; + version = "2.4.1"; + sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; + }) +] diff --git a/pkgs/applications/blockchains/nbxplorer/update.sh b/pkgs/applications/blockchains/nbxplorer/update.sh new file mode 100755 index 00000000000..5db2723ef8e --- /dev/null +++ b/pkgs/applications/blockchains/nbxplorer/update.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -euo pipefail + +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) + +getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh new file mode 100755 index 00000000000..1402d1cd1eb --- /dev/null +++ b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p dotnet-sdk_3 +set -euo pipefail + +# Writes deps for dotnet package in $pkgSrc to $depsFile. +# Expects $pkgSrc to contain a single .sln file. + +pkgSrc=$1 +depsFile=$2 + +sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) +[[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } + +tmpdir=$(mktemp -d /tmp/$pkgName-src.XXX) +echo "Using tmp dir: $tmpdir" +cp -rT "$pkgSrc" "$tmpdir" +chmod -R +w "$tmpdir" + +pushd "$tmpdir" > /dev/null +mkdir home +echo "Running dotnet restore for $sln" +HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \ + dotnet restore -v normal --no-cache "$sln" > restore_log + +echo "{ fetchNuGet }: [" > "$depsFile" +while read pkgSpec; do + { read name; read version; } < <( + # Ignore build version part: 1.0.0-beta2+77df2220 -> 1.0.0-beta2 + sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkgSpec" + ) + sha256=$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkgSpec")"/*.nupkg) + cat >> "$depsFile" <> "$depsFile" + +echo "Created $depsFile" + +popd > /dev/null +rm -r $tmpdir diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh new file mode 100755 index 00000000000..c69168ccbbb --- /dev/null +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 +set -euo pipefail + +# This script uses the following env vars: +# getVersionFromTags +# onlyCreateDeps + +pkgName=$1 +depsFile=$2 + +: ${getVersionFromTags:=} +: ${onlyCreateDeps:=} + +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) +nixpkgs=$(realpath "$scriptDir"/../../../../..) + +evalNixpkgs() { + nix eval --raw "(with import \"$nixpkgs\" {}; $1)" +} + +getRepo() { + url=$(evalNixpkgs $pkgName.src.meta.homepage) + echo $(basename $(dirname $url))/$(basename $url) +} + +getLatestVersionTag() { + "$nixpkgs"/pkgs/common-updater/scripts/list-git-tags https://github.com/$(getRepo) 2>/dev/null \ + | sort -V | tail -1 | sed 's|^v||' +} + +if [[ ! $onlyCreateDeps ]]; then + oldVersion=$(evalNixpkgs "$pkgName.version") + if [[ $getVersionFromTags ]]; then + newVersion=$(getLatestVersionTag) + else + newVersion=$(curl -s "https://api.github.com/repos/$(getRepo)/releases" | jq -r '.[0].name') + fi + + if [[ $newVersion == $oldVersion ]]; then + echo "nixpkgs already has the latest version $newVersion" + echo "Run this script with env var onlyCreateDeps=1 to recreate "$(basename "$depsFile") + exit 0 + else + echo "Updating $pkgName: $oldVersion -> $newVersion" + (cd "$nixpkgs" && update-source-version "$pkgName" "$newVersion") + fi +fi + +storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" +. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77c8fa56992..2d1b7065ed8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24429,7 +24429,9 @@ in namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; - pivx = libsForQt514.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; + nbxplorer = callPackage ../applications/blockchains/nbxplorer { }; + + pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; ethabi = callPackage ../applications/blockchains/ethabi.nix { }; From 2f55d6f697396e18f6ae644754013e47d9c647d2 Mon Sep 17 00:00:00 2001 From: Calvin Kim Date: Tue, 11 Aug 2020 03:52:53 +0900 Subject: [PATCH 066/463] btcpayserver: init at 1.0.5.4 --- .../blockchains/btcpayserver/default.nix | 66 + .../blockchains/btcpayserver/deps.nix | 1937 +++++++++++++++++ .../blockchains/btcpayserver/update.sh | 6 + pkgs/top-level/all-packages.nix | 2 + 4 files changed, 2011 insertions(+) create mode 100644 pkgs/applications/blockchains/btcpayserver/default.nix create mode 100644 pkgs/applications/blockchains/btcpayserver/deps.nix create mode 100755 pkgs/applications/blockchains/btcpayserver/update.sh diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix new file mode 100644 index 00000000000..eec39e691a8 --- /dev/null +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, + dotnetPackages, dotnetCorePackages, writeScript, bash +}: + +let + deps = import ./deps.nix { + fetchNuGet = { name, version, sha256 }: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + }; + dotnetSdk = dotnetCorePackages.sdk_3_1; +in + +stdenv.mkDerivation rec { + pname = "btcpayserver"; + version = "1.0.5.5"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "11h1nrmb7f44msbhhiz9ddqh5ss2kz6d8ysnvd070x3xj5krgnxz"; + }; + + nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget ]; + + # Due to a bug in btcpayserver, we can't just `dotnet publish` to create a binary. + # Build with `dotnet build` instead and add a custom `dotnet run` script. + buildPhase = '' + export HOME=$TMP/home + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + nuget sources Add -Name tmpsrc -Source $TMP/nuget + nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget + + dotnet restore --source $TMP/nuget BTCPayServer/BTCPayServer.csproj + dotnet build -c Release BTCPayServer/BTCPayServer.csproj + ''; + + runScript = '' + #!${bash}/bin/bash + DOTNET_CLI_TELEMETRY_OPTOUT=1 exec ${dotnetSdk}/bin/dotnet run --no-launch-profile --no-build \ + -c Release -p @@SHARE@@/BTCPayServer/BTCPayServer.csproj -- "$@" + ''; + + installPhase = '' + cd .. + share=$out/share/$pname + mkdir -p $share + mv -T source $share + install -D -m500 <(echo "$runScript" | sed "s|@@SHARE@@|$share|") $out/bin/$pname + ''; + + dontStrip = true; + + meta = with lib; { + description = "Self-hosted, open-source cryptocurrency payment processor"; + homepage = "https://btcpayserver.org"; + maintainers = with maintainers; [ kcalvinalvin earvstedt ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix new file mode 100644 index 00000000000..cb0641b8c85 --- /dev/null +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -0,0 +1,1937 @@ +{ fetchNuGet }: [ + (fetchNuGet { + name = "AngleSharp"; + version = "0.9.11"; + sha256 = "17vf1bizskkxr8pf547lk2b48m12wv3si83gxk145i73bf9gi64a"; + }) + (fetchNuGet { + name = "AWSSDK.Core"; + version = "3.3.104.14"; + sha256 = "157694kb63z1szbsv861515fvjv7amrjrfmgbm3idpyw31afk650"; + }) + (fetchNuGet { + name = "AWSSDK.S3"; + version = "3.3.110.10"; + sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; + }) + (fetchNuGet { + name = "BTCPayServer.Hwi"; + version = "1.1.3"; + sha256 = "1c8hfnrjh2ad8qh75d63gsl170q8czf3j1hk8sv8fnbgnxdnkm7a"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.All"; + version = "1.2.3"; + sha256 = "1vx47rb505904pz30n5jzc9x42pcfln695l31q4dv5p4fbf10g4q"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.Charge"; + version = "1.2.1"; + sha256 = "0iv9frbr6xfxif3pnfd7c87y8mv31nqkdrnhvnaswrx43nv6s272"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.CLightning"; + version = "1.2.0"; + sha256 = "0a47fz20ngcz90h2y01isi2h940jljcmnfy6wyknj029sii7i1zs"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.Common"; + version = "1.2.0"; + sha256 = "17di8ndkw8z0ci0zk15mcrqpmganwkz9ys2snr2rqpw5mrlhpwa0"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.Eclair"; + version = "1.2.0"; + sha256 = "0w7nwsr0n2hrqak023xa294palsk3r96wlgw2ks8d3p5kxm8kskp"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.LND"; + version = "1.2.1"; + sha256 = "0ql4qyvz0rms6ls46pi3bgak3r6hj2c5ivnzahiq6cb84pbl61cr"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.Ptarmigan"; + version = "1.2.0"; + sha256 = "1yd6nhlssb9k08p5491knlwwjij9324ildir99sa9cp24rlq5nis"; + }) + (fetchNuGet { + name = "BuildBundlerMinifier"; + version = "3.2.435"; + sha256 = "0y1p226dbvs7q2ngm9w4mpkhfrhw2y122plv1yff7lx5m84ia02l"; + }) + (fetchNuGet { + name = "BundlerMinifier.Core"; + version = "3.2.435"; + sha256 = "17338x8ycr7hjzq16kr0ri30k19802hsn1sy259k3v694mxk59vd"; + }) + (fetchNuGet { + name = "BundlerMinifier.TagHelpers"; + version = "3.2.435"; + sha256 = "0ksmby0lzgsxkv0xfzr840262kcqra9vds91mcx0rf20blksfvsk"; + }) + (fetchNuGet { + name = "CsvHelper"; + version = "15.0.5"; + sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; + }) + (fetchNuGet { + name = "DBriize"; + version = "1.0.1.3"; + sha256 = "0rsm68hwq2ky8i6mv3ckdjkj4vjygnkgk3disva0skl3apk833dc"; + }) + (fetchNuGet { + name = "DigitalRuby.ExchangeSharp"; + version = "0.6.3"; + sha256 = "1vb7ahafcd3lcbiiz552aisilwm1yq3j600gkf1wik8vhvsk02fs"; + }) + (fetchNuGet { + name = "Google.Api.Gax.Rest"; + version = "2.5.0"; + sha256 = "1zkjl5zh6qwdz4qmnxnk5877pas638i2qi25znilhqqf3mrkp0rp"; + }) + (fetchNuGet { + name = "Google.Api.Gax"; + version = "2.5.0"; + sha256 = "0q6pi53px998i3gdndla8v0zqdpyi9gnsy9mdcfpkrg09vfbdsl9"; + }) + (fetchNuGet { + name = "Google.Apis.Auth"; + version = "1.35.1"; + sha256 = "1qdnd1nq9bfgyljmiww91pfi0iz1n29rz2dlizhxcijqya2ldha3"; + }) + (fetchNuGet { + name = "Google.Apis.Auth"; + version = "1.38.0"; + sha256 = "0x3bdwiyqjxw5df99bfasmsv09kb47wzisag938631cijl0g277y"; + }) + (fetchNuGet { + name = "Google.Apis.Core"; + version = "1.35.1"; + sha256 = "01dfw2kxknlc5pm7x1q88lv9j979509lkkgvlffjry5bawsxsja4"; + }) + (fetchNuGet { + name = "Google.Apis.Core"; + version = "1.38.0"; + sha256 = "012gslhnx65vqfyzjnqx4bqk9kb8bwbx966q2f9fdgrfcn26gj9j"; + }) + (fetchNuGet { + name = "Google.Apis.Storage.v1"; + version = "1.38.0.1470"; + sha256 = "0mfrz7fmpfbjvp4zfpjasmnfbgxgxrrjkf8xgp9p6h9g8qh2f2h2"; + }) + (fetchNuGet { + name = "Google.Apis"; + version = "1.35.1"; + sha256 = "1022l8m7v9f3rkjc9l11mkzwsbmqx9sk5f4aym035vn9hdr16d49"; + }) + (fetchNuGet { + name = "Google.Apis"; + version = "1.38.0"; + sha256 = "01j3d1lv106cqw9n0lwgclrxghy852fsibv6av4xr03ivrkm8g40"; + }) + (fetchNuGet { + name = "Google.Cloud.Storage.V1"; + version = "2.3.0"; + sha256 = "01jhrd6m6md8m28chzg2dkdfd4yris79j1xi7r1ydm1cfjhmlj64"; + }) + (fetchNuGet { + name = "HtmlSanitizer"; + version = "4.0.217"; + sha256 = "0szay9mf5mmrp1hx0yc175aaalv76qg0j515lfs133j1d95lj26d"; + }) + (fetchNuGet { + name = "Microsoft.AspNet.SignalR.Client"; + version = "2.3.0"; + sha256 = "1xyj8b88bc6sc7fxgqyalzfmlfgbagfk7adyk29if9hr8ki9bic4"; + }) + (fetchNuGet { + name = "Microsoft.AspNet.WebApi.Client"; + version = "5.2.7"; + sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Cryptography.Internal"; + version = "3.1.4"; + sha256 = "0d4djj073bl9kps5jkcpydh92lcp6kpa7njhypjw3myaa987dcsh"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; + version = "3.1.4"; + sha256 = "1rya2775prm8ss0rz6izsqqcz96gcf1rh0bpcvnfy1mwi04rx8bl"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Hosting.Abstractions"; + version = "2.0.0"; + sha256 = "0x6vw7kiy9z7cdmgbqav0d9wq66032wg39l2c9cv6xvxxvdpbkz7"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; + version = "2.0.0"; + sha256 = "1k4dr6l32swi8zasfvzxixnjvgbrra7v6lgpri0929vb3r5lagjb"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http.Abstractions"; + version = "2.0.0"; + sha256 = "1hgmnd5mj35g8cqq3mdhjf9cmi3wm5lqiyrj5mgfscnig6i686xr"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http.Features"; + version = "2.0.0"; + sha256 = "1zk5ad3laa7ma83md8r80kijqzps6dcrvv0k1015nddfk1qd74s6"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; + version = "3.1.4"; + sha256 = "0smcpaqm7d95flr0k7i2psrsfvs48lv28kzqgnllv5229hhb670d"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.JsonPatch"; + version = "3.1.1"; + sha256 = "0c0aaz9rlh9chc53dnv5jryp0x0415hipaizrmih3kzwd3fmqpml"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; + version = "3.1.1"; + sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; + version = "3.1.1"; + sha256 = "1iydcr7rfzg3kqky0x70853g6lbzsl9ja9cv8ph6iwpqxnswgdkh"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"; + version = "3.1.1"; + sha256 = "1q1bblcj9l2dnz46frygsfq7w4v08l96clgryh78wyws83xjm43y"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Razor.Language"; + version = "3.1.1"; + sha256 = "0arqmy04dd0r4wm2fin66gxxwj2kirbgxyf3w7kq6f73lrnazhq0"; + }) + (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "1.1.0"; + sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; + }) + (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "1.1.1"; + sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; + }) + (fetchNuGet { + name = "Microsoft.Bcl.HashCode"; + version = "1.1.0"; + sha256 = "1ggsadahlp76zcn1plapszd5v5ja8rh479fwrahqd3knql4dfnr0"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Analyzers"; + version = "2.9.3"; + sha256 = "1kskwc9gyd2sx3zwx52qwfsl7s0xhaclmlnxvjsb4jgvpydv3xii"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Analyzers"; + version = "3.0.0"; + sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Common"; + version = "3.3.0"; + sha256 = "1vwhsp3pjgcfnpapkps9a3z9n2ryiv5bbhzycfljngj5grj63rg2"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Common"; + version = "3.6.0"; + sha256 = "0i8x90700jr30j580mpawj6d90fngrb2zpkjjbn7f8r2p1mz75y7"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.CSharp"; + version = "3.3.0"; + sha256 = "09nmd5h1r2q0dwp1dfpn4anvs8sfi3rwcgpcv28lrhky8vc51424"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.CSharp"; + version = "3.6.0"; + sha256 = "0c44qp7lfpja6cq5nk7851qrswm2z1k2pnvsw43j9ybf10a27jrn"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Razor"; + version = "3.1.1"; + sha256 = "03n5rli6v1kvghha82zar3dvvkbc2vb9g8zp5fjrzhvp4l74ingn"; + }) + (fetchNuGet { + name = "Microsoft.CodeCoverage"; + version = "16.6.1"; + sha256 = "01ffm4nflqdb93vq4xl0j3377x360fgx6c6h12mpkcy85ixbv3rl"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.3.0"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.5.0"; + sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.7.0"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; + }) + (fetchNuGet { + name = "Microsoft.Data.Sqlite.Core"; + version = "3.1.4"; + sha256 = "1pahyqjs4l9g1wg9hvxf68kgzzf72ny2i7n7ai97a389p2c86xvh"; + }) + (fetchNuGet { + name = "Microsoft.DotNet.PlatformAbstractions"; + version = "2.0.4"; + sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; + }) + (fetchNuGet { + name = "Microsoft.DotNet.PlatformAbstractions"; + version = "3.1.4"; + sha256 = "1s5h96zdc3vh1v03gizmqfw5hmksajw10bdrj79pm8brbyzipxia"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Abstractions"; + version = "3.1.0"; + sha256 = "1bd6hilnwp47z3l14qspdxi5f5nhv6rivarc6w8wil425bq0h3pd"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Abstractions"; + version = "3.1.4"; + sha256 = "07l7137pzwh0k4m53ji5j6a2zmbbzrl164p18wxcri77ds5is4g7"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Analyzers"; + version = "3.1.0"; + sha256 = "1pjn4wwhxgsiap7byld114kx6m0nm6696r8drspqic7lskm4y305"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Analyzers"; + version = "3.1.4"; + sha256 = "1zaqn9z7ns6p6jgnffzkgpziqr2wqs68g2sa0c11kaclhlhgvvbv"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Design"; + version = "3.1.4"; + sha256 = "10mxnbiw23ia4sln86sd3gn84yhmrb6r2kipzid4h1g15paal9gi"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Relational"; + version = "3.1.0"; + sha256 = "0javqw6c27ppcysigjvcjcw3mk0gg1pv2pmwfpvvryr1pb4a9n55"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Relational"; + version = "3.1.4"; + sha256 = "1344rsavawwg69dx8xsl08hcs43lc6h7z4mn461dcx85rirlwd0v"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; + version = "3.1.4"; + sha256 = "080qz0b52i7v5c1sgnqlh9px9881cfr1x06np66hdgmh0ni5c1lw"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Sqlite"; + version = "3.1.4"; + sha256 = "009mcmakw0p7k8xrz920a8qc0rjv361awiz8jia5i5a8p5ihgkbx"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore"; + version = "3.1.0"; + sha256 = "1l12lsk1xfrv5pjnm0b9w9kncgdh0pcjcbxl4zrsg82s7bs7dhda"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore"; + version = "3.1.4"; + sha256 = "11w63yp7fk9qwmnq3lmpf1h30mlbzfx4zpm89vrs0lprj86g0742"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Abstractions"; + version = "3.1.0"; + sha256 = "0j5m2a48rwyzzvbz0hpr2md35iv78b86zyqjnrjq0y4vb7sairc0"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Abstractions"; + version = "3.1.4"; + sha256 = "09f96pvpyzylpdaiw3lsvr7p6rs4i21mmhsxl6pkivg5lpfb79sk"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Memory"; + version = "3.1.0"; + sha256 = "1hi61647apn25kqjcb37nqafp8fikymdrk43j3kxjbwwwx507jy1"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Memory"; + version = "3.1.4"; + sha256 = "0b8ijxjd8lgq8mgnvh3wl4y4wbjj3v5b763y6gslm75fn43iyad8"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "1.1.2"; + sha256 = "0z83kxfzsgqlshg4x1mhdnhlrprrwsgnnibvwk257drzy9079994"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.0.0"; + sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.1.0"; + sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "3.1.0"; + sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "3.1.4"; + sha256 = "0r33m68y1vgpmqams4sgciizl0w6y97qkp93m0hyn0nlkxqf72l6"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "2.0.0"; + sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "3.1.0"; + sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "3.1.4"; + sha256 = "1bnf213zlrh0m3sbhsv601yx21l5xp254jiy2g4hm7zpm8vsz1hz"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; + version = "2.1.0"; + sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.FileExtensions"; + version = "2.1.0"; + sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Ini"; + version = "2.1.0"; + sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "2.0.0"; + sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "2.1.0"; + sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "3.1.0"; + sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "3.1.4"; + sha256 = "0npc18pjl86d06czb0fy6ln3prfpwfb16p6709xx2jrsl96dp9bp"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "2.0.0"; + sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "2.1.0"; + sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "3.1.0"; + sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "3.1.4"; + sha256 = "03ys96pqca93zwxvh0vprzms09i9y0lmq32w98m6klbizq01fc06"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "2.0.0"; + sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "3.1.0"; + sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "3.1.4"; + sha256 = "0rhyjgdpjm56drvrvqd9v1xq1qhyrpwwn2pjsz17g2s462rwliqx"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "2.0.4"; + sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "3.1.1"; + sha256 = "0qa04dspjl4qk7l8d66wqyrvhp5dxcfn2j4r8mmj362xyrp3r8sh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "3.1.4"; + sha256 = "0r0wv4k0ig6mrl6fr184zqbf5f010d6i2an2ws23g2bjvk8jh1bk"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.0.0"; + sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.1.0"; + sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Physical"; + version = "2.1.0"; + sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileSystemGlobbing"; + version = "2.1.0"; + sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Hosting.Abstractions"; + version = "2.0.0"; + sha256 = "056wgjcdzvz1qwb26xv6hgxq4xya56qiimhk30v8an8cgsrjk3mc"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Hosting.Abstractions"; + version = "2.1.0"; + sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Identity.Core"; + version = "3.1.4"; + sha256 = "0kyi03l9d7pnsvrcylc86fcxwnj59mhvmbz4c1d142f8djdrqfid"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Identity.Stores"; + version = "3.1.4"; + sha256 = "0jb3syy0glyn4nnd7lb7aj412xnqyrwhfavh98rbc5adq9v09nbw"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "1.0.0"; + sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "1.1.2"; + sha256 = "0j9b4z3pf8a5xphx3ksn6jm01rf4z001vfll5kcbxw995xcidjw1"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.0.0"; + sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.1.0"; + sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "3.1.0"; + sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "3.1.4"; + sha256 = "1rkl0yqmi5vfivn641866v2mdsgdy8amym546y6lzbab39g24b5n"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Filter"; + version = "1.1.2"; + sha256 = "1pip87q89376xxpi3r5pf9vxhqxx21qrp179fbldbkr2m1577k9m"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "2.0.0"; + sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "3.1.0"; + sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "3.1.4"; + sha256 = "04asfrhfrcl3ijilry2pr28ql5m6pgrwapadikgcg66jjxbx75zq"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options.ConfigurationExtensions"; + version = "2.0.0"; + sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "2.0.0"; + sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "3.1.0"; + sha256 = "0akccwhpn93a4qrssyb3rszdsp3j4p9hlxbsb7yhqb78xydaqhyh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "3.1.4"; + sha256 = "0jphncx82l7jm5xi49dfxhbh24wv86sy44022chd7bkizllsypp4"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.PlatformAbstractions"; + version = "1.1.0"; + sha256 = "0r4j8v2vvp3kalvb11ny9cvpls3nrvqj0c81rxbkh99ynd2dbscp"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "1.1.1"; + sha256 = "0rcwxz1r89y96s8k3bmg0v6zdqanqfp09khy5l99wnl777y15g7x"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.0.0"; + sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.1.0"; + sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "3.1.0"; + sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "3.1.4"; + sha256 = "12xvysk024aghrcwzv4525vznnk8lqmknl2vqqxhq4k5hjxpsysp"; + }) + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.6.1"; + sha256 = "0jjdg468jc6pv2z764f3xc19lcr772nzjm9cjfqq3bqw8vkpzmhv"; + }) + (fetchNuGet { + name = "Microsoft.NetCore.Analyzers"; + version = "2.9.8"; + sha256 = "1klybsdy9yw49zlpmix4vjdhmfaibg5h9yx03vszdnijzap7vpsx"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.0.0"; + sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.1.2"; + sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.ObjectModel"; + version = "16.6.1"; + sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.TestHost"; + version = "16.6.1"; + sha256 = "0anzvb2mda548swb2ll1hv65knb8gwjm01hwbl0pzzr607my3lix"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + (fetchNuGet { + name = "MySqlConnector"; + version = "0.61.0"; + sha256 = "0b0mc41dsih4p1ky3kcmibsz4bw14w439nraq5732wjfkq2sqdxg"; + }) + (fetchNuGet { + name = "NBitcoin.Altcoins"; + version = "2.0.16"; + sha256 = "0fsdb96k5lwyq4d7h7yg91qghima08yk0bsw5cvr4h2jsfphk423"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.33"; + sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.4"; + sha256 = "04iafda61izzxb691brk72qs01m5dadqb4970nw5ayck6275s71i"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.40"; + sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.45"; + sha256 = "102vwxwkg367yxv26hycnc7hjxlv2zvsgr8g6adw8dmzsxck5fwk"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.51"; + sha256 = "0rg014sl7rqscnranwyfk41xfr5ccjqyx7aidfl5mh0znz44db2g"; + }) + (fetchNuGet { + name = "NBitpayClient"; + version = "1.0.0.39"; + sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; + }) + (fetchNuGet { + name = "NBXplorer.Client"; + version = "3.0.17"; + sha256 = "0xx2xshgpci9l9883zpqnmgchpizygy0hcq2wp2ch6yf3hbrj9qq"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Bson"; + version = "1.0.1"; + sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Bson"; + version = "1.0.2"; + sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Schema"; + version = "3.0.13"; + sha256 = "04vzjz5fb588rh6ji5a0svfzjsdcfpr1qrz9hxpc64z5zhnh6sf4"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "10.0.3"; + sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "11.0.1"; + sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "11.0.2"; + sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.3"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) + (fetchNuGet { + name = "NicolasDorier.CommandLine.Configuration"; + version = "1.0.0.3"; + sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg"; + }) + (fetchNuGet { + name = "NicolasDorier.CommandLine"; + version = "1.0.0.2"; + sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy"; + }) + (fetchNuGet { + name = "NicolasDorier.RateLimits"; + version = "1.1.0"; + sha256 = "06cajxi8wnrxfwqfnk98avphwiyvg1fw428bd42lqjgq9k414rk9"; + }) + (fetchNuGet { + name = "NicolasDorier.StandardConfiguration"; + version = "1.0.0.18"; + sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; + }) + (fetchNuGet { + name = "NLog"; + version = "4.5.10"; + sha256 = "0d4yqxrhqn2k36h3v1f5pn6qqlagbzg67v6gvxqhz3s4zyc3b8rg"; + }) + (fetchNuGet { + name = "Npgsql.EntityFrameworkCore.PostgreSQL"; + version = "3.1.4"; + sha256 = "1ng9pbamh93g0fbnjq8ygaf40d6rs0fy4s08bjmxpa69k3s8c7a4"; + }) + (fetchNuGet { + name = "Npgsql"; + version = "4.1.3.1"; + sha256 = "0qk3hb8s521c2gy4k3m1i6fhpr133mnw9w85cwsy9j7ghxyca1nv"; + }) + (fetchNuGet { + name = "NuGet.Frameworks"; + version = "5.0.0"; + sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + }) + (fetchNuGet { + name = "NUglify"; + version = "1.5.12"; + sha256 = "0f4gs31z8dwfvd246nrv3m0qkxzav37hxynx2maykza017khynyf"; + }) + (fetchNuGet { + name = "Pomelo.EntityFrameworkCore.MySql"; + version = "3.1.1"; + sha256 = "1jvv2q7pmh5wzsfjim7iby4r1scb30kgj9w6sbm2dp60i6vm32dx"; + }) + (fetchNuGet { + name = "Pomelo.JsonObject"; + version = "2.2.1"; + sha256 = "1w6s9wjbsyvq8cnqknkdzm9chnv0g5gcsrq5i94zp6br9vg7c627"; + }) + (fetchNuGet { + name = "Portable.BouncyCastle"; + version = "1.8.1.3"; + sha256 = "1lv1ljaz8df835jgmp3ny1xgqqjf1s9f25baw7bf8d24qlf25i2g"; + }) + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Security"; + version = "4.3.0"; + sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + (fetchNuGet { + name = "Selenium.WebDriver.ChromeDriver"; + version = "83.0.4103.3900"; + sha256 = "17j9b637209nm5cs5sgr3vflphkhaxpm8bcjizhgj65r52gn17as"; + }) + (fetchNuGet { + name = "Selenium.WebDriver"; + version = "3.141.0"; + sha256 = "09g0zhz6n7yhxmxlrpzjdykfavr3m4z1gb4cmq304dw0gr8s89mq"; + }) + (fetchNuGet { + name = "Serilog.AspNetCore"; + version = "3.2.0"; + sha256 = "14d1lsw1djsshlkxbn5lkmdvj4372hnddb6788m6ix0mv4mhj3bj"; + }) + (fetchNuGet { + name = "Serilog.Extensions.Hosting"; + version = "3.0.0"; + sha256 = "1r01lsy4rp0wj7ffbjcf9dcg3aipdhy7066yjicja45m0z2y42w6"; + }) + (fetchNuGet { + name = "Serilog.Extensions.Logging"; + version = "3.0.1"; + sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; + }) + (fetchNuGet { + name = "Serilog.Formatting.Compact"; + version = "1.0.0"; + sha256 = "0mi1yzzj33v4nkyspyshhc6nn2mx3y07z5dvv26hl7hw6kb6yazw"; + }) + (fetchNuGet { + name = "Serilog.Settings.Configuration"; + version = "3.1.0"; + sha256 = "1cj5am4n073331gbfm2ylqb9cadl4q3ppzgwmm5c8m1drxpiwkb5"; + }) + (fetchNuGet { + name = "Serilog.Sinks.Console"; + version = "3.1.1"; + sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; + }) + (fetchNuGet { + name = "Serilog.Sinks.Debug"; + version = "1.0.1"; + sha256 = "0969mb254kr59bgkq01ybyzca89z3f4n9ng5mdj8m53d5653zf22"; + }) + (fetchNuGet { + name = "Serilog.Sinks.File"; + version = "4.1.0"; + sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; + }) + (fetchNuGet { + name = "Serilog"; + version = "2.9.0"; + sha256 = "0z0ib82w9b229a728bbyhzc2hnlbl0ki7nnvmgnv3l741f2vr4i6"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.bundle_e_sqlite3"; + version = "2.0.2"; + sha256 = "00p7n7ndmmh45fhhd3clb11igpzklm1n7r50sdrgnbi5yifv1lxl"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.core"; + version = "2.0.2"; + sha256 = "11mnbnsiirpgmilskqh1issvgzgg08ndq3p3nkrw73hyqr7kl958"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.lib.e_sqlite3"; + version = "2.0.2"; + sha256 = "0967w6r6n94hj0fma3kidb9fx1m2p3fgrw6gpsy6q6jbb33qw6vj"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.provider.dynamic_cdecl"; + version = "2.0.2"; + sha256 = "1lzs8yfjygrwfm3hjmkhnbnpsjzq53ijwx9whmii2r9kjg2a46if"; + }) + (fetchNuGet { + name = "SSH.NET"; + version = "2016.1.0"; + sha256 = "0q08bf9sdf1rf9763z4bk2mr6z381iybm73823scmq9qcpr2jk4d"; + }) + (fetchNuGet { + name = "SshNet.Security.Cryptography"; + version = "1.2.0"; + sha256 = "1xlj8bjavpjk6lrkypk66cxpf2xa31wv73ymrk34d72f05z0xrg0"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.3.0"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.5.0"; + sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.7.0"; + sha256 = "1gik4sn9jsi1wcy1pyyp0r4sn2g17cwrsh24b2d52vif8p2h24zx"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.7.1"; + sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; + }) + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.3.0"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; + }) + (fetchNuGet { + name = "System.Collections.Specialized"; + version = "4.3.0"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "System.ComponentModel.Annotations"; + version = "4.7.0"; + sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; + }) + (fetchNuGet { + name = "System.ComponentModel.Primitives"; + version = "4.3.0"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; + }) + (fetchNuGet { + name = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) + (fetchNuGet { + name = "System.Configuration.ConfigurationManager"; + version = "4.5.0"; + sha256 = "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c"; + }) + (fetchNuGet { + name = "System.Console"; + version = "4.3.0"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.0.0"; + sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.7.0"; + sha256 = "0cr0v5dz8l5ackxv6b772fjcyj2nimqmrmzanjs4cw2668v568n1"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.7.1"; + sha256 = "1mivaifniyrqwlnvzsfaxzrh2sd981bwzs3cbvs5wi7jjzbcqr4p"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + (fetchNuGet { + name = "System.Diagnostics.TraceSource"; + version = "4.0.0"; + sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.0.1"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.0.1"; + sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "System.Interactive.Async"; + version = "3.1.1"; + sha256 = "03iq20gq0n2b2sdzs5jhxf46nzkfgvzip6q5248vka2rcvn1yanh"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.3.0"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.3.0"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + name = "System.IO.Pipelines"; + version = "4.7.2"; + sha256 = "16v4qaypm72cfsfqr8z3k6yrpzn0m3apgkh6aljfwpycdk150sf9"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.0"; + sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.3"; + sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.1.0"; + sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.3.0"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }) + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.0.0"; + sha256 = "0dj3pvpv069nyia28gkl4a0fb7q33hbxz2dg25qvpah3l7pbl0qh"; + }) + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.3.0"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) + (fetchNuGet { + name = "System.Net.Requests"; + version = "4.0.11"; + sha256 = "13mka55sa6dg6nw4zdrih44gnp8hnj5azynz47ljsh2791lz3d9h"; + }) + (fetchNuGet { + name = "System.Net.Security"; + version = "4.3.0"; + sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.1.0"; + sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.3.0"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }) + (fetchNuGet { + name = "System.Net.WebHeaderCollection"; + version = "4.0.1"; + sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; + }) + (fetchNuGet { + name = "System.Net.WebHeaderCollection"; + version = "4.3.0"; + sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; + }) + (fetchNuGet { + name = "System.Net.WebSockets.Client"; + version = "4.3.2"; + sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; + }) + (fetchNuGet { + name = "System.Net.WebSockets"; + version = "4.3.0"; + sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "System.Reflection.Metadata"; + version = "1.6.0"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.3.0"; + sha256 = "149xcsa1pphlrc2zfmca9n822g4mxk7s2a44phvf34r0fajm3hk8"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.4.0"; + sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.0"; + sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.2"; + sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.6.0"; + sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.7.0"; + sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Formatters"; + version = "4.3.0"; + sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.3.0"; + sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "System.Security.AccessControl"; + version = "4.5.0"; + sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; + }) + (fetchNuGet { + name = "System.Security.Claims"; + version = "4.0.1"; + sha256 = "03dw0ls49bvsrffgwycyifjgz0qzr9r85skqhdyhfd51fqf398n6"; + }) + (fetchNuGet { + name = "System.Security.Claims"; + version = "4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.ProtectedData"; + version = "4.5.0"; + sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + (fetchNuGet { + name = "System.Security.Permissions"; + version = "4.5.0"; + sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.0.0"; + sha256 = "1d3vc8i0zss9z8p4qprls4gbh7q4218l9845kclx7wvw41809k6z"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.5.0"; + sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.0.1"; + sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; + }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) + (fetchNuGet { + name = "System.Text.Encoding.CodePages"; + version = "4.5.1"; + sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "System.Text.Encodings.Web"; + version = "4.4.0"; + sha256 = "05qp3yivh6gz0vva0v3wjlj3g1b45d5jmz362f2y8ah6yb3rx088"; + }) + (fetchNuGet { + name = "System.Text.Json"; + version = "4.7.0"; + sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; + }) + (fetchNuGet { + name = "System.Text.Json"; + version = "4.7.2"; + sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "System.Threading.Channels"; + version = "4.5.0"; + sha256 = "0n6z3wjia7h2a5vl727p97riydnb6jhhkb1pdcnizza02dwkz0nz"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.5.3"; + sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "System.Threading.Thread"; + version = "4.0.0"; + sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.0.10"; + sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.3.0"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.0.1"; + sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + (fetchNuGet { + name = "System.Xml.XPath.XmlDocument"; + version = "4.0.1"; + sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; + }) + (fetchNuGet { + name = "System.Xml.XPath"; + version = "4.0.1"; + sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; + }) + (fetchNuGet { + name = "Text.Analyzers"; + version = "2.6.4"; + sha256 = "1fm3gjnbfnjap3wphx5x48awriy14a2g3s9c1nc4m8w85k8mqdsl"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage.Amazon"; + version = "2.12.1"; + sha256 = "03nrkvhki35w1rqx94s97rwxl0qwqlczyiimhrkc72vjppn5p6ph"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage.Azure"; + version = "2.12.1"; + sha256 = "10q7gpr8kmgzmxrzj3paqlnw4d8li8scwpxkzs11ildscfp6hvlv"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage.Google"; + version = "2.12.1"; + sha256 = "0d8s7p9brp03h9dpv3wxnqg0xsm7d9p4k6dpxpb9jak535khxzhp"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage.Local"; + version = "2.12.1"; + sha256 = "1zmjqwd1v3z78ab4vdmaadh94465k1qgpv7ylv8x3sdx4z78yjm8"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage"; + version = "2.12.1"; + sha256 = "0m41dxzc3hh0f4j1k4q915pvcq6zr0hv1pj6b3sayrn8vjhk64qb"; + }) + (fetchNuGet { + name = "U2F.Core"; + version = "1.0.4"; + sha256 = "0mk32yyihigp9njs54z411fswgzr6x3kw134c7ylwy2d2wmq2n9b"; + }) + (fetchNuGet { + name = "WindowsAzure.Storage"; + version = "9.3.3"; + sha256 = "14b0b0nj85yvyn0h8ghr3kj6di2nkbzjxc2q98f1wcr0151xvdfx"; + }) + (fetchNuGet { + name = "xunit.abstractions"; + version = "2.0.3"; + sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; + }) + (fetchNuGet { + name = "xunit.analyzers"; + version = "0.10.0"; + sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; + }) + (fetchNuGet { + name = "xunit.assert"; + version = "2.4.1"; + sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; + }) + (fetchNuGet { + name = "xunit.core"; + version = "2.4.1"; + sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; + }) + (fetchNuGet { + name = "xunit.extensibility.core"; + version = "2.4.1"; + sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; + }) + (fetchNuGet { + name = "xunit.extensibility.execution"; + version = "2.4.1"; + sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; + }) + (fetchNuGet { + name = "xunit.runner.visualstudio"; + version = "2.4.2"; + sha256 = "0fi85h43nyrhfc5jzg07znh01r7cpb7bpjdc6mzb9z1pm14ppfm6"; + }) + (fetchNuGet { + name = "xunit"; + version = "2.4.1"; + sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; + }) + (fetchNuGet { + name = "YamlDotNet"; + version = "8.0.0"; + sha256 = "09hr1jimmfhcpk97p963y94h2k5p7wzcj4mpwqpdnwzbyrp2flpm"; + }) +] diff --git a/pkgs/applications/blockchains/btcpayserver/update.sh b/pkgs/applications/blockchains/btcpayserver/update.sh new file mode 100755 index 00000000000..1f7dbedd020 --- /dev/null +++ b/pkgs/applications/blockchains/btcpayserver/update.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -euo pipefail + +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) + +"$scriptDir"/../nbxplorer/util/update-common.sh btcpayserver "$scriptDir"/deps.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d1b7065ed8..b1a97067fc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24377,6 +24377,8 @@ in }; btc1d = btc1.override { withGui = false; }; + btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; + cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; dashpay = callPackage ../applications/blockchains/dashpay.nix { }; From cf5a892a242e4ee481aada0938d8ada4256007bb Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 12 Sep 2020 14:30:53 +0100 Subject: [PATCH 067/463] pythonPackages.korean-lunar-calendar: init at 0.2.1 --- .../korean-lunar-calendar/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/korean-lunar-calendar/default.nix diff --git a/pkgs/development/python-modules/korean-lunar-calendar/default.nix b/pkgs/development/python-modules/korean-lunar-calendar/default.nix new file mode 100644 index 00000000000..41569ac9dc9 --- /dev/null +++ b/pkgs/development/python-modules/korean-lunar-calendar/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "korean-lunar-calendar"; + version = "0.2.1"; + + src = fetchPypi { + inherit version; + pname = "korean_lunar_calendar"; + sha256 = "0p97r21298ipgvsqh978aq2n6cvybzp8bskcvj15mm1f76qm9khj"; + }; + + # no real tests + pythonImportsCheck = [ "korean_lunar_calendar" ]; + + meta = with stdenv.lib; { + description = "A library to convert Korean lunar-calendar to Gregorian calendar."; + homepage = "https://github.com/usingsky/korean_lunar_calendar_py"; + license = licenses.mit; + maintainers = [ maintainers.ris ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 702e209650b..68be01a3dec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3188,6 +3188,8 @@ in { konfig = callPackage ../development/python-modules/konfig { }; + korean-lunar-calendar = callPackage ../development/python-modules/korean-lunar-calendar { }; + kubernetes = callPackage ../development/python-modules/kubernetes { }; labelbox = callPackage ../development/python-modules/labelbox { }; From ad7b27b4c848826e12b76f5fc05f3dfa3e9b50a9 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sat, 12 Sep 2020 17:00:44 +0200 Subject: [PATCH 068/463] fixup: address @jtojnar's review comments --- nixos/modules/virtualisation/spice-usb-redirection.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/spice-usb-redirection.nix b/nixos/modules/virtualisation/spice-usb-redirection.nix index 39bfa0e6047..4168cebe79b 100644 --- a/nixos/modules/virtualisation/spice-usb-redirection.nix +++ b/nixos/modules/virtualisation/spice-usb-redirection.nix @@ -13,8 +13,11 @@ }; config = lib.mkIf config.virtualisation.spiceUSBRedirection.enable { - environment.systemPackages = [ pkgs.spice_gtk ]; - security.wrappers.spice-client-glib-usb-acl-helper.source = "${pkgs.spice_gtk}/bin/spice-client-glib-usb-acl-helper"; + environment.systemPackages = [ pkgs.spice-gtk ]; # For polkit actions + security.wrappers.spice-client-glib-usb-acl-helper ={ + source = "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper"; + capabilities = "cap_fowner+ep"; + }; }; meta.maintainers = [ lib.maintainers.lheckemann ]; From 28cd74522e670dd549ccbdead1799c12b86a26a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 12 Sep 2020 19:34:43 +0200 Subject: [PATCH 069/463] _1password-gui: 0.8.4 -> 0.8.5-1 Changes: https://discussions.agilebits.com/discussion/115658/1password-development-preview-0-8-5 --- pkgs/tools/security/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index b8ecf45c629..d03f2c551b9 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "1password"; - version = "0.8.4"; + version = "0.8.5-1"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "04rjlyi465pkg75pql3rfzmfj9zf8pfnxynz110x1wkqnvqmsxgw"; + sha256 = "1jardsyxkf7qfhz8jwzwick5r9jf9yjwsdqvmc2rrnrflzzpscm9"; }; nativeBuildInputs = [ makeWrapper ]; From e2c8ae9881c3e221d2736ed1eaddadd7ab8fa28b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 12 Sep 2020 19:39:28 +0200 Subject: [PATCH 070/463] softmaker-office: 1018 -> 1020 --- pkgs/applications/office/softmaker/softmaker_office.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix index 6aaa8c6745a..d0eb2ffdc93 100644 --- a/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/pkgs/applications/office/softmaker/softmaker_office.nix @@ -6,9 +6,9 @@ # Softmaker Office or when the upstream archive was replaced and # nixpkgs is not in sync yet. , officeVersion ? { - version = "1018"; + version = "1020"; edition = "2021"; - sha256 = "1g9mcn0z7s3xw7d5bcjxbnamh6knzndcysahydskfcds6czdxg0c"; + sha256 = "1v227pih1p33x7axsw7wz8pz5walpbqnk0iqng711ixk883nqxn5"; } , ... } @ args: From c1f4bf78a8b2edb14b888f159576890aace744df Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 13 Sep 2020 00:36:03 +0300 Subject: [PATCH 071/463] shadowfox: Add ldflags shadowfox-updater compares the version of itself with that of the latest version released upon startup. If it doesn't know it's own version, this comparison always falsely leads to it suggesting the user to update it upon startup, where in fact it is updated. This is a confusing behavior only NixOS users suffer and now it's solved. --- pkgs/tools/networking/shadowfox/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 5f7247248e7..d1cc3345773 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -15,7 +15,9 @@ buildGoModule rec { doCheck = false; - buildFlags = [ "--tags" "release" ]; + buildFlagsArray = [ + "-ldflags=-X main.tag=v${version}" + ]; meta = with stdenv.lib; { description = '' From b027fc3df836c1be8a8e396678640432adce5982 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 13 Sep 2020 00:41:49 +0300 Subject: [PATCH 072/463] gotify-cli: Add version and commit to ldflags --- pkgs/tools/misc/gotify-cli/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index 9e9f3c84782..8d81713e7b1 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -19,6 +19,10 @@ buildGoModule rec { mv $out/bin/cli $out/bin/gotify ''; + buildFlagsArray = [ + "-ldflags=-X main.Version=${version} -X main.Commit=${version} -X main.BuildDate=1970-01-01" + ]; + meta = with lib; { license = licenses.mit; homepage = "https://github.com/gotify/cli"; From 9225192bf67c72ec69b7d489b0e3d368a778ee4b Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sat, 12 Sep 2020 23:45:22 +0200 Subject: [PATCH 073/463] pythonPackage.python-gitlab: add missing tests requirements --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index b543b435fc6..470095eae8d 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder }: +{ stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: buildPythonPackage rec { pname = "python-gitlab"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ mock httmock ]; + checkInputs = [ mock httmock pytest responses ]; disabled = pythonOlder "3.6"; From 3fc3fd14cf82759ca0ddc7a0a7a4fa10fe567834 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 11 Sep 2020 12:18:58 +0200 Subject: [PATCH 074/463] lp_solve: fix buildCommand some binaries moved --- pkgs/applications/science/math/lp_solve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index f39c6a04d19..673c28ffa77 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { cd lp_solve*/lpsolve55 bash ccc mkdir -pv $out/lib - cp -v bin/*/* $out/lib + find bin -type f -exec cp -v "{}" $out/lib \; ) ( cd lp_solve*/lp_solve bash ccc mkdir -pv $out/bin - cp -v bin/*/* $out/bin + find bin -type f -exec cp -v "{}" $out/bin \; ) ( mkdir -pv $out/include From de7719a240b276547d8940a9712009d3bda83468 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 13 Sep 2020 04:20:00 +0000 Subject: [PATCH 075/463] exiv2: fix build on darwin --- pkgs/development/libraries/exiv2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index a9c66709dba..a845e8998e7 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -92,10 +92,12 @@ stdenv.mkDerivation rec { ''} ${stdenv.lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib # Removing tests depending on charset conversion substituteInPlace ../test/Makefile --replace "conversions.sh" "" rm -f ../tests/bugfixes/redmine/test_issue_460.py rm -f ../tests/bugfixes/redmine/test_issue_662.py + rm -f ../tests/bugfixes/github/test_issue_1046.py ''} ''; From 36cb6946efe26a6afe41a84c3bc129a7332c4678 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 13 Sep 2020 04:20:00 +0000 Subject: [PATCH 076/463] pythonPackages.grpcio: fix build --- pkgs/development/python-modules/grpcio/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index ecb15cc024d..9311838627a 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR"; + GRPC_BUILD_WITH_BORING_SSL_ASM = ""; GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1; GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1; GRPC_PYTHON_BUILD_SYSTEM_CARES = 1; From 96acb3a7727d4e4b1ecdca325f0a8c669ae150fb Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 11 Sep 2020 15:06:04 +0200 Subject: [PATCH 077/463] python2Packages.green: remove --- pkgs/development/python-modules/green/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 1d35978824f..5ecf9a18ad5 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -4,14 +4,14 @@ , termstyle , lxml , unidecode -, mock -, backports_shutil_get_terminal_size }: buildPythonPackage rec { pname = "green"; version = "3.2.1"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "c5a90e247237ac7e320120961608cf65191134fa400d327cbd4d09864c880935"; @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorama coverage termstyle unidecode lxml - ] ++ lib.optionals (!isPy3k) [ mock backports_shutil_get_terminal_size ]; + ]; # let green run it's own test suite checkPhase = '' From 66f0303a29a20801c1ccf7235155b6968a431f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 13 Sep 2020 08:43:04 +0200 Subject: [PATCH 078/463] snort: trailing whitespace I mainly mind because of annoying red cross in CI :-) https://github.com/NixOS/nixpkgs/runs/1106746284 --- pkgs/applications/networking/ids/snort/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 49f7bbfd812..3392ce282df 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--enable-control-socket" "--with-daq-includes=${daq}/includes" "--with-daq-libraries=${daq}/lib" - ]; + ]; postInstall = '' wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine" From d9d3013117db62040fefb964e21a95cc70e61708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Tr=C3=A9ca?= Date: Tue, 21 Jan 2020 01:38:43 +0100 Subject: [PATCH 079/463] pam_gnupg: init at 0.1 Add the pam_gnupg module that unlocks gnupg keys on login. --- maintainers/maintainer-list.nix | 6 ++++ pkgs/os-specific/linux/pam_gnupg/default.nix | 32 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/os-specific/linux/pam_gnupg/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4fda49dfa06..2d50b03feda 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5893,6 +5893,12 @@ githubId = 2176611; name = "Marko Poikonen"; }; + mtreca = { + email = "maxime@treca.dev"; + name = "Maxime Tréca"; + github = "mtreca"; + githubId = 16440823; + }; mtreskin = { email = "zerthurd@gmail.com"; github = "Zert"; diff --git a/pkgs/os-specific/linux/pam_gnupg/default.nix b/pkgs/os-specific/linux/pam_gnupg/default.nix new file mode 100644 index 00000000000..84135f2492a --- /dev/null +++ b/pkgs/os-specific/linux/pam_gnupg/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pam, gnupg }: + +stdenv.mkDerivation rec { + pname = "pam_gnupg"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "cruegge"; + repo = "pam-gnupg"; + rev = "v${version}"; + sha256 = "0b70mazyvcbg6xyqllm62rwhbz0y94pcy202db1qyy4w8466bhsw"; + }; + + configureFlags = [ + "--with-moduledir=${placeholder "out"}/lib/security" + ]; + + buildInputs = [ pam gnupg ]; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "Unlock GnuPG keys on login"; + longDescription = '' + A PAM module that hands over your login password to gpg-agent. This can + be useful if you are using a GnuPG-based password manager like pass. + ''; + homepage = "https://github.com/cruegge/pam-gnupg"; + license = licenses.gpl3; + maintainers = with maintainers; [ mtreca ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae19e77cadb..132a1ec931f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18226,6 +18226,8 @@ in pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { }; + pam_gnupg = callPackage ../os-specific/linux/pam_gnupg { }; + pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { }; pam_ldap = callPackage ../os-specific/linux/pam_ldap { }; From e2dffb60a549e00188d05c678a4251b8a8af2248 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 6 Sep 2020 07:48:27 +0200 Subject: [PATCH 080/463] =?UTF-8?q?ocamlPackages.batteries:=203.0.0=20?= =?UTF-8?q?=E2=86=92=203.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/batteries/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 3032df7b8fd..43fc0696e2e 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,26 +1,28 @@ { stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, qtest, num }: -let version = "3.0.0"; in +let version = "3.1.0"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-batteries-${version}"; src = fetchurl { url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz"; - sha256 = "0d833amm4p0pczgl7wriv99f3r5r6345p5gi9d97sm0hqx27vzwi"; + sha256 = "0bq1np3ai3r559s3vivn45yid25fwz76rvbmsg30j57j7cyr3jqm"; }; - # Fixes tests with OCaml 4.10 + # Fix a test case patches = [(fetchpatch { - url = "https://github.com/ocaml-batteries-team/batteries-included/commit/6d8d67f9fb48181be3d527b32df15899b00cd5dd.patch"; - sha256 = "0msk8c5bjm6gm011i75b1rza332i1r4adj58qzli6gyjlvfj1hx4"; + url = "https://github.com/ocaml-batteries-team/batteries-included/commit/7cbd9617d4efa5b3d647b1cc99d9a25fa01ac6dd.patch"; + sha256 = "0q4kq10psr7n1xdv4rspk959n1a5mk9524pzm5v68ab2gkcgm8sk"; + })]; - buildInputs = [ ocaml findlib ocamlbuild qtest ]; + buildInputs = [ ocaml findlib ocamlbuild ]; + checkInputs = [ qtest ]; propagatedBuildInputs = [ num ]; - doCheck = stdenv.lib.versions.majorMinor ocaml.version != "4.07" && !stdenv.isAarch64; - checkTarget = "test test"; + doCheck = stdenv.lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64; + checkTarget = "test"; createFindlibDestdir = true; From 43cd431b443c2df4b1be9247083a2bcb8d6540fd Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Sun, 13 Sep 2020 12:33:47 +0200 Subject: [PATCH 081/463] fetchgitlab: Escape a few more characters in the revision --- pkgs/build-support/fetchgitlab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix index f1850fbaa1e..77512510a7c 100644 --- a/pkgs/build-support/fetchgitlab/default.nix +++ b/pkgs/build-support/fetchgitlab/default.nix @@ -12,7 +12,7 @@ let ((optional (group != null) group) ++ [ owner repo ]); escapedSlug = replaceStrings ["." "/"] ["%2E" "%2F"] slug; - escapedRev = replaceStrings ["+"] ["%2B"] rev; + escapedRev = replaceStrings ["+" "%" "/"] ["%2B" "%25" "%2F"] rev; in fetchzip ({ From a9597f957371cd5b191f5e456f939dfb8cc94c2f Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Sun, 13 Sep 2020 11:30:39 +0200 Subject: [PATCH 082/463] busybox: Use git to fetch debian.script from debian Debian has yanked the upstream tarball we use to get default.script. We could simply bump the version number to get the new tarball, but to avoid the problem in the future, we should instead fetch it from git. --- pkgs/os-specific/linux/busybox/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 728d2d49118..599754129b4 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, fetchzip +{ stdenv, lib, buildPackages, fetchurl, fetchFromGitLab , enableStatic ? false , enableMinimal ? false # Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping: @@ -32,12 +32,18 @@ let CONFIG_FEATURE_WTMP n ''; - debianName = "busybox_1.30.1-5"; - debianTarball = fetchzip { - url = "http://deb.debian.org/debian/pool/main/b/busybox/${debianName}.debian.tar.xz"; - sha256 = "03m4rvs2pd0hj0mdkdm3r4m1gh0bgwr0cvnqds297xnkfi5s01nx"; + # The debian version lacks behind the upstream version and also contains + # a debian-specific suffix. We only fetch the debian repository to get the + # default.script + debianVersion = "1.30.1-6"; + debianSource = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "installer-team"; + repo = "busybox"; + rev = "debian/1%${debianVersion}"; + sha256 = "sha256-6r0RXtmqGXtJbvLSD1Ma1xpqR8oXL2bBKaUE/cSENL8="; }; - debianDispatcherScript = "${debianTarball}/tree/udhcpc/etc/udhcpc/default.script"; + debianDispatcherScript = "${debianSource}/debian/tree/udhcpc/etc/udhcpc/default.script"; outDispatchPath = "$out/default.script"; in From 2102764e62ba5b548757f1e26ed3b9699e9c25fd Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 11 Sep 2020 13:53:00 +0200 Subject: [PATCH 083/463] python2Packages.dependency-injector: add missing dependencies --- .../python-modules/dependency-injector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index ea0ef783573..1a90462a245 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six, unittest2 }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }: let testPath = @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ]; - checkInputs = [ unittest2 ]; + checkInputs = [ unittest2 pyyaml flask ]; checkPhase = '' unit2 discover -s tests/unit -p "${testPath}" From 92a9db2e3ee96447986b29d03f5d4dcee05ffc9f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 13 Sep 2020 12:44:47 +0100 Subject: [PATCH 084/463] pythonPackages.httpx: fix tests test suite contained a literal timestamp which expired, fixed upstream --- pkgs/development/python-modules/httpx/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 58152ca270e..5361e047207 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , certifi , chardet , h11 @@ -31,6 +32,14 @@ buildPythonPackage rec { sha256 = "08b6k5g8car3bic90aw4ysb2zvsa5nm8qk3hk4dgamllnnxzl5br"; }; + patches = [ + (fetchpatch { + name = "fix-cookie-test-timestamp.patch"; + url = "https://github.com/encode/httpx/pull/1270.patch"; + sha256 = "1hgrynac6226sgnyzmsr1nr15rn49gbfmk4c2kx3dwkbh6vr7jpd"; + }) + ]; + propagatedBuildInputs = [ certifi chardet From 2b27d94f016796f3f0ac6f79f618505be990ead5 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 13 Sep 2020 14:07:37 +0200 Subject: [PATCH 085/463] gocryptfs: switch buildGoPackage to buildGoModule --- pkgs/tools/filesystems/gocryptfs/default.nix | 37 +++++----- pkgs/tools/filesystems/gocryptfs/deps.nix | 75 -------------------- 2 files changed, 19 insertions(+), 93 deletions(-) delete mode 100644 pkgs/tools/filesystems/gocryptfs/deps.nix diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 2f0deed7f61..bed971229cd 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -1,20 +1,15 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchFromGitHub, openssl, pandoc, pkgconfig }: +{ stdenv +, buildGoModule +, fetchFromGitHub +, openssl +, pandoc +, pkg-config +}: -let - goFuseVersion = with stdenv.lib; substring 0 7 (head (filter ( - d: d.goPackagePath == "github.com/hanwen/go-fuse" - ) (import ./deps.nix))).fetch.rev; -in -buildGoPackage rec { +buildGoModule rec { pname = "gocryptfs"; version = "1.8.0"; - goPackagePath = "github.com/rfjakob/gocryptfs"; - - nativeBuildInputs = [ pandoc pkgconfig ]; - buildInputs = [ openssl ]; - src = fetchFromGitHub { owner = "rfjakob"; repo = pname; @@ -22,21 +17,27 @@ buildGoPackage rec { sha256 = "1acalwrr5xqhpqca3gypj0s68w6vpckxmg5z5gfgh8wx6nqx4aw9"; }; - postPatch = "rm -r tests"; + runVend = true; + vendorSha256 = "0z3y51sgr1rmr23jpc5h5d5lw14p3qzv48rc7zj7qa4rd5cfhsgi"; + + nativeBuildInputs = [ pandoc pkg-config ]; + buildInputs = [ openssl ]; buildFlagsArray = '' -ldflags= -X main.GitVersion=${version} - -X main.GitVersionFuse=${goFuseVersion} + -X main.GitVersionFuse=[vendored] + -X main.BuildDate=unknown ''; - goDeps = ./deps.nix; + subPackages = [ "." "gocryptfs-xray" "contrib/statfs" ]; postBuild = '' - pushd go/src/github.com/rfjakob/gocryptfs/Documentation/ + pushd Documentation/ mkdir -p $out/share/man/man1 pandoc MANPAGE.md -s -t man -o $out/share/man/man1/gocryptfs.1 pandoc MANPAGE-XRAY.md -s -t man -o $out/share/man/man1/gocryptfs-xray.1 + pandoc MANPAGE-STATFS.md -s -t man -o $out/share/man/man1/statfs.1 popd ''; @@ -44,7 +45,7 @@ buildGoPackage rec { description = "Encrypted overlay filesystem written in Go"; license = licenses.mit; homepage = "https://nuetzlich.net/gocryptfs/"; - maintainers = with maintainers; [ flokli offline ]; + maintainers = with maintainers; [ flokli offline prusnak ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/gocryptfs/deps.nix b/pkgs/tools/filesystems/gocryptfs/deps.nix deleted file mode 100644 index cebad12327e..00000000000 --- a/pkgs/tools/filesystems/gocryptfs/deps.nix +++ /dev/null @@ -1,75 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/hanwen/go-fuse"; - fetch = { - type = "git"; - url = "https://github.com/hanwen/go-fuse"; - rev = "161a164844568ebf4bfaa68c90ba3a9f2914dda4"; - sha256 = "1r0rs76k9zg60i02jlcqxi7m4ivla1xwv3ijwav7pfbyyr1yqhsx"; - }; - } - { - goPackagePath = "github.com/jacobsa/crypto"; - fetch = { - type = "git"; - url = "https://github.com/jacobsa/crypto"; - rev = "9f44e2d11115452dad8f404f029574422855f46a"; - sha256 = "18c3cx8izxdajq22zdq0n19j9d2l6iickd3mz39j5h96kw7l5qmy"; - }; - } - { - goPackagePath = "github.com/pkg/xattr"; - fetch = { - type = "git"; - url = "https://github.com/pkg/xattr"; - rev = "7782c2d6871d6e659e1563dc19c86b845264a6fc"; - sha256 = "1j3z5b9nwgkxia925rkiq8n5avhf4zhmsdbpn2s3xb16a2w66prd"; - }; - } - { - goPackagePath = "github.com/rfjakob/eme"; - fetch = { - type = "git"; - url = "https://github.com/rfjakob/eme"; - rev = "2222dbd4ba467ab3fc7e8af41562fcfe69c0d770"; - sha256 = "0c227ly3z8pqaqg22lpd8nzgqrfsbjx5gi9rp9ks1cmd11dv2gl9"; - }; - } - { - goPackagePath = "github.com/sabhiram/go-gitignore"; - fetch = { - type = "git"; - url = "https://github.com/sabhiram/go-gitignore"; - rev = "d3107576ba9425fc1c85f4b3569c4631b805a02e"; - sha256 = "1rdwyxgcsiwgmlqnc3k6h300mzlvjc3j21np4yh1h476wc8dvl0l"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "a1f597ede03a7bef967a422b5b3a5bd08805a01e"; - sha256 = "0yiczljll72ip2vkxgd6052rhpaba37a68vf6si3v8s8s3g870lc"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "e225da77a7e68af35c70ccbf71af2b83e6acac3c"; - sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "61b9204099cb1bebc803c9ffb9b2d3acd9d457d9"; - sha256 = "110carnw1rxk9awbcdbg5is0zl28vynm649y7rza36pg1vlv8rrh"; - }; - } -] From c305f3fac34b3297c1883c0d79fa9d3e4a16a6ee Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 13 Sep 2020 13:21:56 +0100 Subject: [PATCH 086/463] pythonPackages.amply: init at 0.1.2 --- .../python-modules/amply/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/amply/default.nix diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix new file mode 100644 index 00000000000..e0e9100f792 --- /dev/null +++ b/pkgs/development/python-modules/amply/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, setuptools_scm +, docutils +, pyparsing +}: + +buildPythonPackage rec { + pname = "amply"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1j2dqdz1y1nbyw33qq89v0f5rkmqfbga72d9hax909vpcapm6pbf"; + }; + + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ + docutils + pyparsing + ]; + + checkPhase = '' + python tests/test_amply.py + ''; + pythonImportsCheck = [ "amply" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/willu47/amply"; + description = '' + Allows you to load and manipulate AMPL/GLPK data as Python data structures + ''; + maintainers = with maintainers; [ ris ]; + license = licenses.epl10; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca39973e002..dfcff182823 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -270,6 +270,8 @@ in { amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; + amply = callPackage ../development/python-modules/amply { }; + amqp = callPackage ../development/python-modules/amqp { }; amqplib = callPackage ../development/python-modules/amqplib { }; From 26e023bfa76ff83b97a7ae4ecafd8eb4614f7321 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 13 Sep 2020 13:23:13 +0100 Subject: [PATCH 087/463] pythonPackages.pulp: fix by adding new dependency amply --- pkgs/development/python-modules/pulp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 60b34f09833..a98c7a518d2 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -2,6 +2,7 @@ , fetchPypi , buildPythonPackage , pyparsing +, amply }: buildPythonPackage rec { @@ -13,7 +14,7 @@ buildPythonPackage rec { sha256 = "9d8ecf532868cc31fa9ff59ee5d5b2049600c5c902c18c794a2bad677c1f92e5"; }; - propagatedBuildInputs = [ pyparsing ]; + propagatedBuildInputs = [ pyparsing amply ]; # only one test that requires an extra doCheck = false; From 9be28ee3615d8c26e01b29103390a25634b0845e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 5 Sep 2020 15:50:54 +0200 Subject: [PATCH 088/463] libxsmm: 1.15 -> 1.16.1, improve derivation The following changes are made to the derivation besides the version bump: - Move all buildInputs to nativeBuildInputs. - Switch from Python 2 to Python 3. - Build a dynamic library by default. - Use gfortran version corresponding to gcc version. - Enable parallel building. --- .../development/libraries/libxsmm/default.nix | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix index 25c85948608..394347277f6 100644 --- a/pkgs/development/libraries/libxsmm/default.nix +++ b/pkgs/development/libraries/libxsmm/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchFromGitHub, coreutils, gfortran7, gnused -, python27, utillinux, which, bash +{ stdenv, fetchFromGitHub, coreutils, gfortran, gnused +, python3, utillinux, which + +, enableStatic ? false }: let - version = "1.15"; + version = "1.16.1"; in stdenv.mkDerivation { pname = "libxsmm"; inherit version; @@ -11,31 +13,40 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "hfp"; repo = "libxsmm"; - rev = "refs/tags/${version}"; - sha256 = "1406qk7k2k4qfqy4psqk55iihsrx91w8kjgsa82jxj50nl9nw5nj"; + rev = version; + sha256 = "1c1qj6hcdfx11bvilnly92vgk1niisd2bjw1s8vfyi2f7ws1wnp0"; }; - buildInputs = [ + nativeBuildInputs = [ coreutils - gfortran7 + gfortran gnused - python27 + python3 utillinux which ]; + enableParallelBuilding = true; + + dontConfigure = true; + + makeFlags = let + static = if enableStatic then "1" else "0"; + in [ + "OMP=1" + "PREFIX=$(out)" + "STATIC=${static}" + ]; + prePatch = '' patchShebangs . ''; - makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; license = licenses.bsd3; homepage = "https://github.com/hfp/libxsmm"; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ chessai ]; - inherit version; }; } From 8864a7c6ac6182ef01e15b0238693cbae0e55755 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 13 Sep 2020 14:56:41 +0200 Subject: [PATCH 089/463] Update rider --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 3c3d9fb0a5a..9c8c9d2cdf3 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -385,12 +385,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0xrk7n0mprzy7dfkx3vj5wasw5031jl61qkh89y6w031hp77vq7n"; /* updated by script */ + sha256 = "1v3n4mg8b55ni72bdgsgiwyqcvp9zhqlkqshscwfjggv0iai9r6p"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; From a4cdb9a6241cead067fbf68828a327c452c5caf3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 13 Sep 2020 16:16:00 +0300 Subject: [PATCH 090/463] gotify-server: 2.0.17 -> 2.0.18 Use new line in printf calls of update.sh, so editor config CI check won't fail. --- pkgs/servers/gotify/default.nix | 7 +- pkgs/servers/gotify/package.json | 63 +- pkgs/servers/gotify/source-sha.nix | 2 +- pkgs/servers/gotify/update.sh | 6 +- pkgs/servers/gotify/vendor-sha.nix | 2 +- pkgs/servers/gotify/version.nix | 2 +- pkgs/servers/gotify/yarndeps.nix | 2928 ++++++++++++++++------------ 7 files changed, 1681 insertions(+), 1329 deletions(-) diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 4360ac95b0b..924625ebd78 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -24,11 +24,6 @@ buildGoModule rec { doCheck = false; - postPatch = '' - substituteInPlace app.go \ - --replace 'Version = "unknown"' 'Version = "${version}"' - ''; - buildInputs = [ sqlite ]; ui = callPackage ./ui.nix { }; @@ -46,7 +41,7 @@ buildGoModule rec { subPackages = [ "." ]; buildFlagsArray = [ - "-ldflags='-X main.Version=${version} -X main.Mode=prod'" + "-ldflags=-X main.Version=${version} -X main.Mode=prod" ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/gotify/package.json b/pkgs/servers/gotify/package.json index 7e8defe3858..6224d533010 100644 --- a/pkgs/servers/gotify/package.json +++ b/pkgs/servers/gotify/package.json @@ -5,24 +5,24 @@ "homepage": ".", "proxy": "http://localhost:80", "dependencies": { - "@material-ui/core": "^4.9.5", + "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", - "axios": "^0.19.0", - "codemirror": "^5.43.0", - "detect-browser": "^5.1.0", - "js-base64": "^2.5.1", - "mobx": "^5.1.1", - "mobx-react": "^6.2.2", - "mobx-utils": "^5.0.2", + "axios": "^0.20.0", + "codemirror": "^5.57.0", + "detect-browser": "^5.1.1", + "js-base64": "^3.4.5", + "mobx": "^5.15.6", + "mobx-react": "^6.3.0", + "mobx-utils": "^5.6.1", "notifyjs": "^3.0.0", "prop-types": "^15.6.2", "react": "^16.4.2", - "react-codemirror2": "^7.1.0", + "react-codemirror2": "^7.2.1", "react-dom": "^16.4.2", "react-infinite": "^0.13.0", "react-markdown": "^4.0.6", - "react-router": "^5.1.2", - "react-router-dom": "^5.1.2", + "react-router": "^5.2.0", + "react-router-dom": "^5.2.0", "react-timeago": "^4.1.9", "remove-markdown": "^0.3.0", "typeface-roboto": "0.0.75" @@ -32,36 +32,41 @@ "build": "react-scripts build", "test": "react-scripts test --env=node", "eject": "react-scripts eject", - "lint": "tslint --project .", - "lintfix": "tslint --fix --project .", + "lint": "eslint \"src/*.{ts,tsx}\"", "format": "prettier \"src/**/*.{ts,tsx}\" --write", "testformat": "prettier \"src/**/*.{ts,tsx}\" --list-different" }, "devDependencies": { - "@types/codemirror": "0.0.91", + "@types/codemirror": "0.0.98", "@types/detect-browser": "^4.0.0", "@types/get-port": "^4.0.0", - "@types/jest": "^25.2.1", - "@types/js-base64": "^2.3.1", - "@types/node": "^13.13.5", - "@types/notifyjs": "^3.0.0", - "@types/puppeteer": "^2.0.1", - "@types/react": "^16.4.11", - "@types/react-dom": "^16.0.7", - "@types/react-infinite": "0.0.34", + "@types/jest": "^26.0.13", + "@types/js-base64": "^3.0.0", + "@types/node": "^14.10.1", + "@types/notifyjs": "^3.0.2", + "@types/puppeteer": "^3.0.2", + "@types/react": "^16.9.49", + "@types/react-dom": "^16.9.8", + "@types/react-infinite": "0.0.35", "@types/react-router-dom": "^5.1.5", "@types/remove-markdown": "^0.1.1", "@types/rimraf": "^3.0.0", + "@typescript-eslint/eslint-plugin": "^4.1.0", + "@typescript-eslint/parser": "^4.1.0", + "eslint-config-prettier": "^6.11.0", + "eslint-plugin-import": "^2.22.0", + "eslint-plugin-jest": "^24.0.0", + "eslint-plugin-prefer-arrow": "^1.2.2", + "eslint-plugin-react": "^7.20.6", + "eslint-plugin-unicorn": "^21.0.0", "get-port": "^5.1.1", - "prettier": "^2.0.5", - "puppeteer": "^3.0.4", - "react-scripts": "^3.4.1", + "prettier": "^2.1.1", + "puppeteer": "^5.3.0", + "react-scripts": "^3.4.3", "rimraf": "^3.0.2", "tree-kill": "^1.2.0", - "tslint": "^6.1.2", - "tslint-sonarts": "^1.7.0", - "typescript": "3.8.3", - "wait-on": "^5.0.0" + "typescript": "4.0.2", + "wait-on": "^5.2.0" }, "eslintConfig": { "extends": "react-app" diff --git a/pkgs/servers/gotify/source-sha.nix b/pkgs/servers/gotify/source-sha.nix index 2d7375fc9b5..8f20c05407c 100644 --- a/pkgs/servers/gotify/source-sha.nix +++ b/pkgs/servers/gotify/source-sha.nix @@ -1 +1 @@ -"0agnbpqzz751643c4s0fs10b3zw98pp8r9kys9p1vxbb3d6r2anb" \ No newline at end of file +"1v123j9d4psbg7pnqnc7bc9li2qyahapjbimmf0qpfxacx968gm9" diff --git a/pkgs/servers/gotify/update.sh b/pkgs/servers/gotify/update.sh index dc39a15be73..f0a40e30c91 100755 --- a/pkgs/servers/gotify/update.sh +++ b/pkgs/servers/gotify/update.sh @@ -9,11 +9,11 @@ latest_release=$(curl --silent https://api.github.com/repos/gotify/server/releas version=$(jq -r '.tag_name' <<<"$latest_release") echo got version $version echo \""${version#v}"\" > "$dirname/version.nix" -printf '%s' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix +printf '%s\n' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix tput setaf 1 echo zeroing vendorSha256 in $dirname/vendor-sha.nix tput sgr0 -printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/vendor-sha.nix +printf '"%s"\n' "0000000000000000000000000000000000000000000000000000" > $dirname/vendor-sha.nix GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$version" @@ -32,7 +32,7 @@ echo running nix-build for gotify itself in order to get vendorSha256 set +e vendorSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" set -e -printf '"%s"' "$vendorSha256" > $dirname/vendor-sha.nix +printf '"%s"\n' "$vendorSha256" > $dirname/vendor-sha.nix tput setaf 2 echo got vendorSha256 of: $vendorSha256 tput sgr0 diff --git a/pkgs/servers/gotify/vendor-sha.nix b/pkgs/servers/gotify/vendor-sha.nix index e8f40372339..f9e648a957e 100644 --- a/pkgs/servers/gotify/vendor-sha.nix +++ b/pkgs/servers/gotify/vendor-sha.nix @@ -1 +1 @@ -"0cczw8h1mibxmfgy2z6xnqq11x31ai17gnq2z4j5751b5finhqng" \ No newline at end of file +"1in4gzmrgb6z7p5fnz33f88g5l0vki2xlxlllk5wy9icp4h3h9sd" diff --git a/pkgs/servers/gotify/version.nix b/pkgs/servers/gotify/version.nix index 7473811783e..0018815632b 100644 --- a/pkgs/servers/gotify/version.nix +++ b/pkgs/servers/gotify/version.nix @@ -1 +1 @@ -"2.0.17" +"2.0.18" diff --git a/pkgs/servers/gotify/yarndeps.nix b/pkgs/servers/gotify/yarndeps.nix index 798c2787e34..c6631cd9606 100644 --- a/pkgs/servers/gotify/yarndeps.nix +++ b/pkgs/servers/gotify/yarndeps.nix @@ -10,11 +10,19 @@ }; } { - name = "_babel_compat_data___compat_data_7.9.6.tgz"; + name = "_babel_code_frame___code_frame_7.10.4.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz"; - sha1 = "3f604c40e420131affe6f2c8052e9a275ae2049b"; + name = "_babel_code_frame___code_frame_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; + sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; + }; + } + { + name = "_babel_compat_data___compat_data_7.11.0.tgz"; + path = fetchurl { + name = "_babel_compat_data___compat_data_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz"; + sha1 = "e9f73efe09af1355b723a7f39b11bad637d7c99c"; }; } { @@ -26,243 +34,251 @@ }; } { - name = "_babel_core___core_7.9.6.tgz"; + name = "_babel_core___core_7.11.6.tgz"; path = fetchurl { - name = "_babel_core___core_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz"; - sha1 = "d9aa1f580abf3b2286ef40b6904d390904c63376"; + name = "_babel_core___core_7.11.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz"; + sha1 = "3a9455dc7387ff1bac45770650bc13ba04a15651"; }; } { - name = "_babel_generator___generator_7.9.6.tgz"; + name = "_babel_generator___generator_7.11.6.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz"; - sha1 = "5408c82ac5de98cda0d77d8124e99fa1f2170a43"; + name = "_babel_generator___generator_7.11.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz"; + sha1 = "b868900f81b163b4d464ea24545c61cbac4dc620"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz"; - sha1 = "60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; + sha1 = "5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"; }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz"; - sha1 = "c84097a427a061ac56a1c30ebf54b7b22d241503"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; + sha1 = "bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"; }; } { - name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.5.tgz"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.11.5.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.5.tgz"; - sha1 = "0b4b3e04e6123f03b404ca4dfd6528fe6bb92fe3"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz"; + sha1 = "4ea43dd63857b0a35cd1f1b161dc29b43414e79f"; }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz"; - sha1 = "16bf391990b57732700a3278d4d9a81231ea8d32"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz"; + sha1 = "8095cddbff858e6fa9c326daee54a2f2732c1d5d"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.9.6.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz"; - sha1 = "1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz"; + sha1 = "804ae8e3f04376607cc791b9d47d540276332bd2"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.9.6.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.5.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz"; - sha1 = "965c8b0a9f051801fd9d3b372ca0ccf200a90897"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"; + sha1 = "9f61446ba80e8240b0a5c85c6fdac8459d6f259d"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz"; - sha1 = "5d84180b588f560b7864efaeea89243e58312087"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz"; + sha1 = "fdd60d88524659a0b6959c0579925e425714f3b8"; }; } { - name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; + name = "_babel_helper_define_map___helper_define_map_7.10.5.tgz"; path = fetchurl { - name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz"; - sha1 = "a0655cad5451c3760b726eba875f1cd8faa02c15"; + name = "_babel_helper_define_map___helper_define_map_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; + sha1 = "b53c10db78a640800152692b13393147acb9bb30"; }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.11.4.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz"; - sha1 = "a728dc5b4e89e30fc2dfc7d04fa28a930653f982"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.11.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz"; + sha1 = "2d8e3470252cc17aba917ede7803d4a7a276a41b"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz"; - sha1 = "2b53820d35275120e1874a82e5aabe1376920a5c"; + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; + sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; - sha1 = "b894b947bd004381ce63ea1db9f08547e920abd5"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; + sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz"; - sha1 = "1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; + sha1 = "d49b001d1d5a68ca5e6604dda01a6297f7c9381e"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz"; - sha1 = "659b710498ea6c1d9907e0c73f206eee7dadc24c"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; + sha1 = "ae69c83d84ee82f4b42f96e2a09410935a8f26df"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; - sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498"; + name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; + sha1 = "4c5c54be04bd31670a7382797d75b9fa2e5b5620"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; - sha1 = "43b34dfe15961918707d247327431388e9fe96e5"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; + sha1 = "b16f250229e47211abdd84b34b64737c2ab2d359"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz"; - sha1 = "7ed071813d09c75298ef4f208956006b6111ecb9"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; + sha1 = "50dc96413d594f995a77905905b05893cd779673"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz"; - sha1 = "9ea293be19babc0f52ff8ca88b34c3611b208670"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; + sha1 = "2f75a831269d4f677de49986dff59927533cf375"; }; } { - name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; + name = "_babel_helper_regex___helper_regex_7.10.5.tgz"; path = fetchurl { - name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz"; - sha1 = "139772607d51b93f23effe72105b319d2a4c6965"; + name = "_babel_helper_regex___helper_regex_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz"; + sha1 = "32dfbb79899073c415557053a19bd055aae50ae0"; }; } { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.11.4.tgz"; path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz"; - sha1 = "273c600d8b9bf5006142c1e35887d555c12edd86"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.11.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz"; + sha1 = "4474ea9f7438f18575e30b0cac784045b402a12d"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.9.6.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz"; - sha1 = "03149d7e6a5586ab6764996cd31d6981a17e1444"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; + sha1 = "d585cd9388ea06e6031e4cd44b6713cbead9e6cf"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz"; - sha1 = "7f8109928b4dab4654076986af575231deb639ae"; + name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; + sha1 = "0f5ccda2945277a2a7a2d3a821e15395edcf3461"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; - sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9"; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"; + sha1 = "eec162f112c2f58d3af0af125e3bb57665146729"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; - sha1 = "90977a8e6fbf6b431a7dc31752eee233bf052d80"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; + sha1 = "f8a491244acf6a676158ac42072911ba83ad099f"; }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz"; - sha1 = "9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; + sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; }; } { - name = "_babel_helpers___helpers_7.9.6.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz"; - sha1 = "092c774743471d0bb6c7de3ad465ab3d3486d580"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"; + sha1 = "8a6f701eab0ff39f765b5a1cfef409990e624b87"; }; } { - name = "_babel_highlight___highlight_7.9.0.tgz"; + name = "_babel_helpers___helpers_7.10.4.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz"; - sha1 = "4e9b45ccb82b79607271b2979ad82c7b68163079"; + name = "_babel_helpers___helpers_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz"; + sha1 = "2abeb0d721aff7c0a97376b9e1f6f65d7a475044"; }; } { - name = "_babel_parser___parser_7.9.6.tgz"; + name = "_babel_highlight___highlight_7.10.4.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz"; - sha1 = "3b1bbb30dabe600cd72db58720998376ff653bc7"; + name = "_babel_highlight___highlight_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; + sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; + name = "_babel_parser___parser_7.11.5.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz"; - sha1 = "bad329c670b382589721b27540c7d288601c6e6f"; + name = "_babel_parser___parser_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz"; + sha1 = "c7ff6303df71080ec7a4f5b8c003c58f1cf51037"; + }; + } + { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz"; + sha1 = "3491cabf2f7c179ab820606cec27fed15e0e8558"; }; } { @@ -273,6 +289,14 @@ sha1 = "5e06654af5cd04b608915aada9b2a6788004464e"; }; } + { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz"; + sha1 = "a33bf632da390a59c7a8c570045d1115cd778807"; + }; + } { name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.tgz"; path = fetchurl { @@ -282,19 +306,35 @@ }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz"; - sha1 = "38c4fe555744826e97e2ae930b0fb4cc07e66054"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz"; + sha1 = "ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz"; - sha1 = "da5216b238a98b58a1e05d6852104b10f9a70d6b"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"; + sha1 = "570d883b91031637b3e2958eea3c438e62c05f54"; + }; + } + { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz"; + sha1 = "593e59c63528160233bd321b1aebe0820c2341db"; + }; + } + { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.11.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"; + sha1 = "9f80e482c03083c87125dee10026b58527ea20c8"; }; } { @@ -305,6 +345,14 @@ sha1 = "e4572253fdeed65cddeecfdab3f928afeb2fd5d2"; }; } + { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz"; + sha1 = "02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"; + }; + } { name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz"; path = fetchurl { @@ -314,19 +362,27 @@ }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.6.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz"; - sha1 = "7a093586fcb18b08266eb1a7177da671ac575b63"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz"; + sha1 = "ce1590ff0a65ad12970a609d78855e9a4c1aef06"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.11.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz"; - sha1 = "9dee96ab1650eed88646ae9734ca167ac4a9c5c9"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz"; + sha1 = "bd81f95a1f746760ea43b6c2d3d62b11790ad0af"; + }; + } + { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz"; + sha1 = "31c938309d24a78a49d68fdabffaa863758554dd"; }; } { @@ -338,11 +394,27 @@ }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.11.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz"; - sha1 = "ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"; + sha1 = "de5866d0646f6afdaab8a566382fe3a221755076"; + }; + } + { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz"; + sha1 = "b160d972b8fdba5c7d111a145fc8c421fc2a6909"; + }; + } + { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz"; + sha1 = "4483cda53041ce3413b7fe2f00022665ddfaa75d"; }; } { @@ -354,11 +426,19 @@ }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz"; - sha1 = "8d2c15a9f1af624b0025f961682a9d53d3001bda"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz"; + sha1 = "6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"; + }; + } + { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz"; + sha1 = "6853085b2c429f9d322d02f5a635018cdeb2360c"; }; } { @@ -370,11 +450,19 @@ }; } { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz"; - sha1 = "f2c883bd61a6316f2c89380ae5122f923ba4527f"; + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha1 = "028964a9ba80dbc094c915c487ad7c4e7a66465a"; + }; + } + { + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz"; + sha1 = "53351dd7ae01995e567d04ce42af1a6e0ba846a6"; }; } { @@ -386,11 +474,19 @@ }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz"; - sha1 = "521b06c83c40480f1e58b4fd33b92eceb1d6ea94"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz"; + sha1 = "39abaae3cbf710c4373d8429484e6ba21340166c"; + }; + } + { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha1 = "ca91ef46303530448b906652bac2e9fe9941f699"; }; } { @@ -402,11 +498,11 @@ }; } { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz"; - sha1 = "0e3fb63e09bea1b11e96467271c8308007e7c41f"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha1 = "b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"; }; } { @@ -434,99 +530,99 @@ }; } { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz"; - sha1 = "3acdece695e6b13aaf57fc291d1a800950c71391"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz"; + sha1 = "4bbeb8917b54fcf768364e0a81f560e33a3ef57d"; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz"; - sha1 = "c1f659dda97711a569cef75275f7e15dcaa6cabc"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz"; + sha1 = "2f55e770d3501e83af217d782cb7517d7bb34d25"; }; } { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz"; - sha1 = "82776c2ed0cd9e1a49956daeb896024c9473b8b6"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz"; + sha1 = "e22960d77e697c74f41c501d44d73dbf8a6a64cd"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz"; - sha1 = "4308fad0d9409d71eafb9b1a6ee35f9d64b64086"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz"; + sha1 = "41a5017e49eb6f3cda9392a51eef29405b245a37"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz"; - sha1 = "437eec5b799b5852072084b3ae5ef66e8349e8a3"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz"; + sha1 = "1afa595744f75e43a91af73b0d998ecfe4ebc2e8"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.11.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz"; - sha1 = "97d35dab66857a437c166358b91d09050c868f3a"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.11.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"; + sha1 = "5b7efe98852bef8d652c0b28144cd93a9e4b5215"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.5.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz"; - sha1 = "800597ddb8aefc2c293ed27459c1fcc935a26c2c"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz"; + sha1 = "405136af2b3e218bc4a1926228bc917ab1a0adc7"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz"; - sha1 = "96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz"; + sha1 = "9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"; }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.9.5.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.9.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz"; - sha1 = "72c97cf5f38604aea3abf3b935b0e17b1db76a50"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz"; + sha1 = "70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz"; - sha1 = "c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz"; + sha1 = "469c2062105c1eb6a040eaf4fac4b488078395ee"; }; } { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz"; - sha1 = "8d12df309aa537f272899c565ea1768e286e21f1"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz"; + sha1 = "697e50c9fee14380fe843d1f306b295617431e47"; }; } { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz"; - sha1 = "581a6d7f56970e06bf51560cd64f5e947b70d7b7"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz"; + sha1 = "5ae338c57f8cf4001bdb35607ae66b92d665af2e"; }; } { @@ -538,115 +634,115 @@ }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; - sha1 = "0f260e27d3e29cd1bb3128da5e76c761aa6c108e"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz"; + sha1 = "c08892e8819d3a5db29031b115af511dbbfebae9"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz"; - sha1 = "279373cb27322aaad67c2683e776dfc47196ed8b"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz"; + sha1 = "6a467880e0fc9638514ba369111811ddbe2644b7"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz"; - sha1 = "aef239823d91994ec7b68e55193525d76dbd5dc1"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz"; + sha1 = "9f42ba0841100a135f22712d0e391c462f571f3c"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz"; - sha1 = "963fed4b620ac7cbf6029c755424029fa3a40410"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz"; + sha1 = "b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.6.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz"; - sha1 = "8539ec42c153d12ea3836e0e3ac30d5aae7b258e"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz"; + sha1 = "1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.6.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz"; - sha1 = "64b7474a4279ee588cacd1906695ca721687c277"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz"; + sha1 = "66667c3eeda1ebf7896d41f1f16b17105a2fbca0"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.6.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz"; - sha1 = "207f1461c78a231d5337a92140e52422510d81a4"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz"; + sha1 = "6270099c854066681bae9e05f87e1b9cadbe8c85"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; - sha1 = "e909acae276fec280f9b821a5f38e1f08b480697"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz"; + sha1 = "9a8481fe81b824654b3a0b65da3df89f3d21839e"; }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz"; - sha1 = "a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz"; + sha1 = "78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"; }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz"; - sha1 = "60cc2ae66d85c95ab540eb34babb6434d4c70c43"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz"; + sha1 = "9097d753cb7b024cb7381a3b2e52e9513a9c6888"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz"; - sha1 = "ebb6a1e7a86ffa96858bd6ac0102d65944261725"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz"; + sha1 = "d7146c4d139433e7a6526f888c667e314a093894"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.9.5.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.9.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz"; - sha1 = "173b265746f5e15b2afe527eeda65b73623a0795"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz"; + sha1 = "59d339d58d0b1950435f4043e74e2510005e2c4a"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz"; - sha1 = "33194300d8539c1ed28c62ad5087ba3807b98263"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz"; + sha1 = "f6fe54b6590352298785b83edd815d214c42e3c0"; }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz"; - sha1 = "a75abc936a3819edec42d3386d9f1c93f28d9d9e"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.4.tgz"; + sha1 = "0f485260bf1c29012bb973e7e404749eaac12c9e"; }; } { @@ -658,51 +754,67 @@ }; } { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz"; - sha1 = "3c2a130727caf00c2a293f0aed24520825dbf754"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz"; + sha1 = "b5795f4e3e3140419c3611b7a2a3832b9aef328d"; }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.11.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz"; - sha1 = "f4f26a325820205239bb915bad8e06fcadabb49b"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.11.5.tgz"; + sha1 = "e1439e6a57ee3d43e9f54ace363fb29cefe5d7b6"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz"; - sha1 = "89ef93025240dd5d17d3122294a093e5e0183de0"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz"; + sha1 = "cd301a5fed8988c182ed0b9d55e9bd6db0bd9369"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.4.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz"; - sha1 = "86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz"; + sha1 = "34f1779117520a779c054f2cdd9680435b9222b4"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz"; - sha1 = "5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz"; + sha1 = "673c9f913948764a4421683b2bef2936968fddf2"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz"; - sha1 = "9a0635ac4e665d29b162837dd3cc50745dfdf1f5"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz"; + sha1 = "3eefbb73db94afbc075f097523e445354a1c6501"; + }; + } + { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz"; + sha1 = "2015e59d839074e76838de2159db421966fd8b63"; + }; + } + { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz"; + sha1 = "8f2682bcdcef9ed327e1b0861585d7013f8a54dd"; }; } { @@ -714,59 +826,67 @@ }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz"; - sha1 = "28545216e023a832d4d3a1185ed492bcfeac08c8"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz"; + sha1 = "9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.11.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz"; - sha1 = "9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"; + sha1 = "fa84d300f5e4f57752fe41a6d1b3c554f13f17cc"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz"; - sha1 = "be7a1290f81dae767475452199e1f76d6175b100"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz"; + sha1 = "8f3889ee8657581130a29d9cc91d7c73b7c4a28d"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz"; - sha1 = "7bfa4732b455ea6a43130adc0ba767ec0e402a80"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz"; + sha1 = "78bc5d626a6642db3312d9d0f001f5e7639fde8c"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz"; - sha1 = "ede4062315ce0aaf8a657a920858f1a2f35fc412"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz"; + sha1 = "9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"; }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.6.tgz"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.11.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz"; - sha1 = "2248971416a506fc78278fc0c0ea3179224af1e9"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz"; + sha1 = "2b4879676af37342ebb278216dd090ac67f13abb"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz"; - sha1 = "0cef36e3ba73e5c57273effb182f46b91a1ecaad"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz"; + sha1 = "feae523391c7651ddac115dae0a9d06857892007"; + }; + } + { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz"; + sha1 = "e56d71f9282fac6db09c82742055576d5e6d80a8"; }; } { @@ -778,19 +898,19 @@ }; } { - name = "_babel_preset_env___preset_env_7.9.6.tgz"; + name = "_babel_preset_env___preset_env_7.11.5.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz"; - sha1 = "df063b276c6455ec6fcfc6e53aacc38da9b0aea6"; + name = "_babel_preset_env___preset_env_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.5.tgz"; + sha1 = "18cb4b9379e3e92ffea92c07471a99a2914e4272"; }; } { - name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; path = fetchurl { - name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; - sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"; + name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; + sha1 = "362f2b68c662842970fdb5e254ffc8fc1c2e415e"; }; } { @@ -802,11 +922,11 @@ }; } { - name = "_babel_preset_react___preset_react_7.9.4.tgz"; + name = "_babel_preset_react___preset_react_7.10.4.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.9.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz"; - sha1 = "c6c97693ac65b6b9c0b4f25b948a8f665463014d"; + name = "_babel_preset_react___preset_react_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz"; + sha1 = "92e8a66d816f9911d11d4cc935be67adfc82dbcf"; }; } { @@ -818,11 +938,11 @@ }; } { - name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.11.2.tgz"; path = fetchurl { - name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz"; - sha1 = "67aded13fffbbc2cb93247388cf84d77a4be9a71"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.11.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz"; + sha1 = "02c3029743150188edeb66541195f54600278419"; }; } { @@ -834,35 +954,35 @@ }; } { - name = "_babel_runtime___runtime_7.9.6.tgz"; + name = "_babel_runtime___runtime_7.11.2.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; - sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; + name = "_babel_runtime___runtime_7.11.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz"; + sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736"; }; } { - name = "_babel_template___template_7.8.6.tgz"; + name = "_babel_template___template_7.10.4.tgz"; path = fetchurl { - name = "_babel_template___template_7.8.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz"; - sha1 = "86b22af15f828dfb086474f964dcc3e39c43ce2b"; + name = "_babel_template___template_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz"; + sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; }; } { - name = "_babel_traverse___traverse_7.9.6.tgz"; + name = "_babel_traverse___traverse_7.11.5.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz"; - sha1 = "5540d7577697bf619cc57b92aa0f1c231a94f442"; + name = "_babel_traverse___traverse_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz"; + sha1 = "be777b93b518eb6d76ee2e1ea1d143daa11e61c3"; }; } { - name = "_babel_types___types_7.9.6.tgz"; + name = "_babel_types___types_7.11.5.tgz"; path = fetchurl { - name = "_babel_types___types_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz"; - sha1 = "2c5502b427251e9de1bd2dff95add646d95cc9f7"; + name = "_babel_types___types_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz"; + sha1 = "d9de577d01252d77c6800cee039ee64faf75662d"; }; } { @@ -906,11 +1026,11 @@ }; } { - name = "_hapi_address___address_4.0.1.tgz"; + name = "_hapi_address___address_4.1.0.tgz"; path = fetchurl { - name = "_hapi_address___address_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.1.tgz"; - sha1 = "267301ddf7bc453718377a6fb3832a2f04a721dd"; + name = "_hapi_address___address_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/address/-/address-4.1.0.tgz"; + sha1 = "d60c5c0d930e77456fdcde2598e77302e2955e1d"; }; } { @@ -938,11 +1058,11 @@ }; } { - name = "_hapi_hoek___hoek_9.0.4.tgz"; + name = "_hapi_hoek___hoek_9.1.0.tgz"; path = fetchurl { - name = "_hapi_hoek___hoek_9.0.4.tgz"; - url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.0.4.tgz"; - sha1 = "e80ad4e8e8d2adc6c77d985f698447e8628b6010"; + name = "_hapi_hoek___hoek_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.0.tgz"; + sha1 = "6c9eafc78c1529248f8f4d92b0799a712b6052c6"; }; } { @@ -953,14 +1073,6 @@ sha1 = "c675b8a71296f02833f8d6d243b34c57b8ce19d7"; }; } - { - name = "_hapi_joi___joi_17.1.1.tgz"; - path = fetchurl { - name = "_hapi_joi___joi_17.1.1.tgz"; - url = "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.1.tgz"; - sha1 = "9cc8d7e2c2213d1e46708c6260184b447c661350"; - }; - } { name = "_hapi_pinpoint___pinpoint_2.0.0.tgz"; path = fetchurl { @@ -1074,11 +1186,11 @@ }; } { - name = "_material_ui_core___core_4.9.13.tgz"; + name = "_material_ui_core___core_4.11.0.tgz"; path = fetchurl { - name = "_material_ui_core___core_4.9.13.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.13.tgz"; - sha1 = "024962bcdda05139e1bad17a1815bf4088702b15"; + name = "_material_ui_core___core_4.11.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.0.tgz"; + sha1 = "b69b26e4553c9e53f2bfaf1053e216a0af9be15a"; }; } { @@ -1090,43 +1202,35 @@ }; } { - name = "_material_ui_react_transition_group___react_transition_group_4.3.0.tgz"; + name = "_material_ui_styles___styles_4.10.0.tgz"; path = fetchurl { - name = "_material_ui_react_transition_group___react_transition_group_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/react-transition-group/-/react-transition-group-4.3.0.tgz"; - sha1 = "92529142addb5cc179dbf42d246c7e3fe4d6104b"; + name = "_material_ui_styles___styles_4.10.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.10.0.tgz"; + sha1 = "2406dc23aa358217aa8cc772e6237bd7f0544071"; }; } { - name = "_material_ui_styles___styles_4.9.13.tgz"; + name = "_material_ui_system___system_4.9.14.tgz"; path = fetchurl { - name = "_material_ui_styles___styles_4.9.13.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.13.tgz"; - sha1 = "08b3976bdd21c38bc076693d95834f97539f3b15"; + name = "_material_ui_system___system_4.9.14.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.14.tgz"; + sha1 = "4b00c48b569340cefb2036d0596b93ac6c587a5f"; }; } { - name = "_material_ui_system___system_4.9.13.tgz"; + name = "_material_ui_types___types_5.1.0.tgz"; path = fetchurl { - name = "_material_ui_system___system_4.9.13.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.13.tgz"; - sha1 = "adefb3b6a5ddf0b00fe4e82ac63bb48276e9749d"; + name = "_material_ui_types___types_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz"; + sha1 = "efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"; }; } { - name = "_material_ui_types___types_5.0.1.tgz"; + name = "_material_ui_utils___utils_4.10.2.tgz"; path = fetchurl { - name = "_material_ui_types___types_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.1.tgz"; - sha1 = "c4954063cdc196eb327ee62c041368b1aebb6d61"; - }; - } - { - name = "_material_ui_utils___utils_4.9.12.tgz"; - path = fetchurl { - name = "_material_ui_utils___utils_4.9.12.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.9.12.tgz"; - sha1 = "0d639f1c1ed83fffb2ae10c21d15a938795d9e65"; + name = "_material_ui_utils___utils_4.10.2.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.10.2.tgz"; + sha1 = "3fd5470ca61b7341f1e0468ac8f29a70bf6df321"; }; } { @@ -1137,6 +1241,22 @@ sha1 = "524af240d1a360527b730475ecfa1344aa540dde"; }; } + { + name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; + path = fetchurl { + name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; + sha1 = "3a582bdb53804c6ba6d146579c46e52130cf4a3b"; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; + sha1 = "34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"; + }; + } { name = "_nodelib_fs.stat___fs.stat_1.1.3.tgz"; path = fetchurl { @@ -1145,6 +1265,14 @@ sha1 = "2b5a3ab3f918cca48a8c754c08168e3f03eba61b"; }; } + { + name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; + sha1 = "011b9202a70a6366e436ca5c065844528ab04976"; + }; + } { name = "_svgr_babel_plugin_add_jsx_attribute___babel_plugin_add_jsx_attribute_4.2.0.tgz"; path = fetchurl { @@ -1258,11 +1386,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.7.tgz"; + name = "_types_babel__core___babel__core_7.1.9.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.7.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz"; - sha1 = "1dacad8840364a57c98d0dd4855c6dd3752c6b89"; + name = "_types_babel__core___babel__core_7.1.9.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz"; + sha1 = "77e59d438522a6fb898fa43dc3455c6e72f3963d"; }; } { @@ -1282,19 +1410,19 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.0.11.tgz"; + name = "_types_babel__traverse___babel__traverse_7.0.14.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.0.11.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.11.tgz"; - sha1 = "1ae3010e8bf8851d324878b42acec71986486d18"; + name = "_types_babel__traverse___babel__traverse_7.0.14.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.14.tgz"; + sha1 = "e99da8c075d4fb098c774ba65dabf7dc9954bd13"; }; } { - name = "_types_codemirror___codemirror_0.0.91.tgz"; + name = "_types_codemirror___codemirror_0.0.98.tgz"; path = fetchurl { - name = "_types_codemirror___codemirror_0.0.91.tgz"; - url = "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.91.tgz"; - sha1 = "4cb9832388726e57e747f0e3a8ab69105ad02a66"; + name = "_types_codemirror___codemirror_0.0.98.tgz"; + url = "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.98.tgz"; + sha1 = "b35c7a4ab1fc1684b08a4e3eb65240020556ebfb"; }; } { @@ -1322,19 +1450,11 @@ }; } { - name = "_types_estree___estree_0.0.44.tgz"; + name = "_types_estree___estree_0.0.45.tgz"; path = fetchurl { - name = "_types_estree___estree_0.0.44.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.44.tgz"; - sha1 = "980cc5a29a3ef3bea6ff1f7d021047d7ea575e21"; - }; - } - { - name = "_types_events___events_3.0.0.tgz"; - path = fetchurl { - name = "_types_events___events_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz"; - sha1 = "2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"; + name = "_types_estree___estree_0.0.45.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz"; + sha1 = "e9387572998e5ecdac221950dab3e8c3b16af884"; }; } { @@ -1346,27 +1466,27 @@ }; } { - name = "_types_glob___glob_7.1.1.tgz"; + name = "_types_glob___glob_7.1.3.tgz"; path = fetchurl { - name = "_types_glob___glob_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz"; - sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575"; + name = "_types_glob___glob_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz"; + sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; }; } { - name = "_types_history___history_4.7.5.tgz"; + name = "_types_history___history_4.7.7.tgz"; path = fetchurl { - name = "_types_history___history_4.7.5.tgz"; - url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.5.tgz"; - sha1 = "527d20ef68571a4af02ed74350164e7a67544860"; + name = "_types_history___history_4.7.7.tgz"; + url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.7.tgz"; + sha1 = "613957d900fab9ff84c8dfb24fa3eef0c2a40896"; }; } { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz"; + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; path = fetchurl { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz"; - sha1 = "42995b446db9a48a11a07ec083499a860e9138ff"; + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; + sha1 = "4ba8ddb720221f432e443bd5f9117fd22cfd4762"; }; } { @@ -1378,35 +1498,43 @@ }; } { - name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz"; + name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; path = fetchurl { - name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz"; - sha1 = "7a8cbf6a406f36c8add871625b278eaf0b0d255a"; + name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz"; + sha1 = "e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"; }; } { - name = "_types_jest___jest_25.2.1.tgz"; + name = "_types_jest___jest_26.0.13.tgz"; path = fetchurl { - name = "_types_jest___jest_25.2.1.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.1.tgz"; - sha1 = "9544cd438607955381c1bdbdb97767a249297db5"; + name = "_types_jest___jest_26.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.13.tgz"; + sha1 = "5a7b9d5312f5dd521a38329c38ee9d3802a0b85e"; }; } { - name = "_types_js_base64___js_base64_2.3.1.tgz"; + name = "_types_js_base64___js_base64_3.0.0.tgz"; path = fetchurl { - name = "_types_js_base64___js_base64_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/@types/js-base64/-/js-base64-2.3.1.tgz"; - sha1 = "c39f14f129408a3d96a1105a650d8b2b6eeb4168"; + name = "_types_js_base64___js_base64_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/js-base64/-/js-base64-3.0.0.tgz"; + sha1 = "b7b4c130facefefd5c57ba82664c41e2995f91be"; }; } { - name = "_types_json_schema___json_schema_7.0.4.tgz"; + name = "_types_json_schema___json_schema_7.0.6.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz"; - sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"; + name = "_types_json_schema___json_schema_7.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; + }; + } + { + name = "_types_json5___json5_0.0.29.tgz"; + path = fetchurl { + name = "_types_json5___json5_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; + sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; }; } { @@ -1418,19 +1546,27 @@ }; } { - name = "_types_node___node_13.13.5.tgz"; + name = "_types_node___node_14.10.1.tgz"; path = fetchurl { - name = "_types_node___node_13.13.5.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-13.13.5.tgz"; - sha1 = "96ec3b0afafd64a4ccea9107b75bf8489f0e5765"; + name = "_types_node___node_14.10.1.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.10.1.tgz"; + sha1 = "cc323bad8e8a533d4822f45ce4e5326f36e42177"; }; } { - name = "_types_notifyjs___notifyjs_3.0.1.tgz"; + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; path = fetchurl { - name = "_types_notifyjs___notifyjs_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.1.tgz"; - sha1 = "eba3bec10e44309df4aba31a73bfd26a562bc755"; + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e"; + }; + } + { + name = "_types_notifyjs___notifyjs_3.0.2.tgz"; + path = fetchurl { + name = "_types_notifyjs___notifyjs_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.2.tgz"; + sha1 = "97451aa8225e7bbf4f73bf0cb6f9fd2e12889719"; }; } { @@ -1450,35 +1586,35 @@ }; } { - name = "_types_puppeteer___puppeteer_2.0.1.tgz"; + name = "_types_puppeteer___puppeteer_3.0.2.tgz"; path = fetchurl { - name = "_types_puppeteer___puppeteer_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-2.0.1.tgz"; - sha1 = "83a1d7f0a1c2e0edbbb488b4d8fb54b14ec9d455"; + name = "_types_puppeteer___puppeteer_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-3.0.2.tgz"; + sha1 = "20085220593b560c7332b6d46aecaf81ae263540"; }; } { - name = "_types_q___q_1.5.2.tgz"; + name = "_types_q___q_1.5.4.tgz"; path = fetchurl { - name = "_types_q___q_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz"; - sha1 = "690a1475b84f2a884fd07cd797c00f5f31356ea8"; + name = "_types_q___q_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz"; + sha1 = "15925414e0ad2cd765bfef58842f7e26a7accb24"; }; } { - name = "_types_react_dom___react_dom_16.9.7.tgz"; + name = "_types_react_dom___react_dom_16.9.8.tgz"; path = fetchurl { - name = "_types_react_dom___react_dom_16.9.7.tgz"; - url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.7.tgz"; - sha1 = "60844d48ce252d7b2dccf0c7bb937130e27c0cd2"; + name = "_types_react_dom___react_dom_16.9.8.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz"; + sha1 = "fe4c1e11dfc67155733dfa6aa65108b4971cb423"; }; } { - name = "_types_react_infinite___react_infinite_0.0.34.tgz"; + name = "_types_react_infinite___react_infinite_0.0.35.tgz"; path = fetchurl { - name = "_types_react_infinite___react_infinite_0.0.34.tgz"; - url = "https://registry.yarnpkg.com/@types/react-infinite/-/react-infinite-0.0.34.tgz"; - sha1 = "0b514f65c4ba80ad22dea079075e04345ddcaae2"; + name = "_types_react_infinite___react_infinite_0.0.35.tgz"; + url = "https://registry.yarnpkg.com/@types/react-infinite/-/react-infinite-0.0.35.tgz"; + sha1 = "0199474dcafe4a41c30d22a19ccafd8901634fb6"; }; } { @@ -1490,27 +1626,27 @@ }; } { - name = "_types_react_router___react_router_5.1.7.tgz"; + name = "_types_react_router___react_router_5.1.8.tgz"; path = fetchurl { - name = "_types_react_router___react_router_5.1.7.tgz"; - url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.7.tgz"; - sha1 = "e9d12ed7dcfc79187e4d36667745b69a5aa11556"; + name = "_types_react_router___react_router_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.8.tgz"; + sha1 = "4614e5ba7559657438e17766bb95ef6ed6acc3fa"; }; } { - name = "_types_react_transition_group___react_transition_group_4.2.4.tgz"; + name = "_types_react_transition_group___react_transition_group_4.4.0.tgz"; path = fetchurl { - name = "_types_react_transition_group___react_transition_group_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.2.4.tgz"; - sha1 = "c7416225987ccdb719262766c1483da8f826838d"; + name = "_types_react_transition_group___react_transition_group_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.0.tgz"; + sha1 = "882839db465df1320e4753e6e9f70ca7e9b4d46d"; }; } { - name = "_types_react___react_16.9.34.tgz"; + name = "_types_react___react_16.9.49.tgz"; path = fetchurl { - name = "_types_react___react_16.9.34.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz"; - sha1 = "f7d5e331c468f53affed17a8a4d488cd44ea9349"; + name = "_types_react___react_16.9.49.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.49.tgz"; + sha1 = "09db021cf8089aba0cdb12a49f8021a69cce4872"; }; } { @@ -1554,19 +1690,19 @@ }; } { - name = "_types_yargs___yargs_13.0.8.tgz"; + name = "_types_yargs___yargs_13.0.10.tgz"; path = fetchurl { - name = "_types_yargs___yargs_13.0.8.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz"; - sha1 = "a38c22def2f1c2068f8971acb3ea734eb3c64a99"; + name = "_types_yargs___yargs_13.0.10.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.10.tgz"; + sha1 = "e77bf3fc73c781d48c2eb541f87c453e321e5f4b"; }; } { - name = "_types_yargs___yargs_15.0.4.tgz"; + name = "_types_yargs___yargs_15.0.5.tgz"; path = fetchurl { - name = "_types_yargs___yargs_15.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz"; - sha1 = "7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"; + name = "_types_yargs___yargs_15.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz"; + sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79"; }; } { @@ -1578,35 +1714,91 @@ }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.31.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.34.0.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.31.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz"; - sha1 = "942c921fec5e200b79593c71fafb1e3f57aa2e36"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.34.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz"; + sha1 = "6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.31.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.1.0.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.31.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.31.0.tgz"; - sha1 = "a9ec514bf7fd5e5e82bc10dcb6a86d58baae9508"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.1.0.tgz"; + sha1 = "7d309f60815ff35e9627ad85e41928d7b7fd443f"; }; } { - name = "_typescript_eslint_parser___parser_2.31.0.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.34.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_2.31.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.31.0.tgz"; - sha1 = "beddd4e8efe64995108b229b2862cd5752d40d6f"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.34.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz"; + sha1 = "d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.31.0.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_4.1.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.31.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.31.0.tgz"; - sha1 = "ac536c2d46672aa1f27ba0ec2140d53670635cfd"; + name = "_typescript_eslint_experimental_utils___experimental_utils_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.1.0.tgz"; + sha1 = "263d7225645c09a411c8735eeffd417f50f49026"; + }; + } + { + name = "_typescript_eslint_parser___parser_2.34.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_parser___parser_2.34.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz"; + sha1 = "50252630ca319685420e9a39ca05fe185a256bc8"; + }; + } + { + name = "_typescript_eslint_parser___parser_4.1.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_parser___parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.1.0.tgz"; + sha1 = "9b0409411725f14cd7faa81a664e5051225961db"; + }; + } + { + name = "_typescript_eslint_scope_manager___scope_manager_4.1.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_scope_manager___scope_manager_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.1.0.tgz"; + sha1 = "9e389745ee9cfe12252ed1e9958808abd6b3a683"; + }; + } + { + name = "_typescript_eslint_types___types_4.1.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_types___types_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.1.0.tgz"; + sha1 = "edbd3fec346f34e13ce7aa176b03b497a32c496a"; + }; + } + { + name = "_typescript_eslint_typescript_estree___typescript_estree_2.34.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_typescript_estree___typescript_estree_2.34.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz"; + sha1 = "14aeb6353b39ef0732cc7f1b8285294937cf37d5"; + }; + } + { + name = "_typescript_eslint_typescript_estree___typescript_estree_4.1.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_typescript_estree___typescript_estree_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.1.0.tgz"; + sha1 = "394046ead25164494218c0e3d6b960695ea967f6"; + }; + } + { + name = "_typescript_eslint_visitor_keys___visitor_keys_4.1.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_visitor_keys___visitor_keys_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.1.0.tgz"; + sha1 = "b2d528c9484e7eda1aa4f86ccf0432fb16e4d545"; }; } { @@ -1770,11 +1962,11 @@ }; } { - name = "abab___abab_2.0.3.tgz"; + name = "abab___abab_2.0.5.tgz"; path = fetchurl { - name = "abab___abab_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz"; - sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a"; + name = "abab___abab_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; + sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a"; }; } { @@ -1794,11 +1986,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; - sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; }; } { @@ -1826,11 +2018,11 @@ }; } { - name = "acorn___acorn_7.1.1.tgz"; + name = "acorn___acorn_7.4.0.tgz"; path = fetchurl { - name = "acorn___acorn_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz"; - sha1 = "e35668de0b402f359de515c5482a1ab9f89a69bf"; + name = "acorn___acorn_7.4.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz"; + sha1 = "e1ad486e6c54501634c6c397c5c121daa383607c"; }; } { @@ -1858,19 +2050,19 @@ }; } { - name = "aggregate_error___aggregate_error_3.0.1.tgz"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; path = fetchurl { - name = "aggregate_error___aggregate_error_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz"; - sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; }; } { - name = "airbnb_prop_types___airbnb_prop_types_2.15.0.tgz"; + name = "airbnb_prop_types___airbnb_prop_types_2.16.0.tgz"; path = fetchurl { - name = "airbnb_prop_types___airbnb_prop_types_2.15.0.tgz"; - url = "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.15.0.tgz"; - sha1 = "5287820043af1eb469f5b0af0d6f70da6c52aaef"; + name = "airbnb_prop_types___airbnb_prop_types_2.16.0.tgz"; + url = "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz"; + sha1 = "b96274cefa1abb14f623f804173ee97c13971dc2"; }; } { @@ -1882,19 +2074,19 @@ }; } { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; - sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; }; } { - name = "ajv___ajv_6.12.2.tgz"; + name = "ajv___ajv_6.12.4.tgz"; path = fetchurl { - name = "ajv___ajv_6.12.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz"; - sha1 = "c629c5eced17baf314437918d2da88c99d5958cd"; + name = "ajv___ajv_6.12.4.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz"; + sha1 = "0614facc4522127fa713445c6bfd3ebd376e2234"; }; } { @@ -2105,6 +2297,14 @@ sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; }; } + { + name = "array_union___array_union_2.1.0.tgz"; + path = fetchurl { + name = "array_union___array_union_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; + sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; + }; + } { name = "array_uniq___array_uniq_1.0.3.tgz"; path = fetchurl { @@ -2137,6 +2337,14 @@ sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; }; } + { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; + path = fetchurl { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz"; + sha1 = "1c13f84a178566042dd63de4414440db9222e443"; + }; + } { name = "arrify___arrify_1.0.1.tgz"; path = fetchurl { @@ -2154,11 +2362,11 @@ }; } { - name = "asn1.js___asn1.js_4.10.1.tgz"; + name = "asn1.js___asn1.js_5.4.1.tgz"; path = fetchurl { - name = "asn1.js___asn1.js_4.10.1.tgz"; - url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz"; - sha1 = "b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"; + name = "asn1.js___asn1.js_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz"; + sha1 = "11a980b84ebb91781ce35b0fdc2ee294e3783f07"; }; } { @@ -2258,11 +2466,11 @@ }; } { - name = "autoprefixer___autoprefixer_9.7.6.tgz"; + name = "autoprefixer___autoprefixer_9.8.6.tgz"; path = fetchurl { - name = "autoprefixer___autoprefixer_9.7.6.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz"; - sha1 = "63ac5bbc0ce7934e6997207d5bb00d68fa8293a4"; + name = "autoprefixer___autoprefixer_9.8.6.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz"; + sha1 = "3b73594ca1bf9266320c5acf1588d74dea74210f"; }; } { @@ -2274,11 +2482,11 @@ }; } { - name = "aws4___aws4_1.9.1.tgz"; + name = "aws4___aws4_1.10.1.tgz"; path = fetchurl { - name = "aws4___aws4_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; - sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; + name = "aws4___aws4_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz"; + sha1 = "e1e82e4f3e999e2cfd61b161280d16a111f86428"; }; } { @@ -2290,11 +2498,19 @@ }; } { - name = "axobject_query___axobject_query_2.1.2.tgz"; + name = "axios___axios_0.20.0.tgz"; path = fetchurl { - name = "axobject_query___axobject_query_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz"; - sha1 = "2bdffc0371e643e5f03ba99065d5179b9ca79799"; + name = "axios___axios_0.20.0.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.20.0.tgz"; + sha1 = "057ba30f04884694993a8cd07fa394cff11c50bd"; + }; + } + { + name = "axobject_query___axobject_query_2.2.0.tgz"; + path = fetchurl { + name = "axobject_query___axobject_query_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz"; + sha1 = "943d47e10c0b704aa42275e20edf3722648989be"; }; } { @@ -2498,11 +2714,11 @@ }; } { - name = "binary_extensions___binary_extensions_2.0.0.tgz"; + name = "binary_extensions___binary_extensions_2.1.0.tgz"; path = fetchurl { - name = "binary_extensions___binary_extensions_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz"; - sha1 = "23c0df14f6a88077f5f986c0d167ec03c3d5537c"; + name = "binary_extensions___binary_extensions_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz"; + sha1 = "30fa40c9e7fe07dbc895678cd287024dea241dd9"; }; } { @@ -2514,11 +2730,11 @@ }; } { - name = "bl___bl_4.0.2.tgz"; + name = "bl___bl_4.0.3.tgz"; path = fetchurl { - name = "bl___bl_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz"; - sha1 = "52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"; + name = "bl___bl_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz"; + sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489"; }; } { @@ -2530,19 +2746,19 @@ }; } { - name = "bn.js___bn.js_4.11.8.tgz"; + name = "bn.js___bn.js_4.11.9.tgz"; path = fetchurl { - name = "bn.js___bn.js_4.11.8.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz"; - sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f"; + name = "bn.js___bn.js_4.11.9.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz"; + sha1 = "26d556829458f9d1e81fc48952493d0ba3507828"; }; } { - name = "bn.js___bn.js_5.1.1.tgz"; + name = "bn.js___bn.js_5.1.3.tgz"; path = fetchurl { - name = "bn.js___bn.js_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.1.tgz"; - sha1 = "48efc4031a9c4041b9c99c6941d903463ab62eb5"; + name = "bn.js___bn.js_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz"; + sha1 = "beca005408f642ebebea80b042b4d18d2ac0ee6b"; }; } { @@ -2650,11 +2866,11 @@ }; } { - name = "browserify_sign___browserify_sign_4.1.0.tgz"; + name = "browserify_sign___browserify_sign_4.2.1.tgz"; path = fetchurl { - name = "browserify_sign___browserify_sign_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.1.0.tgz"; - sha1 = "4fe971b379a5aeb4925e06779f9fa1f41d249d70"; + name = "browserify_sign___browserify_sign_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz"; + sha1 = "eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"; }; } { @@ -2674,11 +2890,11 @@ }; } { - name = "browserslist___browserslist_4.12.0.tgz"; + name = "browserslist___browserslist_4.14.2.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.12.0.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz"; - sha1 = "06c6d5715a1ede6c51fc39ff67fd647f740b656d"; + name = "browserslist___browserslist_4.14.2.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.2.tgz"; + sha1 = "1b3cec458a1ba87588cc5e9be62f19b6d48813ce"; }; } { @@ -2737,14 +2953,6 @@ sha1 = "a31749dc7d81d84db08abf937b6b8c4033f62786"; }; } - { - name = "builtin_modules___builtin_modules_1.1.1.tgz"; - path = fetchurl { - name = "builtin_modules___builtin_modules_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - } { name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; path = fetchurl { @@ -2866,11 +3074,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001054.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001125.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001054.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001054.tgz"; - sha1 = "7e82fc42d927980b0ce1426c4813df12381e1a75"; + name = "caniuse_lite___caniuse_lite_1.0.30001125.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001125.tgz"; + sha1 = "2a1a51ee045a0a2207474b086f628c34725e997b"; }; } { @@ -2921,6 +3129,14 @@ sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; }; } + { + name = "chalk___chalk_4.1.0.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; + sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + }; + } { name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; path = fetchurl { @@ -2962,11 +3178,11 @@ }; } { - name = "chokidar___chokidar_3.4.0.tgz"; + name = "chokidar___chokidar_3.4.2.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz"; - sha1 = "b30611423ce376357c765b9b8f904b9fba3c0be8"; + name = "chokidar___chokidar_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz"; + sha1 = "38dc8e658dec3809741eb3ef7bb0a47fe424232d"; }; } { @@ -3017,6 +3233,14 @@ sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; }; } + { + name = "clean_regexp___clean_regexp_1.0.0.tgz"; + path = fetchurl { + name = "clean_regexp___clean_regexp_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/clean-regexp/-/clean-regexp-1.0.0.tgz"; + sha1 = "8df7c7aae51fd36874e8f8d05b9180bc11a3fed7"; + }; + } { name = "clean_stack___clean_stack_2.2.0.tgz"; path = fetchurl { @@ -3042,11 +3266,11 @@ }; } { - name = "cliui___cliui_4.1.0.tgz"; + name = "cli_width___cli_width_3.0.0.tgz"; path = fetchurl { - name = "cliui___cliui_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz"; - sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49"; + name = "cli_width___cli_width_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz"; + sha1 = "a2f48437a2caa9a22436e794bf071ec9e61cedf6"; }; } { @@ -3074,11 +3298,11 @@ }; } { - name = "clsx___clsx_1.1.0.tgz"; + name = "clsx___clsx_1.1.1.tgz"; path = fetchurl { - name = "clsx___clsx_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/clsx/-/clsx-1.1.0.tgz"; - sha1 = "62937c6adfea771247c34b54d320fb99624f5702"; + name = "clsx___clsx_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz"; + sha1 = "98b3134f9abbdf23b2663491ace13c5c03a73188"; }; } { @@ -3098,19 +3322,11 @@ }; } { - name = "code_point_at___code_point_at_1.1.0.tgz"; + name = "codemirror___codemirror_5.57.0.tgz"; path = fetchurl { - name = "code_point_at___code_point_at_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; - }; - } - { - name = "codemirror___codemirror_5.53.2.tgz"; - path = fetchurl { - name = "codemirror___codemirror_5.53.2.tgz"; - url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.53.2.tgz"; - sha1 = "9799121cf8c50809cca487304e9de3a74d33f428"; + name = "codemirror___codemirror_5.57.0.tgz"; + url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.57.0.tgz"; + sha1 = "d26365b72f909f5d2dbb6b1209349ca1daeb2d50"; }; } { @@ -3177,6 +3393,14 @@ sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10"; }; } + { + name = "colorette___colorette_1.2.1.tgz"; + path = fetchurl { + name = "colorette___colorette_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz"; + sha1 = "4d0b921325c14faf92633086a536db6e89564b1b"; + }; + } { name = "combined_stream___combined_stream_1.0.8.tgz"; path = fetchurl { @@ -3434,11 +3658,11 @@ }; } { - name = "create_ecdh___create_ecdh_4.0.3.tgz"; + name = "create_ecdh___create_ecdh_4.0.4.tgz"; path = fetchurl { - name = "create_ecdh___create_ecdh_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz"; - sha1 = "c9111b6f33045c4697f144787f9254cdc77c45ff"; + name = "create_ecdh___create_ecdh_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz"; + sha1 = "d6e7f4bffa66736085a0762fd3a632684dabcc4e"; }; } { @@ -3586,11 +3810,11 @@ }; } { - name = "css_what___css_what_3.2.1.tgz"; + name = "css_what___css_what_3.3.0.tgz"; path = fetchurl { - name = "css_what___css_what_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz"; - sha1 = "f4a8f12421064621b456755e34a03a2c22df5da1"; + name = "css_what___css_what_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-3.3.0.tgz"; + sha1 = "10fec696a9ece2e591ac772d759aacabac38cd39"; }; } { @@ -3698,11 +3922,19 @@ }; } { - name = "csstype___csstype_2.6.10.tgz"; + name = "csstype___csstype_2.6.13.tgz"; path = fetchurl { - name = "csstype___csstype_2.6.10.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz"; - sha1 = "e63af50e66d7c266edb6b32909cfd0aabe03928b"; + name = "csstype___csstype_2.6.13.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz"; + sha1 = "a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f"; + }; + } + { + name = "csstype___csstype_3.0.3.tgz"; + path = fetchurl { + name = "csstype___csstype_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.3.tgz"; + sha1 = "2b410bbeba38ba9633353aff34b05d9755d065f8"; }; } { @@ -3890,11 +4122,11 @@ }; } { - name = "detect_browser___detect_browser_5.1.0.tgz"; + name = "detect_browser___detect_browser_5.1.1.tgz"; path = fetchurl { - name = "detect_browser___detect_browser_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.1.0.tgz"; - sha1 = "0c51c66b747ad8f98a6832bf3026a5a23a7850ff"; + name = "detect_browser___detect_browser_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.1.1.tgz"; + sha1 = "a800db91d3fd60d0861669f5984f1be9ffbe009c"; }; } { @@ -3921,6 +4153,14 @@ sha1 = "24707deabe932d4a3cf621302027c2b266568275"; }; } + { + name = "devtools_protocol___devtools_protocol_0.0.799653.tgz"; + path = fetchurl { + name = "devtools_protocol___devtools_protocol_0.0.799653.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.799653.tgz"; + sha1 = "86fc95ce5bf4fdf4b77a58047ba9d2301078f119"; + }; + } { name = "diff_sequences___diff_sequences_24.9.0.tgz"; path = fetchurl { @@ -3937,14 +4177,6 @@ sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd"; }; } - { - name = "diff___diff_4.0.2.tgz"; - path = fetchurl { - name = "diff___diff_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; - sha1 = "60f3aecb89d5fae520c11aa19efc2bb982aade7d"; - }; - } { name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; path = fetchurl { @@ -3961,6 +4193,14 @@ sha1 = "0b205d2b6aef98238ca286598a8204d29d0a0034"; }; } + { + name = "dir_glob___dir_glob_3.0.1.tgz"; + path = fetchurl { + name = "dir_glob___dir_glob_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; + sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; + }; + } { name = "dns_equal___dns_equal_1.0.0.tgz"; path = fetchurl { @@ -4018,11 +4258,11 @@ }; } { - name = "dom_helpers___dom_helpers_5.1.4.tgz"; + name = "dom_helpers___dom_helpers_5.2.0.tgz"; path = fetchurl { - name = "dom_helpers___dom_helpers_5.1.4.tgz"; - url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.4.tgz"; - sha1 = "4609680ab5c79a45f2531441f1949b79d6587f4b"; + name = "dom_helpers___dom_helpers_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz"; + sha1 = "57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b"; }; } { @@ -4033,6 +4273,14 @@ sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; }; } + { + name = "dom_serializer___dom_serializer_1.0.1.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.0.1.tgz"; + sha1 = "79695eb49af3cd8abc8d93a73da382deb1ca0795"; + }; + } { name = "domain_browser___domain_browser_1.2.0.tgz"; path = fetchurl { @@ -4098,11 +4346,11 @@ }; } { - name = "domutils___domutils_2.0.0.tgz"; + name = "domutils___domutils_2.2.0.tgz"; path = fetchurl { - name = "domutils___domutils_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz"; - sha1 = "15b8278e37bfa8468d157478c58c367718133c08"; + name = "domutils___domutils_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.2.0.tgz"; + sha1 = "f3ce1610af5c30280bde1b71f84b018b958f32cf"; }; } { @@ -4114,11 +4362,11 @@ }; } { - name = "dot_prop___dot_prop_5.2.0.tgz"; + name = "dot_prop___dot_prop_5.3.0.tgz"; path = fetchurl { - name = "dot_prop___dot_prop_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz"; - sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"; + name = "dot_prop___dot_prop_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; + sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; }; } { @@ -4138,11 +4386,11 @@ }; } { - name = "duplexer___duplexer_0.1.1.tgz"; + name = "duplexer___duplexer_0.1.2.tgz"; path = fetchurl { - name = "duplexer___duplexer_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + name = "duplexer___duplexer_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; + sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6"; }; } { @@ -4170,19 +4418,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.431.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.566.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.431.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.431.tgz"; - sha1 = "705dd8ef46200415ba837b31d927cdc1e43db303"; + name = "electron_to_chromium___electron_to_chromium_1.3.566.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.566.tgz"; + sha1 = "e373876bb63e5c9bbcbe1b48cbb2db000f79bf88"; }; } { - name = "elliptic___elliptic_6.5.2.tgz"; + name = "elliptic___elliptic_6.5.3.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz"; - sha1 = "05c5678d7173c049d8ca433552224a495d0e3762"; + name = "elliptic___elliptic_6.5.3.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz"; + sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"; }; } { @@ -4226,11 +4474,11 @@ }; } { - name = "encoding___encoding_0.1.12.tgz"; + name = "encoding___encoding_0.1.13.tgz"; path = fetchurl { - name = "encoding___encoding_0.1.12.tgz"; - url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz"; - sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + name = "encoding___encoding_0.1.13.tgz"; + url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz"; + sha1 = "56574afdd791f54a8e9b2785c0582a2d26210fa9"; }; } { @@ -4242,11 +4490,11 @@ }; } { - name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz"; + name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz"; - sha1 = "2937e2b8066cd0fe7ce0990a98f0d71a35189f66"; + name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz"; + sha1 = "3b806f3bfafc1ec7de69551ef93cca46c1704126"; }; } { @@ -4258,11 +4506,11 @@ }; } { - name = "entities___entities_2.0.0.tgz"; + name = "entities___entities_2.0.3.tgz"; path = fetchurl { - name = "entities___entities_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz"; - sha1 = "68d6084cab1b079767540d80e56a39b423e4abf4"; + name = "entities___entities_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"; + sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f"; }; } { @@ -4274,11 +4522,11 @@ }; } { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz"; path = fetchurl { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz"; - sha1 = "01c885dde2114b4690bf741f8dc94cee3060eb78"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.1.tgz"; + sha1 = "59c1b734b0927543e3d8dc477299ec957feb312d"; }; } { @@ -4298,11 +4546,19 @@ }; } { - name = "es_abstract___es_abstract_1.17.5.tgz"; + name = "es_abstract___es_abstract_1.17.6.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.17.5.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz"; - sha1 = "d8c9d1d66c8981fb9200e2251d799eee92774ae9"; + name = "es_abstract___es_abstract_1.17.6.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz"; + sha1 = "9142071707857b2cacc7b89ecb670316c3e2d52a"; + }; + } + { + name = "es_abstract___es_abstract_1.18.0_next.0.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.18.0_next.0.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.0.tgz"; + sha1 = "b302834927e624d8e5837ed48224291f2c66e6fc"; }; } { @@ -4337,6 +4593,14 @@ sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; }; } + { + name = "escalade___escalade_3.0.2.tgz"; + path = fetchurl { + name = "escalade___escalade_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz"; + sha1 = "6a580d70edb87880f22b4c91d0d56078df6962c4"; + }; + } { name = "escape_html___escape_html_1.0.3.tgz"; path = fetchurl { @@ -4362,11 +4626,27 @@ }; } { - name = "escodegen___escodegen_1.14.1.tgz"; + name = "escodegen___escodegen_1.14.3.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; - sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; + name = "escodegen___escodegen_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; + sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; + }; + } + { + name = "eslint_ast_utils___eslint_ast_utils_1.1.0.tgz"; + path = fetchurl { + name = "eslint_ast_utils___eslint_ast_utils_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-ast-utils/-/eslint-ast-utils-1.1.0.tgz"; + sha1 = "3d58ba557801cfb1c941d68131ee9f8c34bd1586"; + }; + } + { + name = "eslint_config_prettier___eslint_config_prettier_6.11.0.tgz"; + path = fetchurl { + name = "eslint_config_prettier___eslint_config_prettier_6.11.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz"; + sha1 = "f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1"; }; } { @@ -4378,11 +4658,11 @@ }; } { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz"; - sha1 = "dbaa52b6b2816b50bc6711af75422de808e98404"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; + sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; }; } { @@ -4417,6 +4697,22 @@ sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3"; }; } + { + name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; + path = fetchurl { + name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz"; + sha1 = "92f7736fe1fde3e2de77623c838dd992ff5ffb7e"; + }; + } + { + name = "eslint_plugin_jest___eslint_plugin_jest_24.0.0.tgz"; + path = fetchurl { + name = "eslint_plugin_jest___eslint_plugin_jest_24.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.0.0.tgz"; + sha1 = "6b1c460c529104c7d16d889e76fe708b281c4d14"; + }; + } { name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.2.3.tgz"; path = fetchurl { @@ -4425,6 +4721,14 @@ sha1 = "b872a09d5de51af70a97db1eea7dc933043708aa"; }; } + { + name = "eslint_plugin_prefer_arrow___eslint_plugin_prefer_arrow_1.2.2.tgz"; + path = fetchurl { + name = "eslint_plugin_prefer_arrow___eslint_plugin_prefer_arrow_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.2.tgz"; + sha1 = "0c6d25a6b94cb3e0110a23d129760af5860edb6e"; + }; + } { name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_1.7.0.tgz"; path = fetchurl { @@ -4441,6 +4745,22 @@ sha1 = "6d08f9673628aa69c5559d33489e855d83551666"; }; } + { + name = "eslint_plugin_react___eslint_plugin_react_7.20.6.tgz"; + path = fetchurl { + name = "eslint_plugin_react___eslint_plugin_react_7.20.6.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.6.tgz"; + sha1 = "4d7845311a93c463493ccfa0a19c9c5d0fd69f60"; + }; + } + { + name = "eslint_plugin_unicorn___eslint_plugin_unicorn_21.0.0.tgz"; + path = fetchurl { + name = "eslint_plugin_unicorn___eslint_plugin_unicorn_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-21.0.0.tgz"; + sha1 = "7e3a8b0f725f003619e1f40d769939ecd8d708d0"; + }; + } { name = "eslint_scope___eslint_scope_4.0.3.tgz"; path = fetchurl { @@ -4450,11 +4770,19 @@ }; } { - name = "eslint_scope___eslint_scope_5.0.0.tgz"; + name = "eslint_scope___eslint_scope_5.1.0.tgz"; path = fetchurl { - name = "eslint_scope___eslint_scope_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz"; - sha1 = "e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"; + name = "eslint_scope___eslint_scope_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz"; + sha1 = "d0f971dfe59c69e0cada684b23d49dbf82600ce5"; + }; + } + { + name = "eslint_template_visitor___eslint_template_visitor_2.2.1.tgz"; + path = fetchurl { + name = "eslint_template_visitor___eslint_template_visitor_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-template-visitor/-/eslint-template-visitor-2.2.1.tgz"; + sha1 = "2dccb1ab28fa7429e56ba6dd0144def2d89bc2d6"; }; } { @@ -4466,19 +4794,27 @@ }; } { - name = "eslint_utils___eslint_utils_2.0.0.tgz"; + name = "eslint_utils___eslint_utils_2.1.0.tgz"; path = fetchurl { - name = "eslint_utils___eslint_utils_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz"; - sha1 = "7be1cc70f27a72a76cd14aa698bcabed6890e1cd"; + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; - sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; }; } { @@ -4514,11 +4850,11 @@ }; } { - name = "esrecurse___esrecurse_4.2.1.tgz"; + name = "esrecurse___esrecurse_4.3.0.tgz"; path = fetchurl { - name = "esrecurse___esrecurse_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz"; - sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"; + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; }; } { @@ -4530,11 +4866,11 @@ }; } { - name = "estraverse___estraverse_5.1.0.tgz"; + name = "estraverse___estraverse_5.2.0.tgz"; path = fetchurl { - name = "estraverse___estraverse_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz"; - sha1 = "374309d39fd935ae500e7b92e8a6b4c720e59642"; + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; }; } { @@ -4554,19 +4890,19 @@ }; } { - name = "eventemitter3___eventemitter3_4.0.0.tgz"; + name = "eventemitter3___eventemitter3_4.0.7.tgz"; path = fetchurl { - name = "eventemitter3___eventemitter3_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz"; - sha1 = "d65176163887ee59f386d64c82610b696a4a74eb"; + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha1 = "2de9b68f6528d5644ef5c59526a1b4a07306169f"; }; } { - name = "events___events_3.1.0.tgz"; + name = "events___events_3.2.0.tgz"; path = fetchurl { - name = "events___events_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz"; - sha1 = "84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"; + name = "events___events_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz"; + sha1 = "93b87c18f8efcd4202a461aec4dfc0556b639379"; }; } { @@ -4682,11 +5018,11 @@ }; } { - name = "extract_zip___extract_zip_2.0.0.tgz"; + name = "extract_zip___extract_zip_2.0.1.tgz"; path = fetchurl { - name = "extract_zip___extract_zip_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.0.tgz"; - sha1 = "f53b71d44f4ff5a4527a2259ade000fb8b303492"; + name = "extract_zip___extract_zip_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; + sha1 = "663dca56fe46df890d5f131ef4a06d22bb8ba13a"; }; } { @@ -4706,11 +5042,11 @@ }; } { - name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha1 = "545145077c501491e33b15ec408c294376e94ae4"; + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; }; } { @@ -4721,6 +5057,14 @@ sha1 = "6953857c3afa475fff92ee6015d52da70a4cd39d"; }; } + { + name = "fast_glob___fast_glob_3.2.4.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz"; + sha1 = "d20aefbf99579383e7f3cc66529158c9b98554d3"; + }; + } { name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; path = fetchurl { @@ -4737,6 +5081,14 @@ sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; } + { + name = "fastq___fastq_1.8.0.tgz"; + path = fetchurl { + name = "fastq___fastq_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz"; + sha1 = "550e1f9f59bbc65fe185cb6a9b4d95357107f481"; + }; + } { name = "faye_websocket___faye_websocket_0.10.0.tgz"; path = fetchurl { @@ -4946,11 +5298,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.11.0.tgz"; + name = "follow_redirects___follow_redirects_1.13.0.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz"; - sha1 = "afa14f08ba12a52963140fe43212658897bc0ecb"; + name = "follow_redirects___follow_redirects_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz"; + sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db"; }; } { @@ -5153,14 +5505,6 @@ sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269"; }; } - { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - path = fetchurl { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; - sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; - }; - } { name = "get_caller_file___get_caller_file_2.0.5.tgz"; path = fetchurl { @@ -5185,6 +5529,14 @@ sha1 = "0469ed07563479de6efb986baf053dcd7d4e3193"; }; } + { + name = "get_stdin___get_stdin_6.0.0.tgz"; + path = fetchurl { + name = "get_stdin___get_stdin_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz"; + sha1 = "9e09bf712b360ab9225e812048f71fde9c89657b"; + }; + } { name = "get_stream___get_stream_4.1.0.tgz"; path = fetchurl { @@ -5194,11 +5546,11 @@ }; } { - name = "get_stream___get_stream_5.1.0.tgz"; + name = "get_stream___get_stream_5.2.0.tgz"; path = fetchurl { - name = "get_stream___get_stream_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz"; - sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9"; + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; }; } { @@ -5289,6 +5641,14 @@ sha1 = "5697619ccd95c5275dbb2d6faa42087c1a941d8d"; }; } + { + name = "globby___globby_11.0.1.tgz"; + path = fetchurl { + name = "globby___globby_11.0.1.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz"; + sha1 = "9a2bf107a068f3ffeabc49ad702c79ede8cfd357"; + }; + } { name = "globby___globby_6.1.0.tgz"; path = fetchurl { @@ -5313,14 +5673,6 @@ sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; }; } - { - name = "gud___gud_1.0.0.tgz"; - path = fetchurl { - name = "gud___gud_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz"; - sha1 = "a489581b17e6a70beca9abe3ae57de7a499852c0"; - }; - } { name = "gzip_size___gzip_size_5.1.1.tgz"; path = fetchurl { @@ -5346,11 +5698,11 @@ }; } { - name = "har_validator___har_validator_5.1.3.tgz"; + name = "har_validator___har_validator_5.1.5.tgz"; path = fetchurl { - name = "har_validator___har_validator_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; - sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + name = "har_validator___har_validator_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; + sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; }; } { @@ -5554,19 +5906,19 @@ }; } { - name = "html_minifier_terser___html_minifier_terser_5.1.0.tgz"; + name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; path = fetchurl { - name = "html_minifier_terser___html_minifier_terser_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz"; - sha1 = "95d3df037f04835e9d1a09d1767c0e361a7de916"; + name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha1 = "922e96f1f3bb60832c2634b79884096389b1f054"; }; } { - name = "html_to_react___html_to_react_1.4.2.tgz"; + name = "html_to_react___html_to_react_1.4.3.tgz"; path = fetchurl { - name = "html_to_react___html_to_react_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.4.2.tgz"; - sha1 = "7b628ab56cd63a52f2d0b79d0fa838a51f088a57"; + name = "html_to_react___html_to_react_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.4.3.tgz"; + sha1 = "1430a1cb581ef29533892ec70a2fdc4554b17ffd"; }; } { @@ -5626,11 +5978,11 @@ }; } { - name = "http_parser_js___http_parser_js_0.4.10.tgz"; + name = "http_parser_js___http_parser_js_0.5.2.tgz"; path = fetchurl { - name = "http_parser_js___http_parser_js_0.4.10.tgz"; - url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz"; - sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; + name = "http_parser_js___http_parser_js_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz"; + sha1 = "da2e31d237b393aae72ace43882dd7e270a8ff77"; }; } { @@ -5642,11 +5994,11 @@ }; } { - name = "http_proxy___http_proxy_1.18.0.tgz"; + name = "http_proxy___http_proxy_1.18.1.tgz"; path = fetchurl { - name = "http_proxy___http_proxy_1.18.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz"; - sha1 = "dbe55f63e75a347db7f3d99974f2692a314a6a3a"; + name = "http_proxy___http_proxy_1.18.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz"; + sha1 = "401541f0534884bbf95260334e72f88ee3976549"; }; } { @@ -5674,11 +6026,11 @@ }; } { - name = "hyphenate_style_name___hyphenate_style_name_1.0.3.tgz"; + name = "hyphenate_style_name___hyphenate_style_name_1.0.4.tgz"; path = fetchurl { - name = "hyphenate_style_name___hyphenate_style_name_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz"; - sha1 = "097bb7fa0b8f1a9cf0bd5c734cf95899981a9b48"; + name = "hyphenate_style_name___hyphenate_style_name_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz"; + sha1 = "691879af8e220aea5750e8827db4ef62a54e361d"; }; } { @@ -5689,6 +6041,14 @@ sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; }; } + { + name = "iconv_lite___iconv_lite_0.6.2.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz"; + sha1 = "ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"; + }; + } { name = "icss_utils___icss_utils_4.1.1.tgz"; path = fetchurl { @@ -5737,6 +6097,14 @@ sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; }; } + { + name = "ignore___ignore_5.1.8.tgz"; + path = fetchurl { + name = "ignore___ignore_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; + sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; + }; + } { name = "immer___immer_1.10.0.tgz"; path = fetchurl { @@ -5745,14 +6113,6 @@ sha1 = "bad67605ba9c810275d91e1c2a47d4582e98286d"; }; } - { - name = "immutable___immutable_3.8.2.tgz"; - path = fetchurl { - name = "immutable___immutable_3.8.2.tgz"; - url = "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz"; - sha1 = "c2439951455bb39913daf281376f1530e104adf3"; - }; - } { name = "import_cwd___import_cwd_2.1.0.tgz"; path = fetchurl { @@ -5793,6 +6153,14 @@ sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d"; }; } + { + name = "import_modules___import_modules_2.0.0.tgz"; + path = fetchurl { + name = "import_modules___import_modules_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-modules/-/import-modules-2.0.0.tgz"; + sha1 = "9c1e13b4e7a15682f70a6e3fa29534e4540cfc5d"; + }; + } { name = "imurmurhash___imurmurhash_0.1.4.tgz"; path = fetchurl { @@ -5874,11 +6242,11 @@ }; } { - name = "inquirer___inquirer_7.1.0.tgz"; + name = "inquirer___inquirer_7.3.3.tgz"; path = fetchurl { - name = "inquirer___inquirer_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz"; - sha1 = "1298a01859883e17c7264b82870ae1034f92dd29"; + name = "inquirer___inquirer_7.3.3.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz"; + sha1 = "04d176b2af04afc157a83fd7c100e98ee0aad003"; }; } { @@ -5905,14 +6273,6 @@ sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6"; }; } - { - name = "invert_kv___invert_kv_2.0.0.tgz"; - path = fetchurl { - name = "invert_kv___invert_kv_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz"; - sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02"; - }; - } { name = "ip_regex___ip_regex_2.1.0.tgz"; path = fetchurl { @@ -6034,11 +6394,11 @@ }; } { - name = "is_callable___is_callable_1.1.5.tgz"; + name = "is_callable___is_callable_1.2.1.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz"; - sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; + name = "is_callable___is_callable_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.1.tgz"; + sha1 = "4d1e21a4f437509d25ce55f8184350771421c96d"; }; } { @@ -6114,11 +6474,11 @@ }; } { - name = "is_docker___is_docker_2.0.0.tgz"; + name = "is_docker___is_docker_2.1.1.tgz"; path = fetchurl { - name = "is_docker___is_docker_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz"; - sha1 = "2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"; + name = "is_docker___is_docker_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz"; + sha1 = "4125a88e44e450d384e09047ede71adc2d144156"; }; } { @@ -6145,14 +6505,6 @@ sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - } { name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; path = fetchurl { @@ -6209,6 +6561,14 @@ sha1 = "56ff4db683a078c6082eb95dad7dc62e1d04f835"; }; } + { + name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; + path = fetchurl { + name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; + sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + }; + } { name = "is_number___is_number_3.0.0.tgz"; path = fetchurl { @@ -6282,11 +6642,11 @@ }; } { - name = "is_regex___is_regex_1.0.5.tgz"; + name = "is_regex___is_regex_1.1.1.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz"; - sha1 = "39d589a358bf18967f726967120b8fc1aed74eae"; + name = "is_regex___is_regex_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz"; + sha1 = "c6f98aacc546f6cec5468a07b7b153ab564a57b9"; }; } { @@ -6634,11 +6994,11 @@ }; } { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz"; + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; path = fetchurl { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz"; - sha1 = "ecdae604c077a7fbc70defb6d517c3c1c898923a"; + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"; + sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c"; }; } { @@ -6754,11 +7114,19 @@ }; } { - name = "js_base64___js_base64_2.5.2.tgz"; + name = "joi___joi_17.2.1.tgz"; path = fetchurl { - name = "js_base64___js_base64_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz"; - sha1 = "313b6274dda718f714d00b3330bbae6e38e90209"; + name = "joi___joi_17.2.1.tgz"; + url = "https://registry.yarnpkg.com/joi/-/joi-17.2.1.tgz"; + sha1 = "e5140fdf07e8fecf9bc977c2832d1bdb1e3f2a0a"; + }; + } + { + name = "js_base64___js_base64_3.4.5.tgz"; + path = fetchurl { + name = "js_base64___js_base64_3.4.5.tgz"; + url = "https://registry.yarnpkg.com/js-base64/-/js-base64-3.4.5.tgz"; + sha1 = "6d1921e65a172cfd924604e1416dfaff45752c3e"; }; } { @@ -6778,11 +7146,11 @@ }; } { - name = "js_yaml___js_yaml_3.13.1.tgz"; + name = "js_yaml___js_yaml_3.14.0.tgz"; path = fetchurl { - name = "js_yaml___js_yaml_3.13.1.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; - sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; + name = "js_yaml___js_yaml_3.14.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz"; + sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482"; }; } { @@ -6833,6 +7201,14 @@ sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; }; } + { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d"; + }; + } { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { @@ -6922,75 +7298,75 @@ }; } { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.1.1.tgz"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.1.1.tgz"; - sha1 = "8e73ecc4f1d0f8dfe4dd31f6f9f2782588970e78"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.4.0.tgz"; + sha1 = "46c75ff7fd61c304984c21af5817823f0f501ceb"; }; } { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.1.1.tgz"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.1.1.tgz"; - sha1 = "2df86016dfe73085eead843f5794e3890e9c5c47"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.4.0.tgz"; + sha1 = "2b10f01269eaea7f36f0f5fd1cfbfcc76ed42854"; }; } { - name = "jss_plugin_global___jss_plugin_global_10.1.1.tgz"; + name = "jss_plugin_global___jss_plugin_global_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_global___jss_plugin_global_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.1.1.tgz"; - sha1 = "36b0d6d9facb74dfd99590643708a89260747d14"; + name = "jss_plugin_global___jss_plugin_global_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.4.0.tgz"; + sha1 = "19449425a94e4e74e113139b629fd44d3577f97d"; }; } { - name = "jss_plugin_nested___jss_plugin_nested_10.1.1.tgz"; + name = "jss_plugin_nested___jss_plugin_nested_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_nested___jss_plugin_nested_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.1.1.tgz"; - sha1 = "5c3de2b8bda344de1ebcef3a4fd30870a29a8a8c"; + name = "jss_plugin_nested___jss_plugin_nested_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.4.0.tgz"; + sha1 = "017d0c02c0b6b454fd9d7d3fc33470a15eea9fd1"; }; } { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.1.1.tgz"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.1.1.tgz"; - sha1 = "34bddcbfaf9430ec8ccdf92729f03bb10caf1785"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.4.0.tgz"; + sha1 = "7110bf0b6049cc2080b220b506532bf0b70c0e07"; }; } { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.1.1.tgz"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.1.1.tgz"; - sha1 = "be00dac6fc394aaddbcef5860b9eca6224d96382"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.4.0.tgz"; + sha1 = "7cff4a91e84973536fa49b6ebbdbf7f339b01c82"; }; } { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.1.1.tgz"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.1.1.tgz"; - sha1 = "8348b20749f790beebab3b6a8f7075b07c2cfcfd"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.4.0.tgz"; + sha1 = "2a78f3c5d57d1e024fe7ad7c41de34d04e72ecc0"; }; } { - name = "jss___jss_10.1.1.tgz"; + name = "jss___jss_10.4.0.tgz"; path = fetchurl { - name = "jss___jss_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss/-/jss-10.1.1.tgz"; - sha1 = "450b27d53761af3e500b43130a54cdbe157ea332"; + name = "jss___jss_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss/-/jss-10.4.0.tgz"; + sha1 = "473a6fbe42e85441020a07e9519dac1e8a2e79ca"; }; } { - name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; + name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz"; - sha1 = "8a9364e402448a3ce7f14d357738310d9248054f"; + name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz"; + sha1 = "1114a4c1209481db06c690c2b4f488cc665f657e"; }; } { @@ -7073,14 +7449,6 @@ sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; } - { - name = "lcid___lcid_2.0.0.tgz"; - path = fetchurl { - name = "lcid___lcid_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz"; - sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf"; - }; - } { name = "left_pad___left_pad_1.3.0.tgz"; path = fetchurl { @@ -7209,6 +7577,14 @@ sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; }; } + { + name = "lodash.get___lodash.get_4.4.2.tgz"; + path = fetchurl { + name = "lodash.get___lodash.get_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + } { name = "lodash.isarray___lodash.isarray_3.0.4.tgz"; path = fetchurl { @@ -7266,19 +7642,27 @@ }; } { - name = "lodash___lodash_4.17.15.tgz"; + name = "lodash.zip___lodash.zip_4.2.0.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.15.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; - sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + name = "lodash.zip___lodash.zip_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz"; + sha1 = "ec6662e4896408ed4ab6c542a3990b72cc080020"; }; } { - name = "loglevel___loglevel_1.6.8.tgz"; + name = "lodash___lodash_4.17.20.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.6.8.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz"; - sha1 = "8a25fb75d092230ecd4457270d80b54e28011171"; + name = "lodash___lodash_4.17.20.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; + sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; + }; + } + { + name = "loglevel___loglevel_1.7.0.tgz"; + path = fetchurl { + name = "loglevel___loglevel_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz"; + sha1 = "728166855a740d59d38db01cf46f042caa041bb0"; }; } { @@ -7337,14 +7721,6 @@ sha1 = "ad2c9576197c9f1abf308d0787865bd975a3f3e4"; }; } - { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; - path = fetchurl { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; - sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a"; - }; - } { name = "map_cache___map_cache_0.2.2.tgz"; path = fetchurl { @@ -7409,14 +7785,6 @@ sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; } - { - name = "mem___mem_4.3.0.tgz"; - path = fetchurl { - name = "mem___mem_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz"; - sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178"; - }; - } { name = "memory_fs___memory_fs_0.4.1.tgz"; path = fetchurl { @@ -7458,11 +7826,11 @@ }; } { - name = "merge2___merge2_1.3.0.tgz"; + name = "merge2___merge2_1.4.1.tgz"; path = fetchurl { - name = "merge2___merge2_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz"; - sha1 = "5b366ee83b2f1582c48f87e47cf1a9352103ca81"; + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; }; } { @@ -7489,6 +7857,14 @@ sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; }; } + { + name = "micromatch___micromatch_4.0.2.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; + sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + }; + } { name = "miller_rabin___miller_rabin_4.0.1.tgz"; path = fetchurl { @@ -7522,11 +7898,11 @@ }; } { - name = "mime___mime_2.4.5.tgz"; + name = "mime___mime_2.4.6.tgz"; path = fetchurl { - name = "mime___mime_2.4.5.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.5.tgz"; - sha1 = "d8de2ecb92982dedbb6541c9b6841d7f218ea009"; + name = "mime___mime_2.4.6.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; + sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; }; } { @@ -7538,11 +7914,11 @@ }; } { - name = "mini_create_react_context___mini_create_react_context_0.3.2.tgz"; + name = "mini_create_react_context___mini_create_react_context_0.4.0.tgz"; path = fetchurl { - name = "mini_create_react_context___mini_create_react_context_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz"; - sha1 = "79fc598f283dd623da8e088b05db8cddab250189"; + name = "mini_create_react_context___mini_create_react_context_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz"; + sha1 = "df60501c83151db69e28eac0ef08b4002efab040"; }; } { @@ -7602,19 +7978,19 @@ }; } { - name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; path = fetchurl { - name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz"; - sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a"; + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha1 = "68472f79711c084657c067c5c6ad93cddea8214c"; }; } { - name = "minipass___minipass_3.1.1.tgz"; + name = "minipass___minipass_3.1.3.tgz"; path = fetchurl { - name = "minipass___minipass_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz"; - sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5"; + name = "minipass___minipass_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; + sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; }; } { @@ -7658,35 +8034,35 @@ }; } { - name = "mobx_react_lite___mobx_react_lite_2.0.6.tgz"; + name = "mobx_react_lite___mobx_react_lite_2.2.1.tgz"; path = fetchurl { - name = "mobx_react_lite___mobx_react_lite_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-2.0.6.tgz"; - sha1 = "e1307a2b271c6a6016c8ad815a25014b7f95997d"; + name = "mobx_react_lite___mobx_react_lite_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-2.2.1.tgz"; + sha1 = "9c05dd799005d29ec1671ae86ca30b3ab5411055"; }; } { - name = "mobx_react___mobx_react_6.2.2.tgz"; + name = "mobx_react___mobx_react_6.3.0.tgz"; path = fetchurl { - name = "mobx_react___mobx_react_6.2.2.tgz"; - url = "https://registry.yarnpkg.com/mobx-react/-/mobx-react-6.2.2.tgz"; - sha1 = "45e8e7c4894cac8399bba0a91060d7cfb8ea084b"; + name = "mobx_react___mobx_react_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/mobx-react/-/mobx-react-6.3.0.tgz"; + sha1 = "7d11799f988bbdadc49e725081993b18baa20329"; }; } { - name = "mobx_utils___mobx_utils_5.5.7.tgz"; + name = "mobx_utils___mobx_utils_5.6.1.tgz"; path = fetchurl { - name = "mobx_utils___mobx_utils_5.5.7.tgz"; - url = "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-5.5.7.tgz"; - sha1 = "0ef58f2d5e05ca0e59ba2322f84f9c763de6ce14"; + name = "mobx_utils___mobx_utils_5.6.1.tgz"; + url = "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-5.6.1.tgz"; + sha1 = "b7d9184b7442fe704be367d4363a2e9961be28cc"; }; } { - name = "mobx___mobx_5.15.4.tgz"; + name = "mobx___mobx_5.15.6.tgz"; path = fetchurl { - name = "mobx___mobx_5.15.4.tgz"; - url = "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz"; - sha1 = "9da1a84e97ba624622f4e55a0bf3300fb931c2ab"; + name = "mobx___mobx_5.15.6.tgz"; + url = "https://registry.yarnpkg.com/mobx/-/mobx-5.15.6.tgz"; + sha1 = "24750af56f87bcf9c3cf82ece4c79eb91bb71968"; }; } { @@ -7737,6 +8113,14 @@ sha1 = "a0ec7bd9055c4282f790c3c82f4e28db3b31b229"; }; } + { + name = "multimap___multimap_1.1.0.tgz"; + path = fetchurl { + name = "multimap___multimap_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/multimap/-/multimap-1.1.0.tgz"; + sha1 = "5263febc085a1791c33b59bb3afc6a76a2a10ca8"; + }; + } { name = "mute_stream___mute_stream_0.0.8.tgz"; path = fetchurl { @@ -7778,11 +8162,11 @@ }; } { - name = "neo_async___neo_async_2.6.1.tgz"; + name = "neo_async___neo_async_2.6.2.tgz"; path = fetchurl { - name = "neo_async___neo_async_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz"; - sha1 = "ac27ada66167fa8849a6addd837f6b189ad2081c"; + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; }; } { @@ -7858,11 +8242,11 @@ }; } { - name = "node_releases___node_releases_1.1.55.tgz"; + name = "node_releases___node_releases_1.1.61.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.55.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.55.tgz"; - sha1 = "8af23b7c561d8e2e6e36a46637bab84633b07cee"; + name = "node_releases___node_releases_1.1.61.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz"; + sha1 = "707b0fca9ce4e11783612ba4a2fcba09047af16e"; }; } { @@ -7945,14 +8329,6 @@ sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; }; } - { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - path = fetchurl { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - } { name = "nwsapi___nwsapi_2.2.0.tgz"; path = fetchurl { @@ -8002,11 +8378,11 @@ }; } { - name = "object_inspect___object_inspect_1.7.0.tgz"; + name = "object_inspect___object_inspect_1.8.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; - sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; + name = "object_inspect___object_inspect_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; + sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; }; } { @@ -8042,19 +8418,19 @@ }; } { - name = "object.assign___object.assign_4.1.0.tgz"; + name = "object.assign___object.assign_4.1.1.tgz"; path = fetchurl { - name = "object.assign___object.assign_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; - sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; + name = "object.assign___object.assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz"; + sha1 = "303867a666cdd41936ecdedfb1f8f3e32a478cdd"; }; } { - name = "object.entries___object.entries_1.1.1.tgz"; + name = "object.entries___object.entries_1.1.2.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz"; - sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b"; + name = "object.entries___object.entries_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz"; + sha1 = "bc73f00acb6b6bb16c203434b10f9a7e797d3add"; }; } { @@ -8122,19 +8498,19 @@ }; } { - name = "onetime___onetime_5.1.0.tgz"; + name = "onetime___onetime_5.1.2.tgz"; path = fetchurl { - name = "onetime___onetime_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz"; - sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5"; + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; }; } { - name = "open___open_7.0.3.tgz"; + name = "open___open_7.2.1.tgz"; path = fetchurl { - name = "open___open_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz"; - sha1 = "db551a1af9c7ab4c7af664139930826138531c48"; + name = "open___open_7.2.1.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-7.2.1.tgz"; + sha1 = "07b0ade11a43f2a8ce718480bdf3d7563a095195"; }; } { @@ -8177,14 +8553,6 @@ sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; }; } - { - name = "os_locale___os_locale_3.1.0.tgz"; - path = fetchurl { - name = "os_locale___os_locale_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz"; - sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a"; - }; - } { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; path = fetchurl { @@ -8193,14 +8561,6 @@ sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; } - { - name = "p_defer___p_defer_1.0.0.tgz"; - path = fetchurl { - name = "p_defer___p_defer_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz"; - sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; - }; - } { name = "p_each_series___p_each_series_1.0.0.tgz"; path = fetchurl { @@ -8217,14 +8577,6 @@ sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; } - { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - path = fetchurl { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz"; - sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e"; - }; - } { name = "p_limit___p_limit_1.3.0.tgz"; path = fetchurl { @@ -8346,11 +8698,11 @@ }; } { - name = "parse_asn1___parse_asn1_5.1.5.tgz"; + name = "parse_asn1___parse_asn1_5.1.6.tgz"; path = fetchurl { - name = "parse_asn1___parse_asn1_5.1.5.tgz"; - url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz"; - sha1 = "003271343da58dc94cace494faef3d2147ecea0e"; + name = "parse_asn1___parse_asn1_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz"; + sha1 = "385080a3ec13cb62a62d39409cb3e88844cdaed4"; }; } { @@ -8378,11 +8730,11 @@ }; } { - name = "parse_json___parse_json_5.0.0.tgz"; + name = "parse_json___parse_json_5.1.0.tgz"; path = fetchurl { - name = "parse_json___parse_json_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; - sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f"; + name = "parse_json___parse_json_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz"; + sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646"; }; } { @@ -8546,11 +8898,11 @@ }; } { - name = "pbkdf2___pbkdf2_3.0.17.tgz"; + name = "pbkdf2___pbkdf2_3.1.1.tgz"; path = fetchurl { - name = "pbkdf2___pbkdf2_3.0.17.tgz"; - url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz"; - sha1 = "976c206530617b14ebb32114239f7b09336e93a6"; + name = "pbkdf2___pbkdf2_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz"; + sha1 = "cb8724b0fada984596856d1a6ebafd3584654b94"; }; } { @@ -8666,11 +9018,11 @@ }; } { - name = "pkg_up___pkg_up_2.0.0.tgz"; + name = "pluralize___pluralize_8.0.0.tgz"; path = fetchurl { - name = "pkg_up___pkg_up_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; - sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + name = "pluralize___pluralize_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz"; + sha1 = "1a6fa16a38d12a1901e0320fa017051c539ce3b1"; }; } { @@ -8690,19 +9042,19 @@ }; } { - name = "popper.js___popper.js_1.16.1.tgz"; + name = "popper.js___popper.js_1.16.1_lts.tgz"; path = fetchurl { - name = "popper.js___popper.js_1.16.1.tgz"; - url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz"; - sha1 = "2a223cb3dc7b6213d740e40372be40de43e65b1b"; + name = "popper.js___popper.js_1.16.1_lts.tgz"; + url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz"; + sha1 = "cf6847b807da3799d80ee3d6d2f90df8a3f50b05"; }; } { - name = "portfinder___portfinder_1.0.26.tgz"; + name = "portfinder___portfinder_1.0.28.tgz"; path = fetchurl { - name = "portfinder___portfinder_1.0.26.tgz"; - url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz"; - sha1 = "475658d56ca30bed72ac7f1378ed350bd1b64e70"; + name = "portfinder___portfinder_1.0.28.tgz"; + url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz"; + sha1 = "67c4622852bd5374dd1dd900f779f53462fac778"; }; } { @@ -8730,11 +9082,11 @@ }; } { - name = "postcss_calc___postcss_calc_7.0.2.tgz"; + name = "postcss_calc___postcss_calc_7.0.4.tgz"; path = fetchurl { - name = "postcss_calc___postcss_calc_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz"; - sha1 = "504efcd008ca0273120568b0792b16cdcde8aac1"; + name = "postcss_calc___postcss_calc_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.4.tgz"; + sha1 = "5e177ddb417341e6d4a193c5d9fd8ada79094f8b"; }; } { @@ -9026,11 +9378,11 @@ }; } { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz"; path = fetchurl { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz"; - sha1 = "e8a6561be914aaf3c052876377524ca90dbb7915"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz"; + sha1 = "bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"; }; } { @@ -9306,11 +9658,11 @@ }; } { - name = "postcss___postcss_7.0.29.tgz"; + name = "postcss___postcss_7.0.32.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.29.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.29.tgz"; - sha1 = "d3a903872bd52280b83bce38cdc83ce55c06129e"; + name = "postcss___postcss_7.0.32.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz"; + sha1 = "4310d6ee347053da3433db2be492883d62cec59d"; }; } { @@ -9330,19 +9682,19 @@ }; } { - name = "prettier___prettier_2.0.5.tgz"; + name = "prettier___prettier_2.1.1.tgz"; path = fetchurl { - name = "prettier___prettier_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz"; - sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4"; + name = "prettier___prettier_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz"; + sha1 = "d9485dd5e499daa6cb547023b87a6cf51bee37d6"; }; } { - name = "pretty_bytes___pretty_bytes_5.3.0.tgz"; + name = "pretty_bytes___pretty_bytes_5.4.1.tgz"; path = fetchurl { - name = "pretty_bytes___pretty_bytes_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz"; - sha1 = "f2849e27db79fb4d6cfe24764fc4134f165989f2"; + name = "pretty_bytes___pretty_bytes_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz"; + sha1 = "cd89f79bbcef21e3d21eb0da68ffe93f803e884b"; }; } { @@ -9369,14 +9721,6 @@ sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a"; }; } - { - name = "private___private_0.1.8.tgz"; - path = fetchurl { - name = "private___private_0.1.8.tgz"; - url = "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz"; - sha1 = "2381edb3689f7a53d653190060fcf822d2f368ff"; - }; - } { name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; path = fetchurl { @@ -9538,11 +9882,11 @@ }; } { - name = "puppeteer___puppeteer_3.0.4.tgz"; + name = "puppeteer___puppeteer_5.3.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.0.4.tgz"; - sha1 = "f445aae0a6732c65bbb90e963dcd6fd8fde0d780"; + name = "puppeteer___puppeteer_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-5.3.0.tgz"; + sha1 = "0abf83d0f2d1273baf2b56885a813f8052903e33"; }; } { @@ -9594,11 +9938,11 @@ }; } { - name = "querystringify___querystringify_2.1.1.tgz"; + name = "querystringify___querystringify_2.2.0.tgz"; path = fetchurl { - name = "querystringify___querystringify_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz"; - sha1 = "60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"; + name = "querystringify___querystringify_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz"; + sha1 = "3345941b4153cb9d082d8eee4cda2016a9aef7f6"; }; } { @@ -9610,11 +9954,11 @@ }; } { - name = "ramda___ramda_0.26.1.tgz"; + name = "ramda___ramda_0.27.1.tgz"; path = fetchurl { - name = "ramda___ramda_0.26.1.tgz"; - url = "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz"; - sha1 = "8d41351eb8111c55353617fc3bbffad8e4d35d06"; + name = "ramda___ramda_0.27.1.tgz"; + url = "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz"; + sha1 = "66fc2df3ef873874ffc2da6aa8984658abacf5c9"; }; } { @@ -9658,11 +10002,11 @@ }; } { - name = "react_codemirror2___react_codemirror2_7.1.0.tgz"; + name = "react_codemirror2___react_codemirror2_7.2.1.tgz"; path = fetchurl { - name = "react_codemirror2___react_codemirror2_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-7.1.0.tgz"; - sha1 = "b874a275ad4f6f2ee5adb23b550c0f4b8b82776d"; + name = "react_codemirror2___react_codemirror2_7.2.1.tgz"; + url = "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-7.2.1.tgz"; + sha1 = "38dab492fcbe5fb8ebf5630e5bb7922db8d3a10c"; }; } { @@ -9722,27 +10066,27 @@ }; } { - name = "react_router_dom___react_router_dom_5.1.2.tgz"; + name = "react_router_dom___react_router_dom_5.2.0.tgz"; path = fetchurl { - name = "react_router_dom___react_router_dom_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz"; - sha1 = "06701b834352f44d37fbb6311f870f84c76b9c18"; + name = "react_router_dom___react_router_dom_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz"; + sha1 = "9e65a4d0c45e13289e66c7b17c7e175d0ea15662"; }; } { - name = "react_router___react_router_5.1.2.tgz"; + name = "react_router___react_router_5.2.0.tgz"; path = fetchurl { - name = "react_router___react_router_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz"; - sha1 = "6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418"; + name = "react_router___react_router_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz"; + sha1 = "424e75641ca8747fbf76e5ecca69781aa37ea293"; }; } { - name = "react_scripts___react_scripts_3.4.1.tgz"; + name = "react_scripts___react_scripts_3.4.3.tgz"; path = fetchurl { - name = "react_scripts___react_scripts_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.1.tgz"; - sha1 = "f551298b5c71985cc491b9acf3c8e8c0ae3ada0a"; + name = "react_scripts___react_scripts_3.4.3.tgz"; + url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.3.tgz"; + sha1 = "21de5eb93de41ee92cd0b85b0e1298d0bb2e6c51"; }; } { @@ -9793,6 +10137,14 @@ sha1 = "1b221c6088ba7799601c808f91161c66e58f8978"; }; } + { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha1 = "f3a6135758459733ae2b95638056e1854e7ef507"; + }; + } { name = "read_pkg___read_pkg_2.0.0.tgz"; path = fetchurl { @@ -9809,6 +10161,14 @@ sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; }; } + { + name = "read_pkg___read_pkg_5.2.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; + sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc"; + }; + } { name = "readable_stream___readable_stream_2.3.7.tgz"; path = fetchurl { @@ -9874,11 +10234,11 @@ }; } { - name = "regenerate___regenerate_1.4.0.tgz"; + name = "regenerate___regenerate_1.4.1.tgz"; path = fetchurl { - name = "regenerate___regenerate_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz"; - sha1 = "4a856ec4b56e4077c557589cae85e7a4c8869a11"; + name = "regenerate___regenerate_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz"; + sha1 = "cad92ad8e6b591773485fbe05a485caf4f457e6f"; }; } { @@ -9890,19 +10250,19 @@ }; } { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; }; } { - name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; - sha1 = "5266857896518d1616a78a0479337a30ea974cc7"; + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; + sha1 = "c98da154683671c9c4dcb16ece736517e1b7feb4"; }; } { @@ -9921,6 +10281,14 @@ sha1 = "9e66a8f73d89a107616e63b39d4deddfee912b37"; }; } + { + name = "regexp_tree___regexp_tree_0.1.21.tgz"; + path = fetchurl { + name = "regexp_tree___regexp_tree_0.1.21.tgz"; + url = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.21.tgz"; + sha1 = "55e2246b7f7d36f1b461490942fa780299c400d7"; + }; + } { name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; path = fetchurl { @@ -9954,11 +10322,11 @@ }; } { - name = "regjsgen___regjsgen_0.5.1.tgz"; + name = "regjsgen___regjsgen_0.5.2.tgz"; path = fetchurl { - name = "regjsgen___regjsgen_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz"; - sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c"; + name = "regjsgen___regjsgen_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz"; + sha1 = "92ff295fb1deecbf6ecdab2543d207e91aa33733"; }; } { @@ -10034,19 +10402,19 @@ }; } { - name = "request_promise_core___request_promise_core_1.1.3.tgz"; + name = "request_promise_core___request_promise_core_1.1.4.tgz"; path = fetchurl { - name = "request_promise_core___request_promise_core_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha1 = "e9a3c081b51380dfea677336061fea879a829ee9"; + name = "request_promise_core___request_promise_core_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha1 = "3eedd4223208d419867b78ce815167d10593a22f"; }; } { - name = "request_promise_native___request_promise_native_1.0.8.tgz"; + name = "request_promise_native___request_promise_native_1.0.9.tgz"; path = fetchurl { - name = "request_promise_native___request_promise_native_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz"; - sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36"; + name = "request_promise_native___request_promise_native_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28"; }; } { @@ -10065,14 +10433,6 @@ sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; } - { - name = "require_main_filename___require_main_filename_1.0.1.tgz"; - path = fetchurl { - name = "require_main_filename___require_main_filename_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; - }; - } { name = "require_main_filename___require_main_filename_2.0.0.tgz"; path = fetchurl { @@ -10089,6 +10449,14 @@ sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; } + { + name = "reserved_words___reserved_words_0.1.2.tgz"; + path = fetchurl { + name = "reserved_words___reserved_words_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz"; + sha1 = "00a0940f98cd501aeaaac316411d9adc52b31ab1"; + }; + } { name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; path = fetchurl { @@ -10185,6 +10553,14 @@ sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; }; } + { + name = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha1 = "90da382b1e126efc02146e90845a88db12925d76"; + }; + } { name = "rework_visit___rework_visit_1.0.0.tgz"; path = fetchurl { @@ -10265,6 +10641,14 @@ sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; }; } + { + name = "run_parallel___run_parallel_1.1.9.tgz"; + path = fetchurl { + name = "run_parallel___run_parallel_1.1.9.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz"; + sha1 = "c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"; + }; + } { name = "run_queue___run_queue_1.0.3.tgz"; path = fetchurl { @@ -10274,11 +10658,11 @@ }; } { - name = "rxjs___rxjs_6.5.5.tgz"; + name = "rxjs___rxjs_6.6.3.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.5.5.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz"; - sha1 = "c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"; + name = "rxjs___rxjs_6.6.3.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz"; + sha1 = "8ca84635c4daa900c0d3967a6ee7ac60271ee552"; }; } { @@ -10290,11 +10674,11 @@ }; } { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; }; } { @@ -10305,6 +10689,14 @@ sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; }; } + { + name = "safe_regex___safe_regex_2.1.1.tgz"; + path = fetchurl { + name = "safe_regex___safe_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-2.1.1.tgz"; + sha1 = "f7128f00d056e2fe5c11e81a1324dd974aadced2"; + }; + } { name = "safer_buffer___safer_buffer_2.1.2.tgz"; path = fetchurl { @@ -10370,11 +10762,11 @@ }; } { - name = "schema_utils___schema_utils_2.6.6.tgz"; + name = "schema_utils___schema_utils_2.7.1.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.6.6.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz"; - sha1 = "299fe6bd4a3365dc23d99fd446caff8f1d6c330c"; + name = "schema_utils___schema_utils_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; + sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"; }; } { @@ -10417,6 +10809,14 @@ sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; }; } + { + name = "semver___semver_7.3.2.tgz"; + path = fetchurl { + name = "semver___semver_7.3.2.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz"; + sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; + }; + } { name = "send___send_0.17.1.tgz"; path = fetchurl { @@ -10426,11 +10826,11 @@ }; } { - name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; path = fetchurl { - name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; - sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; + name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; + sha1 = "b525e1238489a5ecfc42afacc3fe99e666f4b1aa"; }; } { @@ -10562,11 +10962,11 @@ }; } { - name = "side_channel___side_channel_1.0.2.tgz"; + name = "side_channel___side_channel_1.0.3.tgz"; path = fetchurl { - name = "side_channel___side_channel_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; - sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; + name = "side_channel___side_channel_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz"; + sha1 = "cdc46b057550bbab63706210838df5d4c19519c3"; }; } { @@ -10658,11 +11058,11 @@ }; } { - name = "sockjs___sockjs_0.3.19.tgz"; + name = "sockjs___sockjs_0.3.20.tgz"; path = fetchurl { - name = "sockjs___sockjs_0.3.19.tgz"; - url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz"; - sha1 = "d976bbe800af7bd20ae08598d582393508993c0d"; + name = "sockjs___sockjs_0.3.20.tgz"; + url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz"; + sha1 = "b26a283ec562ef8b2687b44033a4eeceac75d855"; }; } { @@ -10722,11 +11122,11 @@ }; } { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; + name = "spdx_correct___spdx_correct_3.1.1.tgz"; path = fetchurl { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha1 = "fb83e504445268f154b074e218c87c003cd31df4"; + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; }; } { @@ -10738,11 +11138,11 @@ }; } { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; }; } { @@ -10913,22 +11313,6 @@ sha1 = "107ef8c23456e187a8abd4a61162ff4ac6e25837"; }; } - { - name = "string_width___string_width_1.0.2.tgz"; - path = fetchurl { - name = "string_width___string_width_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - } - { - name = "string_width___string_width_2.1.1.tgz"; - path = fetchurl { - name = "string_width___string_width_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; - sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; - }; - } { name = "string_width___string_width_3.1.0.tgz"; path = fetchurl { @@ -10961,22 +11345,6 @@ sha1 = "85812a6b847ac002270f5808146064c995fb6913"; }; } - { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; - path = fetchurl { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; - sha1 = "4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"; - }; - } - { - name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; - path = fetchurl { - name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; - sha1 = "c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"; - }; - } { name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; path = fetchurl { @@ -11066,11 +11434,11 @@ }; } { - name = "strip_json_comments___strip_json_comments_3.1.0.tgz"; + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; path = fetchurl { - name = "strip_json_comments___strip_json_comments_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz"; - sha1 = "7638d31422129ecf4457440009fba03f9f9ac180"; + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; }; } { @@ -11114,11 +11482,11 @@ }; } { - name = "supports_color___supports_color_7.1.0.tgz"; + name = "supports_color___supports_color_7.2.0.tgz"; path = fetchurl { - name = "supports_color___supports_color_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz"; - sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1"; + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; }; } { @@ -11162,43 +11530,43 @@ }; } { - name = "tar_fs___tar_fs_2.0.1.tgz"; + name = "tar_fs___tar_fs_2.1.0.tgz"; path = fetchurl { - name = "tar_fs___tar_fs_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.1.tgz"; - sha1 = "e44086c1c60d31a4f0cf893b1c4e155dabfae9e2"; + name = "tar_fs___tar_fs_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.0.tgz"; + sha1 = "d1cdd121ab465ee0eb9ccde2d35049d3f3daf0d5"; }; } { - name = "tar_stream___tar_stream_2.1.2.tgz"; + name = "tar_stream___tar_stream_2.1.4.tgz"; path = fetchurl { - name = "tar_stream___tar_stream_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz"; - sha1 = "6d5ef1a7e5783a95ff70b69b97455a5968dc1325"; + name = "tar_stream___tar_stream_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz"; + sha1 = "c4fb1a11eb0da29b893a5b25476397ba2d053bfa"; }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_2.3.5.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.8.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_2.3.5.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz"; - sha1 = "5ad971acce5c517440ba873ea4f09687de2f4a81"; + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz"; + sha1 = "894764a19b0743f2f704e7c2a848c5283a696724"; }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; - sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"; + sha1 = "a217aefaea330e734ffacb6120ec1fa312d6040b"; }; } { - name = "terser___terser_4.6.13.tgz"; + name = "terser___terser_4.8.0.tgz"; path = fetchurl { - name = "terser___terser_4.6.13.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz"; - sha1 = "e879a7364a5e0db52ba4891ecde007422c56a916"; + name = "terser___terser_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz"; + sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; }; } { @@ -11418,35 +11786,19 @@ }; } { - name = "tslib___tslib_1.11.2.tgz"; + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; path = fetchurl { - name = "tslib___tslib_1.11.2.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.2.tgz"; - sha1 = "9c79d83272c9a7aaf166f73915c9667ecdde3cc9"; + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; + sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; }; } { - name = "tslint_sonarts___tslint_sonarts_1.9.0.tgz"; + name = "tslib___tslib_1.13.0.tgz"; path = fetchurl { - name = "tslint_sonarts___tslint_sonarts_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/tslint-sonarts/-/tslint-sonarts-1.9.0.tgz"; - sha1 = "feb593e92db328c0328b430b838adbe65d504de9"; - }; - } - { - name = "tslint___tslint_6.1.2.tgz"; - path = fetchurl { - name = "tslint___tslint_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/tslint/-/tslint-6.1.2.tgz"; - sha1 = "2433c248512cc5a7b2ab88ad44a6b1b34c6911cf"; - }; - } - { - name = "tsutils___tsutils_2.29.0.tgz"; - path = fetchurl { - name = "tsutils___tsutils_2.29.0.tgz"; - url = "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz"; - sha1 = "32b488501467acbedd4b85498673a0812aca0b99"; + name = "tslib___tslib_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; + sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; }; } { @@ -11497,6 +11849,14 @@ sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; }; } + { + name = "type_fest___type_fest_0.6.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; + sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; + }; + } { name = "type_fest___type_fest_0.8.1.tgz"; path = fetchurl { @@ -11522,11 +11882,11 @@ }; } { - name = "type___type_2.0.0.tgz"; + name = "type___type_2.1.0.tgz"; path = fetchurl { - name = "type___type_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz"; - sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3"; + name = "type___type_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz"; + sha1 = "9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"; }; } { @@ -11546,11 +11906,11 @@ }; } { - name = "typescript___typescript_3.8.3.tgz"; + name = "typescript___typescript_4.0.2.tgz"; path = fetchurl { - name = "typescript___typescript_3.8.3.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; - sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; + name = "typescript___typescript_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz"; + sha1 = "7ea7c88777c723c681e33bf7988be5d008d05ac2"; }; } { @@ -11562,11 +11922,11 @@ }; } { - name = "unbzip2_stream___unbzip2_stream_1.4.2.tgz"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; path = fetchurl { - name = "unbzip2_stream___unbzip2_stream_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz"; - sha1 = "84eb9e783b186d8fb397515fbb656f312f1a7dbf"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; + sha1 = "b0da04c4371311df771cdc215e87f2130991ace7"; }; } { @@ -11746,11 +12106,11 @@ }; } { - name = "uri_js___uri_js_4.2.2.tgz"; + name = "uri_js___uri_js_4.4.0.tgz"; path = fetchurl { - name = "uri_js___uri_js_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; - sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + name = "uri_js___uri_js_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; + sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; }; } { @@ -11858,11 +12218,11 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz"; - sha1 = "e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"; + name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz"; + sha1 = "54bc3cdd43317bca91e35dcaf305b1a7237de745"; }; } { @@ -11954,11 +12314,11 @@ }; } { - name = "wait_on___wait_on_5.0.0.tgz"; + name = "wait_on___wait_on_5.2.0.tgz"; path = fetchurl { - name = "wait_on___wait_on_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/wait-on/-/wait-on-5.0.0.tgz"; - sha1 = "72e554b338490bbc7131362755ca1af04f46d029"; + name = "wait_on___wait_on_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/wait-on/-/wait-on-5.2.0.tgz"; + sha1 = "6711e74422523279714a36d52cf49fb47c9d9597"; }; } { @@ -11970,11 +12330,19 @@ }; } { - name = "watchpack___watchpack_1.6.1.tgz"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; path = fetchurl { - name = "watchpack___watchpack_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz"; - sha1 = "280da0a8718592174010c078c7585a74cd8cd0e2"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; + sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"; + }; + } + { + name = "watchpack___watchpack_1.7.4.tgz"; + path = fetchurl { + name = "watchpack___watchpack_1.7.4.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz"; + sha1 = "6e9da53b3c80bb2d6508188f5b200410866cd30b"; }; } { @@ -12002,11 +12370,11 @@ }; } { - name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz"; + name = "webpack_dev_server___webpack_dev_server_3.11.0.tgz"; path = fetchurl { - name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz"; - sha1 = "f35945036813e57ef582c2420ef7b470e14d3af0"; + name = "webpack_dev_server___webpack_dev_server_3.11.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"; + sha1 = "8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"; }; } { @@ -12042,19 +12410,27 @@ }; } { - name = "websocket_driver___websocket_driver_0.7.3.tgz"; + name = "websocket_driver___websocket_driver_0.6.5.tgz"; path = fetchurl { - name = "websocket_driver___websocket_driver_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz"; - sha1 = "a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"; + name = "websocket_driver___websocket_driver_0.6.5.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz"; + sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; }; } { - name = "websocket_extensions___websocket_extensions_0.1.3.tgz"; + name = "websocket_driver___websocket_driver_0.7.4.tgz"; path = fetchurl { - name = "websocket_extensions___websocket_extensions_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; - sha1 = "5d2ff22977003ec687a4b87073dfbbac146ccf29"; + name = "websocket_driver___websocket_driver_0.7.4.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz"; + sha1 = "89ad5295bbf64b480abcba31e4953aca706f5760"; + }; + } + { + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; + path = fetchurl { + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; + sha1 = "7f8473bc839dfd87608adb95d7eb075211578a42"; }; } { @@ -12066,11 +12442,11 @@ }; } { - name = "whatwg_fetch___whatwg_fetch_3.0.0.tgz"; + name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz"; path = fetchurl { - name = "whatwg_fetch___whatwg_fetch_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz"; - sha1 = "fc804e458cc460009b1a2b966bc8817d2578aefb"; + name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"; + sha1 = "e5f871572d6879663fa5674c8f833f15a8425ab3"; }; } { @@ -12273,14 +12649,6 @@ sha1 = "cb565bd6d7071a8f16660686051e969ad32f54d5"; }; } - { - name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - } { name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; path = fetchurl { @@ -12330,11 +12698,11 @@ }; } { - name = "ws___ws_7.2.5.tgz"; + name = "ws___ws_7.3.1.tgz"; path = fetchurl { - name = "ws___ws_7.2.5.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz"; - sha1 = "abb1370d4626a5a9cd79d8de404aa18b3465d10d"; + name = "ws___ws_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz"; + sha1 = "d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"; }; } { @@ -12402,19 +12770,11 @@ }; } { - name = "yaml___yaml_1.9.2.tgz"; + name = "yaml___yaml_1.10.0.tgz"; path = fetchurl { - name = "yaml___yaml_1.9.2.tgz"; - url = "https://registry.yarnpkg.com/yaml/-/yaml-1.9.2.tgz"; - sha1 = "f0cfa865f003ab707663e4f04b3956957ea564ed"; - }; - } - { - name = "yargs_parser___yargs_parser_11.1.1.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_11.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz"; - sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"; + name = "yaml___yaml_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz"; + sha1 = "3b593add944876077d4d683fee01081bd9fff31e"; }; } { @@ -12425,14 +12785,6 @@ sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; }; } - { - name = "yargs___yargs_12.0.5.tgz"; - path = fetchurl { - name = "yargs___yargs_12.0.5.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz"; - sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13"; - }; - } { name = "yargs___yargs_13.3.2.tgz"; path = fetchurl { From 72ccc9b885919e4eb45b5137e42cd9262c9a2639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Sun, 13 Sep 2020 17:52:22 +0200 Subject: [PATCH 091/463] chez-modules: Fix path to csv-site. It seems that the installation path for chez modules no longer includes the Chez version. This fixes the build for chez-mit and chez-scmutils. --- pkgs/development/chez-modules/chez-mit/default.nix | 2 +- pkgs/development/chez-modules/chez-scmutils/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix index fc2c0f7ba4f..3942195aaa7 100644 --- a/pkgs/development/chez-modules/chez-mit/default.nix +++ b/pkgs/development/chez-modules/chez-mit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ chez chez-srfi ]; buildPhase = '' - export CHEZSCHEMELIBDIRS=${chez-srfi}/lib/csv9.5-site + export CHEZSCHEMELIBDIRS=${chez-srfi}/lib/csv-site make PREFIX=$out CHEZ=${chez}/bin/scheme ''; diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/development/chez-modules/chez-scmutils/default.nix index 861ff4ff46b..cda24f0959a 100644 --- a/pkgs/development/chez-modules/chez-scmutils/default.nix +++ b/pkgs/development/chez-modules/chez-scmutils/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ chez chez-srfi chez-mit ]; buildPhase = '' - export CHEZSCHEMELIBDIRS=${chez-srfi}/lib/csv9.5-site:${chez-mit}/lib/csv9.5-site + export CHEZSCHEMELIBDIRS=${chez-srfi}/lib/csv-site:${chez-mit}/lib/csv-site make PREFIX=$out CHEZ=${chez}/bin/scheme ''; From a8d62137262393603e5ea1f7f19e22df8213d5ec Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 13 Sep 2020 09:09:05 -0700 Subject: [PATCH 092/463] Shell programming hygiene (#97884) --- pkgs/applications/editors/vscode/update.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/update.sh b/pkgs/applications/editors/vscode/update.sh index d573fdf04aa..c030e38a70a 100755 --- a/pkgs/applications/editors/vscode/update.sh +++ b/pkgs/applications/editors/vscode/update.sh @@ -1,6 +1,8 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused gawk +set -eou pipefail + ROOT="$(dirname "$(readlink -f "$0")")" if [ ! -f "$ROOT/vscode.nix" ]; then echo "ERROR: cannot find vscode.nix in $ROOT" @@ -36,4 +38,4 @@ sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\" VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-${VSCODIUM_VER}.zip" VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL}) -sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix" \ No newline at end of file +sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix" From a6b064e6492eb471a5a5cecc0852bb57748e1b6e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 27 Aug 2020 04:20:00 +0000 Subject: [PATCH 093/463] cascadia-code: 2007.01 -> 2008.25 https://github.com/microsoft/cascadia-code/releases/tag/v2008.25 --- pkgs/data/fonts/cascadia-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix index 220d2684eef..30738a3c3cd 100644 --- a/pkgs/data/fonts/cascadia-code/default.nix +++ b/pkgs/data/fonts/cascadia-code/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2007.01"; + version = "2008.25"; in fetchzip { name = "cascadia-code-${version}"; url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; - sha256 = "173dpr0k4y5b02ps9426pyaazl2pxj1kw5l5jrikbi6zjv4590gb"; + sha256 = "182ssznm6f5fhykmqqvimq7ihmxkc64gh76faqxg1ihdyzqgi2y6"; postFetch = '' mkdir -p $out/share/fonts/ From 8ddd52d29b3ab2910b11563a8007e0fbdd61941d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 13 Sep 2020 10:10:10 -0500 Subject: [PATCH 094/463] tflint: 0.19.1 -> 0.20.1 https://github.com/terraform-linters/tflint/releases/tag/v0.20.1 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index b6834ea8232..abaff0a8067 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.19.1"; + version = "0.20.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1nj36xxl8zg7wdc36lakzdyr9hk82qwkwrvrw19bqach697y57nf"; + sha256 = "06y4p65zzd7nmpvpnfcig58wbrav9ifbpqw1lhs2vdav17035xif"; }; - vendorSha256 = "0bzd58ry5k100mjgvl1mxz7aysm75s4vkilcykrqy1s5sc0h3ng5"; + vendorSha256 = "0c1b06np4yhixndig11kxxvj24rk50l1sdqah8kzhi2cqjwvmpw0"; doCheck = false; From 4312e2460a98c88438ad15a0797b14c7c873ab8b Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 13 Sep 2020 18:20:22 +0200 Subject: [PATCH 095/463] lefthook: use go 1.14 to build Due to some changes in `go` from 1.14 to 1.15 the lefthook tool currently can't start external programs and errors each test it tries to run, making it effectively useless. This is a temporary fix to make `lefthook` usable again until the upstream issue was fixed and a new release has been cut. Upstream issue: https://github.com/Arkweid/lefthook/issues/151 --- .../version-management/git-and-tools/default.nix | 6 +++++- .../version-management/git-and-tools/lefthook/default.nix | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 765c2157a22..d068fb73169 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -201,7 +201,11 @@ let lab = callPackage ./lab { }; - lefthook = callPackage ./lefthook { }; + lefthook = callPackage ./lefthook { + # Please use empty attrset once upstream bugs have been fixed + # https://github.com/Arkweid/lefthook/issues/151 + buildGoModule = buildGo114Module; + }; legit = callPackage ./legit { }; diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 15c323680a4..a13e4b33d38 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -1,5 +1,11 @@ { stdenv, buildGoModule, fetchFromGitHub }: +# Currently `buildGo114Module` is passed as `buildGoModule` from +# `../default.nix`. Please remove the fixed 1.14 once a new release has been +# made and the issue linked below has been closed upstream. + +# https://github.com/Arkweid/lefthook/issues/151 + buildGoModule rec { pname = "lefthook"; version = "0.7.2"; From 69cdd652b71775c2851896046e83f43ad09fb5df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 13 Sep 2020 09:21:58 +0200 Subject: [PATCH 096/463] python3Packages.datasets: 1.0.0 -> 1.0.1 Changelog: https://github.com/huggingface/datasets/releases/tag/1.0.1 --- pkgs/development/python-modules/datasets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 4bddd69ed99..b953ed1dd1a 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "datasets"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = version; - sha256 = "13l52r7nhj2c1a10isy5309d2g6pmaivyqs5w6yjbjj4195jxya5"; + sha256 = "14f7847b8md5kf631zl8x2f53wy8zbzxypq4wdgzvwsjz4k7v4jn"; }; propagatedBuildInputs = [ From dc2e45e3e580bc2a0fb69a80fdd2207eb1b8ba1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 13 Sep 2020 08:56:44 +0200 Subject: [PATCH 097/463] python.pkgs.geopandas: 0.8.0 -> 0.8.1 This fixes the geopandas build, which did break with the update of pandas from 1.0.5 to 1.1.0. --- .../python-modules/geopandas/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 07982b1e42b..200dfffa562 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -1,19 +1,27 @@ { stdenv, buildPythonPackage, fetchFromGitHub, isPy27 , pandas, shapely, fiona, descartes, pyproj -, pytest, Rtree }: +, pytest, Rtree, fetchpatch }: buildPythonPackage rec { pname = "geopandas"; - version = "0.8.0"; + version = "0.8.1"; disabled = isPy27; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "033jygbyycl9s6b0kqix9xynhapc2xd8nh47kcfacn514gyncgah"; + sha256 = "0618p0s0biisxk2s0h43hkc3bs1nwjk84rxbfyd6brfvs9yx4vq7"; }; + patches = [ + # Fix for test test_numerical_operations: https://github.com/geopandas/geopandas/issues/1541 + (fetchpatch { + url = "https://github.com/geopandas/geopandas/pull/1544/commits/6ce868a33a2f483b071089d51e178030fa4414d0.patch"; + sha256 = "1sjgxrqgbhz5krx51hrv230ywszcdl6z8q3bj6830kfad8n8b5dq"; + }) + ]; + checkInputs = [ pytest Rtree ]; checkPhase = '' From 4269da36d178b5c953f96bc865510fdf55dcc61a Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 13 Sep 2020 09:05:56 +0300 Subject: [PATCH 098/463] ArchiSteamFarm: 4.2.3.6 -> 4.2.4.0 --- pkgs/applications/misc/ArchiSteamFarm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index e5121ce6e7d..38a25b3375a 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ArchiSteamFarm"; - version = "4.2.3.6"; + version = "4.2.4.0"; src = fetchurl { url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-generic.zip"; - sha256 = "1a8baxrb8czndxxi16md1nyl2snfx215yvrygdpcblgngkp2z2y9"; + sha256 = "1nkbyy9gnp8nkr04bbiapwvv2nspnl36fvnzjwaq4a13mj49m5zq"; }; nativeBuildInputs = [ unzip makeWrapper jq ]; From 1810cb2e0cc6f14447073c035aafbe75dd07d195 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 13 Sep 2020 15:10:41 +0200 Subject: [PATCH 099/463] python3Packages.brother: 0.1.14 -> 0.1.17 --- pkgs/development/python-modules/brother/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index b560c9ec083..e79ee03241d 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "brother"; - version = "0.1.14"; - disabled = pythonOlder "3.6"; + version = "0.1.17"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "11pkr30bxrzgbz6bi42dyhav6qhr7rz9fb6a13297g7wa77jn4r4"; + sha256 = "03gjcpbq8rwnjzplgwhwr8wb7a1zh940dr6iwnq9srklqzzj691m"; }; propagatedBuildInputs = [ From f57a658d8e85229e27cd052b33b643d2264a2611 Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Sun, 13 Sep 2020 18:45:23 +0200 Subject: [PATCH 100/463] zathura: symlinkJoin all of plugins (#96630) * zathura: symlinkJoin all of plugins * zathura: Add TethysSvensson as a maintainer Co-authored-by: Matthieu Coudron --- pkgs/applications/misc/zathura/wrapper.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 5d37b5190d0..7cd52e0c74f 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -1,21 +1,16 @@ { symlinkJoin, lib, makeWrapper, zathura_core, file, plugins ? [] }: - -let - pluginsPath = lib.makeSearchPath "lib/zathura" plugins; - -in symlinkJoin { +symlinkJoin { name = "zathura-with-plugins-${zathura_core.version}"; - paths = with zathura_core; [ man dev out ]; + paths = with zathura_core; [ man dev out ] ++ plugins; - inherit plugins; buildInputs = [ makeWrapper ]; postBuild = '' makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \ --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ - --add-flags --plugins-dir=${pluginsPath} + --add-flags --plugins-dir="$out/lib/zathura" ''; meta = with lib; { @@ -29,6 +24,6 @@ in symlinkJoin { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ smironov globin ]; + maintainers = with maintainers; [ smironov globin TethysSvensson ]; }; } From 1d5fb043fa848fffd18512e47ea57168fce5de6f Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 13 Sep 2020 12:45:34 -0400 Subject: [PATCH 101/463] nwg-launchers: 0.2.0 -> 0.3.3 --- pkgs/applications/misc/nwg-launchers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index 833a4584412..fc8cf3ee02e 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.2.0"; + version = "0.3.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "1mlym0mpg6njwgwniwlk95fk6wfwlzq8nwmkb5mkjlm2nqv5bdv1"; + sha256 = "1p1bwsn7l4vp7y183735pgsfbh7dssdfn0wjzacl4s87arjdcgvb"; }; nativeBuildInputs = [ From 8cb1e75e3b6766322067bd6d6e933eb66c702f9f Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 13 Sep 2020 16:57:05 +0300 Subject: [PATCH 102/463] wordgrinder: fix build --- pkgs/applications/office/wordgrinder/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index c2ccbabe2f1..6438bed4828 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "LUA_INCLUDE=${lua52Packages.lua}/include" "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" + "OBJDIR=$TMP/wg-build" ]; preBuild = stdenv.lib.optionalString stdenv.isLinux '' From 22d021337680cf97ef399c7fc480c19404ffbd71 Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Sun, 13 Sep 2020 10:15:39 +0200 Subject: [PATCH 103/463] hacksaw: init as 1.0.4 --- pkgs/tools/misc/hacksaw/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/hacksaw/default.nix diff --git a/pkgs/tools/misc/hacksaw/default.nix b/pkgs/tools/misc/hacksaw/default.nix new file mode 100644 index 00000000000..bf0daa38ab3 --- /dev/null +++ b/pkgs/tools/misc/hacksaw/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, libXrandr, libX11, python3 }: + +rustPlatform.buildRustPackage rec { + pname = "hacksaw"; + version = "1.0.4"; + + nativeBuildInputs = [ pkg-config python3 ]; + + buildInputs = [ libXrandr libX11 ]; + + src = fetchCrate { + inherit pname version; + sha256 = "1l6i91xb81p1li1j2jm0r2rx8dbzl2yh468cl3dw0lqpqy4i65hx"; + }; + + cargoSha256 = "01draql3x71h7xl2xcc69dv7vpi3smnajhrvaihs5vij81pyfrzk"; + + meta = with lib; { + description = "Lightweight selection tool for usage in screenshot scripts etc."; + homepage = "https://github.com/neXromancers/hacksaw"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ TethysSvensson ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b68fd797e38..79299e11bbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20916,6 +20916,8 @@ in hackrf = callPackage ../applications/radio/hackrf { }; + hacksaw = callPackage ../tools/misc/hacksaw {}; + hakuneko = callPackage ../tools/misc/hakuneko { }; hamster = callPackage ../applications/misc/hamster { }; From 5e891fd07339fa6e388e75e07637e8de1088cca1 Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Fri, 26 Jun 2020 01:54:00 +0100 Subject: [PATCH 104/463] python3Packages.jenkinsapi: fix build nix-env -f default.nix -iA python38Packages.jenkinsapi now works. Here is a list of all the things done: - fixed the dependency list which was lacking some packages - changed checkPhase. This called python setup.py test by default, which is very much not what jenkinsapi does upstream. This resulted in simple_post_logger.py being imported, which called serve_forever(), manifesting as a hang - tox decided to install pbr every time and fails and also tried to run tests across multiple python versions, so I just made checkPhase call pylint/pycodestyle/py.test directly. - disabled systests which try to run jenkins - disabled misc broken tests. There are some calls in them that should have been mocked but the mocks don't take effect for some reason, resulting in failed requests to localhost. - removed needless inputs. nose and unittest2 are not needed, not even in python2 - disabled tests on darwin, as requests-kerberos is apparently broken --- .../python-modules/jenkinsapi/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index 7fe7f2baa4a..40bf7752a90 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -1,12 +1,13 @@ { stdenv , buildPythonPackage , fetchPypi +, mock +, pytest +, pytest-mock , pytz , requests -, coverage -, mock -, nose -, unittest2 +, requests-kerberos +, toml }: buildPythonPackage rec { @@ -19,14 +20,21 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pytz requests ]; - buildInputs = [ coverage mock nose unittest2 ]; + checkInputs = [ mock pytest pytest-mock requests-kerberos toml ]; + # TODO requests-kerberos is broken on darwin, weeding out the broken tests without + # access to macOS is not an adventure I am ready to embark on - @rski + doCheck = !stdenv.isDarwin; + # don't run tests that try to spin up jenkins, and a few more that are mysteriously broken + checkPhase = '' + py.test jenkinsapi_tests \ + -k "not systests and not test_plugins and not test_view" + ''; meta = with stdenv.lib; { description = "A Python API for accessing resources on a Jenkins continuous-integration server"; homepage = "https://github.com/salimfadhley/jenkinsapi"; maintainers = with maintainers; [ drets ]; license = licenses.mit; - broken = true; }; } From 1be6ac06ab633f539e309cdfe090a948d23a8901 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 13 Sep 2020 05:34:16 +0200 Subject: [PATCH 105/463] barman: init 2.11 --- pkgs/tools/misc/barman/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/barman/default.nix diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix new file mode 100644 index 00000000000..2105ad0ae01 --- /dev/null +++ b/pkgs/tools/misc/barman/default.nix @@ -0,0 +1,29 @@ +{ buildPythonApplication, fetchurl, lib +, dateutil, argcomplete, argh, psycopg2, boto3 +}: + +buildPythonApplication rec { + pname = "barman"; + version = "2.11"; + + outputs = [ "out" "man" ]; + src = fetchurl { + url = "mirror://sourceforge/pgbarman/${version}/barman-${version}.tar.gz"; + sha256 = "0w5lh4aavab9ynfy2mq09ga6j4vss4k0vlc3g6f5a9i4175g9pmr"; + }; + + propagatedBuildInputs = [ dateutil argh psycopg2 boto3 argcomplete ]; + + # Tests are not present in tarball + checkPhase = '' + $out/bin/barman --help > /dev/null + ''; + + meta = with lib; { + homepage = "https://www.2ndquadrant.com/en/resources/barman/"; + description = "Backup and Disaster Recovery Manager for PostgreSQL"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79299e11bbc..fb13539fe79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -875,6 +875,8 @@ in automirror = callPackage ../tools/misc/automirror { }; + barman = python3Packages.callPackage ../tools/misc/barman { }; + bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; bashcards = callPackage ../tools/misc/bashcards { }; From 7849d114789b88ce68dc87d7dadd315b3cdb3140 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 13 Sep 2020 06:04:12 +0200 Subject: [PATCH 106/463] python3Packages.python-snap7: init 0.11 --- .../python-modules/python-snap7/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/python-snap7/default.nix diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix new file mode 100644 index 00000000000..06e1185e343 --- /dev/null +++ b/pkgs/development/python-modules/python-snap7/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, snap7, fetchFromGitHub, six, setuptools }: + +buildPythonPackage rec { + pname = "python-snap7"; + version = "0.11"; + + src = fetchFromGitHub { + owner = "gijzelaerr"; + repo = "python-snap7"; + rev = "899a94c6eeca76fb9b18afd5056e5003646d7f94"; + sha256 = "169zd1nxq86nmi6132vxl1f6wxm9w3waihq2wn14kkmld1vkmvfd"; + }; + + propagatedBuildInputs = [ setuptools six ]; + + prePatch = '' + substituteInPlace snap7/common.py \ + --replace "lib_location = None" "lib_location = '${snap7}/lib/libsnap7.so'" + ''; + + # Tests require root privileges to open privilaged ports + # We cannot run them + doCheck = false; + + pythonImportsCheck = [ + "snap7" + "snap7.six" + "snap7.util" + ]; + + meta = with lib; { + description = "Python wrapper for the snap7 PLC communication library "; + homepage = "https://github.com/gijzelaerr/python-snap7"; + license = licenses.mit; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dfcff182823..bf9c3a7744e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5746,6 +5746,10 @@ in { python-slugify = callPackage ../development/python-modules/python-slugify { }; + python-snap7 = callPackage ../development/python-modules/python-snap7 { + inherit (pkgs) snap7; + }; + python-snappy = callPackage ../development/python-modules/python-snappy { inherit (pkgs) snappy; }; python-socketio = callPackage ../development/python-modules/python-socketio { }; From 2f6c1eac7b5045deb52df93a27b1b4e4dc62bd5a Mon Sep 17 00:00:00 2001 From: syberant Date: Sun, 13 Sep 2020 21:08:17 +0200 Subject: [PATCH 107/463] gitoxide: 0.3.0 -> 0.4.0 Add dependency on openssl. --- .../version-management/gitoxide/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 0e9b3dbedb2..b6b9c7e5660 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -1,24 +1,29 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "0xpic9jx7nrxi5d8lqch2vxpvipx994d717c4n0kgr3ipyij1347"; + sha256 = "0sx3z9l9n9qq2zj91pgm7znhxjsj59zvwms3aivfglhawwj3iwyj"; }; - cargoSha256 = "104lyfni75h1i30s2jlzf66sp1czfd9ywqz78kj4i7lfdf6fc4x9"; + cargoSha256 = "0ykkh86p4csi0v3pb2idjk94w9m32a34a5qrvna7ml5yz84m8hva"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + # Needed to get openssl-sys to use pkgconfig. + OPENSSL_NO_VENDOR = 1; meta = with lib; { description = "A command-line application for interacting with git repositories"; homepage = "https://github.com/Byron/gitoxide"; - # NOTE: the master branch is dual-licensed with APACHE but v0.3.0 is only MIT - license = licenses.mit; + license = with licenses; [ mit /* or */ asl20 ]; maintainers = [ maintainers.syberant ]; }; } From 5efe403c935af24b6a43092607cd48896f8bb537 Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Sun, 13 Sep 2020 22:51:02 +0200 Subject: [PATCH 108/463] palemoon: 28.12.0 -> 28.13.0 --- .../applications/networking/browsers/palemoon/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index ef28e9234ed..9f2eda4c3ba 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.12.0"; + version = "28.13.0"; src = fetchFromGitHub { owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1cc75972nhmxkkynkky1m2fijbf3qlzvpxsd98mxlx0b7h4d3l5l"; + sha256 = "1lza6239kb32wnwd9cwddn11npg1qx7p69l7qy63h9c59w29iypa"; fetchSubmodules = true; }; @@ -88,12 +88,16 @@ in stdenv.mkDerivation rec { ac_add_options --disable-debug ac_add_options --disable-necko-wifi ac_add_options --disable-updater + ac_add_options --with-pthreads # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding. ac_add_options --enable-official-branding export MOZILLA_OFFICIAL=1 + # For versions after 28.12.0 + ac_add_options --enable-phoenix-extensions + ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]} export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION From f35535217780644b32ee74c0b02bde131da438ac Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Sep 2020 23:21:30 +0200 Subject: [PATCH 109/463] emojione: fix build with Inkscape 1 --- pkgs/data/fonts/emojione/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 6f5168e90d5..d5b9b29dd85 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: +{ stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "emojione"; @@ -11,6 +11,22 @@ stdenv.mkDerivation rec { sha256 = "1781kxfbhnvylypbkwxc3mx6hi0gcjisfjr9cf0jdz4d1zkf09b3"; }; + patches = [ + # Fix build with Inkscape 1.0 + # https://github.com/eosrei/twemoji-color-font/pull/82 + (fetchpatch { + url = "https://github.com/eosrei/twemoji-color-font/commit/208ad63c2ceb38c528b5237abeb2b85ceedc1d37.patch"; + sha256 = "7tDWIkpcdir1V6skgXSM3r0FwHy0F6PyJ07OPRsSStA="; + postFetch = '' + substituteInPlace $out \ + --replace "inkscape --without-gui" "inkscape --export-png" \ + --replace TWEMOJI EMOJIONE \ + --replace "the assets" "the emojione assets" \ + --replace twemoji emojione + ''; + }) + ]; + preBuild = '' sed -i 's,SCFBUILD :=.*,SCFBUILD := scfbuild,' Makefile # Shut up inkscape's warnings From 24a6d1152d61ee52043a665e479009e24aa4ab45 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Sep 2020 23:22:37 +0200 Subject: [PATCH 110/463] twemoji-color-font: fix build with Inkscape 1 --- pkgs/data/fonts/twemoji-color-font/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index a9bf3720c07..23ae8e76b1d 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: +{ stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "twemoji-color-font"; @@ -10,6 +10,19 @@ stdenv.mkDerivation rec { sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2"; }; + patches = [ + # Fix build with Inkscape 1.0 + # https://github.com/eosrei/twemoji-color-font/pull/82 + (fetchpatch { + url = "https://github.com/eosrei/twemoji-color-font/commit/208ad63c2ceb38c528b5237abeb2b85ceedc1d37.patch"; + sha256 = "TV8I++BEnVUQg7FNbnrEQ/MLV9n3drmspqjmDZgTGFI="; + postFetch = '' + substituteInPlace $out \ + --replace "inkscape --without-gui" "inkscape --export-png" + ''; + }) + ]; + nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; # silence inkscape errors about non-writable home preBuild = "export HOME=\"$NIX_BUILD_ROOT\""; From 4a11f046a6e132974acb2ce6c21dd893386ac0ff Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 13 Sep 2020 23:36:19 +0200 Subject: [PATCH 111/463] youtube-dl: 2020.09.06 -> 2020.09.14 https://github.com/ytdl-org/youtube-dl/releases/tag/2020.09.14 --- 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 5803de7b52f..aa502f8521a 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.06"; + version = "2020.09.14"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1827hcp9bvwq7p2f5r0wgkg6yb5fgvr4miyi3d99hkah2afw12za"; + sha256 = "18wfhprbaszpxgqkac3hb050ngvdsaibbcifg88rkv5vc6bc2mq6"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 9f33ab62d99c98e3f5bddd64532f15f482cf01b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 2 Jun 2020 16:27:07 +0200 Subject: [PATCH 112/463] nixos/testing: Add support for specialArgs Since using flakes disallows the usage of (which I use in some tests), this adds an alternative. By setting specialArgs, all VMs can get the `unstable` flake input as an arg. This is not possible with extraConfigurations, as that would lead to infinite recursions. --- nixos/lib/build-vms.nix | 8 +++++--- nixos/lib/testing-python.nix | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 1bad63b9194..b1575fc13bb 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -3,8 +3,10 @@ minimal ? false , # Ignored config ? null - # Nixpkgs, for qemu, lib and more -, pkgs +, # Nixpkgs, for qemu, lib and more + pkgs +, # !!! See comment about args in lib/modules.nix + specialArgs ? {} , # NixOS configuration to add to the VMs extraConfigurations ? [] }: @@ -31,7 +33,7 @@ rec { nodes: configurations: import ./eval-config.nix { - inherit system; + inherit system specialArgs; modules = configurations ++ extraConfigurations; baseModules = (import ../modules/module-list.nix) ++ [ ../modules/virtualisation/qemu-vm.nix diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 76a2022082c..498f97336c0 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -4,10 +4,12 @@ , minimal ? false # Ignored , config ? {} + # !!! See comment about args in lib/modules.nix +, specialArgs ? {} # Modules to add to each VM , extraConfigurations ? [] }: -with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; +with import ./build-vms.nix { inherit system pkgs minimal specialArgs extraConfigurations; }; with pkgs; rec { From d88f262fd216503ea777a1c9377fe63112ae8189 Mon Sep 17 00:00:00 2001 From: leenaars Date: Mon, 14 Sep 2020 00:45:13 +0200 Subject: [PATCH 113/463] ipgrep: ipgrep: 1.0 -> 1.0.1 (#97903) --- pkgs/tools/networking/ipgrep/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/ipgrep/default.nix b/pkgs/tools/networking/ipgrep/default.nix index 6ea930fccaa..d9fc41e94b6 100644 --- a/pkgs/tools/networking/ipgrep/default.nix +++ b/pkgs/tools/networking/ipgrep/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { - version = "1.0"; +python3Packages.buildPythonApplication rec { + version = "1.0.1"; pname = "ipgrep"; + disabled = python3Packages.isPy27; + src = fetchFromGitHub { owner = "jedisct1"; repo = pname; rev = version; - sha256 = "1qaxvbqdalvz05aplhhrg7s4h7yx4clbfd50k46bgavhgcqqv8n3"; + hash = "sha256-NrhcUFQM+L66KaDRRpAoC+z5s54a+1fqEepTRXVZ5Qs="; }; patchPhase = '' - mkdir -p ${pname} + mkdir -p ${pname} substituteInPlace setup.py \ --replace "'scripts': []" "'scripts': { '${pname}.py' }" ''; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ pycares urllib3 requests From cc34aad0d725d139e7d439c12a85b9645d5840b5 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 13 Sep 2020 20:29:06 -0400 Subject: [PATCH 114/463] tomcat-native: 1.2.24 -> 1.2.25 --- pkgs/servers/http/tomcat/tomcat-native.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix index 17c4367866f..fa2769f99dd 100644 --- a/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "1.2.24"; + version = "1.2.25"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - sha512 = "5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f"; + sha512 = "e121c0a18c51b5f952833df44c3a0add1f9a6e1b61e300abbafa0bc7e8f32296e64c9f81e9ad7389c1bd24abc40739e4726a56158d08e33b7ef00e5fa8a1d33d"; }; sourceRoot = "${pname}-${version}-src/native"; From a05439ca31a8d75e3d1142e96adcd5495932d10e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 14 Sep 2020 06:05:47 +0200 Subject: [PATCH 115/463] openrgb: 0.3 -> 0.4 (#97711) * openrgb: 0.3 -> 0.4 * openrgb: Patch project configuration to respect SOURCE_DATE_EPOCH --- pkgs/applications/misc/openrgb/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index 89a16568281..09a09811ab1 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -1,19 +1,27 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, libusb1, hidapi, pkg-config }: +{ mkDerivation, lib, fetchFromGitHub, qmake, libusb1, hidapi, pkg-config, fetchpatch }: mkDerivation rec { pname = "openrgb"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "CalcProgrammer1"; repo = "OpenRGB"; rev = "release_${version}"; - sha256 = "1931aisdahjr99d4qqk824ib4x19mvhqgqmkm3j6fc5zd2hnw87m"; + sha256 = "sha256-tHrRG2Zx7NYqn+WPiRpAlWA/QmxuAYidENanTkC1XVw"; }; nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ libusb1 hidapi ]; + patches = [ + # Make build SOURCE_DATE_EPOCH aware, merged in master + (fetchpatch { + url = "https://gitlab.com/CalcProgrammer1/OpenRGB/-/commit/f1b7b8ba900db58a1119d8d3e21c1c79de5666aa.patch"; + sha256 = "17m1hn1kjxfcmd4p3zjhmr5ar9ng0zfbllq78qxrfcq1a0xrkybx"; + }) + ]; + installPhase = '' mkdir -p $out/bin cp OpenRGB $out/bin From aff7ee12528134f76cfe3c9cef8385a589a69be9 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Mon, 14 Sep 2020 06:41:44 +0200 Subject: [PATCH 116/463] coursier: 2.0.0-RC6-25 -> 2.0.0-RC6-26 --- pkgs/development/tools/coursier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index f30acee3667..921c5194d58 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.0.0-RC6-25"; + version = "2.0.0-RC6-26"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "0hkkfm18v2hvkf344ln9ka8gi3jdl6bvqpafc6h06f06vmp8prch"; + sha256 = "0dpm1q4vxhv9ji87qdnsqvdmi0k5757kkd3p83g116skpkzmymvq"; }; nativeBuildInputs = [ makeWrapper ]; From 9c0a900a9defebbfce49695059ce3f92ce405f71 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 14 Sep 2020 10:06:52 +0300 Subject: [PATCH 117/463] pythonPackages.timezonefinder: fix build --- pkgs/development/python-modules/timezonefinder/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index e62a87e67b0..ca07b50ceff 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -4,6 +4,8 @@ , isPy27 , numba , numpy +, pytestCheckHook +, pytestcov }: buildPythonPackage rec { @@ -21,7 +23,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ numba ]; + checkInputs = [ numba pytestCheckHook pytestcov ]; meta = with lib; { description = "fast python package for finding the timezone of any point on earth (coordinates) offline"; From 24fa210e772351f118e5f56e5acbe5eaea38a95f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 14 Sep 2020 02:23:46 -0500 Subject: [PATCH 118/463] rclone: 1.53.0 -> 1.53.1 (#97953) --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 35315b729c1..bd68531db19 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.53.0"; + version = "1.53.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1736np95di9ksy6i8glzmvzc7qp4d06354gvrnxbzimgf0mm11wn"; + sha256 = "1yi6n5ip680ydqhz8fnd0igr8dy7zzhpx37mdgahsfac7cwf6k0q"; }; vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88"; From dd970220aed7ff2761785fcb0352c3738bf6b2bd Mon Sep 17 00:00:00 2001 From: Souvik Sen Date: Tue, 7 Apr 2020 02:42:43 -0400 Subject: [PATCH 119/463] perlPackages.RPM2: init at 1.4 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eb66bc88e7c..d6199c51e06 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16086,6 +16086,22 @@ let }; }; + RPM2 = buildPerlModule { + pname = "RPM2"; + version = "1.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LK/LKUNDRAK/RPM2-1.4.tar.gz"; + sha256 = "5ecb42aa69324e6f4088abfae07313906e5aabf2f46f1204f3f1de59155bb636"; + }; + buildInputs = [ pkgs.pkg-config pkgs.rpm ]; + doCheck = false; # Tries to open /var/lib/rpm + meta = { + description = "Perl bindings for the RPM Package Manager API"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; + }; + }; + RSSParserLite = buildPerlPackage { pname = "RSS-Parser-Lite"; version = "0.12"; From c8ccaebfe4b67d819d225e8016d9f3d2b543a906 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Fri, 4 Sep 2020 20:55:34 +0200 Subject: [PATCH 120/463] nodePackages.diagnostic-languageserver: init at 1.7.1 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1621 +++++++++-------- 2 files changed, 855 insertions(+), 767 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 986a44dfe79..8b1bf76561b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -61,6 +61,7 @@ , "csslint" , "dat" , "dhcp" +, "diagnostic-languageserver" , "dockerfile-language-server-nodejs" , "elasticdump" , "elm-oracle" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f531c61feb9..6b62485db05 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1714,94 +1714,94 @@ let sha512 = "oJZb4PScX25ZGObpw9n7/bJBE7R0oF6hJ4ABe+WvMqSCI3kxaReMTgJJNIrxpmbXscxWM8U1ndLefP5IjPcU7Q=="; }; }; - "@graphql-tools/delegate-6.2.1" = { + "@graphql-tools/delegate-6.2.2" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.1.tgz"; - sha512 = "IsmrZ+aiT00V567PfawxvdjwMf8RrfjSuyOy7LvqJ6ABUlpcjZejYMFIl82ZjHf8m3OU1xF5Wier8G6XFYzPYw=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.2.tgz"; + sha512 = "8VycfZYQ+m4HgajewQT6v6BzAEFxc6mh6rO+uqewnvh143nvv3ud4nXEAfOddUm0PrE6iD3Ng2BZtPSWF5mt+w=="; }; }; - "@graphql-tools/graphql-file-loader-6.2.1" = { + "@graphql-tools/graphql-file-loader-6.2.2" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.1.tgz"; - sha512 = "HfM6kC48KTDhVizeuJVOmh+nJD8s1SefK8aZgFBvnXVWW+HdPx2+T5MH6sSVvqgMrlCxLxuyuwcPIcXqpvYvxA=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.2.tgz"; + sha512 = "dKuOk4vH2WWzVGydL13FjdR3WEmJHMoud3MXF9uyvLcjuDm9L0r+PdSI1PSPiCYs7Ii2bJ8zgmdz32jCBHZszA=="; }; }; - "@graphql-tools/import-6.2.1" = { + "@graphql-tools/import-6.2.2" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.1.tgz"; - sha512 = "10mMCB8x4s0P010n8HHiUExg5m2NMr3Hm30WRSoP3P0m8Q0l8AmwXVwHUtykEaWhu+4xvFZ5Hl3fS+Wm0f7jdg=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.2.tgz"; + sha512 = "fxQx+960CBzG6+MGGRaWv9tQ71ir2NZQeVC2dfieQLv5/LXH0fqKe9ltYCfJFskscAmzWeuS19Sibhdn0JMecw=="; }; }; - "@graphql-tools/json-file-loader-6.2.1" = { + "@graphql-tools/json-file-loader-6.2.2" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.1.tgz"; - sha512 = "WQ4qIl8dBOg6fLh7GZZ2YzSTelBiTPZlohVCBJ8iuqzS1Tryty6c/FAbMBfscNlQ4nb4y3zb4LR0F0pbq2urcQ=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.2.tgz"; + sha512 = "m/gKQGJS+4bUy/8v0uup3su9RcCLdWvmhYW9+J8WDSzDE2QEdYQMeyDFYV14x0r92IhRpftLd//JvoE3cTV5Kg=="; }; }; - "@graphql-tools/load-6.2.1" = { + "@graphql-tools/load-6.2.2" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.1.tgz"; - sha512 = "PkM2xv/bBFQIkmgCX0LsZnHBuJY5YhDrpsljdD+0mXw2b9w0zUG2qIqBoMBLfG3ncjduE9Hwl1oKSBhFUPJmyA=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.2.tgz"; + sha512 = "p5fvGSvtrIjL3rmQbdESnYH5zxqdKeQOIwoPnfvx6uDqqm3HaRBzS+k5V/PkhGsFRR5VFrqA8kPAbE87BYpkqw=="; }; }; - "@graphql-tools/merge-6.2.1" = { + "@graphql-tools/merge-6.2.2" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.1.tgz"; - sha512 = "GJyMOYM2JyZhvMlVwpUZUv5ocvWCh+/KdPCCzXqo3Va/kOO1ntm8lKGNf3JZpQDgpC5FvaQfsu/b5pE7TBFxyw=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.2.tgz"; + sha512 = "2YyErSvq4hn5mjE6qJ/0Q8r3WU9JB3+obv2xyvb+oW+E/T1iYRJGxSFldi6lqO5IADZz8QASLJeSpRBw40gpBg=="; }; }; - "@graphql-tools/schema-6.2.1" = { + "@graphql-tools/schema-6.2.2" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.1.tgz"; - sha512 = "SKoZmxlLwOq08/NZ8Y5aShgEHneTJ8Ksw4gU1WBSWVJGf64ROoxIxN4Uc47F0cZxwOBqVqUy/EdXWZ8Jt97uQQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.2.tgz"; + sha512 = "KITlyr//1oKyxIOlGvNZDl4c6bLj2Gc+3eJXyUKWfSmgsmAZPudpQNa/8VbiVujpm7UaX0cyM3FdeCaxWFeBgg=="; }; }; - "@graphql-tools/url-loader-6.2.1" = { + "@graphql-tools/url-loader-6.2.2" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.1.tgz"; - sha512 = "6NTibFENUn02oI53VhW2Dcas0QdHYDyqRD5yxk0D+rQUP558t4eoYLJ8/hhdqbJ5t+2/lBRkzVU/5oJkZQosMQ=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.2.tgz"; + sha512 = "vNDjhf7SJr9RnIDPBBEyTfKBb3aWRA3uy3jDkqQ/AFyh4hXRkg8xnECH7c6glRnWiZJeObMTxowZSUnDA68IyA=="; }; }; - "@graphql-tools/utils-6.2.1" = { + "@graphql-tools/utils-6.2.2" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.1.tgz"; - sha512 = "DZ6a2bjOH4sWKhNUachvYy+3ocXDvDcTtComOD/z7ncszdlZPU6RXNOgBTxh/bMVHBPqlEh/VjCVMwBysZRbJw=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.2.tgz"; + sha512 = "a0SSYF76dnKHs8te4Igfnrrq1VOO4sFG8yx3ehO7464eGUfUUYo2QmNRjhxny2HRMvqzX40xuQikyg6LBXDNLQ=="; }; }; - "@graphql-tools/wrap-6.2.1" = { + "@graphql-tools/wrap-6.2.2" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.1.tgz"; - sha512 = "bjmN2Xh3haRp5tMDNPpUDV/9IlvFfmG9umsAOb3WFRJBoVi/dX0YwWIyucM3WBVix4ory8Op5eT4KkoKeaFSMw=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.2.tgz"; + sha512 = "FjCE+NvMwcCiAlt9EAw9uDi2zblE4Z5CEkY+z4NRO1AmCB5THoWJKG+csPh8tGuU80mAJI51Wy9FQGyUo/EU0g=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -2569,13 +2569,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.89" = { + "@microsoft/load-themed-styles-1.10.90" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.89"; + version = "1.10.90"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.89.tgz"; - sha512 = "nCL/fosGrCzDbr23cd9snWnRJZ3Hzy/0VmoOOqr3DH1mKqdE4EUmRE9GXn9CBSoqy9rK3+dFG5KOgxOIutylng=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.90.tgz"; + sha512 = "nJaQ6Yij68+GeaSt5ZgK70l5dn2aNGlc9EeES2B054anZTmmBhfaGpciIoSyPZrOg6PSAJjGWTXwd1ovMKOk1w=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -3010,13 +3010,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.8" = { + "@octokit/request-5.4.9" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.8"; + version = "5.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.8.tgz"; - sha512 = "mWbxjsARJzAq5xp+ZrQfotc+MHFz3/Am2qATJwflv4PZ1TjhgIJnr60PCVdZT9Z/tl+uPXooaVgeviy1KkDlLQ=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.9.tgz"; + sha512 = "CzwVvRyimIM1h2n9pLVYfTDmX9m+KHSgCpqPsY8F1NdEK8IaWqXhSBXsdjOBFZSpEcxNEeg4p0UO9cQ8EnOCLA=="; }; }; "@octokit/request-error-1.2.1" = { @@ -3055,13 +3055,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-5.4.1" = { + "@octokit/types-5.5.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-5.4.1.tgz"; - sha512 = "OlMlSySBJoJ6uozkr/i03nO5dlYQyE05vmQNZhAh9MyO4DPBP88QlwsDVLmVjIMFssvIZB6WO0ctIGMRG+xsJQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz"; + sha512 = "UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -3370,13 +3370,13 @@ let sha512 = "eN2UBK51Z9RkRY5Im0j2wCl3XuHBKiuY3kpQIxtGs52yuQx8PA0I/HBsYwyRgoTpvATK3MM/SsyeKpvNs90+uw=="; }; }; - "@serverless/platform-sdk-2.3.1" = { + "@serverless/platform-sdk-2.3.2" = { name = "_at_serverless_slash_platform-sdk"; packageName = "@serverless/platform-sdk"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-sdk/-/platform-sdk-2.3.1.tgz"; - sha512 = "EiSizya9bK0+5uae3GH9uXuWAchZplkLO0tWOAXtnU5QWSg5zicANL9jKCw0dyhjUOvbcO0ddhFlG8EGYvJFSA=="; + url = "https://registry.npmjs.org/@serverless/platform-sdk/-/platform-sdk-2.3.2.tgz"; + sha512 = "JSX0/EphGVvnb4RAgZYewtBXPuVsU2TFCuXh6EEZ4jxK3WgUwNYeYdwB8EuVLrm1/dYqu/UWUC0rPKb+ZDycJg=="; }; }; "@serverless/template-1.1.3" = { @@ -3469,76 +3469,49 @@ let sha512 = "CWr7a3rTVrN5Vs8GYReRAvTourbXHOqB1zglcskj05ICH4GZL5BOAza2ARai+qc3Nz0nY08Bozi1x0014KOqlg=="; }; }; - "@snyk/cli-interface-2.3.2" = { + "@snyk/cli-interface-2.9.1" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.3.2"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz"; - sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.1.tgz"; + sha512 = "2zHRvEt4S0DO+hPRX3hp5ssELouJqgb/JUTmPDMr/32r//qooSTxojwSvAK2A6VYgYOHuo1S3VTpsSP/ywkPXA=="; }; }; - "@snyk/cli-interface-2.6.1" = { + "@snyk/cli-interface-2.9.2" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.6.1"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.6.1.tgz"; - sha512 = "3X+OwwwT9j0r2ObqxYIiAgdaHsTW71b92PN3wawGAxl4YgPRrRVw8Fouhe41I4WJsn7OlKUNedylZguvpYg9qw=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.2.tgz"; + sha512 = "C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng=="; }; }; - "@snyk/cli-interface-2.8.1" = { - name = "_at_snyk_slash_cli-interface"; - packageName = "@snyk/cli-interface"; - version = "2.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.8.1.tgz"; - sha512 = "pALcfgoY0hAavy/pBlDIqEu+FFC5m+D4bMnCwlQ26mObL/zzxp2+Ohx+HykCIom62u2J94SzAtRLFdm/2TgoOw=="; - }; - }; - "@snyk/cli-interface-2.9.0" = { - name = "_at_snyk_slash_cli-interface"; - packageName = "@snyk/cli-interface"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.0.tgz"; - sha512 = "KDVHsU71apUPHK1PiIUXVW7stGZilbwKIoi0ffz1Qa0Er03fm3aV602scnOinbTtVy5UTm3L4WmdCdQrRoBYOQ=="; - }; - }; - "@snyk/cocoapods-lockfile-parser-3.5.1" = { + "@snyk/cocoapods-lockfile-parser-3.5.2" = { name = "_at_snyk_slash_cocoapods-lockfile-parser"; packageName = "@snyk/cocoapods-lockfile-parser"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.5.1.tgz"; - sha512 = "0bzajH/HdP3k5cOZKUmT/xqmHZFuWN124c/lrqh+U6Q1Z9Bt7TLOB2ifLKL+1I4rq+IgOesGWJYG1KhxBy3RLw=="; + url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.5.2.tgz"; + sha512 = "fIiUNCmhDp7lVKTs/nHCnLK1roMkG15HhuQhtZXxiFW3EZ5H9IqMdtrxqjXuzVWt7X2h7lbF5OMBzD07NODtug=="; }; }; - "@snyk/composer-lockfile-parser-1.4.0" = { + "@snyk/composer-lockfile-parser-1.4.1" = { name = "_at_snyk_slash_composer-lockfile-parser"; packageName = "@snyk/composer-lockfile-parser"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.0.tgz"; - sha512 = "ga4YTRjJUuP0Ufr+t1IucwVjEFAv66JSBB/zVHP2zy/jmfA3l3ZjlGQSjsRC6Me9P2Z0esQ83AYNZvmIf9pq2w=="; + url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.1.tgz"; + sha512 = "wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ=="; }; }; - "@snyk/dep-graph-1.19.0" = { + "@snyk/dep-graph-1.19.4" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.19.0"; + version = "1.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.0.tgz"; - sha512 = "/0phOICMk4hkX2KtZgi+4KNd5G9oYDIlxQDQk+ui2xl4gonPvK6Q5MFzHP7Xet1YY/XoU33ox41i+IO48qZ+zQ=="; - }; - }; - "@snyk/dep-graph-1.19.3" = { - name = "_at_snyk_slash_dep-graph"; - packageName = "@snyk/dep-graph"; - version = "1.19.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.3.tgz"; - sha512 = "WJLUFKBokoFK5imi0t8Dkyj+uqtS/5Ziuf4oE/OOFX30UqP1ffMDkv9/3sqBJQVQ9FjdgsX3Cm8JZMtMlYRc6w=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.4.tgz"; + sha512 = "h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw=="; }; }; "@snyk/docker-registry-v2-client-1.13.5" = { @@ -3559,49 +3532,13 @@ let sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="; }; }; - "@snyk/graphlib-2.1.9-patch" = { - name = "_at_snyk_slash_graphlib"; - packageName = "@snyk/graphlib"; - version = "2.1.9-patch"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.tgz"; - sha512 = "uFO/pNMm3pN15QB+hVMU7uaQXhsBNwEA8lOET/VDcdOzLptODhXzkJqSHqt0tZlpdAz6/6Uaj8jY00UvPFgFMA=="; - }; - }; - "@snyk/graphlib-2.1.9-patch.2" = { - name = "_at_snyk_slash_graphlib"; - packageName = "@snyk/graphlib"; - version = "2.1.9-patch.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.2.tgz"; - sha512 = "BjJzOXDNzoEMBOjSks7vadu5f0c39SeorJMi9vUvvWM5dcE22CZqcN9VMRW5DYTifUJiCWszkm5TOyfYfB0bfg=="; - }; - }; - "@snyk/inquirer-6.2.2-patch" = { - name = "_at_snyk_slash_inquirer"; - packageName = "@snyk/inquirer"; - version = "6.2.2-patch"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/inquirer/-/inquirer-6.2.2-patch.tgz"; - sha512 = "IUq5bHRL0vtVKtfvd4GOccAIaLYHbcertug2UVZzk5+yY6R/CxfYsnFUTho1h4BdkfNdin2tPjE/5jRF4SKSrw=="; - }; - }; - "@snyk/java-call-graph-builder-1.13.1" = { + "@snyk/java-call-graph-builder-1.13.2" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.13.1.tgz"; - sha512 = "oOCSIyOMplV73a1agcXKXlFYQftK5esUUaFRTf90GOxQwKy8R9tZtKdP+CdutlgvjRP286DQ+7GlvKYsGGZbWg=="; - }; - }; - "@snyk/lodash-4.17.15-patch" = { - name = "_at_snyk_slash_lodash"; - packageName = "@snyk/lodash"; - version = "4.17.15-patch"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/lodash/-/lodash-4.17.15-patch.tgz"; - sha512 = "e4+t34bGyjjRnwXwI14hqye9J/nRbG9iwaqTgXWHskm5qC+iK0UrjgYdWXiHJCf3Plbpr+1rpW+4LPzZnCGMhQ=="; + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.13.2.tgz"; + sha512 = "YN3a93ttscqFQRUeThrxa7i2SJkFPfYn0VpFqdPB6mIJz2fRVLxUkMtlCbG0aSEUvWiLnGVHN0IYxwWEzhq11w=="; }; }; "@snyk/rpm-parser-2.0.0" = { @@ -3613,31 +3550,13 @@ let sha512 = "bWjQY5Xk3TcfVpeo8M5BhhSUEdPr2P19AWW13CHPu6sFZkckLWEcjQycnBsVD6RBmxGXecJ1YNui8dq6soHoYQ=="; }; }; - "@snyk/ruby-semver-2.2.0" = { - name = "_at_snyk_slash_ruby-semver"; - packageName = "@snyk/ruby-semver"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-2.2.0.tgz"; - sha512 = "FqUayoVjcyCsQFYPm3DcaCKdFR4xmapUkCGY+bcNBs3jqCUw687PoP9CPQ1Jvtaw5YpfBNl/62jyntsWCeciuA=="; - }; - }; - "@snyk/ruby-semver-3.0.0" = { - name = "_at_snyk_slash_ruby-semver"; - packageName = "@snyk/ruby-semver"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-3.0.0.tgz"; - sha512 = "GoSRcwNuJ/mK3Q+tqelRJlylPh8K3RZRWh3ZpkOKm1gQPdG+z0wt+LipSIHxGR8yBDl5bQjwTrPLkL49/N1V6Q=="; - }; - }; - "@snyk/snyk-cocoapods-plugin-2.5.0" = { + "@snyk/snyk-cocoapods-plugin-2.5.1" = { name = "_at_snyk_slash_snyk-cocoapods-plugin"; packageName = "@snyk/snyk-cocoapods-plugin"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.0.tgz"; - sha512 = "arK4VHzNh/D9vCFQFeAiSP+rMRXwLbzaRoIKucodf8Q/3KftIo/byeDmoc2Cc7awR1HPo5E391bwBNH5ra8UqA=="; + url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.1.tgz"; + sha512 = "A+1xHD+SpmXQa0p+dWmiApFZtz/y37qAW9aWmFx2B1j7fwRBf9Qr89/6RbJOznf1a4nEitjzE3fa98yNZk/MNg=="; }; }; "@snyk/snyk-docker-pull-3.2.0" = { @@ -4234,6 +4153,15 @@ let sha512 = "AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ=="; }; }; + "@types/graphlib-2.1.7" = { + name = "_at_types_slash_graphlib"; + packageName = "@types/graphlib"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/graphlib/-/graphlib-2.1.7.tgz"; + sha512 = "K7T1n6U2HbTYu+SFHlBjz/RH74OA2D/zF1qlzn8uXbvB4uRg7knOM85ugS2bbXI1TXMh7rLqk4OVRwIwEBaixg=="; + }; + }; "@types/graphql-upload-8.0.4" = { name = "_at_types_slash_graphql-upload"; packageName = "@types/graphql-upload"; @@ -4531,13 +4459,13 @@ let sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw=="; }; }; - "@types/node-10.17.31" = { + "@types/node-10.17.32" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.31"; + version = "10.17.32"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.31.tgz"; - sha512 = "AiazLSnsm7GfTxr08GrqeqMxygR/yV78RDk5gaw+S7pOP70BIqUbTFl9vZRyUC/XubcwIqkiiHxbJNFAGvSoOw=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.32.tgz"; + sha512 = "EUq+cjH/3KCzQHikGnNbWAGe548IFLSm93Vl8xA7EuYEEATiyOVDyEVuGkowL7c9V69FF/RiZSAOCFPApMs/ig=="; }; }; "@types/node-12.7.12" = { @@ -4549,13 +4477,13 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.18" = { + "@types/node-13.13.19" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.18"; + version = "13.13.19"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.18.tgz"; - sha512 = "nru5D2PxzwzWyo3ocADAkzbc5H1KxVJMmX8oco9Fe5c+4vv6+MMp93wPq6ADqwHAwDtNH55eTCNGVaIZHZsAFQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.19.tgz"; + sha512 = "IVsULCpTdafcHhBDLYEPnV5l15xV0q065zvOHC1ZmzFYaBCMzku078eXnazoSG8907vZjRgEN/EQjku7GwwFyQ=="; }; }; "@types/node-14.0.26" = { @@ -4567,13 +4495,13 @@ let sha512 = "W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA=="; }; }; - "@types/node-14.10.0" = { + "@types/node-14.10.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.10.0"; + version = "14.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.10.0.tgz"; - sha512 = "SOIyrdADB4cq6eY1F+9iU48iIomFAPltu11LCvA9PKcyEwHadjCFzNVPotAR+oEJA0bCP4Xvvgy+vwu1ZjVh8g=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.10.1.tgz"; + sha512 = "aYNbO+FZ/3KGeQCEkNhHFRIzBOUgc7QvcVNKXbfnhDkSfwUv91JsQQa10rDgKSTSLkXZ1UIyPe4FJJNVgw1xWQ=="; }; }; "@types/node-6.14.11" = { @@ -4909,15 +4837,6 @@ let sha512 = "Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ=="; }; }; - "@types/xml2js-0.4.5" = { - name = "_at_types_slash_xml2js"; - packageName = "@types/xml2js"; - version = "0.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.5.tgz"; - sha512 = "yohU3zMn0fkhlape1nxXG2bLEGZRc1FeqF80RoHaYXJN7uibaauXfhzhOJr1Xh36sn+/tx21QAOf07b/xYVk1w=="; - }; - }; "@types/yargs-13.0.10" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -5674,13 +5593,13 @@ let sha1 = "5faad9c2c07f60dd76770f71cf025b62a63cfd4e"; }; }; - "abab-2.0.4" = { + "abab-2.0.5" = { name = "abab"; packageName = "abab"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz"; - sha512 = "Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ=="; + url = "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz"; + sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; }; }; "abbrev-1.1.1" = { @@ -6151,6 +6070,15 @@ let sha512 = "eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ=="; }; }; + "ajv-6.12.5" = { + name = "ajv"; + packageName = "ajv"; + version = "6.12.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz"; + sha512 = "lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag=="; + }; + }; "ajv-6.5.3" = { name = "ajv"; packageName = "ajv"; @@ -7798,6 +7726,15 @@ let sha512 = "pfSiukbt23P1qMhNnsozLzhMLBs7EEeXqPyvPmnuZM+RMfwfqwDbSVKYflgGuVI7/VehR4oMks0igzdNAg4VeQ=="; }; }; + "ast-types-0.14.2" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.14.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz"; + sha512 = "O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA=="; + }; + }; "ast-types-0.9.6" = { name = "ast-types"; packageName = "ast-types"; @@ -8167,13 +8104,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.750.0" = { + "aws-sdk-2.751.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.750.0"; + version = "2.751.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.750.0.tgz"; - sha512 = "eARIyZSd9j197XIMT0jk+4iYSh717AN0VyoAu8ir2IgkpbcB6pSEZPWPP0iuHEUbar+xqBHc4lfjegmMCbsxDw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.751.0.tgz"; + sha512 = "0lo7YKTfjEwoP+2vK7F7WGNigvwFxqiM96PzBaseOpOelfhFHPKEJpk2Poa12JI89c8dGoc1PhTQ1TSTJK3ZqQ=="; }; }; "aws-sign2-0.6.0" = { @@ -10615,13 +10552,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001125" = { + "caniuse-lite-1.0.30001129" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001125"; + version = "1.0.30001129"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001125.tgz"; - sha512 = "9f+r7BW8Qli917mU3j0fUaTweT3f3vnX/Lcs+1C73V+RADmFme+Ih0Br8vONQi3X0lseOe6ZHfsZLCA8MSjxUA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001129.tgz"; + sha512 = "9945fTVKS810DZITpsAbuhQG7Lam0tEfVbZlsBaCFZaszepbryrArS05PWmJSBQ6mta+v9iz0pUIAbW1eBILIg=="; }; }; "capital-case-1.0.3" = { @@ -15917,13 +15854,13 @@ let sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; - "dom-serializer-1.0.1" = { + "dom-serializer-1.1.0" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.0.1.tgz"; - sha512 = "1Aj1Qy3YLbdslkI75QEOfdp9TkQ3o8LRISAzxOibjBs/xWwr1WxZFOQphFkZuepHFGo+kB8e5FVJSS0faAJ4Rw=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.1.0.tgz"; + sha512 = "ox7bvGXt2n+uLWtCRLybYx60IrOlWL/aCebWJk1T0d4m3y2tzf4U3ij9wBMUb6YJZpz06HCCYuyCDveE2xXmzQ=="; }; }; "dom-storage-2.1.0" = { @@ -15971,13 +15908,13 @@ let sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; - "domelementtype-2.0.1" = { + "domelementtype-2.0.2" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz"; - sha512 = "5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz"; + sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA=="; }; }; "domexception-1.0.1" = { @@ -16070,13 +16007,13 @@ let sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; - "domutils-2.2.0" = { + "domutils-2.3.0" = { name = "domutils"; packageName = "domutils"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.2.0.tgz"; - sha512 = "0haAxVr1PR0SqYwCH7mxMpHZUwjih9oPPedqpR/KufsnxPyZ9dyVw1R5093qnJF3WXSbjBkdzRWLw/knJV/fAg=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.3.0.tgz"; + sha512 = "xWC75PM3QF6MjE5e58OzwTX0B/rPQnlqH0YyXB/c056RtVJA+eu60da2I/bdnEHzEYC00g8QaZUlAbqOZVbOsw=="; }; }; "dot-case-3.0.3" = { @@ -16151,13 +16088,13 @@ let sha512 = "UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw=="; }; }; - "dotnet-deps-parser-4.10.0" = { + "dotnet-deps-parser-5.0.0" = { name = "dotnet-deps-parser"; packageName = "dotnet-deps-parser"; - version = "4.10.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.10.0.tgz"; - sha512 = "dEO1oTvreaDCtcvhRdOmmAMubyC+MWqVr1c/1Wvasi+NW4NZeB67qGh1taqowUFh+aCXtPw3SP2eExn6aNkhwA=="; + url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-5.0.0.tgz"; + sha512 = "1l9K4UnQQHSfKgeHeLrxnB53AidCZqPyf9dkRL4/fZl8//NPiiDD43zHtgylw8DHlO7gvM8+O5a0UPHesNYZKw=="; }; }; "downgrade-root-1.2.2" = { @@ -16502,13 +16439,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.565" = { + "electron-to-chromium-1.3.567" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.565"; + version = "1.3.567"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.565.tgz"; - sha512 = "me5dGlHFd8Q7mKhqbWRLIYnKjw4i0fO6hmW0JBxa7tM87fBfNEjWokRnDF7V+Qme/9IYpwhfMn+soWs40tXWqg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.567.tgz"; + sha512 = "1aKkw0Hha1Bw9JA5K5PT5eFXC/TXbkJvUfNSNEciPUMgSIsRJZM1hF2GUEAGZpAbgvd8En21EA+Lv820KOhvqA=="; }; }; "elegant-spinner-1.0.1" = { @@ -17385,13 +17322,13 @@ let sha512 = "vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q=="; }; }; - "eslint-7.8.1" = { + "eslint-7.9.0" = { name = "eslint"; packageName = "eslint"; - version = "7.8.1"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.8.1.tgz"; - sha512 = "/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.9.0.tgz"; + sha512 = "V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA=="; }; }; "eslint-plugin-no-unsanitized-3.1.2" = { @@ -17439,13 +17376,13 @@ let sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; }; }; - "eslint-scope-5.1.0" = { + "eslint-scope-5.1.1" = { name = "eslint-scope"; packageName = "eslint-scope"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz"; - sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w=="; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; }; "eslint-utils-1.4.3" = { @@ -25298,15 +25235,6 @@ let sha512 = "S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="; }; }; - "isomorphic-fetch-2.2.1" = { - name = "isomorphic-fetch"; - packageName = "isomorphic-fetch"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz"; - sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; - }; - }; "isomorphic-git-0.78.5" = { name = "isomorphic-git"; packageName = "isomorphic-git"; @@ -26324,13 +26252,13 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.3.0" = { + "jszip-3.4.0" = { name = "jszip"; packageName = "jszip"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.3.0.tgz"; - sha512 = "EJ9k766htB1ZWnsV5ZMDkKLgA+201r/ouFF8R2OigVjVdcm2rurcBrrdXaeqBJbqnUVMko512PYmlncBKE1Huw=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz"; + sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; }; }; "jszip-3.5.0" = { @@ -28008,15 +27936,6 @@ let sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "lodash.constant-3.0.0" = { - name = "lodash.constant"; - packageName = "lodash.constant"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.constant/-/lodash.constant-3.0.0.tgz"; - sha1 = "bfe05cce7e515b3128925d6362138420bd624910"; - }; - }; "lodash.debounce-4.0.8" = { name = "lodash.debounce"; packageName = "lodash.debounce"; @@ -28062,15 +27981,6 @@ let sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698"; }; }; - "lodash.escaperegexp-4.1.2" = { - name = "lodash.escaperegexp"; - packageName = "lodash.escaperegexp"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; - sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; - }; - }; "lodash.filter-4.6.0" = { name = "lodash.filter"; packageName = "lodash.filter"; @@ -28080,6 +27990,15 @@ let sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; }; }; + "lodash.findkey-4.6.0" = { + name = "lodash.findkey"; + packageName = "lodash.findkey"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.findkey/-/lodash.findkey-4.6.0.tgz"; + sha1 = "83058e903b51cbb759d09ccf546dea3ea39c4718"; + }; + }; "lodash.flatmap-4.5.0" = { name = "lodash.flatmap"; packageName = "lodash.flatmap"; @@ -28152,15 +28071,6 @@ let sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; }; }; - "lodash.has-4.5.2" = { - name = "lodash.has"; - packageName = "lodash.has"; - version = "4.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz"; - sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; - }; - }; "lodash.identity-2.4.1" = { name = "lodash.identity"; packageName = "lodash.identity"; @@ -28197,6 +28107,15 @@ let sha1 = "0a11ba631d0e95c23c7f2f4cbb9a692ed178e705"; }; }; + "lodash.invert-4.3.0" = { + name = "lodash.invert"; + packageName = "lodash.invert"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.invert/-/lodash.invert-4.3.0.tgz"; + sha1 = "8ffe20d4b616f56bea8f1aa0c6ebd80dcf742aee"; + }; + }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -28224,15 +28143,6 @@ let sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; }; }; - "lodash.isarray-4.0.0" = { - name = "lodash.isarray"; - packageName = "lodash.isarray"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz"; - sha1 = "2aca496b28c4ca6d726715313590c02e6ea34403"; - }; - }; "lodash.isboolean-3.0.3" = { name = "lodash.isboolean"; packageName = "lodash.isboolean"; @@ -28269,15 +28179,6 @@ let sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1"; }; }; - "lodash.isfunction-3.0.9" = { - name = "lodash.isfunction"; - packageName = "lodash.isfunction"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz"; - sha512 = "AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw=="; - }; - }; "lodash.isinteger-4.0.4" = { name = "lodash.isinteger"; packageName = "lodash.isinteger"; @@ -28350,15 +28251,6 @@ let sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; }; }; - "lodash.isundefined-3.0.1" = { - name = "lodash.isundefined"; - packageName = "lodash.isundefined"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz"; - sha1 = "23ef3d9535565203a66cefd5b830f848911afb48"; - }; - }; "lodash.iteratee-4.7.0" = { name = "lodash.iteratee"; packageName = "lodash.iteratee"; @@ -28386,15 +28278,6 @@ let sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; }; }; - "lodash.keys-4.2.0" = { - name = "lodash.keys"; - packageName = "lodash.keys"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz"; - sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"; - }; - }; "lodash.map-4.6.0" = { name = "lodash.map"; packageName = "lodash.map"; @@ -28557,15 +28440,6 @@ let sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; }; }; - "lodash.size-4.2.0" = { - name = "lodash.size"; - packageName = "lodash.size"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.size/-/lodash.size-4.2.0.tgz"; - sha1 = "71fe75ed3eabdb2bcb73a1b0b4f51c392ee27b86"; - }; - }; "lodash.snakecase-4.1.1" = { name = "lodash.snakecase"; packageName = "lodash.snakecase"; @@ -28710,15 +28584,6 @@ let sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21"; }; }; - "lodash.values-4.3.0" = { - name = "lodash.values"; - packageName = "lodash.values"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz"; - sha1 = "a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"; - }; - }; "lodash.xorby-4.7.0" = { name = "lodash.xorby"; packageName = "lodash.xorby"; @@ -29511,13 +29376,13 @@ let sha512 = "YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg=="; }; }; - "markdown-it-11.0.0" = { + "markdown-it-11.0.1" = { name = "markdown-it"; packageName = "markdown-it"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.0.tgz"; - sha512 = "+CvOnmbSubmQFSA9dKz1BRiaSMV7rhexl3sngKqFyXSagoA3fBdJQ8oZWtRy2knXdpDXaBw44euz37DeJQ9asg=="; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.1.tgz"; + sha512 = "aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ=="; }; }; "markdown-it-8.4.2" = { @@ -31158,6 +31023,15 @@ let sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="; }; }; + "moment-2.28.0" = { + name = "moment"; + packageName = "moment"; + version = "2.28.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.28.0.tgz"; + sha512 = "Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw=="; + }; + }; "moment-2.7.0" = { name = "moment"; packageName = "moment"; @@ -32356,13 +32230,13 @@ let sha512 = "ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA=="; }; }; - "node-appc-0.2.49" = { + "node-appc-1.1.0" = { name = "node-appc"; packageName = "node-appc"; - version = "0.2.49"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.49.tgz"; - sha512 = "PldEN7CgEy7ekSZyomgpajLX7STCZPDJI6rGy7FCbWi7ZJgTt9/C3omCxPkIKVjtwcXzXoSA31zUWUnBzTkEUg=="; + url = "https://registry.npmjs.org/node-appc/-/node-appc-1.1.0.tgz"; + sha512 = "lKi9ZKfvgxBSM7KoMFPeZhSgzPBYE3cci6D145i92T/lhaDbEAoWDf9EAJPX0MRFNTZP1C8gDIlug8y6Oykp2g=="; }; }; "node-bitmap-0.0.1" = { @@ -33654,6 +33528,15 @@ let sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; }; }; + "object.assign-4.1.1" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz"; + sha512 = "VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA=="; + }; + }; "object.defaults-1.1.0" = { name = "object.defaults"; packageName = "object.defaults"; @@ -41440,13 +41323,13 @@ let sha512 = "bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw=="; }; }; - "sass-formatter-0.4.14" = { + "sass-formatter-0.4.15" = { name = "sass-formatter"; packageName = "sass-formatter"; - version = "0.4.14"; + version = "0.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.14.tgz"; - sha512 = "F8d4v4Gn8rtpICDvoUL7PaHj29713Qssul0aICt6dsHhf4+fjab5qa0p4dM7sJUrTuMDdjUeM6V+MGe9LYM69Q=="; + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.15.tgz"; + sha512 = "EpjwQsya8DmefZawi1sNoCjKw6IGE4z18h9lKd0QPgoGGkis8nqK+mfCMS4B8OaEa0To//71yQyGV1OW1/t60g=="; }; }; "sax-0.5.8" = { @@ -41728,15 +41611,6 @@ let sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; }; }; - "semver-5.5.1" = { - name = "semver"; - packageName = "semver"; - version = "5.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz"; - sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="; - }; - }; "semver-5.7.1" = { name = "semver"; packageName = "semver"; @@ -42826,13 +42700,13 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-config-3.1.0" = { + "snyk-config-3.1.1" = { name = "snyk-config"; packageName = "snyk-config"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.1.0.tgz"; - sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.1.1.tgz"; + sha512 = "wwrMIEDozfLJ8LmakCsCC1FQ0siIX5icCQPCbUKKgRbeVsZ27NjPJs37BpTXX4rcHkaWpe8TbH3yOtp23qmszg=="; }; }; "snyk-cpp-plugin-1.4.3" = { @@ -42862,22 +42736,22 @@ let sha512 = "StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w=="; }; }; - "snyk-go-plugin-1.16.0" = { + "snyk-go-plugin-1.16.2" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.16.0"; + version = "1.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.16.0.tgz"; - sha512 = "XNGHEFyP+pCzcqmXnj5T/1Oy6AZzm2WkTSuUpohWQ/09ecMRCCv2yrr/kwMQemrKN4+7CoJS/9xfm3GnNlzVHA=="; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.16.2.tgz"; + sha512 = "FAM56z3bl1iuxeqkCEA/jyZ2hpwkQK8xQxQbhR+QppEK5lole7w1PQyWYgZAJ9oRY/BU32zdRAJwGuZbhk7G2Q=="; }; }; - "snyk-gradle-plugin-3.6.2" = { + "snyk-gradle-plugin-3.6.3" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.6.2.tgz"; - sha512 = "JJmVOoLCCN58Wjcxdg93KeMjecnypP6+TfnCPuD4NbCNnKSn93c22VKpx6h1/AS1u6EK9dDTelwlYQOopBFA+w=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.6.3.tgz"; + sha512 = "j/eQSLSsK3DHmvVX2fNig4+ugYrKlCOV8Xvo6OYFkNzhMpdyNFiGWTS1uyP1HH75Gyc78MaLANMgjlSYePukzQ=="; }; }; "snyk-module-1.9.1" = { @@ -42907,22 +42781,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.19.3" = { + "snyk-mvn-plugin-2.19.4" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.19.3"; + version = "2.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.19.3.tgz"; - sha512 = "h+znUdd/UsDuJcCkbfcKinM4jqiID0jQmMSN59pIvmWEUf8Az4B+z6O89blgvmeTPB8LRW1LDs9nB8xNgwvJfw=="; - }; - }; - "snyk-nodejs-lockfile-parser-1.28.0" = { - name = "snyk-nodejs-lockfile-parser"; - packageName = "snyk-nodejs-lockfile-parser"; - version = "1.28.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.28.0.tgz"; - sha512 = "C7sLR2vmOp7sNOzxKgEmCOEDgSGE2TikqpIY/G0yD0PFDofbcicF0iG179Bn0Eo4TlNVLWEEP9Uizea8G5nvcA=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.19.4.tgz"; + sha512 = "kYPUKOugnNd31PFqx1YHJTo90pospELYHME4AzBx8dkMDgs5ZPjAmQXSxegQ3AMUqfqcETMSTzlKHe6uHujI8A=="; }; }; "snyk-nodejs-lockfile-parser-1.28.1" = { @@ -42934,13 +42799,13 @@ let sha512 = "0zbmtidYLI2ia/DQD4rZm2YKrhfHLvHlVBdF2cMAGPwhOoKW5ovG9eBO4wNQdvjxNi7b4VeUyAj8SfuhjDraDQ=="; }; }; - "snyk-nuget-plugin-1.18.1" = { + "snyk-nuget-plugin-1.19.3" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.18.1"; + version = "1.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.18.1.tgz"; - sha512 = "Bq+IzbyewxIrUhgdFaDKS5wCNixERC7QBitKsZGM3uCOr9fJM8rr5qg5SS9UIU7eyeKvzuVO/V1yDzjo1cKvUw=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.19.3.tgz"; + sha512 = "KwKoMumwcXVz/DQH80ifXfX7CTnm29bmHJ2fczjCGohxLGb4EKBGQtA3t7K98O7lTISQGgXDxnWIaM9ZXkxPdw=="; }; }; "snyk-paket-parser-1.6.0" = { @@ -42952,13 +42817,13 @@ let sha512 = "6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q=="; }; }; - "snyk-php-plugin-1.9.0" = { + "snyk-php-plugin-1.9.2" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; - version = "1.9.0"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.0.tgz"; - sha512 = "uORrEoC47dw0ITZYu5vKqQtmXnbbQs+ZkWeo5bRHGdf10W8e4rNr1S1R4bReiLrSbSisYhVHeFMkdOAiLIPJVQ=="; + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.2.tgz"; + sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA=="; }; }; "snyk-policy-1.14.1" = { @@ -45436,13 +45301,13 @@ let sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463"; }; }; - "suf-cli-0.1.1" = { + "suf-cli-0.1.3" = { name = "suf-cli"; packageName = "suf-cli"; - version = "0.1.1"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/suf-cli/-/suf-cli-0.1.1.tgz"; - sha512 = "0znmYibLknX0bWsnqW9rzM8IvKux3rTSnW52l5teIC+QAgS/StUl5f4WyLPBw+posfbOgoX+03xHPV4sMxY64Q=="; + url = "https://registry.npmjs.org/suf-cli/-/suf-cli-0.1.3.tgz"; + sha512 = "dM85t6+egHKKM7ChM1JpkZUeXNczRb7vAQN3Y8UAyRjeW6UvfChPi8YbV73eTUBp6N7VfKqwwrsYsbdEb/u0Rg=="; }; }; "suf-node-1.2.1" = { @@ -46742,15 +46607,6 @@ let sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; }; }; - "tmp-0.2.0" = { - name = "tmp"; - packageName = "tmp"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.2.0.tgz"; - sha512 = "spsb5g6EiPmteS5TcOAECU3rltCMDMp4VMU2Sb0+WttN4qGobEkMAd+dkr1cubscN08JGNDX765dPbGImbG7MQ=="; - }; - }; "tmp-0.2.1" = { name = "tmp"; packageName = "tmp"; @@ -49316,15 +49172,6 @@ let sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; - "uuid-3.3.3" = { - name = "uuid"; - packageName = "uuid"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz"; - sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="; - }; - }; "uuid-3.4.0" = { name = "uuid"; packageName = "uuid"; @@ -49847,13 +49694,13 @@ let sha512 = "DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow=="; }; }; - "vls-0.5.2" = { + "vls-0.5.3" = { name = "vls"; packageName = "vls"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.5.2.tgz"; - sha512 = "MHYOWogdwHCvP3jKZOg+oeLlg8uCEeGvCfE3pTIQ6Mg6q3RiHXU+MJdJRdnjhNPcMSyO1oIamHnrs3Zpm27BHw=="; + url = "https://registry.npmjs.org/vls/-/vls-0.5.3.tgz"; + sha512 = "NQKKl3JgiFuo52ra5gjlo5E/TztchkYRaKEWrBlMACNnnDlKkyFPRkQO/tE7A25Hs+y0t/HoOTsMGnAmhQY7Fg=="; }; }; "vm-browserify-1.1.2" = { @@ -50702,15 +50549,6 @@ let sha512 = "9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="; }; }; - "whatwg-fetch-3.4.1" = { - name = "whatwg-fetch"; - packageName = "whatwg-fetch"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"; - sha512 = "sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ=="; - }; - }; "whatwg-mimetype-2.3.0" = { name = "whatwg-mimetype"; packageName = "whatwg-mimetype"; @@ -52449,6 +52287,7 @@ in sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" @@ -52520,7 +52359,11 @@ in sources."oauth-sign-0.9.0" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -52786,6 +52629,8 @@ in ]; }) sources."end-of-stream-1.4.4" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-2.0.0" sources."esprima-4.0.1" sources."exit-on-epipe-1.0.1" @@ -52844,6 +52689,7 @@ in ]; }) sources."handlebars-4.7.6" + sources."has-1.0.3" sources."has-symbols-1.0.1" sources."http-cache-semantics-4.1.0" sources."ieee754-1.1.13" @@ -52852,11 +52698,16 @@ in sources."inherits-2.0.4" sources."is-absolute-1.0.0" sources."is-buffer-1.1.6" + sources."is-callable-1.2.1" + sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" + sources."is-negative-zero-2.0.0" sources."is-number-7.0.0" + sources."is-regex-1.1.1" sources."is-relative-1.0.0" + sources."is-symbol-1.0.3" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" @@ -52894,8 +52745,9 @@ in sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" sources."now-and-later-2.0.1" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + sources."object.assign-4.1.1" sources."once-1.4.0" sources."opal-runtime-1.0.11" (sources."ordered-read-streams-1.0.1" // { @@ -52949,6 +52801,16 @@ in sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stream-shift-1.0.1" + (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.3.0" sources."through-2.3.8" sources."through2-3.0.2" @@ -53018,12 +52880,12 @@ in sha512 = "H/i+fpbf/W9c446Ud+bDSeoUv5pW03orTm3hwVs9TtCt6332He8PK/CHydFnY/uvMKAmWPG5m2DruWIe7f1XMg=="; }; dependencies = [ - sources."abab-2.0.4" + sources."abab-2.0.5" sources."acorn-6.4.1" sources."acorn-globals-4.3.4" sources."acorn-walk-6.2.0" sources."agent-base-5.1.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -53212,7 +53074,7 @@ in sources."@types/color-name-1.1.1" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -53947,7 +53809,7 @@ in sources."@apollo/federation-0.20.0" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.31" + sources."@types/node-10.17.32" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -54243,7 +54105,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -54285,7 +54147,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" - sources."ajv-6.12.4" + sources."ajv-6.12.5" (sources."ansi-align-2.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -54336,7 +54198,11 @@ in sources."apollo-client-2.6.10" (sources."apollo-codegen-core-0.37.9" // { dependencies = [ - sources."recast-0.20.3" + (sources."recast-0.20.3" // { + dependencies = [ + sources."ast-types-0.14.1" + ]; + }) sources."source-map-0.6.1" sources."tslib-2.0.1" ]; @@ -54395,7 +54261,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - (sources."ast-types-0.14.1" // { + (sources."ast-types-0.14.2" // { dependencies = [ sources."tslib-2.0.1" ]; @@ -54487,7 +54353,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001125" + sources."caniuse-lite-1.0.30001129" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -54695,7 +54561,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.565" + sources."electron-to-chromium-1.3.567" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -54980,6 +54846,7 @@ in sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" sources."is-natural-number-4.0.1" + sources."is-negative-zero-2.0.0" sources."is-npm-1.0.0" sources."is-number-7.0.0" sources."is-obj-1.0.1" @@ -55216,7 +55083,11 @@ in sources."object-path-0.11.4" sources."object-treeify-1.1.28" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."on-finished-2.3.0" @@ -55962,10 +55833,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.15.1"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.15.1.tgz"; - sha512 = "exbloxT1pbivXVDOKYG9sG6mu7dv1ppn6pgkqYsKRtwBEqgNFKi9AlR7Gr8DL2wZOxQNExv4MoGYdPvoc6sGpg=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.15.2.tgz"; + sha512 = "40tSBJENAo8bC9RA+IplD/OACRBiZbTBXdt/Q7qaTdDiaMz/ITXCYuALeY6cGK6bO3Frmw2B5djwGbjxlrLa6A=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -56095,7 +55966,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -56129,7 +56000,7 @@ in sha512 = "t80ktUFL9DPaTO7yydoNYXIDKINweWbFvvUXesltmWj7UaIyepIVRAWUp4+62udJtor1VxVFEAXnsVDA640flw=="; }; dependencies = [ - sources."abab-2.0.4" + sources."abab-2.0.5" sources."acorn-5.7.4" (sources."acorn-globals-4.3.4" // { dependencies = [ @@ -56137,7 +56008,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."array-equal-1.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -56635,10 +56506,10 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.18" + sources."@types/node-13.13.19" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -57127,10 +56998,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "1.8.8"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-1.8.8.tgz"; - sha512 = "pfhUukcsILhwBdxd3PKQsE1VKeS/WNQc0QQ24V4G+9uKesxcIV6bHGaLMC57Vjx6h05AfVBupL5M/BGGEbV+EA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.0.tgz"; + sha512 = "uGqh7FKFXc26zjuzErw7vtnR8xHxmEf9jJNOekKyYncRg5Wzc7g5kYt2aFo+lA9zk3qC62DJ6LAaDJkfREQDmA=="; }; buildInputs = globalBuildInputs; meta = { @@ -57259,10 +57130,10 @@ in coc-json = nodeEnv.buildNodePackage { name = "coc-json"; packageName = "coc-json"; - version = "1.2.6"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-json/-/coc-json-1.2.6.tgz"; - sha512 = "PAytSZ30TWoEHOfi2V3Y944u5q1WHNVhjsKyNnggm8CcgYAulWJiCzxSsmKBLw+DbRLqygGUdO3cOIbQeJCm5A=="; + url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.0.tgz"; + sha512 = "VqlL+B3EB9yLMXPs3or+Vu2ezVulxI7remhby4NWnvfE3PVpZreoXo5ISNjLrJ5xBQrj4bkJkMcBFkXwkSSH6w=="; }; buildInputs = globalBuildInputs; meta = { @@ -57439,7 +57310,7 @@ in sources."@typescript-eslint/visitor-keys-3.10.1" sources."acorn-7.4.0" sources."acorn-jsx-5.3.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ajv-keywords-3.5.2" (sources."ansi-align-2.0.0" // { dependencies = [ @@ -57499,7 +57370,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001125" + sources."caniuse-lite-1.0.30001129" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -57587,7 +57458,7 @@ in sources."doctrine-3.0.0" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."domelementtype-2.0.2" sources."entities-2.0.3" ]; }) @@ -57596,7 +57467,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.565" + sources."electron-to-chromium-1.3.567" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -57608,7 +57479,7 @@ in sources."semver-6.3.0" ]; }) - sources."eslint-scope-5.1.0" + sources."eslint-scope-5.1.1" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -58395,11 +58266,17 @@ in coc-r-lsp = nodeEnv.buildNodePackage { name = "coc-r-lsp"; packageName = "coc-r-lsp"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-r-lsp/-/coc-r-lsp-1.1.1.tgz"; - sha512 = "y/6SBQhGAXEHqfb/EPuRZBPpXNMwXXF7lCU6f/J0WjxwGOzip8StuiRc3Vhr3JXvP/QSO37tunkaAJX+z8rRTg=="; + url = "https://registry.npmjs.org/coc-r-lsp/-/coc-r-lsp-1.2.0.tgz"; + sha512 = "+HpMgywqTOkClNI/UD1rpH6WDLmxtKLDVQX3bEmsJNSC70sLcMKhJRh+HUBx0tL2gnNwGYKgUl7uH9rKoPzAbQ=="; }; + dependencies = [ + sources."vscode-jsonrpc-5.0.1" + sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.15.1" + ]; buildInputs = globalBuildInputs; meta = { description = "R language server extension for coc.nvim"; @@ -58466,10 +58343,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.1.28"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.28.tgz"; - sha512 = "okVbjhKbFH6iTPeTpjxhtYtBBTFy5neOQYtn1H9CrbPpjnjodWzBDq3izoXCsC4BMMyBRzOwmwmJ0eA65S6JnQ=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.0.tgz"; + sha512 = "uWY5BquBQaQ9UD8PyjhbkbyQFsoc545A/eyquPJ9G3TF8VaXCBSGiVkzGIBT4It6ldN9vc/VQEVsRpEvtO6TTw=="; }; buildInputs = globalBuildInputs; meta = { @@ -58529,11 +58406,11 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -58580,7 +58457,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001125" + sources."caniuse-lite-1.0.30001129" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -58632,7 +58509,7 @@ in sources."dir-glob-2.2.2" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."domelementtype-2.0.2" sources."entities-2.0.3" ]; }) @@ -58640,7 +58517,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.565" + sources."electron-to-chromium-1.3.567" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -59185,10 +59062,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.5.5"; + version = "1.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.5.tgz"; - sha512 = "pfRHS22Ves4wmooLo92b57iHHVPdITQwPStx0IKe2Ld69MlrnqJbx/YuU9wsKoHhwnjt09CIzXgs+4mLKFQrsg=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.6.tgz"; + sha512 = "cBpsRAEcm48nSGIigFHzLjpGlYQmkpKwPxbafHihYpe0gRhNDNnkYg1dUfAhFb+Dnho9tt5Fwy3cmwd305aaiw=="; }; dependencies = [ sources."typescript-3.9.7" @@ -59259,7 +59136,7 @@ in sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -59282,7 +59159,7 @@ in sources."indent-string-4.0.0" ]; }) - sources."ajv-6.12.4" + sources."ajv-6.12.5" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -59485,7 +59362,7 @@ in sources."enquirer-2.3.6" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.8.1" // { + (sources."eslint-7.9.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -59511,7 +59388,7 @@ in sources."semver-7.3.2" ]; }) - sources."eslint-scope-5.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" @@ -59964,7 +59841,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-formatter-0.4.14" + sources."sass-formatter-0.4.15" sources."sax-1.2.4" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -60089,11 +59966,7 @@ in ]; }) sources."stylus-supremacy-2.14.5" - (sources."suf-cli-0.1.1" // { - dependencies = [ - sources."typescript-3.9.7" - ]; - }) + sources."suf-cli-0.1.3" sources."suf-node-1.2.1" sources."suf-regex-0.0.23" sources."supports-color-5.5.0" @@ -60204,7 +60077,7 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - sources."vls-0.5.2" + sources."vls-0.5.3" sources."vscode-css-languageservice-4.1.0" sources."vscode-emmet-helper-2.0.0" sources."vscode-jsonrpc-5.0.1" @@ -60517,7 +60390,7 @@ in sources."@types/color-name-1.1.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-0.3.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -61013,7 +60886,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -61381,7 +61254,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -61704,7 +61577,7 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" @@ -62370,6 +62243,42 @@ in bypassCache = true; reconstructLock = true; }; + diagnostic-languageserver = nodeEnv.buildNodePackage { + name = "diagnostic-languageserver"; + packageName = "diagnostic-languageserver"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.7.1.tgz"; + sha512 = "iq4RE35kISxPucmRfZhpIJr9xWi2EOGraD4rX0/5Tk3dIUbsLHeUzX5eVQeVL7Kw4QiBsbMO4W2TgV18VyiUYA=="; + }; + dependencies = [ + sources."commander-5.1.0" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."lodash-4.17.20" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + sources."rxjs-6.6.3" + sources."tslib-1.13.0" + sources."vscode-jsonrpc-5.0.1" + sources."vscode-languageserver-6.1.1" + sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.15.1" + sources."vscode-uri-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "diagnostic language server"; + homepage = "https://github.com/iamcco/diagnostic-languageserver#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; @@ -62411,12 +62320,12 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.750.0" + sources."aws-sdk-2.751.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."base64-js-1.3.1" @@ -62595,11 +62504,11 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" - sources."ajv-6.12.4" + sources."ajv-6.12.5" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -62927,7 +62836,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.89" + sources."@microsoft/load-themed-styles-1.10.90" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -63000,7 +62909,7 @@ in sources."acorn-5.7.4" sources."after-0.8.2" sources."aggregate-error-3.1.0" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."ansi-colors-1.1.0" @@ -63366,6 +63275,8 @@ in sources."enhanced-resolve-4.3.0" sources."errno-0.1.7" sources."error-ex-1.3.2" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-promise-4.2.8" @@ -63544,6 +63455,7 @@ in sources."gulplog-1.0.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-ansi-2.0.0" (sources."has-binary2-1.0.3" // { dependencies = [ @@ -63623,7 +63535,9 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + sources."is-callable-1.2.1" sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-dir-1.0.0" sources."is-extendable-0.1.1" @@ -63631,13 +63545,16 @@ in sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-negated-glob-1.0.0" + sources."is-negative-zero-2.0.0" sources."is-number-7.0.0" sources."is-path-cwd-2.2.0" sources."is-path-inside-3.0.2" sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" + sources."is-regex-1.1.1" sources."is-relative-1.0.0" sources."is-stream-1.1.0" + sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" @@ -63786,7 +63703,7 @@ in ]; }) sources."mkdirp-1.0.4" - sources."moment-2.27.0" + sources."moment-2.28.0" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" @@ -63873,9 +63790,10 @@ in 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.0" + sources."object.assign-4.1.1" sources."object.defaults-1.1.0" sources."object.map-1.0.1" sources."object.pick-1.3.0" @@ -64230,6 +64148,16 @@ in }) sources."streamsearch-0.1.2" 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-2.0.0" @@ -64446,10 +64374,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.8.1"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.8.1.tgz"; - sha512 = "/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.9.0.tgz"; + sha512 = "V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -64463,7 +64391,7 @@ in sources."@types/color-name-1.1.1" sources."acorn-7.4.0" sources."acorn-jsx-5.3.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -64491,7 +64419,7 @@ in sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-scope-5.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" @@ -64606,7 +64534,7 @@ in sources."@types/color-name-1.1.1" sources."acorn-7.4.0" sources."acorn-jsx-5.3.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -64635,8 +64563,8 @@ in sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.8.1" - sources."eslint-scope-5.1.0" + sources."eslint-7.9.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" @@ -64741,7 +64669,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -65281,6 +65209,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.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" @@ -65336,7 +65265,11 @@ in sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.pick-1.3.0" sources."once-1.4.0" sources."optimist-0.6.0" @@ -65614,7 +65547,7 @@ in sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."moo-0.5.1" sources."ms-2.1.2" sources."multicb-1.2.2" @@ -65793,7 +65726,7 @@ in sources."@types/color-name-1.1.1" sources."@types/minimist-1.2.0" sources."@types/normalize-package-data-2.4.0" - sources."ajv-6.12.4" + sources."ajv-6.12.5" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -66069,32 +66002,32 @@ in sources."@exodus/schemasafe-1.0.0-rc.2" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" - sources."@graphql-tools/delegate-6.2.1" - (sources."@graphql-tools/graphql-file-loader-6.2.1" // { + sources."@graphql-tools/delegate-6.2.2" + (sources."@graphql-tools/graphql-file-loader-6.2.2" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/import-6.2.1" // { + (sources."@graphql-tools/import-6.2.2" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/json-file-loader-6.2.1" // { + (sources."@graphql-tools/json-file-loader-6.2.2" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - sources."@graphql-tools/load-6.2.1" - sources."@graphql-tools/merge-6.2.1" - sources."@graphql-tools/schema-6.2.1" - (sources."@graphql-tools/url-loader-6.2.1" // { + sources."@graphql-tools/load-6.2.2" + sources."@graphql-tools/merge-6.2.2" + sources."@graphql-tools/schema-6.2.2" + (sources."@graphql-tools/url-loader-6.2.2" // { dependencies = [ sources."cross-fetch-3.0.5" ]; }) - sources."@graphql-tools/utils-6.2.1" - sources."@graphql-tools/wrap-6.2.1" + sources."@graphql-tools/utils-6.2.2" + sources."@graphql-tools/wrap-6.2.2" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -66102,7 +66035,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -66262,7 +66195,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-5.1.5" // { dependencies = [ - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."fast-deep-equal-3.1.3" sources."json-schema-traverse-0.4.1" ]; @@ -66393,7 +66326,11 @@ in sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."once-1.4.0" sources."onetime-5.1.2" sources."open-7.0.4" @@ -67056,6 +66993,8 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" @@ -67132,6 +67071,7 @@ in sources."graceful-fs-4.2.4" sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" + sources."has-1.0.3" sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -67151,20 +67091,25 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + sources."is-callable-1.2.1" sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-negated-glob-1.0.0" + sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) sources."is-plain-object-2.0.4" + sources."is-regex-1.1.1" sources."is-relative-1.0.0" + sources."is-symbol-1.0.3" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" @@ -67219,9 +67164,10 @@ in 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.0" + sources."object.assign-4.1.1" sources."object.defaults-1.1.0" sources."object.map-1.0.1" sources."object.pick-1.3.0" @@ -67337,6 +67283,16 @@ in sources."stream-exhaust-1.0.2" sources."stream-shift-1.0.1" 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-2.0.0" @@ -67467,6 +67423,8 @@ in sources."detect-file-1.0.0" sources."each-props-1.3.2" sources."error-ex-1.3.2" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" @@ -67519,6 +67477,7 @@ in sources."glogg-1.0.2" sources."graceful-fs-4.2.4" sources."gulplog-1.0.0" + sources."has-1.0.3" sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -67540,11 +67499,13 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" + sources."is-callable-1.2.1" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" ]; }) + sources."is-date-object-1.0.2" (sources."is-descriptor-1.0.2" // { dependencies = [ sources."kind-of-6.0.3" @@ -67554,13 +67515,16 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.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" ]; }) sources."is-plain-object-2.0.4" + sources."is-regex-1.1.1" sources."is-relative-1.0.0" + sources."is-symbol-1.0.3" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -67617,9 +67581,10 @@ in 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.0" + sources."object.assign-4.1.1" sources."object.defaults-1.1.0" sources."object.map-1.0.1" sources."object.pick-1.3.0" @@ -67705,6 +67670,16 @@ in ]; }) 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-2.0.0" @@ -67812,7 +67787,7 @@ in }; dependencies = [ sources."@types/color-name-1.1.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-styles-4.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -68027,7 +68002,7 @@ in sources."minimist-1.2.5" ]; }) - sources."moment-2.27.0" + sources."moment-2.28.0" sources."mv-2.1.1" sources."nan-2.14.1" sources."ncp-2.0.0" @@ -68164,7 +68139,7 @@ in sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" - (sources."ast-types-0.14.1" // { + (sources."ast-types-0.14.2" // { dependencies = [ sources."tslib-2.0.1" ]; @@ -68478,7 +68453,7 @@ in sources."@types/color-name-1.1.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -68947,15 +68922,15 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.167"; + version = "1.0.168"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.167.tgz"; - sha512 = "NPJhXp8zoT3o/5K7DIYJSUiGSd5a++ZdHA8XkoQY6Ke8jGfGLsk59B7mfQxxZ7zmCEkq8bkg2gaBi7fBiAtyPw=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.0.168.tgz"; + sha512 = "h4ng5Qc2C1RST9cLlVpu+79TpANA9vIEESCv56rzEy0zyhKGtlMeD0IiiY7ZJalmHCousNfYzdTPhM2pg1Q0ug=="; }; dependencies = [ sources."@cronvel/get-pixels-3.4.0" sources."@yarnpkg/lockfile-1.1.0" - sources."abab-2.0.4" + sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.0" (sources."acorn-globals-4.3.4" // { @@ -68964,7 +68939,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.4" + sources."ajv-6.12.5" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" @@ -68999,7 +68974,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.750.0" // { + (sources."aws-sdk-2.751.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -69115,7 +69090,7 @@ in sources."diff-match-patch-1.0.5" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."domelementtype-2.0.2" sources."entities-2.0.3" ]; }) @@ -69239,10 +69214,10 @@ in sources."html-minifier-3.5.21" (sources."htmlparser2-4.1.0" // { dependencies = [ - sources."dom-serializer-1.0.1" - sources."domelementtype-2.0.1" + sources."dom-serializer-1.1.0" + sources."domelementtype-2.0.2" sources."domhandler-3.0.0" - sources."domutils-2.2.0" + sources."domutils-2.3.0" sources."entities-2.0.3" ]; }) @@ -69380,7 +69355,7 @@ in dependencies = [ sources."entities-2.0.3" sources."linkify-it-3.0.2" - sources."markdown-it-11.0.0" + sources."markdown-it-11.0.1" ]; }) sources."markdown-it-sub-1.0.0" @@ -69406,7 +69381,7 @@ in }) sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.0.0" sources."multiparty-4.2.2" sources."nan-2.14.1" @@ -69914,7 +69889,7 @@ in sources."date-now-0.1.4" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."domelementtype-2.0.2" sources."entities-2.0.3" ]; }) @@ -70060,7 +70035,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.4" + sources."ajv-6.12.5" (sources."ansi-align-3.0.0" // { dependencies = [ sources."string-width-3.1.0" @@ -70583,6 +70558,8 @@ in sources."define-properties-1.1.3" sources."duplexify-3.7.1" sources."end-of-stream-1.4.4" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."extend-3.0.2" sources."flush-write-stream-1.1.1" sources."fs-mkdirp-stream-1.0.0" @@ -70592,15 +70569,21 @@ in sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" sources."graceful-fs-4.2.4" + sources."has-1.0.3" sources."has-symbols-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-absolute-1.0.0" sources."is-buffer-1.1.6" + sources."is-callable-1.2.1" + sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" + sources."is-negative-zero-2.0.0" + sources."is-regex-1.1.1" sources."is-relative-1.0.0" + sources."is-symbol-1.0.3" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" @@ -70612,8 +70595,9 @@ in sources."minimatch-3.0.4" sources."normalize-path-2.1.1" sources."now-and-later-2.0.1" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + sources."object.assign-4.1.1" sources."once-1.4.0" sources."ordered-read-streams-1.0.1" sources."path-dirname-1.0.2" @@ -70629,6 +70613,16 @@ in sources."resolve-options-1.1.0" sources."safe-buffer-5.1.2" sources."stream-shift-1.0.1" + (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."through2-2.0.5" sources."through2-filter-3.0.0" @@ -70666,7 +70660,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -70777,7 +70771,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."mute-stream-0.0.8" (sources."nconf-0.10.0" // { dependencies = [ @@ -71036,7 +71030,7 @@ in sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.8" // { + (sources."@octokit/request-5.4.9" // { dependencies = [ sources."@octokit/request-error-2.0.2" sources."is-plain-object-5.0.0" @@ -71049,18 +71043,18 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-5.4.1" + sources."@octokit/types-5.5.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -71468,6 +71462,7 @@ in sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.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" @@ -71623,7 +71618,11 @@ in sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."octokit-pagination-methods-1.1.0" @@ -72332,7 +72331,7 @@ in dependencies = [ sources."accepts-1.3.7" sources."after-0.8.2" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -72960,7 +72959,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -72990,7 +72989,7 @@ in sources."acorn-7.4.0" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."amdefine-1.0.1" @@ -73137,7 +73136,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001125" + sources."caniuse-lite-1.0.30001129" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -73259,7 +73258,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.565" + sources."electron-to-chromium-1.3.567" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -73275,6 +73274,8 @@ in }) sources."errno-0.1.7" sources."error-ex-1.3.2" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."escalade-3.0.2" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" @@ -73429,8 +73430,10 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" + sources."is-callable-1.2.1" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -73439,6 +73442,7 @@ in sources."is-glob-4.0.1" sources."is-gzip-1.0.0" sources."is-module-1.0.0" + sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -73446,7 +73450,9 @@ in }) sources."is-plain-object-2.0.4" sources."is-reference-1.2.1" + 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-1.1.0" @@ -73586,9 +73592,10 @@ in 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.0" + sources."object.assign-4.1.1" sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-browserify-0.3.0" @@ -73812,6 +73819,16 @@ in sources."stream-shift-1.0.1" sources."stream-splicer-2.0.1" sources."string-width-3.1.0" + (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.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -74022,7 +74039,7 @@ in }; dependencies = [ sources."@types/color-name-1.1.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-styles-4.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -74232,7 +74249,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-5.1.5" // { dependencies = [ - sources."ajv-6.12.4" + sources."ajv-6.12.5" ]; }) sources."has-ansi-2.0.0" @@ -74391,10 +74408,10 @@ in mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mathjax/-/mathjax-3.1.0.tgz"; - sha512 = "W71QY6DBDAhKhsIRbqzB38VV6Mk1IVAx23IjNc00oAPa4jyoeDQOwMIBPnG5ATqOAYevrBrwaNbycERGoYBBhA=="; + url = "https://registry.npmjs.org/mathjax/-/mathjax-3.1.2.tgz"; + sha512 = "BojKspBv4nNWzO1wC6VEI+g9gHDOhkaGHGgLxXkasdU4pwjdO5AXD5M/wcLPkXYPjZ/N+6sU8rjQTlyvN2cWiQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -74459,7 +74476,7 @@ in sources."@fluentui/react-icons-0.3.0" sources."@fluentui/react-window-provider-0.3.0" sources."@fluentui/theme-0.2.0" - sources."@microsoft/load-themed-styles-1.10.89" + sources."@microsoft/load-themed-styles-1.10.90" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@uifabric/foundation-7.9.0" @@ -74470,7 +74487,7 @@ in sources."@uifabric/styling-7.16.0" sources."@uifabric/utilities-7.31.0" sources."accepts-1.3.7" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -75192,7 +75209,7 @@ in sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.8" // { + (sources."@octokit/request-5.4.9" // { dependencies = [ sources."@octokit/request-error-2.0.2" sources."is-plain-object-5.0.0" @@ -75205,7 +75222,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-5.4.1" + sources."@octokit/types-5.5.0" sources."@sindresorhus/is-0.14.0" sources."@sindresorhus/slugify-1.1.0" (sources."@sindresorhus/transliterate-0.1.1" // { @@ -75225,7 +75242,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" sources."@types/semver-5.5.0" @@ -75285,7 +75302,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.750.0" // { + (sources."aws-sdk-2.751.0" // { dependencies = [ sources."buffer-4.9.2" sources."uuid-3.3.2" @@ -75845,6 +75862,7 @@ in sources."is-installed-globally-0.3.2" sources."is-interactive-1.0.0" sources."is-natural-number-4.0.1" + sources."is-negative-zero-2.0.0" sources."is-npm-4.0.0" (sources."is-number-3.0.0" // { dependencies = [ @@ -76058,7 +76076,11 @@ in sources."object-keys-1.1.1" sources."object-treeify-1.1.28" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."octokit-pagination-methods-1.1.0" @@ -76545,7 +76567,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -77357,7 +77379,7 @@ in }) sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."moment-timezone-0.5.31" (sources."mqtt-2.18.8" // { dependencies = [ @@ -77565,7 +77587,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -77930,10 +77952,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-9.0.0.tgz"; - sha512 = "BR3OkfpY06KziYHp1CoOJZO6h3067NCZWEBcszkI4LiND4sSC8qAPbpkVZ2gNr+q5Zu4IfN0m4TM8q9xoMo62g=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-9.0.1.tgz"; + sha512 = "xSMyNEIvsrNPDh5r1N/VxDGE+5ZkiEx8BxBvoEBWc/rsaHHfwKCvsY3qJjAn064pULH4uTrT7+kJwroHYsY/Yw=="; }; dependencies = [ sources."@npmcli/ci-detect-1.3.0" @@ -77950,7 +77972,7 @@ in sources."agent-base-6.0.1" sources."agentkeepalive-4.1.3" sources."aggregate-error-3.1.0" - sources."ajv-6.12.4" + sources."ajv-6.12.5" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -78302,7 +78324,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -78632,7 +78654,7 @@ in sources."@parcel/watcher-1.12.1" sources."@parcel/workers-1.11.0" sources."@types/q-1.5.4" - sources."abab-2.0.4" + sources."abab-2.0.5" sources."acorn-7.4.0" (sources."acorn-globals-4.3.4" // { dependencies = [ @@ -78640,7 +78662,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -78740,7 +78762,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001125" + sources."caniuse-lite-1.0.30001129" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -78859,7 +78881,7 @@ in }) (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."domelementtype-2.0.2" sources."entities-2.0.3" ]; }) @@ -78874,7 +78896,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.565" + sources."electron-to-chromium-1.3.567" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -78884,11 +78906,7 @@ in sources."entities-1.1.2" sources."envinfo-7.7.3" sources."error-ex-1.3.2" - (sources."es-abstract-1.17.6" // { - dependencies = [ - sources."object-inspect-1.8.0" - ]; - }) + sources."es-abstract-1.18.0-next.0" sources."es-to-primitive-1.2.1" sources."escalade-3.0.2" sources."escape-html-1.0.3" @@ -79026,6 +79044,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-html-1.1.0" + sources."is-negative-zero-2.0.0" sources."is-number-3.0.0" sources."is-obj-2.0.0" sources."is-plain-object-2.0.4" @@ -79139,13 +79158,21 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-copy-0.1.0" - sources."object-inspect-1.4.1" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.0" + sources."object.assign-4.1.1" + (sources."object.getownpropertydescriptors-2.1.0" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."object.pick-1.3.0" - sources."object.values-1.1.1" + (sources."object.values-1.1.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" @@ -79363,13 +79390,25 @@ in ]; }) sources."static-extend-0.1.2" - sources."static-module-2.2.5" + (sources."static-module-2.2.5" // { + dependencies = [ + sources."object-inspect-1.4.1" + ]; + }) sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + (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-4.0.0" (sources."stylehacks-4.0.3" // { @@ -79444,7 +79483,11 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" + (sources."util.promisify-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."uuid-3.4.0" sources."v8-compile-cache-2.1.1" sources."vendors-1.0.4" @@ -79490,7 +79533,7 @@ in sources."negotiator-0.6.2" ]; }) - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -79555,6 +79598,8 @@ in sources."encodeurl-1.0.2" sources."entities-1.1.2" sources."errno-0.1.7" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" @@ -79587,6 +79632,7 @@ in sources."handlebars-4.7.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-symbols-1.0.1" sources."hat-0.0.3" sources."heapdump-0.3.15" @@ -79598,7 +79644,12 @@ in sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" sources."is-arguments-1.0.4" + sources."is-callable-1.2.1" + sources."is-date-object-1.0.2" sources."is-fullwidth-code-point-2.0.0" + sources."is-negative-zero-2.0.0" + sources."is-regex-1.1.1" + sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -79631,7 +79682,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" @@ -79640,8 +79691,9 @@ in sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."neo-async-2.6.2" sources."oauth-sign-0.9.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + sources."object.assign-4.1.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -79712,6 +79764,16 @@ in sources."statuses-1.5.0" sources."streamsearch-0.1.2" sources."string-width-3.1.0" + (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-5.2.0" sources."toidentifier-1.0.0" @@ -79890,6 +79952,7 @@ in sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."is-utf8-0.2.1" @@ -79929,7 +79992,11 @@ in sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."once-1.4.0" sources."onetime-2.0.1" sources."open-0.0.5" @@ -80085,7 +80152,7 @@ in sources."accepts-1.3.7" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."archiver-3.1.1" (sources."archiver-utils-2.1.0" // { dependencies = [ @@ -80452,10 +80519,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.5.12"; + version = "5.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.5.12.tgz"; - sha512 = "LtQFpX08J25meH8bLo1yuCzfkpWdGxpFsytfCnqlzzTbr3ajh31drlIQHtGIEQdMVpEeqplLseNWTjrSPLxShQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.5.13.tgz"; + sha512 = "dNKfdY4HXOyAEsCzSuFbJ5uSCoabYTavw19YiN4wYuzk3ULG+5+Wc9+eAIm1hdQhD8gBG8etNm2O3/8lYAImdw=="; }; buildInputs = globalBuildInputs; meta = { @@ -81004,10 +81071,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.70"; + version = "1.1.71"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.70.tgz"; - sha512 = "YASHI2IsIh4gVugf9+CK/e26uuH76HNSu2g0h89NkILwaEXnsqqeSAHjwYln9eRHBv9vk3A5WM5f8idJQm6oVA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.71.tgz"; + sha512 = "sWAZenzmMifLHOmWUz+JVWfW+9w65xwI8VYhzrVD+5d/lQeo1bljwGAi/nHdDmyY0jjW7tmEc4TNTsDpaTGPZg=="; }; buildInputs = globalBuildInputs; meta = { @@ -81081,7 +81148,11 @@ in sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."pkginfo-0.4.1" @@ -81662,7 +81733,7 @@ in sources."acorn-7.4.0" sources."acorn-jsx-5.3.1" sources."agent-base-4.3.0" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -81738,12 +81809,12 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.8.1" // { + (sources."eslint-7.9.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."eslint-scope-5.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" @@ -82019,7 +82090,7 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -82312,7 +82383,7 @@ in sources."async-3.2.0" ]; }) - (sources."@serverless/platform-sdk-2.3.1" // { + (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."debug-4.2.0" sources."https-proxy-agent-4.0.0" @@ -82334,7 +82405,7 @@ in sources."@types/lodash-4.14.161" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/object-assign-4.0.30" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -82342,7 +82413,7 @@ in sources."adm-zip-0.4.16" sources."after-0.8.2" sources."agent-base-5.1.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ajv-keywords-3.5.2" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -82392,7 +82463,7 @@ in sources."async-2.6.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.750.0" // { + (sources."aws-sdk-2.751.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -82569,11 +82640,6 @@ in sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" sources."enabled-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.2" - ]; - }) sources."end-of-stream-1.4.4" (sources."engine.io-client-3.4.3" // { dependencies = [ @@ -82714,11 +82780,6 @@ in }) sources."isarray-2.0.1" sources."isexe-2.0.0" - (sources."isomorphic-fetch-2.2.1" // { - dependencies = [ - sources."node-fetch-1.7.3" - ]; - }) sources."isomorphic-ws-4.0.1" sources."isstream-0.1.2" sources."isurl-1.0.0" @@ -82793,7 +82854,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nanoid-2.1.11" @@ -82857,7 +82918,7 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.10.1" // { dependencies = [ - sources."@types/node-13.13.18" + sources."@types/node-13.13.19" ]; }) sources."psl-1.8.0" @@ -82989,7 +83050,6 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."whatwg-fetch-3.4.1" sources."which-1.3.1" (sources."widest-line-3.1.0" // { dependencies = [ @@ -83046,7 +83106,7 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.7" sources."after-0.8.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" @@ -83660,48 +83720,23 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.393.0"; + version = "1.393.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.393.0.tgz"; - sha512 = "WaFgmZF657i2fXkkdmqJwQ7JGu8eUsimit7cNCwmwcfre4ku2EVVJCT4BcBcL0h1ss47wlVsBmmu8L9yv0o0MQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.393.1.tgz"; + sha512 = "PHUjMJAZGz39vVpYFNlP1pgrJJ6j7fIxeBkwB80ijrds43pyj/WCxvF9ydNbP/vbAT9znHWHg6z+dSK3SEhTzw=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" - (sources."@snyk/cli-interface-2.9.0" // { - dependencies = [ - (sources."@snyk/dep-graph-1.19.0" // { - dependencies = [ - sources."tslib-2.0.1" - ]; - }) - ]; - }) - (sources."@snyk/cocoapods-lockfile-parser-3.5.1" // { - dependencies = [ - sources."@snyk/ruby-semver-3.0.0" - ]; - }) - sources."@snyk/composer-lockfile-parser-1.4.0" - (sources."@snyk/dep-graph-1.19.3" // { - dependencies = [ - sources."@snyk/graphlib-2.1.9-patch.2" - ]; - }) + sources."@snyk/cli-interface-2.9.2" + sources."@snyk/cocoapods-lockfile-parser-3.5.2" + sources."@snyk/composer-lockfile-parser-1.4.1" + sources."@snyk/dep-graph-1.19.4" sources."@snyk/docker-registry-v2-client-1.13.5" sources."@snyk/gemfile-1.2.0" - sources."@snyk/graphlib-2.1.9-patch" - sources."@snyk/inquirer-6.2.2-patch" - sources."@snyk/java-call-graph-builder-1.13.1" - sources."@snyk/lodash-4.17.15-patch" + sources."@snyk/java-call-graph-builder-1.13.2" sources."@snyk/rpm-parser-2.0.0" - sources."@snyk/ruby-semver-2.2.0" - (sources."@snyk/snyk-cocoapods-plugin-2.5.0" // { + (sources."@snyk/snyk-cocoapods-plugin-2.5.1" // { dependencies = [ - (sources."@snyk/cli-interface-2.6.1" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) sources."tslib-2.0.1" ]; }) @@ -83714,31 +83749,33 @@ in sources."@types/cacheable-request-6.0.1" sources."@types/color-name-1.1.1" sources."@types/debug-4.1.5" + sources."@types/graphlib-2.1.7" sources."@types/hosted-git-info-2.7.0" sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" - sources."@types/xml2js-0.4.5" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.3.0" (sources."ansi-align-3.0.0" // { dependencies = [ + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" ]; }) sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" sources."archy-1.0.0" sources."argparse-1.0.10" sources."asap-2.0.6" sources."asn1-0.2.4" - (sources."ast-types-0.14.1" // { + (sources."ast-types-0.14.2" // { dependencies = [ sources."tslib-2.0.1" ]; @@ -83756,18 +83793,14 @@ in }) (sources."boxen-4.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."camelcase-5.3.1" sources."chalk-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."emoji-regex-8.0.0" sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" + sources."type-fest-0.8.1" ]; }) sources."brace-expansion-1.1.11" @@ -83787,9 +83820,9 @@ in sources."child-process-1.0.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" - sources."cli-cursor-2.1.0" + sources."cli-cursor-3.1.0" sources."cli-spinner-0.2.10" - sources."cli-width-2.2.1" + sources."cli-width-3.0.0" (sources."cliui-3.2.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -83840,11 +83873,11 @@ in }) sources."dockerfile-ast-0.0.30" sources."dot-prop-5.3.0" - sources."dotnet-deps-parser-4.10.0" + sources."dotnet-deps-parser-5.0.0" sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."email-validator-2.0.4" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -83859,7 +83892,7 @@ in sources."extend-3.0.2" sources."external-editor-3.1.0" sources."fast-levenshtein-2.0.6" - sources."figures-2.0.0" + sources."figures-3.2.0" sources."file-uri-to-path-1.0.0" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" @@ -83911,12 +83944,24 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-escapes-4.3.1" + 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."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."invert-kv-1.0.0" sources."ip-1.1.5" sources."is-ci-2.0.0" sources."is-deflate-1.0.0" sources."is-docker-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-gzip-1.0.0" sources."is-installed-globally-0.3.2" sources."is-npm-4.0.0" @@ -83945,40 +83990,28 @@ in sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" - sources."lodash.constant-3.0.0" - sources."lodash.escaperegexp-4.1.2" - sources."lodash.filter-4.6.0" + sources."lodash.findkey-4.6.0" sources."lodash.flatmap-4.5.0" sources."lodash.flatten-4.4.0" - sources."lodash.foreach-4.5.0" sources."lodash.get-4.4.2" - sources."lodash.has-4.5.2" - sources."lodash.isarray-4.0.0" + sources."lodash.invert-4.3.0" sources."lodash.isempty-4.4.0" sources."lodash.isequal-4.5.0" - sources."lodash.isfunction-3.0.9" - sources."lodash.isundefined-3.0.1" - sources."lodash.keys-4.2.0" - sources."lodash.map-4.6.0" - sources."lodash.reduce-4.6.0" + sources."lodash.merge-4.6.2" sources."lodash.set-4.3.2" - sources."lodash.size-4.2.0" sources."lodash.topairs-4.3.0" - sources."lodash.transform-4.6.0" - sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" - sources."lodash.values-4.3.0" sources."lowercase-keys-2.0.0" sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."make-dir-3.1.0" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."mute-stream-0.0.7" + sources."mute-stream-0.0.8" sources."nconf-0.10.0" (sources."needle-2.5.0" // { dependencies = [ @@ -83992,7 +84025,7 @@ in sources."number-is-nan-1.0.1" sources."object-hash-2.0.3" sources."once-1.4.0" - sources."onetime-2.0.1" + sources."onetime-5.1.2" sources."open-7.2.1" sources."optionator-0.8.3" sources."os-locale-1.4.0" @@ -84056,7 +84089,7 @@ in sources."registry-url-5.1.0" sources."resolve-alpn-1.0.0" sources."responselike-2.0.0" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" sources."rxjs-6.6.3" @@ -84072,7 +84105,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" - sources."snyk-config-3.1.0" + sources."snyk-config-3.1.1" (sources."snyk-cpp-plugin-1.4.3" // { dependencies = [ sources."ansi-styles-4.2.1" @@ -84087,24 +84120,24 @@ in (sources."snyk-docker-plugin-3.20.0" // { dependencies = [ sources."rimraf-3.0.2" - (sources."snyk-nodejs-lockfile-parser-1.28.1" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) sources."tmp-0.2.1" sources."uuid-8.3.0" ]; }) sources."snyk-go-parser-1.4.1" - (sources."snyk-go-plugin-1.16.0" // { + (sources."snyk-go-plugin-1.16.2" // { dependencies = [ sources."rimraf-3.0.2" - sources."tmp-0.2.0" + sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.6.2" // { + (sources."snyk-gradle-plugin-3.6.3" // { dependencies = [ + (sources."@snyk/cli-interface-2.9.1" // { + dependencies = [ + sources."tslib-1.13.0" + ]; + }) sources."ansi-styles-4.2.1" sources."chalk-3.0.0" sources."color-convert-2.0.1" @@ -84117,29 +84150,23 @@ in ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.19.3" // { + (sources."snyk-mvn-plugin-2.19.4" // { dependencies = [ - sources."@snyk/cli-interface-2.8.1" - (sources."@snyk/dep-graph-1.19.0" // { - dependencies = [ - sources."tslib-2.0.1" - ]; - }) + sources."@snyk/cli-interface-2.9.1" sources."tmp-0.1.0" sources."tslib-1.11.1" ]; }) - sources."snyk-nodejs-lockfile-parser-1.28.0" - (sources."snyk-nuget-plugin-1.18.1" // { + sources."snyk-nodejs-lockfile-parser-1.28.1" + (sources."snyk-nuget-plugin-1.19.3" // { dependencies = [ - sources."jszip-3.3.0" + sources."jszip-3.4.0" sources."pako-1.0.11" ]; }) sources."snyk-paket-parser-1.6.0" - (sources."snyk-php-plugin-1.9.0" // { + (sources."snyk-php-plugin-1.9.2" // { dependencies = [ - sources."@snyk/cli-interface-2.3.2" sources."tslib-1.11.1" ]; }) @@ -84199,9 +84226,9 @@ in sources."statuses-1.5.0" sources."stream-shift-1.0.1" sources."streamsearch-0.1.2" - (sources."string-width-2.1.1" // { + (sources."string-width-4.2.0" // { dependencies = [ - sources."strip-ansi-4.0.0" + sources."strip-ansi-6.0.0" ]; }) sources."string_decoder-0.10.31" @@ -84239,7 +84266,7 @@ in sources."tslib-1.13.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."type-fest-0.8.1" + sources."type-fest-0.11.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."unpipe-1.0.0" @@ -84258,20 +84285,14 @@ in sources."uuid-3.4.0" sources."vscode-languageserver-types-3.15.1" sources."which-1.3.1" - (sources."widest-line-3.1.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - ]; - }) + sources."widest-line-3.1.0" sources."window-size-0.1.4" sources."windows-release-3.3.3" sources."word-wrap-1.2.3" (sources."wrap-ansi-5.1.0" // { dependencies = [ + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" ]; }) @@ -84969,7 +84990,11 @@ in sources."isobject-3.0.1" ]; }) - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.omit-2.0.1" (sources."object.pick-1.3.0" // { dependencies = [ @@ -85444,7 +85469,7 @@ in sources."semver-5.0.3" ]; }) - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."align-text-0.1.4" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -85461,7 +85486,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.750.0" // { + (sources."aws-sdk-2.751.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -85822,7 +85847,7 @@ in sources."minimist-1.2.5" sources."minitouch-prebuilt-1.2.0" sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.1.2" sources."multer-1.4.2" sources."mustache-2.3.2" @@ -86257,7 +86282,7 @@ in sources."define-properties-1.1.3" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."domelementtype-2.0.2" ]; }) sources."domelementtype-1.3.1" @@ -86273,6 +86298,7 @@ in sources."has-symbols-1.0.1" sources."is-callable-1.2.1" sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."js-yaml-3.14.0" @@ -86282,7 +86308,11 @@ in sources."nth-check-1.0.2" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.getownpropertydescriptors-2.1.0" sources."object.values-1.1.1" sources."q-1.5.1" @@ -86945,7 +86975,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -87003,7 +87033,7 @@ in sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."module-alias-2.2.2" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.1.2" sources."node-fetch-2.6.1" sources."oauth-sign-0.9.0" @@ -87198,6 +87228,7 @@ in sources."is-file-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-hexadecimal-1.0.4" + sources."is-negative-zero-2.0.0" sources."is-plain-obj-1.1.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" @@ -87227,7 +87258,11 @@ in sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."once-1.4.0" sources."optionator-0.8.3" sources."p-limit-1.3.0" @@ -87377,12 +87412,17 @@ in sources."has-symbols-1.0.1" sources."is-callable-1.2.1" sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."match-index-1.0.3" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."regexp.prototype.flags-1.3.0" sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" @@ -87962,12 +88002,17 @@ in sources."inherits-2.0.4" sources."is-callable-1.2.1" sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."object-assign-4.1.1" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.values-1.1.1" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -88014,11 +88059,16 @@ in sources."has-symbols-1.0.1" sources."is-callable-1.2.1" sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" ]; @@ -88111,12 +88161,17 @@ in sources."is-callable-1.2.1" sources."is-capitalized-1.0.0" sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" ]; @@ -88145,12 +88200,31 @@ in sources."boundary-1.0.1" sources."define-properties-1.1.3" sources."e-prime-0.10.4" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" + sources."has-1.0.3" sources."has-symbols-1.0.1" + sources."is-callable-1.2.1" + sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" + sources."is-regex-1.1.1" + sources."is-symbol-1.0.3" sources."no-cliches-0.1.1" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + sources."object.assign-4.1.1" sources."passive-voice-0.1.0" + (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."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" sources."too-wordy-0.1.6" @@ -88187,7 +88261,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.0" @@ -88199,7 +88273,7 @@ in sources."ms-2.1.2" ]; }) - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-regex-2.1.1" sources."ansi-styles-4.2.1" sources."aproba-1.2.0" @@ -88654,39 +88728,40 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.2.2.tgz"; - sha512 = "PvlmqvMRwgPReA3tPfExeS1mweQY/KpCIY5+zLP/lp0UEi93wLvSMzqp/5vV5pjK7cwkzhPtc68TszBNM+zv9Q=="; + url = "https://registry.npmjs.org/titanium/-/titanium-5.2.3.tgz"; + sha512 = "7oXVf/Qr68U00Cv+CzaFjxuPnuwewXyDS3jsI5bPcH75vvUQfjRqrWcKvCm3pl9MX7Rd4ZMtelDVbYKtxxkyWw=="; }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" + sources."buffer-crc32-0.2.13" sources."caseless-0.12.0" sources."colors-1.3.3" sources."combined-stream-1.0.8" - sources."commander-2.19.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" - sources."diff-3.5.0" sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" + sources."fd-slicer-1.1.0" (sources."fields-0.1.24" // { dependencies = [ sources."colors-0.6.2" @@ -88694,7 +88769,7 @@ in }) sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-extra-7.0.1" + sources."fs-extra-9.0.1" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -88711,35 +88786,38 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" + sources."jsonfile-6.0.1" sources."jsprim-1.4.1" sources."keypress-0.2.1" sources."lodash-4.17.20" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."minimatch-3.0.4" - sources."minimist-0.0.10" - sources."moment-2.27.0" - (sources."node-appc-0.2.49" // { + sources."moment-2.28.0" + (sources."node-appc-1.1.0" // { dependencies = [ - sources."temp-0.8.4" + sources."async-3.2.0" + sources."colors-1.4.0" ]; }) sources."oauth-sign-0.9.0" sources."once-1.4.0" - sources."optimist-0.6.1" sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" sources."performance-now-2.1.0" sources."pkginfo-0.3.1" sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."request-2.88.0" + (sources."request-2.88.0" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" - sources."source-map-0.6.1" + sources."semver-7.3.2" sources."sprintf-0.1.5" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" @@ -88751,10 +88829,9 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.4.10" - sources."universalify-0.1.2" + sources."universalify-1.0.0" sources."uri-js-4.4.0" - sources."uuid-3.3.3" + sources."uuid-8.3.0" sources."verror-1.10.0" (sources."winston-1.1.2" // { dependencies = [ @@ -88762,9 +88839,9 @@ in sources."colors-1.0.3" ]; }) - sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - sources."xmldom-0.1.31" + sources."xmldom-0.3.0" + sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -88851,7 +88928,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" @@ -89132,7 +89209,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -89588,7 +89665,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -89890,14 +89967,14 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" sources."acorn-6.4.1" sources."acorn-jsx-5.3.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ajv-keywords-2.1.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -90088,7 +90165,7 @@ in dependencies = [ sources."acorn-7.4.0" sources."debug-4.2.0" - sources."eslint-scope-5.1.0" + sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."vue-eslint-parser-7.1.0" ]; @@ -90845,7 +90922,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."JSONSelect-0.2.1" sources."acorn-7.4.0" sources."acorn-jsx-5.3.1" @@ -91095,7 +91172,7 @@ in ]; }) sources."eslint-plugin-no-unsanitized-3.1.2" - sources."eslint-scope-5.1.0" + sources."eslint-scope-5.1.1" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" sources."espree-7.2.0" @@ -91257,6 +91334,7 @@ in sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" sources."is-mergeable-object-1.1.1" + sources."is-negative-zero-2.0.0" sources."is-npm-4.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" @@ -91369,7 +91447,7 @@ in ]; }) sources."mkdirp-1.0.4" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.0.0" sources."multimatch-4.0.0" (sources."mv-2.1.1" // { @@ -91416,7 +91494,11 @@ in sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -91824,7 +91906,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-6.4.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."anymatch-3.1.1" @@ -92647,9 +92729,9 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."accepts-1.3.7" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."ansi-colors-3.2.4" @@ -92897,6 +92979,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.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" @@ -92964,7 +93047,11 @@ in sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.pick-1.3.0" sources."obuf-1.1.2" sources."on-finished-2.3.0" @@ -93238,7 +93325,7 @@ in sources."@npmcli/move-file-1.0.1" sources."@types/json-schema-7.0.6" sources."aggregate-error-3.1.0" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ajv-keywords-3.5.2" sources."array-union-2.1.0" sources."balanced-match-1.0.0" @@ -93357,7 +93444,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.18" + sources."@types/node-13.13.19" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -93492,7 +93579,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-classic-0.5.3" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."mp4-box-encoding-1.4.1" sources."mp4-stream-3.1.0" sources."ms-2.0.0" @@ -93769,11 +93856,11 @@ in sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.0" + sources."@types/node-14.10.1" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -94211,7 +94298,7 @@ in ]; }) sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.0.0" (sources."multimatch-4.0.0" // { dependencies = [ From 612bb9c7965685663759023bf59c1ee871bd39c8 Mon Sep 17 00:00:00 2001 From: Souvik Sen Date: Thu, 9 Apr 2020 12:54:01 -0400 Subject: [PATCH 121/463] perlPackages.CLIHelpers: init at 1.8 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d3ef5d83808..bc8fbdbfe38 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2754,6 +2754,22 @@ let }; }; + CLIHelpers = buildPerlPackage { + pname = "CLI-Helpers"; + version = "1.8"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BL/BLHOTSKY/CLI-Helpers-1.8.tar.gz"; + sha256 = "1hgiynpy7q4gbx1d9pwnzdzil36k13vjxhscalj710ikcddvjz92"; + }; + buildInputs = [ PodCoverageTrustPod TestPerlCritic ]; + propagatedBuildInputs = [ CaptureTiny RefUtil SubExporter TermReadKey YAML ]; + meta = { + homepage = "https://github.com/reyjrar/CLI-Helpers"; + description = "Subroutines for making simple command line scripts"; + license = stdenv.lib.licenses.bsd3; + }; + }; + Clipboard = buildPerlModule { pname = "Clipboard"; version = "0.22"; From 19b5ef48fc8d3a4ea00a993ea888479647538537 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Mon, 14 Sep 2020 14:51:35 +0300 Subject: [PATCH 122/463] nixos/plasma5: Fix build with config.services.colord.enable = true Fix build with enabled colord service after https://github.com/NixOS/nixpkgs/pull/97456 --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 205410852f6..049515c969a 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -309,7 +309,7 @@ in ++ lib.optional config.networking.networkmanager.enable plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma-pa ++ lib.optional config.powerManagement.enable powerdevil - ++ lib.optional config.services.colord.enable colord-kde + ++ lib.optional config.services.colord.enable pkgs.colord-kde ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ] ++ lib.optional config.services.xserver.wacom.enable wacomtablet; From 94be165d1fcece248c6804ba583199ab0b96d034 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Sep 2020 08:25:04 -0400 Subject: [PATCH 123/463] linux: 4.14.197 -> 4.14.198 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 25cc9ac3d32..58721a2a642 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.197"; + version = "4.14.198"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "029h46yki2hxdbn7afmnf3yar1pnwrpszx76irsa5mf8gnrasyp0"; + sha256 = "00xmij2l4qmx1s07hplxkn9ddlwiyalh2l5fqdk6d8v031cbmyhy"; }; } // (args.argsOverride or {})) From 0b5ca2c00fba9759dfa6e74c6b8ae965e531fb90 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Sep 2020 08:25:19 -0400 Subject: [PATCH 124/463] linux: 4.19.144 -> 4.19.145 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 5270372418b..c57e8a21e0a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.144"; + version = "4.19.145"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jnj65bdy5y9lcj5zhrn4iaszpww8z41ac66j00l75sd931l1g9k"; + sha256 = "1dzn7x5lz808r1sxxdrylh8k3c5n8ffqnz6anx2ywnpiz17q7g0p"; }; } // (args.argsOverride or {})) From 5a6b1176ea8bed6cb71306ebd8bac0728f7e3ee1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Sep 2020 08:25:28 -0400 Subject: [PATCH 125/463] linux: 4.4.235 -> 4.4.236 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 0fccc800c07..937149c571c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.235"; + version = "4.4.236"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0w5pkv936zb0shjgnpv17gcp5n8f91djznzq54p6j1bl5q2qdyqd"; + sha256 = "1v1mx16x1crnxf4pix0bhw40lq89n7wpd66gjc2mhxi75h6x6i80"; }; } // (args.argsOverride or {})) From cbe5a50976849a9fb1e73d4bb26d78f111fef673 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Sep 2020 08:25:37 -0400 Subject: [PATCH 126/463] linux: 4.9.235 -> 4.9.236 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 75af5a09d4d..116e40fed78 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.235"; + version = "4.9.236"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hqcb3zw4546h6x5xy2mywdznha8813lx15mxbgfbvwm4qhsc9g6"; + sha256 = "1ma2z0nvby4qyxzi3vxa28f0wvlnl74njk6cryjrqaksq6161qp7"; }; } // (args.argsOverride or {})) From 06f28063d351511642ebaefefbc032764c4fab06 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Sep 2020 08:25:44 -0400 Subject: [PATCH 127/463] linux: 5.4.64 -> 5.4.65 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 9ba456bfcfd..a3423707bbb 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.64"; + version = "5.4.65"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1vymhl6p7i06gfgpw9iv75bvga5sj5kgv46i1ykqiwv6hj9w5lxr"; + sha256 = "0sdcdjhzvz7hksv74dgj0ck9adxzhph47r1ng1kf37fh2x28657m"; }; } // (args.argsOverride or {})) From 37149b8bfe40bb5e9045c1f718ab9096e8ec10ce Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Sep 2020 08:25:52 -0400 Subject: [PATCH 128/463] linux: 5.8.8 -> 5.8.9 --- pkgs/os-specific/linux/kernel/linux-5.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix index 2855f020130..bb690cca278 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.8"; + version = "5.8.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0xm901zvvrwsb9k88la6pb65nybi43bygiyz1z68njwsx6ripxik"; + sha256 = "0pz1jfgmds5xc63jfvlykqap4dqf9jpr8jmgz5wpszgih8dvrn4r"; }; } // (args.argsOverride or {})) From 7699e31abb3a2334b7dae8931575899a4d0f66d1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Sep 2020 08:28:10 -0400 Subject: [PATCH 129/463] oh-my-zsh: 2020-09-09 -> 2020-09-12 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 57ab86d4a27..f1de3ee8214 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-09-09"; + version = "2020-09-12"; pname = "oh-my-zsh"; - rev = "3667f94538c24ebaa9abd46e797a2610f3b67c5e"; + rev = "8a93c89bda7e244ed5d32d5b01bd5f72ab695fbf"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1pa4240rhxj5gi5m63xi5wm8b91pzpzsmqp72mqd9b394bgsd3wy"; + sha256 = "0azm4xp5y6w41jbl4342rmqc5hdrg0rz7pmwlilps44k8xdvml7p"; }; installPhase = '' From 13beb432fb21fb5bea38ac374df0fbace92eec76 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 21 Jul 2020 16:58:30 +0200 Subject: [PATCH 130/463] amdvlk: Add i686-linux platform --- pkgs/development/libraries/amdvlk/default.nix | 25 ++++++++++++++----- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 73983dba050..2480a2707f9 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -15,8 +15,11 @@ , xorg , zlib }: +let -stdenv.mkDerivation rec { + suffix = if stdenv.system == "x86_64-linux" then "64" else "32"; + +in stdenv.mkDerivation rec { pname = "amdvlk"; version = "2020.Q3.4"; @@ -62,14 +65,24 @@ stdenv.mkDerivation rec { cmakeDir = "../drivers/xgl"; + # LTO is disabled in gcc for i686 as of #66528 + cmakeFlags = stdenv.lib.optionals stdenv.is32bit ["-DXGL_ENABLE_LTO=OFF"]; + + postPatch = stdenv.lib.optionalString stdenv.is32bit '' + substituteInPlace drivers/pal/cmake/PalCompilerOptions.cmake \ + --replace "pal_setup_gcc_ipo()" "" + ''; + installPhase = '' - install -Dm755 -t $out/lib icd/amdvlk64.so - install -Dm644 -t $out/share/vulkan/icd.d ../drivers/AMDVLK/json/Redhat/amd_icd64.json + install -Dm755 -t $out/lib icd/amdvlk${suffix}.so + install -Dm644 -t $out/share/vulkan/icd.d ../drivers/AMDVLK/json/Redhat/amd_icd${suffix}.json - substituteInPlace $out/share/vulkan/icd.d/amd_icd64.json --replace \ + substituteInPlace $out/share/vulkan/icd.d/amd_icd${suffix}.json --replace \ "/usr/lib64" "$out/lib" + substituteInPlace $out/share/vulkan/icd.d/amd_icd${suffix}.json --replace \ + "/usr/lib" "$out/lib" - patchelf --set-rpath "$rpath" $out/lib/amdvlk64.so + patchelf --set-rpath "$rpath" $out/lib/amdvlk${suffix}.so ''; # Keep the rpath, otherwise vulkaninfo and vkcube segfault @@ -80,7 +93,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/GPUOpen-Drivers/AMDVLK"; changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${version}"; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ danieldk Flakebi ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c9179f5c5d..1b91dfd4553 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12159,6 +12159,7 @@ in # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux) + amdvlk mesa vaapiIntel libvdpau-va-gl From 8ec1cb8b7a22e40eb63574796cb31497c6fe3f51 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Sep 2020 09:09:55 -0400 Subject: [PATCH 131/463] botocore: 1.17.51 -> 1.17.60 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 0ad2816f55c..2593e3909e0 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.17.51"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.17.60"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "198a62d387eb64b4c1dde33a9c41e96b07884c68c1442dd7c7d38123592aae7c"; + sha256 = "0n3a0mhx00i2i99mcwdkk7nbqdpd50zdfkg14mki0ydccqx1jgqr"; }; propagatedBuildInputs = [ From 8bf7fe69c52c808e23273849f061410328e09e1c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Sep 2020 09:10:20 -0400 Subject: [PATCH 132/463] boto3: 1.14.51 -> 1.14.60 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index ca3ffa98575..b7d599f5811 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.14.51"; # N.B: if you change this, change botocore too + version = "1.14.60"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432"; + sha256 = "05s2ysp90mwz5aydzfs9xm3hk9pz7s95zzpjg6g1msyy2gp2gjnq"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 7f52b1f3398d00503f25b24f0c042fdfc3e02563 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Sep 2020 09:10:36 -0400 Subject: [PATCH 133/463] awscli: 1.18.128 -> 1.18.137 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 4045ab110a8..6bc32962891 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.128"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.137"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "c146c1634edbedc32564c536afcaaaeedc3ecc5aa9db3cf64fe5870c1c1a2a32"; + sha256 = "0g745lvmi30di3bbpbca2bkqqzk7g6l3ssmbpi8pvgy0wrfhij69"; }; postPatch = '' From 60d443d0cdf0321164df46d333d20c513ca3bb08 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 14 Sep 2020 15:14:28 +0200 Subject: [PATCH 134/463] awscli2: 2.0.46 -> 2.0.48 --- pkgs/tools/admin/awscli2/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index bcf0a6c4b0c..471034fa51a 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -8,12 +8,12 @@ let py = python3.override { packageOverrides = self: super: { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev50"; + version = "2.0.0dev52"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "e3dceaf9052cc8e221ea757207d5ba37054af2b8"; - sha256 = "0fcf78il4z6gr4gg0jy2h5045ifkslsgldnk6zyvzcl5gykp8i2f"; + rev = "f115f16d8130957776f232bbb7505ff6c4f18e8c"; + hash = "sha256-wi9ezv6uIvCNFYJX6z0zQO7/VREhe1Sn/CakIgDRp1c="; }; }); prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { @@ -29,13 +29,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.0.46"; # N.B: if you change this, change botocore to a matching version too + version = "2.0.48"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256:10bq4m7hsmj1m7nwr3jgpfvm8bx091vl2hig574r1bjmsi32vy58"; + hash = "sha256-83EKaKv3ZKOD2hzdsJO7/djbzr4V8LpHxqBl9HFhk1U="; }; postPatch = '' From 8822778094d78bdd1beb0b494527cd239ab07b2a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 14 Sep 2020 09:34:32 -0400 Subject: [PATCH 135/463] netatop: 2.0 -> 3.1 (#97779) linuxPackages_hardkernel_4_14.netatop linuxPackages_hardkernel_latest.netatop remain broken. linuxPackages-libre.netatop linuxPackages.netatop linuxPackages_4_14.netatop linuxPackages_4_19.netatop linuxPackages_4_4.netatop linuxPackages_4_9.netatop linuxPackages_5_7.netatop linuxPackages_5_8.netatop linuxPackages_hardened.netatop linuxPackages_latest-libre.netatop linuxPackages_latest_hardened.netatop linuxPackages_latest_xen_dom0.netatop linuxPackages_latest_xen_dom0_hardened.netatop linuxPackages_testing_bcachefs.netatop linuxPackages_xen_dom0.netatop linuxPackages_xen_dom0_hardened.netatop linuxPackages_zen.netatop are good --- pkgs/os-specific/linux/netatop/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 93bb1316d20..e433fd1e9f3 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, kernel, zlib }: let - version = "2.0"; + version = "3.1"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.atoptool.nl/download/netatop-${version}.tar.gz"; - sha256 = "03n248p1l3ps7gj2hdlcbrb1fsw1zcmgzypj4j4l4rynjjh7qvf6"; + sha256 = "0qjw8glfdmngfvbn1w63q128vxdz2jlabw13y140ga9i5ibl6vvk"; }; buildInputs = [ zlib ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation { -e s,/usr,$out, \ -e /init.d/d \ -e /depmod/d \ + -e /netatop.service/d \ Makefile ''; From 1074c0a37f2bb032767d24620123d7817eead9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Thu, 10 Sep 2020 16:56:50 +0200 Subject: [PATCH 136/463] ocamlPackages.graphql_ppx: 0.7.1 -> 1.0.1 --- .../ocaml-modules/graphql_ppx/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/pkgs/development/ocaml-modules/graphql_ppx/default.nix index 59e832291f6..f75465e99a2 100644 --- a/pkgs/development/ocaml-modules/graphql_ppx/default.nix +++ b/pkgs/development/ocaml-modules/graphql_ppx/default.nix @@ -1,26 +1,28 @@ { lib, buildDunePackage, fetchFromGitHub, alcotest, cppo -, ocaml-migrate-parsetree, ppx_tools_versioned, reason, result, yojson }: +, ocaml-migrate-parsetree, ppx_tools_versioned, reason, yojson }: buildDunePackage rec { pname = "graphql_ppx"; - version = "0.7.1"; + version = "1.0.1"; minimumOCamlVersion = "4.06"; src = fetchFromGitHub { owner = "reasonml-community"; - repo = "graphql_ppx"; + repo = "graphql-ppx"; rev = "v${version}"; - sha256 = "0gpzwcnss9c82whncyxfm6gwlkgh9hy90329hrazny32ybb470zh"; + sha256 = "0lvmv1sb0ca9mja6di1dbmsgjqgj3w9var4amv1iz9nhwjjx4cpi"; }; propagatedBuildInputs = - [ cppo ocaml-migrate-parsetree ppx_tools_versioned reason result yojson ]; + [ cppo ocaml-migrate-parsetree ppx_tools_versioned reason yojson ]; checkInputs = lib.optional doCheck alcotest; doCheck = false; + useDune2 = true; + meta = { homepage = "https://github.com/reasonml-community/graphql_ppx"; description = "GraphQL PPX rewriter for Bucklescript/ReasonML"; From 234b39a6d46feace2a44cc64a1f37998d98c7ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Mon, 14 Sep 2020 17:18:06 +0200 Subject: [PATCH 137/463] gildas: 20200601_b -> 20200901_a (#97968) --- pkgs/applications/science/astronomy/gildas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 74eea15e830..e84a542f1a6 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "jun20b"; - version = "20200601_b"; + srcVersion = "sep20a"; + version = "20200901_a"; pname = "gildas"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "190na9p9kaif4hviraksig6hsq35i1q3nlrm50l00kpj2n8knisk"; + sha256 = "9faa0b3e674b5ffe5b1aee88027d7401a46ae28cd0b306595300547605d6222a"; }; nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; From 0dca8d5b1eec611a6e2b770725eb841aa023c1b2 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Fri, 28 Aug 2020 09:47:50 +0200 Subject: [PATCH 138/463] nixos/manual: add 32-bit amdvlk usage --- nixos/doc/manual/configuration/gpu-accel.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/configuration/gpu-accel.xml b/nixos/doc/manual/configuration/gpu-accel.xml index 251e5c26ba4..95ee13f4796 100644 --- a/nixos/doc/manual/configuration/gpu-accel.xml +++ b/nixos/doc/manual/configuration/gpu-accel.xml @@ -183,7 +183,12 @@ GPU1: be forced as follows: = [ - amdvlk + pkgs.amdvlk +]; + +# To enable Vulkan support for 32-bit applications, also add: + = [ + pkgs.driversi686Linux.amdvlk ]; # For amdvlk From 50733da4b0f1187d65111449d80dea241abf7985 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Mon, 14 Sep 2020 13:36:37 +0200 Subject: [PATCH 139/463] amdvlk: 2020.Q3.4 -> 2020.Q3.5 --- 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 2480a2707f9..1f75892b9ac 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.Q3.4"; + version = "2020.Q3.5"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "13yy1v43wyw2dbanl39sk1798344smmycgvl3gla61ipqls0qfgd"; + sha256 = "08fj3cg3axnwadlpfim23g5nyjl69044fqxdr57af6y79441njay"; }; buildInputs = [ From 6d0c57fb934f18f0e513685981bad0e2f1f9f723 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 14 Sep 2020 15:56:26 +0000 Subject: [PATCH 140/463] gitAndTools.git-machete: 2.15.4 -> 2.15.5 ###### Motivation for this change Update to latest upstream version ###### Things done * [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux) * Built on platform(s) * [x] NixOS * [ ] macOS * [ ] other Linux distributions * [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) * [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"` * [x] Tested execution of all binary files (usually in `./result/bin/`) * [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after) * [ ] Ensured that relevant documentation is up to date * [x] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). ###### Notify maintainers cc @blitz @Ma27 @tfc @worldofpeace --- .../version-management/git-and-tools/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index a7d8080708e..2e1c790348e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.15.4"; + version = "2.15.5"; src = fetchPypi { inherit pname version; - sha256 = "0n2lrsjs3flfv7650yfhck1c96wkn41cv49440m7csy5yw16zlim"; + sha256 = "11an0hwva1jlf9y7vd9mscs4g6lzja1rwizsani6411xs6m121a3"; }; nativeBuildInputs = [ installShellFiles pbr ]; From 33d02b3396aec8ef3e2029eab421f6c9fcd2a150 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Sep 2020 18:56:15 +0200 Subject: [PATCH 141/463] element-web: 1.7.5 -> 1.7.7 https://github.com/vector-im/element-web/releases/tag/v1.7.6 https://github.com/vector-im/element-web/releases/tag/v1.7.7 --- .../networking/instant-messengers/element/element-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 1ed5a6261f1..3130c2cac46 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.5"; + version = "1.7.7"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "07qc4hymdp1r2zn9gsgkpwxf6knk6xr88dc3iihlhipmlk46m58b"; + sha256 = "1hly102725qh4xjggxv85w1hyq26mhkgj3y6s76yar7i3smj6kpw"; }; installPhase = '' From 441818c4ff59fb4b4448d18e4766f2b84ead0d77 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Sep 2020 18:56:48 +0200 Subject: [PATCH 142/463] element-desktop: 1.7.5 -> 1.7.7 https://github.com/vector-im/element-desktop/releases/tag/v1.7.6 https://github.com/vector-im/element-desktop/releases/tag/v1.7.7 --- .../element/element-desktop-package.json | 2 +- .../element/element-desktop-yarndeps.nix | 40 ++++++------------- .../element/element-desktop.nix | 4 +- 3 files changed, 15 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 610cb328d66..8d2632420f7 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.5", + "version": "1.7.7", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index f1c5ff1bfd4..f0175f2febf 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -722,11 +722,11 @@ }; } { - name = "bl___bl_4.0.2.tgz"; + name = "bl___bl_4.0.3.tgz"; path = fetchurl { - name = "bl___bl_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz"; - sha1 = "52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"; + name = "bl___bl_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz"; + sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489"; }; } { @@ -801,14 +801,6 @@ sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; }; } - { - name = "buffer___buffer_5.4.3.tgz"; - path = fetchurl { - name = "buffer___buffer_5.4.3.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz"; - sha1 = "3fbc9c69eb713d323e3fc1a895eee0710c072115"; - }; - } { name = "buffer___buffer_5.6.0.tgz"; path = fetchurl { @@ -4945,22 +4937,6 @@ sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; }; } - { - name = "readable_stream___readable_stream_2.3.6.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_2.3.6.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz"; - sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"; - }; - } - { - name = "readable_stream___readable_stream_3.4.0.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz"; - sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc"; - }; - } { name = "readable_stream___readable_stream_3.6.0.tgz"; path = fetchurl { @@ -5201,6 +5177,14 @@ sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; }; } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } { name = "safer_buffer___safer_buffer_2.1.2.tgz"; path = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 46e859076be..d44fadea78f 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.5"; + version = "1.7.7"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "0781yg15bzkw5bpfzbdkqix239djgsc7kjdvbilv1d1xxqz3462y"; + sha256 = "1h3v3d41ykgwn397nhm9zaqgf3n69zh592sjzrprvk1gsn5kj5h2"; }; electron = electron_9; From 7a27aefc1c84510cf5b3190915d0c5e56fcb9e1c Mon Sep 17 00:00:00 2001 From: Souvik Sen Date: Thu, 9 Apr 2020 13:18:57 -0400 Subject: [PATCH 143/463] perlPackages.AstroFITSHeader: init at 3.07 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d89bcdf4310..47d87e9533e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -804,6 +804,20 @@ let }; }; + AstroFITSHeader = buildPerlModule rec { + pname = "Astro-FITS-Header"; + version = "3.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TJ/TJENNESS/${pname}-${version}.tar.gz"; + sha256 = "530d59ef0c0935f9862d187187a2d7583b12c639bb67db14f983322b161892d9"; + }; + meta = { + homepage = "http://github.com/timj/perl-Astro-FITS-Header/tree/master"; + description = "Object-oriented interface to FITS HDUs"; + license = stdenv.lib.licenses.free; + }; + }; + AudioScan = buildPerlPackage { pname = "Audio-Scan"; version = "1.01"; From 68896cd397983cff94a69d8ff378f02af0b842b6 Mon Sep 17 00:00:00 2001 From: Viacheslav Lotsmanov Date: Mon, 14 Sep 2020 19:34:44 +0300 Subject: [PATCH 144/463] vimPlugins.nerdtree-git-plugin: init at 2020-09-11 --- pkgs/misc/vim-plugins/generated.nix | 10 +++++----- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 37780735682..379ee305f49 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2412,14 +2412,14 @@ let nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2019-01-09"; + version = "2020-09-11"; src = fetchFromGitHub { - owner = "albfan"; + owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "95e20577cd442ad6256aff9bb2e9c80db05c13f0"; - sha256 = "15i66mxvygs6xa2jvk7bqdagxx1lcvynmyb9g75whgbv7is80qn7"; + rev = "a8c031f11dd312f53357729ca47ad493e798aa86"; + sha256 = "1d64cmywhj43q9fkrh0kcfsxa7ijxcb1fbz38pxaacg082y6l0jy"; }; - meta.homepage = "https://github.com/albfan/nerdtree-git-plugin/"; + meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; neuron-vim = buildVimPluginFrom2Nix { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 2edab6b4ec3..55bc0e29efd 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -3,7 +3,6 @@ airblade/vim-gitgutter airblade/vim-rooter ajh17/Spacegray.vim aklt/plantuml-syntax -albfan/nerdtree-git-plugin altercation/vim-colors-solarized alvan/vim-closetag alx741/vim-hindent @@ -604,6 +603,7 @@ xavierd/clang_complete xolox/vim-easytags xolox/vim-misc xuhdev/vim-latex-live-preview +Xuyuanp/nerdtree-git-plugin ycm-core/YouCompleteMe Yggdroot/indentLine Yilin-Yang/vim-markbar From b92f79e128f13dceb866e9a240a39f2e5cf5ca48 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 14 Sep 2020 10:18:16 -0700 Subject: [PATCH 145/463] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 300 +++++++++++++--------------- 1 file changed, 144 insertions(+), 156 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 379ee305f49..bf2f591e00b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-09-07"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "b4b75126f9eae30da8f5e0cb9ec100feb38c1cb6"; - sha256 = "0k6zaw31igpm4d2kwbmryk86aifgabph4yzwyrrwvwlj9l5d32fy"; + rev = "08295ce17405cb5f6c80d2f726262493bfd21210"; + sha256 = "1jyxxn6j7jkcr1yky6p1y798rza04q3pivsddig8qk85kg6dkgy5"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -135,18 +135,6 @@ let meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; - asyncomplete-vim = buildVimPluginFrom2Nix { - pname = "asyncomplete-vim"; - version = "2020-08-09"; - src = fetchFromGitHub { - owner = "prabirshrestha"; - repo = "asyncomplete.vim"; - rev = "0d4ec1805d50fd39b8b41626e0761736feb307d0"; - sha256 = "0lcqdh51fd8lx1g02dcwrfnnx3zfm71g57nv2pmin5ap7qgh8kir"; - }; - meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; - }; - ats-vim = buildVimPluginFrom2Nix { pname = "ats-vim"; version = "2020-09-04"; @@ -197,12 +185,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-08-26"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "b89e17b44dc1bcc189298882a4cb6e3252c2fb4c"; - sha256 = "0grgii328c4y086par9l3f2cq2xh47dqv2w2f4lwd5z9zmnxkv4f"; + rev = "41a0d9ea4dac077c2050ceaf144f9ed72d6849d8"; + sha256 = "12ivlzyw0iq9jsj3ll2wwbya0ssl4vdk1vvjpg7v4xhxgh96s3jr"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -377,24 +365,24 @@ let coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2019-01-19"; + version = "2020-09-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "f0cf609724249e662fef54169b484b7d089032f9"; - sha256 = "0jknvcf1cf53bwyhf1rhm5fa7nsp0l7sihns1qybph8hayb5rwvp"; + rev = "8ff425faab53e8bb8c53eec1afdf19a29c8086f6"; + sha256 = "06ddv9brb4zy8ylas36dkmblr93n6c5dp6vpp3c7asxc1kx58gc5"; }; meta.homepage = "https://github.com/neoclide/coc-denite/"; }; coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-09-08"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "847f480a3de6d34c79594caa6c972ecca4e2adba"; - sha256 = "0wny1hakkhngnkx9dsmimljcb8sszxwd7nhcl6ps5wyhxxn46pls"; + rev = "7f97e92347155d14033ac18a4f40777dde87ac74"; + sha256 = "1p4458kbl52l4l07ps2cqljynw0bldzk0inpi5i22wsv55s59hrg"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -461,12 +449,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-08-26"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "52c18cefd06879924a8469fc493af58fb3e7f1f4"; - sha256 = "1ddcmfy6mgmmqmj7a5v1dhz5z43wz2wfyzaxbg6hchb3j0h8dmc5"; + rev = "825f7f5b89fb1708f18711798ef7a2ba6aa1bde5"; + sha256 = "19lp2znwjc6p9wmqbp92qjvy1hvddh89hfcy739haf53pbnscds4"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -522,12 +510,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-09-08"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "7ee735199fcce0e9dd94cbf288dc7d9e630eef95"; - sha256 = "0w0jdm1vggmzcnvssvxy3hg56mh1w6p7rbgj6asw13k0jam6jd3v"; + rev = "3cffa5b8a6494af618d050578e2b8d8c5b70c447"; + sha256 = "160j3al4lcgd68a2qscnfsnsdp2wj3xbs58wr8w9cxfa19xn85nd"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -726,12 +714,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-09-08"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "4e3221ab3dc1144f4c1a94c78435427f9de943f0"; - sha256 = "16nbp5gkzdbmx96sgybh7kjj6wlpz4zly1656m6ihfq0s3mmvlk5"; + rev = "f5beca0c3b652c0c34bfb0f45636f8f99ce0aeef"; + sha256 = "028d6riqvfd7cgdl16vqhnq06ihjmlv27hdpz0ccpkh2yszq16iq"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -762,24 +750,24 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2020-08-20"; + version = "2020-09-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "denite-git"; - rev = "281f45114ba5673d671683ee19194a4958a2da57"; - sha256 = "0j4vmljk6zvgvrj5s6ij5h5v4am7y9sd467f1fn3g6wqgm8432g6"; + rev = "2c80ef41fa56bbb4a0d48c4153404be694368141"; + sha256 = "08kdhn4kry8sc8gyffp8zl609nlajhd1x6qi50n5216r9dk03jlk"; }; meta.homepage = "https://github.com/neoclide/denite-git/"; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-09-02"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "5fbc044e3e8ecf80c589d6e87859dcc4c005f2e5"; - sha256 = "0w8k8bylsh45314yg8g9hrrpkacfp3gixk8qba46lajzib298g63"; + rev = "b9b332a3080708da5f5895965da66c4dbe70bd4c"; + sha256 = "0mifp2ykb0lbf1mbm15p5ywhwcxq8w8ilqcyqbsxakc8pwrl0zw6"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -944,12 +932,12 @@ let deoplete-phpactor = buildVimPluginFrom2Nix { pname = "deoplete-phpactor"; - version = "2019-02-22"; + version = "2020-09-12"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "deoplete-phpactor"; - rev = "53e239effb8ff20fc0a192206e96d98d4f9001ad"; - sha256 = "14097r9fmyp9zxfgv0fj2s52qd1v5cxdckfg4zph7lg3yri1hx9p"; + rev = "3668d35d8ea8177bb70cfb239169d3c12bc54f6a"; + sha256 = "1cjdr8py7brxz419vf125jkyfjrx3n5z65ranj23z20ifc945g6b"; }; meta.homepage = "https://github.com/kristijanhusak/deoplete-phpactor/"; }; @@ -1016,12 +1004,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-08-25"; + version = "2020-09-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "7ab4c1bde7f9bd8824219594b07e4c1aa0814d4e"; - sha256 = "13p59bxad46pxcihsns2vybjv8m6vhka9vbjvsvn6nwgck4rs1w3"; + rev = "895fafe572585b807a31d4ba2835188d7b38cc41"; + sha256 = "1irhdp1bdwpyj9g40mb4n1mjw2f1hxswhgf2f1nkv1cx0j8pvkzd"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1319,12 +1307,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-09-04"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "18205e071dc701ed9ca51971466b9997cd3d0778"; - sha256 = "0rbsq18gqpyngm0kjxhxwm4avxllmxwhg1bgvcj7pvh3pd35nmbl"; + rev = "3348aef05d02828cd8b071ab29476af2029ea3d3"; + sha256 = "0jyk9c3ksxss8zjk0qqkm95074glbf31a5w78sdzwn352xm8nakp"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1872,12 +1860,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-09-07"; + version = "2020-09-12"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "39e1fc1a1bc38fc90dea53d5737c8699107d3343"; - sha256 = "07i5fz1mgqr8sp653qs0kvi2wdls77g80ajz7z0wq6hxxdkfr46s"; + rev = "8823c393fe344daee96d6de0250197d2fbc91dd3"; + sha256 = "050mwgb378vxfdjfvawz2s110pd523jgzx05p8hksk9nm4j2a05n"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2208,24 +2196,24 @@ let neco-syntax = buildVimPluginFrom2Nix { pname = "neco-syntax"; - version = "2019-11-10"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-syntax"; - rev = "6c3862ac82d2c917fa8b4126832de7d3a909f1fe"; - sha256 = "1kmzlz6c5bs7f4dxgrdn4azwh55k6ghhyzy8jjdgj0wsb309y92k"; + rev = "f8d7b748b022aac8ce73458574da5616f1c5fb65"; + sha256 = "12h8qm6l40a2dgbimn579bdyar0dq88hk7mdd0vhyj15c1305kda"; }; meta.homepage = "https://github.com/Shougo/neco-syntax/"; }; neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2020-04-08"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "4fbc3f5f3a2b2d5299c388e2f1ffef04fcaf87ba"; - sha256 = "0lk5p2aihalcarsjnvn1yidgv0xqp1bk29wywsbp8ni964s0si39"; + rev = "e7b5a73cba668a351b0953063b6e18e1dc1773b2"; + sha256 = "0mfli085rpr5assb4n21wnd59fnnsbfilim7impcwr9imvrw6ymf"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -2256,24 +2244,24 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-08-25"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "491d83c50c9b17c896850bbd7ec00f2019e2f110"; - sha256 = "0mj20dyf2hj9wr1df6rv7yn3mcb8z20bivclm8ircni2gi64bdb9"; + rev = "9d1031b809514c0718753db44f268546c37782f6"; + sha256 = "1szfhwxd255rhd94js8jmnk5idd2qbq3fajdjxyaiz775zyfhsiz"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neoinclude-vim = buildVimPluginFrom2Nix { pname = "neoinclude-vim"; - version = "2019-05-11"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoinclude.vim"; - rev = "5125e73de0a8b4f2c399e4896e21be1b8f7b3d39"; - sha256 = "0qw63xyvrxvdzx01k5nnsv3p8zmnd77cwbkk24pikqrscxw3ypsz"; + rev = "954cfc9dfdb303f2c2fa867b9cf949dd74512628"; + sha256 = "0slp6mz8ds5raqhbi9gpr1ilgw745lfzjygyd58r6jcg2givsiik"; }; meta.homepage = "https://github.com/Shougo/neoinclude.vim/"; }; @@ -2316,12 +2304,12 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-09-04"; + version = "2020-09-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "14785c0e60f27b8be7998ebfb075ce816a0aace6"; - sha256 = "1y9h9bp17r30g71zcgdapwrnkwrcr16mhqrs94i8y5nay9zmks79"; + rev = "30b6b53b7a86b84371714b4a0f092d5d303c4a35"; + sha256 = "0q06a0wq2aqgkjc5jndccffibr85hf33w2igcah3x6dl203p4ips"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -2352,12 +2340,12 @@ let neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; - version = "2020-07-21"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "a076c5828182afe03109ead9ca6863d3d0bd47f3"; - sha256 = "0h3ak79kw26wpiw4q9vgjmdp5vdrnhqimlayfjixbqmq4p7nldcj"; + rev = "fae31a285e719a938c19f465ab4b21387e56bbff"; + sha256 = "0ykalrnqp66jr9jnn3ixcmi429w3c2wq7fbl21cnb9iql0gh719j"; }; meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; @@ -2544,12 +2532,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-09-08"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "dc077b5fb00d1c4635c04c0ba1cb9162e613d83c"; - sha256 = "1172pald8686z8mrqp086jb2yin0i9zl599x4804jflz311cyvjn"; + rev = "f8a76d6de6740ee736c32628dadf41a73c008612"; + sha256 = "13mrw57w14j172igfd2jv0nlf606iq343bh709ir86cpliq51n9p"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -2952,12 +2940,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-09-05"; + version = "2020-09-10"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "f24b96bbc6f618f2f082248e9c405e96118bcbc7"; - sha256 = "0p05h3cmhwz5vm3nlgzyssqb21xjbjqb7xn52zfid4q75cq40lsf"; + rev = "2a6736852cbe64e2883adc70a427cb47cb3305bc"; + sha256 = "1zykkq674rg7b6bh57bpfrw5fwhk4fij7mqgdcxi5sk6blcld5j0"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -2988,12 +2976,12 @@ let semantic-highlight-vim = buildVimPluginFrom2Nix { pname = "semantic-highlight-vim"; - version = "2019-09-01"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "jaxbot"; repo = "semantic-highlight.vim"; - rev = "7cf0aabbd0f9cb531b0045ac2148dff1131616de"; - sha256 = "16dnqrdpxf6322az1rn67ay2a4clqz410xn6zqzr1w2y6x4yly1a"; + rev = "7e141c2b7be0f2600276004fd2e7382a3fa0f690"; + sha256 = "04975ly6zd58zhs2v07dw6m1dha0gkmfm0pvhlrgcrf2qp8n4m3v"; }; meta.homepage = "https://github.com/jaxbot/semantic-highlight.vim/"; }; @@ -3048,24 +3036,24 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2020-09-07"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "403accb75e7659dfa9caa9a43e43db9840ea140a"; - sha256 = "1wnr7jfc41i2vvqvbhclw5rym138fki0w67d3q7cqmx2520zxafy"; + rev = "ea78de9eda97728d3489c29eb3e9c8a9b2fdd868"; + sha256 = "0kn1qpkwsv7m58gr3jydynnm12gqns503dhnfqcw7yshbq5sr9rr"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; SimpylFold = buildVimPluginFrom2Nix { pname = "SimpylFold"; - version = "2017-06-13"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "tmhedberg"; repo = "SimpylFold"; - rev = "aa0371d9d708388f3ba385ccc67a7504586a20d9"; - sha256 = "1gjv78x2cgh79a04l411kdhkm53f93czs54p07kadpa9659z93ss"; + rev = "0459df8a0bbfc8ef1bfd88db889e881626f65914"; + sha256 = "1lydkm86d84fsmbklwcgnlb95vczri9a8d898hrnfvskyx050y2w"; }; meta.homepage = "https://github.com/tmhedberg/SimpylFold/"; }; @@ -3253,12 +3241,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-08-24"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "9041bc76b4084dda00933744c0dce4bdf43d15c7"; - sha256 = "076z5cs7gjl4hl92fzplabl0wq87hxzsgvmdna6vrzkh7ki2m3cb"; + rev = "3e31762a26f7c29c0f6344c4215ca9074f4ead8d"; + sha256 = "11wbxnvqgkgmcb3yl5zsn4v6va17p20nnrqxrqbr6y8ia39n7wa0"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3301,12 +3289,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-09-01"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "e1c2c98922ef922070e055a4a55f5b17659a69d8"; - sha256 = "1dirz26hf66g4hichfni95mga1mwk1dmq2jyrlj9f3ph428ps61a"; + rev = "30fb229937d640889448de9c4f8b71b19946c67b"; + sha256 = "01vl3id1fmkd8p9hb2x2mb5iyyfad5a84ibfl6fkr7sm59jfgc2j"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -3446,12 +3434,12 @@ let tslime-vim = buildVimPluginFrom2Nix { pname = "tslime-vim"; - version = "2018-07-23"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "jgdavey"; repo = "tslime.vim"; - rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0"; - sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x"; + rev = "9b2b99e409336584103b83c597fdb6234875ae25"; + sha256 = "048ycam0awcf98zhha6c5n1fk366w559bmjcanik2sqlqw1f74as"; }; meta.homepage = "https://github.com/jgdavey/tslime.vim/"; }; @@ -3470,12 +3458,12 @@ let typescript-vim = buildVimPluginFrom2Nix { pname = "typescript-vim"; - version = "2020-02-13"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "17d85d8051ba21283e62a9101734981e10b732fd"; - sha256 = "17z8ygns97wlnm4vq7kgkx3ymnbb2f6imxn02fc0iywkrhdqv7mj"; + rev = "9f247d7693cd12171239c56c355ba863f559f424"; + sha256 = "1m16rhvmymxps41s7f6nh6gnbfiw5qwkvl23jr9z91xsq58jzj9l"; }; meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; @@ -3830,12 +3818,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-09-03"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "51f599e2cf45c17759b4bd3931ca1c5c10bfd4f4"; - sha256 = "1y6ckm1fkzrq2w5ya0m5iknqcl033ykkzrwx30ia7kxci4drz2ad"; + rev = "f5693986c4ce82e50f4feebda22cf8c2fed35438"; + sha256 = "0jl58s0xp2snhpn5f7r3gacj6fi88hc8anxj9r36gww24j4y7kzw"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4046,12 +4034,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-09-08"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "92620f3435bb12e518d7a06c8f2f1ff2f53396ec"; - sha256 = "088abwj4spriqnqldrm0djf4a5i1dgrxajz2vw7rajwl7mmjsp1v"; + rev = "92c4da683f71cc1c2a17308712bb0b2f60168560"; + sha256 = "0f8dcvfb4br8al73x4i7zs39z78hvd2rfmxiakj0di7a60i9v1yh"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4094,12 +4082,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-07-29"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "a43392a7c4d73b91835e7bd993889646c8a907fd"; - sha256 = "1b850c36xgydn2ibdxzqprzsi65hz9sfhvcj69zm3rqbh47hqi98"; + rev = "9346c381c94c0f9312c6e7970a4ab15419935464"; + sha256 = "03nymldw5ifc57z5vr0xaz00vml6v854zp2fnzm4q9v9n295kh66"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -4550,12 +4538,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2020-08-28"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "9e62520397f6e98c6031aba4cb63e611abe4583b"; - sha256 = "144qiari81xwaxw9rd5mh4g1ywn2r141438r3km6dh3acx18f6ij"; + rev = "72f4b6d4ec8aac44ea6f5ee6e3693b7388cd3449"; + sha256 = "07wcpc7kr113m574zfxjlh65pyhfm24a2f7lyadmhr1sah05iv6s"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -4610,24 +4598,24 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-09-08"; + version = "2020-09-10"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "615568a454e3dfd7a2d1571dcd8a2407f4897303"; - sha256 = "0iclpfqvxhg5b74pixswwys06jmiydk5b82iqkchsxhrfh7jgzb9"; + rev = "9de0fdeba46ec03d645f8ad093978961f405b81d"; + sha256 = "1s9d0h96vgzhff30bxqciv5pdj1im9pk8j1r3361ma9zk8fjsnrr"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flutter = buildVimPluginFrom2Nix { pname = "vim-flutter"; - version = "2020-09-03"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "thosakwe"; repo = "vim-flutter"; - rev = "a5ad99680b4c40cfa7477684e50d6c5b36d17601"; - sha256 = "1zf12nh2sdrh6by3mb2zzhy8dd9xlmj3fa9jykzqa1gvqgp8lg5m"; + rev = "5a6de53adcc72742138b666b305869999fc8066e"; + sha256 = "1zxa1gz47qpkcrzniax6q1bq9a953rypj1cfbcjb62h5ggx2rr5n"; }; meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; @@ -4718,12 +4706,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-09-07"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "94ee004087525d4adb56e9325320053fddef0564"; - sha256 = "0fg2wmk19fp07s3gg8ril8zvhbsvz8n01phv4dyskw6bnaz3vbz7"; + rev = "ea79bc01c2efc84cf8e71fbe5fd8adbf4242739d"; + sha256 = "0dv69ganm4rv2909yy9w13y82bik4maa5x1z3kpv0hrd55qay40z"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4778,12 +4766,12 @@ let vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2020-09-07"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "94404d3724dd85b72d49f371cd810223dd68112b"; - sha256 = "0ll5qb2cj337flba4sg9ds2cyrdn9j8x1sfjv50r1lr8szaqj6cl"; + rev = "b06a6e62db170f085aa4af7f2439ae7e453eb1d3"; + sha256 = "12qwz7m652jgn86210mbbg1glcmshm67wdhrsb36bxqrx39g1ghh"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -5187,12 +5175,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-06-22"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "c665d5ca4247b696f478f91b7c97b9e44442e4b6"; - sha256 = "1p1461rh3yp0ldg4x1cb2nj9xng6scdlrkzj1q8ykspi98qnz0mm"; + rev = "58b9a4dd48ee28488a6772fc6bb04abb0d083092"; + sha256 = "0gw5l1i7crsflrl3si1ymlpjh9yj5l5d23jj9irwyfkc8c6zqvbn"; }; meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; @@ -5235,12 +5223,12 @@ let vim-latex-live-preview = buildVimPluginFrom2Nix { pname = "vim-latex-live-preview"; - version = "2020-06-25"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "xuhdev"; repo = "vim-latex-live-preview"; - rev = "32d1a911641e08c11b3f82ba886540cbae0b7513"; - sha256 = "0hnjc1jpjr6fdy9b5j85didi97f6w8p8ad5cn6b0fnxxlkykymjg"; + rev = "afdf3f4778119f0bfacb07629d0155d58eb5562a"; + sha256 = "0zihnphc021alqbn1f84n233r6a31n499046yw1yspkcnpz7mcxm"; }; meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/"; }; @@ -5475,12 +5463,12 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2020-09-05"; + version = "2020-09-12"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "3ff5adfc7953b48919096cecc3754f0d615a17de"; - sha256 = "0r41abn31jy31lnnj8q6g35y9xnz8j3iivnyyvyxd4z6b8rq4kin"; + rev = "39a3bd877c26792838ed58c1b8b3e0a5daa11402"; + sha256 = "01cmbrzbvsdl8946rwdz8jhnpfr5fapgvpx65vnqq2bisc901dz3"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -5883,12 +5871,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-09-08"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "a4b91124a8fea26575d08c1845e141520e7d33e2"; - sha256 = "1b599jmhlj9nk11hj6h47kny3cvcb8ci6n1s1s9vyghmv2cqysb3"; + rev = "4314841aa4772d98b186636bdbf34fcf48c74275"; + sha256 = "1qkhg6wx1ngvnf3x1bz089sb74f3018z9fs9bgzm6x0ar0jvy1iw"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6832,12 +6820,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-09-01"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "1c9207b28c8898ab01b54e6d6b61b0b820a814bc"; - sha256 = "0jggmhxgs3lkm8hfjicminhsmfdjw8gsp0p5jgamdx68bryp818g"; + rev = "9e1acf352d5f25123ac9bee90e3722ac5712c65f"; + sha256 = "0iysn5b3x08y25c3nvnr1n6dinmy4hgl69gdxm6hm5xg9am27wnr"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6856,12 +6844,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-09-02"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "b4ea93fbcb578250da97722ca825a73a66c3d5c8"; - sha256 = "0zgy4q2b5fywqiv2chz3fly4liy8br2mdj1kf4m43b6pil77qpbi"; + rev = "09c633bb3258ee4f17a5f0414a47433e7779ac66"; + sha256 = "1fj93ig249acqdxfhpvc4rrdwb5yzvwm83hfxxdb4g1d966xg0dw"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -6916,12 +6904,12 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-08-10"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "c940b147c3098278f9c14b85eef9cfdbf82a7f09"; - sha256 = "19qh7lmpb093hnxga2jk6s47bjsdjqj4zrb3lrkrjn2qyyasi194"; + rev = "2109edb1706b26dab64a1851bd934571d5b48dc1"; + sha256 = "12zmhv49wx1h1zd28l9591iglipx2avmfwg7qk918sgx96bym1sf"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -7108,12 +7096,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-09-04"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "f1cc01a39950d18310bad2d14d7f8e7c52a1e7d0"; - sha256 = "0digxir7gclbcgfk6wgwp7ywy6nmndnybmgjsfksvnqf0qw99inc"; + rev = "173f2d6f375bc58bffc6b871c5786ba183af09ee"; + sha256 = "0gyqp71c21yd134065c6brf3avlwy4s9zzf471gal7y41kap5ya4"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7121,12 +7109,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-09-02"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ec219646136de3040356b00d0dc74520950bd761"; - sha256 = "1329cg02mxplflfpww69avn71pz0sj1ihl3qkwmz9b90whglczmr"; + rev = "a9217a31bcfb17a953bcf600245426e3df9a4192"; + sha256 = "0adk5m5hql7ragvbfs110wpai3apyyb3lh9pj550jq1512d30xag"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7302,12 +7290,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-08-25"; + version = "2020-09-10"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "2afee9d9771cf53eec63ab854bcd491fe277109e"; - sha256 = "08dmzy789zg8s9m5gm4rlg9jrs9fv546x6lvziiamn70jbrfrrlg"; + rev = "37a149ee028bfb61a6e33dbfe30d7ce1343c9519"; + sha256 = "0sb93zy6h21aayal08fj57vd7xjhwjkxihbd6l3yqcxgdz9kr5ir"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -7339,24 +7327,24 @@ let zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; - version = "2020-08-31"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "jnurmine"; repo = "zenburn"; - rev = "e1f66dd35ec86ee0aec0b9ef1818f97023f914c4"; - sha256 = "10aizq0xvln917i9jji6fxdxdgfbvcvd041z6qq2m23h5xs232w8"; + rev = "4ec3795d81fc83b6f43389a6291bfa99394473a8"; + sha256 = "148s2szjx61rp93nxa95552m87mn4n4ga00dlbvvv7sm607mvxd8"; }; meta.homepage = "https://github.com/jnurmine/zenburn/"; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-08-30"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "3c95b67a76934959f9124e39e64eb14f65f14dc9"; - sha256 = "0m152kf9yw7q2slci2bzsqmycl9nxawhhclr4r9k5q87xdrzjqk0"; + rev = "9e26b43ada8959f533604be3622fa56bf1d54752"; + sha256 = "1hlqnq83fl0jma0w7pra1iwq174gc2v32sfcjg39yd3hv9dmkl4v"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; From 258cbe62f75e1ee0beb077f992d056772139c932 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 14 Sep 2020 10:18:42 -0700 Subject: [PATCH 146/463] vimPlugins: resolve github repository redirects --- pkgs/misc/vim-plugins/generated.nix | 4 ++-- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index bf2f591e00b..68997849635 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3291,12 +3291,12 @@ let pname = "tagbar"; version = "2020-09-13"; src = fetchFromGitHub { - owner = "majutsushi"; + owner = "preservim"; repo = "tagbar"; rev = "30fb229937d640889448de9c4f8b71b19946c67b"; sha256 = "01vl3id1fmkd8p9hb2x2mb5iyyfad5a84ibfl6fkr7sm59jfgc2j"; }; - meta.homepage = "https://github.com/majutsushi/tagbar/"; + meta.homepage = "https://github.com/preservim/tagbar/"; }; taglist-vim = buildVimPluginFrom2Nix { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 55bc0e29efd..2abec95bcc8 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -266,7 +266,6 @@ lyokha/vim-xkbswitch machakann/vim-highlightedyank machakann/vim-sandwich machakann/vim-swap -majutsushi/tagbar maksimr/vim-jsbeautify MarcWeber/vim-addon-actions MarcWeber/vim-addon-async @@ -394,6 +393,7 @@ PProvost/vim-ps1 prabirshrestha/vim-lsp preservim/nerdcommenter preservim/nerdtree +preservim/tagbar psliwka/vim-smoothie ptzz/lf.vim puremourning/vimspector From 10e2e5be3063a4264226da41d4d11ac1a7710500 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 14 Sep 2020 10:29:13 -0700 Subject: [PATCH 147/463] vimPlugins.asyncomplete-vim: init at 2020-08-09 --- 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 68997849635..cb1d9ec31aa 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -135,6 +135,18 @@ let meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; + asyncomplete-vim = buildVimPluginFrom2Nix { + pname = "asyncomplete-vim"; + version = "2020-08-09"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "asyncomplete.vim"; + rev = "0d4ec1805d50fd39b8b41626e0761736feb307d0"; + sha256 = "0lcqdh51fd8lx1g02dcwrfnnx3zfm71g57nv2pmin5ap7qgh8kir"; + }; + meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; + }; + ats-vim = buildVimPluginFrom2Nix { pname = "ats-vim"; version = "2020-09-04"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 2abec95bcc8..97f391ae556 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -390,6 +390,7 @@ ponko2/deoplete-fish posva/vim-vue powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 +prabirshrestha/asyncomplete.vim prabirshrestha/vim-lsp preservim/nerdcommenter preservim/nerdtree From 26c23c01a63165172503e973d28ffef3f14f919c Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Mon, 14 Sep 2020 18:46:29 +0200 Subject: [PATCH 148/463] rgp: 1.7.0.29 -> 1.8 --- pkgs/development/tools/rgp/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index dea0512b7d6..8c3da159d64 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -13,16 +13,20 @@ , libXi , ncurses5 , qtbase +, qtdeclarative , zlib }: +let + buildNum = "2020-09-11-26"; +in stdenv.mkDerivation rec { pname = "rgp"; - version = "1.7.0.29"; + version = "1.8"; src = fetchurl { - url = "https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/download/v${lib.versions.majorMinor version}/RadeonGPUProfiler_${version}.tgz"; - sha256 = "d7d4aa92231796a509dfcf92e9618cac98ae6572c12efd0871eb43afa4e8240a"; + url = "https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/download/v${lib.versions.majorMinor version}/RadeonDeveloperTools-${buildNum}.tgz"; + sha256 = "1lpkh7sfpq697lm4xnkpjfchh8zpy49f4mb3c5qcn7brav5iqwfh"; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; @@ -38,6 +42,7 @@ stdenv.mkDerivation rec { libXi ncurses5 qtbase + qtdeclarative zlib ]; From c814b0ef2419c80234d8d20f330155621a9e27c8 Mon Sep 17 00:00:00 2001 From: pancho horrillo Date: Mon, 14 Sep 2020 21:31:08 +0200 Subject: [PATCH 149/463] caddy1: fix build (#97988) main.go gets overwritten in order to build caddy with telemetry disabled, but the global variable `run` got neglected, and this in turn broke the test in caddy/main_test.go. This commit fixes that, and build can now complete. --- pkgs/servers/caddy/v1.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/caddy/v1.nix b/pkgs/servers/caddy/v1.nix index 8a18904af2c..dce4eea84b8 100644 --- a/pkgs/servers/caddy/v1.nix +++ b/pkgs/servers/caddy/v1.nix @@ -21,9 +21,10 @@ buildGoModule rec { cat << EOF > caddy/main.go package main import "github.com/caddyserver/caddy/caddy/caddymain" + var run = caddymain.Run // replaced for tests func main() { caddymain.EnableTelemetry = false - caddymain.Run() + run() } EOF ''; From 9fb14d899da482468359fee171546b86d0f97129 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 12 Sep 2020 14:31:30 +0100 Subject: [PATCH 150/463] pythonPackages.holidays: fix build by adding korean-lunar-calendar dependency --- .../python-modules/holidays/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 79d49e654f9..10ee1bbf2e7 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -1,4 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, dateutil, convertdate }: +{ stdenv +, buildPythonPackage +, fetchPypi +, convertdate +, dateutil +, korean-lunar-calendar +, six +}: buildPythonPackage rec { pname = "holidays"; @@ -9,7 +16,13 @@ buildPythonPackage rec { sha256 = "839281f2b1ae7ac576da7951472482f6e714818296853107ea861fa60f5013cc"; }; - propagatedBuildInputs = [ six dateutil convertdate ]; + propagatedBuildInputs = [ + convertdate + dateutil + korean-lunar-calendar + six + ]; + pythonImportsCheck = [ "holidays" ]; meta = with stdenv.lib; { homepage = "https://github.com/dr-prodigy/python-holidays"; From cc4a33d78c0fdfc8d64274179c24d8188153287a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 8 Sep 2020 07:27:08 +0200 Subject: [PATCH 151/463] =?UTF-8?q?ott:=200.30=20=E2=86=92=200.31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/ott/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 4f1b984b995..ecc253a64d9 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ocaml }: +{ stdenv, fetchFromGitHub, pkgconfig, ocaml, opaline }: stdenv.mkDerivation rec { pname = "ott"; @@ -11,17 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0l81126i2qkz11fs5yrjdgymnqgjcs5avb7f951h61yh1s68jpnn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig opaline ]; buildInputs = [ ocaml ]; - installPhase = '' - mkdir -p $out/bin - cp src/ott.opt $out/bin - ln -s $out/bin/ott.opt $out/bin/ott + installTargets = "ott.install"; - mkdir -p $out/share/emacs/site-lisp - cp emacs/ott-mode.el $out/share/emacs/site-lisp - ''; + postInstall = "opaline -prefix $out"; meta = { description = "Ott: tool for the working semanticist"; From e587b5a8a843b296ec6293bc7684fb7856773f71 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Wed, 9 Sep 2020 09:50:00 +1200 Subject: [PATCH 152/463] nixos/shadowsocks: add extraConfig --- .../services/networking/shadowsocks.nix | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/shadowsocks.nix b/nixos/modules/services/networking/shadowsocks.nix index 4fd988297f6..6009a91cbb2 100644 --- a/nixos/modules/services/networking/shadowsocks.nix +++ b/nixos/modules/services/networking/shadowsocks.nix @@ -17,7 +17,7 @@ let plugin_opts = cfg.pluginOpts; } // optionalAttrs (cfg.password != null) { password = cfg.password; - }; + } // cfg.extraConfig; configFile = pkgs.writeText "shadowsocks.json" (builtins.toJSON opts); @@ -112,6 +112,24 @@ in Options to pass to the plugin if one was specified ''; }; + + extraConfig = mkOption { + type = types.attrs; + default = {}; + example = '' + { + nameserver = "8.8.8.8"; + } + ''; + description = '' + Additional configuration for shadowsocks that is not covered by the + provided options. The provided attrset will be serialized to JSON and + has to contain valid shadowsocks options. Unfortunately most + additional options are undocumented but it's easy to find out what is + available by looking into the source code of + + ''; + }; }; }; From 9d60354faee3ec42fccd724fa795ac2f64bef82d Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Wed, 9 Sep 2020 10:15:59 +1200 Subject: [PATCH 153/463] nixos/shadowsocks: add test without plugin --- .../services/networking/shadowsocks.nix | 2 +- nixos/tests/all-tests.nix | 2 +- .../common.nix} | 24 +++++++++++-------- nixos/tests/shadowsocks/default.nix | 16 +++++++++++++ 4 files changed, 32 insertions(+), 12 deletions(-) rename nixos/tests/{shadowsocks.nix => shadowsocks/common.nix} (82%) create mode 100644 nixos/tests/shadowsocks/default.nix diff --git a/nixos/modules/services/networking/shadowsocks.nix b/nixos/modules/services/networking/shadowsocks.nix index 6009a91cbb2..d2541f9a6df 100644 --- a/nixos/modules/services/networking/shadowsocks.nix +++ b/nixos/modules/services/networking/shadowsocks.nix @@ -147,7 +147,7 @@ in description = "shadowsocks-libev Daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.shadowsocks-libev cfg.plugin ] ++ optional (cfg.passwordFile != null) pkgs.jq; + path = [ pkgs.shadowsocks-libev ] ++ optional (cfg.plugin != null) cfg.plugin ++ optional (cfg.passwordFile != null) pkgs.jq; serviceConfig.PrivateTmp = true; script = '' ${optionalString (cfg.passwordFile != null) '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e50c2c7c801..8048c885e15 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -309,7 +309,7 @@ in sanoid = handleTest ./sanoid.nix {}; sddm = handleTest ./sddm.nix {}; service-runner = handleTest ./service-runner.nix {}; - shadowsocks = handleTest ./shadowsocks.nix {}; + shadowsocks = handleTest ./shadowsocks {}; shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix {}; shiori = handleTest ./shiori.nix {}; signal-desktop = handleTest ./signal-desktop.nix {}; diff --git a/nixos/tests/shadowsocks.nix b/nixos/tests/shadowsocks/common.nix similarity index 82% rename from nixos/tests/shadowsocks.nix rename to nixos/tests/shadowsocks/common.nix index 6cb288f7611..8cbbc3f2068 100644 --- a/nixos/tests/shadowsocks.nix +++ b/nixos/tests/shadowsocks/common.nix @@ -1,5 +1,10 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: { - name = "shadowsocks"; +{ name +, plugin ? null +, pluginOpts ? "" +}: + +import ../make-test-python.nix ({ pkgs, lib, ... }: { + inherit name; meta = { maintainers = with lib.maintainers; [ hmenke ]; }; @@ -22,8 +27,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { port = 8488; fastOpen = false; mode = "tcp_and_udp"; - plugin = "${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin"; - pluginOpts = "server;host=nixos.org"; + } // lib.optionalAttrs (plugin != null) { + inherit plugin; + pluginOpts = "server;${pluginOpts}"; }; services.nginx = { enable = true; @@ -42,10 +48,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { description = "connect to shadowsocks"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ - shadowsocks-libev - shadowsocks-v2ray-plugin - ]; + path = with pkgs; [ shadowsocks-libev ]; script = '' exec ss-local \ -s 192.168.0.1 \ @@ -54,8 +57,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { -k 'pa$$w0rd' \ -m chacha20-ietf-poly1305 \ -a nobody \ - --plugin "${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin" \ - --plugin-opts "host=nixos.org" + ${lib.optionalString (plugin != null) '' + --plugin "${plugin}" --plugin-opts "${pluginOpts}" + ''} ''; }; }; diff --git a/nixos/tests/shadowsocks/default.nix b/nixos/tests/shadowsocks/default.nix new file mode 100644 index 00000000000..37a8c3c9d0d --- /dev/null +++ b/nixos/tests/shadowsocks/default.nix @@ -0,0 +1,16 @@ +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../../.. { inherit system config; } +}: + +{ + "basic" = import ./common.nix { + name = "basic"; + }; + + "v2ray-plugin" = import ./common.nix { + name = "v2ray-plugin"; + plugin = "${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin"; + pluginOpts = "host=nixos.org"; + }; +} From de248c05cf69407cc48b442e1cdd9b1366123b2b Mon Sep 17 00:00:00 2001 From: Sage Raflik Date: Mon, 14 Sep 2020 16:13:38 -0500 Subject: [PATCH 154/463] akira: 2020-05-01 -> 0.0.13 --- pkgs/applications/graphics/akira/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix index 262c7b11f98..4038d653a3d 100644 --- a/pkgs/applications/graphics/akira/default.nix +++ b/pkgs/applications/graphics/akira/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "akira"; - version = "2020-05-01"; + version = "0.0.13"; src = fetchFromGitHub { owner = "akiraux"; repo = "Akira"; - rev = "87c495fa0a686b1e9b84aff7d9c0a9553da2c466"; - sha256 = "0ikz6dyx0z2wqskas628hbrbhx3z5gy7i4acrvspfhhg6rk88aqd"; + rev = "v${version}"; + sha256 = "1i20q78jagy8xky68nmd0n7mqvh88r98kp626rnlgyzvlc3c22cm"; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "Native Linux Design application built in Vala and GTK"; homepage = "https://github.com/akiraux/Akira"; license = licenses.gpl3; - maintainers = with maintainers; [ filalex77 ] ++ pantheon.maintainers; + maintainers = with maintainers; [ filalex77 neonfuz ] ++ pantheon.maintainers; platforms = platforms.linux; }; } From 7447bdc5232e86dda606cf17de4f2477eebe514e Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 15 Sep 2020 01:08:00 +0200 Subject: [PATCH 155/463] nixos/plasma5: Fix eval of colord-kde/wacomtablet Regression introduced by 053b05d14d2fa31750d0aafb8fa92cff512750e8. The commit in question essentially removed the "with pkgs;" from the scope around the various packages added to environment.systemPackages. Since services.colord.enable and services.xserver.wacom.enable are false by default, the change above didn't directly result in an evaluation error. Tested evaluation before and after this change via: for cfg in hardware.bluetooth.enable \ networking.networkmanager.enable \ hardware.pulseaudio.enable \ powerManagement.enable \ services.colord.enable \ services.samba.enable \ services.xserver.wacom.enable; do nix-instantiate --eval nixos --arg configuration '{ services.xserver.desktopManager.plasma5.enable = true; '"$cfg"' = true; }' -A config.environment.systemPackages > /dev/null done Signed-off-by: aszlig Cc: @ttuegel --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 205410852f6..149f6cbb762 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -309,9 +309,9 @@ in ++ lib.optional config.networking.networkmanager.enable plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma-pa ++ lib.optional config.powerManagement.enable powerdevil - ++ lib.optional config.services.colord.enable colord-kde + ++ lib.optional config.services.colord.enable pkgs.colord-kde ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ] - ++ lib.optional config.services.xserver.wacom.enable wacomtablet; + ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet; environment.pathsToLink = [ # FIXME: modules should link subdirs of `/share` rather than relying on this From 083041a6f8044dea486431c216cbfe5a45fdd71c Mon Sep 17 00:00:00 2001 From: StephenWithPH Date: Mon, 14 Sep 2020 16:19:21 -0700 Subject: [PATCH 156/463] maintainers: add StephenWithPH --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1ed9f5aea2e..3c56c36d90c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7995,6 +7995,12 @@ githubId = 231788; name = "Stephen Weinberg"; }; + stephenwithph = { + name = "StephenWithPH"; + email = "StephenWithPH@users.noreply.github.com"; + github = "StephenWithPH"; + githubId = 2990492; + }; sterfield = { email = "sterfield@gmail.com"; github = "sterfield"; From fb779db80bd77046707c0567ead312a57063a9ba Mon Sep 17 00:00:00 2001 From: StephenWithPH Date: Mon, 14 Sep 2020 16:22:07 -0700 Subject: [PATCH 157/463] go-swag: init at 1.6.7 --- pkgs/development/tools/go-swag/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/go-swag/default.nix diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix new file mode 100644 index 00000000000..0a0eb41d613 --- /dev/null +++ b/pkgs/development/tools/go-swag/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "go-swag"; + version = "1.6.7"; + + src = fetchFromGitHub { + owner = "swaggo"; + repo = "swag"; + rev = "df209afeed2334a97c83aff34ea7abcad85c31f6"; + sha256 = "17pmcfkcmgjvs4drs0fyhp2m39gw83s0ck3rdzdkgdhrbhva9ksx"; + }; + + vendorSha256 = "1i2n2sz2hc89nf2fqfq3swldz0xwrnms4j9q0lrss5gm3bk49q7f"; + + subPackages = [ "cmd/swag" ]; + + meta = with lib; { + description = "Automatically generate RESTful API documentation with Swagger 2.0 for Go"; + homepage = "https://github.com/swaggo/swag"; + license = licenses.mit; + maintainers = with maintainers; [ stephenwithph ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b91dfd4553..fcfc60c7402 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27364,6 +27364,8 @@ in sqsh = callPackage ../development/tools/sqsh { }; + go-swag = callPackage ../development/tools/go-swag { }; + go-swagger = callPackage ../development/tools/go-swagger { }; jx = callPackage ../applications/networking/cluster/jx {}; From 0d7a2f67dfc7a609bbc6a94ed6a02317016160df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 14 Sep 2020 17:53:10 -0300 Subject: [PATCH 158/463] nixos/nm-applet: starts the applet with Appindicator support As of version 1.18.0 Appindicator support is available in the official network-manager-applet package. To use nm-applet in an Appindicator environment the applet should be started with the following command: $ nm-applet --indicator Without this option it does appear in the Enlightenment panel systray, for instance. --- nixos/modules/programs/nm-applet.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix index 273a6dec59a..5bcee30125b 100644 --- a/nixos/modules/programs/nm-applet.nix +++ b/nixos/modules/programs/nm-applet.nix @@ -5,14 +5,25 @@ maintainers = lib.teams.freedesktop.members; }; - options.programs.nm-applet.enable = lib.mkEnableOption "nm-applet"; + options.programs.nm-applet = { + enable = lib.mkEnableOption "nm-applet"; + + indicator = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to use indicator instead of status icon. + It is needed for Appindicator environments, like Enlightenment. + ''; + }; + }; config = lib.mkIf config.programs.nm-applet.enable { systemd.user.services.nm-applet = { description = "Network manager applet"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; - serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet"; + serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}"; }; services.dbus.packages = [ pkgs.gcr ]; From 0c6e1ddf61712f463fa4077339670cd940188fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 14 Sep 2020 21:27:00 -0300 Subject: [PATCH 159/463] nixos/pantheon: disable nm-applet indicator --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 6dabca6bf09..e67e216f90d 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -240,6 +240,8 @@ in # Otherwise you can't store NetworkManager Secrets with # "Store the password only for this user" programs.nm-applet.enable = true; + # Pantheon has its own network indicator + programs.nm-applet.indicator = false; # Shell integration for VTE terminals programs.bash.vteIntegration = mkDefault true; From 88363a870400d0978266469405f818b77a86df6f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 15 Sep 2020 02:33:30 +0200 Subject: [PATCH 160/463] matomo: 3.14.0 -> 3.14.1 --- pkgs/servers/web-apps/matomo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 22b1bf200ed..eca43dc6f13 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "3.14.0"; - sha256 = "05ycc4k4w01212pklzgxrbwpzp572jmj8i9ija6s7c01071yjjzv"; + version = "3.14.1"; + sha256 = "0gp6v797118z703nh0p77zvsizvdg0c2jkn26996d4sqw5pa78v3"; }; matomo-beta = { - version = "3.14.0"; + version = "3.14.1"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "05ycc4k4w01212pklzgxrbwpzp572jmj8i9ija6s7c01071yjjzv"; + sha256 = "0gp6v797118z703nh0p77zvsizvdg0c2jkn26996d4sqw5pa78v3"; }; }; common = pname: { version, sha256, beta ? null }: From 47ba35d6d4c201ec9badfb3b1f536b07bec377eb Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Mon, 14 Sep 2020 21:48:49 -0600 Subject: [PATCH 161/463] unnethack: 5.2.0 -> 5.3.2 (#97595) Co-authored-by: Jon --- pkgs/games/unnethack/default.nix | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index 1ac87c1d41b..2dde86297e8 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchgit, utillinux, ncurses, flex, bison }: +{ stdenv, fetchFromGitHub, fetchpatch, utillinux, ncurses, flex, bison }: stdenv.mkDerivation rec { pname = "unnethack"; - version = "5.2.0"; + version = "5.3.2"; - src = fetchgit { - url = "https://github.com/UnNetHack/UnNetHack"; - rev = "refs/tags/${version}"; - sha256 = "088gd2c7v95f2pm9ky38i28sz73mnsksr2p2hhhflkchxncd21f1"; + src = fetchFromGitHub { + name = "UnNetHack"; + owner = "UnNetHack"; + repo = "UnNetHack"; + rev = version; + sha256 = "1rg0mqyplgn3dfh3wz09a600qxk7aidqw4d84kyiincljvhyb7ps"; }; buildInputs = [ ncurses ]; @@ -22,6 +24,14 @@ stdenv.mkDerivation rec { ]; makeFlags = [ "GAMEPERM=744" ]; + patches = [ + # fix regression with bison, merged in master + (fetchpatch { + name = "fix-bison.patch"; + url = "https://github.com/UnNetHack/UnNetHack/commit/04f0a3a850a94eb8837ddcef31303968240d1c31.patch"; + sha256 = "1zblbwqqz9nx16k6n31wi2hdvz775lvzmkjblmrx18nbm4ylj0n9"; + }) + ]; enableParallelBuilding = true; @@ -54,5 +64,5 @@ stdenv.mkDerivation rec { license = "nethack"; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; - }; + }; } From 9511b32979670dc391c33d8c2971d40aa8f6584a Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sun, 23 Aug 2020 10:56:40 -0700 Subject: [PATCH 162/463] vscode-extensions.ms-python.python: 2020.7.96456 -> 2020.8.103604 --- pkgs/misc/vscode-extensions/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 7dea6794521..f5dbadd689d 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -41,13 +41,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2020.7.96456"; + version = "2020.8.103604"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "0bk2wnbjcraxilzxszl00r799xf3apkfyzpy88xxv87j7787dsm8"; + sha256 = "1gncnhmwjipaf7hzpimwzqdzyqyy4sznkq4qr2mn1ndjl6s1hh58"; }; buildInputs = [ From 0617d9cfef5d153b0f6b3e6593118526b6466606 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Mon, 14 Sep 2020 17:44:08 -0400 Subject: [PATCH 163/463] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index cb1d9ec31aa..7198d4becad 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -393,8 +393,8 @@ let src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "7f97e92347155d14033ac18a4f40777dde87ac74"; - sha256 = "1p4458kbl52l4l07ps2cqljynw0bldzk0inpi5i22wsv55s59hrg"; + rev = "29ae0c4c07d735e27b780b48e7a1f12a8bcb1aa4"; + sha256 = "012ixvjs6cj7f1s9l26fkmmvzlv6wxy9awi2rgs71bwqgflxxksk"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; From 89c781cc50510ed28fdc883d247a6a73ea02e1ad Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Mon, 14 Sep 2020 17:44:40 -0400 Subject: [PATCH 164/463] vimPlugins.vim-ocaml: init at 2020-08-20 --- 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 7198d4becad..2b340c0f426 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5629,6 +5629,18 @@ let meta.homepage = "https://github.com/tpope/vim-obsession/"; }; + vim-ocaml = buildVimPluginFrom2Nix { + pname = "vim-ocaml"; + version = "2020-08-20"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "vim-ocaml"; + rev = "a3b6c91b8cfed991ff469363a6c081df26a18f6c"; + sha256 = "15lk6a40rl37iswa8yhx5ns0k83n4wyi6afy62107x9wha8hagax"; + }; + meta.homepage = "https://github.com/ocaml/vim-ocaml/"; + }; + vim-one = buildVimPluginFrom2Nix { pname = "vim-one"; version = "2020-08-09"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 97f391ae556..a384f3b6580 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -369,6 +369,7 @@ nvim-lua/completion-nvim nvim-lua/diagnostic-nvim nvim-treesitter/completion-treesitter nvim-treesitter/nvim-treesitter +ocaml/vim-ocaml octol/vim-cpp-enhanced-highlight Olical/conjure OrangeT/vim-csharp From be33b546725f2cac82251870b452091ab6c89831 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 10 Sep 2020 10:27:21 +0200 Subject: [PATCH 165/463] maintainers/build: skip packages that don't evaluate --- maintainers/scripts/build.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/build.nix b/maintainers/scripts/build.nix index 9b2bf00c803..bc4355d0aa8 100644 --- a/maintainers/scripts/build.nix +++ b/maintainers/scripts/build.nix @@ -13,8 +13,12 @@ let let result = builtins.tryEval ( - if pkgs.lib.isDerivation pkg && cond name pkg - then [ (return name pkg) ] + if pkgs.lib.isDerivation pkg && cond name pkg then + # Skip packages whose closure fails on evaluation. + # This happens for pkgs like `python27Packages.djangoql` + # that have disabled Python pkgs as dependencies. + builtins.seq pkg.outPath + [ (return name pkg) ] else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false then packagesWith cond return pkg else [ ] From c1d2464fdb92f5648a422defcb02071136c853dc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 14 Sep 2020 23:19:21 -0500 Subject: [PATCH 166/463] shadowsocks-libev: 3.3.4 -> 3.3.5 https://github.com/shadowsocks/shadowsocks-libev/releases/tag/v3.3.5 --- pkgs/tools/networking/shadowsocks-libev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 7ad0f1e862d..22b291ec44e 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "shadowsocks-libev"; - version = "3.3.4"; + version = "3.3.5"; # Git tag includes CMake build files which are much more convenient. src = fetchFromGitHub { owner = "shadowsocks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "05f1vvd0r0wanbb61rf4p6y991jp7625l0i223v23r2ji43y3i5a"; + sha256 = "1iqpmhxk354db1x08axg6wrdy9p9a4mz0h9351i3mf3pqd1v6fdw"; fetchSubmodules = true; }; From b0b730de19405c762b76456caad14886e9d71457 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 14 Sep 2020 23:32:01 -0500 Subject: [PATCH 167/463] sops: 3.6.0 -> 3.6.1 https://github.com/mozilla/sops/releases/tag/v3.6.1 --- pkgs/tools/security/sops/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 8ec324b3542..7557fa6a6d3 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sops"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "mozilla"; repo = pname; - sha256 = "01skk6vdfki4a88z0snl1pby09im406qhnsfa0d2l8gp6nz8pq6j"; + sha256 = "0xl53rs8jzq5yz4wi0vzsr6ajsaf2x2n1h3x7krk02a9839y6f18"; }; - vendorSha256 = "0475y95qma5m346ng898n80xv2rxzndx89c9ygjcvjs513yzcba2"; + vendorSha256 = "1cpm06dyc6lb3a9apfggyi16alb2yijvyan1gbrl8r9fwlqvdpjk"; doCheck = false; From ce065c6251d8fc4855c17f94684a593e8892c556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Mon, 14 Sep 2020 21:14:56 +0200 Subject: [PATCH 168/463] cli-visualizer: Fix build --- pkgs/applications/misc/cli-visualizer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 112341dcd4f..57b3f906cab 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }: +{ stdenv, fetchFromGitHub, cmake, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { version = "1.8"; @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { sed '1i#include ' -i src/Transformer/SpectrumCircleTransformer.cpp ''; + nativeBuildInputs = [ cmake ]; + buildInputs = [ fftw ncurses5 libpulseaudio makeWrapper ]; buildFlags = [ "ENABLE_PULSE=1" ]; - installPhase = '' - mkdir -p $out/bin - cp build/vis $out/bin/vis + postInstall = '' # See https://github.com/dpayne/cli-visualizer/issues/62#issuecomment-330738075 wrapProgram $out/bin/vis --set TERM rxvt-256color ''; From 715790e27f767a1b8b3c4581095716e92f426758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 15 Sep 2020 08:19:50 +0200 Subject: [PATCH 169/463] _1password-gui: 0.8.5-1 -> 0.8.6-2 Changelog: https://discussions.agilebits.com/discussion/115787/1password-development-preview-0-8-6 --- pkgs/tools/security/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index d03f2c551b9..17064cf913e 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "1password"; - version = "0.8.5-1"; + version = "0.8.6-2"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "1jardsyxkf7qfhz8jwzwick5r9jf9yjwsdqvmc2rrnrflzzpscm9"; + sha256 = "1m7sql2y2kj94gr607n48m0h4b3rijyzvxrssyizv75spmxr4d5r"; }; nativeBuildInputs = [ makeWrapper ]; From c15bcdd91f1272968ec6903fe49905ade8dd93ee Mon Sep 17 00:00:00 2001 From: Milan Date: Tue, 15 Sep 2020 08:25:19 +0200 Subject: [PATCH 170/463] percona-server: 5.6.43-84.3 -> 5.6.49-89.0 (#97923) Fixes build with recent versions of glibc. ZHF: #97479 --- pkgs/servers/sql/percona/5.6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index 43c1de7ea84..46913525336 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "percona-server"; - version = "5.6.43-84.3"; + version = "5.6.49-89.0"; src = fetchurl { url = "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${version}/source/tarball/percona-server-${version}.tar.gz"; - sha256 = "1cc0lfmpq4pw90bcsszsygw06vd4j4bh3ph5x0yn3z7wddvmjlpw"; + sha256 = "09qqk02iny7jvngyk6k2j0kk2sspc6gw8sm3i6nn97njbkihi697"; }; buildInputs = [ cmake bison ncurses openssl zlib libaio perl ]; From 02a7dde905f1ee7314c99df22c970b2767ad122f Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 15 Sep 2020 09:41:37 +0300 Subject: [PATCH 171/463] mbtileserver: init at 0.6.1 --- pkgs/servers/mbtileserver/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/servers/mbtileserver/default.nix diff --git a/pkgs/servers/mbtileserver/default.nix b/pkgs/servers/mbtileserver/default.nix new file mode 100644 index 00000000000..56309f6f1bb --- /dev/null +++ b/pkgs/servers/mbtileserver/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "mbtileserver"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "consbio"; + repo = pname; + rev = "v${version}"; + sha256 = "0b0982rn5jsv8zxfkrcmhys764nim6136hafc8ccj0mwdyvwafxd"; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "A simple Go-based server for map tiles stored in mbtiles format"; + homepage = "https://github.com/consbio/mbtileserver"; + license = licenses.isc; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c9179f5c5d..94d80eabd3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16466,6 +16466,8 @@ in mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; + mbtileserver = callPackage ../servers/mbtileserver { }; + mediatomb = callPackage ../servers/mediatomb { }; memcached = callPackage ../servers/memcached {}; From 4a56effdfbe2ec908bc4c48c6f0e12abe29f2201 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 15 Sep 2020 10:03:50 +0200 Subject: [PATCH 172/463] =?UTF-8?q?redo-sh:=202.0.3=20=E2=86=92=204.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Additional changes: * Change platforms from linux to unix. redo-sh should run as long as stdenv.shell is a bourne shell. * Explicitly pass coreutils as a dependency so it can be overriden to use, say busybox. --- .../tools/build-managers/redo-sh/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix index d8c6cdf1888..315b74b820e 100644 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, makeWrapper }: +{ stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation { - version = "2.0.3"; + version = "4.0.3"; pname = "redo-sh"; src = fetchurl { url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz"; - sha256 = "1ycx3hik7vnlbwxacn1dzr48fwsn2ials0sg6k9l3gcyrha5wf1n"; + sha256 = "1n84ld4fihqa7a6kn3f177dknz89qcvissfwz1m21bwdq950avia"; }; buildInputs = [ makeWrapper ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation { mv man "$out/share" mv bin "$out" for p in $out/bin/*; do - wrapProgram "$p" --suffix PATH : "$out/bin" + wrapProgram "$p" --prefix PATH : "$out/bin:${coreutils}/bin" done ''; @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "Redo implementation in Bourne Shell"; homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html"; license = licenses.agpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ sternenseemann ]; }; } From a839779e0a4f57d55e123c0729844d4592731150 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 15 Sep 2020 12:08:37 +0300 Subject: [PATCH 173/463] netdata: 1.24.0 -> 1.25.0 Also update homepage URL to point to the new domain --- pkgs/tools/system/netdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 752721689ba..f1bb1f9d62d 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -15,14 +15,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.24.0"; + version = "1.25.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "19zr2wlsc8rbw6a7vjy4ivgq71l34lh70pcgwa0k5sp1vryj7r3d"; + sha256 = "0wsgs0slqmj9q5prwlx7d4692lc4c42g0sv35r33vlxnfdwimfh5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { meta = { description = "Real-time performance monitoring tool"; - homepage = "https://my-netdata.io/"; + homepage = "https://www.netdata.cloud/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; From c3be76580f0d959506d4369ae9df670829f10fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Mon, 27 Apr 2020 10:51:23 +0200 Subject: [PATCH 174/463] nixos/xserver: clean up the useXFS option It had confusing semantics, being somewhere between a boolean option and a FontPath specification. Introduce fontPath to replace it and mark the old option as removed. --- nixos/modules/services/x11/xserver.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 400173745d3..0552095ba95 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -113,14 +113,14 @@ let in concatMapStrings (getAttr "value") monitors; configFile = pkgs.runCommand "xserver.conf" - { xfs = optionalString (cfg.useXFS != false) - ''FontPath "${toString cfg.useXFS}"''; + { fontpath = optionalString (cfg.fontPath != null) + ''FontPath "${cfg.fontPath}"''; inherit (cfg) config; preferLocalBuild = true; } '' echo 'Section "Files"' >> $out - echo $xfs >> $out + echo $fontpath >> $out for i in ${toString fontsForXServer}; do if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then @@ -151,6 +151,8 @@ in ./desktop-managers/default.nix (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ] "See the 16.09 release notes for more information.") + (mkRemovedOptionModule ["services" "xserver" "useXFS" ] + "Use services.xserver.fontPath instead of useXFS") ]; @@ -481,11 +483,15 @@ in description = "Default colour depth."; }; - useXFS = mkOption { - # FIXME: what's the type of this option? - default = false; + fontPath = mkOption { + type = types.nullOr types.str; + default = null; example = "unix/:7100"; - description = "Determines how to connect to the X Font Server."; + description = '' + Set the X server FontPath. Defaults to null, which + means the compiled in defaults will be used. See + man xorg.conf for details. + ''; }; tty = mkOption { From b632ca6963d5b794842319fe2f0a5c2cf94b9f3d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 15 Sep 2020 14:59:38 +0200 Subject: [PATCH 175/463] citrix_workspace: add 20.09.0 ChangeLog: https://docs.citrix.com/en-us/citrix-workspace-app-for-linux/whats-new.html#whats-new-in-2009 Also removed 19.12.0 which will be out of maintenance in April 2021 which is still within the lifetime of 20.09. --- .../remote/citrix-workspace/generic.nix | 4 +++ .../remote/citrix-workspace/sources.nix | 26 +++++++++---------- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index c19cb585952..a2ad8b8129a 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -149,6 +149,10 @@ stdenv.mkDerivation rec { sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./linuxx64/hinst ${stdenv.shell} linuxx64/hinst CDROM "$(pwd)" + if [ -f "$ICAInstDir/util/setlog" ]; then + chmod +x "$ICAInstDir/util/setlog" + ln -sf "$ICAInstDir/util/setlog" "$out/bin/citrix-setlog" + fi ${mkWrappers wrapLink toWrap} ${mkWrappers wrap [ "PrimaryAuthManager" "ServiceRecord" "AuthManagerDaemon" "util/ctxwebhelper" ]} diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index cc0d8637b90..abdd54f4af6 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -13,17 +13,6 @@ let # # The latest versions can be found at https://www.citrix.com/de-de/downloads/workspace-app/linux/ supportedVersions = lib.mapAttrs mkVersionInfo { - "19.12.0" = { - major = "19"; - minor = "12"; - patch = "0"; - x64hash = "1si5mkxbgb8m99bkvgc3l80idjfdp0kby6pv47s07nn43dbr1j7a"; - x86hash = "07rfp90ksnvr8zv7ix7f0z6a59n48s7bd4kqbzilfwxgs4ddqmcy"; - x64suffix = "19"; - x86suffix = "19"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1912.html"; - }; - "20.04.0" = { major = "20"; minor = "04"; @@ -32,7 +21,7 @@ let x86hash = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F"; x64suffix = "21"; x86suffix = "21"; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2004.html"; }; "20.06.0" = { @@ -43,6 +32,17 @@ let x86hash = "1di29hrimbw3myjnf2nn26a14klidhdwvjqla6yxhwd3s6lil194"; x64suffix = "15"; x86suffix = "15"; + homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2006.html"; + }; + + "20.09.0" = { + major = "20"; + minor = "9"; + patch = "0"; + x64hash = "15gjq1vk1y76c39p72xnam9h9rnr0632i4n11l6xbjnfnad8d4pr"; + x86hash = "1b4gdmnnpa61ydiv2fnmap8cnfhskrq6swcs6i1nqrp5zvvkqrv4"; + x64suffix = "15"; + x86suffix = "15"; homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; @@ -52,7 +52,7 @@ let # # The lifespans of Citrix products can be found here: # https://www.citrix.com/support/product-lifecycle/milestones/receiver.html - unsupportedVersions = [ "19.6.0" "19.8.0" "19.10.0" ]; + unsupportedVersions = [ "19.6.0" "19.8.0" "19.10.0" "19.12.0" ]; in { inherit supportedVersions unsupportedVersions; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc4e40c779d..509f262ec7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2700,7 +2700,7 @@ in circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_20_06_0; + citrix_workspace = citrix_workspace_20_09_0; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_19_6_0 @@ -2709,6 +2709,7 @@ in citrix_workspace_19_12_0 citrix_workspace_20_04_0 citrix_workspace_20_06_0 + citrix_workspace_20_09_0 ; citra = libsForQt5.callPackage ../misc/emulators/citra { }; From 5b19fa94acc26d1e27bede1855a73298c07d116c Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Tue, 15 Sep 2020 15:52:48 +0200 Subject: [PATCH 176/463] jitsi-meet-electron: 2.2.0 -> 2.3.1 --- .../instant-messengers/jitsi-meet-electron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 66194d9d246..4797bf5ffcc 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "0gqyqjj69x1gxwj4zhwazddnj5xzy598xqz7vwkpdm1ldzna2iyj"; + sha256 = "0af87lvqw3sagi2cayripm62q17nfd841xz0ghvbixzfnqkvgf7x"; name = "${pname}-${version}.AppImage"; }; From fb1ff72f74049e545c3826ac381b78654059780c Mon Sep 17 00:00:00 2001 From: Souvik Sen Date: Thu, 9 Apr 2020 13:18:10 -0400 Subject: [PATCH 177/463] perlPackages.PDL: init at 2.022 --- pkgs/top-level/perl-packages.nix | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 47d87e9533e..7de65455530 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15646,6 +15646,51 @@ let }; }; + PDL = buildPerlPackage rec { + pname = "PDL"; + version = "2.022"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETJ/${pname}-${version}.tar.gz"; + sha256 = "12isj05ni44bgf76lc0fs5v88ai8gn5dqrppsbj7vsxblcya7113"; + }; + patchPhase = '' + substituteInPlace perldl.conf \ + --replace 'POSIX_THREADS_LIBS => undef' 'POSIX_THREADS_LIBS => "-L${pkgs.glibc.dev}/lib"' \ + --replace 'POSIX_THREADS_INC => undef' 'POSIX_THREADS_INC => "-I${pkgs.glibc.dev}/include"' \ + --replace 'WITH_MINUIT => undef' 'WITH_MINUIT => 0' \ + --replace 'WITH_SLATEC => undef' 'WITH_SLATEC => 0' \ + --replace 'WITH_HDF => undef' 'WITH_HDF => 0' \ + --replace 'WITH_GD => undef' 'WITH_GD => 0' \ + --replace 'WITH_PROJ => undef' 'WITH_PROJ => 0' + ''; + + nativeBuildInputs = with pkgs; [ autoPatchelfHook libGL.dev glibc.dev mesa_glu.dev ]; + + buildInputs = [ DevelChecklib TestDeep TestException TestWarn ] ++ + (with pkgs; [ gsl freeglut xorg.libXmu xorg.libXi ]); + + propagatedBuildInputs = [ + AstroFITSHeader + ConvertUU + ExtUtilsF77 + FileMap + Inline + InlineC + ListMoreUtils + ModuleCompile + OpenGL + PodParser + TermReadKey + ]; + + meta = { + homepage = "http://pdl.perl.org/"; + description = "Perl Data Language"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; + }; + }; + Pegex = buildPerlPackage { pname = "Pegex"; version = "0.75"; From 5684d011e44e8ddf09193bc441ab43b9d4c4a820 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Tue, 15 Sep 2020 10:17:23 -0400 Subject: [PATCH 178/463] postman: 7.31.1 -> 7.32.0 --- pkgs/development/web/postman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 3e1b1cced1a..1495b811d09 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.31.1"; + version = "7.32.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "14df24gj0mljblzc78pggyajr7004mg35gary5cz2c26vcklx4pw"; + sha256 = "0dn9awzhaafsdsiwwj6870zyqw4spsmc08zgcc5dhnpcnjcyldf3"; name = "${pname}.tar.gz"; }; From 911c641ace7b9a8a885e46ccb8b31fe7fba75a34 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Sep 2020 10:47:51 -0400 Subject: [PATCH 179/463] oh-my-zsh: 2020-09-12 -> 2020-09-14 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f1de3ee8214..97deab47cfb 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-09-12"; + version = "2020-09-14"; pname = "oh-my-zsh"; - rev = "8a93c89bda7e244ed5d32d5b01bd5f72ab695fbf"; + rev = "2bc1da7f377e78cdfa74190ffe5baf6c814d0fce"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0azm4xp5y6w41jbl4342rmqc5hdrg0rz7pmwlilps44k8xdvml7p"; + sha256 = "1xr5nmd3q8yapc0yzx7cv9qh8gvgvn2rf2z3fhwxrap3z77jp5fv"; }; installPhase = '' From e469ddc9794075e4f00135e731d89c6096cf9e4d Mon Sep 17 00:00:00 2001 From: lb5tr Date: Tue, 15 Sep 2020 08:24:50 -0700 Subject: [PATCH 180/463] vcv-rack: fix broken pfft reference --- pkgs/applications/audio/vcv-rack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 2aa09ec0be8..18d8f7415b5 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -10,7 +10,7 @@ let pfft-source = fetchFromBitbucket { owner = "jpommier"; repo = "pffft"; - rev = "29e4f76ac53bef048938754f32231d7836401f79"; + rev = "74d7261be17cf659d5930d4830609406bd7553e3"; sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1"; }; nanovg-source = fetchFromGitHub { From 2b55bb43382010a57715f1bfda9a16ddebc996be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Tue, 15 Sep 2020 15:10:54 +0200 Subject: [PATCH 181/463] python27.pkgs.joblib: Disable package The version 0.16.0 doesn't support Python older than 3.6. --- pkgs/development/python-modules/joblib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index de60f142670..fa4fc450f1a 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -1,4 +1,5 @@ { lib +, pythonOlder , buildPythonPackage , fetchPypi , stdenv @@ -13,6 +14,7 @@ buildPythonPackage rec { pname = "joblib"; version = "0.16.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; From 43d588b0afd4223f0d6b724d29d59ff81587eda2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Sep 2020 11:01:19 -0700 Subject: [PATCH 182/463] python3Packages.ihatemoney: disable sandbox unfriendly tests, fix passthru --- .../python-modules/ihatemoney/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index bcca68600e9..3e36b4dd8e2 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -30,6 +30,7 @@ , wtforms , psycopg2 # optional, for postgresql support , flask_testing +, pytestCheckHook }: # ihatemoney is not really a library. It will only ever be imported @@ -113,12 +114,19 @@ buildPythonPackage rec { ]; checkInputs = [ - flask_testing + flask_testing pytestCheckHook + ]; + + pytestFlagsArray = [ "--pyargs ihatemoney.tests.tests" ]; + disabledTests = [ + "test_notifications" # requires running service. + "test_invite" # requires running service. ]; passthru.tests = { - inherit (nixosTests) ihatemoney; + inherit (nixosTests.ihatemoney) ihatemoney-postgresql ihatemoney-sqlite; }; + meta = with lib; { homepage = "https://ihatemoney.org"; description = "A simple shared budget manager web application"; From 2003495474b512e377eafe379ed02d8c39d495cb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Sep 2020 10:38:22 -0700 Subject: [PATCH 183/463] python3Packages.graphite_beacon: fix deps, add nixos test --- .../python-modules/graphite_beacon/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphite_beacon/default.nix b/pkgs/development/python-modules/graphite_beacon/default.nix index 159b09d10b9..cc070f55323 100644 --- a/pkgs/development/python-modules/graphite_beacon/default.nix +++ b/pkgs/development/python-modules/graphite_beacon/default.nix @@ -1,6 +1,8 @@ { stdenv, buildPythonPackage, fetchPypi -, tornado, pyyaml, funcparserlib +, tornado_5, pyyaml, funcparserlib +, nixosTests }: + buildPythonPackage rec { pname = "graphite_beacon"; version = "0.27.0"; @@ -10,12 +12,18 @@ buildPythonPackage rec { sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks"; }; - propagatedBuildInputs = [ tornado pyyaml funcparserlib ]; + propagatedBuildInputs = [ tornado_5 pyyaml funcparserlib ]; postPatch = '' substituteInPlace requirements.txt --replace "==" ">=" ''; + pythonImportsCheck = [ "graphite_beacon" ]; + + passthru.tests = { + nixos = nixosTests.graphite; + }; + meta = with stdenv.lib; { description = "A simple alerting application for Graphite metrics"; homepage = "https://github.com/klen/graphite-beacon"; From 07660b28bc74f2d0422731b60174cc16920a82a7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Sep 2020 11:19:26 -0700 Subject: [PATCH 184/463] streamlit: fix build --- .../science/machine-learning/streamlit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index 3856b8ec841..26b241ff0ad 100644 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonApplication, fetchPypi , altair, astor, base58, blinker, boto3, botocore, click, enum-compat - , future, pillow, protobuf, requests, toml, tornado, tzlocal, validators, watchdog + , future, pillow, protobuf, requests, toml, tornado_5, tzlocal, validators, watchdog , jinja2, setuptools }: @@ -16,7 +16,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ altair astor base58 blinker boto3 botocore click enum-compat - future pillow protobuf requests toml tornado tzlocal validators watchdog + future pillow protobuf requests toml tornado_5 tzlocal validators watchdog jinja2 setuptools ]; From dd9c0cf6929004866bf15d5221ffdb9f3036b7d4 Mon Sep 17 00:00:00 2001 From: mlvzk Date: Tue, 15 Sep 2020 20:24:34 +0200 Subject: [PATCH 185/463] maintainers: add mlvzk --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3c56c36d90c..fe659c3618f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5671,6 +5671,12 @@ githubId = 622577; name = "Michael Lieberman"; }; + mlvzk = { + name = "mlvzk"; + email = "mlvzk@users.noreply.github.com"; + github = "mlvzk"; + githubId = 44906333; + }; mmahut = { email = "marek.mahut@gmail.com"; github = "mmahut"; From 92ba610833f1d4dd01bf31a2f4f52a08c9cf6e29 Mon Sep 17 00:00:00 2001 From: mlvzk Date: Tue, 15 Sep 2020 20:25:33 +0200 Subject: [PATCH 186/463] manix: init at 0.6.2 --- pkgs/tools/nix/manix/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/nix/manix/default.nix diff --git a/pkgs/tools/nix/manix/default.nix b/pkgs/tools/nix/manix/default.nix new file mode 100644 index 00000000000..c4d1930a0fb --- /dev/null +++ b/pkgs/tools/nix/manix/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, rustPlatform, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "manix"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "mlvzk"; + repo = pname; + rev = "v${version}"; + sha256 = "0fv3sgzwjsgq2h1177r8r1cl5zrfja4ll801sd0bzj3nzmkyww7p"; + }; + + buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ]; + + cargoSha256 = "0f2q3bj1cmpbma0fjhc2lc92j4al78fhrx3yc37kmbgzaza0yan5"; + + meta = with stdenv.lib; { + description = "A Fast Documentation Searcher for Nix"; + homepage = "https://github.com/mlvzk/manix"; + license = [ licenses.mpl20 ]; + maintainers = [ maintainers.mlvzk ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3681b0df254..c2e33fafd17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5368,6 +5368,8 @@ in mandoc = callPackage ../tools/misc/mandoc { }; + manix = callPackage ../tools/nix/manix {}; + marktext = callPackage ../applications/misc/marktext { }; mawk = callPackage ../tools/text/mawk { }; From 0051c0a4a506f5b21e5923a873fbc91a107e1300 Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Mon, 14 Sep 2020 12:16:49 -0700 Subject: [PATCH 187/463] pythonPackages.bcrypt: use 3.1.x for python older than 3.6 --- .../development/python-modules/bcrypt/3_1.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/bcrypt/3_1.nix diff --git a/pkgs/development/python-modules/bcrypt/3_1.nix b/pkgs/development/python-modules/bcrypt/3_1.nix new file mode 100644 index 00000000000..c70161cf28b --- /dev/null +++ b/pkgs/development/python-modules/bcrypt/3_1.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi +, isPyPy, cffi, pytest, six }: + +buildPythonPackage rec { + version = "3.1.7"; + pname = "bcrypt"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ six ] ++ lib.optional (!isPyPy) cffi; + + meta = with lib; { + description = "Modern password hashing for your software and your servers"; + homepage = "https://github.com/pyca/bcrypt/"; + license = licenses.asl20; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b837acff878..593ac2c88d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -778,7 +778,10 @@ in { bcdoc = callPackage ../development/python-modules/bcdoc { }; - bcrypt = callPackage ../development/python-modules/bcrypt { }; + bcrypt = if pythonOlder "3.6" then + callPackage ../development/python-modules/bcrypt/3_1.nix { } + else + callPackage ../development/python-modules/bcrypt { }; beaker = callPackage ../development/python-modules/beaker { }; From 5f4b880b403928656c822552178a62a40ce6c26e Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Mon, 14 Sep 2020 23:57:40 -0700 Subject: [PATCH 188/463] python2Packages.trytond: disable for python2 --- pkgs/development/python-modules/trytond/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 834942ee00e..54eae801dfe 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonApplication , fetchPypi +, pythonOlder , mock , lxml , relatorio @@ -25,6 +26,8 @@ with stdenv.lib; buildPythonApplication rec { pname = "trytond"; version = "5.6.5"; + disabled = pythonOlder "3.5"; + src = fetchPypi { inherit pname version; sha256 = "a373d73b141d71f8e30d728dd8380955bc0f33daaa097201fa9a952e3663e6d8"; From c35b6b3b5c577a449adfa47d5fc7f828eba6b41c Mon Sep 17 00:00:00 2001 From: LeUlukai Date: Tue, 15 Sep 2020 20:52:16 +0200 Subject: [PATCH 189/463] texstudio: 3.0.0 -> 3.0.1 --- pkgs/applications/editors/texstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 8f7e18a35c5..7f92c4d492c 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "1663lgl30698awa7fjplr8rjnf6capqvf8z80lzlnkfl5m9ph0jb"; + sha256 = "18ad85y4hrsvp7gs50dfg08cz40vbakb9hs8gw4cvi7r17vds5ar"; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ]; From 4d111fdf397fc01d88ebfa3374e7977f85195f3c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 15 Sep 2020 00:10:05 +0100 Subject: [PATCH 190/463] pythonPackages.sievelib: fix build by adding patch this fixes installation with newer pip versions also give a name to an existing patch --- pkgs/development/python-modules/sievelib/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/sievelib/default.nix b/pkgs/development/python-modules/sievelib/default.nix index 8204cc3b415..7fd955abd17 100644 --- a/pkgs/development/python-modules/sievelib/default.nix +++ b/pkgs/development/python-modules/sievelib/default.nix @@ -12,9 +12,15 @@ buildPythonPackage rec { patches = [ (fetchpatch { + name = "pip-10-pip-req.patch"; url = "https://github.com/tonioo/sievelib/commit/1deef0e2bf039a0e817ea6f19aaf1947dc9fafbc.patch"; sha256 = "0vaj73mcij9dism8vfaai82irh8j1b2n8gf9jl1a19d2l26jrflk"; }) + (fetchpatch { + name = "requirements-in-setup-py.patch"; + url = "https://github.com/tonioo/sievelib/commit/91f40ec226ea288e98379da01672a46dabd89fc9.patch"; + sha256 = "0hph89xn16r353rg6f05bh0cgigmwdc736bya089qc03jhssrgns"; + }) ]; buildInputs = [ setuptools_scm ]; From ca682af5eae0fddefb72981fd75480fb5525c73a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 10 Sep 2020 21:44:27 +0200 Subject: [PATCH 191/463] cod: init at unstable-2020-09-10 --- pkgs/tools/misc/cod/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/cod/default.nix diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/tools/misc/cod/default.nix new file mode 100644 index 00000000000..945f4c61f1d --- /dev/null +++ b/pkgs/tools/misc/cod/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "cod"; + version = "unstable-2020-09-10"; + + goPackagePath = "cod"; + + src = fetchFromGitHub { + owner = "dim-an"; + repo = pname; + rev = "ae68da08339471dd278d6df79abbfd6fe89a10fe"; + sha256 = "1l3gn9v8dcy72f5xq9hwbkvkis0vp4dp8qyinsrii3acmhksg9v6"; + }; + + vendorSha256 = "1arllkiz1hk12hq5b2zpg3f8i9lxl66mil5sdv8gnhflmb37vbv3"; + + buildFlagsArray = [ "-ldflags=-X main.GitSha=${src.rev}" ]; + + doCheck = false; + + meta = with lib; { + description = "Tool for generating Bash/Zsh autocompletions based on `--help` output"; + homepage = src.meta.homepage; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71a8e0c8368..062ceefccfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -948,6 +948,8 @@ in cloud-custodian = python3Packages.callPackage ../tools/networking/cloud-custodian { }; + cod = callPackage ../tools/misc/cod { }; + codespell = with python3Packages; toPythonApplication codespell; coolreader = libsForQt5.callPackage ../applications/misc/coolreader {}; From ffc3f8227bbe93f47636122a8d05ddc975a3283f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 14 Sep 2020 22:10:41 +0200 Subject: [PATCH 192/463] saga: use proj 6 --- pkgs/applications/gis/saga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 716972342ed..aa418148209 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -6,7 +6,7 @@ # not native , gdal , wxGTK31-gtk3 -, proj_5 +, proj , dxflib , curl , libiodbc @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { hdf5 gdal wxGTK31-gtk3 - proj_5 + proj libharu opencv vigra From d92b2463fc1ead7cbb596f81b41324d687463ce6 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 15 Sep 2020 09:39:36 +0300 Subject: [PATCH 193/463] josm: 16812 -> 17013 --- pkgs/applications/misc/josm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index ab8448f503d..72095cee1c3 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: let pname = "josm"; - version = "16812"; + version = "17013"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1ld0c87mhifbdnlrr7a9jmgn3s5xklzbpwcl1m6j1lc18ajs1awq"; + sha256 = "0dgfiqk5bcbs03llkffm6h96zcqa19azbanac883g26f6z6j9b8j"; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; - sha256 = "0vhawcgzh06k2dfqav28n3sv1ij1ziz6bgi4k7m0diix6ia7hlar"; + sha256 = "1mzaxcswmxah0gc9cifgaazwisr5cbanf4bspv1ra8xwzj5mdss6"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; From b467630062f6dac3cebc205b8e1b42566ba218cb Mon Sep 17 00:00:00 2001 From: Ahmad Jagot Date: Tue, 15 Sep 2020 18:34:08 +0100 Subject: [PATCH 194/463] f2fs-tools: 1.13.0 -> 1.14.0 Allow use of 'compression' option on volume creation, supported at mount-time in kernels 5.6+ --- pkgs/tools/filesystems/f2fs-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index 2ab168a19a5..af30751b885 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "f2fs-tools"; - version = "1.13.0"; + version = "1.14.0"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; rev = "refs/tags/v${version}"; - sha256 = "0h6wincsvg6s232ajxblg66r5nx87v00a4w7xkbxgbl1qyny477j"; + sha256 = "06ss05n87i1c3149qb3n7j1qp2scv3g2adx0v6ljkl59ab9b5saj"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 7621c8b1fc23ed61b29bb3482a936de27b3fc9a7 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 15 Sep 2020 22:55:01 +0100 Subject: [PATCH 195/463] pforth: fix build with patch patch from upstream fixes build with gnumake>=4.3 --- pkgs/development/compilers/pforth/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/development/compilers/pforth/default.nix index c13d28c6a3b..ce228c2f1cb 100644 --- a/pkgs/development/compilers/pforth/default.nix +++ b/pkgs/development/compilers/pforth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { version = "28"; @@ -10,6 +10,14 @@ stdenv.mkDerivation { sha256 = "0k3pmcgybsnwrxy75piyb2420r8d4ij190606js32j99062glr3x"; }; + patches = [ + (fetchpatch { + name = "gnumake-4.3-fix.patch"; + url = "https://github.com/philburk/pforth/commit/457cb99f57292bc855e53abcdcb7b12d6681e847.patch"; + sha256 = "0x1bwx3pqb09ddjhmdli47lnk1ys4ny42819g17kfn8nkjs5hbx7"; + }) + ]; + makeFlags = [ "SRCDIR=." ]; makefile = "build/unix/Makefile"; From c80258af164d2b3d51f864c791ffd6c438d6f582 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Tue, 15 Sep 2020 15:41:47 -0700 Subject: [PATCH 196/463] gist: 5.1.0 -> 6.0.0 (#98053) --- pkgs/tools/text/gist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix index a4a26e139fb..d2676b37997 100644 --- a/pkgs/tools/text/gist/default.nix +++ b/pkgs/tools/text/gist/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "gist"; - version = "5.1.0"; - source.sha256 = "0s69y6hi5iq5k6317j1kjmhi3mk586j1543q8wa608grwcmbq3fw"; + version = "6.0.0"; + source.sha256 = "0qnd1jqd7b04871v4l73grcmi7c0pivm8nsfrqvwivm4n4b3c2hd"; meta = with lib; { description = "Upload code to https://gist.github.com (or github enterprise)"; From afeed1fe5800dd9eb615542213dc7a6e352fbb49 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 15 Sep 2020 18:00:00 -0500 Subject: [PATCH 197/463] nodejs-10_x: 10.22.0 -> 10.22.1 https://github.com/nodejs/node/releases/tag/v10.22.1 --- pkgs/development/web/nodejs/v10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 4cd2502f196..1fa46389204 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.22.0"; - sha256 = "1nz18fa550li10r0kzsm28c2rvvq61nq8bqdygip0rmvbi2paxg0"; + version = "10.22.1"; + sha256 = "0pr569qiabr4m7k38s7rwi3iyzrc5jmx19z2z0k7n4xfvhjlfzzl"; } From 095a32182d920919f9ca55b8e0e91066b97e617c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 15 Sep 2020 18:01:00 -0500 Subject: [PATCH 198/463] nodejs-12_x: 12.18.3 -> 12.18.4 https://github.com/nodejs/node/releases/tag/v12.18.4 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 571042b73c2..0e836226833 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.18.3"; - sha256 = "03hdds6ghlmbz8q61alqj18pdnyd6hxmbhiws4pl51wlawk805bi"; + version = "12.18.4"; + sha256 = "02gncjrrjqdwf9ydmg96yn9ldsw539q9w88cknax1djkisqkrw15"; } From deb412f54f838a3425cfdd2d42d9fce6650e99f5 Mon Sep 17 00:00:00 2001 From: David Percy Date: Tue, 15 Sep 2020 21:19:11 -0400 Subject: [PATCH 199/463] maintainers: add dpercy --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 80a88a2cd3f..16f3196b613 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2233,6 +2233,12 @@ fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; }]; }; + dpercy = { + email = "dpercy@dpercy.dev"; + github = "dpercy"; + githubId = 349909; + name = "David Percy"; + }; dpflug = { email = "david@pflug.email"; github = "dpflug"; From 16beff405dd78a96b1f61d92195d87f1d32da68c Mon Sep 17 00:00:00 2001 From: David Percy Date: Tue, 15 Sep 2020 21:19:44 -0400 Subject: [PATCH 200/463] fac-build: init at 0.5.3 --- .../tools/build-managers/fac/cargo-lock.patch | 802 ++++++++++++++++++ .../tools/build-managers/fac/default.nix | 50 ++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 854 insertions(+) create mode 100644 pkgs/development/tools/build-managers/fac/cargo-lock.patch create mode 100644 pkgs/development/tools/build-managers/fac/default.nix diff --git a/pkgs/development/tools/build-managers/fac/cargo-lock.patch b/pkgs/development/tools/build-managers/fac/cargo-lock.patch new file mode 100644 index 00000000000..86768d4611e --- /dev/null +++ b/pkgs/development/tools/build-managers/fac/cargo-lock.patch @@ -0,0 +1,802 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..4ab2c17 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,796 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "ahash" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "bigbro" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3eaac07a3e62cd31e2102ca97c7fdf20002893ba2a396d29ea4710d2415cdce5" ++dependencies = [ ++ "libc", ++ "seccomp-droundy", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "cc" ++version = "1.0.59" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "clap" ++version = "2.33.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "crude-profiler" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9389510ac716b6ace8c4b635420cf023e12c81b61e933bfef06639142f149ecd" ++dependencies = [ ++ "lazy_static 0.2.11", ++] ++ ++[[package]] ++name = "ctrlc" ++version = "3.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d0b676fa23f995faf587496dcd1c80fead847ed58d2da52ac1caca9a72790dd2" ++dependencies = [ ++ "nix", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "either" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f" ++ ++[[package]] ++name = "env_logger" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" ++dependencies = [ ++ "log", ++ "regex", ++] ++ ++[[package]] ++name = "fac" ++version = "0.5.3" ++dependencies = [ ++ "atty", ++ "bigbro", ++ "clap", ++ "crude-profiler", ++ "ctrlc", ++ "git-version", ++ "internment", ++ "lazy_static 1.4.0", ++ "libc", ++ "metrohash", ++ "notify", ++ "num_cpus", ++ "pathdiff", ++ "quickcheck", ++ "termcolor", ++ "tinyset", ++] ++ ++[[package]] ++name = "filetime" ++version = "0.2.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "redox_syscall", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "fsevent" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" ++dependencies = [ ++ "bitflags", ++ "fsevent-sys", ++] ++ ++[[package]] ++name = "fsevent-sys" ++version = "2.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++dependencies = [ ++ "bitflags", ++ "fuchsia-zircon-sys", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++ ++[[package]] ++name = "gcc" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" ++ ++[[package]] ++name = "getrandom" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "git-version" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94918e83f1e01dedc2e361d00ce9487b14c58c7f40bab148026fa39d42cb41e2" ++dependencies = [ ++ "git-version-macro", ++ "proc-macro-hack", ++] ++ ++[[package]] ++name = "git-version-macro" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34a97a52fdee1870a34fa6e4b77570cba531b27d1838874fef4429a791a3d657" ++dependencies = [ ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" ++dependencies = [ ++ "ahash", ++ "autocfg", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "inotify" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" ++dependencies = [ ++ "bitflags", ++ "inotify-sys", ++ "libc", ++] ++ ++[[package]] ++name = "inotify-sys" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "internment" ++version = "0.3.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e5cba670f596a69e619cb796bcf609cb32c0ba4415d1e809104b8b832130d79" ++dependencies = [ ++ "hashbrown", ++ "lazy_static 1.4.0", ++ "serde", ++ "state", ++ "tinyset", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "lazycell" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" ++ ++[[package]] ++name = "libc" ++version = "0.2.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235" ++ ++[[package]] ++name = "log" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" ++ ++[[package]] ++name = "metrohash" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ba553cb19e2acbc54baa16faef215126243fe45e53357a3b2e9f4ebc7b0506c" ++ ++[[package]] ++name = "mio" ++version = "0.6.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" ++dependencies = [ ++ "cfg-if", ++ "fuchsia-zircon", ++ "fuchsia-zircon-sys", ++ "iovec", ++ "kernel32-sys", ++ "libc", ++ "log", ++ "miow", ++ "net2", ++ "slab", ++ "winapi 0.2.8", ++] ++ ++[[package]] ++name = "mio-extras" ++version = "2.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" ++dependencies = [ ++ "lazycell", ++ "log", ++ "mio", ++ "slab", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" ++dependencies = [ ++ "kernel32-sys", ++ "net2", ++ "winapi 0.2.8", ++ "ws2_32-sys", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "nix" ++version = "0.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" ++dependencies = [ ++ "bitflags", ++ "cc", ++ "cfg-if", ++ "libc", ++ "void", ++] ++ ++[[package]] ++name = "notify" ++version = "4.0.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd" ++dependencies = [ ++ "bitflags", ++ "filetime", ++ "fsevent", ++ "fsevent-sys", ++ "inotify", ++ "libc", ++ "mio", ++ "mio-extras", ++ "walkdir", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "pathdiff" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "877630b3de15c0b64cc52f659345724fbf6bdad9bd9566699fc53688f3c34a34" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" ++ ++[[package]] ++name = "proc-macro-hack" ++version = "0.5.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quickcheck" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" ++dependencies = [ ++ "env_logger", ++ "log", ++ "rand", ++ "rand_core", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom", ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.57" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" ++ ++[[package]] ++name = "regex" ++version = "1.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local 1.0.1", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" ++ ++[[package]] ++name = "same-file" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "seccomp-droundy" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4b762ab71c6bf1a9a3e0b21e8600b73b088f2a6562e03cd77b2826821fae5f8" ++dependencies = [ ++ "libc", ++ "seccomp-droundy-sys", ++] ++ ++[[package]] ++name = "seccomp-droundy-sys" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "200976cc4ff22cd8b9c6c23681fe6aa89a12aa3637c86dd16e44c05d7c373488" ++dependencies = [ ++ "gcc", ++ "libc", ++ "pkg-config", ++] ++ ++[[package]] ++name = "serde" ++version = "1.0.115" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" ++ ++[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++ ++[[package]] ++name = "state" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7345c971d1ef21ffdbd103a75990a15eb03604fc8b8852ca8cb418ee1a099028" ++dependencies = [ ++ "thread_local 0.3.3", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "syn" ++version = "1.0.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "thread-id" ++version = "3.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" ++dependencies = [ ++ "libc", ++ "redox_syscall", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c85048c6260d17cf486ceae3282d9fb6b90be220bf5b28c400f5485ffc29f0c7" ++dependencies = [ ++ "thread-id", ++ "unreachable", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++dependencies = [ ++ "lazy_static 1.4.0", ++] ++ ++[[package]] ++name = "tinyset" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "784f540960a63144d63992caf430ed87e39d920f2c474cb8ac586ff31fb861fc" ++dependencies = [ ++ "itertools", ++ "rand", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "unreachable" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91" ++dependencies = [ ++ "void", ++] ++ ++[[package]] ++name = "vec_map" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" ++ ++[[package]] ++name = "void" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" ++ ++[[package]] ++name = "walkdir" ++version = "2.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" ++dependencies = [ ++ "same-file", ++ "winapi 0.3.9", ++ "winapi-util", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix new file mode 100644 index 00000000000..8c41eb3ac51 --- /dev/null +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -0,0 +1,50 @@ +{ stdenv, git, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "fac-build"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "droundy"; + repo = "fac"; + rev = version; + sha256 = "1gifrlb31jy8633rnhny58ccp3wlmd338129c6sh0h1a38vkmsxk"; + }; + + # workaround for missing Cargo.lock file + cargoPatches = [ ./cargo-lock.patch ]; + + cargoSha256 = "0hjfq61y1ikdcajr2k514k7fad2zxbwq7yb5nk1wx38f1524709q"; + + # fac includes a unit test called ls_files_works which assumes it's + # running in a git repo. Nix's sandbox runs cargo build outside git, + # so this test won't work. + checkFlagsArray = [ "--skip=ls_files_works" ]; + + # fac calls git at runtime, expecting it to be in the PATH, + # so we need to patch it to call git by absolute path instead. + postPatch = '' + substituteInPlace src/git.rs \ + --replace 'std::process::Command::new("git")' \ + 'std::process::Command::new("${git}/bin/git")' + ''; + + meta = with stdenv.lib; { + description = '' + A build system that uses ptrace to handle dependencies automatically + ''; + longDescription = '' + Fac is a general-purpose build system inspired by make that utilizes + ptrace to ensure that all dependences are enumerated and that all + source files are added to a (git) repo. An important feature of fac + is that it automatically handles dependencies, rather than either + complaining about them or giving an incorrect build. Currently, fac + only runs on linux systems, but on those systems it is incredibly + easy to use! + ''; + homepage = "https://physics.oregonstate.edu/~roundyd/fac"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.dpercy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91d9790fca8..e2505ade4d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27953,4 +27953,6 @@ in unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; + fac-build = callPackage ../development/tools/build-managers/fac {}; + } From 8d27394e25edcb414708746f5b43e73c74ed5d23 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 13 Sep 2020 18:03:08 +0200 Subject: [PATCH 201/463] ocamlPackages.qcheck-core: init at 0.15 --- .../development/ocaml-modules/qcheck/core.nix | 23 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/ocaml-modules/qcheck/core.nix diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix new file mode 100644 index 00000000000..fa72a211ef4 --- /dev/null +++ b/pkgs/development/ocaml-modules/qcheck/core.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, fetchFromGitHub }: + +buildDunePackage rec { + pname = "qcheck-core"; + version = "0.15"; + + minimumOCamlVersion = "4.03"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = "qcheck"; + rev = version; + sha256 = "1ywaklqm1agvxvzv7pwl8v4zlwc3ykw6l251w43f0gy9cfwqmh3j"; + }; + + meta = { + description = "Core qcheck library"; + homepage = "https://c-cube.github.io/qcheck/"; + 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 a7d9f04ee67..31b2c22532d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -886,6 +886,8 @@ let pycaml = callPackage ../development/ocaml-modules/pycaml { }; + qcheck-core = callPackage ../development/ocaml-modules/qcheck/core.nix { }; + qcheck = callPackage ../development/ocaml-modules/qcheck { }; qtest = callPackage ../development/ocaml-modules/qtest { }; From 79a0130dbde8a804289d8598d72bfe1794e6f333 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 13 Sep 2020 18:03:13 +0200 Subject: [PATCH 202/463] ocamlPackages.qcheck-ounit: init at 0.15 --- pkgs/development/ocaml-modules/qcheck/ounit.nix | 14 ++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/qcheck/ounit.nix diff --git a/pkgs/development/ocaml-modules/qcheck/ounit.nix b/pkgs/development/ocaml-modules/qcheck/ounit.nix new file mode 100644 index 00000000000..06897987a95 --- /dev/null +++ b/pkgs/development/ocaml-modules/qcheck/ounit.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, qcheck-core, ounit }: + +buildDunePackage { + pname = "qcheck-ounit"; + + inherit (qcheck-core) version src; + + propagatedBuildInputs = [ qcheck-core ounit ]; + + meta = qcheck-core.meta // { + description = "OUnit backend for qcheck"; + }; + +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 31b2c22532d..92dfb4ba646 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -888,6 +888,8 @@ let qcheck-core = callPackage ../development/ocaml-modules/qcheck/core.nix { }; + qcheck-ounit = callPackage ../development/ocaml-modules/qcheck/ounit.nix { }; + qcheck = callPackage ../development/ocaml-modules/qcheck { }; qtest = callPackage ../development/ocaml-modules/qtest { }; From 491e80986777b190b4ac2b285276793a4467c36c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 13 Sep 2020 18:03:18 +0200 Subject: [PATCH 203/463] ocamlPackages.qcheck-alcotest: init at 0.15 --- pkgs/development/ocaml-modules/qcheck/alcotest.nix | 13 +++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/ocaml-modules/qcheck/alcotest.nix diff --git a/pkgs/development/ocaml-modules/qcheck/alcotest.nix b/pkgs/development/ocaml-modules/qcheck/alcotest.nix new file mode 100644 index 00000000000..4f1baec1e55 --- /dev/null +++ b/pkgs/development/ocaml-modules/qcheck/alcotest.nix @@ -0,0 +1,13 @@ +{ buildDunePackage, qcheck-core, alcotest }: + +buildDunePackage { + pname = "qcheck-alcotest"; + + inherit (qcheck-core) version src; + + propagatedBuildInputs = [ qcheck-core alcotest ]; + + meta = qcheck-core.meta // { + description = "Alcotest backend for qcheck"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 92dfb4ba646..9ea32ed8e9e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -886,6 +886,8 @@ let pycaml = callPackage ../development/ocaml-modules/pycaml { }; + qcheck-alcotest = callPackage ../development/ocaml-modules/qcheck/alcotest.nix { }; + qcheck-core = callPackage ../development/ocaml-modules/qcheck/core.nix { }; qcheck-ounit = callPackage ../development/ocaml-modules/qcheck/ounit.nix { }; From 10fef19f4b16b9097d4e510b1758a30e08027192 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 13 Sep 2020 18:03:22 +0200 Subject: [PATCH 204/463] =?UTF-8?q?ocamlPackages.qcheck:=200.7=20=E2=86=92?= =?UTF-8?q?=200.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/qcheck/default.nix | 31 +++++-------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index be625f4d8d7..2a0e6c0ae40 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -1,29 +1,14 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: +{ buildDunePackage, qcheck-ounit }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; +buildDunePackage { + pname = "qcheck"; -stdenv.mkDerivation { + inherit (qcheck-ounit) version src; - name = "ocaml${ocaml.version}-qcheck-0.7"; - src = fetchzip { - url = "https://github.com/c-cube/qcheck/archive/0.7.tar.gz"; - sha256 = "1afy7li74r3ivpvq670gvsj1rmglh5rnvb17p6w8gy5rh30aljah"; + propagatedBuildInputs = [ qcheck-ounit ]; + + meta = qcheck-ounit.meta // { + description = "Compatibility package for qcheck"; }; - buildInputs = [ ocaml findlib ocamlbuild ounit ]; - - configureFlags = [ "--enable-tests" ]; - - doCheck = true; - checkPhase = "ocaml setup.ml -test"; - - createFindlibDestdir = true; - - meta = { - description = "QuickCheck inspired property-based testing for OCaml"; - homepage = "https://github.com/c-cube/qcheck/"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = ocaml.meta.platforms or []; - }; } From 52c3214ea6853eabd52f3f569e4c7fbcdc520b08 Mon Sep 17 00:00:00 2001 From: ryneeverett Date: Thu, 10 Sep 2020 07:36:42 +0000 Subject: [PATCH 205/463] lxpanel: 0.9.3 -> 0.10.0 Curl is a new requirement so the weather plugin can use libcurl to pull weather data. --- pkgs/desktops/lxde/core/lxpanel/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index da146764c32..1e0fb356982 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, pkgconfig, gettext, m4, intltool, libxmlxx, keybinder , gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf, gdk-pixbuf-xlib -, menu-cache, lxmenu-data, wirelesstools +, menu-cache, lxmenu-data, wirelesstools, curl , supportAlsa ? false, alsaLib }: stdenv.mkDerivation rec { - name = "lxpanel-0.9.3"; + name = "lxpanel-0.10.0"; src = fetchurl { url = "mirror://sourceforge/lxde/${name}.tar.xz"; - sha256 = "1ccgv7jgl3y865cpb6w7baaz7468fxncm83bqxlwyni5bwhglb1l"; + sha256 = "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26"; }; nativeBuildInputs = [ pkgconfig gettext m4 intltool libxmlxx ]; buildInputs = [ keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf gdk-pixbuf-xlib.dev - menu-cache lxmenu-data m4 wirelesstools + menu-cache lxmenu-data m4 wirelesstools curl ] ++ stdenv.lib.optional supportAlsa alsaLib; postPatch = '' From db0e901b56eadaa4ff4b4cc958d7a4f9437f14e1 Mon Sep 17 00:00:00 2001 From: Jason Carr Date: Wed, 9 Sep 2020 00:18:14 -0700 Subject: [PATCH 206/463] lesspass-cli: 9.0.0 -> 9.1.9 --- pkgs/tools/security/lesspass-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/tools/security/lesspass-cli/default.nix index 0d59c34ee9a..5bf7358fa76 100644 --- a/pkgs/tools/security/lesspass-cli/default.nix +++ b/pkgs/tools/security/lesspass-cli/default.nix @@ -6,13 +6,13 @@ let in buildPythonApplication rec { pname = "lesspass-cli"; - version = "9.0.0"; + version = "9.1.9"; src = fetchFromGitHub { owner = repo; repo = repo; rev = version; - sha256 = "1mdv0c0fn4d72iigy8hz4s7kf7q3pg4gjjadxwxyjwsalapnsapk"; + sha256 = "126zk248s9r72qk9b8j27yvb8gglw49kazwz0sd69b5kkxvhz2dh"; }; sourceRoot = "source/cli"; From eabba0daf0b3a9192a54576a3249e5cc8dc6bf52 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Mon, 14 Sep 2020 23:00:28 -0700 Subject: [PATCH 207/463] python36Packages.ipython: 7.17 -> 7.16.1 (downgrade) IPython versions 7.17 and higher don't support Python 3.6 anymore, so this commit adds back the old expression for 7.16.1 from before ba1038a98bc2e3aa399c5ef3c4b03d42c94e1bea for use in python36Packages only. nix-repl> :b python36.withPackages (ps: [ ps.ipython ]) builder for '/nix/store/q8v4f89xwv35a3idb9z345z6n3nzfycb-python3.6-ipython-7.17.0.drv' failed with exit code 1; last 10 log lines: Python 3.5 was supported with IPython 7.0 to 7.9. Python 3.6 was supported with IPython up to 7.16. See IPython `README.rst` file for more information: https://github.com/ipython/ipython/blob/master/README.rst Python sys.version_info(major=3, minor=6, micro=12, releaselevel='final', serial=0) detected. cannot build derivation '/nix/store/mhpdarp18z6skzswrl7sbgzv8hr4gwih-python3-3.6.12-env.drv': 1 dependencies couldn't be built [0 built (1 failed)] error: build of '/nix/store/mhpdarp18z6skzswrl7sbgzv8hr4gwih-python3-3.6.12-env.drv' failed --- .../python-modules/ipython/7.16.nix | 70 +++++++++++++++++++ .../python-modules/ipython/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 + 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/ipython/7.16.nix diff --git a/pkgs/development/python-modules/ipython/7.16.nix b/pkgs/development/python-modules/ipython/7.16.nix new file mode 100644 index 00000000000..9700737f485 --- /dev/null +++ b/pkgs/development/python-modules/ipython/7.16.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +# Build dependencies +, glibcLocales +# Test dependencies +, nose +, pygments +# Runtime dependencies +, jedi +, decorator +, pickleshare +, traitlets +, prompt_toolkit +, pexpect +, appnope +, backcall +, fetchpatch +}: + +buildPythonPackage rec { + pname = "ipython"; + version = "7.16.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf"; + }; + + prePatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py --replace "'gnureadline'" " " + ''; + + buildInputs = [ glibcLocales ]; + + checkInputs = [ nose pygments ]; + + propagatedBuildInputs = [ + jedi + decorator + pickleshare + traitlets + prompt_toolkit + pygments + pexpect + backcall + ] ++ lib.optionals stdenv.isDarwin [appnope]; + + LC_ALL="en_US.UTF-8"; + + doCheck = false; # Circular dependency with ipykernel + + checkPhase = '' + nosetests + ''; + + pythonImportsCheck = [ + "IPython" + ]; + + meta = with lib; { + description = "IPython: Productive Interactive Computing"; + homepage = "http://ipython.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ bjornfor fridh ]; + }; +} diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 5e48accfe35..1f1a50363f9 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "ipython"; version = "7.17.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 593ac2c88d9..09d9f1f53a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2911,6 +2911,8 @@ in { ipython = if isPy27 then callPackage ../development/python-modules/ipython/5.nix { } + else if isPy36 then + callPackage ../development/python-modules/ipython/7.16.nix { } else callPackage ../development/python-modules/ipython { }; From 389ab45924ba36899ea13452a5e80be96ab10e7b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Sep 2020 11:28:51 -0700 Subject: [PATCH 208/463] python3Packages.hickle: disable tests Incompatible with astropy>=4.0 --- pkgs/development/python-modules/hickle/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index f481509e6a3..6dbaf073d78 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -31,10 +31,14 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ h5py numpy dill ]; + + doCheck = false; # incompatible with latest astropy checkInputs = [ pytest pytestcov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov ]; + pythonImportsCheck = [ "hickle" ]; + meta = { description = "Serialize Python data to HDF5"; homepage = "https://github.com/telegraphic/hickle"; From f1325cdfe7da80f809c4c6f6d22a4d1a22c7422e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Sep 2020 11:41:36 -0700 Subject: [PATCH 209/463] python2Packages.hickle: disable ``` Processing ./hickle-4.0.1-py2-none-any.whl ERROR: Package 'hickle' requires a different Python: 2.7.18 not in '>=3.5' ``` --- pkgs/development/python-modules/hickle/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 6dbaf073d78..0806573d7be 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , fetchPypi +, pythonOlder , h5py , numpy , dill @@ -19,6 +20,7 @@ buildPythonPackage rec { pname = "hickle"; version = "4.0.1"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; From c6dd555bde34d75c9ccfdeec2b0fbd7418f5f22f Mon Sep 17 00:00:00 2001 From: Ferran Pujol Camins Date: Tue, 15 Sep 2020 19:14:36 +0200 Subject: [PATCH 210/463] chromaprint: add darwin compatibility --- .../development/libraries/chromaprint/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 4702d67a01f..8907e64d5d6 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, cmake, boost, ffmpeg }: +{ lib, stdenv, fetchurl, cmake, boost, ffmpeg, zlib }: -stdenv.mkDerivation rec { +let frameworks = (import {}).darwin.apple_sdk.frameworks; +in stdenv.mkDerivation rec { pname = "chromaprint"; version = "1.5.0"; @@ -11,7 +12,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ffmpeg ]; + darwinInputs = [ + frameworks.Accelerate + frameworks.CoreGraphics + frameworks.CoreVideo + zlib + ]; + buildInputs = [ boost ffmpeg ] ++ lib.optional stdenv.isDarwin darwinInputs; cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; @@ -20,6 +27,6 @@ stdenv.mkDerivation rec { description = "AcoustID audio fingerprinting library"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From c12cfa428c0ee2bf2d900c32d5f0096b80236ce8 Mon Sep 17 00:00:00 2001 From: Ferran Pujol Camins Date: Wed, 16 Sep 2020 09:13:43 +0200 Subject: [PATCH 211/463] chromaprint: fix derivation --- pkgs/development/libraries/chromaprint/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 8907e64d5d6..12f844aa595 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,7 +1,6 @@ -{ lib, stdenv, fetchurl, cmake, boost, ffmpeg, zlib }: +{ lib, stdenv, fetchurl, cmake, boost, ffmpeg, darwin, zlib }: -let frameworks = (import {}).darwin.apple_sdk.frameworks; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "chromaprint"; version = "1.5.0"; @@ -12,13 +11,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - darwinInputs = [ - frameworks.Accelerate - frameworks.CoreGraphics - frameworks.CoreVideo - zlib - ]; - buildInputs = [ boost ffmpeg ] ++ lib.optional stdenv.isDarwin darwinInputs; + buildInputs = [ boost ffmpeg ] ++ lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo zlib]); cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; From 809ed03259eb5bb5f82c44e9bdf2812308a43c8d Mon Sep 17 00:00:00 2001 From: eyjhb Date: Wed, 16 Sep 2020 15:05:20 +0200 Subject: [PATCH 212/463] scrot: 1.3 -> 1.4 --- pkgs/tools/graphics/scrot/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index f9042645be0..df6fb7bcda8 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, giblib, xlibsWrapper, autoreconfHook -, autoconf-archive, libXfixes, libXcursor }: +, autoconf-archive, libXfixes, libXcursor, libXcomposite }: stdenv.mkDerivation rec { pname = "scrot"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = pname; rev = version; - sha256 = "0x70hd59ik37kqd8xqpwrz46np01jv324iz28x2s0kk36d7sblsj"; + sha256 = "12xq6glg70icwsvbnfw9gm4dahlbnrc7b6adpd0mpf89h4sj2gds"; }; nativeBuildInputs = [ autoreconfHook autoconf-archive ]; - buildInputs = [ giblib xlibsWrapper libXfixes libXcursor ]; + buildInputs = [ giblib xlibsWrapper libXfixes libXcursor libXcomposite ]; meta = with stdenv.lib; { homepage = "https://github.com/resurrecting-open-source-projects/scrot"; From 21779aece5848870fd47b7dbfb55823e7355f6a8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 16 Sep 2020 15:45:37 +0200 Subject: [PATCH 213/463] matrix-synapse: 1.19.1 -> 1.19.2 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index f788057e386..3758505edba 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.19.1"; + version = "1.19.2"; src = fetchPypi { inherit pname version; - sha256 = "0ddn3g3q0nkxpmw0xpjhnl0m1g3lrlp89abqbal9k6n689h6kfly"; + sha256 = "0q2w3aid6xsn1ibpsl3wf6m7vl0znngz8n717rx1jndz4s6014nj"; }; patches = [ From 1c61a932bbdf084152762147755429f1d25e659e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 Sep 2020 09:58:43 -0400 Subject: [PATCH 214/463] linux/hardened/patches/5.4: 5.4.64.a -> 5.4.65.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index eacebab1cff..ca6b9911c54 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.144.a/linux-hardened-4.19.144.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.64.a.patch", - "sha256": "1wkkvs66bmgqvgy1iqjck0c0mdad8lnwl42n5npw4ynjhfgiwp3b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.64.a/linux-hardened-5.4.64.a.patch" + "name": "linux-hardened-5.4.65.a.patch", + "sha256": "028nxwjy2sp5bvi9m76nl9x1gyrk4752p376bwvz1h47ljw2hwni", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.65.a/linux-hardened-5.4.65.a.patch" }, "5.7": { "name": "linux-hardened-5.7.19.a.patch", From b585d600821be50f7e8a16ae84e2b8ec4d73d6e8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 Sep 2020 09:58:49 -0400 Subject: [PATCH 215/463] linux/hardened/patches/5.8: 5.8.8.a -> 5.8.9.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ca6b9911c54..71b305a81b0 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch" }, "5.8": { - "name": "linux-hardened-5.8.8.a.patch", - "sha256": "0nm6k8mb51wwwpmb65ragdkxrvljr3dxslaad3l4x0d0yah4d93z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.8.a/linux-hardened-5.8.8.a.patch" + "name": "linux-hardened-5.8.9.a.patch", + "sha256": "1911zxi39h2s98n7xlpym0isbdcj964ymavywvw2lh18nry8934m", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.9.a/linux-hardened-5.8.9.a.patch" } } From d39013b183b27809bd1b3e32a8c81088ec32cb65 Mon Sep 17 00:00:00 2001 From: Titouan Date: Wed, 16 Sep 2020 16:30:52 +0200 Subject: [PATCH 216/463] micro: 2.0.5 -> 2.0.7 --- pkgs/applications/editors/micro/default.nix | 4 ++-- pkgs/applications/editors/micro/deps.nix | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index 4a8c176f575..ffef5d5fdde 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "micro"; - version = "2.0.5"; + version = "2.0.7"; goPackagePath = "github.com/zyedidia/micro"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "12fyyax1mr0n82s5yhmk90iyyzbh32rppkkpj37c25pal73czdhc"; + sha256 = "07ck1a9arklic3p0z50wcg608cvpba1kljvlfb4fljr6jhv5cmkb"; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/micro/deps.nix b/pkgs/applications/editors/micro/deps.nix index c274ce80ada..d1cb91c2959 100644 --- a/pkgs/applications/editors/micro/deps.nix +++ b/pkgs/applications/editors/micro/deps.nix @@ -189,6 +189,15 @@ sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; }; } + { + goPackagePath = "github.com/xo/terminfo"; + fetch = { + type = "git"; + url = "https://github.com/xo/terminfo"; + rev = "454e5b68f9e8"; + sha256 = "0xvjb09nwbanp7ja4560pwb6b2xr9h0axyr7f5clgncca2k4f1pd"; + }; + } { goPackagePath = "github.com/yuin/gopher-lua"; fetch = { @@ -203,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/zyedidia/clipboard"; - rev = "7c45b8673834"; - sha256 = "0ag36wd3830d4s6fvpj05v6f662c5rymgdydsj2gq8aaqplfb0v4"; + rev = "v1.0.3"; + sha256 = "134vnx0r51f08b37yaymlxlfl14qv6r8yzgqz7dxxn1zw9197b3q"; }; } { @@ -257,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/zyedidia/tcell"; - rev = "v1.4.7"; - sha256 = "1ddaznp0haz35mxfjjh2fmamdrlk1igqg65fz22l5r6vvhcdsfxa"; + rev = "v2.0.2"; + sha256 = "0fr7zm6zcir2bjll5ycdxy9m98gjr3ins7mzmqpd46b3njzbl75z"; }; } { From db645087797f49dafccdd08babbbfd015bf8b8b6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Sep 2020 16:57:56 +0200 Subject: [PATCH 217/463] ufraw: mark broken It does not build so let's mark it broken in order for gimp-with-plugins not to be broken. Fixes: https://github.com/NixOS/nixpkgs/issues/98103 --- pkgs/applications/graphics/ufraw/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 9e05a41e848..e1a0cfa9520 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -66,6 +66,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/sergiomb2/ufraw"; + broken = true; # https://github.com/NixOS/nixpkgs/issues/97946 + description = "Utility to read and manipulate raw images from digital cameras"; longDescription = From 70399cc1ce0e182a96e823ebfb0521f5f45d5901 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Tue, 8 Sep 2020 23:38:24 +0200 Subject: [PATCH 218/463] maintainers: add felschr --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d4131829314..c6c14b438eb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2805,6 +2805,16 @@ githubId = 541748; name = "Felipe Espinoza"; }; + felschr = { + email = "dev@felschr.com"; + github = "felschr"; + githubId = 3314323; + name = "Felix Tenley"; + keys = [{ + longkeyid = "ed25519/0x910ACB9F6BD26F58"; + fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58"; + }]; + }; ffinkdevs = { email = "fink@h0st.space"; github = "ffinkdevs"; From b1423ee641f16d2470fd4744dc48cf71ed5ae3f3 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Tue, 8 Sep 2020 23:51:57 +0200 Subject: [PATCH 219/463] filebot: init at 4.9.1 --- pkgs/applications/video/filebot/default.nix | 54 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/applications/video/filebot/default.nix diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix new file mode 100644 index 00000000000..cdd70b4c894 --- /dev/null +++ b/pkgs/applications/video/filebot/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, openjdk11, makeWrapper, autoPatchelfHook +, zlib, libzen, libmediainfo, curl, libmms, glib +}: + +let + # FileBot requires libcurl-gnutls.so to build + curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; + +in + +stdenv.mkDerivation rec { + pname = "filebot"; + version = "4.9.1"; + + src = fetchurl { + url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; + sha256 = "0l496cz703mjymjhgmyrkqbfld1bz53pdsbkx00h9a267j22fkms"; + }; + + unpackPhase = "tar xvf $src"; + + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + + buildInputs = [ zlib libzen libmediainfo curlWithGnuTls libmms glib ]; + + dontBuild = true; + installPhase = '' + mkdir -p $out/opt $out/bin + # Since FileBot has dependencies on relative paths between files, all required files are copied to the same location as is. + 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 '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' + wrapProgram $out/opt/filebot.sh \ + --prefix PATH : ${stdenv.lib.makeBinPath [ openjdk11 ]} + # Expose the binary in bin to make runnable. + ln -s $out/opt/filebot.sh $out/bin/filebot + ''; + + meta = with stdenv.lib; { + description = "The ultimate TV and Movie Renamer"; + longDescription = '' + FileBot is the ultimate tool for organizing and renaming your Movies, TV + Shows and Anime as well as fetching subtitles and artwork. It's smart and + just works. + ''; + homepage = "https://filebot.net"; + changelog = "https://www.filebot.net/forums/viewforum.php?f=7"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ gleber felschr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c027cfbeca5..27cb10ff727 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1945,6 +1945,8 @@ in filebench = callPackage ../tools/misc/filebench { }; + filebot = callPackage ../applications/video/filebot { }; + fileshare = callPackage ../servers/fileshare {}; fileshelter = callPackage ../servers/web-apps/fileshelter { }; From 60df61b67e28cf02424cbebac5303d8254bc6a21 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 16 Sep 2020 11:22:27 -0400 Subject: [PATCH 220/463] mk-python-derivation: document pyproject format Optional setting of format == "pyproject", "egg" had been documented in the manual, but they weren't listed in the function header for ``mk-python-derivation.nix``. --- pkgs/development/interpreters/python/mk-python-derivation.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index df945c645a8..c3be76790eb 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -81,6 +81,8 @@ # "setuptools" : Install a common setuptools/distutils based package. This builds a wheel. # "wheel" : Install from a pre-compiled wheel. # "flit" : Install a flit package. This builds a wheel. +# "pyproject": Install a package using a ``pyproject.toml`` file (PEP517). This builds a wheel. +# "egg": Install a package from an egg. # "other" : Provide your own buildPhase and installPhase. , format ? "setuptools" From 9839c0b292a35f77aefe8c1ff319a455ba6dcbee Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Wed, 16 Sep 2020 08:40:01 -0700 Subject: [PATCH 221/463] verilator: 4.040 -> 4.100 Signed-off-by: Pamplemousse --- pkgs/applications/science/electronics/verilator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 9c59ad3a394..ce8ebe42ea8 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.040"; + version = "4.100"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "1qy0wllsmxva3c838spxwmacxx36r3njxwhgp172m4l3829785bf"; + sha256 = "0vg1gk1hqlnz74gfpf57588758myxvhqzi37yl4vqjcq40r83nr2"; }; enableParallelBuilding = true; From b6b616bbe59dc4ad0afe521c874b0a8f0b019dd0 Mon Sep 17 00:00:00 2001 From: meutraa Date: Wed, 16 Sep 2020 15:49:33 +0100 Subject: [PATCH 222/463] androidStudioPackages.beta: 4.1.0.17 -> 4.1.0.18 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index c0b404c9285..964a1cd7ae1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j"; }; betaVersion = { - version = "4.1.0.17"; # "Android Studio 4.1 RC 2" - build = "201.6776251"; - sha256Hash = "sha256-3W+eUcffRk7lZxbvf3X/Np4hkwAUqU51sQ061XR7Ddc="; + version = "4.1.0.18"; # "Android Studio 4.1 RC 3" + build = "201.6823847"; + sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88="; }; latestVersion = { # canary & dev version = "4.2.0.10"; # "Android Studio 4.2 Canary 10" From 6a8415c93fd5045f3c640fad025b1f8068d1aefa Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 16 Sep 2020 18:04:08 +0200 Subject: [PATCH 223/463] python3Packages.google_api_python_client: 1.11.0 -> 1.12.1 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 492a0519d18..14a9c7841a8 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.11.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "0yxrz897kpjypfqzcy0ry90hc34w47q4fzqidp81h6pg01c03x6a"; + sha256 = "ddadc243ce627512c2a27e11d369f5ddf658ef80dbffb247787499486ef1ea98"; }; # No tests included in archive From 5cae66cb841d3ba45a144c5b3c39c153476aea9b Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Tue, 8 Sep 2020 08:40:48 +0200 Subject: [PATCH 224/463] thermald: 2.2 -> 2.3 Also cleanup the derivation: - remove unnecessary PKG_CONFIG_PATH export - change gpl2 to gpl2Only - add meta.changelog - reformat inputs and sort alphabetically last three suggested by @drewrisinger. --- pkgs/tools/system/thermald/default.nix | 57 ++++++++++++++++++++------ 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index c0a94457e6a..ae9e29b6f1d 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -1,34 +1,64 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkgconfig, dbus, dbus-glib, libxml2, autoconf-archive }: +{ autoconf +, autoconf-archive +, automake +, dbus +, dbus-glib +, docbook_xml_dtd_412 +, docbook-xsl-nons +, fetchFromGitHub +, gtk-doc +, libevdev +, libtool +, libxml2 +, lzma +, pkgconfig +, stdenv +, upower +}: stdenv.mkDerivation rec { pname = "thermald"; - version = "2.2"; + version = "2.3"; + + outputs = [ "out" "devdoc" ]; src = fetchFromGitHub { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "1nrhv3bypyc48h9smj5cpq63rawm6vqyg3cwkhpz69rgjnf1283m"; + sha256 = "0cisaca2c2z1x9xvxc4lr6nl6yqx5bww6brh73m0p1n643jgq1dl"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 autoconf-archive ]; + nativeBuildInputs = [ + autoconf + autoconf-archive + automake + docbook-xsl-nons + docbook_xml_dtd_412 + gtk-doc + libtool + pkgconfig + ]; - patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; - - preConfigure = '' - export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" - ./autogen.sh - ''; + buildInputs = [ + dbus + dbus-glib + libevdev + libxml2 + lzma + upower + ]; configureFlags = [ "--sysconfdir=${placeholder "out"}/etc" "--localstatedir=/var" + "--enable-gtk-doc" "--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" ]; + preConfigure = "NO_CONFIGURE=1 ./autogen.sh"; + postInstall = '' cp ./data/thermal-conf.xml $out/etc/thermald/ ''; @@ -36,7 +66,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Thermal Daemon"; homepage = "https://01.org/linux-thermal-daemon"; - license = licenses.gpl2; + changelog = "https://github.com/intel/thermal_daemon/blob/master/README.txt"; + license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; }; From 0aaa5addfb8ad428bc31c23da24fea8996f853ca Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Thu, 10 Sep 2020 06:59:32 +0200 Subject: [PATCH 225/463] nixos/thermald: add adaptive mode thermald >=2.3 supports the adaptive DPTF mode, in conjunction with kernel 5.8. --- nixos/modules/services/hardware/thermald.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix index ecb529e9bf0..b7be0e89d0c 100644 --- a/nixos/modules/services/hardware/thermald.nix +++ b/nixos/modules/services/hardware/thermald.nix @@ -23,6 +23,15 @@ in { default = null; description = "the thermald manual configuration file."; }; + + adaptive = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable adaptive mode, only working on kernel versions greater than 5.8. + Thermald will detect this itself, safe to enable on kernel versions below 5.8. + ''; + }; }; }; @@ -39,6 +48,7 @@ in { --no-daemon \ ${optionalString cfg.debug "--loglevel=debug"} \ ${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \ + ${optionalString cfg.adaptive "--adaptive"} \ --dbus-enable ''; }; From 99ae3e932bb0d8ba203be162d15ecd3dfd5558dd Mon Sep 17 00:00:00 2001 From: Titouan Date: Wed, 16 Sep 2020 18:55:51 +0200 Subject: [PATCH 226/463] mkvtoolnix: 48.0.0 -> 50.0.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 9b2c8f83577..fa68c58f5af 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv, drake , ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib -, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark +, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2 , withGUI ? true , qtbase ? null , qtmultimedia ? null @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "48.0.0"; + version = "50.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0lbl3w2m12blymda3m00afl9racgahvl0z4b2clwbawhvypc5vfc"; + sha256 = "001i206lwxjyrp406svv4zpb1pliac3f4k5zhzgkjbk2dzj85pyd"; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat file xdg_utils boost libebml zlib fmt - libmatroska libogg libvorbis flac cmark + libmatroska libogg libvorbis flac cmark pcre2 ] ++ optional stdenv.isDarwin libiconv ++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ]; From 5e8db8802bda69a09b58a66c7af0dcb57b77d6f5 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 16 Sep 2020 20:12:46 +0200 Subject: [PATCH 227/463] transcribe: drop --- .../applications/audio/transcribe/default.nix | 73 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 pkgs/applications/audio/transcribe/default.nix diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix deleted file mode 100644 index d9469fa4b7a..00000000000 --- a/pkgs/applications/audio/transcribe/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, fetchzip, wrapGAppsHook, alsaLib, atk, cairo, gdk-pixbuf -, glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }: - -stdenv.mkDerivation rec { - pname = "transcribe"; - version = "8.72"; - - src = if stdenv.hostPlatform.system == "i686-linux" then - fetchzip { - url = "https://www.seventhstring.com/xscribe/downlinux32/xscsetup.tar.gz"; - sha256 = "1h5l7ry9c9awpxfnd29b0wm973ifrhj17xl5d2fdsclw2swsickb"; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchzip { - url = "https://www.seventhstring.com/xscribe/downlinux64/xsc64setup.tar.gz"; - sha256 = "1rpd3ppnx5i5yrnfbjrx7h7dk48kwl99i9lnpa75ap7nxvbiznm0"; - } - else throw "Platform not supported"; - - nativeBuildInputs = [ wrapGAppsHook ]; - - buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly ]; - - dontPatchELF = true; - - libPath = with gst_all_1; stdenv.lib.makeLibraryPath [ - stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsaLib - libX11 libSM libpng12 gstreamer gst-plugins-base zlib - ]; - - installPhase = '' - mkdir -p $out/bin $out/libexec $out/share/doc - cp transcribe $out/libexec - cp xschelp.htb readme_gtk.html $out/share/doc - cp -r gtkicons $out/share/icons - - ln -s $out/share/doc/xschelp.htb $out/libexec - - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - $out/libexec/transcribe - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH_1_0" - --prefix LD_LIBRARY_PATH : "${libPath}" - ) - ''; - - postFixup = '' - ln -s $out/libexec/transcribe $out/bin/ - ''; - - meta = with stdenv.lib; { - description = "Software to help transcribe recorded music"; - longDescription = '' - The Transcribe! application is an assistant for people who want - to work out a piece of music from a recording, in order to write - it out, or play it themselves, or both. It doesn't do the - transcribing for you, but it is essentially a specialised player - program which is optimised for the purpose of transcription. It - has many transcription-specific features not found on - conventional music players. - ''; - homepage = "https://www.seventhstring.com/xscribe/"; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ michalrus ]; - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0f21c24af67..006903efdc5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -601,6 +601,7 @@ mapAliases ({ torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # added 2020-03-28 torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # added 2020-03-28 trang = jing-trang; # added 2018-04-25 + transcribe = throw "transcribe has been removed after being marked a broken for over a year"; # added 2020-09-16 transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb345817569..179e9303783 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23520,8 +23520,6 @@ in transcode = callPackage ../applications/audio/transcode { }; - transcribe = callPackage ../applications/audio/transcribe { }; - transmission = callPackage ../applications/networking/p2p/transmission { }; transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-qt = transmission.override { enableQt = true; }; From a4e50bb197f032ec447a13f56910ff035b32017f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Sep 2020 20:29:23 +0200 Subject: [PATCH 228/463] Revert "qutebrowser: use qt515 (#97586)" We are not going to add parameters to `python-packages.nix`. The proper way to do this is override Python, and pass in a custom `pkgs`. This reverts commit c1a0dfadea3c0f56d5213a677dbbd7b3e89ee98f. --- pkgs/top-level/all-packages.nix | 7 +------ pkgs/top-level/python-packages.nix | 7 +++++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1259c07e445..79a134c2d36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22829,12 +22829,7 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt515.callPackage ../applications/networking/browsers/qutebrowser { - python3Packages = python3Packages.override { - qt5 = qt515; - libsForQt5 = libsForQt515; - }; - }; + qutebrowser = libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09d9f1f53a0..312527a39b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,13 +9,16 @@ { pkgs , stdenv , python -, qt5 -, libsForQt5 , overrides ? (self: super: {}) }: with pkgs.lib; +let + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; +in + let packages = ( self: From c88f3adb1793cd3b007baff0292cf1fa8d0ab1e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Sep 2020 20:54:28 +0200 Subject: [PATCH 229/463] pythonPackages: set qt version by overriding pkgs --- pkgs/top-level/all-packages.nix | 8 +++++++- pkgs/top-level/python-packages.nix | 31 +++++++++++++----------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79a134c2d36..127bf01abd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10158,7 +10158,13 @@ in python2Packages = python2.pkgs; python3Packages = python3.pkgs; - pythonInterpreters = callPackage ./../development/interpreters/python {}; + pythonInterpreters = callPackage ./../development/interpreters/python { + # Overrides that apply to all Python interpreters + pkgs = pkgs // { + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; + }; + }; inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; # Python package sets. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 312527a39b5..b0bf49fe103 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14,11 +14,6 @@ with pkgs.lib; -let - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; -in - let packages = ( self: @@ -3598,7 +3593,7 @@ in { maya = callPackage ../development/python-modules/maya { }; - mayavi = libsForQt5.callPackage ../development/python-modules/mayavi { + mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { inherit buildPythonPackage isPy27 fetchPypi; inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; }; @@ -4188,7 +4183,7 @@ in { ovh = callPackage ../development/python-modules/ovh { }; - ovito = toPythonModule (libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); + ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); owslib = callPackage ../development/python-modules/owslib { }; @@ -4440,8 +4435,8 @@ in { pipx = callPackage ../development/python-modules/pipx { }; pivy = callPackage ../development/python-modules/pivy { - inherit (qt5) qtbase qmake; - inherit (libsForQt5) soqt; + inherit (pkgs.qt5) qtbase qmake; + inherit (pkgs.libsForQt5) soqt; }; pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; @@ -4513,8 +4508,8 @@ in { pooch = callPackage ../development/python-modules/pooch { }; poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { - inherit (qt5) qtbase; - inherit (libsForQt5) poppler; + inherit (pkgs.qt5) qtbase; + inherit (pkgs.libsForQt5) poppler; inherit (pkgs) pkgconfig; }; @@ -5219,7 +5214,7 @@ in { pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; - pyqt5 = libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; @@ -5232,7 +5227,7 @@ in { pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - pyqtwebengine = libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; + pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; pyquery = callPackage ../development/python-modules/pyquery { }; @@ -5338,9 +5333,9 @@ in { pyshp = callPackage ../development/python-modules/pyshp { }; pyside2-tools = - toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake; inherit qt5; }); + toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); - pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja; inherit qt5; }); + pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja qt5; }); pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; @@ -5941,7 +5936,7 @@ in { qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; - qscintilla-qt5 = libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; + qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; qscintilla = self.qscintilla-qt4; @@ -6122,7 +6117,7 @@ in { roboschool = callPackage ../development/python-modules/roboschool { inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package - inherit (qt5) qtbase; + inherit (pkgs.qt5) qtbase; }; robot-detection = callPackage ../development/python-modules/robot-detection { }; @@ -6408,7 +6403,7 @@ in { shellingham = callPackage ../development/python-modules/shellingham { }; shiboken2 = - toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages; inherit qt5; }); + toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages qt5; }); shippai = callPackage ../development/python-modules/shippai { }; From 2daf5702c6d059976e203f2eab7ccb539dd9274d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Sep 2020 21:00:04 +0200 Subject: [PATCH 230/463] qutebrowser: use qt 5.15 Follow-up to a4e50bb197f032ec447a13f56910ff035b32017f. --- .../networking/browsers/qutebrowser/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 0e3e7205e1f..69ca08e990c 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchzip, python3Packages +{ stdenv, lib, fetchurl, fetchzip, python3 , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null @@ -10,6 +10,7 @@ assert withMediaPlayback -> gst_all_1 != null; let + python3Packages = python3.pkgs; pdfjs = let version = "2.4.456"; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 127bf01abd4..e0b3f75d76e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22835,7 +22835,20 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; + qutebrowser = let + libsForQt5 = qt515; + qt5 = qt515; + python = python3.override { + packageOverrides = self: super: { + pkgs = pkgs // { + inherit libsForQt5 qt5; + }; + }; + self = python3; + }; + in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { + python3 = python; + }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; From 00f16b7e0c7f4330567e781df17bbd48abf23c1b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 16 Sep 2020 11:01:26 +0100 Subject: [PATCH 231/463] pythonPackages.pyslurm: mark as broken --- pkgs/development/python-modules/pyslurm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index f5169b68393..a113314aa40 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -22,5 +22,6 @@ buildPythonPackage rec { description = "Python bindings to Slurm"; license = licenses.gpl2; maintainers = with maintainers; [ bhipple ]; + broken = true; # still needs slurm-19.05, but nixpkgs has slurm-20+ now }; } From b529c6cf652860c3cda0c5e29d6233ea0d0a1e17 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Wed, 16 Sep 2020 21:16:01 +0200 Subject: [PATCH 232/463] corefonts: fix hash mismatch update --- pkgs/data/fonts/corefonts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index e4107cd4b99..ed28f6b5e6c 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0baadsrgpqj15fgjmcn0aim0k0nk7mvivcxinw1zwg61kkcwhalx"; + outputHash = "089d2m9bvaacj36qdq77pcazji0sbbr796shic3k52cpxkjnzbwh"; meta = with stdenv.lib; { homepage = "http://corefonts.sourceforge.net/"; From bfa35d8d119e9e5d7b2a9b927a5c608eb6bba5d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Sep 2020 21:21:33 +0200 Subject: [PATCH 233/463] qutebrowser: fixup to 2daf5702c6d059976e203f2eab7ccb539dd9274d --- 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 e0b3f75d76e..8c81983742b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22836,7 +22836,7 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; qutebrowser = let - libsForQt5 = qt515; + libsForQt5 = libsForQt515; qt5 = qt515; python = python3.override { packageOverrides = self: super: { From d219ce3a8236146625c7b6ec284c90bf19cfb39d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 16 Sep 2020 21:06:57 +0200 Subject: [PATCH 234/463] sky: drop --- .../instant-messengers/sky/default.nix | 86 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 3 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/sky/default.nix diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix deleted file mode 100644 index 33bd4586bfd..00000000000 --- a/pkgs/applications/networking/instant-messengers/sky/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, file, libX11, libXScrnSaver -, libGL, qt5, SDL, libpulseaudio -, libXrandr, libXext, libXcursor, libXinerama, libXi -, curl, sqlite, openssl -, libuuid, openh264, libv4l, libxkbfile, libXv, zlib, libXmu -, libXtst, libXdamage, pam, libXfixes, libXrender, libjpeg_original -, ffmpeg_3 -}: - let - # Sky is linked to the libjpeg 8 version and checks for the version number in the code. - libjpeg_original_fix = libjpeg_original.overrideAttrs (oldAttrs: { - src = fetchurl{ - url = "https://www.ijg.org/files/jpegsrc.v8d.tar.gz"; - sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; - }; - }); -in -stdenv.mkDerivation rec { - version_major = "2.1.7369"; - version_minor = "1"; - version = version_major + "." + version_minor; - pname = "sky"; - unpackCmd = "ar x $curSrc; tar -xf data.tar.xz"; - src = fetchurl { - url = "https://tel.red/repos/ubuntu/pool/non-free/sky_${version_major + "-" + version_minor}ubuntu+xenial_amd64.deb"; - sha256 = "0b3j90km3rp5bgaklxw881g0gcy09mqzbhjdfrq4s2np026ql3d9"; - }; - buildInputs = [ - file - qt5.qtbase - SDL - ffmpeg_3 - sqlite - openssl - openh264 - pam - curl - libX11 libXScrnSaver libGL libpulseaudio libXrandr - libXext libXcursor libXinerama libXi libuuid libv4l - libxkbfile libXv zlib libXmu libXtst libXdamage - libXfixes libXrender - libjpeg_original_fix - ]; - dontBuild = true; - - installPhase = '' - ls -al ./ - mkdir -p "$out/bin" "$out/lib" "$out/share" - cp -a lib/sky/* $out/bin/ - cp -aR lib/sky/lib64/* "$out/lib/" - cp -a lib/sky/man.sh "$out/bin" - chmod +x $out/bin/sky - cp -a share/* "$out/share" - '' - ; - - - postFixup = '' - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp-client.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp-server.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp-shadow.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libopenh264.so.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/librdtk.so.1.1.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libSDL-1.3.so.0.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libsipw.so.1.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libwinpr.so.1.1.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libxfreerdp-client.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/sky - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/sky_sender - sed -i "s#/usr/bin/sky#$out/bin/sky#g" $out/share/applications/sky.desktop - sed -i "s#/usr/lib/sky#$out/bin/#g" $out/share/applications/sky.desktop - ''; - - meta = with stdenv.lib; { - description = "Skype for business"; - longDescription = '' - Lync & Skype for business on linux - ''; - homepage = "https://tel.red/"; - license = licenses.unfree; - maintainers = [ maintainers.Scriptkiddi ]; - platforms = platforms.unix; - }; -} - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0f21c24af67..8d7dd3f71c7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -515,6 +515,7 @@ mapAliases ({ seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)"; shared_mime_info = shared-mime-info; # added 2018-02-25 skrooge2 = skrooge; # added 2017-02-18 + sky = throw "sky has been removed from nixpkgs (2020-09-16)"; skype = skypeforlinux; # added 2017-07-27 skydive = throw "skydive has been removed from nixpkgs (2019-09-10)"; slack-dark = slack; # added 2020-03-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb345817569..4cc468a16ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22177,10 +22177,6 @@ in }; }; - sky = callPackage ../applications/networking/instant-messengers/sky { - qt5 = qt514; - }; - smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; smtube = libsForQt514.callPackage ../applications/video/smtube {}; From 5a6ec92badcbaf3405edb99ea197f4d036bcb96d Mon Sep 17 00:00:00 2001 From: Diego Rodriguez Date: Wed, 16 Sep 2020 14:34:36 -0600 Subject: [PATCH 235/463] eksctl: 0.26.0 -> 0.27.0 --- pkgs/tools/admin/eksctl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 7c240aa4131..74cc3f3f171 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1av5w32ia68j2xrw4m16mzm9jn6xlap93kwi8iqw0s6wgihzadds"; + sha256 = "1yclffhr76jd5rzqi37bpdj524lmywmgcfr9r0ahacfkp1hxdn3v"; }; - vendorSha256 = "13sc4yrzgx2sm98whibfy2kjia3yy9cdvibvhbvg2lz2spprjb9v"; + vendorSha256 = "133g2d7l1szmpxjdg28yjm3pw6galwq8948rvalnh932kxngkxys"; doCheck = false; @@ -36,6 +36,6 @@ buildGoModule rec { description = "A CLI for Amazon EKS"; homepage = "https://github.com/weaveworks/eksctl"; license = licenses.asl20; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ xrelkd Chili-Man ]; }; } From e77d4ecac28f14f79eb0df3261e98ad70500eea4 Mon Sep 17 00:00:00 2001 From: Demyan Rogozhin Date: Wed, 16 Sep 2020 22:45:09 +0200 Subject: [PATCH 236/463] react-native-debugger: fix build --- pkgs/development/tools/react-native-debugger/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index f4cf500c2f9..ff1b669a253 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { exec = "React\\ Native\\ Debugger"; desktopName = "React Native Debugger"; genericName = "React Native Debugger"; - categories = "Development;Tools;"; + categories = "Development;Debugger;"; }; meta = with stdenv.lib; { From 9dfcba812aa0f4dc374acfe0600d591885f4e274 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Sep 2020 23:20:16 +0200 Subject: [PATCH 237/463] jwt-cli: 3.1.0 -> 3.2.1 --- pkgs/tools/security/jwt-cli/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 23c25accc93..728ea0a92da 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -2,27 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "jwt-cli"; - version = "3.1.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "mike-engel"; repo = pname; rev = version; - sha256 = "0pmxis3m3madwnmswz9hn0i8fz6a9bg11slgrrwql7mx23ijqf6y"; + sha256 = "07mnkr7hi29fyyyn7llb30p4ndiqz4gf1lnhm44qm09alaxmfvws"; }; - cargoSha256 = "165g1v0c8jxs8ddm8ld0hh7k8mvk3566ig43pf99hnw009fg1yc2"; - - patches = [ - # to fix `cargo test -- --test-threads $NIX_BUILD_CORES` - (fetchpatch { - url = "https://github.com/mike-engel/jwt-cli/commit/df87111f3084abdecce5d58ad031edb6e7fef94a.patch"; - sha256 = "1vjk7wy8ddkz9wjkiayag61gklrq59m7bwlaiyinjp4n15gx0j1k"; - }) - ]; + cargoSha256 = "0jkzy7ssg9v9phhlldq6s4rfs3sn17y2r1k0jr10g9j15lzixa04"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + doInstallCheck = true; + installCheckPhase = "$out/bin/jwt --version"; + meta = with stdenv.lib; { description = "Super fast CLI tool to decode and encode JWTs"; homepage = "https://github.com/mike-engel/jwt-cli"; From c603f6262868d7ea4893b83ad7ddd3e38714470b Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Wed, 16 Sep 2020 09:37:02 -0700 Subject: [PATCH 238/463] topydo: Don't fail build on tests Signed-off-by: Pamplemousse --- pkgs/applications/misc/topydo/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index eb3894c7b47..6db651ff392 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -22,7 +22,14 @@ buildPythonApplication rec { watchdog ]; - checkInputs = [ mock freezegun coverage green pylint ]; + checkInputs = [ mock freezegun pylint ]; + + # Skip test that has been reported multiple times upstream without result: + # bram85/topydo#271, bram85/topydo#274. + checkPhase = '' + substituteInPlace test/test_revert_command.py --replace 'test_revert_ls' 'dont_test_revert_ls' + python -m unittest discover + ''; LC_ALL="en_US.UTF-8"; From 0561fdef057c93767d680a338bbf7f94064af9fe Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 16 Sep 2020 18:00:00 -0500 Subject: [PATCH 239/463] xonsh: 0.9.21 -> 0.9.22 https://github.com/xonsh/xonsh/releases/tag/0.9.22 --- 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 751dd00efc7..e775ab04dc1 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.21"; + version = "0.9.22"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "16k8506fk54krpkls374cn3vm1dp9ixi0byh5xvi3m5a4bnbvrs0"; + sha256 = "04yd8y4lksmxbgl6v6bw1k32r8v5mia3sm8y9v39cgfzjbkvys1p"; }; LC_ALL = "en_US.UTF-8"; From 35593698d5dd49117d9d082174add68389f96e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 17 Sep 2020 03:17:49 +0200 Subject: [PATCH 240/463] ntfy: Switch to python3. Also fixes test failure. Fixes test error: AttributeError: 'module' object has no attribute 'test_prowl' --- pkgs/tools/misc/ntfy/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index a3cf6ad07d5..593a8cfc637 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ntfy"; version = "2.7.0"; @@ -11,11 +11,11 @@ pythonPackages.buildPythonApplication rec { sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv"; }; - checkInputs = with pythonPackages; [ + checkInputs = with python3Packages; [ mock ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ requests ruamel_yaml appdirs sleekxmpp dns emoji @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { ]; checkPhase = '' - HOME=$(mktemp -d) ${pythonPackages.python.interpreter} setup.py test + HOME=$(mktemp -d) ${python3Packages.python.interpreter} setup.py test ''; meta = with stdenv.lib; { From a2f450984ab3d5b02eb8cfa74de48668c4e83bff Mon Sep 17 00:00:00 2001 From: midchildan Date: Thu, 17 Sep 2020 10:48:11 +0900 Subject: [PATCH 241/463] maintainers.midchildan: update info --- maintainers/maintainer-list.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c6c14b438eb..d4adf05d883 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5552,10 +5552,14 @@ name = "Michael Mercier"; }; midchildan = { - email = "midchildan+nix@gmail.com"; + email = "git@midchildan.org"; github = "midchildan"; githubId = 7343721; name = "midchildan"; + keys = [{ + longkeyid = "rsa4096/0x186A1EDAC5C63F83"; + fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; + }]; }; mikefaille = { email = "michael@faille.io"; From bc3d459cebb536122f0214779cc82432008d4041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Thu, 10 Sep 2020 00:21:43 +0200 Subject: [PATCH 242/463] release-notes: mention cinnamon --- nixos/doc/manual/release-notes/rl-2009.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 8bc51c906ae..009e2532a31 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -26,6 +26,12 @@ GNOME desktop environment was upgraded to 3.36, see its release notes. + + + The Cinnamon desktop environment (v4.6) has been added. services.xserver.desktopManager.cinnamon.enable = true; to try it out! + Remember that, with any new feature it's possible you could run into issues, so please send all support requests to github.com/NixOS/nixpkgs to notify the maintainers. + + maxx package removed along with services.xserver.desktopManager.maxx module. From eaf667bbf0060b93387fc1f57e028cf976f37bf1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 17 Sep 2020 09:24:46 +0300 Subject: [PATCH 243/463] all-packages.nix: Remove trailing space for qutebrowser --- 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 8c81983742b..4c12a1104bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22846,7 +22846,7 @@ in }; self = python3; }; - in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { + in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { python3 = python; }; From ce0a59cb9fee380765455d7ef6802e6e0a28514e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Povi=C5=A1er?= Date: Thu, 17 Sep 2020 09:08:54 +0200 Subject: [PATCH 244/463] python3.pkgs.libiio: fix build Add missing setuptools dependency. --- pkgs/development/libraries/libiio/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index c4136428035..3c3ccf27884 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -7,6 +7,7 @@ , python , libusb1 , runtimeShell +, lib }: stdenv.mkDerivation rec { @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { python libxml2 libusb1 - ]; + ] ++ lib.optional python.isPy3k python.pkgs.setuptools; cmakeFlags = [ "-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d" From ec63faba640fd446a3111d89b3bc85d520478e01 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Sep 2020 06:05:20 +1000 Subject: [PATCH 245/463] gitAndTools.gh: 0.12.0 -> 1.0.0 https://github.com/cli/cli/releases/tag/v1.0.0 --- .../version-management/git-and-tools/gh/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 09d50d5a11c..13fe6cf4ef8 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,20 +2,21 @@ buildGoModule rec { pname = "gh"; - version = "0.12.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "1nwpqwr8sqqpndj7qsk935i1675f4qdbl31x60a038l9iiwc28x1"; + sha256 = "10ixjrb56ddqxla7mfxqnf74zissjx66akcyvgl9xfmww0bvg64x"; }; - vendorSha256 = "1m5ahzh5sfla3p6hllr7wjigvrnccdvrsdjpxd2hy0rl7jsrp85m"; + vendorSha256 = "079zbm57xfcskwhsfj1x0c0lg6ip6c6dbk8hfwrzkpy8gfs2ysmr"; nativeBuildInputs = [ installShellFiles ]; buildPhase = '' + export GO_LDFLAGS="-s -w" make GH_VERSION=${version} bin/gh manpages ''; From 1e8324291e5cf93a63a9159855071a032725e0ce Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 15 Sep 2020 09:04:44 +0200 Subject: [PATCH 246/463] cri-o: 1.18.3 -> 1.19.0 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/cri-o/default.nix | 8 ++------ pkgs/applications/virtualization/cri-o/wrapper.nix | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index d0c8938e6de..54ffb036f3c 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.18.3"; + version = "1.19.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1csdbyypqwxkfc061pdv7nj52a52b9xxzb6qgxcznd82w7wgfb3g"; + sha256 = "1lrr8y0k6609z4gb8cg277rq58sh0bqd2b4mzjlynyjdgp3xskfq"; }; vendorSha256 = null; @@ -41,10 +41,6 @@ buildGoModule rec { BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub"; buildPhase = '' - patchShebangs . - - sed -i '/version.buildDate/d' Makefile - make binaries docs BUILDTAGS="$BUILDTAGS" ''; diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index 298bec6550e..6d72623d86c 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -10,7 +10,6 @@ , utillinux # nsenter , cni-plugins # not added to path , iptables -, socat }: let @@ -22,7 +21,6 @@ let conmon utillinux iptables - socat ] ++ extraPackages); in runCommand cri-o.name { From e363aef498d9bb3f22ab758de8ba5ad971e4ceee Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 15 Sep 2020 09:43:47 +0200 Subject: [PATCH 247/463] nixos/cri-o: remove deprecated manage_ns_lifecycle option Signed-off-by: Sascha Grunert --- nixos/modules/virtualisation/cri-o.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index aa2fb73533a..70e7c8794d4 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -99,7 +99,6 @@ in [crio.runtime] cgroup_manager = "systemd" log_level = "${cfg.logLevel}" - manage_ns_lifecycle = true pinns_path = "${cfg.package}/bin/pinns" hooks_dir = [] From eb6e2ac2c033a86afa6a606753aab0dbde8bddda Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 17 Sep 2020 03:21:22 -0500 Subject: [PATCH 248/463] terraform_0_13: 0.13.2 -> 0.13.3 (#98137) https://github.com/hashicorp/terraform/releases/tag/v0.13.3 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index f29508ffe38..a6d9278f58b 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -132,8 +132,8 @@ in rec { }); terraform_0_13 = pluggable (generic { - version = "0.13.2"; - sha256 = "04pm57l29j3ai6dvh2343q4yhskkxqj8ayr2hdw2qqjch52p8mrw"; + version = "0.13.3"; + sha256 = "1bjgsabkyh3xf4gdp41mwhw6bpmjg45bnq2hk522glk02n2xngpw"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From 3f1a356b8179956eddf36cd573749a29911731b3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 17 Sep 2020 11:39:07 +0300 Subject: [PATCH 249/463] gnomeExtensions.gsconnect: 39 -> 41 Update patch so it'll apply on v41. --- .../gnome-3/extensions/gsconnect/default.nix | 4 +-- .../extensions/gsconnect/fix-paths.patch | 34 +++++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 53f8d9e79a0..98827fd3f6a 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-gsconnect"; - version = "39"; + version = "41"; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "0d2wypf36p95v756arf06gfilpb48gp55i1xbqnqvcd10n3q4zc2"; + sha256 = "0lcj7k16jki54bsyh01j4ss4hhfddnahcw02zlmlkl637qdv1b5j"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch index 629d34b6f68..58c02a92eb2 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch @@ -1,5 +1,7 @@ ---- a/data/org.gnome.Shell.Extensions.GSConnect.desktop -+++ b/data/org.gnome.Shell.Extensions.GSConnect.desktop +diff --git i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in +index ffb23342..b405c73b 100644 +--- i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in ++++ w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application @@ -9,18 +11,22 @@ Terminal=false NoDisplay=true Icon=org.gnome.Shell.Extensions.GSConnect ---- a/src/extension.js -+++ b/src/extension.js -@@ -1,5 +1,7 @@ - 'use strict'; - -+'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path)); -+ - const Gio = imports.gi.Gio; - const GLib = imports.gi.GLib; - const Gtk = imports.gi.Gtk; ---- a/src/prefs.js -+++ b/src/prefs.js +diff --git i/src/extension.js w/src/extension.js +index 5f32aa68..872c0c61 100644 +--- i/src/extension.js ++++ w/src/extension.js +@@ -1,5 +1,7 @@ + 'use strict'; + ++'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path)); ++ + const Gio = imports.gi.Gio; + const GObject = imports.gi.GObject; + const Gtk = imports.gi.Gtk; +diff --git i/src/prefs.js w/src/prefs.js +index 07e93099..1c166710 100644 +--- i/src/prefs.js ++++ w/src/prefs.js @@ -1,5 +1,7 @@ 'use strict'; From af92611103e43319842972e82c9fc3e51a3e84ad Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 17 Sep 2020 11:35:38 +0200 Subject: [PATCH 250/463] Revert "python: gsd: 1.7.0 -> 1.9.3" Incorrect update. Should not update the Python 2 version. This reverts commit d1a46d4ff3bd3db14e06fc0d01420e37b39b0fb1. --- pkgs/development/python-modules/gsd/1.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gsd/1.7.nix b/pkgs/development/python-modules/gsd/1.7.nix index c9b3078cd46..6e6f0504aa7 100644 --- a/pkgs/development/python-modules/gsd/1.7.nix +++ b/pkgs/development/python-modules/gsd/1.7.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.9.3"; + version = "1.7.0"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "c6b37344e69020f69fda2b8d97f894cb41fd720840abeda682edd680d1cff838"; + sha256 = "0fpk69wachyydpk9cbs901m7hkwrrvq24ykxsrz62km9ql8lr2vp"; }; propagatedBuildInputs = [ numpy ]; From 4560d7ed7029408bbbc940aabbbfea10d32e62ac Mon Sep 17 00:00:00 2001 From: Sebastian Zivota Date: Fri, 15 May 2020 17:53:07 +0200 Subject: [PATCH 251/463] nixos/calibre-server: Allow multiple libraries Also add options for group and user. --- .../modules/services/misc/calibre-server.nix | 49 ++++++++++++++----- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix index 84c04f403d3..2467d34b524 100644 --- a/nixos/modules/services/misc/calibre-server.nix +++ b/nixos/modules/services/misc/calibre-server.nix @@ -9,24 +9,42 @@ let in { + imports = [ + (mkChangedOptionModule [ "services" "calibre-server" "libraryDir" ] [ "services" "calibre-server" "libraries" ] + (config: + let libraryDir = getAttrFromPath [ "services" "calibre-server" "libraryDir" ] config; + in [ libraryDir ] + ) + ) + ]; ###### interface options = { - services.calibre-server = { enable = mkEnableOption "calibre-server"; - libraryDir = mkOption { + libraries = mkOption { description = '' - The directory where the Calibre library to serve is. - ''; - type = types.path; + The directories of the libraries to serve. They must be readable for the user under which the server runs. + ''; + type = types.listOf types.path; + }; + + user = mkOption { + description = "The user under which calibre-server runs."; + type = types.str; + default = "calibre-server"; + }; + + group = mkOption { + description = "The group under which calibre-server runs."; + type = types.str; + default = "calibre-server"; }; }; - }; @@ -34,29 +52,34 @@ in config = mkIf cfg.enable { - systemd.services.calibre-server = - { + systemd.services.calibre-server = { description = "Calibre Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - User = "calibre-server"; + User = cfg.user; Restart = "always"; - ExecStart = "${pkgs.calibre}/bin/calibre-server ${cfg.libraryDir}"; + ExecStart = "${pkgs.calibre}/bin/calibre-server ${lib.concatStringsSep " " cfg.libraries}"; }; }; environment.systemPackages = [ pkgs.calibre ]; - users.users.calibre-server = { + users.users = optionalAttrs (cfg.user == "calibre-server") { + calibre-server = { + home = "/var/lib/calibre-server"; + createHome = true; uid = config.ids.uids.calibre-server; - group = "calibre-server"; + group = cfg.group; }; + }; - users.groups.calibre-server = { + users.groups = optionalAttrs (cfg.group == "calibre-server") { + calibre-server = { gid = config.ids.gids.calibre-server; }; + }; }; From 114ad1a7c51fcdf8a67016ba9ed2e76bcb3cba14 Mon Sep 17 00:00:00 2001 From: Demyan Rogozhin Date: Thu, 17 Sep 2020 12:57:02 +0200 Subject: [PATCH 252/463] react-native-debugger: 0.9.10 -> 0.11.4 --- .../tools/react-native-debugger/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index ff1b669a253..bba41f08595 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib -, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem +{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at_spi2_atk, at-spi2-core +, gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: let @@ -10,7 +10,7 @@ let fontconfig pango atk - gtk2 + gtk3 glib freetype dbus @@ -20,8 +20,8 @@ let cups expat udev - - gnome2.GConf + at_spi2_atk + at-spi2-core xorg.libX11 xorg.libXcursor @@ -38,11 +38,10 @@ let ]; in stdenv.mkDerivation rec { pname = "react-native-debugger"; - version = "0.9.10"; - + version = "0.11.4"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "158275sp37smc8lnrcbj56lp7aa6fj9gzb6fzjgz9r980qgzhia6"; + sha256 = "1dnlxdqcn90r509ff5003fibkrprdr0ydpnwg5p0xzs6rz3k8698"; }; buildInputs = [ unzip ]; @@ -52,15 +51,15 @@ in stdenv.mkDerivation rec { unzip $src -d $out mkdir $out/{lib,bin,share} - mv $out/lib{node,ffmpeg}.so $out/lib + mv $out/{libEGL,libGLESv2,libvk_swiftshader,libffmpeg}.so $out/lib mv $out/!(lib|share|bin) $out/share patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath ${rpath}:$out/lib \ - $out/share/React\ Native\ Debugger + $out/share/react-native-debugger - ln -s $out/share/React\ Native\ Debugger $out/bin/React\ Native\ Debugger + ln -s $out/share/react-native-debugger $out/bin/react-native-debugger install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ @@ -68,7 +67,7 @@ in stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "rndebugger"; - exec = "React\\ Native\\ Debugger"; + exec = "react-native-debugger"; desktopName = "React Native Debugger"; genericName = "React Native Debugger"; categories = "Development;Debugger;"; From 501eaab47a08ff336fbd8017125a5f73787fa4ca Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 17 Sep 2020 13:39:01 +0200 Subject: [PATCH 253/463] react-native-debugger: fix eval --- pkgs/development/tools/react-native-debugger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index bba41f08595..3cb5ae2b930 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at_spi2_atk, at-spi2-core +{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core , gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: @@ -20,7 +20,7 @@ let cups expat udev - at_spi2_atk + at-spi2-atk at-spi2-core xorg.libX11 From 3df04beafcadefb4c129bd6ddbe7729538c06439 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 16 Sep 2020 18:52:22 -0300 Subject: [PATCH 254/463] signal-desktop: ringrtc depends on libpulseaudio voice/video calls should now work, fixing #98082 --- .../networking/instant-messengers/signal-desktop/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index dc8fc81d35e..881d7458c09 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -4,7 +4,7 @@ , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3 # Runtime dependencies: -, systemd, libnotify, libdbusmenu +, systemd, libnotify, libdbusmenu, libpulseaudio # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -122,6 +122,7 @@ in stdenv.mkDerivation rec { --replace /opt/Signal/signal-desktop $out/bin/signal-desktop autoPatchelf --no-recurse -- $out/lib/Signal/ + patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node ''; # Tests if the application launches and waits for "Link your phone to Signal Desktop": From 8263d6e68bad2069973932d8283abe41fcf47f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Sep 2020 21:20:00 +0200 Subject: [PATCH 255/463] dnscontrol: 3.2.0 -> 3.3.0 --- pkgs/applications/networking/dnscontrol/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 70e107c063f..0beba63597f 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchFromGitHub, buildGoPackage}: +{ stdenv, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "dnscontrol"; - version = "3.2.0"; - - goPackagePath = "github.com/StackExchange/dnscontrol"; + version = "3.3.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "1lrn1whmx9zkyvs505zxrsmnr5s6kpj3kjkr6rblfwdlnadkgfj7"; + sha256 = "0lldkx906imwm8mxcfafpanbgaqh0sdm3zdkwkn7j0nmngyncx9p"; }; - subPackages = [ "." ]; + vendorSha256 = "16cc6hb2iwh1zwrrnb7s4dqxqhaj67gq3gfr5xvh5kqafd685hvx"; meta = with stdenv.lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; From 5cd3b2d62ab1eb7aac935744a768466db00a07e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Sep 2020 22:27:22 +0200 Subject: [PATCH 256/463] dnscontrol: replace stdenv.lib with lib --- pkgs/applications/networking/dnscontrol/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 0beba63597f..59d7c58466e 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "dnscontrol"; @@ -13,7 +13,9 @@ buildGoModule rec { vendorSha256 = "16cc6hb2iwh1zwrrnb7s4dqxqhaj67gq3gfr5xvh5kqafd685hvx"; - meta = with stdenv.lib; { + subPackages = [ "." ]; + + meta = with lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; homepage = "https://stackexchange.github.io/dnscontrol/"; license = licenses.mit; From 139143cabf74db27e5d4ac1cabd1e380570ed4a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Sep 2020 22:27:38 +0200 Subject: [PATCH 257/463] dnscontrol: add SuperSandro2000 as maintainer --- pkgs/applications/networking/dnscontrol/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 59d7c58466e..8fb14ae3b14 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { description = "Synchronize your DNS to multiple providers from a simple DSL"; homepage = "https://stackexchange.github.io/dnscontrol/"; license = licenses.mit; - maintainers = with maintainers; [ mmahut ]; + maintainers = with maintainers; [ mmahut SuperSandro2000 ]; }; } From cb4b908d127d34b60519269c1492352b2f573ead Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 17 Sep 2020 09:55:56 -0400 Subject: [PATCH 258/463] linux: 4.19.145 -> 4.19.146 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index c57e8a21e0a..d50535e5d32 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.145"; + version = "4.19.146"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1dzn7x5lz808r1sxxdrylh8k3c5n8ffqnz6anx2ywnpiz17q7g0p"; + sha256 = "0jl17yk3fpz0sx203l9l1fj5bly3jgsyr8hy5qa6py99fbk0qnim"; }; } // (args.argsOverride or {})) From e8121e56865d675469832a760433f2f9cc1ce62d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 17 Sep 2020 09:56:09 -0400 Subject: [PATCH 259/463] linux: 5.4.65 -> 5.4.66 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a3423707bbb..90f191c3681 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.65"; + version = "5.4.66"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0sdcdjhzvz7hksv74dgj0ck9adxzhph47r1ng1kf37fh2x28657m"; + sha256 = "1cnsrz21kcf0h7krpv9p1a7n59mybr5ii0jdi3yc3x3lcwvk06gz"; }; } // (args.argsOverride or {})) From fa60ed8f8d4dc3cc7ae9ef3deea8224e418b3d19 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 17 Sep 2020 09:56:18 -0400 Subject: [PATCH 260/463] linux: 5.8.9 -> 5.8.10 --- pkgs/os-specific/linux/kernel/linux-5.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix index bb690cca278..14abb483eee 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.9"; + version = "5.8.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0pz1jfgmds5xc63jfvlykqap4dqf9jpr8jmgz5wpszgih8dvrn4r"; + sha256 = "1wjsdc93xilag0pk205m2q0ixmpp93ql5qj0fm3qlqddgxm14vlx"; }; } // (args.argsOverride or {})) From 0596ac5105166bd5b927cd6aa2882269f46b90b0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 17 Sep 2020 16:00:43 +0200 Subject: [PATCH 261/463] =?UTF-8?q?pythonPackages.afdko:=203.5.0=20?= =?UTF-8?q?=E2=86=92=203.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/afdko/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 5d960b5e92e..a887b65a8f9 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -1,20 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder, python , fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens , brotli, fontmath, mutatormath, booleanoperations -, ufoprocessor, ufonormalizer, psautohint +, ufoprocessor, ufonormalizer, psautohint, tqdm , setuptools_scm , pytest }: buildPythonPackage rec { pname = "afdko"; - version = "3.5.0"; + version = "3.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0wid4l70bxm297xgayyrgw5glhp6n92gh4sz1nd4rncgf1ziz8ck"; + sha256 = "1qg7dgl81yq0sp50pkhgvmf8az1svx20zmpkfa68ka9d0ssh1wjw"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -35,6 +35,7 @@ buildPythonPackage rec { ufoprocessor ufonormalizer psautohint + tqdm ]; # tests are broken on non x86_64 From 19f22514cb40bef8febef448e3ac9bb039118436 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Thu, 17 Sep 2020 16:23:16 +0200 Subject: [PATCH 262/463] pythonPackages.grpcio-tools: add setuptools dependency (#98157) --- 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 94a440bb4f1..c60acb2d1f1 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio }: +{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }: buildPythonPackage rec { pname = "grpcio-tools"; @@ -11,7 +11,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - propagatedBuildInputs = [ protobuf grpcio ]; + propagatedBuildInputs = [ protobuf grpcio setuptools ]; # no tests in the package doCheck = false; From 9c73e34d1810ca72379d9c53254e32f46b9a074d Mon Sep 17 00:00:00 2001 From: Hannes Weisbach Date: Wed, 16 Sep 2020 17:12:11 +0200 Subject: [PATCH 263/463] kicad: remove gettext from buildInputs, add to nativeBuildInputs The i18n "library" does not link against gettext. It only requires the msgfmt utility from gettext, hence gettext should be a nativeBuildInput --- pkgs/applications/science/electronics/kicad/libraries.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index 91ce30de5f0..057bc15bf5f 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -62,8 +62,7 @@ in inherit name; } // (libSources.${name} or { }) ); - buildInputs = [ gettext ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gettext ]; meta = { license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 platforms = stdenv.lib.platforms.all; From e8a612c06630048e407a28a45a665ea1504106aa Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 17 Sep 2020 19:55:20 +0200 Subject: [PATCH 264/463] =?UTF-8?q?pythonPackages.nototools:=200.2.12=20?= =?UTF-8?q?=E2=86=92=200.2.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/fonts/noto-fonts/tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index 6ea26f7c79d..f5bd6335dfb 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "nototools"; - version = "0.2.12"; + version = "0.2.13"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "nototools"; rev = "v${version}"; - sha256 = "0drmx1asni3g6616fa4gjn5n43qkcf7icvxq9y2krpjxq78wcmc5"; + sha256 = "0ggp65xgkf9y7jamncm65lkm84wapsa47abf133pcb702875v8jz"; }; postPatch = '' From ebd935523129ec3b6c02b40d21bb45519d625a27 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 17 Sep 2020 16:01:27 +0200 Subject: [PATCH 265/463] =?UTF-8?q?noto-fonts-emoji:=20unstable-2020-08-20?= =?UTF-8?q?=20=E2=86=92=202020-09-16-unicode13.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/fonts/noto-fonts/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 40a6c887439..79f8cb8b336 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -111,18 +111,18 @@ in }; noto-fonts-emoji = let - version = "unstable-2020-08-20"; + version = "2020-09-16-unicode13_1"; emojiPythonEnv = python3.withPackages (p: with p; [ fonttools nototools ]); in stdenv.mkDerivation { pname = "noto-fonts-emoji"; - inherit version; + version = builtins.replaceStrings [ "_" ] [ "." ] version; src = fetchFromGitHub { owner = "googlefonts"; repo = "noto-emoji"; - rev = "1bc491419fa2925d018f27bfe702792031be0e68"; - sha256 = "1vak4s1p4wlwzpnqfb1c2sg62q82gnjpnmqrfz8xl6bd0z55imzy"; + rev = "v${version}"; + sha256 = "0659336dp0l2nkac153jpcb9yvp0p3dx1crcyxjd14i8cqkfi2hh"; }; nativeBuildInputs = [ From 3584644092391b342b77705bba4786b9d919f9f3 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 17 Sep 2020 20:35:42 +0200 Subject: [PATCH 266/463] cloc: 1.86 -> 1.88 --- pkgs/tools/misc/cloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index e35d5283256..2b9cbfe1030 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cloc"; - version = "1.86"; + version = "1.88"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; rev = version; - sha256 = "082gj2b3x11bilz8c572dd60vn6n0fhld5zhi7wk7g1wy9wlgm9w"; + sha256 = "1ixgswzbzv63bl50gb2kgaqr0jcicjz6w610hi9fal1i7744zraw"; }; setSourceRoot = '' From d347b85c020f0de83bd737e9f060a79fd7e225c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 17 Sep 2020 22:29:25 +0200 Subject: [PATCH 267/463] linuxPackages.exfat-nofuse: lazier assertion (/cc #97577) I'm not sure what happens exactly. I suspect some construct like mkIf pushing into boot.kernelPackages contents and tripping on the assertion. --- pkgs/os-specific/linux/exfat/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index a92754bba7d..5e212825bab 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -3,10 +3,13 @@ # Upstream build for kernel 4.1 is broken, 3.12 and below seems to be working assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.version "4.0"; -# linux kernel above 5.7 comes with its own exfat implementation https://github.com/arter97/exfat-linux/issues/27 -assert lib.versionOlder kernel.version "5.8"; stdenv.mkDerivation rec { + # linux kernel above 5.7 comes with its own exfat implementation https://github.com/arter97/exfat-linux/issues/27 + # Assertion moved here due to some tests unintenionally triggering it, + # e.g. nixosTests.kernel-latest; it's unclear how/why so far. + assertion = assert lib.versionOlder kernel.version "5.8"; null; + name = "exfat-nofuse-${version}-${kernel.version}"; version = "2020-04-15"; From 9560e5d1aa95dc4282918f17aaf2eb8587bce2d9 Mon Sep 17 00:00:00 2001 From: mlvzk Date: Fri, 18 Sep 2020 00:52:48 +0200 Subject: [PATCH 268/463] discocss: init at 0.1.0 --- pkgs/tools/misc/discocss/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/misc/discocss/default.nix diff --git a/pkgs/tools/misc/discocss/default.nix b/pkgs/tools/misc/discocss/default.nix new file mode 100644 index 00000000000..43214c86630 --- /dev/null +++ b/pkgs/tools/misc/discocss/default.nix @@ -0,0 +1,27 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "discocss"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "mlvzk"; + repo = pname; + rev = "v${version}"; + sha256 = "1818jca3sw2ngw1n488q82w5rakx4cxgknnkmsaa0sz4h8gldfy8"; + }; + + dontBuild = true; + + installPhase = '' + install -m755 -D ./discocss $out/bin/discocss + ''; + + meta = with lib; { + description = "A tiny Discord css-injector"; + homepage = "https://github.com/mlvzk/discocss"; + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = with maintainers; [ mlvzk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35bfbcbdc73..b7c2317d2f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1806,6 +1806,8 @@ in discount = callPackage ../tools/text/discount { }; + discocss = callPackage ../tools/misc/discocss { }; + disk-filltest = callPackage ../tools/system/disk-filltest { }; diskscan = callPackage ../tools/misc/diskscan { }; From 72b9660dc18ba347f7cd41a9504fc181a6d87dc3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 17 Sep 2020 19:00:53 -0500 Subject: [PATCH 269/463] _3270font: 2.0.4 -> 2.1.0 (#98156) https://github.com/rbanffy/3270font/releases/tag/v.2.1.0 --- pkgs/data/fonts/3270font/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/3270font/default.nix b/pkgs/data/fonts/3270font/default.nix index 3338b778415..a972bd7c3d8 100644 --- a/pkgs/data/fonts/3270font/default.nix +++ b/pkgs/data/fonts/3270font/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.0.4"; + version = "2.1.0"; in -fetchzip rec { +fetchzip { name = "3270font-${version}"; - url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_ece94f6.zip"; + url = "https://github.com/rbanffy/3270font/releases/download/v.${version}/3270_fonts_fba25eb.zip"; - sha256 = "04q7dnrlq5hm30iibh3jafb33m5lwsgb3g9n9i188sg02ydkrsl9"; + sha256 = "04xqgiznd6d3c1rdbbdmd87rjy9bnhh00lm8xzmal1zidcr2g0n9"; postFetch = '' mkdir -p $out/share/fonts/ From ce6de89eeab2e4bed5098a48bdabe296b6c8971e Mon Sep 17 00:00:00 2001 From: Jason O'Conal Date: Fri, 18 Sep 2020 11:54:45 +0930 Subject: [PATCH 270/463] idea: 2020.2.1 -> 2020.2.2 --- .../editors/jetbrains/default.nix | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 9c8c9d2cdf3..2747176e01b 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -268,12 +268,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1sma3ay02lajg6q1g3k05gi7jdja7cf9rxb9v0w62s6z87l719bv"; /* updated by script */ + sha256 = "1kdlmdsfxmwks3rk2dzm5q30vwzpxcwzpyjsir122k36xnqvaqxq"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -281,12 +281,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.3"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1bk6z6mirrykypb4j2wa4744v0m9y1n7973qgj6z3dsifrq9q7zc"; /* updated by script */ + sha256 = "0iv1zmdpbqk8f4cjd6dhgj9mrvxli4dg83jzkhv566sy8wrrx7kb"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -294,12 +294,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "1r6bbx5hsg82l1pa3syfdi8nbsz6rrfszsw4dmwcnxvccp2hs3mh"; /* updated by script */ + sha256 = "18mzlqibgc6lzwhbmyrni56464qhzla9mss27d45hv0mbv087jn0"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "055hy5jy5151x3gf8hn7ar36br545qr253fz9wrc3b49wydg01x1"; /* updated by script */ + sha256 = "0kbn9q7fvhrzb1w6l8i2nv4cx8qrj74jp7fidj9yk8vkv9lfijg6"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1g18l3malsyn7dij4w83yfcsb8msa0s89mzlld3dby8hr9bq0aqm"; /* updated by script */ + sha256 = "1196zrcbgrr9271kjrzd2mzvhvxd7hkr1d2a4ij4h8f97qmsd6r6"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -333,12 +333,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.1.4"; /* updated by script */ + version = "2020.2"; /* updated by script */ description = "Create your own domain-specific language"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/mps/2020.1/MPS-${version}.tar.gz"; - sha256 = "1j5n100fl8yvfla2slm95wv499azwzzxigp1kdcaj8xbc0a0mp7c"; /* updated by script */ + url = "https://download.jetbrains.com/mps/2020.2/MPS-${version}.tar.gz"; + sha256 = "06c0yv9vvz0y5njh1sghn7ijpn1d81mxsyk5xjpj29bvvg511pjs"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0kml58v6clqj0j0vlvghrywxym2n9h41izazzn4srn7wjj9010fa"; /* updated by script */ + sha256 = "1a1vhlc2q5n3dxli0x6ppxx3mgary4gpakcxdp9nylmixjzjph6v"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0ml9fg1dlfg8sdp9n8nlsj7z88dx0ac1kvlpk61p7q5di1lyxc94"; /* updated by script */ + sha256 = "0v64f5sbv1639d6fjg0shfgdy40f1xc2zbn0jqfrx6xmkg7wgsz9"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1pkzql710bc4qdz5pdhh0yx9wkqx85qwkwm1jvvvxbvbsj299vcb"; /* updated by script */ + sha256 = "11v26hpf891nq5vj8i0ad4shhzpy8b7rvyrkr3l29dwfnd83lgpz"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1sx67bms90fsc1bf6pqz1rd1x9aysj0xxb8d7cnclz6bv8kzhgfp"; /* updated by script */ + sha256 = "1w17cf0qj0vyizkzj1frcmi52q5qxbf31msg8df38wy2l8r0b928"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; From a9cd1c3baee90d800bda42f49277bb42705f6f4b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Sep 2020 04:20:00 +0000 Subject: [PATCH 271/463] lxd: 4.5 -> 4.6 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 2a71556961e..3d62e39c6ed 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.5"; + version = "4.6"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1nszzcyn8kvpnxppjbxky5x9a8n0jfmhy20j6nrwm3196gd6hirr"; + sha256 = "011fsyafmpis6j0aq7vwd56m2mcb9v3rn4f246ms5nx6zgmga0ip"; }; postPatch = '' From 356602c5dff237ba3f9048adc03417fe83ac5232 Mon Sep 17 00:00:00 2001 From: Emanuele Peruffo Date: Fri, 18 Sep 2020 08:13:09 +0200 Subject: [PATCH 272/463] mongodb-compass: 1.17.0 -> 1.22.1 Fixes segmentation fault and upgrades the package --- pkgs/tools/misc/mongodb-compass/default.nix | 31 +++++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index bdc3ac4ddeb..ec6be6eba28 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome2, gnome3, libnotify, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: +, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib +, gnome2, gnome3, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: let - - version = "1.17.0"; + version = "1.22.1"; rpath = stdenv.lib.makeLibraryPath [ alsaLib + at-spi2-atk + at-spi2-core atk cairo cups @@ -22,6 +23,8 @@ let gnome3.gtk gnome2.pango libnotify + libsecret + libuuid libxcb nspr nss @@ -46,7 +49,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "085xq1ik8kyza1kq9kn0pf98zk6g2qa21clxhn48rgnqk20aninv"; + sha256 = "1wbjj2w4dii644lprvmwnlval53yqh4y0f58cad657jjw8101rd9"; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; @@ -62,20 +65,30 @@ in stdenv.mkDerivation { buildCommand = '' IFS=$'\n' - dpkg -x $src $out - cp -av $out/usr/* $out + + # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here + dpkg --fsys-tarfile $src | tar --extract + + mkdir -p $out + mv usr/* $out + + # cp -av $out/usr/* $out rm -rf $out/share/lintian - #The node_modules are bringing in non-linux files/dependencies + + # The node_modules are bringing in non-linux files/dependencies find $out -name "*.app" -exec rm -rf {} \; || true find $out -name "*.dll" -delete find $out -name "*.exe" -delete + # Otherwise it looks "suspicious" chmod -R g-w $out + for file in `find $out -type f -perm /0111 -o -name \*.so\*`; do echo "Manipulating file: $file" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath ${rpath}:$out/share/mongodb-compass "$file" || true + patchelf --set-rpath ${rpath}:$out/lib/mongodb-compass "$file" || true done + wrapGAppsHook $out/bin/mongodb-compass ''; From 5fa0612d85736b759dbe9b2fc1db0cc420a59233 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Thu, 17 Sep 2020 18:47:14 +0200 Subject: [PATCH 273/463] cpuid: init at 20200427 cpuid is a tool to describe x86 CPU features. This is useful for people doing low-level software development. --- pkgs/os-specific/linux/cpuid/default.nix | 50 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/os-specific/linux/cpuid/default.nix diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix new file mode 100644 index 00000000000..df0017eadc1 --- /dev/null +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + pname = "cpuid"; + version = "20200427"; + + src = fetchurl { + name = "${pname}-${version}.src.tar.gz"; + url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; + sha256 = "1m31238z2ya8f8pzpyklwp0ksf5xicqrw1z941hhhx913wzldaf1"; + }; + + # For pod2man during the build process. + nativeBuildInputs = [ perl ]; + + # As runtime dependency for cpuinfo2cpuid. + buildInputs = [ perl ]; + + # The Makefile hardcodes $(BUILDROOT)/usr as installation + # destination. Just nuke all mentions of /usr to get the right + # installation location. + patchPhase = '' + sed -i -e 's,/usr/,/,' Makefile + ''; + + installPhase = '' + make install BUILDROOT=$out + + if [ ! -x $out/bin/cpuid ]; then + echo Failed to properly patch Makefile. + exit 1 + fi + ''; + + meta = { + description = "Linux tool to dump x86 CPUID information about the CPU"; + longDescription = '' + cpuid dumps detailed information about the CPU(s) gathered from the CPUID + instruction, and also determines the exact model of CPU(s). It supports + Intel, AMD, VIA, Hygon, and Zhaoxin CPUs, as well as older Transmeta, + Cyrix, UMC, NexGen, Rise, and SiS CPUs. + ''; + + platforms = [ "i686-linux" "x86_64-linux" ]; + license = stdenv.lib.licenses.gpl2; + homepage = "http://etallen.com/cpuid.html"; + maintainers = with stdenv.lib.maintainers; [ blitz ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35bfbcbdc73..952ddd19780 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -962,6 +962,8 @@ in cozy = callPackage ../applications/audio/cozy-audiobooks { }; + cpuid = callPackage ../os-specific/linux/cpuid { }; + ctrtool = callPackage ../tools/archivers/ctrtool { }; crowbar = callPackage ../tools/security/crowbar { }; From 6dccacd3198adbe5529a8e5361922b7a3476fc74 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 18 Sep 2020 11:53:11 +0200 Subject: [PATCH 274/463] maintainers: Add NobbZ as a maintainer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d4adf05d883..ad45a68d440 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6143,6 +6143,12 @@ githubId = 6930756; name = "Nicolas Mattia"; }; + nobbz = { + name = "Norbert Melzer"; + email = "timmelzer+nixpkgs@gmail.com"; + github = "NobbZ"; + githubId = 58951; + }; nocent = { email = "nocent@protonmail.ch"; github = "nocent"; From 76e3103b7ab863e2da8ebdb2e0496d1785d8c57b Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 18 Sep 2020 12:02:47 +0200 Subject: [PATCH 275/463] exercism: Add NobbZ as maintainer --- pkgs/applications/misc/exercism/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index b1e9f3ac35a..87e59d4292f 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { inherit (src.meta) homepage; description = "A Go based command line tool for exercism.io"; license = licenses.mit; - maintainers = [ maintainers.rbasso ]; + maintainers = [ maintainers.rbasso maintainers.nobbz ]; }; } From 1e9f9492a84e3761e9aa06692e28aab1b13d4754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 18 Sep 2020 11:09:10 +0100 Subject: [PATCH 276/463] linux_zen: 5.8.7 -> 5.8.10 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 8dea4c17092..ce90893586a 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.8.7"; + version = "5.8.10"; in buildLinux (args // { @@ -12,7 +12,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-zen1"; - sha256 = "06s7dpfxvwqfyh8qm8krcaxy98ki26cgh67k12g734bclg4bqsc5"; + sha256 = "1mm4x2amnpwixvi7q8pj9my75b08ps2mafgz4j2iszpylkdzi53d"; }; extraMeta = { From 19f7f150a4ab1ff3a1583cc173ff10bcc224ffb2 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 18 Sep 2020 10:19:42 +0000 Subject: [PATCH 277/463] solfege: fix build with texinfo 6.7 makeinfo seems right to fail when input encoding is not declared and is not UTF-8. texinfo was updated in #95910. --- pkgs/misc/solfege/default.nix | 1 + pkgs/misc/solfege/texinfo.patch | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/misc/solfege/texinfo.patch diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 05e13f3c9aa..21615b0c2b6 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -15,6 +15,7 @@ buildPythonApplication rec { patches = [ ./css.patch ./menubar.patch + ./texinfo.patch ./webbrowser.patch ]; diff --git a/pkgs/misc/solfege/texinfo.patch b/pkgs/misc/solfege/texinfo.patch new file mode 100644 index 00000000000..d681b3e901b --- /dev/null +++ b/pkgs/misc/solfege/texinfo.patch @@ -0,0 +1,20 @@ +Fix build with texinfo 6.7. Otherwise + + makeinfo -I topdocs --no-split --no-headers --output AUTHORS topdocs/AUTHORS.texi + +fails with + + utf8 "\xC1" does not map to Unicode at /nix/store/...-texinfo-6.7/share/texinfo/Texinfo/ParserNonXS.pm line 1796, line 38. + +--- a/topdocs/AUTHORS.texi ++++ b/topdocs/AUTHORS.texi +@@ -1,2 +1,3 @@ + \input texinfo ++@documentencoding ISO-8859-1 + @setfilename AUTHORS.info +--- a/topdocs/README.texi ++++ b/topdocs/README.texi +@@ -1,2 +1,3 @@ + \input texinfo ++@documentencoding ISO-8859-1 + @setfilename README.info From 948d8289559e1097873a5fe9d8c398874bc4cd09 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 18 Sep 2020 12:09:42 +0200 Subject: [PATCH 278/463] uqm: Fix purity checking error during config phase Since commit fb777be7d2925ec0e97783ce5e3a0136361dc0a8, linking programs in /tmp will no longer work, since with this commit (hardcoded) /tmp will no longer be treated a valid temporary directory by the purity checking logic. Essentially what that logic does is checking whether the link target is either relative, in some temporary directory or in the Nix store and if that's not the case, an error is thrown like in this case: gcc -c /tmp/build.24.tmp.c -o /tmp/build.24.tmp.c.o gcc /tmp/build.24.tmp.c.o -o /tmp/build.24.tmp.out impure path `/tmp/build.24.tmp.out' used in link collect2: error: ld returned 1 exit status Note here, that $TMP and $TMPDIR point to /build while the output here still refers to /tmp. This is because the custom build system of uqm simply hardcodes /tmp and doesn't honor any of these variables. To fix this, all we need to do is the latter and we're now using $TMPDIR instead of /tmp for these compile-tests during configure. While the pull request[1] introducing said commit has a few comments regarding other issues and it could still be either reverted or changed, using $TMPDIR in the uqm build script is entirely backwards-compatible and shouldn't hurt in any case. [1]: https://github.com/NixOS/nixpkgs/pull/93560 Signed-off-by: aszlig --- pkgs/games/uqm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 523ae354b76..bce8fde3acd 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -65,9 +65,11 @@ in stdenv.mkDerivation rec { ln -s "${videos}" "uqm-${version}/content/addons/3dovideo" ''; - # Using _STRINGS_H as include guard conflicts with glibc. postPatch = '' + # Using _STRINGS_H as include guard conflicts with glibc. sed -i -e '/^#/s/_STRINGS_H/_UQM_STRINGS_H/g' src/uqm/comm/*/strings.h + # See https://github.com/NixOS/nixpkgs/pull/93560 + sed -i -e 's,/tmp/,$TMPDIR/,' build/unix/config_functions ''; # uqm has a 'unique' build system with a root script incidentally called From d85114062a34b7e8139b651cb00c4c8302f0008e Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 18 Sep 2020 12:44:30 +0200 Subject: [PATCH 279/463] trojita: disable withI18n by default The translation sources are too massive to reliably build. --- .../networking/mailreaders/trojita/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index 52d4d77a400..51f6b4e0622 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -18,10 +18,16 @@ , qtwebkit , qttranslations , substituteAll -, withI18n ? true +, withI18n ? false }: -mkDerivation rec { +let + l10n = fetchsvn { + url = "svn://anonsvn.kde.org/home/kde/trunk/l10n-kf5"; + rev = "1566642"; + sha256 = "0y45fjib153za085la3hqpryycx33dkj3cz8kwzn2w31kvldfl1q"; + }; +in mkDerivation rec { pname = "trojita"; version = "unstable-2020-07-06"; @@ -31,12 +37,6 @@ mkDerivation rec { sha256 = "0r8nmlqwgsqkk0k8xh32fkwvv6iylj35xq2h8b7l3g03yc342kbn"; }; - l10n = fetchsvn { - url = "svn://anonsvn.kde.org/home/kde/trunk/l10n-kf5"; - rev = "1566642"; - sha256 = "0y45fjib153za085la3hqpryycx33dkj3cz8kwzn2w31kvldfl1q"; - }; - patches = (substituteAll { # See https://github.com/NixOS/nixpkgs/issues/86054 src = ./fix-qttranslations-path.patch; From 1655af5e17969dbe526463600d8f44d29dd15773 Mon Sep 17 00:00:00 2001 From: Titouan Date: Fri, 18 Sep 2020 13:52:57 +0200 Subject: [PATCH 280/463] lazygit: 0.22.1 -> 0.22.8 --- pkgs/development/tools/lazygit/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index a0bdfdb083d..02b4d8abf24 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -1,12 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "lazygit"; - version = "0.22.1"; - - goPackagePath = "github.com/jesseduffield/lazygit"; - - subPackages = [ "." ]; + version = "0.22.8"; src = fetchFromGitHub { owner = "jesseduffield"; @@ -15,6 +11,11 @@ buildGoPackage rec { sha256 = "1jq093nsfh7xqvsjvaad9wvqd3rjrpyp5fl8qxwbhaj3sxx19v7g"; }; + vendorSha256 = null; + subPackages = [ "." ]; + + buildFlagsArray = [ "-ldflags=-X main.version=${version} -X main.buildSource=nix" ]; + meta = with stdenv.lib; { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; From deea9b8a4aef6c493b288e65032d8331f8201df2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 18 Sep 2020 08:15:40 -0400 Subject: [PATCH 281/463] linux/hardened/patches/5.8: 5.8.9.a -> 5.8.10.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 71b305a81b0..c903b88e350 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch" }, "5.8": { - "name": "linux-hardened-5.8.9.a.patch", - "sha256": "1911zxi39h2s98n7xlpym0isbdcj964ymavywvw2lh18nry8934m", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.9.a/linux-hardened-5.8.9.a.patch" + "name": "linux-hardened-5.8.10.a.patch", + "sha256": "0myfn5iz7gljj977fwsi3vzvm3n66yihrj2w207m3sr9mw9hp6d9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.10.a/linux-hardened-5.8.10.a.patch" } } From c0064c3c22ed62acc91ebdf24a19ad0c18ef1bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 14 Sep 2020 17:12:42 -0300 Subject: [PATCH 282/463] enlightenment.evisum: init at 0.5.6 --- pkgs/desktops/enlightenment/default.nix | 1 + .../desktops/enlightenment/evisum/default.nix | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/desktops/enlightenment/evisum/default.nix diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 5c6a64b1f33..80b4eb58ab5 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -8,6 +8,7 @@ #### APPLICATIONS econnman = callPackage ./econnman { }; + evisum = callPackage ./evisum { }; terminology = callPackage ./terminology { }; rage = callPackage ./rage { }; ephoto = callPackage ./ephoto { }; diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix new file mode 100644 index 00000000000..7b97d871e60 --- /dev/null +++ b/pkgs/desktops/enlightenment/evisum/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, meson, ninja, pkg-config, efl }: + +stdenv.mkDerivation rec { + pname = "evisum"; + version = "0.5.6"; + + src = fetchurl { + url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1l8pym7738kncvic5ga03sj9d5igigvmcxa9lbg47z2yvdjwzv97"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + efl + ]; + + meta = with stdenv.lib; { + description = "System and process monitor written with EFL"; + homepage = "https://www.enlightenment.org"; + license = with licenses; [ isc ]; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} From c56e8e73deaac9484dbe5add710afde0866943bb Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Tue, 15 Sep 2020 10:43:37 +0200 Subject: [PATCH 283/463] nodePackages.patch-package: init at 6.2.2 Note this also updates all node packages. --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 2343 +++++++++++------ 2 files changed, 1601 insertions(+), 743 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 8b1bf76561b..a780d3cc967 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -139,6 +139,7 @@ , "ocaml-language-server" , "parcel-bundler" , "parsoid" +, "patch-package" , "peerflix" , "peerflix-server" , "pnpm" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6b62485db05..1dbe9ac6e26 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "VHRggJbRY8vHIADWVwbq9cZux0L9LdmlN31XA3daVAI4gMkKdQEocxB7KqGDt6SfIJ3NYi/qh1nRJGooYmTBiA=="; }; }; - "@angular-devkit/architect-0.1001.1" = { + "@angular-devkit/architect-0.1001.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1001.1"; + version = "0.1001.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.1.tgz"; - sha512 = "2jRO7L/k9gNxHVJxPoUMVvtf/KzsSXNT7akbAbb8CkBJxjx3NC3Y9NssPD9E78kyiXogO6IvkwyalBGrWvOPBQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.2.tgz"; + sha512 = "05o12amjZ8NNIFehKm/lFYf12xvCclC7V5tGl/9+V7g/3pQqakwAjCysgb9T+ETffhmKhMnE8XdAJZqF7YrDcw=="; }; }; "@angular-devkit/core-10.0.7" = { @@ -67,13 +67,13 @@ let sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw=="; }; }; - "@angular-devkit/core-10.1.1" = { + "@angular-devkit/core-10.1.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.1.tgz"; - sha512 = "0ZmknL5I177JO+iOz2gDSqHtPK3zGGwyz4ix9IIu172eFRX53sdbl1vDiMikovyvZWx5fXqU3Vazf7CUeGA28w=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.2.tgz"; + sha512 = "LMxesiCuXRe3UzPdRouXsC1W73/q6rVtACVoD5GdzmmnZ7cRh7oiwonqT0lEXIKQikMsZUasUOXHD2HoKV6BoA=="; }; }; "@angular-devkit/core-9.1.12" = { @@ -94,13 +94,13 @@ let sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg=="; }; }; - "@angular-devkit/schematics-10.1.1" = { + "@angular-devkit/schematics-10.1.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.1.tgz"; - sha512 = "4UrBbDkuzGmBN1YDG3+GBJ21C+X29vxO0k2EDGrFFjQROsDeogeyWJoUP789v4JCCz9DHF2TRmdhQiEBctZXMg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.2.tgz"; + sha512 = "gS5yP8ntw3/v9zBK9kBsp5r4gYlp8cLvJ3oWLZmSvdzzbm/QznPnRKqNm72AptKrlxRFX0xyrJ7vjtLWcssqxA=="; }; }; "@angular-devkit/schematics-9.1.12" = { @@ -121,40 +121,40 @@ let sha512 = "5zXO0WfyRySZudv2/EEC/UVfG75y7TGrdMfVZNc1WP0SB54psA0U3Z3jT+6Y9VjdjmXdxjVfybhuOzZ4I1fs0Q=="; }; }; - "@antora/asciidoc-loader-2.3.3" = { + "@antora/asciidoc-loader-2.3.4" = { name = "_at_antora_slash_asciidoc-loader"; packageName = "@antora/asciidoc-loader"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.3.tgz"; - sha512 = "4dPwCnpKUrME8PZLImOD3BBcyxpaA9tAtySPKACDJPkXc24GcfjI59QbSc+shG1fKptOGaDk68O2ZMu/Gpmlhw=="; + url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.4.tgz"; + sha512 = "IQ0d/hnOCGZXzTYUwKAw2BlyRMI4Kg/zu7XejQ6ERIncjuUUv/+PhlzVxoJNT0r9uasJFHDlZ7l3X53Hn+MUuQ=="; }; }; - "@antora/content-aggregator-2.3.3" = { + "@antora/content-aggregator-2.3.4" = { name = "_at_antora_slash_content-aggregator"; packageName = "@antora/content-aggregator"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.3.tgz"; - sha512 = "ehr0VmPltRCmKuSIT5idSnI7S2sn/q9UHBdB85GsvxOqgfM08lnkZrxbdiVqmg+06rLi8qUUCLB3dI4RZ8+xvw=="; + url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.4.tgz"; + sha512 = "ZwlGm/t90PUnGVo+pir71O+wC+gyXnVuhoAed+9bBLjsiGI7EGUzwUEXSZqHRSihPx5XLFj6pZinoCGX+uabcw=="; }; }; - "@antora/content-classifier-2.3.3" = { + "@antora/content-classifier-2.3.4" = { name = "_at_antora_slash_content-classifier"; packageName = "@antora/content-classifier"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.3.tgz"; - sha512 = "VLnOIuL0uRasQsXJ8m2vjpAFdEkpWfs1L32OuVupQ1SwjpUAvJz46W3pVg9qxxEWRRjtidCvcc3KY0LI6X0Jvw=="; + url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.4.tgz"; + sha512 = "DR4I6dLSZEFOS3T0F/hYwLf3AGY2Rb3e9j8V8ygEFzdP8OySAAZWyTjjJPF4pJZqjWtqD7s7S1f5/cCI83977Q=="; }; }; - "@antora/document-converter-2.3.3" = { + "@antora/document-converter-2.3.4" = { name = "_at_antora_slash_document-converter"; packageName = "@antora/document-converter"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.3.tgz"; - sha512 = "mGdDHRxYPts3QiT/thYVoQz1QgFXN6ZFU2jgjX0VmCzcIwKGK0TOgzbp+1A3V0o92VAISEmrjC812orbtHeKqA=="; + url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.4.tgz"; + sha512 = "Fo2SKdX3BlNrvfQEBOi2II+YmYzdEqKQ5+lO2pzxJuNBfqN0kJJYYk30jFPR27h6QuU43U/XZgufyDt+FjfdZg=="; }; }; "@antora/expand-path-helper-1.0.0" = { @@ -166,67 +166,67 @@ let sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw=="; }; }; - "@antora/navigation-builder-2.3.3" = { + "@antora/navigation-builder-2.3.4" = { name = "_at_antora_slash_navigation-builder"; packageName = "@antora/navigation-builder"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.3.tgz"; - sha512 = "dx8PPFPvRBF+KInDXZU8k5dJ3sIVh1VvfsZhPUI27d5HMi+FRa0le8PK0OK5Hms4ixY/c1lXGcCAPFt0aH4Lxw=="; + url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.4.tgz"; + sha512 = "55I7p9tNTernQ/YR1+mp6RRXMV5EcU8q20Tdodt3mazdm3ObTe9E9XVAvUDFmDzRA27D0eb06jVRwLoth1gHYA=="; }; }; - "@antora/page-composer-2.3.3" = { + "@antora/page-composer-2.3.4" = { name = "_at_antora_slash_page-composer"; packageName = "@antora/page-composer"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.3.tgz"; - sha512 = "yp1bHj5twD8TbBn8MHwe7488EB+xVmbyFJBvV2GLMyiWN7DnlCaW/AaCiw05vsU4mDAd+MQ8P+KeNhDRZnlU2w=="; + url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.4.tgz"; + sha512 = "xY0O9X87DzcoP6k/5Jx55ysy0iQIhgav3q1JbOQK/FoYQYHbiQgmVWOjJdqh5nZw57ih3yE20JROPuYqOYuUZA=="; }; }; - "@antora/playbook-builder-2.3.3" = { + "@antora/playbook-builder-2.3.4" = { name = "_at_antora_slash_playbook-builder"; packageName = "@antora/playbook-builder"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.3.tgz"; - sha512 = "X9S38WgX2diZISNF4QKdF4ZfdND4ySsMlI26Iz4iybxf7xNlUJE1lAk9RM57Ooq543lEUNSnYHpECb1tog2BNw=="; + url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.4.tgz"; + sha512 = "iPjBndcoZhWqpN608WOkXKUUD94b3JX38igebshiT5/NRINJbeEclpdEX/gPv8D1Z1JcrSVGURZQO1uML76dkg=="; }; }; - "@antora/redirect-producer-2.3.3" = { + "@antora/redirect-producer-2.3.4" = { name = "_at_antora_slash_redirect-producer"; packageName = "@antora/redirect-producer"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.3.tgz"; - sha512 = "69QtpB9wPVsg7/ykJq8zYUrHywSOtfgJEizxK+GmWharjZyrMReNB7IX1pg7Dk8qI6CGB0OOkhIYC41nGmuhmg=="; + url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.4.tgz"; + sha512 = "148amiLc+1Pod6kluAOBke8OATFWFUW3LZdTPFVfqX1lJolCp5ciOnGciy52sIIysSyVkQUjotEUhqGO9Af1EQ=="; }; }; - "@antora/site-mapper-2.3.3" = { + "@antora/site-mapper-2.3.4" = { name = "_at_antora_slash_site-mapper"; packageName = "@antora/site-mapper"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.3.tgz"; - sha512 = "ERMGWl6s9B42crML7Tt4alPdJ/diSE6zQUSIMbbK7biI1EzjwxUCgKQ5lRJllUuGAdcXuYWQLGrpj/CWJzUXXA=="; + url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.4.tgz"; + sha512 = "GVghn6ausIWZlUfbEEdDD4YB7M1mWJAUMokyha9sE5w0gyYoWwukKWQiwCwk/JhvnwXunMLhEUm6y2nrHEmlLw=="; }; }; - "@antora/site-publisher-2.3.3" = { + "@antora/site-publisher-2.3.4" = { name = "_at_antora_slash_site-publisher"; packageName = "@antora/site-publisher"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.3.tgz"; - sha512 = "LAavxXd3wmH0hWqNkKMgQuj/fjE08BTO6zYR51KLBO798h0f7H0OgyBI+p8c7l/QANpAfjaWyBpbR1zOxnLCMQ=="; + url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.4.tgz"; + sha512 = "7xI/5OdjKq5tkdGzE0ABkl/QpIcgtnof+rnIWZweQKeQtA3LWutvEHtdIeXLQt0oNZmE/kf45FwC2XCg9/ptDg=="; }; }; - "@antora/ui-loader-2.3.3" = { + "@antora/ui-loader-2.3.4" = { name = "_at_antora_slash_ui-loader"; packageName = "@antora/ui-loader"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.3.tgz"; - sha512 = "bQVb6PE34iDmZj6wZZzYm3rLjguxoSqHZj4QReVQsOle/LdIwl48hV9Iz/Pivy9NtVCui9LL/lmSQzMt0G0jkw=="; + url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.4.tgz"; + sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg=="; }; }; "@apollo/federation-0.20.0" = { @@ -1345,22 +1345,22 @@ let sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="; }; }; - "@bugsnag/browser-7.3.4" = { + "@bugsnag/browser-7.3.5" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.3.4.tgz"; - sha512 = "2Og0IxymqJV5oeOuVHs/EJ0xR0V84GLcd6nZDHYSAcVU93wyb8722qfcIVx+CQRzYzoeeMmOb4n3xuuu+Svx+A=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.3.5.tgz"; + sha512 = "Zs54UH7rXJTQbcuKDr6a4Qn2SDHr7cq7XLd5EHuLCJ6OMBktBlM8vZSf1sOiCBE2EE2g/kC2rk6VJktsRIaUEA=="; }; }; - "@bugsnag/core-7.3.4" = { + "@bugsnag/core-7.3.5" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.3.4.tgz"; - sha512 = "eEm4oMw77oOvBf8lHEhWbMYrQJPc9CncVrnVmgZoWYBMeQQQ9sTMKBPEmaO1RJwyWUv/TQc5bPCpDGlGarA3qg=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.3.5.tgz"; + sha512 = "7zKFLcA6m9aaQ1p1AQx2iRaT3gE/MJqy0vGa/RhlKNdgMdMKYRGECWxJE66firvJT5ZwL7Bu11IkK6sLWHCBaw=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1372,22 +1372,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.3.4" = { + "@bugsnag/js-7.3.5" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.3.4.tgz"; - sha512 = "00jqmlvDASwCV8g0ynfWkPobSacy78yysSWhSxrwZee0C2/ewzMUjWuaRg/iwCsoTV44O09est0qWgvmK4WArA=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.3.5.tgz"; + sha512 = "5KCeFEM7ntww2UbxbgW94TEwLHKzVLepDd8TNZeae2rdInt+fTc4o9oS0QxgubdLZHdLo9LNt8GTghl6F/9NwQ=="; }; }; - "@bugsnag/node-7.3.4" = { + "@bugsnag/node-7.3.5" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.3.4.tgz"; - sha512 = "G/yL7FGXnkDRDxBR0aEhDX8iZoiGIRGX4dc5CHmpKrS0fbhszIS7ApCT4p5TnXMvZadJTYqTW5ZST2gl0khbNQ=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.3.5.tgz"; + sha512 = "eN06NgphKYikBq/AXpiLO9tNx1H7cz8C78oQnR5fj2POulj+Zm9njr9dM6DEzGIvBDt952SwwcOA73jAiOmztQ=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1399,13 +1399,13 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@chemzqm/neovim-5.1.9" = { + "@chemzqm/neovim-5.2.6" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.1.9"; + version = "5.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.1.9.tgz"; - sha512 = "lV60tnl2jcJZj3Hb+IDg6uz2zsjsB2hIGAiaW5a452SlVeLmuUoDsy2WaqRbFqcIHZKG5GTP3ttnOlB+ltHWhg=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.2.6.tgz"; + sha512 = "9R4k2fvsX79dsNjxEjJaAlhdAZKx/DBGPHOXR3TVwJhX0TFPi9fvmHqJ8YFkAOweAVTXaiOdHv/LMerSBsA5Pw=="; }; }; "@cliqz-oss/firefox-client-0.3.1" = { @@ -1633,67 +1633,76 @@ let sha512 = "W98NvvOe/Med3o66xTO03pd7a2omZebH79PV64gSE+ceDdU8uxQhFTa7ISiD1kseyqyOrMyW5/MNdsGEU02i3Q=="; }; }; - "@fluentui/date-time-utilities-7.8.0" = { + "@fluentui/date-time-utilities-7.8.1" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "7.8.0"; + version = "7.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.8.0.tgz"; - sha512 = "qzlTp3t+PghebJsLK9JwZr91qBRZ/fOml8TQCIjdtsEn4mH6/ciCwir7Fj8iOEkwwTC0iKsEr1jfsITtJKWSmA=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.8.1.tgz"; + sha512 = "2FsR7scZ6yS9h7MEUAunpLLYpHp4z7+DVgGlIBlNeL7YD5Vl0msj4pn7zRd1pcGfvoQfkWz3+ju3rBBl4LV4wQ=="; }; }; - "@fluentui/keyboard-key-0.2.11" = { + "@fluentui/dom-utilities-1.1.1" = { + name = "_at_fluentui_slash_dom-utilities"; + packageName = "@fluentui/dom-utilities"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-1.1.1.tgz"; + sha512 = "w40gi8fzCpwa7U8cONiuu8rszPStkVOL/weDf5pCbYEb1gdaV7MDPSNkgM6IV0Kz+k017noDgK9Fv4ru1Dwz1g=="; + }; + }; + "@fluentui/keyboard-key-0.2.12" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.2.11"; + version = "0.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.11.tgz"; - sha512 = "4iG5vNlRD3PrLaMfDTimHNOP1x6V3Dad0fXOwtvBBMsfdySPE9zlY+G+0aqCFcgjymOriFOk0ANZVBpK7XrnTg=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.12.tgz"; + sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.137.1" = { + "@fluentui/react-7.138.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.137.1"; + version = "7.138.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.137.1.tgz"; - sha512 = "u9qlBobDBjqwOK3vN7N7NoS53RuPXvcpVMOaK5oPRBMdCTsEDcK9pZj/OrKDSGVKmnPRGpoAdNAgsx34QaOfyQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.138.0.tgz"; + sha512 = "fekFIGSMqzSUbiqwm1GvYZ+BvmBPHwP0sUcoNct92WCTrfcwnHhX7q770RbcRGGG7K9OuasbGafP3auFHSz7FQ=="; }; }; - "@fluentui/react-focus-7.16.0" = { + "@fluentui/react-focus-7.16.5" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.0.tgz"; - sha512 = "TwB4Av7ID70ejisDIGkCZGKOxlquSazr6W+9Jv1JQAvsBLuj5XOspFJH4/Igjniw1LeO9QmAvFZeh/XRShiObw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.5.tgz"; + sha512 = "FlRqYSzkptXuKvsIiI9m1tf7g5pRcbu9S9rK6c8pHax/kDRsBuDRW2OajxjVYR36B6IyAgYjylWdk6zBJI5oSQ=="; }; }; - "@fluentui/react-icons-0.3.0" = { + "@fluentui/react-icons-0.3.4" = { name = "_at_fluentui_slash_react-icons"; packageName = "@fluentui/react-icons"; - version = "0.3.0"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.3.0.tgz"; - sha512 = "QDrIhLUpkxM5q5bFE4pkweJJsfaNswdfDoc+X6cmr22Dii+anDFTpOcePEJiTtILxdlEmH0968OcZ4BGZF/joQ=="; + url = "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.3.4.tgz"; + sha512 = "/6xyGL7EQVCn9TP1eV+VjKS0HuC7WGZHs0t604E40LEE1HCIbXx7Jm1KDlMqP36n1W8XVDgyEZlffTmEOVGRkg=="; }; }; - "@fluentui/react-window-provider-0.3.0" = { + "@fluentui/react-window-provider-0.3.3" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "0.3.0"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-0.3.0.tgz"; - sha512 = "zHeH1PAmoFB3OkgU8f51E3oGHrL/CjuvdPBlb1SGpByUGNihAgH/CwvJohV9z0yPDkq+chfNUmxWA/oDVpbh6Q=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-0.3.3.tgz"; + sha512 = "MVPf2hqOQ17LAZsuvGcr3oOHksAskUm+fCYdXFhbVoAgsCDVTIuH6i8XgHFd6YjBtzjZmI4+k/3NTQfDqBX8EQ=="; }; }; - "@fluentui/theme-0.2.0" = { + "@fluentui/theme-0.3.2" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "0.2.0"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-0.2.0.tgz"; - sha512 = "L5OwqymTdxTVwBa3ifkQLF1A3YU6WMkMTk6PFIMfOonjt8LJ3yMMqZgz+KQR3sF/tzgy4wzW4oBmrxtTfJS2EQ=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-0.3.2.tgz"; + sha512 = "Yt4VK2NKTc+Sao0+ZguXiQ0ZpN74h+7c+7YAyxaao2R/nwSHSnmH42VVlzBN+aL5kYDrbQ4P9Z8zPIwKEZ1u3A=="; }; }; "@graphql-cli/common-4.0.0" = { @@ -2038,6 +2047,24 @@ let sha512 = "44DWNv5gDR9EwrCTVQ4ZC99yPqVS0VCWrYIBl45qNR8XQy+4lbl0IQG8kBDf6NHwj4Ib4c2z1Fq1IUJOCbkZcw=="; }; }; + "@kwsites/file-exists-1.1.1" = { + name = "_at_kwsites_slash_file-exists"; + packageName = "@kwsites/file-exists"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz"; + sha512 = "m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw=="; + }; + }; + "@kwsites/promise-deferred-1.1.1" = { + name = "_at_kwsites_slash_promise-deferred"; + packageName = "@kwsites/promise-deferred"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz"; + sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; + }; + }; "@lerna/add-3.21.0" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; @@ -2569,13 +2596,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.90" = { + "@microsoft/load-themed-styles-1.10.93" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.90"; + version = "1.10.93"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.90.tgz"; - sha512 = "nJaQ6Yij68+GeaSt5ZgK70l5dn2aNGlc9EeES2B054anZTmmBhfaGpciIoSyPZrOg6PSAJjGWTXwd1ovMKOk1w=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.93.tgz"; + sha512 = "iziiQyDJmyP8QE33hYjuVsj18RvtzRMdON1QLDkJSrs9xisXWgEjK8U12UsEkBYpYXzxPxqq5+X+fK8Vs6g8vQ=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -2614,22 +2641,22 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-3.3.5" = { + "@netlify/build-4.0.4" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "3.3.5"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-3.3.5.tgz"; - sha512 = "QhPsiexwv2pKJTCvxiOKYaR5LmQS1H9hlF+8PzZBqk/rUUQAt9y6L6gQQJ1hnXEdsFIQGUqBG0aPolKgWQ3H7A=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-4.0.4.tgz"; + sha512 = "TXVFLp2z96Dl5MfaB0LgTIlD+9IThnjAsYsRrMJZXugOBgsIQzJr/uJql4ISKcK3b33T46amYT6+ULB6ZVJeLw=="; }; }; - "@netlify/cache-utils-1.0.2" = { + "@netlify/cache-utils-1.0.3" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.2.tgz"; - sha512 = "5eB8PpX4UaJsgVWwV+TSuGyzi/rysCqTSZzVVJVDSVr0sQa574N6LmLWuYl0WJluSTWeYtUUlATLeP838FaZfQ=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.3.tgz"; + sha512 = "M7hr8JDirjF9o+7JbHy0T59hfhQL7t9ywTpQ4h625jnJO7BaW+w0Y2CrH0M3QOfdukdof7rkUM2eyR8G0ReSZw=="; }; }; "@netlify/config-0.11.11" = { @@ -2641,31 +2668,31 @@ let sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; }; }; - "@netlify/config-2.1.3" = { + "@netlify/config-2.1.5" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-2.1.3.tgz"; - sha512 = "rasNRIFI/U6j293k46capM+b9yc+NT/wfnqtSjd+WGsXuj6O4iMXuN5gpNteKg5RYGFP4mAkP4BjM+//OBFtvg=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-2.1.5.tgz"; + sha512 = "bsREmA1xLdThEZZwTcDZuTgu+eUO6bQJ/xLGmrCcerUn90lY7zh/P5w+1p5Kx0ebGeRQxQAmm1L9vQs2wUPcLg=="; }; }; - "@netlify/functions-utils-1.2.8" = { + "@netlify/functions-utils-1.2.9" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.2.8.tgz"; - sha512 = "Pi0IJ4REgr7AWu6dbOjlTMHB3v5s5ZXQboyCrgf9eYe7lVZRKtNrMjYtk3XMGAyL0MFmJFGeO8vIbp5ToQppsQ=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.2.9.tgz"; + sha512 = "1iMgfIMDy38ip7hAZd644BJ7he641xeGyG7MkPZtuxESfYfS6IrWiPNMu1NcVsNytXFLIFVg4m8LD6IBSiz1EQ=="; }; }; - "@netlify/git-utils-1.0.1" = { + "@netlify/git-utils-1.0.2" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.1.tgz"; - sha512 = "HiKpGyEHOW5ajkU/sQ8mSRIZvznC8GK1AAZWIeBmVRwZIzTykgmZM+HVjPUhfeFH+RK5bWQB4vg7dod2UttI8A=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.2.tgz"; + sha512 = "rqaCUHlJFYwvcCL8l+wp/YMhGkuXo2ceEf9fpHCN8GFOlU3kSu0NLRlKFohIFk1pdrymG1D3M7Pt+s62EKLjwA=="; }; }; "@netlify/open-api-0.16.0" = { @@ -2677,13 +2704,22 @@ let sha512 = "o3QI9hAe6lspQysWrB8CygMO4h+7B4qtPDkacitZ4VPBR26rX2TASq0/x1TNa4TnFG2lNgzkuBWhtXAmd/9tdw=="; }; }; - "@netlify/run-utils-1.0.0" = { + "@netlify/plugin-edge-handlers-1.1.0" = { + name = "_at_netlify_slash_plugin-edge-handlers"; + packageName = "@netlify/plugin-edge-handlers"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.1.0.tgz"; + sha512 = "JR7d1u48ne9+Y2bRGYmYvWDaGhkZccZuw12ba63q6EJTHMC+hMp8t+Le1G6Bds+SEEox4npt0VHyHfuWmCcMaA=="; + }; + }; + "@netlify/run-utils-1.0.1" = { name = "_at_netlify_slash_run-utils"; packageName = "@netlify/run-utils"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.0.tgz"; - sha512 = "TcdVJZ3J4iu+WYV9sLMBOr1jW2+XgLtIt1LfGYqsH+yqfkWoWavV27y5ttznM1BODFYQb9fMJG/xO2wAeXCzMw=="; + url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.1.tgz"; + sha512 = "fx0A9xVgFQXjZ/uZCa4XtlaO7mPgwhanVHwQAcBDGOwps8fhuaVITCcPy/kPv+igOimvqWzOD3x/F0OrsXGpBw=="; }; }; "@netlify/zip-it-and-ship-it-1.3.12" = { @@ -3217,6 +3253,15 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; + "@rollup/plugin-babel-5.2.1" = { + name = "_at_rollup_slash_plugin-babel"; + packageName = "@rollup/plugin-babel"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.2.1.tgz"; + sha512 = "Jd7oqFR2dzZJ3NWANDyBjwTtX/lYbZpVcmkHrfQcpvawHs9E4c0nYk5U2mfZ6I/DZcIvy506KZJi54XK/jxH7A=="; + }; + }; "@rollup/plugin-commonjs-13.0.2" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; @@ -3226,6 +3271,24 @@ let sha512 = "9JXf2k8xqvMYfqmhgtB6eCgMN9fbxwF1XDF3mGKJc6pkAmt0jnsqurxQ0tC1akQKNSXCm7c3unQxa3zuxtZ7mQ=="; }; }; + "@rollup/plugin-commonjs-15.0.0" = { + name = "_at_rollup_slash_plugin-commonjs"; + packageName = "@rollup/plugin-commonjs"; + version = "15.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.0.0.tgz"; + sha512 = "8uAdikHqVyrT32w1zB9VhW6uGwGjhKgnDNP4pQJsjdnyF4FgCj6/bmv24c7v2CuKhq32CcyCwRzMPEElaKkn0w=="; + }; + }; + "@rollup/plugin-json-4.1.0" = { + name = "_at_rollup_slash_plugin-json"; + packageName = "@rollup/plugin-json"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz"; + sha512 = "yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw=="; + }; + }; "@rollup/plugin-node-resolve-8.4.0" = { name = "_at_rollup_slash_plugin-node-resolve"; packageName = "@rollup/plugin-node-resolve"; @@ -3235,6 +3298,15 @@ let sha512 = "LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ=="; }; }; + "@rollup/plugin-node-resolve-9.0.0" = { + name = "_at_rollup_slash_plugin-node-resolve"; + packageName = "@rollup/plugin-node-resolve"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-9.0.0.tgz"; + sha512 = "gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg=="; + }; + }; "@rollup/pluginutils-3.1.0" = { name = "_at_rollup_slash_pluginutils"; packageName = "@rollup/pluginutils"; @@ -3262,13 +3334,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-10.1.1" = { + "@schematics/angular-10.1.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.1.tgz"; - sha512 = "U+5CfLlMqgkfRWZpmA3yzr+Axj1D42k0+tkfuaBrJTJUf5j7+JyULONPvzUh4Pi1c4EZJt+RuCE+AxtUZO/hug=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.2.tgz"; + sha512 = "7BHgSdP4yC0IuoiPGWBGQrwE5ilBhIOGozjKSHx41Utac45YKyXpmjr1Jw+SvFilgsnPEjZwc7VKqgINmeLkqA=="; }; }; "@schematics/schematics-0.1000.7" = { @@ -3280,13 +3352,13 @@ let sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw=="; }; }; - "@schematics/update-0.1001.1" = { + "@schematics/update-0.1001.2" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1001.1"; + version = "0.1001.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.1.tgz"; - sha512 = "71PyE0pTW2u3PPkNBdCXO0gH9pwTgZCfsHNNOWsIsslDDHYHGknJagN0JM/X1YAJ0nVZPgvMC0GSJ/xtIoCZmA=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.2.tgz"; + sha512 = "Z/P08k4FlbKNmxV5pe34yfKPLI2327CjBg26isO5qpR4nB1FVZkC39YXwFwJod3nU7DE6UMkKcA749k30k2KSg=="; }; }; "@serverless/cli-1.5.2" = { @@ -3307,13 +3379,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.1.2" = { + "@serverless/components-3.1.3" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.1.2.tgz"; - sha512 = "qkelIDlMMRRioY1iijRl7RA/ojoYZ/4Kh2EqcQRcQQzPz7yKICKpOuqA0Juq/ZW3zX2V18MXRvemJ/tNwPPZrQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.1.3.tgz"; + sha512 = "WVPM0lVwzzg1KuCGVWNnps/X4IyLdkFQ34XLLJq6PMtsOxeYs9GMg5j8C9TBrWN2s9eJjUpu2fq0KOt2L/s5yQ=="; }; }; "@serverless/core-1.1.2" = { @@ -3325,13 +3397,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-4.0.2" = { + "@serverless/enterprise-plugin-4.0.4" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "4.0.2"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.0.2.tgz"; - sha512 = "jad3tvY6N89Pm35cKjjG56usXIs+Txg9UBMCWAZ/b64hdJ2gXrAzKM3qrS/7CoRj0yI1cefxKKzj04AihDNimg=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.0.4.tgz"; + sha512 = "B+I1tZWWJN2Ziwp34FZ9umbu6cZ5Pv8lHA6iOtYzMqq6r22xF/9rwxY3fCdguo+Szd6t7RFb0zIW2RuBRgktVA=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -3361,6 +3433,15 @@ let sha512 = "vMCYRdDaqQjPDlny3+mVNy0lr1P6RJ7hVkR2w9Bk783ZB894hobtMrTm8V8OQPwOvlAypmLnQsLPXwRNM+AMsw=="; }; }; + "@serverless/platform-client-2.0.2" = { + name = "_at_serverless_slash_platform-client"; + packageName = "@serverless/platform-client"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-2.0.2.tgz"; + sha512 = "3guXwRmHOujBy6Lmf7THtnfJQcLRYzpTRpL1rCxLko7OtIWcOth3TvW2JtWNu6qubauA+5kpLB2rdCaPefZYbQ=="; + }; + }; "@serverless/platform-client-china-1.0.37" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; @@ -3397,13 +3478,13 @@ let sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; }; }; - "@serverless/utils-china-0.1.27" = { + "@serverless/utils-china-0.1.28" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.27"; + version = "0.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.27.tgz"; - sha512 = "ZQDTtmFBD2xl23YFFMVOTmqsgqtcxk9WKBGdixZ3ZY2MxAjrNJvBE0vPCRsYrQCs0I+TzdPDRIPSrOUJh7cpiw=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.28.tgz"; + sha512 = "nxMBES1wR+U1U8UWaWd7CwKmoY18SRHT6h39ux8YGXgxeRd9pqKB4/TTLX4hHYMsqHteXufpFZQIhl0aGf9oww=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -4459,13 +4540,13 @@ let sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw=="; }; }; - "@types/node-10.17.32" = { + "@types/node-10.17.35" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.32"; + version = "10.17.35"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.32.tgz"; - sha512 = "EUq+cjH/3KCzQHikGnNbWAGe548IFLSm93Vl8xA7EuYEEATiyOVDyEVuGkowL7c9V69FF/RiZSAOCFPApMs/ig=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.35.tgz"; + sha512 = "gXx7jAWpMddu0f7a+L+txMplp3FnHl53OhQIF9puXKq3hDGY/GjH+MF04oWnV/adPSCrbtHumDCFwzq2VhltWA=="; }; }; "@types/node-12.7.12" = { @@ -4477,13 +4558,13 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.19" = { + "@types/node-13.13.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.19"; + version = "13.13.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.19.tgz"; - sha512 = "IVsULCpTdafcHhBDLYEPnV5l15xV0q065zvOHC1ZmzFYaBCMzku078eXnazoSG8907vZjRgEN/EQjku7GwwFyQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.21.tgz"; + sha512 = "tlFWakSzBITITJSxHV4hg4KvrhR/7h3xbJdSFbYJBVzKubrASbnnIFuSgolUh7qKGo/ZeJPKUfbZ0WS6Jp14DQ=="; }; }; "@types/node-14.0.26" = { @@ -4495,22 +4576,22 @@ let sha512 = "W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA=="; }; }; - "@types/node-14.10.1" = { + "@types/node-14.11.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.10.1"; + version = "14.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.10.1.tgz"; - sha512 = "aYNbO+FZ/3KGeQCEkNhHFRIzBOUgc7QvcVNKXbfnhDkSfwUv91JsQQa10rDgKSTSLkXZ1UIyPe4FJJNVgw1xWQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz"; + sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-6.14.11" = { + "@types/node-6.14.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.14.11"; + version = "6.14.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.14.11.tgz"; - sha512 = "htzPk08CmbGFjgIWaJut1oW2roZAAQxxOhkhsehCVLE7Uocx9wkcHfIQYdBWO7KqbuRvYrdBQtl5h5Mz/GxehA=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.14.12.tgz"; + sha512 = "7iPCCv/SOqeGvz3CcBBnhG+3vBMntO3SMVcyUHmrJq6Lzdbi4dtSxk3JkIUm+JDGnT26mtxlNQHmTKlvDnjFwg=="; }; }; "@types/node-fetch-2.5.7" = { @@ -4585,13 +4666,13 @@ let sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="; }; }; - "@types/qs-6.9.4" = { + "@types/qs-6.9.5" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.4"; + version = "6.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz"; - sha512 = "+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz"; + sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="; }; }; "@types/range-parser-1.2.3" = { @@ -4945,67 +5026,67 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@uifabric/foundation-7.9.0" = { + "@uifabric/foundation-7.9.5" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.0"; + version = "7.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.0.tgz"; - sha512 = "4gdPwx0HV59aWvPKIw6yIje60CYwJZmTJsdLRXqh8Np1tWp2EsbA8U/IHQL1V91rEN0DlQhASqCDFhfQoD1jUw=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.5.tgz"; + sha512 = "r4KjYJAjSRgBGqeJXGKogYgzJS55/zcxmU3Gsps0BCMP8SCn55KZ31KiMYmjxoNnJAlGnhIq+h5zUEVRhpHN/Q=="; }; }; - "@uifabric/icons-7.5.0" = { + "@uifabric/icons-7.5.5" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.0"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.0.tgz"; - sha512 = "RINA9VkajlCnlwEBbqiwLBaaGn38Bf9UvjOuwrrja4B9lclLeQzZuGrG/kp7CnDtIO+LC19OYl/7E3jW7yIihA=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.5.tgz"; + sha512 = "lErlirRm3D4Lv63oxa/JFx+JUyHRX/pqNoolLQKlPKqNauHFcrcEEDRuZdtfSOJtF/1a09ZvIyirij3XwZjNBw=="; }; }; - "@uifabric/merge-styles-7.18.0" = { + "@uifabric/merge-styles-7.19.1" = { name = "_at_uifabric_slash_merge-styles"; packageName = "@uifabric/merge-styles"; - version = "7.18.0"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.18.0.tgz"; - sha512 = "805WIbN7lAJATXKxZjjRbIgN7raRMwWYWeDkJJ52PCPuCesOvbpdr0GkH8rC6GQ7EB0MB7YM2i6Fiye7SFewbw=="; + url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.19.1.tgz"; + sha512 = "yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A=="; }; }; - "@uifabric/react-hooks-7.13.0" = { + "@uifabric/react-hooks-7.13.4" = { name = "_at_uifabric_slash_react-hooks"; packageName = "@uifabric/react-hooks"; - version = "7.13.0"; + version = "7.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.0.tgz"; - sha512 = "A7K0YFHHr10hB/txsqpPX6PhNhHEv8U7JpY3O81oqlZwSsHroJklQdd897JkAYJUUR+gWe2kQyXkkcaMDdqXjg=="; + url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.4.tgz"; + sha512 = "hyL3eQqbS7DrZCpkF1QDrC0TX+dV+yZZr5UgT3wAZMtzEMBFVgaiPHdv0zHgUbiQv5ktbQoY7yQp7clfVN65DA=="; }; }; - "@uifabric/set-version-7.0.22" = { + "@uifabric/set-version-7.0.23" = { name = "_at_uifabric_slash_set-version"; packageName = "@uifabric/set-version"; - version = "7.0.22"; + version = "7.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.22.tgz"; - sha512 = "IG35UNJNxqI7NC2eYuobGTD+v4W0VHQcC3bYd5Na9EgoC9jVgguS8n6EXUtP/lC1vJEYEyPEZdVwhPxKw4F4Sw=="; + url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.23.tgz"; + sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; }; }; - "@uifabric/styling-7.16.0" = { + "@uifabric/styling-7.16.5" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.0.tgz"; - sha512 = "yO404ws8Wl4fjBwG4T58TFJjeU/K+SpWJ4w+WeNMDlJcYe4zXaWn2lbOJtKtQiMl324RAEjFSOuNkXzPb0uOGQ=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.5.tgz"; + sha512 = "mJcPam0ivtGfC8NEUQgpJFs8uG4ZRY1ml1RY9rOY6py5pTEno15xaq11yfRxv3ACxkuK9D9qZM23x0q8sWsCdg=="; }; }; - "@uifabric/utilities-7.31.0" = { + "@uifabric/utilities-7.32.2" = { name = "_at_uifabric_slash_utilities"; packageName = "@uifabric/utilities"; - version = "7.31.0"; + version = "7.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.31.0.tgz"; - sha512 = "m4Yeyn4gyW7xS8LvOnCesokPModYS2YuE9GQmO++MDZ/vC5RRNlvlyktUZDuxCZ84cNCiXyTQ8nImBaPGnxHVQ=="; + url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.32.2.tgz"; + sha512 = "x47zJIjezkfed17EfNRTr9wP6hHR+i0pBbr3eQYetpcVsAXcbZsd+D6divwy+kQOsdLQ8TozWqoVk3ySe6RfSw=="; }; }; "@vue/cli-shared-utils-4.5.6" = { @@ -5044,76 +5125,76 @@ let sha512 = "4Lpf59lr0pycIzKdTlZsgubJxCHDkAqcc4I60Gp6rggueksuhz2q3rAp7kfxwCzaZlAXXsqy6hoeyj+3sukqDQ=="; }; }; - "@vue/compiler-core-3.0.0-rc.10" = { + "@vue/compiler-core-3.0.0-rc.13" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.0-rc.10"; + version = "3.0.0-rc.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0-rc.10.tgz"; - sha512 = "kQzHzRsM0NPAWHeqSTb2J4VsHhjRkGeLTsGzeMnW+sojgTnS3T94KacwvYgVS4qeZAKiDq0bMNZoJWrHVQ3T8g=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0-rc.13.tgz"; + sha512 = "bVtg7iilAE8uq+WvR4JN+vtzQWX+yjKHNG5Un0ar6M9WbphydGY9C0y1whKjRbKn/7U+evUh1MJ2hV2q3GBrSQ=="; }; }; - "@vue/compiler-dom-3.0.0-rc.10" = { + "@vue/compiler-dom-3.0.0-rc.13" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.0-rc.10"; + version = "3.0.0-rc.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.10.tgz"; - sha512 = "pqIUf5leZm0P9379utrRSVBMxhV8XaqJTEFFp5etCtbEa/H5ALs29EjFMtMcm9sQaVkZlKLu86mgIacbYB9Q3w=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.13.tgz"; + sha512 = "D0x6cZFiDfz+rcmWSgvgxjhVQOADMmQy7kcbft3u5nlTurZaztBNBz7pwHYi57/z3FjhzyclpDf0daOrRvph4A=="; }; }; - "@vue/compiler-sfc-3.0.0-rc.10" = { + "@vue/compiler-sfc-3.0.0-rc.13" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.0-rc.10"; + version = "3.0.0-rc.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.10.tgz"; - sha512 = "VIJ+VXqeM7WoRNgD9uYSARVb6CYq+JS2NNHfeerfNc7Uk3pjYHRv1MwEicAvN6zWFm5GLC1ZYTVD+WFg3xGAkQ=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.13.tgz"; + sha512 = "b98HQgq1dEWqWUzUFMnGxeRpuOfbehCCWbT6+cH+SARNVwUi+/5UPHLxJ58GyXlyy6hMY6IDr6TUmGPG1aXV7A=="; }; }; - "@vue/compiler-ssr-3.0.0-rc.10" = { + "@vue/compiler-ssr-3.0.0-rc.13" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.0-rc.10"; + version = "3.0.0-rc.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.10.tgz"; - sha512 = "JBPil8sO5j7puB8acX2CQMRXEYB/EP8PoEur7RcF/+aqATI7C4yqWcSLC5TRJpigj6xE6ku6sx8om+j7ZHvgBw=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.13.tgz"; + sha512 = "BEVx2BXMJwzpmNI63YDtEMLdnLysMHbBwrapXiX421FwEAL8gwHE0rTc9WgcresegEmDuCmZTi/LnwcEooO+8Q=="; }; }; - "@vue/reactivity-3.0.0-rc.10" = { + "@vue/reactivity-3.0.0-rc.13" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.0-rc.10"; + version = "3.0.0-rc.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0-rc.10.tgz"; - sha512 = "mkUZfOJlbqGZx2cARmhCs5r2+xLJPL7VFNagmlA3Fd66ZXBc3ZvTQdYsY4VUbYJFe5ByIzqu9TZiAkzXY+JVaA=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0-rc.13.tgz"; + sha512 = "I4E9/3ZGejuNfUbpbgtWWDGas3qIGqqvjUeMEuDGbJfaUluZauSKXPRKjfGPz+esmgwvGAWjkcFeyyiYY4RSNQ=="; }; }; - "@vue/runtime-core-3.0.0-rc.10" = { + "@vue/runtime-core-3.0.0-rc.13" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.0-rc.10"; + version = "3.0.0-rc.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0-rc.10.tgz"; - sha512 = "VK/kq4gDDoqZ45CVwdbLLpikXLYLCt6YLhdgXX3fhf20gvPqrbEZv1ZNLruNnhhTpf9cLyU4tZ18DHeaUYPziw=="; + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0-rc.13.tgz"; + sha512 = "N5xGV6s/LaXybNt81XdBdil6exMoI1HPd0FeURnmhHfUizI41xq4yrWO+Yi44XO+R8xFcfxYECBaPqk0jPLgsg=="; }; }; - "@vue/runtime-dom-3.0.0-rc.10" = { + "@vue/runtime-dom-3.0.0-rc.13" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.0-rc.10"; + version = "3.0.0-rc.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.10.tgz"; - sha512 = "bH4GuneHt3FQ+/21jba5orM/CO9N1cnT7J3wtrxopFJ4/4H5cvHXyG6v+ZVTu1d733Ij/6yMRA7xbtfi9a4zJw=="; + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.13.tgz"; + sha512 = "o3Y9qlS3w8gqaj/vc99Z0DA2yETQFH8Q+qvxZstvRTEOYGEzxualIkBpCBXkPEXVSaing3Gbd4wso764RUZjkQ=="; }; }; - "@vue/shared-3.0.0-rc.10" = { + "@vue/shared-3.0.0-rc.13" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.0-rc.10"; + version = "3.0.0-rc.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0-rc.10.tgz"; - sha512 = "fI6gVhhgb3cAmEkY4oeVVA2hWZ2xvkgogHdBI5PL7gSvZnOB6XZ2eQGsYjC4W+7BegvEkoMBuZsFXVa4ZQ07XQ=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0-rc.13.tgz"; + sha512 = "8zEVHmffW1P8Wlt8P63N+zKJrmzL6y0P2P6biWdl4CI9E5QVKlbOEYl7i+tU/dpa6oLj6nEzBxUCwA7UHvcPkw=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -6997,6 +7078,15 @@ let sha512 = "B9IZjlGwaxF33UN4oPbfBkyA4V1SxNLeIhR1qY8sRXSsbdUkEHrrOvwlYFPx+8uQeCe9M+FG6KgO+imDmQ79CQ=="; }; }; + "archiver-5.0.2" = { + name = "archiver"; + packageName = "archiver"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/archiver/-/archiver-5.0.2.tgz"; + sha512 = "Tq3yV/T4wxBsD2Wign8W9VQKhaUxzzRmjEiSoOK0SLqPgDP/N1TKdYyBeIEu56T4I9iO4fKTTR0mN9NWkBA0sg=="; + }; + }; "archiver-utils-1.3.0" = { name = "archiver-utils"; packageName = "archiver-utils"; @@ -8104,13 +8194,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.751.0" = { + "aws-sdk-2.755.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.751.0"; + version = "2.755.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.751.0.tgz"; - sha512 = "0lo7YKTfjEwoP+2vK7F7WGNigvwFxqiM96PzBaseOpOelfhFHPKEJpk2Poa12JI89c8dGoc1PhTQ1TSTJK3ZqQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.755.0.tgz"; + sha512 = "APei6/d3ki6wi9pp6XvQ7QTiOhDBCo1qCOQZ5n8POUE1yrB7/6SNWami9OTj2TavFvnz7OuPr5YZ2/Ra45N49A=="; }; }; "aws-sign2-0.6.0" = { @@ -9031,6 +9121,15 @@ let sha1 = "e24ebfa6b63cb0387c5fc174f86e5cc812ca7cc9"; }; }; + "binary-0.3.0" = { + name = "binary"; + packageName = "binary"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; + sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; + }; + }; "binary-extensions-1.13.1" = { name = "binary-extensions"; packageName = "binary-extensions"; @@ -9796,13 +9895,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.14.2" = { + "browserslist-4.14.3" = { name = "browserslist"; packageName = "browserslist"; - version = "4.14.2"; + version = "4.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz"; - sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.3.tgz"; + sha512 = "GcZPC5+YqyPO4SFnz48/B0YaCwS47Q9iPChRGi6t7HhflKBcINzFrJvRfC+jp30sRMKxF+d4EHGs27Z0XP1NaQ=="; }; }; "bser-2.1.1" = { @@ -9985,6 +10084,15 @@ let sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; }; }; + "buffer-indexof-polyfill-1.0.2" = { + name = "buffer-indexof-polyfill"; + packageName = "buffer-indexof-polyfill"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz"; + sha512 = "I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A=="; + }; + }; "buffer-queue-1.0.0" = { name = "buffer-queue"; packageName = "buffer-queue"; @@ -10552,13 +10660,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001129" = { + "caniuse-lite-1.0.30001131" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001129"; + version = "1.0.30001131"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001129.tgz"; - sha512 = "9945fTVKS810DZITpsAbuhQG7Lam0tEfVbZlsBaCFZaszepbryrArS05PWmJSBQ6mta+v9iz0pUIAbW1eBILIg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001131.tgz"; + sha512 = "4QYi6Mal4MMfQMSqGIRPGbKIbZygeN83QsWq1ixpUwvtfgAZot5BrCKzGygvZaV+CnELdTwD0S4cqUNozq7/Cw=="; }; }; "capital-case-1.0.3" = { @@ -10696,6 +10804,15 @@ let sha1 = "11a05102d1c4c785b6d0415d336d5a3a1612913e"; }; }; + "chainsaw-0.1.0" = { + name = "chainsaw"; + packageName = "chainsaw"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; + sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; + }; + }; "chalk-0.4.0" = { name = "chalk"; packageName = "chalk"; @@ -11911,13 +12028,13 @@ let sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; }; }; - "coc.nvim-0.0.77" = { + "coc.nvim-0.0.79" = { name = "coc.nvim"; packageName = "coc.nvim"; - version = "0.0.77"; + version = "0.0.79"; src = fetchurl { - url = "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.77.tgz"; - sha512 = "wwn3ca7iMKuH/a6NAV7HL95xkEK5DzrKJ1dWGKBs+HZHFLhzXVYhjA0RL8x8Xf62TBEQGhH1wlKtBxkluGd1oQ=="; + url = "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.79.tgz"; + sha512 = "tge3BeOtehBouqo8sdrjRuQxsAWuwUxWJN1pTttZ8HpV+fe2fxmBE9lqrzzOlRIysBvgsZr7D0FdNfrwRwpK8A=="; }; }; "code-error-fragment-0.0.230" = { @@ -12577,6 +12694,15 @@ let sha512 = "FyDqr8TKX5/X0qo+aVfaZ+PVmNJHJeckFBlq8jZGSJOgnynhfifoyl24qaqdUdDIBe0EVTHByN6NAkqYvE/2Xg=="; }; }; + "compress-commons-4.0.1" = { + name = "compress-commons"; + packageName = "compress-commons"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.0.1.tgz"; + sha512 = "xZm9o6iikekkI0GnXCmAl3LQGZj5TBDj0zLowsqi7tJtEa3FMGSEcHcqrSJIrOAk1UG/NBbDn/F1q+MG/p/EsA=="; + }; + }; "compressible-2.0.18" = { name = "compressible"; packageName = "compressible"; @@ -12829,13 +12955,13 @@ let sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; }; }; - "consolidate-0.15.1" = { + "consolidate-0.16.0" = { name = "consolidate"; packageName = "consolidate"; - version = "0.15.1"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz"; - sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="; + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.16.0.tgz"; + sha512 = "Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ=="; }; }; "constant-case-3.0.3" = { @@ -13487,6 +13613,15 @@ let sha512 = "mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w=="; }; }; + "crc32-stream-4.0.0" = { + name = "crc32-stream"; + packageName = "crc32-stream"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.0.tgz"; + sha512 = "tyMw2IeUX6t9jhgXI6um0eKfWq4EIDpfv5m7GX4Jzp7eVelQ360xd8EPXJhp2mHwLQIkqlnMLjzqSZI3a+0wRw=="; + }; + }; "create-ecdh-4.0.4" = { name = "create-ecdh"; packageName = "create-ecdh"; @@ -14414,13 +14549,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.35" = { + "dayjs-1.8.36" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.35"; + version = "1.8.36"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.35.tgz"; - sha512 = "isAbIEenO4ilm6f8cpqvgjZCsuerDAz2Kb7ri201AiNn58aqXuaLJEnCtfIMdCvERZHNGRY5lDMTr/jdAnKSWQ=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.36.tgz"; + sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="; }; }; "deasync-0.1.15" = { @@ -16124,6 +16259,15 @@ let sha512 = "xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ=="; }; }; + "download-8.0.0" = { + name = "download"; + packageName = "download"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/download/-/download-8.0.0.tgz"; + sha512 = "ASRY5QhDk7FK+XrQtQyvhpDKanLluEEQtWl/J7Lxuf/b+i8RYh997QeXvL85xitrmRKVlx9c7eTrcRdq2GS4eA=="; + }; + }; "download-git-repo-1.1.0" = { name = "download-git-repo"; packageName = "download-git-repo"; @@ -16439,13 +16583,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.567" = { + "electron-to-chromium-1.3.570" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.567"; + version = "1.3.570"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.567.tgz"; - sha512 = "1aKkw0Hha1Bw9JA5K5PT5eFXC/TXbkJvUfNSNEciPUMgSIsRJZM1hF2GUEAGZpAbgvd8En21EA+Lv820KOhvqA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.570.tgz"; + sha512 = "Y6OCoVQgFQBP5py6A/06+yWxUZHDlNr/gNDGatjH8AZqXl8X0tE4LfjLJsXGz/JmWJz8a6K7bR1k+QzZ+k//fg=="; }; }; "elegant-spinner-1.0.1" = { @@ -17160,13 +17304,13 @@ let sha512 = "VHDcDg9AwFoeQU9ULPCJCw6P95gr9Er65M+bccefEVD/OOb+WMyQIYw58rpm0F+zcfRJNf394I+BMH8JeU97Hw=="; }; }; - "escalade-3.0.2" = { + "escalade-3.1.0" = { name = "escalade"; packageName = "escalade"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz"; - sha512 = "gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz"; + sha512 = "mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig=="; }; }; "escape-goat-2.1.1" = { @@ -18600,6 +18744,15 @@ let sha1 = "f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"; }; }; + "fastest-levenshtein-1.0.12" = { + name = "fastest-levenshtein"; + packageName = "fastest-levenshtein"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; + sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; + }; + }; "fastparse-1.1.2" = { name = "fastparse"; packageName = "fastparse"; @@ -18780,6 +18933,15 @@ let sha512 = "uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw=="; }; }; + "file-type-11.1.0" = { + name = "file-type"; + packageName = "file-type"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-11.1.0.tgz"; + sha512 = "rM0UO7Qm9K7TWTtA6AShI/t7H5BPjDeGVDaNyg9BjHAj3PysKy7+8C8D137R88jnR3rFJZQB/tFgydl5sN5m7g=="; + }; + }; "file-type-14.7.1" = { name = "file-type"; packageName = "file-type"; @@ -18879,6 +19041,15 @@ let sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; }; }; + "filenamify-3.0.0" = { + name = "filenamify"; + packageName = "filenamify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filenamify/-/filenamify-3.0.0.tgz"; + sha512 = "5EFZ//MsvJgXjBAFJ+Bh2YaCTRF/VP1YOmGrgt+KJ4SFRLjI87EIdwLLuT6wQX0I4F9W41xutobzczjsOKlI/g=="; + }; + }; "filenamify-4.1.0" = { name = "filenamify"; packageName = "filenamify"; @@ -18897,6 +19068,15 @@ let sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; + "filesize-6.1.0" = { + name = "filesize"; + packageName = "filesize"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz"; + sha512 = "LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="; + }; + }; "filestream-5.0.0" = { name = "filestream"; packageName = "filestream"; @@ -19266,13 +19446,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.133.0" = { + "flow-parser-0.134.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.133.0"; + version = "0.134.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.133.0.tgz"; - sha512 = "ONvDDUcQVY7bMQG4ht7Ti+2IYjBBPphkc7fGmHXZHrrNNjGG4tykLZjIrIx710/k77x2djaY9VKlHC342Luy3A=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.134.0.tgz"; + sha512 = "VmRba5YXKmVqIH3xNzUJ4pNobxXEOl6h36m+0f5dZ6/av9YlRpls/yBnPESQ4qBUbyyp7iqoc1Feo1lFw3u1YQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -20481,13 +20661,13 @@ let sha1 = "ee95be37106fd8748a96f8d1db4baea89e1bfa8a"; }; }; - "gh-release-fetch-1.0.3" = { + "gh-release-fetch-1.0.4" = { name = "gh-release-fetch"; packageName = "gh-release-fetch"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-1.0.3.tgz"; - sha512 = "Av+27/G9dJT5iPjFGZcHbjKJcTO1FrGIFQ3e8//9PJtNbK1QKbtm++R/rn8+OXH5ebtMGtXcVdyZrQLyf16i7g=="; + url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-1.0.4.tgz"; + sha512 = "uL2T1vCOr5HAuY1Cbtj+h1AOTWZ0Qvubi1s7KCRqKOiytVlTDHLYoPJ9TIJLEmNYbmuCtZVOtYsojf3REAAgbQ=="; }; }; "git-apply-delta-0.0.7" = { @@ -23291,13 +23471,13 @@ let sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; }; - "inflected-2.0.4" = { + "inflected-2.1.0" = { name = "inflected"; packageName = "inflected"; - version = "2.0.4"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/inflected/-/inflected-2.0.4.tgz"; - sha512 = "HQPzFLTTUvwfeUH6RAGjD8cHS069mBqXG5n4qaxX7sJXBhVQrsGgF+0ZJGkSuN6a8pcUWB/GXStta11kKi/WvA=="; + url = "https://registry.npmjs.org/inflected/-/inflected-2.1.0.tgz"; + sha512 = "hAEKNxvHf2Iq3H60oMBHkB4wl5jn3TPF3+fXek/sRwAB5gP9xWs4r7aweSF95f99HFoz69pnZTcu8f0SIHV18w=="; }; }; "inflight-1.0.6" = { @@ -26072,6 +26252,15 @@ let sha512 = "b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA=="; }; }; + "jsonc-parser-2.3.1" = { + name = "jsonc-parser"; + packageName = "jsonc-parser"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz"; + sha512 = "H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="; + }; + }; "jsonfile-1.0.1" = { name = "jsonfile"; packageName = "jsonfile"; @@ -26559,13 +26748,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.0.1" = { + "keyv-4.0.3" = { name = "keyv"; packageName = "keyv"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.0.1.tgz"; - sha512 = "xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz"; + sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA=="; }; }; "killable-1.0.1" = { @@ -27279,6 +27468,15 @@ let sha512 = "gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ=="; }; }; + "listenercount-1.0.1" = { + name = "listenercount"; + packageName = "listenercount"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz"; + sha1 = "84c8a72ab59c4725321480c975e6508342e70937"; + }; + }; "listr-0.14.3" = { name = "listr"; packageName = "listr"; @@ -28674,15 +28872,6 @@ let sha512 = "ILKe88NeMt4gmDvk/eb615U/IVn7K9KWGkoYbdatQ69Z65nj1ZzjM6fHXfcs0Uge+e+EGnMW7DY4T9yko8vWFg=="; }; }; - "log4js-5.3.0" = { - name = "log4js"; - packageName = "log4js"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-5.3.0.tgz"; - sha512 = "PZHXaXJKMKEscvQxSnTjM4UosQalSDlNpMw63eCKW+/DiAFKIZPW1jGyIPXZDjiEYFusMfiI7zzvnxeGozUcAw=="; - }; - }; "log4js-6.3.0" = { name = "log4js"; packageName = "log4js"; @@ -30249,13 +30438,13 @@ let sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; }; }; - "metals-languageclient-0.3.0" = { + "metals-languageclient-0.3.1" = { name = "metals-languageclient"; packageName = "metals-languageclient"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.3.0.tgz"; - sha512 = "Uh3jj6+b/vWdR3k1BqC8QZK3a/5Z9mVdI+OhVbFGMq6slJ6odFLTDaDZ25zpon4MaLEs+IIC4R91pJcmFdU6og=="; + url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.3.1.tgz"; + sha512 = "+bxUq6HmdHlqEBIyCyr41KsoLJLQ4DRBn9sVXPhZUlhoA/pBMNSq4LVlLUEnBvRYMhxwbAGV6XYuUMKd0vMokA=="; }; }; "metalsmith-2.3.0" = { @@ -32005,13 +32194,13 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-4.3.13" = { + "netlify-4.5.1" = { name = "netlify"; packageName = "netlify"; - version = "4.3.13"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-4.3.13.tgz"; - sha512 = "nXiqUm89HOEGOzYiLtxGOUCZ+iJB01zxCMeolaQXaIia6UnFCw/jHMARGXMLpntxkgjclaMgMVzKO3aetbHAvQ=="; + url = "https://registry.npmjs.org/netlify/-/netlify-4.5.1.tgz"; + sha512 = "Ke6lXulj8Jd4qzAmHv5VHvqAWoV+EkQUKiBDvpZuUAGA12UDRP4vl7gvJkxmwZ5Z/trIOgiOC9n8y/NHlvFbXA=="; }; }; "netlify-redirect-parser-2.5.0" = { @@ -32230,13 +32419,13 @@ let sha512 = "ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA=="; }; }; - "node-appc-1.1.0" = { + "node-appc-1.1.1" = { name = "node-appc"; packageName = "node-appc"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-1.1.0.tgz"; - sha512 = "lKi9ZKfvgxBSM7KoMFPeZhSgzPBYE3cci6D145i92T/lhaDbEAoWDf9EAJPX0MRFNTZP1C8gDIlug8y6Oykp2g=="; + url = "https://registry.npmjs.org/node-appc/-/node-appc-1.1.1.tgz"; + sha512 = "QYOmRUq9B0LfVZ5MWQlbv8tHa4pzQ+YbagjUUvMIx6lVjhCjG9pPMRyPFK7/HXiQ+WrsiuydSbJgsBZt1p18Rg=="; }; }; "node-bitmap-0.0.1" = { @@ -32357,6 +32546,15 @@ let sha512 = "iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg=="; }; }; + "node-forge-0.10.0" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"; + sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; + }; + }; "node-forge-0.2.24" = { name = "node-forge"; packageName = "node-forge"; @@ -32375,15 +32573,6 @@ let sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="; }; }; - "node-forge-0.9.0" = { - name = "node-forge"; - packageName = "node-forge"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz"; - sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="; - }; - }; "node-forge-0.9.1" = { name = "node-forge"; packageName = "node-forge"; @@ -33293,6 +33482,15 @@ let sha512 = "670+SM5CXYrjI547cgUeQTdB1wJb2gyrJ7bnGywQMrmciKXhXj/EFbE/8c8wed+j1WmGAh7xS+QdQxiuIlNqlw=="; }; }; + "oas-resolver-2.5.0" = { + name = "oas-resolver"; + packageName = "oas-resolver"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.0.tgz"; + sha512 = "69OF0iCTDXXp3ttAEPUcCz/eSJd6eyrWAIrPit2wnL7Q4Ti82Q2dXQVMdz5S+JPCgtZOETnTgPs/EsMuH2vIzg=="; + }; + }; "oas-schema-walker-1.1.5" = { name = "oas-schema-walker"; packageName = "oas-schema-walker"; @@ -33663,13 +33861,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.137.1" = { + "office-ui-fabric-react-7.138.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.137.1"; + version = "7.138.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.137.1.tgz"; - sha512 = "6m1M9m5psaJqhWwroVp1L0G8q66scLMsQRi+gQ/fY3f75ipGSABGeQ86d4P0ilKaYcLVYIzosocPIZKLbBVpnQ=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.138.0.tgz"; + sha512 = "HW4ugd+x7Jg96yBWxmUNMfkTS0U8RMwf5mGsHBAvW9s5l1ektjTjKnb5beHxNrddXKqcjz9ZThdTk/Gxds0jig=="; }; }; "omggif-1.0.10" = { @@ -36463,6 +36661,15 @@ let sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; }; + "postcss-7.0.34" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.34"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.34.tgz"; + sha512 = "H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw=="; + }; + }; "postcss-calc-7.0.4" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -36571,13 +36778,13 @@ let sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA=="; }; }; - "postcss-load-config-2.1.0" = { + "postcss-load-config-2.1.1" = { name = "postcss-load-config"; packageName = "postcss-load-config"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz"; - sha512 = "4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q=="; + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.1.tgz"; + sha512 = "D2ENobdoZsW0+BHy4x1CAkXtbXtYWYRIxL/JbtRBqrRGOPtJ2zoga/bEZWhV/ShWB5saVxJMzbMdSyA/vv4tXw=="; }; }; "postcss-markdown-0.36.0" = { @@ -37165,13 +37372,13 @@ let sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; - "prettier-2.1.1" = { + "prettier-2.1.2" = { name = "prettier"; packageName = "prettier"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz"; - sha512 = "9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz"; + sha512 = "16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg=="; }; }; "prettier-bytes-1.0.4" = { @@ -37543,6 +37750,15 @@ let sha512 = "UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg=="; }; }; + "promise.prototype.finally-3.1.2" = { + name = "promise.prototype.finally"; + packageName = "promise.prototype.finally"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz"; + sha512 = "A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA=="; + }; + }; "promised-temp-0.1.0" = { name = "promised-temp"; packageName = "promised-temp"; @@ -39415,6 +39631,15 @@ let sha512 = "+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA=="; }; }; + "readdir-glob-1.0.0" = { + name = "readdir-glob"; + packageName = "readdir-glob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.0.0.tgz"; + sha512 = "km0DIcwQVZ1ZUhXhMWpF74/Wm5aFEd5/jDiVWF1Hkw2myPQovG8vCQ8+FQO2KXE9npQQvCnAMZhhWuUee4WcCQ=="; + }; + }; "readdir-scoped-modules-1.1.0" = { name = "readdir-scoped-modules"; packageName = "readdir-scoped-modules"; @@ -39739,13 +39964,13 @@ let sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; }; }; - "regexpu-core-4.7.0" = { + "regexpu-core-4.7.1" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz"; - sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz"; + sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; }; }; "registry-auth-token-3.3.2" = { @@ -40837,13 +41062,13 @@ let sha1 = "df43e80d9bc82ad4430bcfef03f49c717e8b2e8c"; }; }; - "roarr-2.15.3" = { + "roarr-2.15.4" = { name = "roarr"; packageName = "roarr"; - version = "2.15.3"; + version = "2.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz"; - sha512 = "AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA=="; + url = "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz"; + sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; }; "rollup-1.32.1" = { @@ -40855,13 +41080,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.26.11" = { + "rollup-2.27.1" = { name = "rollup"; packageName = "rollup"; - version = "2.26.11"; + version = "2.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.26.11.tgz"; - sha512 = "xyfxxhsE6hW57xhfL1I+ixH8l2bdoIMaAecdQiWF3N7IgJEMu99JG+daBiSZQjnBpzFxa0/xZm+3pbCdAQehHw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.27.1.tgz"; + sha512 = "GiWHQvnmMgBktSpY/1+nrGpwPsTw4b9P28og2uedfeq4JZ16rzAmnQ5Pm/E0/BEmDNia1ZbY7+qu3nBgNa19Hg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -41314,13 +41539,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.26.10" = { + "sass-1.26.11" = { name = "sass"; packageName = "sass"; - version = "1.26.10"; + version = "1.26.11"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.26.10.tgz"; - sha512 = "bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.26.11.tgz"; + sha512 = "W1l/+vjGjIamsJ6OnTe0K37U2DBO/dgsv2Z4c89XQ8ZOO6l/VwkqwLSqoYzJeJs6CLuGSTRWc91GbQFL3lvrvw=="; }; }; "sass-formatter-0.4.15" = { @@ -41503,13 +41728,13 @@ let sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; }; }; - "selfsigned-1.10.7" = { + "selfsigned-1.10.8" = { name = "selfsigned"; packageName = "selfsigned"; - version = "1.10.7"; + version = "1.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz"; - sha512 = "8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA=="; + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz"; + sha512 = "2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w=="; }; }; "semaphore-async-await-1.5.1" = { @@ -41710,15 +41935,6 @@ let sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; }; }; - "semver-regex-2.0.0" = { - name = "semver-regex"; - packageName = "semver-regex"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz"; - sha512 = "mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw=="; - }; - }; "semver-truncate-1.1.2" = { name = "semver-truncate"; packageName = "semver-truncate"; @@ -42340,6 +42556,15 @@ let sha512 = "xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg=="; }; }; + "simple-git-2.20.1" = { + name = "simple-git"; + packageName = "simple-git"; + version = "2.20.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.20.1.tgz"; + sha512 = "aa9s2ZLjXlHCVGbDXQLInMLvLkxKEclqMU9X5HMXi3tLWLxbWObz1UgtyZha6ocHarQtFp0OjQW9KHVR1g6wbA=="; + }; + }; "simple-git-2.5.0" = { name = "simple-git"; packageName = "simple-git"; @@ -42709,22 +42934,22 @@ let sha512 = "wwrMIEDozfLJ8LmakCsCC1FQ0siIX5icCQPCbUKKgRbeVsZ27NjPJs37BpTXX4rcHkaWpe8TbH3yOtp23qmszg=="; }; }; - "snyk-cpp-plugin-1.4.3" = { + "snyk-cpp-plugin-1.5.0" = { name = "snyk-cpp-plugin"; packageName = "snyk-cpp-plugin"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-1.4.3.tgz"; - sha512 = "dHnYm6SVk+LGDqXaVwZqg6+0dMNjjPgJ3S3XUhjTWtGHqvokAdK5iGqSvwbQbJGOikEqt0rjnkorsgnGD/TbjQ=="; + url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-1.5.0.tgz"; + sha512 = "nBZ0cBmpT4RVJUFzYydQJOxwjcdXk7NtRJE1UIIOafQa2FcvIl3GBezfrCJ6pu61svOAf5r8Qi/likx6F15K1A=="; }; }; - "snyk-docker-plugin-3.20.0" = { + "snyk-docker-plugin-3.21.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.20.0"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.20.0.tgz"; - sha512 = "E2aZW3CWeb4tJrQF9DgeJQsDHwRikkUkJh1eTmkksBBDH/wj0gjab9fRE8N0Lu04OQa8LRA4CW7VRdo/QjLjUA=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.21.0.tgz"; + sha512 = "A7oJS3QGR7bwm1qeeczCb8PDfi8go1KM6VWph/drJHBQ7JxVKKLb3j4AzrMmIM96mGZFbmyNOL4pznwumaOM8g=="; }; }; "snyk-go-parser-1.4.1" = { @@ -43420,13 +43645,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.5" = { + "spdx-license-ids-3.0.6" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; + sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="; }; }; "spdy-1.32.5" = { @@ -44752,13 +44977,13 @@ let sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; - "string.prototype.trim-1.2.1" = { + "string.prototype.trim-1.2.2" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz"; - sha512 = "MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.2.tgz"; + sha512 = "b5yrbl3BXIjHau9Prk7U0RRYcUYdN4wGSVaqoBQS50CCE3KBuYU0TYRNPFCP7aVoNMX87HKThdMRVIP3giclKg=="; }; }; "string.prototype.trimend-1.0.1" = { @@ -45688,13 +45913,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.27.3" = { + "systeminformation-4.27.4" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.27.3"; + version = "4.27.4"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.3.tgz"; - sha512 = "0Nc8AYEK818h7FI+bbe/kj7xXsMD5zOHvO9alUqQH/G4MHXu5tHQfWqC/bzWOk4JtoQPhnyLgxMYncDA2eeSBw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.4.tgz"; + sha512 = "VlFlxbkvSddq16F/nHC0GRaKBZOKWbAuRbck4G9muHhCUcDKskhNkVbaBBFxxqwcp0IyVozLS96eAVmkRZTG4w=="; }; }; "syswide-cas-5.3.0" = { @@ -46364,6 +46589,15 @@ let sha512 = "enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ=="; }; }; + "through2-4.0.2" = { + name = "through2"; + packageName = "through2"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"; + sha512 = "iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw=="; + }; + }; "through2-filter-3.0.0" = { name = "through2-filter"; packageName = "through2-filter"; @@ -48695,6 +48929,15 @@ let sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; }; }; + "unzipper-0.10.11" = { + name = "unzipper"; + packageName = "unzipper"; + version = "0.10.11"; + src = fetchurl { + url = "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz"; + sha512 = "+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw=="; + }; + }; "upath-1.2.0" = { name = "upath"; packageName = "upath"; @@ -49181,6 +49424,15 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; + "uuid-7.0.3" = { + name = "uuid"; + packageName = "uuid"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"; + sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; + }; + }; "uuid-8.3.0" = { name = "uuid"; packageName = "uuid"; @@ -49757,13 +50009,13 @@ let sha512 = "iTX3dTp0Y0RFWhIux5jasI8r9swdiWVB1Z3OrZ10iDHxzkETjVPxAQ5BEQU4ag0Awc8TTg1C7sJriHQY2LO14g=="; }; }; - "vscode-css-languageservice-4.3.3" = { + "vscode-css-languageservice-4.3.4" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "4.3.3"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.3.tgz"; - sha512 = "b2b+0oHvPmBHygDtOXX3xBvpQCa6eIQSvXnGDNSDmIC1894ZTJ2yX10vjplOO/PvV7mwhyvGPwHyY4X2HGxtKw=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.4.tgz"; + sha512 = "/0HCaxiSL0Rmm3sJ+iyZekljKEYKo1UHSzX4UFOo5VDLgRhKomJf7g1p8glcbCHXB/70IcH8IhKnwlTznf8RPQ=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -49793,13 +50045,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.8.3" = { + "vscode-json-languageservice-3.8.4" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.3.tgz"; - sha512 = "8yPag/NQHCuTthahyaTtzK0DHT0FKM/xBU0mFBQ8nMo8C1i2P+FCyIVqICoNoHkRI2BTGlXKomPUpsqjSz0TnQ=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.4.tgz"; + sha512 = "njDG0+YJvYNKXH+6plQGZMxgbifATFrRpC6Qnm/SAn4IW8bMHxsYunsxrjtpqK42CVSz6Lr7bpbTEZbVuOmFLw=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -50054,6 +50306,15 @@ let sha512 = "7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="; }; }; + "vscode-nls-5.0.0" = { + name = "vscode-nls"; + packageName = "vscode-nls"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz"; + sha512 = "u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="; + }; + }; "vscode-test-1.4.0" = { name = "vscode-test"; packageName = "vscode-test"; @@ -50135,13 +50396,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.0-rc.10" = { + "vue-3.0.0-rc.13" = { name = "vue"; packageName = "vue"; - version = "3.0.0-rc.10"; + version = "3.0.0-rc.13"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.0-rc.10.tgz"; - sha512 = "nRsyIQtOWLDMBb5dsPwg/WdIqznCMVWN6O6wJSzhseKC768wHlZKcJ7SPHhWPid9wi3Ykhtl9vtgvxTK/qICkw=="; + url = "https://registry.npmjs.org/vue/-/vue-3.0.0-rc.13.tgz"; + sha512 = "xCW8EAVSMdU7z+3BWBFV9hO36Tg6vN25fYN6agC6/z/3JlAyo0hVqQtqmGaDAHVlO110rPowfkGIWqStPhTdcw=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -50405,6 +50666,15 @@ let sha512 = "4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ=="; }; }; + "webpack-4.44.2" = { + name = "webpack"; + packageName = "webpack"; + version = "4.44.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz"; + sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; + }; + }; "webpack-cli-3.3.12" = { name = "webpack-cli"; packageName = "webpack-cli"; @@ -51891,6 +52161,15 @@ let sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; + "yargs-parser-20.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "20.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.0.0.tgz"; + sha512 = "8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA=="; + }; + }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -52125,6 +52404,15 @@ let sha512 = "r+JdDipt93ttDjsOVPU5zaq5bAyY+3H19bDrThkvuVxC0xMQzU1PJcS6D+KrP3u96gH9XLomcHPb+2skoDjulQ=="; }; }; + "zip-stream-4.0.2" = { + name = "zip-stream"; + packageName = "zip-stream"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/zip-stream/-/zip-stream-4.0.2.tgz"; + sha512 = "TGxB2g+1ur6MHkvM644DuZr8Uzyz0k0OYWtS3YlpfWBEmK4woaC2t3+pozEL3dBfIPmpgmClR5B2QRcMgGt22g=="; + }; + }; "zmq-2.15.3" = { name = "zmq"; packageName = "zmq"; @@ -52149,17 +52437,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.1.tgz"; - sha512 = "u1Dd2Qe4ShFFef8cehaHoEKOrWo6QONj7yJrlvIIyzcnXWUb3jQmyZoILTv759lRdYF0GrgBx5jCKxzok0jTww=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.2.tgz"; + sha512 = "dBcqFTuT71CCkH4BoV2cN5RP5k8ggzOBijNNtwkQv7N4gNcdcczhoPtEa2v4Oo8mPcTwxf/C3RXZ+NicdROJOw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1001.1" - sources."@angular-devkit/core-10.1.1" - sources."@angular-devkit/schematics-10.1.1" - sources."@schematics/angular-10.1.1" - sources."@schematics/update-0.1001.1" + sources."@angular-devkit/architect-0.1001.2" + sources."@angular-devkit/core-10.1.2" + sources."@angular-devkit/schematics-10.1.2" + sources."@schematics/angular-10.1.2" + sources."@schematics/update-0.1001.2" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" @@ -52441,7 +52729,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sshpk-1.16.1" sources."ssri-6.0.1" sources."stream-each-1.2.3" @@ -52505,18 +52793,18 @@ in "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.3.tgz"; - sha512 = "mWxMMWKzTmhmTgAeAVestZf4CRcC4lBD5l521J2fsdGpGx9dQGiwqQZqNcwROJDE+Lg0YfXYYqP1UUKhZwYz6Q=="; + url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.4.tgz"; + sha512 = "KItaWFEf/X4LLY2XCidjD00oUp4Ay7y9Hu26+T8dPqV+qnMwOL+MGHhYXsJz+4JaeNJu1Ofwc4onmShpwHQruA=="; }; dependencies = [ - sources."@antora/playbook-builder-2.3.3" + sources."@antora/playbook-builder-2.3.4" sources."@iarna/toml-2.2.5" sources."argparse-1.0.10" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."commander-5.1.0" + sources."commander-6.1.0" sources."convict-6.0.0" sources."decamelize-1.2.0" sources."esprima-4.0.1" @@ -52542,24 +52830,24 @@ in "@antora/site-generator-default" = nodeEnv.buildNodePackage { name = "_at_antora_slash_site-generator-default"; packageName = "@antora/site-generator-default"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.3.tgz"; - sha512 = "kY2j2gsBo1U4Jn+WqK09chsFgXbbUvafgqGo3SzFDdjpsG/NvIylLK3g+bbZ0X9N7FysXytlAhyAYlOJDvXjGw=="; + url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.4.tgz"; + sha512 = "uRiFJ/nG5bxjDmFOur27ae7A1J7r+OFVocEwx+vVLRvVYfNHxYP0fI2uUrmJTci8xJ92NLH9VLHpfsHypsoq9Q=="; }; dependencies = [ - sources."@antora/asciidoc-loader-2.3.3" - sources."@antora/content-aggregator-2.3.3" - sources."@antora/content-classifier-2.3.3" - sources."@antora/document-converter-2.3.3" + sources."@antora/asciidoc-loader-2.3.4" + sources."@antora/content-aggregator-2.3.4" + sources."@antora/content-classifier-2.3.4" + sources."@antora/document-converter-2.3.4" sources."@antora/expand-path-helper-1.0.0" - sources."@antora/navigation-builder-2.3.3" - sources."@antora/page-composer-2.3.3" - sources."@antora/playbook-builder-2.3.3" - sources."@antora/redirect-producer-2.3.3" - sources."@antora/site-mapper-2.3.3" - sources."@antora/site-publisher-2.3.3" - sources."@antora/ui-loader-2.3.3" + sources."@antora/navigation-builder-2.3.4" + sources."@antora/page-composer-2.3.4" + sources."@antora/playbook-builder-2.3.4" + sources."@antora/redirect-producer-2.3.4" + sources."@antora/site-mapper-2.3.4" + sources."@antora/site-publisher-2.3.4" + sources."@antora/ui-loader-2.3.4" sources."@iarna/toml-2.2.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -52813,7 +53101,7 @@ in }) sources."string_decoder-1.3.0" sources."through-2.3.8" - sources."through2-3.0.2" + sources."through2-4.0.2" (sources."through2-filter-3.0.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -52874,10 +53162,10 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.11.0.tgz"; - sha512 = "H/i+fpbf/W9c446Ud+bDSeoUv5pW03orTm3hwVs9TtCt6332He8PK/CHydFnY/uvMKAmWPG5m2DruWIe7f1XMg=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.12.0.tgz"; + sha512 = "bUyvGm6DOiyLxKwUcGe/ItuSu1/iAHp31hw/c04f4QWyTk2znuyDK/KD6Jn7xqIj1+zRuCVSgUPvRH9R+bfpKg=="; }; dependencies = [ sources."abab-2.0.5" @@ -52942,9 +53230,11 @@ in sources."https-proxy-agent-4.0.0" sources."iconv-lite-0.4.24" sources."inquirer-6.2.0" + sources."is-docker-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-promise-2.2.2" sources."is-typedarray-1.0.0" + sources."is-wsl-2.2.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."jsdom-13.2.0" @@ -52967,6 +53257,7 @@ in sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."onetime-2.0.1" + sources."open-7.1.0" sources."optionator-0.8.3" sources."os-tmpdir-1.0.2" sources."papaparse-4.6.0" @@ -53074,7 +53365,7 @@ in sources."@types/color-name-1.1.1" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -53809,7 +54100,7 @@ in sources."@apollo/federation-0.20.0" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.32" + sources."@types/node-10.17.35" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -54105,14 +54396,14 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" ]; }) sources."@types/normalize-package-data-2.4.0" - sources."@types/qs-6.9.4" + sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.5" sources."@types/through-0.0.30" @@ -54126,22 +54417,24 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.6" sources."@vue/cli-ui-addon-widgets-4.5.6" - (sources."@vue/compiler-core-3.0.0-rc.10" // { + (sources."@vue/compiler-core-3.0.0-rc.13" // { dependencies = [ + sources."@babel/types-7.11.5" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.0.0-rc.10" - (sources."@vue/compiler-sfc-3.0.0-rc.10" // { + sources."@vue/compiler-dom-3.0.0-rc.13" + (sources."@vue/compiler-sfc-3.0.0-rc.13" // { dependencies = [ + sources."@babel/types-7.11.5" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.0.0-rc.10" - sources."@vue/reactivity-3.0.0-rc.10" - sources."@vue/runtime-core-3.0.0-rc.10" - sources."@vue/runtime-dom-3.0.0-rc.10" - sources."@vue/shared-3.0.0-rc.10" + sources."@vue/compiler-ssr-3.0.0-rc.13" + sources."@vue/reactivity-3.0.0-rc.13" + sources."@vue/runtime-core-3.0.0-rc.13" + sources."@vue/runtime-dom-3.0.0-rc.13" + sources."@vue/shared-3.0.0-rc.13" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -54326,7 +54619,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.14.2" + sources."browserslist-4.14.3" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -54353,7 +54646,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001129" + sources."caniuse-lite-1.0.30001131" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -54453,7 +54746,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.12" sources."configstore-3.1.5" - sources."consolidate-0.15.1" + sources."consolidate-0.16.0" sources."constant-case-3.0.3" (sources."content-disposition-0.5.3" // { dependencies = [ @@ -54561,7 +54854,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.567" + sources."electron-to-chromium-1.3.570" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -54573,7 +54866,7 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" - sources."escalade-3.0.2" + sources."escalade-3.1.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esm-3.2.25" @@ -54652,7 +54945,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.133.0" + sources."flow-parser-0.134.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -54804,7 +55097,7 @@ in sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."indexes-of-1.0.1" - sources."inflected-2.0.4" + sources."inflected-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -55157,7 +55450,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.34" // { dependencies = [ sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -55239,7 +55532,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexpu-core-4.7.0" + sources."regexpu-core-4.7.1" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."regjsgen-0.5.2" @@ -55350,7 +55643,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -55570,7 +55863,7 @@ in (sources."vue-codemod-0.0.4" // { dependencies = [ sources."globby-10.0.2" - sources."vue-3.0.0-rc.10" + sources."vue-3.0.0-rc.13" ]; }) sources."watch-1.0.2" @@ -55966,7 +56259,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -56256,7 +56549,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -56506,7 +56799,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.19" + sources."@types/node-13.13.21" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.5" @@ -56827,7 +57120,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" @@ -57130,10 +57423,10 @@ in coc-json = nodeEnv.buildNodePackage { name = "coc-json"; packageName = "coc-json"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.0.tgz"; - sha512 = "VqlL+B3EB9yLMXPs3or+Vu2ezVulxI7remhby4NWnvfE3PVpZreoXo5ISNjLrJ5xBQrj4bkJkMcBFkXwkSSH6w=="; + url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.1.tgz"; + sha512 = "VKCzzCMZYxqjU89EMh8g58ytbhXXQcMSyWx385NXiijjK3Amtuvz775lPfiUeIAeVNr2VM+yeKimUw4pbE/lug=="; }; buildInputs = globalBuildInputs; meta = { @@ -57165,99 +57458,171 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.3.tgz"; - sha512 = "HrD1Mryqkw4IO0IA//GHBvUiI6jqxAhoWPP1/FjYXcTZDOcB7x4CTW3Azg8YiucgbeJTwZgMmg/j+z7ArYdQ/w=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.4.tgz"; + sha512 = "EaDdMssH8XCpXq4rTQOkl8BhiB5eR+pAlV4mARs+jsB6wvJVd6U3Ba6nKuTB7n7HbHbn3tWZWLhclpqByi5G8g=="; }; dependencies = [ - sources."@chemzqm/neovim-5.1.9" + sources."@chemzqm/neovim-5.2.6" + sources."@tootallnate/once-1.1.2" + sources."agent-base-6.0.1" + sources."arch-2.1.2" sources."async-2.6.3" sources."await-semaphore-0.1.3" sources."balanced-match-1.0.0" + sources."big-integer-1.6.48" + sources."binary-0.3.0" + sources."bluebird-3.4.7" sources."brace-expansion-1.1.11" sources."bser-2.1.1" - sources."chownr-1.1.4" - sources."coc.nvim-0.0.77" + sources."buffer-indexof-polyfill-1.0.2" + sources."buffers-0.1.1" + sources."bytes-3.1.0" + sources."chainsaw-0.1.0" + sources."chownr-2.0.0" + sources."clipboardy-2.3.0" + sources."coc.nvim-0.0.79" sources."concat-map-0.0.1" - sources."date-format-2.1.0" + sources."content-disposition-0.5.3" + sources."core-util-is-1.0.2" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + sources."which-1.3.1" + ]; + }) + sources."date-format-3.0.0" sources."debounce-1.2.0" sources."debug-4.2.0" sources."deep-extend-0.6.0" + sources."define-properties-1.1.3" + sources."duplexer2-0.1.4" + sources."end-of-stream-1.4.4" + sources."es-abstract-1.17.6" + sources."es-to-primitive-1.2.1" sources."event-lite-0.1.2" + sources."execa-1.0.0" sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.13.0" sources."fp-ts-2.8.2" sources."fs-extra-8.1.0" - sources."fs-minipass-1.2.7" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" + (sources."fstream-1.0.12" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + ]; + }) + sources."function-bind-1.1.1" + sources."get-stream-4.1.0" sources."glob-7.1.6" sources."graceful-fs-4.2.4" + sources."has-1.0.3" + sources."has-symbols-1.0.1" + sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.0" sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" sources."int64-buffer-0.1.10" + sources."is-callable-1.2.1" + sources."is-date-object-1.0.2" + sources."is-docker-2.1.1" + sources."is-negative-zero-2.0.0" + sources."is-regex-1.1.1" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.3" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isuri-2.0.3" - sources."jsonc-parser-2.3.0" + sources."jsonc-parser-2.3.1" sources."jsonfile-4.0.0" + sources."listenercount-1.0.1" (sources."locate-java-home-1.1.2" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."lodash-4.17.20" - sources."log4js-5.3.0" - (sources."metals-languageclient-0.3.0" // { - dependencies = [ - sources."mkdirp-1.0.4" - sources."semver-7.3.2" - ]; - }) + sources."log4js-6.3.0" + sources."metals-languageclient-0.3.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."minipass-3.1.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."msgpack-lite-0.1.26" (sources."mv-2.1.1" // { dependencies = [ sources."glob-6.0.4" + sources."mkdirp-0.5.5" sources."rimraf-2.4.5" ]; }) sources."ncp-2.0.0" + sources."nice-try-1.0.5" sources."node-fetch-2.6.1" sources."node-int64-0.4.0" + sources."npm-run-path-2.0.2" + sources."object-inspect-1.8.0" + sources."object-keys-1.1.1" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."once-1.4.0" + sources."p-finally-1.0.0" sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."process-nextick-args-2.0.1" + sources."promise.prototype.finally-3.1.2" sources."promisify-child-process-4.1.1" + sources."pump-3.0.0" sources."rc-1.2.8" + sources."readable-stream-2.3.7" sources."rfc-3986-1.0.1" sources."rfdc-1.1.4" sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" - sources."semver-6.3.0" + sources."safe-buffer-5.1.2" + sources."semver-7.3.2" + sources."setimmediate-1.0.5" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" - sources."streamroller-2.2.4" + sources."signal-exit-3.0.3" + (sources."streamroller-2.2.4" // { + dependencies = [ + sources."date-format-2.1.0" + ]; + }) + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimstart-1.0.1" + sources."string_decoder-1.1.1" + sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."tar-4.4.13" - sources."tslib-1.13.0" - sources."tunnel-0.0.6" + sources."tar-6.0.5" + sources."traverse-0.3.9" + sources."tslib-2.0.1" sources."universalify-0.1.2" - sources."uuid-3.4.0" + sources."unzipper-0.10.11" + sources."util-deprecate-1.0.2" + sources."uuid-7.0.3" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" sources."vscode-uri-2.1.2" - sources."which-1.3.1" + sources."which-2.0.2" sources."wrappy-1.0.2" - sources."yallist-3.1.1" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -57370,7 +57735,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001129" + sources."caniuse-lite-1.0.30001131" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -57467,7 +57832,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.567" + sources."electron-to-chromium-1.3.570" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -57903,7 +58268,7 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.1.1" + sources."prettier-2.1.2" (sources."prettier-eslint-10.1.1" // { dependencies = [ sources."prettier-1.19.1" @@ -58046,7 +58411,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."specificity-0.3.2" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -58307,10 +58672,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.7.16"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.16.tgz"; - sha512 = "nYF/RznvKMwVXrW5z4k6Wrw13T6ogdF4TraAMp0P4upAHKhJkkA2aWwzCPiyq9wdadsp9/njWvmMTt5klfAI+g=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.8.0.tgz"; + sha512 = "kX/mSezjGZKy1hM3l+qrqLt4sQfS1GvtzwQQ1iqS4s+1YAwViRFLx/E1RFJRElQZ4WPvvRiu+d0OeiGbKQaMAg=="; }; buildInputs = globalBuildInputs; meta = { @@ -58406,7 +58771,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -58449,7 +58814,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.14.2" + sources."browserslist-4.14.3" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -58457,7 +58822,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001129" + sources."caniuse-lite-1.0.30001131" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -58517,11 +58882,11 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.567" + sources."electron-to-chromium-1.3.570" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."escalade-3.0.2" + sources."escalade-3.1.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."execall-2.0.0" @@ -58738,7 +59103,7 @@ in sources."picomatch-2.2.2" sources."pify-4.0.1" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.34" // { dependencies = [ sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -58830,7 +59195,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."specificity-0.4.1" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -59062,10 +59427,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.5.6"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.6.tgz"; - sha512 = "cBpsRAEcm48nSGIigFHzLjpGlYQmkpKwPxbafHihYpe0gRhNDNnkYg1dUfAhFb+Dnho9tt5Fwy3cmwd305aaiw=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.7.tgz"; + sha512 = "VP/xLBnChBWZPrURULJsy5fi9gt+Fsvv5qWXZrLorBsh/14ppnPqfdyyKRuK+mDrxi9gcnSbAwTHOJ4yl5e9ag=="; }; dependencies = [ sources."typescript-3.9.7" @@ -59136,7 +59501,7 @@ in sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -59602,7 +59967,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-2.1.3" - sources."jsonc-parser-2.3.0" + sources."jsonc-parser-2.3.1" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" @@ -59743,7 +60108,7 @@ in sources."posix-character-classes-0.1.1" sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" - sources."prettier-2.1.1" + sources."prettier-2.1.2" (sources."prettier-eslint-11.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -59897,7 +60262,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -60187,12 +60552,17 @@ in sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" sources."js-yaml-3.14.0" - sources."jsonc-parser-2.3.0" + sources."jsonc-parser-2.3.1" sources."ms-2.0.0" sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.8.3" + (sources."vscode-json-languageservice-3.8.4" // { + dependencies = [ + sources."vscode-languageserver-types-3.16.0-next.2" + sources."vscode-nls-5.0.0" + ]; + }) sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -60223,10 +60593,10 @@ in coc-yank = nodeEnv.buildNodePackage { name = "coc-yank"; packageName = "coc-yank"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.4.tgz"; - sha512 = "8qonhyBfipzni6Fbbdm9hOjUIdLtwPGqnVGxA5DV+Kd4ctvD+FiBRuaWnXWf4QqxC8ATHQyTyoSqrvdXdko4PA=="; + url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.5.tgz"; + sha512 = "HITJR6Cjah8xJwPBqWFQCj0vAWu29IrPWuEdZBnGo+qqasGoVSjurGnrRrmZZADuMWh/Z+2z4V7J8DoVejs40Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -60780,7 +61150,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sshpk-1.16.1" sources."statuses-1.5.0" (sources."string-width-2.1.1" // { @@ -60799,7 +61169,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.27.3" + sources."systeminformation-4.27.4" sources."term-size-2.2.0" sources."through-2.3.8" sources."tmp-0.2.1" @@ -60886,7 +61256,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -61178,7 +61548,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -61254,7 +61624,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -62325,7 +62695,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.751.0" + sources."aws-sdk-2.755.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."base64-js-1.3.1" @@ -62504,7 +62874,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -62636,7 +63006,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" sources."json5-2.1.3" - sources."keyv-4.0.1" + sources."keyv-4.0.3" sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" @@ -62744,7 +63114,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" (sources."stack-utils-2.0.2" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -62818,13 +63188,14 @@ in sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@fluentui/date-time-utilities-7.8.0" - sources."@fluentui/keyboard-key-0.2.11" - sources."@fluentui/react-7.137.1" - sources."@fluentui/react-focus-7.16.0" - sources."@fluentui/react-icons-0.3.0" - sources."@fluentui/react-window-provider-0.3.0" - sources."@fluentui/theme-0.2.0" + sources."@fluentui/date-time-utilities-7.8.1" + sources."@fluentui/dom-utilities-1.1.1" + sources."@fluentui/keyboard-key-0.2.12" + sources."@fluentui/react-7.138.0" + sources."@fluentui/react-focus-7.16.5" + sources."@fluentui/react-icons-0.3.4" + sources."@fluentui/react-window-provider-0.3.3" + sources."@fluentui/theme-0.3.2" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { dependencies = [ sources."normalize-path-2.1.1" @@ -62836,7 +63207,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.90" + sources."@microsoft/load-themed-styles-1.10.93" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -62868,7 +63239,7 @@ in sources."@types/node-14.0.26" sources."@types/pg-7.14.4" sources."@types/pg-types-1.11.5" - sources."@types/qs-6.9.4" + sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" sources."@types/request-2.48.5" sources."@types/serve-static-1.13.5" @@ -62877,13 +63248,13 @@ in sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.0" - sources."@uifabric/icons-7.5.0" - sources."@uifabric/merge-styles-7.18.0" - sources."@uifabric/react-hooks-7.13.0" - sources."@uifabric/set-version-7.0.22" - sources."@uifabric/styling-7.16.0" - sources."@uifabric/utilities-7.31.0" + sources."@uifabric/foundation-7.9.5" + sources."@uifabric/icons-7.5.5" + sources."@uifabric/merge-styles-7.19.1" + sources."@uifabric/react-hooks-7.13.4" + sources."@uifabric/set-version-7.0.23" + sources."@uifabric/styling-7.16.5" + sources."@uifabric/utilities-7.32.2" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -63798,7 +64169,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.137.1" + sources."office-ui-fabric-react-7.138.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -64009,7 +64380,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-1.26.10" + sources."sass-1.26.11" sources."sax-1.2.4" sources."scheduler-0.19.1" sources."schema-utils-2.7.1" @@ -64104,7 +64475,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-1.0.1" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -64809,7 +65180,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -65004,7 +65375,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" @@ -65934,7 +66305,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-final-newline-2.0.0" @@ -66035,7 +66406,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -66857,7 +67228,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.27.3" + sources."systeminformation-4.27.4" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -67260,7 +67631,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -67657,7 +68028,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -68670,7 +69041,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prelude-ls-1.1.2" - sources."prettier-2.1.1" + sources."prettier-2.1.2" sources."process-nextick-args-2.0.1" sources."promise-polyfill-6.1.0" sources."pseudomap-1.0.2" @@ -68707,7 +69078,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."spiro-2.0.0" sources."split-1.0.1" sources."sprintf-js-1.0.3" @@ -68974,7 +69345,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.751.0" // { + (sources."aws-sdk-2.755.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -71047,7 +71418,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -71785,7 +72156,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-1.0.1" sources."split-string-3.1.0" sources."split2-2.2.0" @@ -72959,7 +73330,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -73121,7 +73492,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.14.2" + sources."browserslist-4.14.3" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -73136,7 +73507,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001129" + sources."caniuse-lite-1.0.30001131" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -73258,7 +73629,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.567" + sources."electron-to-chromium-1.3.570" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -73276,7 +73647,7 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.18.0-next.0" sources."es-to-primitive-1.2.1" - sources."escalade-3.0.2" + sources."escalade-3.1.0" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" sources."eslint-visitor-keys-1.3.0" @@ -73674,7 +74045,7 @@ in sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" - sources."regexpu-core-4.7.0" + sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" (sources."regjsparser-0.6.4" // { dependencies = [ @@ -73786,7 +74157,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -73934,7 +74305,7 @@ in sources."readdirp-2.2.1" ]; }) - (sources."webpack-4.44.1" // { + (sources."webpack-4.44.2" // { dependencies = [ sources."acorn-6.4.1" sources."micromatch-3.1.10" @@ -74469,23 +74840,24 @@ in sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-7.8.0" - sources."@fluentui/keyboard-key-0.2.11" - sources."@fluentui/react-7.137.1" - sources."@fluentui/react-focus-7.16.0" - sources."@fluentui/react-icons-0.3.0" - sources."@fluentui/react-window-provider-0.3.0" - sources."@fluentui/theme-0.2.0" - sources."@microsoft/load-themed-styles-1.10.90" + sources."@fluentui/date-time-utilities-7.8.1" + sources."@fluentui/dom-utilities-1.1.1" + sources."@fluentui/keyboard-key-0.2.12" + sources."@fluentui/react-7.138.0" + sources."@fluentui/react-focus-7.16.5" + sources."@fluentui/react-icons-0.3.4" + sources."@fluentui/react-window-provider-0.3.3" + sources."@fluentui/theme-0.3.2" + sources."@microsoft/load-themed-styles-1.10.93" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.0" - sources."@uifabric/icons-7.5.0" - sources."@uifabric/merge-styles-7.18.0" - sources."@uifabric/react-hooks-7.13.0" - sources."@uifabric/set-version-7.0.22" - sources."@uifabric/styling-7.16.0" - sources."@uifabric/utilities-7.31.0" + sources."@uifabric/foundation-7.9.5" + sources."@uifabric/icons-7.5.5" + sources."@uifabric/merge-styles-7.19.1" + sources."@uifabric/react-hooks-7.13.4" + sources."@uifabric/set-version-7.0.23" + sources."@uifabric/styling-7.16.5" + sources."@uifabric/utilities-7.32.2" sources."accepts-1.3.7" sources."ajv-6.12.5" sources."ansi-escapes-1.4.0" @@ -74611,7 +74983,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.137.1" + sources."office-ui-fabric-react-7.138.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -75031,42 +75403,147 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.62.0"; + version = "2.63.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.62.0.tgz"; - sha512 = "fjMziW+anU8VUQCZmNJAb+yN6n9O+gTqKXgHRT7lVYCpSyBzQP9dCVNBu8x+kwAR1rfPuQE15h/BfG5O1WuU/w=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.63.2.tgz"; + sha512 = "H9c4UIuhOG5jl7ZlwuB/D4ac35BbYgiwXi77jTwx2QLy5Gy/UfId6ocFAdV5KYwSY5Yx2aS5txt4uYXm5qAb6w=="; }; dependencies = [ sources."@analytics/cookie-utils-0.2.3" sources."@analytics/core-0.6.2" sources."@analytics/storage-utils-0.2.4" sources."@babel/code-frame-7.10.4" + (sources."@babel/compat-data-7.11.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + (sources."@babel/core-7.11.6" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."@babel/generator-7.11.6" + 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" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.10.5" + sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-define-map-7.10.5" + sources."@babel/helper-explode-assignable-expression-7.11.4" + 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-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-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/highlight-7.10.4" sources."@babel/parser-7.11.5" - sources."@bugsnag/browser-7.3.4" - sources."@bugsnag/core-7.3.4" + 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/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" + sources."@babel/plugin-syntax-json-strings-7.8.3" + sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.10.4" + 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-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-unicode-escapes-7.10.4" + sources."@babel/plugin-transform-unicode-regex-7.10.4" + (sources."@babel/preset-env-7.11.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."@babel/preset-modules-0.1.4" + sources."@babel/runtime-7.11.2" + sources."@babel/template-7.10.4" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" + sources."@bugsnag/browser-7.3.5" + sources."@bugsnag/core-7.3.5" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.3.4" - sources."@bugsnag/node-7.3.4" + sources."@bugsnag/js-7.3.5" + sources."@bugsnag/node-7.3.5" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-3.3.5" // { + (sources."@netlify/build-4.0.4" // { dependencies = [ sources."chalk-3.0.0" sources."resolve-2.0.0-next.1" ]; }) - sources."@netlify/cache-utils-1.0.2" - (sources."@netlify/config-2.1.3" // { + sources."@netlify/cache-utils-1.0.3" + (sources."@netlify/config-2.1.5" // { dependencies = [ sources."chalk-3.0.0" ]; }) - sources."@netlify/functions-utils-1.2.8" - (sources."@netlify/git-utils-1.0.1" // { + sources."@netlify/functions-utils-1.2.9" + (sources."@netlify/git-utils-1.0.2" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -75076,7 +75553,8 @@ in ]; }) sources."@netlify/open-api-0.16.0" - sources."@netlify/run-utils-1.0.0" + sources."@netlify/plugin-edge-handlers-1.1.0" + sources."@netlify/run-utils-1.0.1" (sources."@netlify/zip-it-and-ship-it-1.3.12" // { dependencies = [ sources."resolve-2.0.0-next.1" @@ -75223,6 +75701,15 @@ in }) sources."@octokit/rest-16.43.2" sources."@octokit/types-5.5.0" + sources."@rollup/plugin-babel-5.2.1" + (sources."@rollup/plugin-commonjs-15.0.0" // { + dependencies = [ + sources."estree-walker-2.0.1" + ]; + }) + sources."@rollup/plugin-json-4.1.0" + sources."@rollup/plugin-node-resolve-9.0.0" + sources."@rollup/pluginutils-3.1.0" sources."@sindresorhus/is-0.14.0" sources."@sindresorhus/slugify-1.1.0" (sources."@sindresorhus/transliterate-0.1.1" // { @@ -75234,6 +75721,7 @@ in sources."@types/color-name-1.1.1" sources."@types/decompress-4.2.3" sources."@types/download-6.2.4" + sources."@types/estree-0.0.39" sources."@types/glob-7.1.3" sources."@types/got-8.3.5" sources."@types/http-proxy-1.17.4" @@ -75242,9 +75730,10 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" + sources."@types/resolve-1.17.1" sources."@types/semver-5.5.0" sources."@types/yargs-13.0.10" sources."@types/yargs-parser-15.0.0" @@ -75302,12 +75791,13 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.751.0" // { + (sources."aws-sdk-2.755.0" // { dependencies = [ sources."buffer-4.9.2" sources."uuid-3.3.2" ]; }) + sources."babel-plugin-dynamic-import-node-2.3.3" sources."backoff-2.5.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -75336,12 +75826,14 @@ in sources."extend-shallow-2.0.1" ]; }) + sources."browserslist-4.14.3" sources."btoa-lite-1.0.0" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" + sources."builtin-modules-3.1.0" sources."builtins-1.0.3" sources."byline-5.0.0" sources."bytes-3.1.0" @@ -75354,6 +75846,7 @@ in sources."cachedir-2.3.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" + sources."caniuse-lite-1.0.30001131" sources."cardinal-2.1.1" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -75424,6 +75917,7 @@ in sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."common-path-prefix-2.0.0" + sources."commondir-1.0.1" sources."component-emitter-1.3.0" (sources."compress-commons-3.0.0" // { dependencies = [ @@ -75445,6 +75939,11 @@ in ]; }) sources."content-type-1.0.4" + (sources."convert-source-map-1.7.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."cookie-0.4.1" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" @@ -75456,6 +75955,11 @@ in sources."safe-buffer-5.1.2" ]; }) + (sources."core-js-compat-3.6.5" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) sources."core-util-is-1.0.2" sources."cp-file-7.0.0" (sources."cpy-8.1.1" // { @@ -75573,6 +76077,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" + sources."electron-to-chromium-1.3.570" sources."elf-tools-1.1.2" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" @@ -75581,8 +76086,9 @@ in sources."envinfo-7.7.3" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."es-abstract-1.17.6" + sources."es-abstract-1.18.0-next.0" sources."es-to-primitive-1.2.1" + sources."escalade-3.1.0" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" @@ -75594,6 +76100,7 @@ in sources."eslint-visitor-keys-1.3.0" sources."esprima-4.0.1" sources."estraverse-4.3.0" + sources."estree-walker-1.0.1" sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-4.0.7" @@ -75709,13 +76216,14 @@ in sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."fuzzy-0.1.3" + sources."gensync-1.0.0-beta.1" sources."get-amd-module-type-3.0.0" sources."get-caller-file-2.0.5" sources."get-port-5.1.1" sources."get-proxy-2.1.0" sources."get-stream-5.2.0" sources."get-value-2.0.6" - (sources."gh-release-fetch-1.0.3" // { + (sources."gh-release-fetch-1.0.4" // { dependencies = [ sources."semver-5.7.1" ]; @@ -75731,6 +76239,7 @@ in sources."glob-to-regexp-0.3.0" sources."global-cache-dir-1.0.1" sources."global-dirs-2.0.1" + sources."globals-11.12.0" (sources."globby-10.0.2" // { dependencies = [ sources."@nodelib/fs.stat-2.0.3" @@ -75844,6 +76353,7 @@ in ]; }) sources."into-stream-3.1.0" + sources."invariant-2.2.4" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" @@ -75861,6 +76371,7 @@ in sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" sources."is-interactive-1.0.0" + sources."is-module-1.0.0" sources."is-natural-number-4.0.1" sources."is-negative-zero-2.0.0" sources."is-npm-4.0.0" @@ -75875,6 +76386,7 @@ in sources."is-path-inside-3.0.2" sources."is-plain-obj-2.1.0" sources."is-plain-object-2.0.4" + sources."is-reference-1.2.1" sources."is-regex-1.1.1" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" @@ -75895,9 +76407,11 @@ in sources."js-string-escape-1.0.1" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" + sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" + sources."json5-2.1.3" sources."jsonfile-6.0.1" sources."junk-3.1.0" sources."jwt-decode-2.2.0" @@ -75918,6 +76432,7 @@ in ]; }) sources."leven-3.1.0" + sources."levenary-1.1.1" sources."levn-0.3.0" sources."lines-and-columns-1.1.6" (sources."load-json-file-5.3.0" // { @@ -75964,8 +76479,10 @@ in sources."ms-2.1.2" ]; }) + sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."macos-release-2.4.1" + sources."magic-string-0.25.7" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -76029,7 +76546,7 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-4.3.13" // { + (sources."netlify-4.5.1" // { dependencies = [ sources."qs-6.9.4" ]; @@ -76043,6 +76560,7 @@ in sources."netlify-redirector-0.2.0" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" + sources."node-releases-1.1.61" sources."node-source-walk-4.2.0" sources."noop2-2.0.0" (sources."normalize-package-data-2.5.0" // { @@ -76076,12 +76594,12 @@ in sources."object-keys-1.1.1" sources."object-treeify-1.1.28" sources."object-visit-1.0.1" - (sources."object.assign-4.1.1" // { + sources."object.assign-4.1.1" + (sources."object.getownpropertydescriptors-2.1.0" // { dependencies = [ - sources."es-abstract-1.18.0-next.0" + sources."es-abstract-1.17.6" ]; }) - sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."octokit-pagination-methods-1.1.0" sources."omit.js-2.0.2" @@ -76168,7 +76686,7 @@ in sources."pinkie-promise-2.0.1" sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.34" // { dependencies = [ sources."has-flag-3.0.0" sources."source-map-0.6.1" @@ -76215,9 +76733,20 @@ in sources."readable-stream-3.6.0" sources."readdirp-3.4.0" sources."redeyed-2.1.1" + sources."regenerate-1.4.1" + sources."regenerate-unicode-properties-8.2.0" + sources."regenerator-runtime-0.13.7" + sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" + sources."regexpu-core-4.7.1" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" + sources."regjsgen-0.5.2" + (sources."regjsparser-0.6.4" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -76237,6 +76766,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" + sources."rollup-2.27.1" sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."rxjs-6.6.3" @@ -76318,10 +76848,11 @@ in sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" + sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."split2-1.1.1" sources."sprintf-js-1.0.3" @@ -76359,8 +76890,16 @@ in sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" sources."string-width-4.2.0" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + (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" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -76417,6 +76956,7 @@ in sources."timed-out-4.0.1" sources."tmp-0.0.33" sources."to-buffer-1.1.1" + sources."to-fast-properties-2.0.0" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -76445,6 +76985,10 @@ in sources."typescript-3.9.7" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" + 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" + sources."unicode-property-aliases-ecmascript-1.1.0" sources."union-value-1.0.1" sources."uniq-1.0.1" sources."unique-string-2.0.0" @@ -76477,7 +77021,11 @@ in sources."url-to-options-1.0.1" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" + (sources."util.promisify-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."utils-merge-1.0.1" sources."uuid-8.3.0" sources."validate-npm-package-license-3.0.4" @@ -76911,7 +77459,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -77725,7 +78273,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -78746,7 +79294,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.14.2" + sources."browserslist-4.14.3" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -78762,7 +79310,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001129" + sources."caniuse-lite-1.0.30001131" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -78896,7 +79444,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.567" + sources."electron-to-chromium-1.3.570" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -78908,7 +79456,7 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.18.0-next.0" sources."es-to-primitive-1.2.1" - sources."escalade-3.0.2" + sources."escalade-3.1.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."escodegen-1.9.1" @@ -79196,7 +79744,7 @@ in sources."physical-cpu-count-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.34" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -79278,6 +79826,8 @@ in (sources."purgecss-2.3.0" // { dependencies = [ sources."commander-5.1.0" + sources."postcss-7.0.32" + sources."supports-color-6.1.0" ]; }) sources."q-1.5.1" @@ -79304,7 +79854,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexpu-core-4.7.0" + sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" (sources."regjsparser-0.6.4" // { dependencies = [ @@ -79815,6 +80365,274 @@ in bypassCache = true; reconstructLock = true; }; + patch-package = nodeEnv.buildNodePackage { + name = "patch-package"; + packageName = "patch-package"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz"; + sha512 = "YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg=="; + }; + dependencies = [ + sources."@yarnpkg/lockfile-1.1.0" + sources."ansi-styles-3.2.1" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."atob-2.1.2" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."cache-base-1.0.1" + sources."chalk-2.4.2" + sources."ci-info-2.0.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."copy-descriptor-0.1.1" + sources."cross-spawn-6.0.5" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."define-property-2.0.2" + sources."escape-string-regexp-1.0.5" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."find-yarn-workspace-root-1.2.1" // { + dependencies = [ + sources."fs-extra-4.0.3" + ]; + }) + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" + sources."fs-extra-7.0.1" + sources."fs.realpath-1.0.0" + sources."get-value-2.0.6" + sources."glob-7.1.6" + sources."graceful-fs-4.2.4" + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-ci-2.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."jsonfile-4.0.0" + sources."kind-of-6.0.3" + sources."klaw-sync-6.0.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."micromatch-3.1.10" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."ms-2.0.0" + sources."nanomatch-1.2.13" + sources."nice-try-1.0.5" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."os-tmpdir-1.0.2" + sources."pascalcase-0.1.1" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."posix-character-classes-0.1.1" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."rimraf-2.7.1" + sources."safe-regex-1.1.0" + sources."semver-5.7.1" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."slash-2.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."supports-color-5.5.0" + sources."tmp-0.0.33" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."union-value-1.0.1" + sources."universalify-0.1.2" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" + sources."which-1.3.1" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Fix broken node modules with no fuss"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; @@ -80078,7 +80896,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -80519,10 +81337,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.5.13"; + version = "5.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.5.13.tgz"; - sha512 = "dNKfdY4HXOyAEsCzSuFbJ5uSCoabYTavw19YiN4wYuzk3ULG+5+Wc9+eAIm1hdQhD8gBG8etNm2O3/8lYAImdw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.6.1.tgz"; + sha512 = "pHEgIV5hIqwaMqDlDNj5yuNuSjN5CKAZvBgdL5CC2mo2itdpqoYy/NkLId0bnnRgrsmyA57Nz4Q78JFnx0Jcdw=="; }; buildInputs = globalBuildInputs; meta = { @@ -80621,7 +81439,7 @@ in sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."pify-2.3.0" - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.34" // { dependencies = [ sources."ansi-styles-3.2.1" (sources."chalk-2.4.2" // { @@ -80635,7 +81453,7 @@ in sources."supports-color-6.1.0" ]; }) - sources."postcss-load-config-2.1.0" + sources."postcss-load-config-2.1.1" (sources."postcss-reporter-6.0.1" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -80682,10 +81500,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz"; - sha512 = "9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz"; + sha512 = "16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg=="; }; buildInputs = globalBuildInputs; meta = { @@ -81005,10 +81823,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.14.0.tgz"; - sha512 = "tx8p1CIBNLO8f3Z0+MfiVIBzfKDQh0CykaFnlvWfGMH5Q0JPjF9egR4F4YI6FHXUfRi9tccMSXeIR/ZV423Wnw=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.14.1.tgz"; + sha512 = "8UGSiSRXw2I8grlN2mbu7WuJbekZiPKWqbB2/nRzg+ifdB7gxKFs7G4J+GPxHNOqJdMIuuXFbu8OdzmVzx8R0g=="; }; dependencies = [ sources."isexe-2.0.0" @@ -81071,10 +81889,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.71"; + version = "1.1.72"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.71.tgz"; - sha512 = "sWAZenzmMifLHOmWUz+JVWfW+9w65xwI8VYhzrVD+5d/lQeo1bljwGAi/nHdDmyY0jjW7tmEc4TNTsDpaTGPZg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.72.tgz"; + sha512 = "nRYCxhlGwG/NRl6eCZX3oxUaZGy7VRVuL/b46ZsDh69ZzkZ/CSMsxW19Jb4vZgGb8M2eLcFpan45m7UtiHBMWA=="; }; buildInputs = globalBuildInputs; meta = { @@ -81474,7 +82292,7 @@ in sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.0" - sources."oas-resolver-2.4.4" + sources."oas-resolver-2.5.0" sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."object-assign-4.1.1" @@ -81670,10 +82488,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.26.11"; + version = "2.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.26.11.tgz"; - sha512 = "xyfxxhsE6hW57xhfL1I+ixH8l2bdoIMaAecdQiWF3N7IgJEMu99JG+daBiSZQjnBpzFxa0/xZm+3pbCdAQehHw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.27.1.tgz"; + sha512 = "GiWHQvnmMgBktSpY/1+nrGpwPsTw4b9P28og2uedfeq4JZ16rzAmnQ5Pm/E0/BEmDNia1ZbY7+qu3nBgNa19Hg=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -81973,7 +82791,7 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.26.11" + sources."rollup-2.27.1" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" @@ -82340,13 +83158,20 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.0.0.tgz"; - sha512 = "VC4VaZ4vDlV7PZ0pknUNCEGAEadr/NkkFjSl2or89tngb5Y2A/Y/vwoCIXOqshR5bT6xIcPZuP7Oq573KeEXLQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.1.1.tgz"; + sha512 = "e9NoM93/1hWm2+5YsfNbZPZuqjD62B2k16j85hTuLoOtkDPjp80vma9he4kMwbJoEoU4cT332vBWg8+EQmdkFA=="; }; dependencies = [ sources."2-thenable-1.0.0" + (sources."@kwsites/file-exists-1.1.1" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) + sources."@kwsites/promise-deferred-1.1.1" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -82360,41 +83185,65 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" - sources."@serverless/cli-1.5.2" - sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.1.2" // { + (sources."@serverless/cli-1.5.2" // { dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@serverless/component-metrics-1.0.8" + (sources."@serverless/components-3.1.3" // { + dependencies = [ + sources."chalk-2.4.2" + sources."fs-extra-8.1.0" sources."globby-10.0.2" - sources."semver-7.3.2" + sources."uuid-3.4.0" ]; }) (sources."@serverless/core-1.1.2" // { dependencies = [ sources."fs-extra-7.0.1" + sources."semver-6.3.0" + ]; + }) + (sources."@serverless/enterprise-plugin-4.0.4" // { + dependencies = [ + sources."@serverless/platform-client-2.0.2" ]; }) - sources."@serverless/enterprise-plugin-4.0.2" sources."@serverless/event-mocks-1.1.1" - sources."@serverless/inquirer-1.1.2" + (sources."@serverless/inquirer-1.1.2" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) sources."@serverless/platform-client-1.1.10" (sources."@serverless/platform-client-china-1.0.37" // { dependencies = [ sources."archiver-4.0.2" sources."async-3.2.0" + sources."fs-extra-8.1.0" ]; }) (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ + sources."chalk-2.4.2" sources."debug-4.2.0" sources."https-proxy-agent-4.0.0" + sources."is-docker-1.1.0" sources."ms-2.1.2" sources."ramda-0.25.0" + sources."uuid-3.4.0" sources."ws-6.2.1" ]; }) sources."@serverless/template-1.1.3" - sources."@serverless/utils-1.2.0" - sources."@serverless/utils-china-0.1.27" + (sources."@serverless/utils-1.2.0" // { + dependencies = [ + sources."chalk-2.4.2" + sources."uuid-3.4.0" + ]; + }) + sources."@serverless/utils-china-0.1.28" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-0.2.17" @@ -82405,7 +83254,7 @@ in sources."@types/lodash-4.14.161" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/object-assign-4.0.30" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -82422,29 +83271,19 @@ in }) sources."ansi-escapes-4.3.1" sources."ansi-regex-4.1.0" - (sources."ansi-styles-4.2.1" // { - dependencies = [ - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" ]; }) - (sources."archiver-3.1.1" // { + (sources."archiver-5.0.2" // { dependencies = [ - (sources."compress-commons-2.1.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - ]; - }) - sources."isarray-1.0.0" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - sources."zip-stream-2.1.3" + sources."async-3.2.0" + sources."compress-commons-4.0.1" + sources."crc32-stream-4.0.0" + sources."zip-stream-4.0.2" ]; }) (sources."archiver-utils-2.1.0" // { @@ -82463,7 +83302,8 @@ in sources."async-2.6.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.751.0" // { + sources."at-least-node-1.0.0" + (sources."aws-sdk-2.755.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -82486,11 +83326,16 @@ in (sources."boxen-4.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."emoji-regex-8.0.0" + sources."has-flag-4.0.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" sources."type-fest-0.8.1" ]; }) @@ -82513,12 +83358,13 @@ in sources."callsite-1.0.0" sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."caw-2.0.1" - (sources."chalk-2.4.2" // { + (sources."chalk-4.1.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" + sources."ansi-styles-4.2.1" + 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."chardet-0.7.0" @@ -82554,7 +83400,6 @@ in ]; }) sources."concat-map-0.0.1" - sources."config-chain-1.1.12" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -82575,9 +83420,8 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.35" + sources."dayjs-1.8.36" sources."debug-3.1.0" - sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" (sources."decompress-4.2.1" // { dependencies = [ @@ -82618,19 +83462,29 @@ in sources."dir-glob-3.0.1" sources."dot-qs-0.2.0" sources."dotenv-8.2.0" - (sources."download-7.1.0" // { + (sources."download-8.0.0" // { dependencies = [ sources."@sindresorhus/is-0.7.0" - sources."cacheable-request-2.1.4" - sources."file-type-8.1.0" - sources."get-stream-3.0.0" - sources."got-8.3.2" + (sources."cacheable-request-2.1.4" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) + sources."file-type-11.1.0" + (sources."got-8.3.2" // { + dependencies = [ + sources."get-stream-3.0.0" + sources."pify-3.0.0" + ]; + }) sources."http-cache-semantics-3.8.1" sources."keyv-3.0.0" sources."lowercase-keys-1.0.0" + sources."make-dir-2.1.0" sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" - sources."pify-3.0.0" + sources."pify-4.0.1" + sources."semver-5.7.1" sources."sort-keys-2.0.0" ]; }) @@ -82676,19 +83530,20 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" + sources."fastest-levenshtein-1.0.12" sources."fastq-1.8.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.0" sources."figures-3.2.0" sources."file-type-5.2.0" sources."filename-reserved-regex-2.0.0" - sources."filenamify-2.1.0" - sources."filesize-3.6.1" + sources."filenamify-3.0.0" + sources."filesize-6.1.0" sources."fill-range-7.0.1" (sources."find-process-1.4.3" // { dependencies = [ + sources."chalk-2.4.2" sources."debug-2.6.9" ]; }) @@ -82707,13 +83562,17 @@ in ]; }) sources."fs-constants-1.0.0" - sources."fs-extra-8.1.0" + (sources."fs-extra-9.0.1" // { + dependencies = [ + sources."jsonfile-6.0.1" + sources."universalify-1.0.0" + ]; + }) sources."fs.realpath-1.0.0" sources."fs2-0.3.8" sources."fsevents-2.1.3" sources."function-bind-1.1.1" - sources."get-proxy-2.1.0" - sources."get-stdin-6.0.0" + sources."get-stdin-8.0.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -82726,7 +83585,7 @@ in sources."har-validator-5.1.5" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."http-cache-semantics-4.1.0" @@ -82750,18 +83609,15 @@ in (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-escapes-3.2.0" + sources."chalk-2.4.2" sources."figures-2.0.0" ]; }) - (sources."inquirer-autocomplete-prompt-1.1.0" // { - dependencies = [ - sources."chalk-4.1.0" - ]; - }) + sources."inquirer-autocomplete-prompt-1.1.0" sources."into-stream-3.1.0" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" - sources."is-docker-1.1.0" + sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -82773,11 +83629,7 @@ in sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - (sources."is-wsl-2.2.0" // { - dependencies = [ - sources."is-docker-2.1.1" - ]; - }) + sources."is-wsl-2.2.0" sources."isarray-2.0.1" sources."isexe-2.0.0" sources."isomorphic-ws-4.0.1" @@ -82866,11 +83718,6 @@ in sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" - (sources."npm-conf-1.1.3" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-component-0.0.3" @@ -82879,11 +83726,7 @@ in sources."once-1.4.0" sources."one-time-0.0.4" sources."onetime-2.0.1" - (sources."open-7.2.1" // { - dependencies = [ - sources."is-docker-2.1.1" - ]; - }) + sources."open-7.2.1" (sources."opn-5.5.0" // { dependencies = [ sources."is-wsl-1.1.0" @@ -82894,10 +83737,14 @@ in sources."p-event-2.3.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-2.3.0" + sources."p-limit-3.0.2" sources."p-timeout-2.0.1" sources."p-try-2.2.0" - sources."package-json-6.5.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."pako-1.0.11" sources."parseqs-0.0.5" sources."parseuri-0.0.5" @@ -82915,10 +83762,9 @@ in sources."prettyoutput-1.2.0" sources."process-nextick-args-2.0.1" sources."promise-queue-2.2.5" - sources."proto-list-1.2.4" (sources."protobufjs-6.10.1" // { dependencies = [ - sources."@types/node-13.13.19" + sources."@types/node-13.13.21" ]; }) sources."psl-1.8.0" @@ -82930,6 +83776,7 @@ in sources."ramda-0.26.1" sources."rc-1.2.8" sources."readable-stream-3.6.0" + sources."readdir-glob-1.0.0" sources."readdirp-3.4.0" sources."regenerator-runtime-0.13.7" sources."registry-auth-token-4.2.0" @@ -82938,6 +83785,7 @@ in (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" + sources."uuid-3.4.0" ]; }) sources."request-promise-core-1.1.4" @@ -82952,14 +83800,13 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."seek-bzip-1.0.6" - sources."semver-6.3.0" - sources."semver-regex-2.0.0" + sources."semver-7.3.2" sources."set-immediate-shim-1.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shortid-2.2.15" sources."signal-exit-3.0.3" - (sources."simple-git-1.132.0" // { + (sources."simple-git-2.20.1" // { dependencies = [ sources."debug-4.2.0" sources."ms-2.1.2" @@ -83008,11 +83855,12 @@ in sources."string_decoder-1.1.1" ]; }) - sources."supports-color-7.2.0" + sources."supports-color-5.5.0" (sources."tabtab-3.0.2" // { dependencies = [ sources."debug-4.2.0" sources."ms-2.1.2" + sources."untildify-3.0.3" ]; }) sources."tar-stream-2.1.4" @@ -83037,7 +83885,7 @@ in sources."type-fest-0.11.0" sources."unbzip2-stream-1.4.3" sources."universalify-0.1.2" - sources."untildify-3.0.3" + sources."untildify-4.0.0" sources."uri-js-4.4.0" (sources."url-0.10.3" // { dependencies = [ @@ -83048,7 +83896,7 @@ in sources."url-to-options-1.0.1" sources."urlencode-1.1.0" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" + sources."uuid-8.3.0" sources."verror-1.10.0" sources."which-1.3.1" (sources."widest-line-3.1.0" // { @@ -83078,7 +83926,7 @@ in sources."xtend-4.0.2" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.0.0" sources."yauzl-2.10.0" sources."yeast-0.1.2" sources."zip-stream-3.0.1" @@ -83720,10 +84568,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.393.1"; + version = "1.398.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.393.1.tgz"; - sha512 = "PHUjMJAZGz39vVpYFNlP1pgrJJ6j7fIxeBkwB80ijrds43pyj/WCxvF9ydNbP/vbAT9znHWHg6z+dSK3SEhTzw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.398.1.tgz"; + sha512 = "jH24ztdJY8DQlqkd1z8n/JutdOqHtTPccCynM2hfOedW20yAp9c108LFjXvqBEk/EH3YyNmWzyLkkHOySeDkwQ=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -83754,7 +84602,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" @@ -83980,7 +84828,7 @@ in sources."pako-1.0.11" ]; }) - sources."keyv-4.0.1" + sources."keyv-4.0.3" sources."latest-version-5.1.0" sources."lcid-1.0.0" sources."levn-0.3.0" @@ -84106,7 +84954,7 @@ in sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" sources."snyk-config-3.1.1" - (sources."snyk-cpp-plugin-1.4.3" // { + (sources."snyk-cpp-plugin-1.5.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -84117,7 +84965,7 @@ in sources."tslib-2.0.1" ]; }) - (sources."snyk-docker-plugin-3.20.0" // { + (sources."snyk-docker-plugin-3.21.0" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -84172,7 +85020,7 @@ in }) (sources."snyk-policy-1.14.1" // { dependencies = [ - sources."@types/node-6.14.11" + sources."@types/node-6.14.12" sources."hosted-git-info-2.8.8" (sources."snyk-module-2.1.0" // { dependencies = [ @@ -84189,7 +85037,7 @@ in }) (sources."snyk-resolve-deps-4.4.0" // { dependencies = [ - sources."@types/node-6.14.11" + sources."@types/node-6.14.12" sources."debug-3.2.6" sources."hosted-git-info-2.8.8" sources."lru-cache-4.1.5" @@ -84529,7 +85377,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."speedtest-net-1.6.2" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -85313,7 +86161,11 @@ in ]; }) sources."string-width-1.0.2" - sources."string.prototype.trim-1.2.1" + (sources."string.prototype.trim-1.2.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" @@ -85486,7 +86338,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.751.0" // { + (sources."aws-sdk-2.755.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -86040,7 +86892,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-1.0.1" sources."sprintf-js-1.0.3" (sources."sshpk-1.16.1" // { @@ -87308,7 +88160,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sprintf-js-1.0.3" sources."state-toggle-1.0.3" (sources."string-width-1.0.2" // { @@ -87737,7 +88589,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -88261,7 +89113,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.0" @@ -88469,7 +89321,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.0.1" + sources."keyv-4.0.3" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -88728,10 +89580,10 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.2.3"; + version = "5.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.2.3.tgz"; - sha512 = "7oXVf/Qr68U00Cv+CzaFjxuPnuwewXyDS3jsI5bPcH75vvUQfjRqrWcKvCm3pl9MX7Rd4ZMtelDVbYKtxxkyWw=="; + url = "https://registry.npmjs.org/titanium/-/titanium-5.2.5.tgz"; + sha512 = "P2+0coxeYre+1Lf/k2t61W1UwcNhupQy5s5UcpDkbGiRg7EDoYVnkix1H08yg+mfKh14Jm9+6QDDKpEWM+arZQ=="; }; dependencies = [ sources."adm-zip-0.4.13" @@ -88794,7 +89646,7 @@ in sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."moment-2.28.0" - (sources."node-appc-1.1.0" // { + (sources."node-appc-1.1.1" // { dependencies = [ sources."async-3.2.0" sources."colors-1.4.0" @@ -89060,7 +89912,7 @@ in sha512 = "N8E1X543CWEjg0/A70ZnA/kfAfAY/uogILsIuWBhHGxzv9kaJaj7/JCSwDiBH86CPEy37chSgW86KxVeYKsswQ=="; }; dependencies = [ - sources."@types/node-6.14.11" + sources."@types/node-6.14.12" sources."ansi-0.3.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -89209,7 +90061,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -89626,10 +90478,10 @@ in sources."vscode-nls-4.1.2" ]; }) - (sources."vscode-json-languageservice-3.8.3" // { + (sources."vscode-json-languageservice-3.8.4" // { dependencies = [ - sources."jsonc-parser-2.3.0" - sources."vscode-nls-4.1.2" + sources."jsonc-parser-2.3.1" + sources."vscode-nls-5.0.0" sources."vscode-uri-2.1.2" ]; }) @@ -89641,7 +90493,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-2.0.2" sources."vscode-uri-1.0.8" ]; @@ -89967,7 +90819,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -90655,7 +91507,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -90832,7 +91684,7 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - (sources."vscode-css-languageservice-4.3.3" // { + (sources."vscode-css-languageservice-4.3.4" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-uri-2.1.2" @@ -90844,7 +91696,7 @@ in sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-nls-4.1.2" + sources."vscode-nls-5.0.0" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" (sources."vue-eslint-parser-6.0.5" // { @@ -90922,7 +91774,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."JSONSelect-0.2.1" sources."acorn-7.4.0" sources."acorn-jsx-5.3.1" @@ -91879,10 +92731,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.44.1"; + version = "4.44.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz"; - sha512 = "4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz"; + sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; }; dependencies = [ sources."@webassemblyjs/ast-1.9.0" @@ -92729,7 +93581,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."accepts-1.3.7" sources."ajv-6.12.5" sources."ajv-errors-1.0.1" @@ -93026,7 +93878,7 @@ in sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."nice-try-1.0.5" - sources."node-forge-0.9.0" + sources."node-forge-0.10.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" @@ -93123,7 +93975,7 @@ in sources."safer-buffer-2.1.2" sources."schema-utils-1.0.0" sources."select-hose-2.0.0" - sources."selfsigned-1.10.7" + sources."selfsigned-1.10.8" sources."semver-6.3.0" (sources."send-0.17.1" // { dependencies = [ @@ -93444,7 +94296,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.19" + sources."@types/node-13.13.21" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -93787,12 +94639,17 @@ in sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" sources."js-yaml-3.14.0" - sources."jsonc-parser-2.3.0" + sources."jsonc-parser-2.3.1" sources."ms-2.0.0" sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.8.3" + (sources."vscode-json-languageservice-3.8.4" // { + dependencies = [ + sources."vscode-languageserver-types-3.16.0-next.2" + sources."vscode-nls-5.0.0" + ]; + }) sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -93856,7 +94713,7 @@ in sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -94451,7 +95308,7 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.7.1" - sources."roarr-2.15.3" + sources."roarr-2.15.4" sources."root-check-1.0.0" sources."run-async-2.4.1" sources."rx-4.1.0" @@ -94519,7 +95376,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" From 524755d323f8d8f5dd6c993bf4922b141d865367 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 18 Sep 2020 14:12:27 +0200 Subject: [PATCH 284/463] embree: init at 3.11.0 --- pkgs/development/libraries/embree/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/embree/default.nix diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix new file mode 100644 index 00000000000..2d83b9bbfab --- /dev/null +++ b/pkgs/development/libraries/embree/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw, + openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: + +stdenv.mkDerivation rec { + pname = "embree"; + version = "3.11.0"; + + src = fetchFromGitHub { + owner = "embree"; + repo = "embree"; + rev = "v${version}"; + sha256 = "0v5gqi8jp09xxcbyyknji83412bq4l0w35b6hnrqxycgdrnf7hkr"; + }; + + postPatch = '' + # Fix duplicate /nix/store/.../nix/store/.../ paths + sed -i "s|SET(EMBREE_ROOT_DIR .*)|set(EMBREE_ROOT_DIR $out)|" \ + common/cmake/embree-config.cmake + sed -i "s|$""{EMBREE_ROOT_DIR}/||" common/cmake/embree-config.cmake + ''; + + cmakeFlags = [ + "-DEMBREE_TUTORIALS=OFF" + "-DEMBREE_RAY_MASK=ON" + ]; + + nativeBuildInputs = [ ispc pkgconfig cmake ]; + buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; + + meta = with stdenv.lib; { + description = "High performance ray tracing kernels from Intel"; + homepage = "https://embree.github.io/"; + maintainers = with maintainers; [ hodapp gebner ]; + license = licenses.asl20; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 952ddd19780..f3d95de47fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3468,6 +3468,7 @@ in python = python3; }; + embree = callPackage ../development/libraries/embree { }; embree2 = callPackage ../development/libraries/embree/2.x.nix { }; emem = callPackage ../applications/misc/emem { }; From 6b74f99abd2f4c62e8093cfbdb104f60661d5405 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 18 Sep 2020 15:14:12 +0200 Subject: [PATCH 285/463] blender: 2.83.5 -> 2.90.0 --- pkgs/applications/misc/blender/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 2190307fbb5..2a28a4edc4f 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -9,6 +9,7 @@ , colladaSupport ? true, opencollada , makeWrapper , pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL +, embree }: with lib; @@ -17,11 +18,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.83.5"; + version = "2.90.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "0xyawly00a59hfdb6b7va84k5fhcv2mxnzd77vs22bzi9y7sap43"; + sha256 = "08qkvgdfrqh4ljqw5m64bbki1dsfcs4xnwzq6829z3ddhiwrxw84"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { (opensubdiv.override { inherit cudaSupport; }) tbb makeWrapper + embree ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender @@ -50,8 +52,11 @@ stdenv.mkDerivation rec { ++ optional cudaSupport cudatoolkit ++ optional colladaSupport opencollada; - postPatch = - if stdenv.isDarwin then '' + postPatch = '' + # allow usage of dynamically linked embree + rm build_files/cmake/Modules/FindEmbree.cmake + '' + + (if stdenv.isDarwin then '' : > build_files/cmake/platform/platform_apple_xcode.cmake substituteInPlace source/creator/CMakeLists.txt \ --replace '${"$"}{LIBDIR}/python' \ @@ -77,7 +82,7 @@ stdenv.mkDerivation rec { 'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #' '' else '' substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' - ''; + ''); cmakeFlags = [ From 44c558b219388881337bedb20d6fecb7358f8d46 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 18 Sep 2020 17:07:22 +0200 Subject: [PATCH 286/463] matrix-synapse: 1.19.2 -> 1.19.3 https://github.com/matrix-org/synapse/releases/tag/v1.19.3 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 3758505edba..cc4447914c4 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.19.2"; + version = "1.19.3"; src = fetchPypi { inherit pname version; - sha256 = "0q2w3aid6xsn1ibpsl3wf6m7vl0znngz8n717rx1jndz4s6014nj"; + sha256 = "1r63gw9a4n2sd3520zadpn05zxfk45nqrgwxp3zky5nkyrh4qbys"; }; patches = [ From cfb9acad8a3121eda7ca3d84a8349398c69fb7e0 Mon Sep 17 00:00:00 2001 From: Diego Pontoriero <74719+diegs@users.noreply.github.com> Date: Fri, 18 Sep 2020 09:28:49 -0700 Subject: [PATCH 287/463] gopls: 0.4.4 -> 0.5.0 (#98182) --- pkgs/development/tools/gopls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 4ce65518a85..1e750a2dec5 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gopls"; - version = "0.4.4"; + version = "0.5.0"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "1h4ica6rwrdp5wg4ybpzvyvszj4m5l6w9hpvd9r2qcd9qdnqlykf"; + sha256 = "150jg1qmdszfvh1x5fagawgc24xy19xjg9y1hq3drwy7lfdnahmq"; }; modRoot = "gopls"; - vendorSha256 = "175051d858lsdir2hj5qcimp6hakbi9grpws1ssvk3r2jna27x1z"; + vendorSha256 = "1s3d4hnbw0mab7njck79qmgkjn87vs4ffk44zk2qdrzqjjlqq5iv"; doCheck = false; From e3c1b8782a24286f8778baa784d9fbfd061cd1d5 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 11 Sep 2020 14:08:39 +0200 Subject: [PATCH 288/463] python3Packages.fluent-logger: relax version for msgpack Also add imports tests as we can't do more using the pip release --- .../python-modules/fluent-logger/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix index e99ececc24e..70c9173f4d5 100644 --- a/pkgs/development/python-modules/fluent-logger/default.nix +++ b/pkgs/development/python-modules/fluent-logger/default.nix @@ -9,10 +9,21 @@ buildPythonPackage rec { sha256 = "a7d47eae4d2a11c8cb0df10ae3d034d95b0b8cef9d060e59e7519ad1f82ffa73"; }; + prePatch = '' + substituteInPlace setup.py \ + --replace "msgpack<1.0.0" "msgpack" + ''; + propagatedBuildInputs = [ msgpack ]; # Tests fail because absent in package doCheck = false; + pythonImportsCheck = [ + "fluent" + "fluent.event" + "fluent.handler" + "fluent.sender" + ]; meta = with lib; { description = "A structured logger for Fluentd (Python)"; From 20472523e7538a1d2271d856fe91ae2d40a2c8ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Povi=C5=A1er?= Date: Fri, 18 Sep 2020 12:05:37 +0200 Subject: [PATCH 289/463] python3.pkgs.cartopy: 0.17 -> 0.18 Fixes build. Formerly cartopy tests were failing, likely since update of matplotlib to 3.3.0. --- pkgs/development/python-modules/cartopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index c01f27608fd..f41aa6985da 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "cartopy"; - version = "0.17.0"; + version = "0.18.0"; src = fetchPypi { inherit version; pname = "Cartopy"; - sha256 = "0q9ckfi37cxj7jwnqnzij62vwcf4krccx576vv5lhvpgvplxjjs2"; + sha256 = "0d24fk0cbp29gmkysrwq05vry13swmwi3vx3cpcy04c0ixz33ykz"; }; checkInputs = [ filelock mock pytest_4 pep8 ]; From 5f0f2b85cb86770d362f57bc6ac048ba04cbaf7d Mon Sep 17 00:00:00 2001 From: William Kral Date: Thu, 17 Sep 2020 19:19:16 -0700 Subject: [PATCH 290/463] python3Packages.requests-aws4auth: fix build --- .../python-modules/requests-aws4auth/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index c54657b4bf5..f954a340b7f 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }: +{ lib, buildPythonPackage, fetchPypi, python, requests }: with lib; buildPythonPackage rec { pname = "requests-aws4auth"; @@ -9,15 +9,12 @@ buildPythonPackage rec { sha256 = "2950f6ff686b5a452a269076d990e4821d959b61cfac319c3d3c6daaa5db55ce"; }; - postPatch = optionalString isPy3k '' - sed "s/path_encoding_style/'path_encoding_style'/" \ - -i requests_aws4auth/service_parameters.py - ''; - propagatedBuildInputs = [ requests ]; - # The test fail on Python >= 3 because of module import errors. - doCheck = !isPy3k; + checkPhase = '' + cd requests_aws4auth + ${python.interpreter} test/requests_aws4auth_test.py + ''; meta = { description = "Amazon Web Services version 4 authentication for the Python Requests library."; From 6a4e785931e8e9ccd008f43cff2126861f2f182d Mon Sep 17 00:00:00 2001 From: William Kral Date: Wed, 16 Sep 2020 18:29:28 -0700 Subject: [PATCH 291/463] python3Packages.word2vec: fix build and tests --- .../python-modules/word2vec/default.nix | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index 367c299a70c..1e448c37709 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -1,14 +1,23 @@ { stdenv , buildPythonPackage , fetchPypi +, fetchzip , cython , numpy , scikitlearn , six -, python +, setuptools_scm +, gcc +, pytest +, pytestcov , isPy27 }: - +let + testData = fetchzip { + url = "http://mattmahoney.net/dc/text8.zip"; + sha256 = "0w3l64bww9znmmvd9cqbfmh3dddnlrjicz43y5qq6fhi9cfqjfar"; + }; +in buildPythonPackage rec { pname = "word2vec"; version = "0.11.1"; @@ -19,17 +28,25 @@ buildPythonPackage rec { sha256 = "222d8ffb47f385c43eba45e3f308e605fc9736b2b7137d74979adf1a31e7c8b4"; }; + nativeBuildInputs = [ setuptools_scm gcc ]; + propagatedBuildInputs = [ cython numpy scikitlearn six ]; + checkInputs = [ pytest pytestcov ]; + + # Checks require test data downloaded separately + # See project source Makefile:test-data rule for reference checkPhase = '' - cd word2vec/tests; - ${python.interpreter} test_word2vec.py + PATH=$PATH:$out/bin + mkdir data + head -c 100000 ${testData}/text8 > data/text8-small + pytest ''; meta = with stdenv.lib; { description = "Tool for computing continuous distributed representations of words"; homepage = "https://github.com/danielfrg/word2vec"; - license = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ NikolaMandic ]; }; From aa49a71159c135ada9822fb6ba616805d647198e Mon Sep 17 00:00:00 2001 From: Zach Coyle Date: Thu, 17 Sep 2020 19:56:50 -0400 Subject: [PATCH 292/463] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 192 ++++++++++++++-------------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 2b340c0f426..a820152d6cc 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -137,12 +137,12 @@ let asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2020-08-09"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "0d4ec1805d50fd39b8b41626e0761736feb307d0"; - sha256 = "0lcqdh51fd8lx1g02dcwrfnnx3zfm71g57nv2pmin5ap7qgh8kir"; + rev = "20a279b079452dba6e841755f8e9cc5aed75d05e"; + sha256 = "0fsafx0h3nmsrsscg233cyfhm2vj6n1k0n37l2mg0kbv77pzicga"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -389,12 +389,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-09-14"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "29ae0c4c07d735e27b780b48e7a1f12a8bcb1aa4"; - sha256 = "012ixvjs6cj7f1s9l26fkmmvzlv6wxy9awi2rgs71bwqgflxxksk"; + rev = "fd1fbf5eaba58ff25cae154bc98b3ceaa6467d8b"; + sha256 = "0h9ff2n7mw00vn0yw5jkfa8p8ii9gj25lnir7812b182480my1mg"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -413,12 +413,12 @@ let coc-markdownlint = buildVimPluginFrom2Nix { pname = "coc-markdownlint"; - version = "2020-09-02"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-markdownlint"; - rev = "9e68427e138bcce5440fd29fd632081962f6c6e9"; - sha256 = "064afqfjjx1ad26sgbypzivcpdx5n45wa5d93dbib4wrvkkqyslm"; + rev = "3da74c203bf9db5c702142791338c1fdeec3310d"; + sha256 = "09zh0pchv0iirr7hfig1x6zai90fzg33ap9n6dhd3fa2yrd8qgci"; }; meta.homepage = "https://github.com/fannheyward/coc-markdownlint/"; }; @@ -437,12 +437,12 @@ let coc-spell-checker = buildVimPluginFrom2Nix { pname = "coc-spell-checker"; - version = "2020-08-01"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "iamcco"; repo = "coc-spell-checker"; - rev = "c1fe3de47f6ba93d4c44b514e530517c19a75880"; - sha256 = "1yvcbfrd5lxgmxbvphpbzcw8ni6zjqmg2flkrvnz59b9rmafn8dg"; + rev = "a76ebbff41fec61bb7a3c2556a670720db3f9ff9"; + sha256 = "0i2znngg8jyxgns1kqi5168c4899wj2b8h8n14yy6pxgidhgqvzp"; }; meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; @@ -522,12 +522,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-09-14"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "3cffa5b8a6494af618d050578e2b8d8c5b70c447"; - sha256 = "160j3al4lcgd68a2qscnfsnsdp2wj3xbs58wr8w9cxfa19xn85nd"; + rev = "f6f63add3a6004183ae6f2fff12b5b9f5067f493"; + sha256 = "059msciykax5gcf71i80zxn0qm9hpf7g7k5cn8h2xqxil13jxrin"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -570,24 +570,24 @@ let context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2020-04-27"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "a96f74ac35b77ebe2c5788ca31e66d87ab239adb"; - sha256 = "1pgb86cpv4649qnxfw4280sqghldm66s572pg610giqjxda4a52s"; + rev = "cf25d744ac35872364c49fac3cb6a546e8af92ce"; + sha256 = "0mq0wh6kihmn5izaz81zl274yxc1x4gr9qmz9sjdhh122i9gbfs8"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2020-09-08"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "828f950097e33325912fd142aa3c4c284c081986"; - sha256 = "1qwc40fvfbhnn160m0clab4kcd1laqibhp7rvivqnk537pw5fk6l"; + rev = "7ea2fd5f42910dcd10eaaccddedcc33f2edd2ef1"; + sha256 = "1f14sg9v80ir9f1zk4xqjbqqd0cv2pxpipbflzwafmwcs5chz6rv"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -726,12 +726,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-09-13"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "f5beca0c3b652c0c34bfb0f45636f8f99ce0aeef"; - sha256 = "028d6riqvfd7cgdl16vqhnq06ihjmlv27hdpz0ccpkh2yszq16iq"; + rev = "ac40f5170ba097efec0f9055c92fe95e20ee2a7e"; + sha256 = "031bgs5ypw20ffml7x2nbrfzpi4zqb64d1n9j3blyy4yyaa60089"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -774,12 +774,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-09-11"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "b9b332a3080708da5f5895965da66c4dbe70bd4c"; - sha256 = "0mifp2ykb0lbf1mbm15p5ywhwcxq8w8ilqcyqbsxakc8pwrl0zw6"; + rev = "7d54f44e1035aea4cba99bdb34f0565b55008706"; + sha256 = "1bjslhsw3xm4pvzks7b1v7il8ap2mr7n64sv2sgx56c5fl410pkl"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1052,12 +1052,12 @@ let diagnostic-nvim = buildVimPluginFrom2Nix { pname = "diagnostic-nvim"; - version = "2020-07-25"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "diagnostic-nvim"; - rev = "03670688e70fc65eff70abb3cefe1a086ee95bf8"; - sha256 = "02nci7n9lpz1axpwzpv34r6720iycfh43n1910ryhm4f7cxs2x61"; + rev = "49abd2e71772f6976b7e1360782570535069bc94"; + sha256 = "16i99j76j1s8p7kjyr49pwj9jlqiq0krzwyxxk1z16shfymvav88"; }; meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; @@ -1872,12 +1872,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-09-12"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "8823c393fe344daee96d6de0250197d2fbc91dd3"; - sha256 = "050mwgb378vxfdjfvawz2s110pd523jgzx05p8hksk9nm4j2a05n"; + rev = "b9024dcb4204437452b84dfd83bd39748bfc7cd3"; + sha256 = "1m896054kz44k8kfmp4pmashin85n41gddnhsv1657dgd2dyzply"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2256,12 +2256,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-09-13"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "9d1031b809514c0718753db44f268546c37782f6"; - sha256 = "1szfhwxd255rhd94js8jmnk5idd2qbq3fajdjxyaiz775zyfhsiz"; + rev = "edb1751fbe5330f32ded49d736b8c403ae071fba"; + sha256 = "19m0yyasjnm5863yw9qlkbschj6f901p6qn89brf2ml7app9vmb4"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2352,12 +2352,12 @@ let neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; - version = "2020-09-09"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "fae31a285e719a938c19f465ab4b21387e56bbff"; - sha256 = "0ykalrnqp66jr9jnn3ixcmi429w3c2wq7fbl21cnb9iql0gh719j"; + rev = "78f4d79f703aff49c9bcee5d527234c2f64425d5"; + sha256 = "1dq79jabyyyphgigqac9jf7hhadfh336fm8hklh1d64xlzyrfp6s"; }; meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; @@ -2496,12 +2496,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2020-08-22"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "004dc3cfa93fb56baeaed55291cf356dd1b18f9b"; - sha256 = "0x4r0s9rm2zk8rrvw2m1rfmagmy68d88bmxiqps2c3fb9zd1c7ny"; + rev = "db06dcbdc480b936b2da3028addb80807fdc8ed6"; + sha256 = "1d3jg75l8zgwxigmyy274rhn8ldfx003qzmfj2abd9lncqcs43va"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -2544,12 +2544,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-09-14"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f8a76d6de6740ee736c32628dadf41a73c008612"; - sha256 = "13mrw57w14j172igfd2jv0nlf606iq343bh709ir86cpliq51n9p"; + rev = "b2e1ea1edf2cb42d20a941595cd0b4fcb871a0b5"; + sha256 = "1lg7mmp87r35h9rsf8pkngnxkgrjwg43a3aig6zmg37v58kgwv1j"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3830,12 +3830,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-09-09"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "f5693986c4ce82e50f4feebda22cf8c2fed35438"; - sha256 = "0jl58s0xp2snhpn5f7r3gacj6fi88hc8anxj9r36gww24j4y7kzw"; + rev = "3740312de0be5200286260816e2563e77c0be0c5"; + sha256 = "0ia4h37gnxqagjz3yb2r6awp016iyc6dr0n84k2205g5pqck5b2x"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4046,12 +4046,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-09-13"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "92c4da683f71cc1c2a17308712bb0b2f60168560"; - sha256 = "0f8dcvfb4br8al73x4i7zs39z78hvd2rfmxiakj0di7a60i9v1yh"; + rev = "415fd21e109ca05e22a38613f93baf1f96ede08c"; + sha256 = "066k0mdcxqv2hl9jdy93i6v5mi8mhr3q8zr1cd5xrxsxzgv9r476"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4610,12 +4610,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-09-10"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "9de0fdeba46ec03d645f8ad093978961f405b81d"; - sha256 = "1s9d0h96vgzhff30bxqciv5pdj1im9pk8j1r3361ma9zk8fjsnrr"; + rev = "dfaecd8d3fede970a1e4c38e2287e0fa5a264253"; + sha256 = "0wkhib4cawh6hq1ihq851afdj6chkxw4a4dqgjkvz2f6krhpblj5"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -4754,24 +4754,24 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-09-07"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "9b9b527d61a6fe10a6d0c618cc0dd113b6aa7690"; - sha256 = "147yqgr7vrn2rj90qczp70fiqk3mj02p4v5qkkhwh1kspdqsjmp7"; + rev = "b919c60a6d1ca70a93d56fa4ee13dbcf412a8554"; + sha256 = "0sz08nbmk8pqlc4b1vypwv6xbhg7nrns6g1abp7xkzwn07lnrqb2"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; vim-grammarous = buildVimPluginFrom2Nix { pname = "vim-grammarous"; - version = "2019-03-30"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-grammarous"; - rev = "083cbee6094c9ec347d7c75af421be27d2ec7e70"; - sha256 = "1cxycr2ijzxn9d5xgp9ri4f2i4d87a3100nsc11iwa2bzir4xsiz"; + rev = "a3d67402099ca3554dc06eb7cb514865e39ec0ea"; + sha256 = "0w1qicka7g386qg7iyfg7fh30hmdx5yvmh3qza6ifj5x4w99l0ri"; }; meta.homepage = "https://github.com/rhysd/vim-grammarous/"; }; @@ -5211,12 +5211,12 @@ let vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2019-11-04"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "c32357892f10117291461631d51a6bfd20e72b9a"; - sha256 = "0zqvcnbns0vbxkqr0mpiapql8cvp54nn5a6mwc7l24jr6plhiwmn"; + rev = "ebdf6988bac3d1ebc45b3e51a86f3c065cf60c24"; + sha256 = "0zw24lhgs37lpbbdv2ir9s7g0fd3gjhjx2kvv54cs6mjszg2qmsm"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -5355,12 +5355,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-09-01"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "a8dd16f59a1f56ee40d0d403a722b6d556fa04e9"; - sha256 = "1m08v4b0l88ly5jhklr4hx642gdypz315x9yhsni9bnxi9dhhkaa"; + rev = "46330cd0cbab3780b59a53c16fde6273bb217071"; + sha256 = "121pr3s13bcy1hqc4bcx0x7isg0x5izbrsvir33d39q2x0wj44my"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -5631,12 +5631,12 @@ let vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2020-08-20"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "a3b6c91b8cfed991ff469363a6c081df26a18f6c"; - sha256 = "15lk6a40rl37iswa8yhx5ns0k83n4wyi6afy62107x9wha8hagax"; + rev = "acee4ad4d65ddaf81895cca9e28baea4c13fa76a"; + sha256 = "0rrjcc5i1isia74nrrik5avkd0casbjhgyqb2ph2176gywz6h5y5"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -5847,12 +5847,12 @@ let vim-phabricator = buildVimPluginFrom2Nix { pname = "vim-phabricator"; - version = "2020-01-23"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-phabricator"; - rev = "065c7e3f2d92a6792b50f087393b2c9a10a1e825"; - sha256 = "0yhf347fhrs0aqsq1swqihyav32442lv2chzjr3mzqcym8zbzsh6"; + rev = "d5c0571f44f2c44ba32df2d12e52b4dfcd4921ed"; + sha256 = "003zi8dvyyhvlb30zz8ah7iai8pmwmsk2jwa38386ff0jfm6dkpq"; }; meta.homepage = "https://github.com/jparise/vim-phabricator/"; }; @@ -5895,12 +5895,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-09-13"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "4314841aa4772d98b186636bdbf34fcf48c74275"; - sha256 = "1qkhg6wx1ngvnf3x1bz089sb74f3018z9fs9bgzm6x0ar0jvy1iw"; + rev = "06548fe61765d8a68a289741ce8d30f04a037e60"; + sha256 = "18yiqj62vpkvnxgcy1hqbdy846g4c3i807d3bbiz1kgwf9jh50ik"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6063,12 +6063,12 @@ let vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2020-08-22"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "858a379bcb389d67abdb7e0eb1b0a1fa78d8ba39"; - sha256 = "077jxka05w452g7vrlx1dly85ddqv8z8fh3xklq6dvz016x306m4"; + rev = "3cc34304643abf8d28d2482e74119d0d5f4b5302"; + sha256 = "1j2a3kwcff4avniph4z8g4im59z8fs2kj7vkwzgalj828nncx5g6"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -6555,12 +6555,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2020-08-07"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "85402fc0f05c103da9d3416e34fb88237ca1de3c"; - sha256 = "1g8802wmhg5zjk51qfiqcvdclqwg8rfizfpz5jlskcayh82gxvg0"; + rev = "4c0ae1aa9324dc37e0d8bb672ecdcb313f97f75c"; + sha256 = "1rg9r0zpxwbzj710rm3jh9bvgdngmn8c4ikcv0rjk7d7wy2pclkn"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -6844,12 +6844,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-09-11"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "9e1acf352d5f25123ac9bee90e3722ac5712c65f"; - sha256 = "0iysn5b3x08y25c3nvnr1n6dinmy4hgl69gdxm6hm5xg9am27wnr"; + rev = "d74c0b97ab0514ac924daa6dde87bee005d3469a"; + sha256 = "0jg2prsdfhs0vq43flsm8clhbamnddpafn2ajwjcxgyjb6dn6ndj"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6868,12 +6868,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-09-14"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "09c633bb3258ee4f17a5f0414a47433e7779ac66"; - sha256 = "1fj93ig249acqdxfhpvc4rrdwb5yzvwm83hfxxdb4g1d966xg0dw"; + rev = "3d2d4b8e6cb219d615d54e3fa31288ff85879711"; + sha256 = "1iadzwzf0v64a89zavw9dh1n6cp7388npm7zihcfdflhisrbrk22"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -7133,12 +7133,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-09-13"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "a9217a31bcfb17a953bcf600245426e3df9a4192"; - sha256 = "0adk5m5hql7ragvbfs110wpai3apyyb3lh9pj550jq1512d30xag"; + rev = "9b53bb31a04e4ad4aaad43f3b5200f2494c256ae"; + sha256 = "180w0ajhjvwscl1f0w15yrb1lhvxm878izici1wj0sn06gkb51cp"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7181,12 +7181,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-08-14"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "7f97d30914daea5b542a90eed747d5bd00afbb19"; - sha256 = "1ghpkyh9ga759v065yvn4xr8ccwamyr87jkq3av9fslxzfzhwdpm"; + rev = "7972a7c6ebb3d5a1ab505605477b0fb79b5a7700"; + sha256 = "0qh8kwvl5dbc3k3pqfpc7liqvisjh08v7w9igrh719v0zdhdlyhv"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7314,12 +7314,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-09-10"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "37a149ee028bfb61a6e33dbfe30d7ce1343c9519"; - sha256 = "0sb93zy6h21aayal08fj57vd7xjhwjkxihbd6l3yqcxgdz9kr5ir"; + rev = "d98f896ada495c3687007313374b2f945a2f2fb4"; + sha256 = "1p6x5qd6zvzg3ypllsgl7n9vk18g67dqyqg4zg9j07c9fsqs6383"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; From 93fd4b5c6c7875188390da8a336cca41d55ecb06 Mon Sep 17 00:00:00 2001 From: Zach Coyle Date: Thu, 17 Sep 2020 19:57:13 -0400 Subject: [PATCH 293/463] vimPlugins.vim-nerdtree-syntax-highlight: init at 2020-07-19 --- 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 a820152d6cc..90dd6c94d37 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5545,6 +5545,18 @@ let meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; + vim-nerdtree-syntax-highlight = buildVimPluginFrom2Nix { + pname = "vim-nerdtree-syntax-highlight"; + version = "2020-07-19"; + src = fetchFromGitHub { + owner = "tiagofumo"; + repo = "vim-nerdtree-syntax-highlight"; + rev = "1acc12aa7f773ede38538293332905f1ba3fea6a"; + sha256 = "0zm023mhi1si9g5r46md1v4rlls6z2m6kyn1jcfxjqyrgba67899"; + }; + meta.homepage = "https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/"; + }; + vim-nerdtree-tabs = buildVimPluginFrom2Nix { pname = "vim-nerdtree-tabs"; version = "2018-12-21"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a384f3b6580..f97280adf7b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -490,6 +490,7 @@ thinca/vim-themis thinca/vim-visualstar thirtythreeforty/lessspace.vim thosakwe/vim-flutter +tiagofumo/vim-nerdtree-syntax-highlight tikhomirov/vim-glsl tmhedberg/SimpylFold tmsvg/pear-tree From e2b99c074a663ba03dc755546b8d159702f191f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Sep 2020 19:35:50 +0200 Subject: [PATCH 294/463] LTS Haskell 16.15 --- .../configuration-hackage2nix.yaml | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index bcbf09a4070..93342f104f3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.13 + # LTS Haskell 16.15 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -243,7 +243,7 @@ default-package-overrides: - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.4 - - assert-failure ==0.1.2.4 + - assert-failure ==0.1.2.5 - assoc ==1.0.2 - astro ==0.4.2.1 - async ==2.2.2 @@ -261,12 +261,12 @@ default-package-overrides: - attoparsec-iso8601 ==1.0.1.0 - attoparsec-path ==0.0.0.1 - audacity ==0.0.2 - - aur ==7.0.3 - - aura ==3.1.8 + - aur ==7.0.4 + - aura ==3.1.9 - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - autoexporter ==1.1.18 + - autoexporter ==1.1.19 - auto-update ==0.1.6 - avers ==0.0.17.1 - avro ==0.5.2.0 @@ -402,7 +402,7 @@ default-package-overrides: - casing ==0.1.4.1 - cassava ==0.5.2.0 - cassava-conduit ==0.5.1 - - cassava-megaparsec ==2.0.1 + - cassava-megaparsec ==2.0.2 - cast ==0.1.0.2 - category ==0.2.5.0 - cayley-client ==0.4.13 @@ -454,7 +454,7 @@ default-package-overrides: - clumpiness ==0.17.0.2 - ClustalParser ==1.3.0 - cmark ==0.6 - - cmark-gfm ==0.2.1 + - cmark-gfm ==0.2.2 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.20 - codec-beam ==0.2.0 @@ -657,7 +657,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.2 - - dl-fedora ==0.7.4 + - dl-fedora ==0.7.5 - dlist ==0.8.0.8 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -671,7 +671,7 @@ default-package-overrides: - doldol ==0.4.1.2 - do-list ==1.0.1 - do-notation ==0.1.0.2 - - dotenv ==0.8.0.6 + - dotenv ==0.8.0.7 - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 @@ -733,7 +733,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.8 - - esqueleto ==3.3.3.3 + - esqueleto ==3.3.4.0 - essence-of-live-coding ==0.1.0.3 - essence-of-live-coding-gloss ==0.1.0.3 - essence-of-live-coding-pulse ==0.1.0.3 @@ -760,7 +760,7 @@ default-package-overrides: - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - - extra ==1.7.7 + - extra ==1.7.8 - extractable-singleton ==0.0.1 - extrapolate ==0.4.2 - fail ==4.9.0.0 @@ -902,8 +902,8 @@ default-package-overrides: - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.10.2.20200808 - - ghc-lib-parser ==8.10.2.20200808 + - ghc-lib ==8.10.2.20200916 + - ghc-lib-parser ==8.10.2.20200916 - ghc-lib-parser-ex ==8.10.0.16 - ghc-parser ==0.2.2.0 - ghc-paths ==0.1.0.12 @@ -988,7 +988,7 @@ default-package-overrides: - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 - hashmap ==1.3.3 - - hashtables ==1.2.3.4 + - hashtables ==1.2.4.1 - haskeline ==0.7.5.0 - haskell-gi ==0.23.1 - haskell-gi-base ==0.23.0 @@ -1130,7 +1130,7 @@ default-package-overrides: - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - http2 ==2.0.5 - - HTTP ==4000.3.14 + - HTTP ==4000.3.15 - http-api-data ==0.4.1.1 - http-client ==0.6.4.1 - http-client-openssl ==0.3.1.0 @@ -1205,7 +1205,7 @@ default-package-overrides: - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1 - infer-license ==0.2.0 - - inflections ==0.4.0.5 + - inflections ==0.4.0.6 - influxdb ==1.7.1.6 - ini ==0.4.1 - inj ==1.0 @@ -1232,11 +1232,11 @@ default-package-overrides: - invertible ==0.2.0.7 - invertible-grammar ==0.1.3 - io-machine ==0.2.0.0 - - io-manager ==0.1.0.2 + - io-manager ==0.1.0.3 - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 - - io-streams ==1.5.1.0 + - io-streams ==1.5.2.0 - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.1 - iproute ==1.7.9 @@ -1597,7 +1597,7 @@ default-package-overrides: - OpenGLRaw ==3.3.4.0 - openpgp-asciiarmor ==0.1.2 - opensource ==0.1.1.0 - - openssl-streams ==1.2.2.0 + - openssl-streams ==1.2.3.0 - opentelemetry ==0.4.2 - opentelemetry-extra ==0.4.2 - opentelemetry-lightstep ==0.4.2 @@ -1782,7 +1782,7 @@ default-package-overrides: - pushbullet-types ==0.4.1.0 - pusher-http-haskell ==1.5.1.14 - pvar ==0.2.0.0 - - PyF ==0.9.0.1 + - PyF ==0.9.0.2 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qrcode-core ==0.9.4 @@ -1793,7 +1793,7 @@ default-package-overrides: - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.6.4.0 - - quickcheck-classes-base ==0.6.0.0 + - quickcheck-classes-base ==0.6.1.0 - quickcheck-instances ==0.3.23 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.1.1 @@ -1886,7 +1886,7 @@ default-package-overrides: - rhine ==0.6.0 - rhine-gloss ==0.6.0.1 - rigel-viz ==0.2.0.0 - - rio ==0.1.18.0 + - rio ==0.1.19.0 - rio-orphans ==0.1.1.0 - rio-prettyprint ==0.1.1.0 - roc-id ==0.1.0.0 @@ -2039,7 +2039,7 @@ default-package-overrides: - smallcheck ==1.1.7 - smash ==0.1.1.0 - smash-aeson ==0.1.0.0 - - smash-lens ==0.1.0.0 + - smash-lens ==0.1.0.1 - smash-microlens ==0.1.0.0 - smoothie ==0.4.2.11 - snap-blaze ==0.2.1.5 @@ -2413,7 +2413,7 @@ default-package-overrides: - wai-cors ==0.2.7 - wai-enforce-https ==0.0.2.1 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.29.2 + - wai-extra ==3.0.31 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.3.6 - wai-middleware-caching ==0.1.0.2 @@ -2512,7 +2512,7 @@ default-package-overrides: - yesod-gitrev ==0.2.1 - yesod-newsfeed ==1.7.0.0 - yesod-persistent ==1.6.0.4 - - yesod-recaptcha2 ==1.0.0 + - yesod-recaptcha2 ==1.0.1 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - yesod-test ==1.6.10 From 0be74333d01ee0a431417ffee9f9c61ae3b07322 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Sep 2020 20:12:05 +0200 Subject: [PATCH 295/463] hackage2nix: disable failing builds to fix evaluation on Hydra --- .../haskell-modules/configuration-hackage2nix.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 93342f104f3..541356d9b32 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3441,6 +3441,7 @@ broken-packages: - bitcoin-api - bitcoin-api-extra - bitcoin-block + - bitcoin-compact-filters - bitcoin-hs - bitcoin-rpc - bitcoin-script @@ -5543,6 +5544,7 @@ broken-packages: - graphicstools - graphmod-plugin - graphql + - graphql-utils - graphql-w-persistent - graphted - graphtype @@ -7515,6 +7517,7 @@ broken-packages: - LslPlus - lsystem - ltext + - lti13 - ltk - LTS - lua-bc @@ -11227,6 +11230,7 @@ broken-packages: - yesod-auth-ldap - yesod-auth-ldap-mediocre - yesod-auth-ldap-native + - yesod-auth-lti13 - yesod-auth-nopassword - yesod-auth-oauth2 - yesod-auth-pam From eb523e8663829be02087188974bc38e44cd4e8d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Sep 2020 02:30:23 +0200 Subject: [PATCH 296/463] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-17-g25ee725 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/2f8dc088ed039ec87e5acbc9ec0048244cbf2b9f. --- .../haskell-modules/hackage-packages.nix | 1163 ++++++++++------- 1 file changed, 665 insertions(+), 498 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a6f5ba494c8..4bdd2471708 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9438,10 +9438,8 @@ self: { }: mkDerivation { pname = "HTTP"; - version = "4000.3.14"; - sha256 = "0yv8mbjicpl7l2017c4dhm49117lblgwpy1llv368wci1vrxf0m6"; - revision = "1"; - editedCabalFile = "1inz9grpl9605bbymy6n5y4as54mlykbsiw8wpm5gl6qvxgrf69w"; + version = "4000.3.15"; + sha256 = "150m5v125s4jrxzl85jhnh69kp4mjyzhkqp0c1k087008f73csqd"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -16296,29 +16294,6 @@ self: { }) {}; "PyF" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , filepath, hashable, haskell-src-exts, haskell-src-meta, hspec - , HUnit, megaparsec, mtl, process, python3, template-haskell - , temporary, text - }: - mkDerivation { - pname = "PyF"; - version = "0.9.0.1"; - sha256 = "00pmpm2g7161bksc1l5clkghi0sbzh8y0f6xd52gwx9h6zxacns3"; - libraryHaskellDepends = [ - base containers haskell-src-exts haskell-src-meta megaparsec mtl - template-haskell text - ]; - testHaskellDepends = [ - base bytestring deepseq directory filepath hashable hspec HUnit - process template-haskell temporary text - ]; - testToolDepends = [ python3 ]; - description = "Quasiquotations for a python like interpolated string formater"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) python3;}; - - "PyF_0_9_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , filepath, hashable, haskell-src-exts, haskell-src-meta, hspec , HUnit, megaparsec, mtl, process, template-haskell, temporary @@ -16338,7 +16313,6 @@ self: { ]; description = "Quasiquotations for a python like interpolated string formater"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QIO" = callPackage @@ -17325,18 +17299,19 @@ self: { }) {}; "RtMidi" = callPackage - ({ mkDerivation, alsaLib, base, tasty, tasty-hunit, unliftio-core + ({ mkDerivation, alsaLib, base, deepseq, pretty-simple, tasty + , tasty-hunit, unliftio-core, vector }: mkDerivation { pname = "RtMidi"; - version = "0.2.0.0"; - sha256 = "110fdfa47lmgvk1xjgl71hicbnv6j3ihw2r4i3nig28ciliyc2v2"; + version = "0.4.0.0"; + sha256 = "075j6d7vmihyz33b5ikv2l0c0alnhjzy1wpnzdrca6l201vab2mw"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base unliftio-core ]; + libraryHaskellDepends = [ base deepseq unliftio-core vector ]; librarySystemDepends = [ alsaLib ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base tasty tasty-hunit ]; + executableHaskellDepends = [ base pretty-simple vector ]; + testHaskellDepends = [ base tasty tasty-hunit vector ]; description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -21846,6 +21821,30 @@ self: { broken = true; }) {inherit (pkgs) readline;}; + "Z-Data" = callPackage + ({ mkDerivation, base, case-insensitive, deepseq, ghc-prim + , hashable, hspec, hspec-discover, HUnit, integer-gmp, primitive + , QuickCheck, quickcheck-instances, scientific, tagged + , template-haskell, unordered-containers, word8 + }: + mkDerivation { + pname = "Z-Data"; + version = "0.1.1.0"; + sha256 = "0z7cri6mkmj22ffwg3mz8yyjr81z4ww7kkmi7m9ilmbbpssma5fw"; + libraryHaskellDepends = [ + base case-insensitive deepseq ghc-prim hashable integer-gmp + primitive QuickCheck scientific tagged template-haskell + unordered-containers + ]; + libraryToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + base hashable hspec HUnit integer-gmp primitive QuickCheck + quickcheck-instances scientific word8 + ]; + description = "array, vector and text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ZEBEDDE" = callPackage ({ mkDerivation, base, vect }: mkDerivation { @@ -24580,8 +24579,8 @@ self: { }: mkDerivation { pname = "aeson-injector"; - version = "1.1.3.0"; - sha256 = "0188g4z204dw8gyza5hn3xljwmvfk9jq1wq4gnh43894nbrcm4ji"; + version = "1.1.4.0"; + sha256 = "1q8wv9xdw8nw504dxplb3ibskfjqbawmv2694sjwg5cvi8d7fvkn"; libraryHaskellDepends = [ aeson base bifunctors deepseq hashable lens servant-docs swagger2 text unordered-containers @@ -33529,18 +33528,6 @@ self: { }) {}; "assert-failure" = callPackage - ({ mkDerivation, base, pretty-show, text }: - mkDerivation { - pname = "assert-failure"; - version = "0.1.2.4"; - sha256 = "0q4kaaxvz89qrw7j9kgh57nzyn6a8rh2w1hjb1h7ymdnznhr3cj4"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base pretty-show text ]; - description = "Syntactic sugar improving 'assert' and 'error'"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "assert-failure_0_1_2_5" = callPackage ({ mkDerivation, base, pretty-show, text }: mkDerivation { pname = "assert-failure"; @@ -33550,7 +33537,6 @@ self: { libraryHaskellDepends = [ base pretty-show text ]; description = "Syntactic sugar improving 'assert' and 'error'"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "assertions" = callPackage @@ -34459,8 +34445,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.5.0.1"; - sha256 = "09vv8cmag4189sv0nv213vhxp4pak5swk3gi4pnl777lmm0qgxxh"; + version = "3.5.0.2"; + sha256 = "1whx2yyjxc3b4s7nrwrxvyz9bwy7n15gmr9m6lcs3zxr7dvwvlmk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -35029,8 +35015,8 @@ self: { }: mkDerivation { pname = "aur"; - version = "7.0.3"; - sha256 = "0q54p9lb65k8n41gya09k8232y1piyfmks71c2z38kybh783mgg2"; + version = "7.0.4"; + sha256 = "0zq1p255qpi1alnhm7k4aj9w4v8y4ybdywbw5w9jbx47imfqqp9y"; libraryHaskellDepends = [ aeson base bytestring http-client http-types text ]; @@ -35071,10 +35057,8 @@ self: { }: mkDerivation { pname = "aura"; - version = "3.1.8"; - sha256 = "19zm9bwpixqdg4a5mcrv2c8fyhygjzawjrwv1jwwhcczqsrjwvrw"; - revision = "1"; - editedCabalFile = "0yi5hhsjv77v9gqsj6ix6nb042nywkwdwkjljpzbvl7pvsv4asr3"; + version = "3.1.9"; + sha256 = "1q248qh2wpm0gq07pihw3gshd3ixjdl1l3bf1cpxabn0gjss4hma"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35248,8 +35232,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.18"; - sha256 = "0pzszi5q7h1qxqh2fpds8d43miq0cf4mfzcwggi8409s72pyf9xl"; + version = "1.1.19"; + sha256 = "0hgxfd5pykl6y1v3asnh46abfmi5fsdp0hs1kf6a2acqsnx9vad7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -37633,6 +37617,8 @@ self: { pname = "base16"; version = "0.3.0.1"; sha256 = "10id9h9mas4kb4kfiz7hhp2hhwnb9mh92pr327c53jqxi4hazgnd"; + revision = "2"; + editedCabalFile = "1ryc4228j4v9mcfjkgallfmww7g19y4awkqyq4j4734rgvkvgslw"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -37655,12 +37641,36 @@ self: { pname = "base16-bytestring"; version = "0.1.1.7"; sha256 = "1fk9zvkx005sy4adbyil86svnqhgrvmczmf16ajhzj2wkmkqjmjj"; + revision = "3"; + editedCabalFile = "1lrxqhbjsml0q1ahpcx7p0xjy6bj1m6qzjwmv841r5r8jrm2a880"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring ]; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; license = stdenv.lib.licenses.bsd3; }) {}; + "base16-bytestring_1_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "base16-bytestring"; + version = "1.0.0.0"; + sha256 = "12bnl2fs0h4hcjpr69xqqngjh0117dlvkv56lxski6g6fnbwps2r"; + revision = "1"; + editedCabalFile = "0k47j9csaqizvbk3v7zm05l3z23v359h3w079chzbf44z99hkphc"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "RFC 4648-compliant Base16 encodings for ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base16-lens" = callPackage ({ mkDerivation, base, base16, bytestring, Cabal, cabal-doctest , doctest, lens, text @@ -37724,6 +37734,8 @@ self: { pname = "base32"; version = "0.2.0.0"; sha256 = "0xvilxcdcvz07f3qpad35whjd35c9ykicip2cdsd54ysxg71mwzm"; + revision = "1"; + editedCabalFile = "0vsc0fq4rihhx4hicfgy1xpfm1bbq4rnwgfs9qzgmwhslffqy2x5"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -37893,6 +37905,8 @@ self: { pname = "base64"; version = "0.4.2.2"; sha256 = "05ins0i1561d4gfz6h7fxx8pj8i1qkskz8dgh8pfxa1llzmr856i"; + revision = "1"; + editedCabalFile = "1rlvmg18f2d2rdyzvvzk0is4073j5arx9qirgvshjx67kic2lzqm"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -41983,6 +41997,30 @@ self: { broken = true; }) {}; + "bitcoin-compact-filters" = callPackage + ({ mkDerivation, aeson, base, bitstream, bytestring, cereal + , haskoin-core, memory, tasty, tasty-hunit, tasty-quickcheck, text + , transformers + }: + mkDerivation { + pname = "bitcoin-compact-filters"; + version = "0.1.0.0"; + sha256 = "0ikirjf0n0np0l6mjfyfxvp367imbmb3g092m4mq457ja8yp7r8m"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bitstream bytestring cereal haskoin-core memory text + transformers + ]; + testHaskellDepends = [ + aeson base bytestring cereal haskoin-core tasty tasty-hunit + tasty-quickcheck text + ]; + description = "BIP 158 compact block filters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "bitcoin-hash" = callPackage ({ mkDerivation, base, bytestring, cryptonite, memory, tasty , tasty-hunit, time @@ -46835,6 +46873,8 @@ self: { pname = "bytestring"; version = "0.10.12.0"; sha256 = "1s1kgnqb8ybz223sf2838mmxnlhwsd3lnakng6ap38m058bzzj7d"; + revision = "1"; + editedCabalFile = "10d0n2k8zhlw0bbrm2na9zchlggm8ix2wi2lav6vkbd98sg96mip"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = stdenv.lib.licenses.bsd3; @@ -49500,8 +49540,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.20.0"; - sha256 = "0b11nkh4wynb8rdhn8qym5422l0nc49shkkp2mfbwh7yhmzaqwrh"; + version = "0.1.20.1"; + sha256 = "0nh9x2w8xrmbrkadawq0ab6pvp4v14pr49x18sq9qhi0m922b0p0"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-core di-polysemy @@ -51064,24 +51104,6 @@ self: { }) {}; "cassava-megaparsec" = callPackage - ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec - , megaparsec, unordered-containers, vector - }: - mkDerivation { - pname = "cassava-megaparsec"; - version = "2.0.1"; - sha256 = "0q4skw98nzy6icmgpwqvgw0c5pqcgi25rf7nmwh2pksvv94pi3p3"; - libraryHaskellDepends = [ - base bytestring cassava megaparsec unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring cassava hspec hspec-megaparsec vector - ]; - description = "Megaparsec parser of CSV files that plays nicely with Cassava"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cassava-megaparsec_2_0_2" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec , megaparsec, unordered-containers, vector }: @@ -51097,7 +51119,6 @@ self: { ]; description = "Megaparsec parser of CSV files that plays nicely with Cassava"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-records" = callPackage @@ -54895,8 +54916,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.26.0"; - sha256 = "0yjw0kk241qbh2z6248savy3a99asd3smva1qbplga31232a8025"; + version = "0.26.1"; + sha256 = "1n37gllcgq05wgvq4f10vwz7lll6q8an1gak69m50n6fwx8zpb5i"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring @@ -56068,8 +56089,8 @@ self: { }: mkDerivation { pname = "cmark-gfm"; - version = "0.2.1"; - sha256 = "1qbhcirg7a0r68l3ifq8q9clnkai5hyhk62jb232bjplrl6y4c23"; + version = "0.2.2"; + sha256 = "1skzdg1icmhn0zrkhbnba4200ymah8sd5msk4qfgawrk77zilw7f"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -58961,8 +58982,8 @@ self: { ({ mkDerivation, base, composite-base }: mkDerivation { pname = "composite-tuple"; - version = "0.1.0.0"; - sha256 = "1c3xljlwisx3b9p5nz8jny7svsjjzazpvywwksxqccfv1vipi50z"; + version = "0.1.1.0"; + sha256 = "0ykxf17zlyjrs8nhj02r0k3l20x7ih1k1z5byxdvw7gxjwsqwq2d"; libraryHaskellDepends = [ base composite-base ]; description = "Tuple functions for composite records"; license = stdenv.lib.licenses.mit; @@ -72531,6 +72552,8 @@ self: { pname = "dhall"; version = "1.35.0"; sha256 = "19h0afgxqq9da1apx4xx9p4p0f2r6miivc4l1dkhbbvfk2r5wkw3"; + revision = "1"; + editedCabalFile = "16hlc738l0w58g5fj6kyr7il24n23a6jbwd6m0xc1sncv74pxh8w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72595,6 +72618,8 @@ self: { pname = "dhall-bash"; version = "1.0.33"; sha256 = "0b920cscim2mqcav0yy4s00gcgjqfybvbmfvnnbvarxswknw8z1v"; + revision = "1"; + editedCabalFile = "1r01himc5n19q9675i6i27yrfrx9l362ycsnvk48mcbrbmv1z5lf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72840,6 +72865,8 @@ self: { pname = "dhall-nix"; version = "1.1.17"; sha256 = "1c696f0if218pbmir4rmkb6shcgk9acw5g1iwcb2mslshmncbyfd"; + revision = "1"; + editedCabalFile = "0vdni3cmx3p6a0p587avja4zg6278fmdfv6jh5h4wfx0b7z1sphg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74611,8 +74638,8 @@ self: { }: mkDerivation { pname = "diohsc"; - version = "0.1.1"; - sha256 = "129ray1dp18f24zfxm8qj5rmafcpz0gyfp4nhf5y0yjh41jffixf"; + version = "0.1.2"; + sha256 = "0ksawn7wspw1f3yaaqyz4sgbl0p9fnidn1jjfwmjs9zrna1cb084"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76261,8 +76288,8 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "0.7.4"; - sha256 = "092fmla7a0xbnfac6izcj08wsyxbd04n23cjy33c132lqhs5k6w5"; + version = "0.7.5"; + sha256 = "1x4gdnb2k1ywvaniif7j2lsbavadaghvcpbdnms3x13s4cg18lyh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77504,34 +77531,6 @@ self: { }) {}; "dotenv" = callPackage - ({ mkDerivation, base, base-compat, containers, directory - , exceptions, hspec, hspec-megaparsec, megaparsec - , optparse-applicative, process, text, transformers, yaml - }: - mkDerivation { - pname = "dotenv"; - version = "0.8.0.6"; - sha256 = "0ndgsjjcpmhxaxjn4mmw4cyd6i2y67zpx9ap099k5jw9ad0lbwb0"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat containers directory exceptions megaparsec process - text transformers yaml - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers yaml - ]; - testHaskellDepends = [ - base base-compat containers directory exceptions hspec - hspec-megaparsec megaparsec process text transformers yaml - ]; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dotenv_0_8_0_7" = callPackage ({ mkDerivation, base, base-compat, containers, directory , exceptions, hspec, hspec-megaparsec, megaparsec , optparse-applicative, process, text, transformers, yaml @@ -77557,7 +77556,6 @@ self: { ]; description = "Loads environment variables from dotenv files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dotfs" = callPackage @@ -83792,8 +83790,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.3.3.3"; - sha256 = "14h6x4bj39ffz7arn9ddyjabb5s2a8ynphjvha606lz4mcv3mxkv"; + version = "3.3.4.0"; + sha256 = "1w46sfh4rrj7lvsdyzwphcv8n00v6kr3padkk8v5lr0r40w5n60r"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -85522,6 +85520,25 @@ self: { broken = true; }) {inherit (pkgs) exif;}; + "exiftool" = callPackage + ({ mkDerivation, aeson, base, base64, bytestring, hashable, process + , scientific, string-conversions, temporary, text + , unordered-containers, vector + }: + mkDerivation { + pname = "exiftool"; + version = "0.1.0.0"; + sha256 = "015f0ai0x6iv49k4ljz8058509h8z8kkgnp7p9l4s8z54sgqfw8y"; + revision = "1"; + editedCabalFile = "06w0g76jddjykbvym2zgcwjsa33alm1rwshhzaw0pqm573mqbp26"; + libraryHaskellDepends = [ + aeson base base64 bytestring hashable process scientific + string-conversions temporary text unordered-containers vector + ]; + description = "Haskell bindings to ExifTool"; + license = stdenv.lib.licenses.mit; + }) {}; + "exigo-schema" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, directory , esqueleto, exceptions, hint, hspec, hspec-core, interpolate @@ -86486,8 +86503,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.7.7"; - sha256 = "1ark7b6xknc44v8jg5aymxffj5d0qr81frjpg2ffqrkwnhva0w5s"; + version = "1.7.8"; + sha256 = "1sgd08h9p7ywmv08yd1h6z1bpf6pqpj1qn4v7vv7w4la86jmh2yg"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -95198,8 +95215,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "funspection"; - version = "1.0.0.0"; - sha256 = "0jbzvn06d5kfyiav3fjd6k8sk8dy00pwk2g711nrbmlrljbw7f39"; + version = "1.0.0.1"; + sha256 = "0jf8yhk45n06avl9avgmawvazsz585i7jppvcds6pjd8pqdb2qk4"; libraryHaskellDepends = [ base ]; description = "Type-level function utilities"; license = stdenv.lib.licenses.bsd3; @@ -99127,8 +99144,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "8.10.2.20200808"; - sha256 = "0vh941bk7fy44rn5hwqa25xbfyhm28wcy4nwpvm3291lp0cxndgh"; + version = "8.10.2.20200916"; + sha256 = "0yarxqbl7njqhfycrdz4lr6m04wqhrlsgb9vcq6gbmlizswwxr6g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -99146,8 +99163,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.10.2.20200808"; - sha256 = "0nfxsvpsiyxbjc3hvdax70z07k08bc255lz9jhqgq57lnw46dyfl"; + version = "8.10.2.20200916"; + sha256 = "0azfy14w268by4ydaarjdw7awbd44pgqg03zykzfg7iabyzr2dfk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -100056,18 +100073,19 @@ self: { , directory, extra, filepath, fuzzy, ghc, ghc-boot, ghc-boot-th , ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev , haddock-library, hashable, haskell-lsp, haskell-lsp-types - , hie-bios, hslogger, lens, lsp-test, mtl, network-uri - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , process, QuickCheck, quickcheck-instances, regex-tdfa - , rope-utf16-splay, safe, safe-exceptions, shake, sorted-list, stm - , syb, tasty, tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unordered-containers - , utf8-string, yaml + , hie-bios, hslogger, implicit-hie-cradle, lens, lsp-test, mtl + , network-uri, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck + , quickcheck-instances, record-dot-preprocessor, record-hasfield + , regex-tdfa, rope-utf16-splay, safe, safe-exceptions, shake + , sorted-list, stm, syb, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, tasty-rerun, text, time, transformers, unix + , unordered-containers, utf8-string, yaml }: mkDerivation { pname = "ghcide"; - version = "0.3.0"; - sha256 = "001g3240qd9q9j00cmvz9d0b73mbf8mv5204cyf5jh04xcd09908"; + version = "0.4.0"; + sha256 = "0h714pfdjkb4rbq9kz3ilj52nxdvr3c0w5nms5znxjlaysgaqp5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100075,24 +100093,25 @@ self: { containers cryptohash-sha1 data-default deepseq directory extra filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths haddock-library hashable haskell-lsp haskell-lsp-types hie-bios - hslogger mtl network-uri prettyprinter prettyprinter-ansi-terminal - regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list - stm syb text time transformers unix unordered-containers - utf8-string + hslogger implicit-hie-cradle mtl network-uri prettyprinter + prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay safe + safe-exceptions shake sorted-list stm syb text time transformers + unix unordered-containers utf8-string ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios - lsp-test optparse-applicative process safe-exceptions text + lens lsp-test optparse-applicative process safe-exceptions text unordered-containers ]; testHaskellDepends = [ aeson base binary bytestring containers directory extra filepath ghc ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types lens lsp-test network-uri optparse-applicative - process QuickCheck quickcheck-instances rope-utf16-splay safe - safe-exceptions shake tasty tasty-expected-failure tasty-hunit - tasty-quickcheck tasty-rerun text + process QuickCheck quickcheck-instances record-dot-preprocessor + record-hasfield rope-utf16-splay safe safe-exceptions shake tasty + tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun + text ]; benchmarkHaskellDepends = [ aeson base Chart Chart-diagrams diagrams diagrams-svg directory @@ -100576,6 +100595,23 @@ self: { broken = true; }) {}; + "gi-cairo-connector_0_1_0" = callPackage + ({ mkDerivation, base, gi-cairo, gi-cairo-render, haskell-gi-base + , mtl + }: + mkDerivation { + pname = "gi-cairo-connector"; + version = "0.1.0"; + sha256 = "115iy6sd77aabzghdmfpn5w2zqqalrxgbs5i93z49y3vz4wsjiwf"; + libraryHaskellDepends = [ + base gi-cairo gi-cairo-render haskell-gi-base mtl + ]; + description = "GI friendly Binding to the Cairo library"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "gi-cairo-render" = callPackage ({ mkDerivation, array, base, bytestring, c2hs, cairo , haskell-gi-base, mtl, text, utf8-string @@ -100597,6 +100633,25 @@ self: { broken = true; }) {inherit (pkgs) cairo;}; + "gi-cairo-render_0_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, c2hs, cairo + , haskell-gi-base, mtl, text, utf8-string + }: + mkDerivation { + pname = "gi-cairo-render"; + version = "0.1.0"; + sha256 = "1b2qxfahs4w288i6w5m0rs74amnm3zp0mj2vsccf34q437yni2gx"; + libraryHaskellDepends = [ + array base bytestring haskell-gi-base mtl text utf8-string + ]; + libraryPkgconfigDepends = [ cairo ]; + libraryToolDepends = [ c2hs ]; + description = "GI friendly Binding to the Cairo library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) cairo;}; + "gi-dbusmenu" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading @@ -103020,15 +103075,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "gitlab-haskell_0_2_2" = callPackage + "gitlab-haskell_0_2_3" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, http-conduit , http-types, tasty, tasty-hunit, text, time, transformers , unliftio, unliftio-core }: mkDerivation { pname = "gitlab-haskell"; - version = "0.2.2"; - sha256 = "10c6fv0hd8fnll56l7p4qbhyb0b4imiav910762kywbfrz1z6w18"; + version = "0.2.3"; + sha256 = "0nsb7rkqflss6bhdvbjbgg2akwavz777icfkpfy97ix9ahq0i1r8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring connection http-conduit http-types text time @@ -108529,14 +108584,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "graphql-utils" = callPackage + ({ mkDerivation, aeson, aeson-helper, base, graphql, text + , unordered-containers, vector + }: + mkDerivation { + pname = "graphql-utils"; + version = "0.1.0.0"; + sha256 = "1m0wan1isb1b574q933mm8xd7gnw2qrf2fd7z0sr7bnqlnl6nkjk"; + libraryHaskellDepends = [ + aeson aeson-helper base graphql text unordered-containers vector + ]; + description = "GraphQL Utils"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "graphql-w-persistent" = callPackage ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.9.0.0"; - sha256 = "1kwrpcrvf6j23lq40j6kyrp6wvya2rb4l6zgn47bwcignac1ag3g"; + version = "0.9.1.0"; + sha256 = "0sm0j1d2h6b2d3ksbbdyvzyvwl306mb64yikwkdwp2izfy387lwg"; libraryHaskellDepends = [ base containers json text ]; - description = "GraphQL interface middleware for (SQL) databases"; + description = "GraphQL interface middleware for SQL databases"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -111691,8 +111763,8 @@ self: { pname = "hackage-security"; version = "0.6.0.1"; sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli"; - revision = "3"; - editedCabalFile = "03cc99ynscxhmw1mxm2xn2ywvfnl1zfb3rdbbcc7fvm92nznzpyi"; + revision = "4"; + editedCabalFile = "06d4xqmpqarisxlm0sp87w2z9rl62p08z5ra5swkvfwn36i9zr15"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -115196,31 +115268,32 @@ self: { ({ mkDerivation, base, brick, containers, directory, filepath , megaparsec, microlens, microlens-platform, mwc-random , optparse-applicative, ordered-containers, process, random-fu - , strict, text, vector, vty, word-wrap + , split, strict, tasty, tasty-hunit, tasty-quickcheck, text, vector + , vty, word-wrap }: mkDerivation { pname = "hascard"; - version = "0.3.0.1"; - sha256 = "17f08qqwdzala1ldyarp841gpjl9iayi1440r77n8bkzcq3hpl54"; + version = "0.4.0.0"; + sha256 = "1rkcnpv22bfiyzmfdk82531yv6mh6g7imjch9qy8sxda2d73fdm7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers directory filepath megaparsec microlens microlens-platform mwc-random optparse-applicative - ordered-containers process random-fu strict text vector vty - word-wrap + ordered-containers process random-fu split strict tasty tasty-hunit + tasty-quickcheck text vector vty word-wrap ]; executableHaskellDepends = [ base brick containers directory filepath megaparsec microlens microlens-platform mwc-random optparse-applicative - ordered-containers process random-fu strict text vector vty - word-wrap + ordered-containers process random-fu split strict tasty tasty-hunit + tasty-quickcheck text vector vty word-wrap ]; testHaskellDepends = [ base brick containers directory filepath megaparsec microlens microlens-platform mwc-random optparse-applicative - ordered-containers process random-fu strict text vector vty - word-wrap + ordered-containers process random-fu split strict tasty tasty-hunit + tasty-quickcheck text vector vty word-wrap ]; description = "A TUI for reviewing notes using 'flashcards' written with markdown-like syntax"; license = stdenv.lib.licenses.bsd3; @@ -115654,19 +115727,6 @@ self: { }) {}; "hashtables" = callPackage - ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: - mkDerivation { - pname = "hashtables"; - version = "1.2.3.4"; - sha256 = "1rjmxnr30g4hygiywkpz5p9sanh0abs7ap4zc1kgd8zv04kycp0j"; - libraryHaskellDepends = [ - base ghc-prim hashable primitive vector - ]; - description = "Mutable hash tables in the ST monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hashtables_1_2_4_1" = callPackage ({ mkDerivation, base, ghc-prim, hashable, HUnit, mwc-random , primitive, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, vector @@ -115685,7 +115745,6 @@ self: { ]; description = "Mutable hash tables in the ST monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashtables-plus" = callPackage @@ -125296,8 +125355,8 @@ self: { pname = "hie-bios"; version = "0.7.1"; sha256 = "00gkr4dbbs70vnd6y90iirss88j8ax714l9jmwdfkmslwd4m2ml8"; - revision = "1"; - editedCabalFile = "1whhyczfr1d03gmsi7pw31321km53y0hjdhjyy2bxhk3z9ch6ji5"; + revision = "3"; + editedCabalFile = "104cp386qbk6k72s2ld1cl0fny3f53x98zy3w10mlhqyaipqrf17"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127467,8 +127526,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.1.6"; - sha256 = "1kbzj3qw3rr4yb2x50q79abckh6fvadbzqidbzkbydqqm0yhqhnx"; + version = "3.2"; + sha256 = "0g3ay30dwr2v22bybapryl0ykjyqs5ym1i1p7jfky7lp20ri9x1z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -127614,6 +127673,24 @@ self: { broken = true; }) {}; + "hls-plugin-api" = callPackage + ({ mkDerivation, aeson, base, containers, data-default, Diff, ghc + , ghc-boot-th, ghcide, haskell-lsp, hslogger, lens, process + , regex-tdfa, shake, text, unordered-containers + }: + mkDerivation { + pname = "hls-plugin-api"; + version = "0.4.0.0"; + sha256 = "1fr9j1nf0lkff3fb5vslfvkb42836ncfhhkswn8rq6mwlv0mv03k"; + libraryHaskellDepends = [ + aeson base containers data-default Diff ghc ghc-boot-th ghcide + haskell-lsp hslogger lens process regex-tdfa shake text + unordered-containers + ]; + description = "Haskell Language Server API for plugin communication"; + license = stdenv.lib.licenses.asl20; + }) {}; + "hlwm" = callPackage ({ mkDerivation, base, stm, transformers, unix, X11 }: mkDerivation { @@ -128350,28 +128427,27 @@ self: { ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, comonad, containers, criterion, data-fix, deepseq , deriving-compat, Diff, directory, exceptions, filepath, free - , Glob, hashable, hashing, hedgehog, hnix-store-core, http-client - , http-client-tls, http-types, lens-family, lens-family-core - , lens-family-th, logict, megaparsec, monad-control, monadlist, mtl - , neat-interpolation, optparse-applicative, parser-combinators - , pretty-show, prettyprinter, process, ref-tf, regex-tdfa - , scientific, semialign, semialign-indexed, serialise, some, split - , syb, tasty, tasty-hedgehog, tasty-hunit, tasty-th - , template-haskell, text, these, time, transformers - , transformers-base, unix, unordered-containers, vector, xml + , gitrev, Glob, hashable, hashing, hedgehog, hnix-store-core + , http-client, http-client-tls, http-types, lens-family + , lens-family-core, lens-family-th, logict, megaparsec + , monad-control, monadlist, mtl, neat-interpolation + , optparse-applicative, parser-combinators, pretty-show + , prettyprinter, process, ref-tf, regex-tdfa, scientific, semialign + , semialign-indexed, serialise, some, split, syb, tasty + , tasty-hedgehog, tasty-hunit, tasty-th, template-haskell, text + , these, time, transformers, transformers-base, unix + , unordered-containers, vector, xml }: mkDerivation { pname = "hnix"; - version = "0.9.1"; - sha256 = "1vxb55ih0gpaazb8kvms2sw21l78hb36cbz5217vg94i3yvk8zls"; - revision = "2"; - editedCabalFile = "17fxwg4bxnpwhwfwmh42xrwq6ajbk5b707zl8f01z0cyskzabzxy"; + version = "0.10.1"; + sha256 = "19a5pa1ji4hjr3vjvbkjmhnysnd8jcpkzlj9f2qw67h5iagysccy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring comonad containers data-fix deepseq deriving-compat directory exceptions - filepath free hashable hashing hnix-store-core http-client + filepath free gitrev hashable hashing hnix-store-core http-client http-client-tls http-types lens-family lens-family-core lens-family-th logict megaparsec monad-control monadlist mtl neat-interpolation optparse-applicative parser-combinators @@ -130906,8 +130982,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.9.0.1"; - sha256 = "1s5bd631nzc2kw22ngzf30pywgb7yc33m93dxcr2xa2wx0za3fv2"; + version = "1.9.1.0"; + sha256 = "13q20ak0zakwvlc05y187iq2vpvdjx9dlmvmgvv2gjd263sqcgm2"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ aeson async base bytestring containers exceptions lifted-base @@ -143202,8 +143278,8 @@ self: { }: mkDerivation { pname = "implicit-hie-cradle"; - version = "0.1.0.0"; - sha256 = "0yyzfpmv5x2ivzjsjwngklxv5nkad987ns8w3g7h92s5j1fb7x82"; + version = "0.2.0.0"; + sha256 = "1rzif3hzayqhm6spmynvw7ynkymsycaiycf6z9h18382vsd53qrk"; libraryHaskellDepends = [ base base16-bytestring bytestring containers directory extra filepath hie-bios hslogger implicit-hie process temporary text time @@ -143899,19 +143975,28 @@ self: { }) {}; "indigo" = callPackage - ({ mkDerivation, base, cleveland, constraints, containers, fmt - , hedgehog, hspec-expectations, HUnit, lorentz, morley - , morley-prelude, reflection, singletons, tasty, tasty-discover - , tasty-hedgehog, tasty-hunit-compat, vinyl, with-utf8 + ({ mkDerivation, base, cleveland, constraints, containers + , directory, fmt, hedgehog, hspec-expectations, HUnit, lorentz + , megaparsec, morley, morley-prelude, optparse-applicative, process + , reflection, shelly, singletons, string-interpolate, summoner + , tasty, tasty-discover, tasty-hedgehog, tasty-hunit-compat, text + , vinyl, with-utf8 }: mkDerivation { pname = "indigo"; - version = "0.2.1"; - sha256 = "07zgqg6d4ijfvdg0q9lgfi545c903lc6mbcc9mzyfl4b3gpxqfpj"; + version = "0.2.2"; + sha256 = "1ggq5ryq90vmxd4ar93nsfzmmq7b1h3i4piv39220kkpgzz2x291"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base constraints containers lorentz morley morley-prelude reflection singletons vinyl with-utf8 ]; + executableHaskellDepends = [ + base directory megaparsec morley morley-prelude + optparse-applicative process shelly string-interpolate summoner + text with-utf8 + ]; testHaskellDepends = [ base cleveland containers fmt hedgehog hspec-expectations HUnit lorentz morley morley-prelude singletons tasty tasty-hedgehog @@ -144061,25 +144146,6 @@ self: { }) {}; "inflections" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec - , hspec-megaparsec, megaparsec, QuickCheck, text - , unordered-containers - }: - mkDerivation { - pname = "inflections"; - version = "0.4.0.5"; - sha256 = "0fdq3iwa2vgb5k19ck6jxzh7f1xsf1kpwx4p3agpdpsrylrcanvb"; - libraryHaskellDepends = [ - base exceptions megaparsec text unordered-containers - ]; - testHaskellDepends = [ - base containers hspec hspec-megaparsec megaparsec QuickCheck text - ]; - description = "Inflections library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inflections_0_4_0_6" = callPackage ({ mkDerivation, base, containers, exceptions, hspec , hspec-megaparsec, megaparsec, QuickCheck, text , unordered-containers @@ -144096,7 +144162,6 @@ self: { ]; description = "Inflections library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inflist" = callPackage @@ -145896,20 +145961,6 @@ self: { }) {}; "io-manager" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "io-manager"; - version = "0.1.0.2"; - sha256 = "0f21h36z2ls0d6g31pcf4kcyfninaxws8w159zy33bwa19saf2mz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers ]; - executableHaskellDepends = [ base containers ]; - description = "Skeleton library around the IO monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "io-manager_0_1_0_3" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "io-manager"; @@ -145921,7 +145972,6 @@ self: { executableHaskellDepends = [ base containers ]; description = "Skeleton library around the IO monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "io-memoize" = callPackage @@ -145975,34 +146025,6 @@ self: { }) {}; "io-streams" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder - , deepseq, directory, filepath, HUnit, mtl, network, primitive - , process, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers, vector - , zlib, zlib-bindings - }: - mkDerivation { - pname = "io-streams"; - version = "1.5.1.0"; - sha256 = "1c7byr943x41nxpc3bnz152fvfbmakafq2958wyf9qiyp2pz18la"; - revision = "1"; - editedCabalFile = "0n0qs5lgryh3zxy73j3qbpnxand43yd2bj6pclvyii8apqqp901a"; - configureFlags = [ "-fnointeractivetests" ]; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-builder network primitive - process text time transformers vector zlib-bindings - ]; - testHaskellDepends = [ - attoparsec base bytestring bytestring-builder deepseq directory - filepath HUnit mtl network primitive process QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - time transformers vector zlib zlib-bindings - ]; - description = "Simple, composable, and easy-to-use stream I/O"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "io-streams_1_5_2_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , deepseq, directory, filepath, HUnit, mtl, network, primitive , process, QuickCheck, test-framework, test-framework-hunit @@ -146026,7 +146048,6 @@ self: { ]; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "io-streams-haproxy" = callPackage @@ -146318,22 +146339,24 @@ self: { "ipfs" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, directory-tree - , doctest, envy, flow, Glob, ip, lens, lens-aeson, monad-logger - , QuickCheck, regex-compat, rio, servant-client, servant-server - , swagger2, text, vector, yaml + , doctest, envy, flow, Glob, http-media, ip, lens, lens-aeson + , monad-logger, QuickCheck, regex-compat, rio, servant + , servant-client, servant-server, swagger2, text, vector, yaml }: mkDerivation { pname = "ipfs"; - version = "1.1.3"; - sha256 = "0ndd4015s5mp2cxwg85zly8xw0wfpx2da9jj6p0hh015whk8p2fm"; + version = "1.1.5.0"; + sha256 = "050zj21m4pg8jnpd594p2wc5m3nn4j6cmmv0069mi7kg473dqz2m"; libraryHaskellDepends = [ - aeson base bytestring envy flow Glob ip lens monad-logger - regex-compat rio servant-client servant-server swagger2 text vector + aeson base bytestring envy flow Glob http-media ip lens + monad-logger regex-compat rio servant servant-client servant-server + swagger2 text vector ]; testHaskellDepends = [ aeson base bytestring directory directory-tree doctest envy flow - Glob ip lens lens-aeson monad-logger QuickCheck regex-compat rio - servant-client servant-server swagger2 text vector yaml + Glob http-media ip lens lens-aeson monad-logger QuickCheck + regex-compat rio servant servant-client servant-server swagger2 + text vector yaml ]; description = "Access IPFS locally and remotely"; license = stdenv.lib.licenses.agpl3Plus; @@ -147891,8 +147914,8 @@ self: { }: mkDerivation { pname = "ixset-typed-conversions"; - version = "0.1.1.1"; - sha256 = "1fs0yys0hv9a2d8cxk94c89qp3843qqhjd47qvs50mxj1l22mc57"; + version = "0.1.2.0"; + sha256 = "15hxis8m60kfxi65k4sq2wica65whh8l1axw8jkx37yh1fys520x"; libraryHaskellDepends = [ base exceptions free hashable ixset-typed unordered-containers zipper-extra @@ -149485,15 +149508,13 @@ self: { "json-bytes-builder" = callPackage ({ mkDerivation, aeson, base, base-prelude, bytestring, criterion - , rebase, scientific, semigroups, text + , rebase, scientific, text }: mkDerivation { pname = "json-bytes-builder"; - version = "0.5.2"; - sha256 = "1a7bak30av58739wsxqv8p11nb3ljpj3xfd43yc563z5s3qnchqk"; - libraryHaskellDepends = [ - base base-prelude bytestring scientific semigroups text - ]; + version = "0.5.2.1"; + sha256 = "1h4wnjs1rjl1aq0ldsxmdcxvxgn2c3815640d5dn6ibf2fwlrd3f"; + libraryHaskellDepends = [ base bytestring scientific text ]; testHaskellDepends = [ base-prelude bytestring text ]; benchmarkHaskellDepends = [ aeson criterion rebase ]; description = "Direct-to-bytes JSON Builder"; @@ -152689,6 +152710,25 @@ self: { broken = true; }) {}; + "kmonad" = callPackage + ({ mkDerivation, base, cereal, lens, megaparsec, mtl + , optparse-applicative, resourcet, rio, time, unix, unliftio + }: + mkDerivation { + pname = "kmonad"; + version = "0.4.1"; + sha256 = "1l9980q74q98x9z8xj37bsnc6ywv362cap27n2nwjyc8wsihhc8c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cereal lens megaparsec mtl optparse-applicative resourcet rio + time unix unliftio + ]; + executableHaskellDepends = [ base ]; + description = "Advanced keyboard remapping utility"; + license = stdenv.lib.licenses.mit; + }) {}; + "kmp-dfa" = callPackage ({ mkDerivation, array, base, QuickCheck }: mkDerivation { @@ -153622,8 +153662,8 @@ self: { }: mkDerivation { pname = "lambda-options"; - version = "1.1.0.0"; - sha256 = "0ihbwml2l4jyd3h2kj5qz7fxzzkq47xk4fkybhp1rnfzxjlqfib3"; + version = "1.1.0.1"; + sha256 = "1lffzazcv3r14fsymkng6l10g65z1brsg8ghz4w4jplilp2i8ly2"; libraryHaskellDepends = [ base containers funspection mtl read-bounded ]; @@ -154724,8 +154764,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.3.0.2"; - sha256 = "1dldip54xd54kbfgc3kl79z86p6c4q37vx43r3qpymxpc85kid84"; + version = "1.3.0.3"; + sha256 = "1bgcczk8v3gfrh44hsqmw7an7998yvn0dgla3rc0kr0xs7zsgp62"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -158481,6 +158521,36 @@ self: { broken = true; }) {}; + "libjwt-typed" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, casing + , containers, criterion, data-default, deepseq, either, exceptions + , extra, hspec, hspec-core, jose, jwt, lens, monad-time, proxied + , QuickCheck, quickcheck-instances, text, time, transformers + , unordered-containers, utf8-string, uuid + }: + mkDerivation { + pname = "libjwt-typed"; + version = "0.1"; + sha256 = "0w0snz2gbdx6csp85bwwga57v1dpz53q2dkhkmmmzrl29jbix9h3"; + libraryHaskellDepends = [ + base bytestring case-insensitive casing data-default either + exceptions extra monad-time proxied text time transformers + unordered-containers utf8-string uuid + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default either exceptions + extra hspec hspec-core jwt monad-time QuickCheck + quickcheck-instances text time transformers uuid + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion data-default deepseq either + exceptions extra jose lens monad-time QuickCheck text time + transformers unordered-containers uuid + ]; + description = "A Haskell implementation of JSON Web Token (JWT)"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "liblastfm" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , cryptonite, hspec, hspec-expectations-lens, http-client @@ -160827,6 +160897,8 @@ self: { pname = "liquidhaskell"; version = "0.8.10.2"; sha256 = "0byh5lia3kb44sgmilya881dp9il3n5qvrn16brnkvl9xhr9rdyi"; + revision = "1"; + editedCabalFile = "13xzhr99z459h6kd7h9y3pyyjnvsxwapjiayjr3yq2nyqhpyjygw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -163916,6 +163988,24 @@ self: { broken = true; }) {}; + "lti13" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-client + , http-types, jose-jwt, oidc-client, safe-exceptions, text + }: + mkDerivation { + pname = "lti13"; + version = "0.1.2.1"; + sha256 = "0fs8hj07b9p8m4y8jzmh0ny5x8fnxx75yb8kyk8slc6fjg8ybzlm"; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-types jose-jwt + oidc-client safe-exceptions text + ]; + description = "Core functionality for LTI 1.3."; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ltiv1p1" = callPackage ({ mkDerivation, authenticate-oauth, base, blaze-builder , bytestring, containers, data-default, http-client, http-types @@ -164553,8 +164643,8 @@ self: { }: mkDerivation { pname = "lz4-frame-conduit"; - version = "0.1.0.0"; - sha256 = "0nvvf42m4vbadl869hgyqrzbzbxp9q7rlbrldi4y6zw48ig21r1d"; + version = "0.1.0.1"; + sha256 = "0n07cgdwq2miskgqj354hnjghmp555d7n8b39b00sjigdjzkbala"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173656,14 +173746,14 @@ self: { }) {}; "monad-supply" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "monad-supply"; - version = "0.7"; - sha256 = "1786rj4n0rrjpp07gn2y8vwpf6ijkjaim1q34rq7lvbjx1fhr2z5"; - libraryHaskellDepends = [ base mtl ]; + version = "0.9"; + sha256 = "1jknppcw8r0fpqnrgw1y8xjyx5xifzl1dkc0s2ffwkgij4x75saa"; + libraryHaskellDepends = [ base mtl transformers ]; description = "Stateful supply monad"; - license = stdenv.lib.licenses.mit; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -174907,7 +174997,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "morpheus-graphql_0_14_1" = callPackage + "morpheus-graphql_0_15_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, megaparsec , morpheus-graphql-core, mtl, scientific, tasty, tasty-hunit , template-haskell, text, transformers, unliftio-core @@ -174915,8 +175005,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.14.1"; - sha256 = "1vyb3jqnsmsjyl3zc0rh3c77ma3s5pgcqph4ijafhlm44fk6s82z"; + version = "0.15.1"; + sha256 = "1vk1rzrham61pnn5c77rvrn0zb02hc1birxdnyz80sjdap5fk8in"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers megaparsec morpheus-graphql-core @@ -174962,8 +175052,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.14.1"; - sha256 = "0q5cb5db1fdnp685jkmary43m6l4w8bhlqs5zh4h0q1lmkfz13n8"; + version = "0.15.1"; + sha256 = "1gmyil518qjn5l30kljrm52fznkib1d1qyxnjhyb535jc9f44zhz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-core mtl template-haskell @@ -175003,7 +175093,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "morpheus-graphql-core_0_14_1" = callPackage + "morpheus-graphql-core_0_15_1" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, hashable , megaparsec, mtl, scientific, tasty, tasty-hunit, template-haskell , text, th-lift-instances, transformers, unordered-containers @@ -175011,8 +175101,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.14.1"; - sha256 = "0xqam41z0i9f2bsa8z7gh3x2fhvy8qa02a1r4gix7dnymi69bbgj"; + version = "0.15.1"; + sha256 = "0nakm33ybrj8y3ci0a4697dvz8q38z17vr2mkcbm7h14h06kg8wr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring hashable megaparsec mtl scientific @@ -182609,8 +182699,8 @@ self: { }: mkDerivation { pname = "niv"; - version = "0.2.17"; - sha256 = "0qra7rrak3g2r8irbfib6j3jdcaw8d0j6y5k12clpcn8iv0d5bgf"; + version = "0.2.18"; + sha256 = "1jgljmj7msix2vn9nxip9q4754hx4739w4r7sa05l6q4ba5ilwqd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -185342,8 +185432,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ocap-io"; - version = "0.1.0.0"; - sha256 = "0cdxdi7rllkc4f0qi73xgz5jz2h936hnzashwz3hv82br8482lyv"; + version = "0.1.1.0"; + sha256 = "07s3nman83mv6g96naz0aax6pn6h6vrw3linv46895rvfz4vak8k"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Object capability based IO"; @@ -186316,6 +186406,8 @@ self: { pname = "opaleye"; version = "0.7.1.0"; sha256 = "0i4ndy9dd6jb4dzx8a5fv8jsmnmp7p1kx2qr012xj1qjq36sqpy6"; + revision = "1"; + editedCabalFile = "1kcgpigl645m1n7ikxx4lnnlqmwh06kndg6mbz69rn5ir7qimv51"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -187092,27 +187184,6 @@ self: { }) {}; "openssl-streams" = callPackage - ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams - , network, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "openssl-streams"; - version = "1.2.2.0"; - sha256 = "0rplym6ayydkpr7x9mw3l13p0vzzfzzxw244d7sd3jcvaxpv0rmr"; - revision = "1"; - editedCabalFile = "125bxb2axgpcq7rrpamfq0yz017i0ks9zsykh6hn0ifw3lxj1k29"; - libraryHaskellDepends = [ - base bytestring HsOpenSSL io-streams network - ]; - testHaskellDepends = [ - base bytestring HsOpenSSL HUnit io-streams network test-framework - test-framework-hunit - ]; - description = "OpenSSL network support for io-streams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "openssl-streams_1_2_3_0" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams , network, test-framework, test-framework-hunit }: @@ -187129,7 +187200,6 @@ self: { ]; description = "OpenSSL network support for io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentelemetry" = callPackage @@ -188777,6 +188847,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "orthotope" = callPackage + ({ mkDerivation, base, deepseq, dlist, HUnit, pretty, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector + }: + mkDerivation { + pname = "orthotope"; + version = "0.1.0.0"; + sha256 = "0nx97r1svhzayf0f4chj8mprqp524hliffnw5y612lwsx41c671k"; + libraryHaskellDepends = [ + base deepseq dlist pretty QuickCheck vector + ]; + testHaskellDepends = [ + base deepseq HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 vector + ]; + description = "Multidimensional arrays inspired by APL"; + license = stdenv.lib.licenses.asl20; + }) {}; + "os-release" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, hspec , hspec-megaparsec, megaparsec, pretty-simple, safe-exceptions @@ -192534,28 +192624,28 @@ self: { }) {}; "patat" = callPackage - ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, async, base , base64-bytestring, bytestring, colour, containers, directory , filepath, mtl, network, network-uri, optparse-applicative, pandoc - , process, QuickCheck, skylighting, tasty, tasty-hunit - , tasty-quickcheck, terminal-size, text, time, unordered-containers - , yaml + , pandoc-types, process, QuickCheck, skylighting, tasty + , tasty-hunit, tasty-quickcheck, terminal-size, text, time + , unordered-containers, yaml }: mkDerivation { pname = "patat"; - version = "0.8.5.0"; - sha256 = "1b4g5m32dv7905q51p4f23c9d4sfy5jvwbq7wgwsa2mwl8hf5cds"; + version = "0.8.6.1"; + sha256 = "1n9qw4wmh7aqmnkqdc6v12rs80vipnszr4744nlkasq6jlzijw0c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base64-bytestring + aeson ansi-terminal ansi-wl-pprint async base base64-bytestring bytestring colour containers directory filepath mtl network - network-uri optparse-applicative pandoc process skylighting - terminal-size text time unordered-containers yaml + network-uri optparse-applicative pandoc pandoc-types process + skylighting terminal-size text time unordered-containers yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base directory QuickCheck tasty tasty-hunit tasty-quickcheck + base directory QuickCheck tasty tasty-hunit tasty-quickcheck text ]; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; @@ -195052,6 +195142,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-qq_2_9_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, fast-logger + , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent + , persistent-sqlite, persistent-template, resourcet + , template-haskell, text, unliftio + }: + mkDerivation { + pname = "persistent-qq"; + version = "2.9.2"; + sha256 = "1nks3b420g447i3bvlpf3f41ry8jkfkl60m9yl48vyxgbpcjq523"; + libraryHaskellDepends = [ + base haskell-src-meta mtl persistent template-haskell text + ]; + testHaskellDepends = [ + aeson base bytestring fast-logger haskell-src-meta hspec HUnit + monad-logger mtl persistent persistent-sqlite persistent-template + resourcet template-haskell text unliftio + ]; + description = "Provides a quasi-quoter for raw SQL for persistent"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-ratelimit" = callPackage ({ mkDerivation, base, time, yesod }: mkDerivation { @@ -195692,8 +195805,8 @@ self: { ({ mkDerivation, base, containers, gu, pgf, pretty }: mkDerivation { pname = "pgf2"; - version = "1.2.0"; - sha256 = "1lw9wdsvlasd5x323dficcmzqf48yz49wd3v64gsyx60sw93vn0y"; + version = "1.2.1"; + sha256 = "10nbwhdirhlsh68f14z8y75wlbs9f9xcn8cbgkf47m74x71jqqb3"; libraryHaskellDepends = [ base containers pretty ]; librarySystemDepends = [ gu pgf ]; description = "Bindings to the C version of the PGF runtime"; @@ -198743,8 +198856,8 @@ self: { }: mkDerivation { pname = "plugins"; - version = "1.6.0"; - sha256 = "0wbmvcb2j4qi29yrmvjfhdf8251lam5yiqshk9gf6dlprz2kvww1"; + version = "1.6.1"; + sha256 = "004mfq0d10s26sgk12zrhgmxcfxnhvdyajr48scxf5rh1fv9440i"; libraryHaskellDepends = [ array base Cabal containers directory filepath ghc ghc-paths ghc-prim haskell-src process random split @@ -199584,7 +199697,7 @@ self: { }) {}; "polysemy-http" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring + ({ mkDerivation, aeson, ansi-terminal, base, bytestring , case-insensitive, co-log-core, co-log-polysemy, composition , containers, data-default, either, hedgehog, http-client , http-client-tls, http-conduit, http-types, lens, network @@ -199594,20 +199707,19 @@ self: { }: mkDerivation { pname = "polysemy-http"; - version = "0.2.0.2"; - sha256 = "0ahanslhdidday6ykfcw1yshjp5yjzx5wlwwdy3csr67mnxxs44y"; + version = "0.2.0.3"; + sha256 = "10a0sihivgxn7w1m9rj6dbs9wiw6gmcf7qg0s2bnd3d4ipxxy89q"; libraryHaskellDepends = [ - aeson ansi-terminal base-noprelude bytestring case-insensitive - co-log-core co-log-polysemy composition containers data-default - either http-client http-client-tls http-conduit http-types lens - polysemy polysemy-plugin relude string-interpolate template-haskell - text + aeson ansi-terminal base bytestring case-insensitive co-log-core + co-log-polysemy composition containers data-default either + http-client http-client-tls http-conduit http-types lens polysemy + polysemy-plugin relude string-interpolate template-haskell text ]; testHaskellDepends = [ - aeson ansi-terminal base-noprelude bytestring case-insensitive - co-log-core co-log-polysemy composition containers data-default - either hedgehog http-client http-client-tls http-conduit http-types - lens network polysemy polysemy-plugin relude servant servant-client + aeson ansi-terminal base bytestring case-insensitive co-log-core + co-log-polysemy composition containers data-default either hedgehog + http-client http-client-tls http-conduit http-types lens network + polysemy polysemy-plugin relude servant servant-client servant-server string-interpolate tasty tasty-hedgehog template-haskell text warp ]; @@ -199638,8 +199750,8 @@ self: { }: mkDerivation { pname = "polysemy-plugin"; - version = "0.2.5.0"; - sha256 = "1ymry3ppc5cl9agvkbxks155xnxr9cv39p77j05ychnhv9r4vjsh"; + version = "0.2.5.1"; + sha256 = "14iz5p5g57ki9lbjyy8i3lx7xk2qmrc8dqkd94jrbilsvn4m5gf3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra polysemy syb transformers @@ -200780,7 +200892,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "postgresql-binary_0_12_3" = callPackage + "postgresql-binary_0_12_3_1" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, bytestring-strict-builder, containers, conversion , conversion-bytestring, conversion-text, criterion, json-ast @@ -200791,8 +200903,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.12.3"; - sha256 = "0z31d7bw7m43195maqw5pba3l2l98nnkck0gzaghk05id0p7rlmd"; + version = "0.12.3.1"; + sha256 = "0frdyhzdrfnrqmf15all0g817p7i6asj46hzk87rw52qbfiyag2v"; libraryHaskellDepends = [ aeson base base-prelude binary-parser bytestring bytestring-strict-builder containers loch-th network-ip @@ -202965,20 +203077,21 @@ self: { maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; }) {}; - "pretty-simple_3_3_0_0" = callPackage - ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest - , containers, criterion, doctest, Glob, mtl, QuickCheck - , template-haskell, text, transformers + "pretty-simple_4_0_0_0" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, criterion + , doctest, Glob, mtl, prettyprinter, prettyprinter-ansi-terminal + , QuickCheck, template-haskell, text, transformers }: mkDerivation { pname = "pretty-simple"; - version = "3.3.0.0"; - sha256 = "0g83958npqscqqz2lh5m0m666qp8ldwps4l5gvfip4b1zgy3f5nh"; + version = "4.0.0.0"; + sha256 = "1srvx854ml2gffnkxr2fm12xk8syjsk078rfzrq0a3idwgv46myw"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - ansi-terminal base containers mtl text transformers + base containers mtl prettyprinter prettyprinter-ansi-terminal text + transformers ]; testHaskellDepends = [ base doctest Glob QuickCheck template-haskell @@ -204387,14 +204500,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "product-profunctors_0_11_0_0" = callPackage + "product-profunctors_0_11_0_1" = callPackage ({ mkDerivation, base, bifunctors, contravariant, criterion , deepseq, profunctors, tagged, template-haskell }: mkDerivation { pname = "product-profunctors"; - version = "0.11.0.0"; - sha256 = "1jx427xixykq9h353r7izd5nx1hpzc7g0hz4pcx6hnd0ql2d644a"; + version = "0.11.0.1"; + sha256 = "0lwwjnpxgkgk02179j8jj9c1zvaw4f406i9gm7ngqczl8y796q3l"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell ]; @@ -205141,8 +205254,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.11"; - sha256 = "0jda99g9a818w1yisms40rlzx81dyvv16w2ms8iazs5b9h4fwb3a"; + version = "5.12"; + sha256 = "0j2w2j6df965fhh828y6x55p70wi4r7plrlzzgzxxhq0lhjdjyr0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206106,8 +206219,8 @@ self: { }: mkDerivation { pname = "psql-utils"; - version = "0.2.0.0"; - sha256 = "0y195pymiy31d8pyq71hjrh58s3hfzaa58l7qskbf3biyy159sxz"; + version = "0.2.0.1"; + sha256 = "0vqi45v5ghv36gqmqc0ddhm4rwc0zg9qckl0bf7klwiiczs52smq"; libraryHaskellDepends = [ aeson base hashable postgresql-simple resource-pool time ]; @@ -207117,15 +207230,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_2_0_0_0" = callPackage + "pusher-http-haskell_2_0_0_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-client-tls , http-types, memory, QuickCheck, text, time, unordered-containers }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.0.0.0"; - sha256 = "0q13lq2bjhw2mwsla1m6h1l6bhrwsy6iin7cprqh9bjjaqmq4dxi"; + version = "2.0.0.1"; + sha256 = "05f4p4rnx2gy1f17d83sfpnxrfniq710pyai97gwi4ks3f4avk5a"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -208385,22 +208498,6 @@ self: { }) {}; "quickcheck-classes-base" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, containers - , contravariant, fail, QuickCheck, semigroups, tagged, transformers - }: - mkDerivation { - pname = "quickcheck-classes-base"; - version = "0.6.0.0"; - sha256 = "193jbr3fy2451gx0hzw82xrzxp6mxz5ics6yaybbz1a3dhlz53yx"; - libraryHaskellDepends = [ - base base-orphans bifunctors containers contravariant fail - QuickCheck semigroups tagged transformers - ]; - description = "QuickCheck common typeclasses from `base`"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-classes-base_0_6_1_0" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, containers , contravariant, fail, QuickCheck, tagged, transformers }: @@ -208414,7 +208511,6 @@ self: { ]; description = "QuickCheck common typeclasses from `base`"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-combinators" = callPackage @@ -211902,8 +211998,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "read-bounded"; - version = "0.1.1.2"; - sha256 = "1h525al4aavplyimhxsvk96cajl8m7rnlqq3wxh9gqlc1sy4ywcg"; + version = "0.1.1.3"; + sha256 = "0b2syhxan3fpf9h1zq3izpb8bgsl4qrk975afy3r2ji6dhjq81cl"; libraryHaskellDepends = [ base ]; description = "Class for reading bounded values"; license = stdenv.lib.licenses.bsd3; @@ -212317,7 +212413,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rebase_1_7_1_1" = callPackage + "rebase_1_7_3" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, contravariant-extras, deepseq, dlist, either , hashable, mtl, profunctors, scientific, selective, semigroupoids @@ -212326,8 +212422,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.7.1.1"; - sha256 = "1hyh4b5dqp3lkfyafv6zm41vw9mnpvw6gb9ypwh6lwx64yipzmlx"; + version = "1.7.3"; + sha256 = "0w5ywvwq4m2jw5rrlvxwnczwnxx5gkzdlbji85n0crcsqkhkmn1i"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant contravariant-extras deepseq dlist either hashable mtl profunctors @@ -216553,12 +216649,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rerebase_1_7_1_1" = callPackage + "rerebase_1_7_3" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.7.1.1"; - sha256 = "0jvvyqridkbcgyfisvc5c3116d2asph3vim72mvgwbd1ijs101y7"; + version = "1.7.3"; + sha256 = "0ynvpawhjwbw3231nlwpk5x5wwbzpx1iw66vs97wpk5b8p1bhrld"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; @@ -218284,8 +218380,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.18.0"; - sha256 = "11f1cxa9c90d7hgqn9bl08l499n2dzdj31f9pw9acb1nrlx5hik8"; + version = "0.1.19.0"; + sha256 = "04kvpirwz86pj7izaa0la601xyqnqzsspg43z10vxnc1whjp5rsm"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens microlens-mtl mtl primitive process text time @@ -218760,6 +218856,27 @@ self: { broken = true; }) {}; + "roboservant" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hedgehog, mtl + , servant, servant-client, servant-flatten, servant-server + , string-conversions + }: + mkDerivation { + pname = "roboservant"; + version = "0.1.0.2"; + sha256 = "1dbzwczmjms6phzf3r6igy1q33gkwsdirdabd2rr0i2qp0lynshv"; + libraryHaskellDepends = [ + base bytestring containers hedgehog mtl servant servant-client + servant-flatten servant-server string-conversions + ]; + testHaskellDepends = [ + aeson base bytestring containers hedgehog mtl servant + servant-client servant-flatten servant-server string-conversions + ]; + description = "Automatic session-aware servant testing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "robot" = callPackage ({ mkDerivation, base, containers, exceptions, transformers, xhb }: mkDerivation { @@ -219698,19 +219815,19 @@ self: { }) {}; "row-types" = callPackage - ({ mkDerivation, base, constraints, criterion, deepseq - , generic-lens, hashable, profunctors, text, unordered-containers + ({ mkDerivation, base, constraints, deepseq, gauge, generic-lens + , hashable, profunctors, text, unordered-containers }: mkDerivation { pname = "row-types"; - version = "0.4.0.0"; - sha256 = "146wcmy65wls6s8z333z9xqdb0m89dwjbfd9vshldkd1g9kgbck7"; + version = "1.0.0.0"; + sha256 = "03qavr0d3ivap1n9nq7ks7yiappmzvirczi796y1krm0kgi25djy"; libraryHaskellDepends = [ base constraints deepseq generic-lens hashable profunctors text unordered-containers ]; testHaskellDepends = [ base generic-lens ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; + benchmarkHaskellDepends = [ base deepseq gauge ]; description = "Open Records and Variants"; license = stdenv.lib.licenses.mit; }) {}; @@ -219844,15 +219961,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rpmbuild-order_0_4_2_1" = callPackage + "rpmbuild-order_0_4_3" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, extra, fgl, filepath, hspec, optparse-applicative , process, simple-cmd, simple-cmd-args, unix }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.2.1"; - sha256 = "148wxcglf4jiz5s2ybw9ija33vzp0cg619dxncsmjsn9lz4c8gcf"; + version = "0.4.3"; + sha256 = "19aszn4fcsxbzciswrb80qvm6r3x28kyl7g5m3c1569f0ib3rbg6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220940,15 +221057,15 @@ self: { }) {}; "safe-tensor" = callPackage - ({ mkDerivation, base, constraints, containers, hmatrix, mtl - , singletons + ({ mkDerivation, base, constraints, containers, deepseq, hmatrix + , mtl, singletons }: mkDerivation { pname = "safe-tensor"; - version = "0.2.0.0"; - sha256 = "04fafmypwcw88qqb9v9lalfyyqna68b3brx2rmry7i4898gwasp8"; + version = "0.2.1.0"; + sha256 = "00s8p7bp72wjpz4mbxn79xg6cllyl2c6fn952w2nykyrapzpxhxm"; libraryHaskellDepends = [ - base constraints containers hmatrix mtl singletons + base constraints containers deepseq hmatrix mtl singletons ]; description = "Dependently typed tensor algebra"; license = stdenv.lib.licenses.mit; @@ -228487,7 +228604,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "serverless-haskell_0_12_1" = callPackage + "serverless-haskell_0_12_2" = callPackage ({ mkDerivation, aeson, aeson-casing, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-client, http-types, iproute, lens @@ -228496,8 +228613,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.12.1"; - sha256 = "0a9df4mxl73wbyf9mvbrczmcn0vvf8yn3p4wb9ggf29x4ls22zg8"; + version = "0.12.2"; + sha256 = "0x61rqv7w0qjnjpkd1hsy1ixdnxv5abicfdglsr62nazhchnh717"; libraryHaskellDepends = [ aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-client http-types iproute lens @@ -233322,14 +233439,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_10" = callPackage + "skylighting_0_10_0_2" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , directory, filepath, pretty-show, skylighting-core, text }: mkDerivation { pname = "skylighting"; - version = "0.10"; - sha256 = "1gi6pfi5rcmql0gdcjyb114phkc0xnkrhk6y2h6yvx4jflzpw4lj"; + version = "0.10.0.2"; + sha256 = "0m2z4hmv2m6h6kmvn8n3fskwyhq6pj28bjfvs61qg9pnga3xbf26"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -233377,7 +233494,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "skylighting-core_0_10" = callPackage + "skylighting-core_0_10_0_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -233387,8 +233504,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.10"; - sha256 = "1b2ldgdgq0a1wg7nlfpzm1rag8hbmm7gnirrm78cd72kycrmly60"; + version = "0.10.0.2"; + sha256 = "07gdvmz8lvqkzzgnxakx015g2ijmqd2jmni1phz6x79xf9q7s5vw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234066,18 +234183,19 @@ self: { "smallcheck-series" = callPackage ({ mkDerivation, base, bytestring, containers, doctest, Glob - , logict, smallcheck, text, transformers + , logict, smallcheck, tasty, tasty-hunit, tasty-smallcheck, text + , transformers }: mkDerivation { pname = "smallcheck-series"; - version = "0.6.1"; - sha256 = "07kjbci4wxi6g9m0k0fqpxm8p2kxspyrcmg175vb3bp008vqb931"; - revision = "2"; - editedCabalFile = "1944nax2aq32cd8i335nc511zis3lcwkclkh5caigsfs34kwwglg"; + version = "0.7.0.0"; + sha256 = "11pb4k0y8fqfkq5ajspn5nnliskvk8qp02dzpcjrzqk27da2iwb6"; libraryHaskellDepends = [ base bytestring containers logict smallcheck text transformers ]; - testHaskellDepends = [ base doctest Glob ]; + testHaskellDepends = [ + base doctest Glob smallcheck tasty tasty-hunit tasty-smallcheck + ]; description = "Extra SmallCheck series and utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -234290,8 +234408,8 @@ self: { ({ mkDerivation, base, lens, smash }: mkDerivation { pname = "smash-lens"; - version = "0.1.0.0"; - sha256 = "05f2swr4qv3x12fwpyxa0ph90awgf484gn9y8rlxlvql0h213rnm"; + version = "0.1.0.1"; + sha256 = "1j7v3713aahp3vh7dswrkdfrnksi1zlw9iv9zanhb714s6anyq66"; libraryHaskellDepends = [ base lens smash ]; testHaskellDepends = [ base ]; description = "Optics for the `smash` library"; @@ -234314,12 +234432,10 @@ self: { ({ mkDerivation, base, optics-core, smash }: mkDerivation { pname = "smash-optics"; - version = "0.1.0.0"; - sha256 = "0h8khdm2lgklmf73bshfrjqfmkmhrbr6cq2r11vsm0lqfkzlyndh"; - revision = "1"; - editedCabalFile = "1kzkznb0167krv5pcia2vsj0gy9zgykjhqg5d3pfnwz3152197ql"; + version = "0.1.0.1"; + sha256 = "1jf60vx8hlmyjgap91fvwn0p0hnazpcimshhkz5lsys0ynd4pcwh"; libraryHaskellDepends = [ base optics-core smash ]; - description = "Optics for the `smash` library"; + description = "Optics for the `smash` library using `optics-core`"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -237922,8 +238038,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "spherical"; - version = "0.1.2.2"; - sha256 = "014fmxgzymyfa82qabc90avjyv4yp7c0s88kkmp02pvpkmjd6p24"; + version = "0.1.3.0"; + sha256 = "1h014k4yi0aachbbni011a1jkzi31lrxhpi8h5q5f2vkgb18k1g4"; libraryHaskellDepends = [ base composition-prelude ]; description = "Geometry on a sphere"; license = stdenv.lib.licenses.bsd3; @@ -238183,8 +238299,8 @@ self: { ({ mkDerivation, base, containers, ghc, hlint, stm }: mkDerivation { pname = "splint"; - version = "1.0.1.1"; - sha256 = "14rwj7dbzg01lv4abwrgxjianwnshnycsmxcckw1hhqc8wx9jdac"; + version = "1.0.1.2"; + sha256 = "0b7czphkra6q6a5xm30pjh5b4cdvz87fzb2pv17dpxai0mb3c0r6"; libraryHaskellDepends = [ base containers ghc hlint stm ]; description = "HLint as a GHC source plugin"; license = stdenv.lib.licenses.isc; @@ -242115,15 +242231,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_59_0" = callPackage + "stratosphere_0_59_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.59.0"; - sha256 = "0k9xynh0qbnbif78air5dn6ndk3bydnbkcx0ny0hbcx1p2x3fifn"; + version = "0.59.1"; + sha256 = "1gcvz8gpyj495jr5qa2jx2yay7ip3hs1dd4bqckmam8llyz2gvxv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242991,8 +243107,8 @@ self: { }: mkDerivation { pname = "streamly-lmdb"; - version = "0.0.1.1"; - sha256 = "080w7c9dgw4dixnxhvpjnii53c5sk00h18vwps973q51qhl9qa18"; + version = "0.1.0"; + sha256 = "0yccaszb6fbasmlwq3iqci7gin8kf7hgmlcjfsq0pdqw32lnmcbn"; libraryHaskellDepends = [ async base bytestring streamly ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ @@ -245172,16 +245288,18 @@ self: { "supernova" = callPackage ({ mkDerivation, aeson, async, base, bifunctor, binary, bytestring - , crc32c, exceptions, lens-family-core, logging, managed, network - , proto-lens, proto-lens-runtime, streamly, text, unliftio + , crc32c, exceptions, lens-family-core, lens-family-th, logging + , managed, mtl, network, proto-lens, proto-lens-runtime, streamly + , text }: mkDerivation { pname = "supernova"; - version = "0.0.2"; - sha256 = "0nqylb2qqqyxqw2f9smdl3hiv4kbi8hphxndp4v1yx3hq3zhdbjj"; + version = "0.0.3"; + sha256 = "1k04k71x42h56n6qzdcviya9alwxgch846l1xcl17zc34rs4p79v"; libraryHaskellDepends = [ - base bifunctor binary bytestring crc32c exceptions lens-family-core - logging managed network proto-lens proto-lens-runtime text unliftio + async base bifunctor binary bytestring crc32c exceptions + lens-family-core lens-family-th logging managed mtl network + proto-lens proto-lens-runtime text ]; testHaskellDepends = [ aeson async base bytestring streamly text ]; description = "Apache Pulsar client for Haskell"; @@ -245866,8 +245984,8 @@ self: { }: mkDerivation { pname = "swiss-ephemeris"; - version = "1.0.0.0"; - sha256 = "0sv53h1wy0yf32hkwywigl3hpjaabslk0v6m2y2b1lc1hxnavxnv"; + version = "1.2.0.0"; + sha256 = "1inzvwm7z562q07r5h8prxpn4g1ywza88a7rv95yx8634fcy1bsl"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -248690,8 +248808,8 @@ self: { }: mkDerivation { pname = "taskell"; - version = "1.10.0"; - sha256 = "14syiis60fds1r295d6nlvw0mn1d1d6ly0j69r9srbcbrbb2j7yw"; + version = "1.10.1"; + sha256 = "1s05jwsfzjvgfcyd4n4ykzxld11mkf5gnyd9crl5ry5pg77iqw72"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263611,8 +263729,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "uniqueness-periods-vector-common"; - version = "0.2.0.0"; - sha256 = "1qnnydvfl1ylgd2j54jyq820404pq1477qqda70bbr6y5ax2as62"; + version = "0.3.0.0"; + sha256 = "1dw1j10ambqcjr42jb5p9kwdzpz943dw6pgiivxs41iq2w6nibp6"; libraryHaskellDepends = [ base vector ]; description = "Generalization of the dobutokO-poetry-general package functionality"; license = stdenv.lib.licenses.mit; @@ -263622,33 +263740,45 @@ self: { ({ mkDerivation, base, mmsyn6ukr, phonetic-languages-ukrainian , print-info, uniqueness-periods-vector , uniqueness-periods-vector-common + , uniqueness-periods-vector-filters , uniqueness-periods-vector-general , uniqueness-periods-vector-properties, vector }: mkDerivation { pname = "uniqueness-periods-vector-examples"; - version = "0.1.0.0"; - sha256 = "151gmyq6hx61hgq5inf939dbhlc8wb2y5bw43xx11rmv77ajkf14"; + version = "0.4.0.0"; + sha256 = "11f7kgsrz0d7hna02qpf519775w4kli7zxg8yp0d0zzi1yp1cgrq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mmsyn6ukr phonetic-languages-ukrainian print-info uniqueness-periods-vector uniqueness-periods-vector-common - uniqueness-periods-vector-general + uniqueness-periods-vector-filters uniqueness-periods-vector-general uniqueness-periods-vector-properties vector ]; description = "Examples of usage for the uniqueness-periods-vector series of packages"; license = stdenv.lib.licenses.mit; }) {}; + "uniqueness-periods-vector-filters" = callPackage + ({ mkDerivation, base, mmsyn2, vector }: + mkDerivation { + pname = "uniqueness-periods-vector-filters"; + version = "0.1.1.0"; + sha256 = "1slwc94m62qp28g3bqbaa4x0zp0zz7x74kv41mcalzd79nlxf7cv"; + libraryHaskellDepends = [ base mmsyn2 vector ]; + description = "A library allows to change the structure of the 'RealFrac' function output"; + license = stdenv.lib.licenses.mit; + }) {}; + "uniqueness-periods-vector-general" = callPackage ({ mkDerivation, base, print-info, uniqueness-periods-vector-common , vector }: mkDerivation { pname = "uniqueness-periods-vector-general"; - version = "0.2.3.0"; - sha256 = "0nw03a751cyr9mw9qz0vdc284bwvw52ybw87wj3cm1l7if54qjwk"; + version = "0.4.2.0"; + sha256 = "1ixw5lf2p4wnjsm9989nvsp01aznirb2awhasvlbp0bhgqaj0zmq"; libraryHaskellDepends = [ base print-info uniqueness-periods-vector-common vector ]; @@ -264817,8 +264947,8 @@ self: { }: mkDerivation { pname = "up"; - version = "1.0.0.5"; - sha256 = "1b41pqj2v6j0vgj7j18wlparbbkvf92xcfr59lvgf9k8xvarl43k"; + version = "2.0.0.0"; + sha256 = "1m07w91dq5db5kjv5w4m5hvh6a19rv4m9vz3pq80zng2c1w4qyb8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -266008,15 +266138,16 @@ self: { }) {}; "uuagc" = callPackage - ({ mkDerivation, array, base, containers, directory, filepath - , ghc-prim, haskell-src-exts, mtl, uuagc-cabal, uulib + ({ mkDerivation, array, base, Cabal, containers, directory + , filepath, ghc-prim, haskell-src-exts, mtl, uuagc-cabal, uulib }: mkDerivation { pname = "uuagc"; - version = "0.9.52.2"; - sha256 = "1wqva95nmz9yx9b60jjwkpb73pq9m4g9l4iq739xnj6llwckpb8y"; + version = "0.9.53"; + sha256 = "0cij4kf8f2151xz2q935bn9bhrqig9alc008vds7cw6pkb32ngz6"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ array base containers directory filepath ghc-prim haskell-src-exts mtl uuagc-cabal uulib @@ -266058,8 +266189,8 @@ self: { }: mkDerivation { pname = "uuagc-cabal"; - version = "1.1.0.0"; - sha256 = "0bdvrxdbs9672gfmf3r2j2nasc7map2jr191crf1d0jhmg6dmlzj"; + version = "1.2.0.0"; + sha256 = "1hb567h06zdhrrysb99d0c63ih5p1ii2jl0ng2l304w71m35pk2z"; libraryHaskellDepends = [ base Cabal containers directory filepath mtl process uulib ]; @@ -266073,8 +266204,8 @@ self: { ({ mkDerivation, base, diagrams-lib, SVGFonts }: mkDerivation { pname = "uuagc-diagrams"; - version = "0.1.1.0"; - sha256 = "16sf4kbjgxsi3amdpr3nqg15f2gmjvf3w2wh6pn72zhjqsbnfnmz"; + version = "0.1.2.0"; + sha256 = "0x4dhbzl5xvs3mrg7256hg673nbr4k6kjszyavjs61klcq58asm7"; libraryHaskellDepends = [ base diagrams-lib SVGFonts ]; description = "Utility for drawing attribute grammar pictures with the diagrams package"; license = stdenv.lib.licenses.bsd3; @@ -269647,7 +269778,7 @@ self: { "wai-extra" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, case-insensitive, containers, cookie + , bytestring, call-stack, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec , http-types, http2, HUnit, iproute, network, old-locale, resourcet , streaming-commons, text, time, transformers, unix, unix-compat @@ -269655,12 +269786,12 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.29.2"; - sha256 = "00r65l7xmvhc1jx5fq134q1sysx7ja5dzyhv5x55gmnxmqr0p107"; + version = "3.0.31"; + sha256 = "1kyid5h7pssgqigmggvx6jh9ip848dkyaslnxi58hhddx0m50vs3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring + aeson ansi-terminal base base64-bytestring bytestring call-stack case-insensitive containers cookie data-default-class deepseq directory fast-logger http-types http2 iproute network old-locale resourcet streaming-commons text time transformers unix unix-compat @@ -279687,6 +279818,30 @@ self: { broken = true; }) {}; + "yesod-auth-lti13" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, containers, cryptonite, http-client, http-conduit + , jose-jwt, load-env, lti13, microlens, oidc-client, random + , safe-exceptions, text, time, warp, yesod, yesod-auth, yesod-core + }: + mkDerivation { + pname = "yesod-auth-lti13"; + version = "0.1.2.1"; + sha256 = "0p4z1vsbf55jc5ljwsdgbvji61554q3ngfn74klr2ddp87dn0fzr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring containers + cryptonite http-client http-conduit jose-jwt load-env lti13 + microlens oidc-client random safe-exceptions text time warp yesod + yesod-auth yesod-core + ]; + description = "A yesod-auth plugin for LTI 1.3"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "yesod-auth-nopassword" = callPackage ({ mkDerivation, base, blaze-markup, http-types, pwstore-fast, text , uuid, yesod-auth, yesod-core, yesod-form @@ -280971,22 +281126,6 @@ self: { }) {}; "yesod-recaptcha2" = callPackage - ({ mkDerivation, aeson, base, classy-prelude, http-conduit - , yesod-auth, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-recaptcha2"; - version = "1.0.0"; - sha256 = "1hg5g90ld4jc1ggi6rg0si35rr8r8dq79a221zjzs37hsla2cr7i"; - libraryHaskellDepends = [ - aeson base classy-prelude http-conduit yesod-auth yesod-core - yesod-form - ]; - description = "yesod recaptcha2"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-recaptcha2_1_0_1" = callPackage ({ mkDerivation, aeson, base, classy-prelude, http-conduit , yesod-core, yesod-form }: @@ -280999,7 +281138,6 @@ self: { ]; description = "yesod recaptcha2"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-routes" = callPackage @@ -283278,6 +283416,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zip_1_6_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, conduit-zstd, containers, digest + , directory, dlist, exceptions, filepath, hspec, monad-control, mtl + , QuickCheck, resourcet, temporary, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "zip"; + version = "1.6.0"; + sha256 = "1k00g2952yf3iyq1p6pjn307zsxsc9j3iq6lih3rr8vysiijivcx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra conduit-zstd containers digest directory dlist + exceptions filepath monad-control mtl resourcet text time + transformers transformers-base + ]; + executableHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring conduit containers directory dlist exceptions + filepath hspec QuickCheck temporary text time transformers + ]; + description = "Operations on zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, pretty, process From f40afea4178949c171d37f9114b552185fca7010 Mon Sep 17 00:00:00 2001 From: Kai Harries Date: Mon, 14 Sep 2020 06:43:11 +0200 Subject: [PATCH 297/463] haskellPackages.sbv: fix tests By patching paths of the external provers and excluding not available provers from the test. ZHF: #97479 --- .../haskell-modules/configuration-nix.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index cff7cc2cd80..a1938de0ab3 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -571,9 +571,20 @@ self: super: builtins.intersectAttrs super { })); # Expects z3 to be on path so we replace it with a hard + # + # The tests expect additional solvers on the path, replace the + # available ones also with hard coded paths, and remove the missing + # ones from the test. sbv = overrideCabal super.sbv (drv: { postPatch = '' - sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs''; + sed -i -e 's|"abc"|"${pkgs.abc-verifier}/bin/abc"|' Data/SBV/Provers/ABC.hs + sed -i -e 's|"boolector"|"${pkgs.boolector}/bin/boolector"|' Data/SBV/Provers/Boolector.hs + sed -i -e 's|"cvc4"|"${pkgs.cvc4}/bin/cvc4"|' Data/SBV/Provers/CVC4.hs + sed -i -e 's|"yices-smt2"|"${pkgs.yices}/bin/yices-smt2"|' Data/SBV/Provers/Yices.hs + sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs + + sed -i -e 's|\[abc, boolector, cvc4, mathSAT, yices, z3, dReal\]|[abc, boolector, cvc4, yices, z3]|' SBVTestSuite/SBVConnectionTest.hs + ''; }); # The test-suite requires a running PostgreSQL server. From 59617bc142f959d5e0e5f37efdbb9e53085932ea Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 18 Sep 2020 11:38:43 +0200 Subject: [PATCH 298/463] haskellPackages.ghcide: Fix build --- pkgs/development/haskell-modules/configuration-common.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 18ec7ea3021..bf7b5b9ffa5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1209,14 +1209,9 @@ self: super: { # this will probably need to get updated with every ghcide update, # we need an override because ghcide is tracking haskell-lsp closely. - ghcide = dontCheck (appendPatch (super.ghcide.override { + ghcide = dontCheck (super.ghcide.overrideScope (self: super: { hie-bios = dontCheck super.hie-bios_0_7_1; lsp-test = dontCheck self.lsp-test_0_11_0_5; - }) (pkgs.fetchpatch { - # This patch loosens the hie-bios upper bound. - # It is already merged into upstream and won‘t be needed for ghcide 0.4.0 - url = "https://github.com/haskell/ghcide/commit/3e1b3620948870a4da8808ca0c0897fbd3ecad16.patch"; - sha256 = "1jwn7jgi740x6wwv1k0mz9d4z0b9p3mzs54pdg4nfq0h2v7zxchz"; })); # hasn‘t bumped upper bounds From ae73fa0d56d5c78cabdfa146d5f6f301a6c127a1 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 18 Sep 2020 11:40:57 +0200 Subject: [PATCH 299/463] haskellPackages.ghc.withPackages: Remove obsolete ghcide wrapper --- .../haskell-modules/with-packages-wrapper.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index dc105c845d7..32fa46fd04a 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -105,18 +105,6 @@ symlinkJoin { --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" fi - # ghcide 0.2.0 does package discovery without calling our ghc wrapper. - # 2020-08-16 We can most likely remove this workaround as soon as we build ghcide with a newer hie-bios (currently we use 0.5.1 from stack) - for prg in ghcide; do - if [[ -x "$out/bin/$prg" ]]; then - wrapProgram $out/bin/$prg \ - --set "NIX_${ghcCommandCaps}" "$out/bin/${ghcCommand}" \ - --set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \ - --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \ - --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" - fi - done - '' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) '' # Work around a linker limit in macOS Sierra (see generic-builder.nix): local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; From 2bf095d0269b9e88aac7b18793337cfe6074d413 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 18 Sep 2020 17:38:25 +0200 Subject: [PATCH 300/463] haskellPackages.hnix: Fix build --- .../haskell-modules/configuration-common.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bf7b5b9ffa5..4c11c5cda87 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -208,11 +208,11 @@ self: super: { # Generating the completions should be activated again, once we default to # ghc 8.10. hnix = dontCheck (super.hnix.override { - # The neat-interpolation package from stack is to old for hnix. - # https://github.com/haskell-nix/hnix/issues/676 - # Once neat-interpolation >= 0.4 is in our stack release, - # (which should happen soon), we can remove this override - neat-interpolation = self.neat-interpolation_0_5_1_2; + # 2020-09-18: Those packages are all needed by hnix at versions newer than on stackage + neat-interpolation = self.neat-interpolation_0_5_1_2; # at least 0.5.1 + data-fix = self.data-fix_0_3_0; # at least 0.3 + prettyprinter = self.prettyprinter_1_7_0; # at least 1.7 + }); # Fails for non-obvious reasons while attempting to use doctest. From d0541e2ecaa7ba1cd4ffa9c10a47b4515c267b31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Sep 2020 20:31:29 +0200 Subject: [PATCH 301/463] haskell-pandoc-plot: mark broken because of failing test suite Reported upstream at https://github.com/LaurentRDC/pandoc-plot/issues/13. --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4c11c5cda87..8d9feffc5ed 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1461,7 +1461,6 @@ self: super: { jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; pandoc = doDistribute self.pandoc_2_10_1; pandoc-citeproc = doDistribute self.pandoc-citeproc_0_17_0_2; - pandoc-plot = doDistribute self.pandoc-plot_0_9_2_0; pandoc-types = doDistribute self.pandoc-types_1_21; rfc5051 = doDistribute self.rfc5051_0_2; From 7567bd6d89653e9cf275a803d9de4dbe059121a1 Mon Sep 17 00:00:00 2001 From: William Kral Date: Fri, 18 Sep 2020 12:53:24 -0700 Subject: [PATCH 302/463] python3Packages.irc: fix build --- pkgs/development/python-modules/irc/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 9bd2b4ab288..bc87015f104 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools_scm, jaraco_collections, importlib-metadata +, setuptools_scm, jaraco_collections, importlib-metadata, toml }: buildPythonPackage rec { @@ -16,6 +16,8 @@ buildPythonPackage rec { doCheck = false; + pythonImportsCheck = [ "irc" ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six @@ -26,6 +28,7 @@ buildPythonPackage rec { pytz jaraco_itertools jaraco_collections + toml ]; meta = with lib; { From a9162ffdaa77d7fbc0c72f822449f63fae9454ec Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Sep 2020 11:24:21 -0700 Subject: [PATCH 303/463] python3Packages.runway-python: add missing deps --- .../python-modules/runway-python/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 23455ae8940..9c7f89585d8 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -5,6 +5,7 @@ , flask-compress , flask-cors , flask-sockets +, imageio , numpy , scipy , pillow @@ -25,7 +26,22 @@ buildPythonPackage rec { sha256 = "695d78f8edeb6a7ca98d8351adb36948d56cceeffe8a84896c9fbfd349fc4cb8"; }; - propagatedBuildInputs = [ flask flask-compress flask-cors flask-sockets numpy scipy pillow gevent wget six colorcet unidecode urllib3 ]; + propagatedBuildInputs = [ + colorcet + flask + flask-compress + flask-cors + flask-sockets + gevent + imageio + numpy + pillow + scipy + six + unidecode + urllib3 + wget + ]; # tests are not packaged in the released tarball doCheck = false; From 2a35f664394b379e0c0785cc769ff6ccc791be39 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Sep 2020 11:38:59 -0700 Subject: [PATCH 304/463] python3Packages.lightparam: fix source and deps --- .../python-modules/lightparam/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/lightparam/default.nix b/pkgs/development/python-modules/lightparam/default.nix index b3ddb7655c0..0c3eb5292a8 100644 --- a/pkgs/development/python-modules/lightparam/default.nix +++ b/pkgs/development/python-modules/lightparam/default.nix @@ -1,24 +1,31 @@ -{ lib, pkgs, buildPythonPackage, fetchPypi, isPy3k +{ lib, pkgs, buildPythonPackage, fetchFromGitHub, isPy3k +, ipython +, ipywidgets , numpy +, pyqt5 }: buildPythonPackage rec { pname = "lightparam"; version = "0.4.6"; disabled = !isPy3k; - format = "wheel"; - src = fetchPypi { - inherit pname version; - format = "wheel"; - python = "py3"; - sha256 = "eca63016524208afb6a06db19baf659e698cce3ae2e57be15b37bc988549c631"; + src = fetchFromGitHub { + owner = "portugueslab"; + repo = pname; + rev = "v${version}"; + sha256 = "13hlkvjcyz2lhvlfqyavja64jccbidshhs39sl4fibrn9iq34s3i"; }; propagatedBuildInputs = [ + ipython + ipywidgets numpy + pyqt5 ]; + pythonImportsCheck = [ "lightparam" ]; + meta = { homepage = "https://github.com/portugueslab/lightparam"; description = "Another attempt at parameters in Python"; From 9583f5295eb76fc3bc0ce08686842c3764644b00 Mon Sep 17 00:00:00 2001 From: Hongchang Wu Date: Fri, 18 Sep 2020 20:37:12 -0400 Subject: [PATCH 305/463] tmuxPlugins.nord: init at 0.3.0 --- pkgs/misc/tmux-plugins/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index f1f1bc5c8c5..8efa0000da7 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -184,6 +184,17 @@ in rec { }; }; + nord = mkDerivation rec { + pluginName = "nord"; + version = "0.3.0"; + src = pkgs.fetchFromGitHub { + owner = "arcticicestudio"; + repo = "nord-tmux"; + rev = "v${version}"; + sha256 = "14xhh49izvjw4ycwq5gx4if7a0bcnvgsf3irywc3qps6jjcf5ymk"; + }; + }; + maildir-counter = mkDerivation { pluginName = "maildir-counter"; version = "unstable-2016-11-25"; From 3cecd3fe691afe2a41fce86e0d3de915a9b4cc6b Mon Sep 17 00:00:00 2001 From: Markus Wamser Date: Sat, 19 Sep 2020 06:34:18 +0200 Subject: [PATCH 306/463] mmc-utils: 2018-12-14 -> 2019-10-04 (#98150) --- pkgs/os-specific/linux/mmc-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 61ad327c394..6a9f807947d 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "2018-12-14"; + version = "2019-10-04"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git"; - rev = "aef913e31b659462fe6b9320d241676cba97f67b"; - sha256 = "1mak9rqjp6yvqk2h5hfil5a9gfx138h62n3cryckfbhr6fmaylm7"; + rev = "73d6c59af8d1bcedf5de4aa1f5d5b7f765f545f5"; + sha256 = "18a7qm86gavg15gv4h6xfnapgq24v4dyvhwfp53lkssxyhjbli0z"; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; From ad1c7eb7b60626c6dc9a40c044e51080c5d490e0 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 18 Sep 2020 21:46:12 -0700 Subject: [PATCH 307/463] nixos/heyefi: remove module and package heyefi is no longer maintained by me; the company that made the sd cards is defunct and the cards depended on their servers to work. --- nixos/modules/module-list.nix | 1 - nixos/modules/services/networking/heyefi.nix | 82 -------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 85 deletions(-) delete mode 100644 nixos/modules/services/networking/heyefi.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e188ff54edf..ba060a6b175 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -637,7 +637,6 @@ ./services/networking/gvpe.nix ./services/networking/hans.nix ./services/networking/haproxy.nix - ./services/networking/heyefi.nix ./services/networking/hostapd.nix ./services/networking/htpdate.nix ./services/networking/hylafax/default.nix diff --git a/nixos/modules/services/networking/heyefi.nix b/nixos/modules/services/networking/heyefi.nix deleted file mode 100644 index fc2b5a84857..00000000000 --- a/nixos/modules/services/networking/heyefi.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.heyefi; -in - -{ - - ###### interface - - options = { - - services.heyefi = { - - enable = mkEnableOption "heyefi"; - - cardMacaddress = mkOption { - default = ""; - description = '' - An Eye-Fi card MAC address. - ''; - }; - - uploadKey = mkOption { - default = ""; - description = '' - An Eye-Fi card's upload key. - ''; - }; - - uploadDir = mkOption { - example = "/home/username/pictures"; - description = '' - The directory to upload the files to. - ''; - }; - - user = mkOption { - default = "root"; - description = '' - heyefi will be run under this user (user must exist, - this can be your user name). - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - systemd.services.heyefi = - { - description = "heyefi service"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "${cfg.user}"; - Restart = "always"; - ExecStart = "${pkgs.heyefi}/bin/heyefi"; - }; - - }; - - environment.etc."heyefi/heyefi.config".text = - '' - # /etc/heyefi/heyefi.conf: DO NOT EDIT -- this file has been generated automatically. - cards = [["${config.services.heyefi.cardMacaddress}","${config.services.heyefi.uploadKey}"]] - upload_dir = "${toString config.services.heyefi.uploadDir}" - ''; - - environment.systemPackages = [ pkgs.heyefi ]; - - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e63e038a6ff..c9687026cb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12862,8 +12862,6 @@ in herqq = libsForQt514.callPackage ../development/libraries/herqq { }; - heyefi = haskellPackages.heyefi; - hidapi = callPackage ../development/libraries/hidapi { }; highfive = callPackage ../development/libraries/highfive { }; From 61863c5155c8b324ac3d16f77b726c7ee3d9bd2f Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 18 Sep 2020 21:57:54 -0700 Subject: [PATCH 308/463] Revert "nixos/monit: Allow splitting the config in multiple files" --- nixos/modules/services/monitoring/monit.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix index aa51b83912c..ca935227217 100644 --- a/nixos/modules/services/monitoring/monit.nix +++ b/nixos/modules/services/monitoring/monit.nix @@ -4,29 +4,19 @@ with lib; let cfg = config.services.monit; - extraConfig = pkgs.writeText "monitConfig" cfg.extraConfig; in { - imports = [ - (mkRenamedOptionModule [ "services" "monit" "config" ] ["services" "monit" "extraConfig" ]) - ]; - options.services.monit = { enable = mkEnableOption "Monit"; - configFiles = mkOption { - type = types.listOf types.path; - default = []; - description = "List of paths to be included in the monitrc file"; - }; - - extraConfig = mkOption { + config = mkOption { type = types.lines; default = ""; - description = "Additional monit config as string"; + description = "monitrc content"; }; + }; config = mkIf cfg.enable { @@ -34,7 +24,7 @@ in environment.systemPackages = [ pkgs.monit ]; environment.etc.monitrc = { - text = concatMapStringsSep "\n" (path: "include ${path}") (cfg.configFiles ++ [extraConfig]); + text = cfg.config; mode = "0400"; }; From 16b94bf2314e44a67fc346bfd84fddfa043e94ff Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 18 Sep 2020 22:09:22 -0700 Subject: [PATCH 309/463] nixos/monit: add ryantm as maintainer --- nixos/modules/services/monitoring/monit.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix index ca935227217..379ee967620 100644 --- a/nixos/modules/services/monitoring/monit.nix +++ b/nixos/modules/services/monitoring/monit.nix @@ -43,4 +43,6 @@ in }; }; + + meta.maintainers = with maintainers; [ ryantm ]; } From a3461afcca1c37906f19aa6e777bce5e66a4ee13 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 19 Sep 2020 07:27:53 +0200 Subject: [PATCH 310/463] gitolite: fix updating of gitweb access list and description --- pkgs/applications/version-management/gitolite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index d0853f33978..5e2fdc087fe 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/gitolite-shell \ - --prefix PATH : "${git}/bin" + --prefix PATH : ${lib.makeBinPath [ git perl ]} ''; installPhase = '' From 5e166f892d9298eeff0216987207a31788c5c695 Mon Sep 17 00:00:00 2001 From: asdf8dfafjk <67588957+asdf8dfafjk@users.noreply.github.com> Date: Sat, 19 Sep 2020 11:32:42 +0530 Subject: [PATCH 311/463] nixos/onedrive: Remove verbose flag --- nixos/modules/services/networking/onedrive.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/onedrive.nix b/nixos/modules/services/networking/onedrive.nix index 210d2217b27..c52f920bae2 100644 --- a/nixos/modules/services/networking/onedrive.nix +++ b/nixos/modules/services/networking/onedrive.nix @@ -53,7 +53,7 @@ in { serviceConfig = { Type = "simple"; ExecStart = '' - ${cfg.package}/bin/onedrive --monitor --verbose --confdir=%h/.config/%i + ${cfg.package}/bin/onedrive --monitor --confdir=%h/.config/%i ''; Restart="on-failure"; RestartSec=3; From b5ea7643dc0be82bad110c441a48f7b96b46258a Mon Sep 17 00:00:00 2001 From: Serg Nesterov Date: Tue, 15 Sep 2020 16:48:50 +0300 Subject: [PATCH 312/463] navi: 2.10.0 -> 2.12.0 --- pkgs/applications/misc/navi/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 62951f3fcab..1965a8ad5ec 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -2,21 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.10.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "1fpfc3ikb6rhb8m0dp9ybh46mnqaw361rrsbv6yrivwfm3zc4w2w"; + sha256 = "0izmf4flwwn2h1wwpsnghb6rd494lj63hhsky1v9v6l1l641had4"; }; - cargoSha256 = "0klizxrb92h7qfxs89m08ksdq698wx4kxsdhqhr5ld9dy3b6ks32"; + cargoSha256 = "19xv9kbmxbp84lj8ycifsdr7sw9vhwgla7cdmrvlhayiq5r04xd7"; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram $out/bin/navi --prefix PATH : ${lib.makeBinPath [ fzf wget ]} + wrapProgram $out/bin/navi \ + --prefix PATH : "$out/bin" \ + --prefix PATH : ${lib.makeBinPath [ fzf wget ]} ''; meta = with lib; { From f65d6237ca309e2a1135050eaf9d6246f87de363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Fri, 18 Sep 2020 14:52:11 +0200 Subject: [PATCH 313/463] maintainers: add NieDzejkob --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ad45a68d440..bd8af9892f0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6089,6 +6089,16 @@ githubId = 8214542; name = "Nicolò Balzarotti"; }; + NieDzejkob = { + email = "kuba@kadziolka.net"; + github = "NieDzejkob"; + githubId = 23580910; + name = "Jakub Kądziołka"; + keys = [{ + longkeyid = "rsa4096/0xE315A75846131564"; + fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"; + }]; + }; NikolaMandic = { email = "nikola@mandic.email"; github = "NikolaMandic"; From 220490a6b460b98ac2738a7f9a304d66dbc9e2cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Fri, 18 Sep 2020 14:53:58 +0200 Subject: [PATCH 314/463] sameboy: init at 0.13.6 --- pkgs/misc/emulators/sameboy/default.nix | 53 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/misc/emulators/sameboy/default.nix diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/misc/emulators/sameboy/default.nix new file mode 100644 index 00000000000..e90cc5a00f5 --- /dev/null +++ b/pkgs/misc/emulators/sameboy/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }: + +stdenv.mkDerivation rec { + pname = "sameboy"; + version = "0.13.6"; + + src = fetchFromGitHub { + owner = "LIJI32"; + repo = "SameBoy"; + rev = "v${version}"; + sha256 = "04w8lybi7ssnax37ka4qw7pmcm7cgnmk90p9m73zbyp5chgpqqzc"; + }; + + enableParallelBuilding = true; + # glib and wrapGAppsHook are needed to make the Open ROM menu work. + nativeBuildInputs = [ rgbds glib wrapGAppsHook ]; + buildInputs = [ SDL2 ]; + + makeFlags = "CONF=release DATA_DIR=$(out)/share/sameboy/"; + + patchPhase = '' + sed 's/-Werror //g' -i Makefile + sed 's@"libgtk-3.so"@"${gtk3}/lib/libgtk-3.so"@g' -i OpenDialog/gtk.c + ''; + + installPhase = '' + pushd build/bin/SDL + install -Dm755 sameboy $out/bin/sameboy + rm sameboy + mkdir -p $out/share/sameboy + cp -r * $out/share/sameboy + popd + ''; + + meta = with stdenv.lib; { + homepage = "https://sameboy.github.io"; + description = "Game Boy, Game Boy Color, and Super Game Boy emulator"; + + longDescription = '' + SameBoy is a user friendly Game Boy, Game Boy Color and Super + Game Boy emulator for macOS, Windows and Unix-like platforms. + SameBoy is extremely accurate and includes a wide range of + powerful debugging features, making it ideal for both casual + players and developers. In addition to accuracy and developer + capabilities, SameBoy has all the features one would expect from + an emulator – from save states to scaling filters. + ''; + + license = licenses.mit; + maintainers = with maintainers; [ NieDzejkob ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e63e038a6ff..dc7adf5066d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22979,6 +22979,8 @@ in sakura = callPackage ../applications/misc/sakura { }; + sameboy = callPackage ../misc/emulators/sameboy { }; + sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; sbagen = callPackage ../applications/misc/sbagen { }; From 84d11cdb40ae5f67c6d1bd9c97804e95f4df4018 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 15 Sep 2020 20:40:21 +0200 Subject: [PATCH 315/463] slurm: 20.02.4.1 -> 20.02.5.1 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 2b06671e4e0..cc77dbd4891 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.02.4.1"; + version = "20.02.5.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "071lwny7cj4idq0h03mmvkk4f4i6fgl3c5q8cvbh7z8px6k50cfp"; + sha256 = "09d4zyyjl5mcrzhzbh6nhc35mzim1sy0h0p2h468nwk1fbl81ff5"; }; outputs = [ "out" "dev" ]; From 187cd50cce5e6af7dd75e8e7d84bbd6b2de9eed6 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 19 Sep 2020 06:46:23 +0000 Subject: [PATCH 316/463] mamba: 1.4 -> 1.5 --- pkgs/applications/audio/mamba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix index ad0a41bc005..6229cb3a80d 100644 --- a/pkgs/applications/audio/mamba/default.nix +++ b/pkgs/applications/audio/mamba/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mamba"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "brummer10"; repo = "Mamba"; rev = "v${version}"; - sha256 = "08dcm0mmka1lbssrgck66v9l2rk3r4y63ij06aw2f9la8a84y20j"; + sha256 = "1l74ckqqrccgsdy430pfsbv4fbzny7zivx399bi2jk1lv06p4h9a"; fetchSubmodules = true; }; From d3a2be1e7ee39f65133fc2cc458ee1dd7b28dadb Mon Sep 17 00:00:00 2001 From: Maxwell L-T Date: Tue, 15 Sep 2020 17:52:53 -0400 Subject: [PATCH 317/463] yed: 3.20 -> 3.20.1 --- pkgs/applications/graphics/yed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 9472f931246..f92e910eacc 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.20"; + version = "3.20.1"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "08j8lpn2nd41gavgrj03rlrxl04wcamq1y02f1x1569ykbhycb3m"; + sha256 = "0sd73s700f3gqq5zq1psrqjg6ff2gv49f8vd37v6bv65vdxqxryq"; }; nativeBuildInputs = [ makeWrapper unzip ]; From 72b0046db8f9f55f89306967f9a400c3ac311c1c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Sep 2020 10:07:21 +0200 Subject: [PATCH 318/463] batman-adv: 2019.5 -> 2020.3 (#98247) --- pkgs/os-specific/linux/batman-adv/version.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index f9f3013e1f9..e617881a570 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,9 @@ { - version = "2019.5"; + version = "2020.3"; sha256 = { - batman-adv = "1v18zvvg12jgywncbhxshgjc93r72ajpxgw22zp0zx22g2q13z99"; - alfred = "09npizg89ks1wm19l5xz0pq1ljpsbwy030xnprqnd0p53976wywa"; - batctl = "1b9w4636dq8m38nzr8j0v0j3b0vdsw84c58c2isc33h66dx8brgz"; + batman-adv = "0wrzh0k44zzjx2s5zj65hjkh4jm9y38qpis1s5cbx9cyj756slb5"; + alfred = "13bvccz90pkjl09jyw68gj23pbrw9b05w1vhds9sjggwf3jkj5w2"; + batctl = "0r2w2v4sy6wgr7mp9lc7yj9k4ldsbsm3425rjil7p0b17zmzf4rm"; }; } From 54a0a400f2d1ab30764cf752dd107a86fef11ffa Mon Sep 17 00:00:00 2001 From: squalus Date: Fri, 18 Sep 2020 18:37:22 +0000 Subject: [PATCH 319/463] ungoogled-chromium: 84.0.4147.89-1 -> 85.0.4183.102-1 based on chromium master@05f5001c --- .../browsers/ungoogled-chromium/common.nix | 36 ++- .../browsers/ungoogled-chromium/default.nix | 72 +++-- .../ungoogled-chromium/ungoogled-src.nix | 6 +- .../browsers/ungoogled-chromium/update.nix | 271 ------------------ .../browsers/ungoogled-chromium/update.py | 77 +++++ .../browsers/ungoogled-chromium/update.sh | 4 - .../ungoogled-chromium/upstream-info.json | 17 ++ .../ungoogled-chromium/upstream-info.nix | 18 -- 8 files changed, 171 insertions(+), 330 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/update.nix create mode 100755 pkgs/applications/networking/browsers/ungoogled-chromium/update.py delete mode 100755 pkgs/applications/networking/browsers/ungoogled-chromium/update.sh create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json delete mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index f9a2693f243..4d537f8dd4c 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar +{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, fetchurl # default dependencies -, bzip2, flac, speex, libopus +, gnutar, bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy , libpng, libcap , xdg_utils, yasm, nasm, minizip, libwebp @@ -41,6 +41,7 @@ , ungoogled-chromium , ungoogled ? false +, channel , upstream-info }: @@ -110,7 +111,7 @@ let versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; - stable-version = (import ./upstream-info.nix).stable.version; + stable-version = (importJSON ./upstream-info.json).stable.version; in if versionAtLeast stable-version upto-version then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." result @@ -123,10 +124,13 @@ let }; base = rec { name = "${packageName}-unwrapped-${version}"; - inherit (upstream-info) channel version; - inherit packageName buildType buildPath; + inherit (upstream-info) version; + inherit channel packageName buildType buildPath; - src = upstream-info.main; + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; + inherit (upstream-info) sha256; + }; nativeBuildInputs = [ ninja which python2Packages.python perl pkgconfig @@ -151,8 +155,9 @@ let ++ optional pulseSupport libpulseaudio ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; - patches = [ + patches = optionals (versionRange "68" "86") [ ./patches/nix_plugin_paths_68.patch + ] ++ [ ./patches/remove-webp-include-69.patch ./patches/no-build-timestamps.patch ./patches/widevine-79.patch @@ -166,12 +171,18 @@ let # # ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi) [ # Improvements for the VA-API build: + ] ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build: ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) ]; - postPatch = '' + postPatch = optionalString (!versionRange "0" "86") '' + # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): + substituteInPlace native_client/SConstruct \ + --replace "#! -*- python -*-" "" + substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ + --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" + '' + '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ --replace \ @@ -300,8 +311,8 @@ let use_system_libdrm = true; system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; } // optionalAttrs ungoogled { - closure_compile = false; enable_hangout_services_extension = false; + enable_js_type_check = false; enable_mdns = false; enable_nacl_nonsfi = false; enable_one_click_signin = false; @@ -313,7 +324,6 @@ let google_api_key = ""; google_default_client_id = ""; google_default_client_secret = ""; - optimize_webui = false; safe_browsing_mode = 0; use_official_google_api_keys = false; use_unofficial_version_number = false; @@ -366,9 +376,11 @@ let origRpath="$(patchelf --print-rpath "$chromiumBinary")" patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" ''; + + passthru.updateScript = ./update.py; }; # Remove some extraAttrs we supplied to the base attributes already. in stdenv.mkDerivation (base // removeAttrs extraAttrs [ "name" "gnFlags" "buildTargets" -]) +] // { passthru = base.passthru // (extraAttrs.passthru or {}); }) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix index 9051fc55feb..7c581ee633f 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix @@ -1,5 +1,5 @@ -{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10 -, makeWrapper, ed, gnugrep +{ newScope, config, stdenv, fetchurl, makeWrapper +, llvmPackages_10, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire_0_2 @@ -29,24 +29,16 @@ let callPackage = newScope chromium; - chromium = { + chromium = rec { inherit stdenv llvmPackages; - upstream-info = (callPackage ./update.nix {}).getChannel channel; + upstream-info = (lib.importJSON ./upstream-info.json).${channel}; mkChromiumDerivation = callPackage ./common.nix ({ - inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; + inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs + cupsSupport pulseSupport useOzone; inherit ungoogled; # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): - gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-03-23"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "5ed3c9cc67b090d5e311e4bd2aba072173e82db9"; - sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy"; - }; - }); - } // lib.optionalAttrs (channel == "dev") { gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-05-19"; src = fetchgit { @@ -55,6 +47,27 @@ let sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17"; }; }); + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") { + llvmPackages = llvmPackages_11; + gnChromium = gn.overrideAttrs (oldAttrs: { + version = "2020-07-20"; + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "3028c6a426a4aaf6da91c4ebafe716ae370225fe"; + sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q"; + }; + }); + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") { + llvmPackages = llvmPackages_11; + useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/ + gnChromium = gn.overrideAttrs (oldAttrs: { + version = "2020-08-17"; + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "6f13aaac55a977e1948910942675c69f2b4f7a94"; + sha256 = "01hpma1sllpdx09mvr4d6073sg6zmk6iv44kd3r28khymcj4s251"; + }; + }); }); browser = callPackage ./browser.nix { inherit channel enableWideVine; }; @@ -66,22 +79,33 @@ let ungoogled-chromium = callPackage ./ungoogled.nix {}; }; + pkgSuffix = if channel == "dev" then "unstable" else channel; + pkgName = "google-chrome-${pkgSuffix}"; + chromeSrc = fetchurl { + urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ + "https://dl.google.com/linux/chrome/deb/pool/main/g" + "http://95.31.35.30/chrome/pool/main/g" + "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" + "http://repo.fdzh.org/chrome/deb/pool/main/g" + ]; + sha256 = chromium.upstream-info.sha256bin64; + }; + mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; - widevineCdm = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation { + widevineCdm = stdenv.mkDerivation { name = "chrome-widevine-cdm"; - # The .deb file for Google Chrome - src = upstream-info.binary; + src = chromeSrc; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; unpackCmd = let widevineCdmPath = - if upstream-info.channel == "stable" then + if channel == "stable" then "./opt/google/chrome/WidevineCdm" - else if upstream-info.channel == "beta" then + else if channel == "beta" then "./opt/google/chrome-beta/WidevineCdm" - else if upstream-info.channel == "dev" then + else if channel == "dev" then "./opt/google/chrome-unstable/WidevineCdm" else throw "Unknown chromium channel."; @@ -191,10 +215,13 @@ in stdenv.mkDerivation { '' + '' # libredirect causes chromium to deadlock on startup - export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" + export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | ${coreutils}/bin/tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | ${coreutils}/bin/tr '\n' ':')" export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS + # Mainly for xdg-open but also other xdg-* tools: + export PATH="${xdg_utils}/bin\''${PATH:+:}\$PATH" + . w EOF @@ -214,6 +241,7 @@ in stdenv.mkDerivation { passthru = { inherit (chromium) upstream-info browser; mkDerivation = chromium.mkChromiumDerivation; - inherit sandboxExecutableName; + inherit chromeSrc sandboxExecutableName; + updateScript = ./update.py; }; } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix index 109e410d5ee..73f4e4c9e83 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix @@ -1,6 +1,6 @@ { - "84.0.4147.89" = { - rev = "84.0.4147.89-1"; - sha256 = "1bqvcq3dj6615198j7cz3ylyyic5zpis06capvl6ybl1na3ainb0"; + "85.0.4183.102" = { + rev = "85.0.4183.102-1"; + sha256 = "1mdx4a5zcs3an9yx1jxx4amq8p9rcj0hv76r8y7nz6cpsfgd9n3y"; }; } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix deleted file mode 100644 index 6dff17c69dd..00000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix +++ /dev/null @@ -1,271 +0,0 @@ -let maybePkgs = import ../../../../../. {}; in - -{ stdenv ? maybePkgs.stdenv -, runCommand ? maybePkgs.runCommand -, fetchurl ? maybePkgs.fetchurl -, writeText ? maybePkgs.writeText -, curl ? maybePkgs.curl -, cacert ? maybePkgs.cacert -, nix ? maybePkgs.nix -}: - -let - inherit (stdenv) lib; - - sources = if builtins.pathExists ./upstream-info.nix - then import ./upstream-info.nix - else {}; - - bucketURL = "https://commondatastorage.googleapis.com/" - + "chromium-browser-official"; - - mkVerURL = version: "${bucketURL}/chromium-${version}.tar.xz"; - - debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g"; - - getDebURL = channelName: version: arch: mirror: let - packageSuffix = if channelName == "dev" then "unstable" else channelName; - packageName = "google-chrome-${packageSuffix}"; - in "${mirror}/${packageName}/${packageName}_${version}-1_${arch}.deb"; - - # Untrusted mirrors, don't try to update from them! - debMirrors = [ - "http://95.31.35.30/chrome/pool/main/g" - "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" - "http://repo.fdzh.org/chrome/deb/pool/main/g" - ]; - -in { - getChannel = channel: let - chanAttrs = builtins.getAttr channel sources; - in { - inherit channel; - inherit (chanAttrs) version; - - main = fetchurl { - url = mkVerURL chanAttrs.version; - inherit (chanAttrs) sha256; - }; - - binary = fetchurl (let - mkUrls = arch: let - mkURLForMirror = getDebURL channel chanAttrs.version arch; - in map mkURLForMirror ([ debURL ] ++ debMirrors); - in if stdenv.is64bit && chanAttrs ? sha256bin64 then { - urls = mkUrls "amd64"; - sha256 = chanAttrs.sha256bin64; - } else if !stdenv.is64bit && chanAttrs ? sha256bin32 then { - urls = mkUrls "i386"; - sha256 = chanAttrs.sha256bin32; - } else throw "No Chrome plugins are available for your architecture."); - }; - - update = let - csv2nix = name: src: import (runCommand "${name}.nix" { - src = builtins.fetchurl src; - } '' - esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } # ohai emacs " - IFS=, read -r -a headings <<< "$(head -n1 "$src")" - echo "[" > "$out" - tail -n +2 "$src" | while IFS=, read -r -a line; do - echo " {" - for idx in "''${!headings[@]}"; do - echo " $(esc "''${headings[idx]}") = $(esc ''${line[$idx]});" - done - echo " }" - done >> "$out" - echo "]" >> "$out" - ''); - - channels = lib.fold lib.recursiveUpdate {} (map (attrs: { - ${attrs.os}.${attrs.channel} = attrs // { - history = let - drvName = "omahaproxy-${attrs.os}.${attrs.channel}-info"; - history = csv2nix drvName "http://omahaproxy.appspot.com/history"; - cond = h: attrs.os == h.os && attrs.channel == h.channel - && lib.versionOlder h.version attrs.current_version; - # Note that this is a *reverse* sort! - sorter = a: b: lib.versionOlder b.version a.version; - sorted = builtins.sort sorter (lib.filter cond history); - in map (lib.flip removeAttrs ["os" "channel"]) sorted; - version = attrs.current_version; - }; - }) (csv2nix "omahaproxy-info" "http://omahaproxy.appspot.com/all?csv=1")); - - /* - XXX: This is essentially the same as: - - builtins.tryEval (builtins.fetchurl url) - - ... except that tryEval on fetchurl isn't working and doesn't catch - errors for fetchurl, so we go for a different approach. - - We only have fixed-output derivations that can have networking access, so - we abuse SHA1 and its weaknesses to forge a fixed-output derivation which - is not so fixed, because it emits different contents that have the same - SHA1 hash. - - Using this method, we can distinguish whether the URL is available or - whether it's not based on the actual content. - - So let's use tryEval as soon as it's working with fetchurl in Nix. - */ - tryFetch = url: let - # SHA1 hash collisions from https://shattered.io/static/shattered.pdf: - collisions = runCommand "sha1-collisions" { - outputs = [ "out" "good" "bad" ]; - base64 = '' - QlpoOTFBWSZTWbL5V5MABl///////9Pv///v////+/////HDdK739/677r+W3/75rUNr4 - Aa/AAAAAAACgEVTRtQDQAaA0AAyGmjTQGmgAAANGgAaMIAYgGgAABo0AAAAAADQAIAGQ0 - MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk - 0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIAN - GgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRp - o0GIGgBoGQAABVTUExEZATTICnkxNR+p6E09JppoyamjGhkm0ammIyaekbUejU9JiGnqZ - qaaDxJ6m0JkZMQ2oaYmJ6gxqMyE2TUzJqfItligtJQJfYbl9Zy9QjQuB5mHQRdSSXCCTH - MgmSDYmdOoOmLTBJWiCpOhMQYpQlOYpJjn+wQUJSTCEpOMekaFaaNB6glCC0hKEJdHr6B - mUIHeph7YxS8WJYyGwgWnMTFJBDFSxSCCYljiEk7HZgJzJVDHJxMgY6tCEIIWgsKSlSZ0 - S8GckoIIF+551Ro4RCw260VCEpWJSlpWx/PMrLyVoyhWMAneDilBcUIeZ1j6NCkus0qUC - Wnahhk5KT4GpWMh3vm2nJWjTL9Qg+84iExBJhNKpbV9tvEN265t3fu/TKkt4rXFTsV+Nc - upJXhOhOhJMQQktrqt4K8mSh9M2DAO2X7uXGVL9YQxUtzQmS7uBndL7M6R7vX869VxqPu - renSuHYNq1yTXOfNWLwgvKlRlFYqLCs6OChDp0HuTzCWscmGudLyqUuwVGG75nmyZhKpJ - yOE/pOZyHyrZxGM51DYIN+Jc8yVJgAykxKCEtW55MlfudLg3KG6TtozalunXrroSxUpVL - StWrWLFihMnVpkyZOrQnUrE6xq1CGtJlbAb5ShMbV1CZgqlKC0wCFCpMmUKSEkvFLaZC8 - wHOCVAlvzaJQ/T+XLb5Dh5TNM67p6KZ4e4ZSGyVENx2O27LzrTIteAreTkMZpW95GS0CE - JYhMc4nToTJ0wQhKEyddaLb/rTqmgJSlkpnALxMhlNmuKEpkEkqhKUoEq3SoKUpIQcDgW - lC0rYahMmLuPQ0fHqZaF4v2W8IoJ2EhMhYmSw7qql27WJS+G4rUplToFi2rSv0NSrVvDU - pltQ8Lv6F8pXyxmFBSxiLSxglNC4uvXVKmAtusXy4YXGX1ixedEvXF1aX6t8adYnYCpC6 - rW1ZzdZYlCCxKEv8vpbqdSsXl8v1jCQv0KEPxPTa/5rtWSF1dSgg4z4KjfIMNtgwWoWLE - sRhKxsSA9ji7V5LRPwtumeQ8V57UtFSPIUmtQdOQfseI2Ly1DMtk4Jl8n927w34zrWG6P - i4jzC82js/46Rt2IZoadWxOtMInS2xYmcu8mOw9PLYxQ4bdfFw3ZPf/g2pzSwZDhGrZAl - 9lqky0W+yeanadC037xk496t0Dq3ctfmqmjgie8ln9k6Q0K1krb3dK9el4Xsu44LpGcen - r2eQZ1s1IhOhnE56WnXf0BLWn9Xz15fMkzi4kpVxiTKGEpffErEEMvEeMZhUl6yD1SdeJ - YbxzGNM3ak2TAaglLZlDCVnoM6wV5DRrycwF8Zh/fRsdmhkMfAO1duwknrsFwrzePWeMw - l107DWzymxdQwiSXx/lncnn75jL9mUzw2bUDqj20LTgtawxK2SlQg1CCZDQMgSpEqLjRM - sykM9zbSIUqil0zNk7Nu+b5J0DKZlhl9CtpGKgX5uyp0idoJ3we9bSrY7PupnUL5eWiDp - V5mmnNUhOnYi8xyClkLbNmAXyoWk7GaVrM2umkbpqHDzDymiKjetgzTocWNsJ2E0zPcfh - t46J4ipaXGCfF7fuO0a70c82bvqo3HceIcRlshgu73seO8BqlLIap2z5jTOY+T2ucCnBt - Atva3aHdchJg9AJ5YdKHz7LoA3VKmeqxAlFyEnQLBxB2PAhAZ8KvmuR6ELXws1Qr13Nd1 - i4nsp189jqvaNzt+0nEnIaniuP1+/UOZdyfoZh57ku8sYHKdvfW/jYSUks+0rK+qtte+p - y8jWL9cOJ0fV8rrH/t+85/p1z2N67p/ZsZ3JmdyliL7lrNxZUlx0MVIl6PxXOUuGOeArW - 3vuEvJ2beoh7SGyZKHKbR2bBWO1d49JDIcVM6lQtu9UO8ec8pOnXmkcponBPLNM2CwZ9k - NC/4ct6rQkPkQHMcV/8XckU4UJCy+VeTA== - ''; - } '' - echo "$base64" | base64 -d | tar xj - mv good.pdf "$good" - mv bad.pdf "$bad" - touch "$out" - ''; - - cacheVal = let - urlHash = builtins.hashString "sha256" url; - timeSlice = builtins.currentTime / 600; - in "${urlHash}-${toString timeSlice}"; - - in { - success = import (runCommand "check-success" { - result = stdenv.mkDerivation { - name = "tryfetch-${cacheVal}"; - inherit url; - - outputHash = "d00bbe65d80f6d53d5c15da7c6b4f0a655c5a86a"; - outputHashMode = "flat"; - outputHashAlgo = "sha1"; - - nativeBuildInputs = [ curl ]; - preferLocalBuild = true; - - inherit (collisions) good bad; - - buildCommand = '' - if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \ - curl -s -L -f -I "$url" > /dev/null; then - cp "$good" "$out" - else - cp "$bad" "$out" - fi - ''; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - }; - inherit (collisions) good; - } '' - if cmp -s "$result" "$good"; then - echo true > "$out" - else - echo false > "$out" - fi - ''); - value = builtins.fetchurl url; - }; - - fetchLatest = channel: let - result = tryFetch (mkVerURL channel.version); - in if result.success then result.value else fetchLatest (channel // { - version = if channel.history != [] - then (lib.head channel.history).version - else throw "Unfortunately there's no older version than " + - "${channel.version} available for channel " + - "${channel.channel} on ${channel.os}."; - history = lib.tail channel.history; - }); - - getHash = path: import (runCommand "gethash.nix" { - inherit path; - nativeBuildInputs = [ nix ]; - } '' - sha256="$(nix-hash --flat --base32 --type sha256 "$path")" - echo "\"$sha256\"" > "$out" - ''); - - isLatest = channel: version: let - ourVersion = sources.${channel}.version or null; - in if ourVersion == null then false - else lib.versionOlder version sources.${channel}.version - || version == sources.${channel}.version; - - # We only support GNU/Linux right now. - linuxChannels = let - genLatest = channelName: channel: let - newUpstream = { - inherit (channel) version; - sha256 = getHash (fetchLatest channel); - }; - keepOld = let - oldChannel = sources.${channelName}; - in { - inherit (oldChannel) version sha256; - } // lib.optionalAttrs (oldChannel ? sha256bin32) { - inherit (oldChannel) sha256bin32; - } // lib.optionalAttrs (oldChannel ? sha256bin64) { - inherit (oldChannel) sha256bin64; - }; - in if isLatest channelName channel.version then keepOld else newUpstream; - in lib.mapAttrs genLatest channels.linux; - - getLinuxFlash = channelName: channel: let - inherit (channel) version; - fetchArch = arch: tryFetch (getDebURL channelName version arch debURL); - packages = lib.genAttrs ["i386" "amd64"] fetchArch; - isNew = arch: attr: !(builtins.hasAttr attr channel) - && packages.${arch}.success; - in channel // lib.optionalAttrs (isNew "i386" "sha256bin32") { - sha256bin32 = getHash (packages.i386.value); - } // lib.optionalAttrs (isNew "amd64" "sha256bin64") { - sha256bin64 = getHash (packages.amd64.value); - }; - - newChannels = lib.mapAttrs getLinuxFlash linuxChannels; - - dumpAttrs = indent: attrs: let - mkVal = val: if lib.isAttrs val then dumpAttrs (indent + 1) val - else "\"${lib.escape ["$" "\\" "\""] (toString val)}\""; - mkIndent = level: lib.concatStrings (builtins.genList (_: " ") level); - mkAttr = key: val: "${mkIndent (indent + 1)}${key} = ${mkVal val};\n"; - attrLines = lib.mapAttrsToList mkAttr attrs; - in "{\n" + (lib.concatStrings attrLines) + (mkIndent indent) + "}"; - in writeText "chromium-new-upstream-info.nix" '' - # This file is autogenerated from update.sh in the same directory. - ${dumpAttrs 0 newChannels} - ''; -} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.py b/pkgs/applications/networking/browsers/ungoogled-chromium/update.py new file mode 100755 index 00000000000..bfc7f0d2478 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/update.py @@ -0,0 +1,77 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python -p python3 nix + +import csv +import json +import subprocess +import sys + +from codecs import iterdecode +from collections import OrderedDict +from os.path import abspath, dirname +from urllib.request import urlopen + +HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux' +DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' +BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official' + +JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json' + +def load_json(path): + with open(path, 'r') as f: + return json.load(f) + +def nix_prefetch_url(url, algo='sha256'): + print(f'nix-prefetch-url {url}') + out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) + return out.decode('utf-8').rstrip() + +channels = {} +last_channels = load_json(JSON_PATH) + +print(f'GET {HISTORY_URL}', file=sys.stderr) +with urlopen(HISTORY_URL) as resp: + builds = csv.DictReader(iterdecode(resp, 'utf-8')) + for build in builds: + channel_name = build['channel'] + + # If we've already found a newer build for this channel, we're + # no longer interested in it. + if channel_name in channels: + continue + + # If we're back at the last build we used, we don't need to + # keep going -- there's no new version available, and we can + # just reuse the info from last time. + if build['version'] == last_channels[channel_name]['version']: + channels[channel_name] = last_channels[channel_name] + continue + + channel = {'version': build['version']} + suffix = 'unstable' if channel_name == 'dev' else channel_name + + try: + channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz') + channel['sha256bin64'] = nix_prefetch_url(f'{DEB_URL}/google-chrome-{suffix}/google-chrome-{suffix}_{build["version"]}-1_amd64.deb') + except subprocess.CalledProcessError: + # This build isn't actually available yet. Continue to + # the next one. + continue + + channels[channel_name] = channel + +with open(JSON_PATH, 'w') as out: + def get_channel_key(item): + channel_name = item[0] + if channel_name == 'stable': + return 0 + elif channel_name == 'beta': + return 1 + elif channel_name == 'dev': + return 2 + else: + print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) + sys.exit(1) + sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key)) + json.dump(sorted_channels, out, indent=2) + out.write('\n') diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh b/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh deleted file mode 100755 index ea67a62c107..00000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -e -cd "$(dirname "$0")" -sp="$(nix-build --builders "" -Q --no-out-link update.nix -A update)" -cat "$sp" > upstream-info.nix diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json new file mode 100644 index 00000000000..dae7f741b35 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json @@ -0,0 +1,17 @@ +{ + "stable": { + "version": "85.0.4183.102", + "sha256": "032yh1mfwins7a62zw8kwwq8xw1n52a0a93lqz7qlyjaf9sd8s4a", + "sha256bin64": "1i8xaxxnmg80vsia8hxnq58qi9k5nnbrl80d6d23g9lb7dbc9cpm" + }, + "beta": { + "version": "86.0.4240.30", + "sha256": "1isj0zngb72k1hhn3h0s8mccg1cdmppz1mjmg19f2h306farzmzl", + "sha256bin64": "10d8im2adqqnkd6265gngv6xlm5qsz6r13z6cbbchsss0ssr8fxa" + }, + "dev": { + "version": "87.0.4252.0", + "sha256": "1lxlsdni63zh79hxvpwgmnfn67kgfzhz3yg9bkxghqchqykkz92y", + "sha256bin64": "130hf7b35wcxpw05ddbqq89x10c0kays1vb9qg6xhq3zx2mk6ijw" + } +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix deleted file mode 100644 index 874e45307eb..00000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file is autogenerated from update.sh in the same directory. -{ - beta = { - sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp"; - sha256bin64 = "017ix9a74f2gzlg6in0x6fqgiw8bpk0rypr6wsqqkslywprypjd0"; - version = "84.0.4147.89"; - }; - dev = { - sha256 = "1dbbr7s8vbhxd0sk4k2yqp630zp1r4gzkkd2a86pzlzq2mjhsk8a"; - sha256bin64 = "0bphfwi6nkj9nzrjjaffiv27xfblgdikyifsbjl6vv2pawkh335q"; - version = "85.0.4183.15"; - }; - stable = { - sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp"; - sha256bin64 = "1hzhgvs2ykqsncpnbnhzh09sw1vlsdfjhs06z5gc80l47brdi3wz"; - version = "84.0.4147.89"; - }; -} From eae103c83540effbc7d52f4532795e85688820b3 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sat, 19 Sep 2020 12:16:37 +0200 Subject: [PATCH 320/463] nixos/doc: fix dead link --- nixos/doc/manual/development/writing-nixos-tests.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 74ab23605b3..cab4c067e0d 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -43,7 +43,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix"> console, whether device ownership is correctly maintained when switching between consoles, and so on. On the other hand, nfs.nix, +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix">nfs/simple.nix, which tests NFS client and server functionality in the Linux kernel (including whether locks are maintained across server crashes), requires three machines: a server and two clients. From 48978fb8d0696d10e7bba6b3226358a682a2cb91 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 7 Jun 2020 13:43:22 +0300 Subject: [PATCH 321/463] jdk: point attributes without version suffix to latest For too long `jdk` was pointing to the legacy, unmaintained openjdk8 and too many apps are using it just because it works. --- pkgs/top-level/all-packages.nix | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc7adf5066d..17af7b756fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9173,6 +9173,11 @@ in else openjdk8.override { headless = true; }; + jdk8 = openjdk8; + jdk8_headless = openjdk8_headless; + jre8 = openjdk8.jre; + jre8_headless = openjdk8_headless.jre; + openjdk11-bootstrap = if adoptopenjdk-hotspot-bin-11.meta.available then adoptopenjdk-hotspot-bin-11 @@ -9213,7 +9218,10 @@ in }; }; - /* current JDK */ + jdk11 = openjdk11; + jdk11_headless = openjdk11_headless; + + /* Latest JDK */ openjdk14 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } @@ -9229,23 +9237,18 @@ in else openjdk14.override { headless = true; }; - openjdk = openjdk8; - openjdk_headless = openjdk8_headless; - - jdk8 = openjdk8; - jdk8_headless = openjdk8_headless; - jre8 = openjdk8.jre; - jre8_headless = openjdk8_headless.jre; - - jdk11 = openjdk11; - jdk11_headless = openjdk11_headless; - jdk14 = openjdk14; jdk14_headless = openjdk14_headless; - jdk = jdk8; - jre = jre8; - jre_headless = jre8_headless; + /* default JDK */ + + jdk = jdk14; + # jdk14 lacks a jre output. See https://github.com/NixOS/nixpkgs/issues/79490 + jre = jdk14; + jre_headless = jdk14_headless; + + openjdk = openjdk14; + openjdk_headless = openjdk14_headless; inherit (callPackages ../development/compilers/graalvm { gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc; From 8ca15576526ea3d8bf5be59118bb7307ae57bf99 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 13:22:22 +0200 Subject: [PATCH 322/463] fop: use openjdk8 --- 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 17af7b756fe..f70437ad22f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1969,7 +1969,9 @@ in fsql = callPackage ../tools/misc/fsql { }; - fop = callPackage ../tools/typesetting/fop { }; + fop = callPackage ../tools/typesetting/fop { + jdk = openjdk8; + }; fondu = callPackage ../tools/misc/fondu { }; From 3d55255bfda0f7f4d3e22a0fac5fa358226f99e1 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 13:27:25 +0200 Subject: [PATCH 323/463] mercury: use openjdk8 --- 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 f70437ad22f..c20dde47c3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9435,7 +9435,9 @@ in manticore = callPackage ../development/compilers/manticore { }; - mercury = callPackage ../development/compilers/mercury { }; + mercury = callPackage ../development/compilers/mercury { + jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; microscheme = callPackage ../development/compilers/microscheme { }; From 05104cc10467442362a824dcb1aa9e532211a469 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 13:29:03 +0200 Subject: [PATCH 324/463] libreoffice-still: specify jdk version --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c20dde47c3d..31d5aa89d9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21635,6 +21635,7 @@ in (libreoffice-args // { icu = icu64; variant = "still"; + jdk = jdk8; }); }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; From 2edf2654481377d74d9114d464fb96292325dd93 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 13:34:07 +0200 Subject: [PATCH 325/463] jedit: use jdk8 --- 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 31d5aa89d9e..7fb13bccc23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21344,7 +21344,9 @@ in jdupes = callPackage ../tools/misc/jdupes { }; - jedit = callPackage ../applications/editors/jedit { }; + jedit = callPackage ../applications/editors/jedit { + jdk = jdk8; # TODO: upgrade + }; jgmenu = callPackage ../applications/misc/jgmenu { }; From 705ecdc1927b5523f6e728f1418af8cfb0eceb88 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 13:41:44 +0200 Subject: [PATCH 326/463] chromium: use jre8 --- pkgs/applications/networking/browsers/chromium/common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4e3960ee729..a79a48fffcc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -17,7 +17,7 @@ , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg_3, libxslt, libxml2, at-spi2-core -, jre +, jre8 , pipewire_0_2 # optional dependencies @@ -50,6 +50,8 @@ with stdenv.lib; # see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html let + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + # The additional attributes for creating derivations based on the chromium # source tree. extraAttrs = buildFun base; From 33bae6276dc50ea84ce3f5a12605bc0cac180651 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 13:41:47 +0200 Subject: [PATCH 327/463] ungoogled-chromium: use jre8 --- .../networking/browsers/ungoogled-chromium/common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index 4d537f8dd4c..421d6bb745a 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -17,7 +17,7 @@ , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg_3, libxslt, libxml2, at-spi2-core -, jre +, jre8 , pipewire_0_2 # optional dependencies @@ -52,6 +52,8 @@ with stdenv.lib; # see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html let + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + # The additional attributes for creating derivations based on the chromium # source tree. extraAttrs = buildFun base; From 809f3344f83726be2a38491630815ae9deb33c67 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 13:44:43 +0200 Subject: [PATCH 328/463] virtualbox: use openjdk8 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fb13bccc23..656c6f92a24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23739,6 +23739,7 @@ in virtualbox = libsForQt514.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; + jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; virtualboxHardened = lowPrio (virtualbox.override { From 98cab0de9f106ebc867c57e93cf34ac876c6518f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 13:45:19 +0200 Subject: [PATCH 329/463] swiProlog: use openjdk8 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 656c6f92a24..0099221797d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9780,6 +9780,7 @@ in swiProlog = callPackage ../development/compilers/swi-prolog { inherit (darwin.apple_sdk.frameworks) Security; + jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; swiPrologWithGui = swiProlog.override { withGui = true; }; From cb973a0368d6e7a8fb1d2f1250a0074b393d3812 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 13:47:12 +0200 Subject: [PATCH 330/463] antlr: use jre8 --- pkgs/top-level/all-packages.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0099221797d..70094f95b7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10466,13 +10466,21 @@ in ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; - antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; + antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { + jdk = jdk8; # todo: remove override https://github.com/nixos/nixpkgs/pull/89731 + }; - antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; - antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; + antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; antlr3 = antlr3_5; - antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { }; + antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; antlr4 = antlr4_7; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; From cdcdeb63b2a11c24f5da637351373ffa27a9cb2d Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 13:52:36 +0200 Subject: [PATCH 331/463] dwarf-fortress: use jdk8 --- pkgs/games/dwarf-fortress/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 0664af117e1..2a4df9bf7cf 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -86,6 +86,8 @@ let twbt = twbt; dfhack = dfhack; dwarf-therapist = dwarf-therapist; + + jdk = pkgs.jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; }) (lib.attrNames self.df-hashes)); @@ -104,7 +106,9 @@ let soundSense = callPackage ./soundsense.nix { }; - legends-browser = callPackage ./legends-browser {}; + legends-browser = callPackage ./legends-browser { + jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; themes = recurseIntoAttrs (callPackage ./themes { stdenv = stdenvNoCC; From c37d47d5729f44db56c72cceb027bb1db0cc18c4 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 13:57:18 +0200 Subject: [PATCH 332/463] freenet: use jdk8 --- 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 70094f95b7d..64a9d395d1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20697,7 +20697,9 @@ in freemind = callPackage ../applications/misc/freemind { }; - freenet = callPackage ../applications/networking/p2p/freenet { }; + freenet = callPackage ../applications/networking/p2p/freenet { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {}; From 2a991c046cb90e0f98041ef9df5fc71269e541f5 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:03:28 +0200 Subject: [PATCH 333/463] javaCup: use jdk8 --- 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 64a9d395d1d..788616a184e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16031,7 +16031,9 @@ in gwtwidgets = callPackage ../development/libraries/java/gwt-widgets { }; - javaCup = callPackage ../development/libraries/java/cup { }; + javaCup = callPackage ../development/libraries/java/cup { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; jdom = callPackage ../development/libraries/java/jdom { }; From 2306062573560f73e1174e734e3b654efd571cdd Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:05:29 +0200 Subject: [PATCH 334/463] jdepend: use jdk8 --- 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 788616a184e..b93730480f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10998,7 +10998,9 @@ in pmdk = callPackage ../development/libraries/pmdk { }; - jdepend = callPackage ../development/tools/analysis/jdepend { }; + jdepend = callPackage ../development/tools/analysis/jdepend { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { }; From d2468814126a832761c7acf2443f2f0143130b46 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:06:57 +0200 Subject: [PATCH 335/463] pmd: use openjdk8 --- 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 b93730480f8..b6bd61f3b8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10994,7 +10994,9 @@ in gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; - pmd = callPackage ../development/tools/analysis/pmd { }; + pmd = callPackage ../development/tools/analysis/pmd { + openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; pmdk = callPackage ../development/libraries/pmdk { }; From d2a7944217141955d23fcb738e6b41e69a24bb58 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:13:19 +0200 Subject: [PATCH 336/463] openmodelica: use jre8 --- 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 b6bd61f3b8f..df734473f06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6500,7 +6500,9 @@ in ucx = callPackage ../development/libraries/ucx {}; - openmodelica = callPackage ../applications/science/misc/openmodelica { }; + openmodelica = callPackage ../applications/science/misc/openmodelica { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; qarte = libsForQt514.callPackage ../applications/video/qarte { }; From a89d5a14afaa578fcd50f03fea676a9008ce8004 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:16:58 +0200 Subject: [PATCH 337/463] python3Packages.skein: use jre8 --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0bf49fe103..d71e72e9a16 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6459,7 +6459,9 @@ in { six = callPackage ../development/python-modules/six { }; - skein = callPackage ../development/python-modules/skein { }; + skein = callPackage ../development/python-modules/skein { + jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; From 5ef1503546a0d8dba1e55a3d70d3c676b687d408 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:17:01 +0200 Subject: [PATCH 338/463] maven3: use jdk8 --- 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 df734473f06..d9608f051fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11241,7 +11241,9 @@ in massif-visualizer = libsForQt514.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; - maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + maven3 = callPackage ../development/tools/build-managers/apache-maven { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; From 7552827fb42a79ce52126a3203c8fa43e7248434 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:20:46 +0200 Subject: [PATCH 339/463] octave: use jdk8 --- pkgs/top-level/all-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9608f051fa..df20b379e12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10080,15 +10080,18 @@ in octave = callPackage ../development/interpreters/octave { python = python3; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octave-jit = callPackage ../development/interpreters/octave { python = python3; enableJIT = true; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave { python = python3; enableQt = true; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 })); ocropus = callPackage ../applications/misc/ocropus { }; From 1c576d0b37b14a2887afe9f9ac6751d6dc00444f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:22:43 +0200 Subject: [PATCH 340/463] sage: use jdk8 --- pkgs/applications/science/math/sage/sage-env.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 626e1bf1ea9..ba7f6ccd18b 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -50,7 +50,7 @@ , zlib , gsl , ntl -, jdk +, jdk8 , less }: @@ -61,6 +61,8 @@ assert (!blas.isILP64) && (!lapack.isILP64); # dependencies. let + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + runtimepath = (lib.makeBinPath ([ "@sage-local@" "@sage-local@/build" From e191f1ac74289aca42afd8d56eb6770ee09ed5b7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:23:47 +0200 Subject: [PATCH 341/463] R: use jdk8 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df20b379e12..a6e2462c018 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16184,6 +16184,7 @@ in withRecommendedPackages = false; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; inherit (darwin) libobjc; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; rWrapper = callPackage ../development/r-modules/wrapper.nix { From acc968f1e734e07f4c2440aa6d2e07fb00793267 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:24:28 +0200 Subject: [PATCH 342/463] jmol: use jre8 --- 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 a6e2462c018..0ae5f8a3a58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25689,7 +25689,9 @@ in gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; - jmol = callPackage ../applications/science/chemistry/jmol { }; + jmol = callPackage ../applications/science/chemistry/jmol { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; marvin = callPackage ../applications/science/chemistry/marvin { }; From e192fe6527b040cb5dbd5f33ce3b4b7727ab058b Mon Sep 17 00:00:00 2001 From: Matthias Meschede Date: Mon, 14 Sep 2020 09:46:05 +0200 Subject: [PATCH 343/463] maintainer: add mmesch --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bd8af9892f0..3b09303f75b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5709,6 +5709,12 @@ githubId = 117842; name = "Henri Bourcereau"; }; + mmesch = { + email = "mmesch@noreply.github.com"; + github = "mmesch"; + githubId = 2597803; + name = "Matthias Meschede"; + }; mmilata = { email = "martin@martinmilata.cz"; github = "mmilata"; From 233331c2236cec0d5441004c465f1ecb9d0a5add Mon Sep 17 00:00:00 2001 From: Matthias Meschede Date: Sun, 13 Sep 2020 15:14:26 +0200 Subject: [PATCH 344/463] nodePackages.vega-cli: init at version 5.15.0 --- pkgs/development/node-packages/default.nix | 11 + .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 761 ++++++++++++++++-- 3 files changed, 712 insertions(+), 61 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 71b9bd77411..24a13a060f6 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -170,6 +170,17 @@ let meta.broken = since "10"; }; + vega-cli = super.vega-cli.override { + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ + super.node-pre-gyp + pixman + cairo + pango + libjpeg + ]; + }; + webtorrent-cli = super.webtorrent-cli.override { buildInputs = [ self.node-gyp-build ]; }; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index a780d3cc967..acb9e4c29c2 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -199,6 +199,7 @@ , "typescript-language-server" , "uglify-js" , "ungit" +, "vega-cli" , "vim-language-server" , "vscode-css-languageserver-bin" , "vscode-html-languageserver-bin" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1dbe9ac6e26..5407e684c34 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -5125,76 +5125,76 @@ let sha512 = "4Lpf59lr0pycIzKdTlZsgubJxCHDkAqcc4I60Gp6rggueksuhz2q3rAp7kfxwCzaZlAXXsqy6hoeyj+3sukqDQ=="; }; }; - "@vue/compiler-core-3.0.0-rc.13" = { + "@vue/compiler-core-3.0.0" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0-rc.13.tgz"; - sha512 = "bVtg7iilAE8uq+WvR4JN+vtzQWX+yjKHNG5Un0ar6M9WbphydGY9C0y1whKjRbKn/7U+evUh1MJ2hV2q3GBrSQ=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0.tgz"; + sha512 = "XqPC7vdv4rFE77S71oCHmT1K4Ks3WE2Gi6Lr4B5wn0Idmp+NyQQBUHsCNieMDRiEpgtJrw+yOHslrsV0AfAsfQ=="; }; }; - "@vue/compiler-dom-3.0.0-rc.13" = { + "@vue/compiler-dom-3.0.0" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.13.tgz"; - sha512 = "D0x6cZFiDfz+rcmWSgvgxjhVQOADMmQy7kcbft3u5nlTurZaztBNBz7pwHYi57/z3FjhzyclpDf0daOrRvph4A=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0.tgz"; + sha512 = "ukDEGOP8P7lCPyStuM3F2iD5w2QPgUu2xwCW2XNeqPjFKIlR2xMsWjy4raI/cLjN6W16GtlMFaZdK8tLj5PRog=="; }; }; - "@vue/compiler-sfc-3.0.0-rc.13" = { + "@vue/compiler-sfc-3.0.0" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.13.tgz"; - sha512 = "b98HQgq1dEWqWUzUFMnGxeRpuOfbehCCWbT6+cH+SARNVwUi+/5UPHLxJ58GyXlyy6hMY6IDr6TUmGPG1aXV7A=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0.tgz"; + sha512 = "1Bn4L5jNRm6tlb79YwqYUGGe+Yc9PRoRSJi67NJX6icdhf84+tRMtESbx1zCLL9QixQXu2+7aLkXHxvh4RpqAA=="; }; }; - "@vue/compiler-ssr-3.0.0-rc.13" = { + "@vue/compiler-ssr-3.0.0" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.13.tgz"; - sha512 = "BEVx2BXMJwzpmNI63YDtEMLdnLysMHbBwrapXiX421FwEAL8gwHE0rTc9WgcresegEmDuCmZTi/LnwcEooO+8Q=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0.tgz"; + sha512 = "Er41F9ZFyKB3YnNbE6JSTIGCVWve3NAQimgDOk4uP42OnckxBYKGBTutDeFNeqUZBMu/9vRHYrxlGFC9Z5jBVQ=="; }; }; - "@vue/reactivity-3.0.0-rc.13" = { + "@vue/reactivity-3.0.0" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0-rc.13.tgz"; - sha512 = "I4E9/3ZGejuNfUbpbgtWWDGas3qIGqqvjUeMEuDGbJfaUluZauSKXPRKjfGPz+esmgwvGAWjkcFeyyiYY4RSNQ=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0.tgz"; + sha512 = "mEGkztGQrAPZRhV7C6PorrpT3+NtuA4dY2QjMzzrW31noKhssWTajRZTwpLF39NBRrF5UU6cp9+1I0FfavMgEQ=="; }; }; - "@vue/runtime-core-3.0.0-rc.13" = { + "@vue/runtime-core-3.0.0" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0-rc.13.tgz"; - sha512 = "N5xGV6s/LaXybNt81XdBdil6exMoI1HPd0FeURnmhHfUizI41xq4yrWO+Yi44XO+R8xFcfxYECBaPqk0jPLgsg=="; + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0.tgz"; + sha512 = "3ABMLeA0ZbeVNLbGGLXr+pNUwqXILOqz8WCVGfDWwQb+jW114Cm8djOHVVDoqdvRETQvDf8yHSUmpKHZpQuTkA=="; }; }; - "@vue/runtime-dom-3.0.0-rc.13" = { + "@vue/runtime-dom-3.0.0" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.13.tgz"; - sha512 = "o3Y9qlS3w8gqaj/vc99Z0DA2yETQFH8Q+qvxZstvRTEOYGEzxualIkBpCBXkPEXVSaing3Gbd4wso764RUZjkQ=="; + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0.tgz"; + sha512 = "f312n5w9gK6mVvkDSj6/Xnot1XjlKXzFBYybmoy6ahAVC8ExbQ+LOWti1IZM/adU8VMNdKaw7Q53Hxz3y5jX8g=="; }; }; - "@vue/shared-3.0.0-rc.13" = { + "@vue/shared-3.0.0" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0-rc.13.tgz"; - sha512 = "8zEVHmffW1P8Wlt8P63N+zKJrmzL6y0P2P6biWdl4CI9E5QVKlbOEYl7i+tU/dpa6oLj6nEzBxUCwA7UHvcPkw=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0.tgz"; + sha512 = "4XWL/avABGxU2E2ZF1eZq3Tj7fvksCMssDZUHOykBIMmh5d+KcAnQMC5XHMhtnA0NAvktYsA2YpdsVwVmhWzvA=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -10669,6 +10669,15 @@ let sha512 = "4QYi6Mal4MMfQMSqGIRPGbKIbZygeN83QsWq1ixpUwvtfgAZot5BrCKzGygvZaV+CnELdTwD0S4cqUNozq7/Cw=="; }; }; + "canvas-2.6.1" = { + name = "canvas"; + packageName = "canvas"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/canvas/-/canvas-2.6.1.tgz"; + sha512 = "S98rKsPcuhfTcYbtF53UIJhcbgIAK533d1kJKMwsMwAIFgfd58MOyxRud3kktlzWiEkFliaJtvyZCBtud/XVEA=="; + }; + }; "capital-case-1.0.3" = { name = "capital-case"; packageName = "capital-case"; @@ -14288,6 +14297,168 @@ let sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; }; }; + "d3-array-2.7.1" = { + name = "d3-array"; + packageName = "d3-array"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz"; + sha512 = "dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q=="; + }; + }; + "d3-color-2.0.0" = { + name = "d3-color"; + packageName = "d3-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz"; + sha512 = "SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ=="; + }; + }; + "d3-delaunay-5.3.0" = { + name = "d3-delaunay"; + packageName = "d3-delaunay"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-5.3.0.tgz"; + sha512 = "amALSrOllWVLaHTnDLHwMIiz0d1bBu9gZXd1FiLfXf8sHcX9jrcj81TVZOqD4UX7MgBZZ07c8GxzEgBpJqc74w=="; + }; + }; + "d3-dispatch-2.0.0" = { + name = "d3-dispatch"; + packageName = "d3-dispatch"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-2.0.0.tgz"; + sha512 = "S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA=="; + }; + }; + "d3-dsv-2.0.0" = { + name = "d3-dsv"; + packageName = "d3-dsv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-dsv/-/d3-dsv-2.0.0.tgz"; + sha512 = "E+Pn8UJYx9mViuIUkoc93gJGGYut6mSDKy2+XaPwccwkRGlR+LO97L2VCCRjQivTwLHkSnAJG7yo00BWY6QM+w=="; + }; + }; + "d3-force-2.1.1" = { + name = "d3-force"; + packageName = "d3-force"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-force/-/d3-force-2.1.1.tgz"; + sha512 = "nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew=="; + }; + }; + "d3-format-2.0.0" = { + name = "d3-format"; + packageName = "d3-format"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz"; + sha512 = "Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA=="; + }; + }; + "d3-geo-2.0.1" = { + name = "d3-geo"; + packageName = "d3-geo"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.1.tgz"; + sha512 = "M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A=="; + }; + }; + "d3-geo-projection-3.0.0" = { + name = "d3-geo-projection"; + packageName = "d3-geo-projection"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-3.0.0.tgz"; + sha512 = "1JE+filVbkEX2bT25dJdQ05iA4QHvUwev6o0nIQHOSrNlHCAKfVss/U10vEM3pA4j5v7uQoFdQ4KLbx9BlEbWA=="; + }; + }; + "d3-hierarchy-2.0.0" = { + name = "d3-hierarchy"; + packageName = "d3-hierarchy"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-2.0.0.tgz"; + sha512 = "SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw=="; + }; + }; + "d3-interpolate-2.0.1" = { + name = "d3-interpolate"; + packageName = "d3-interpolate"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz"; + sha512 = "c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ=="; + }; + }; + "d3-path-2.0.0" = { + name = "d3-path"; + packageName = "d3-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-path/-/d3-path-2.0.0.tgz"; + sha512 = "ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA=="; + }; + }; + "d3-quadtree-2.0.0" = { + name = "d3-quadtree"; + packageName = "d3-quadtree"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-2.0.0.tgz"; + sha512 = "b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw=="; + }; + }; + "d3-scale-3.2.2" = { + name = "d3-scale"; + packageName = "d3-scale"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.2.tgz"; + sha512 = "3Mvi5HfqPFq0nlyeFlkskGjeqrR/790pINMHc4RXKJ2E6FraTd3juaRIRZZHyMAbi3LjAMW0EH4FB1WgoGyeXg=="; + }; + }; + "d3-shape-2.0.0" = { + name = "d3-shape"; + packageName = "d3-shape"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-shape/-/d3-shape-2.0.0.tgz"; + sha512 = "djpGlA779ua+rImicYyyjnOjeubyhql1Jyn1HK0bTyawuH76UQRWXd+pftr67H6Fa8hSwetkgb/0id3agKWykw=="; + }; + }; + "d3-time-2.0.0" = { + name = "d3-time"; + packageName = "d3-time"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-time/-/d3-time-2.0.0.tgz"; + sha512 = "2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q=="; + }; + }; + "d3-time-format-3.0.0" = { + name = "d3-time-format"; + packageName = "d3-time-format"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz"; + sha512 = "UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag=="; + }; + }; + "d3-timer-2.0.0" = { + name = "d3-timer"; + packageName = "d3-timer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz"; + sha512 = "TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA=="; + }; + }; "dag-map-1.0.2" = { name = "dag-map"; packageName = "dag-map"; @@ -15179,6 +15350,15 @@ let sha512 = "BLHItGr82rUbHhjMu41d+vw9Md49i81jmZSV00HdTq4t+RTHywmEht/23mNFpUl2YeLYJZJyGz4rdlMAyOxNeg=="; }; }; + "delaunator-4.0.1" = { + name = "delaunator"; + packageName = "delaunator"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/delaunator/-/delaunator-4.0.1.tgz"; + sha512 = "WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag=="; + }; + }; "delay-4.4.0" = { name = "delay"; packageName = "delay"; @@ -33473,15 +33653,6 @@ let sha512 = "LP5F1dhjULEJV5oGRg6ROztH2FddzttrrUEwq5J2GB2Zy938mg0vwt1+Rthn/qqDHtj4Qgq21duNGHh+Ew1wUg=="; }; }; - "oas-resolver-2.4.4" = { - name = "oas-resolver"; - packageName = "oas-resolver"; - version = "2.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.4.4.tgz"; - sha512 = "670+SM5CXYrjI547cgUeQTdB1wJb2gyrJ7bnGywQMrmciKXhXj/EFbE/8c8wed+j1WmGAh7xS+QdQxiuIlNqlw=="; - }; - }; "oas-resolver-2.5.0" = { name = "oas-resolver"; packageName = "oas-resolver"; @@ -41287,6 +41458,15 @@ let sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; }; }; + "rw-1.3.3" = { + name = "rw"; + packageName = "rw"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz"; + sha1 = "3f862dfa91ab766b14885ef4d01124bfda074fb4"; + }; + }; "rwlock-5.0.0" = { name = "rwlock"; packageName = "rwlock"; @@ -47138,6 +47318,15 @@ let sha512 = "ePZfjs1ajL4b8jT4MeVId+9Ci5hJCzAtNIEXIHyFYmKmQuX+eHC/RNv6tuLMUhrGrhJ+sYWW/lBF/LKILHGZEA=="; }; }; + "topojson-client-3.1.0" = { + name = "topojson-client"; + packageName = "topojson-client"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz"; + sha512 = "605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw=="; + }; + }; "topsort-0.0.2" = { name = "topsort"; packageName = "topsort"; @@ -49649,6 +49838,267 @@ let sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b"; }; }; + "vega-5.15.0" = { + name = "vega"; + packageName = "vega"; + version = "5.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega/-/vega-5.15.0.tgz"; + sha512 = "uygUtkZJm3/HNvNGLQSugZld4qvaiOMtH34tOGuS/MSGj7MaP0CLoFrthlas30lyMPQ42UfzX8tk5X+I91dFKQ=="; + }; + }; + "vega-canvas-1.2.4" = { + name = "vega-canvas"; + packageName = "vega-canvas"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.4.tgz"; + sha512 = "BI44AIAa13xSindGXMQm0FAhI2zx3F3conFmXhey63hqGsfvH/19nv+A0PEvSVa/lK4iPneMTpw583iffDiq3w=="; + }; + }; + "vega-crossfilter-4.0.4" = { + name = "vega-crossfilter"; + packageName = "vega-crossfilter"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.0.4.tgz"; + sha512 = "mXKhHxkgxJPwtTrMgK3Uw1bStfD+rmfKXsUvdIh1ZwmpheGOQM2Uflo3tQNh9j9wqu8xHywCcddohKpSRBt8HQ=="; + }; + }; + "vega-dataflow-5.7.2" = { + name = "vega-dataflow"; + packageName = "vega-dataflow"; + version = "5.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.2.tgz"; + sha512 = "O6CEchGAQtEhDKfI3UHWVUbUcXSMsq5JrefvvB2hldx3XbHkEQioXtgAnK6OosyKpB1dJlVvFRMR40pwdNO1hw=="; + }; + }; + "vega-encode-4.8.2" = { + name = "vega-encode"; + packageName = "vega-encode"; + version = "4.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-encode/-/vega-encode-4.8.2.tgz"; + sha512 = "+PEimVqZysvLEScU/EJrpElBrNMcDHeVGmMhLkswxfVrFix4ialV3/iGB9Wcr5g1pOQcsBdNn7qUy2bjvAvIvA=="; + }; + }; + "vega-event-selector-2.0.5" = { + name = "vega-event-selector"; + packageName = "vega-event-selector"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-2.0.5.tgz"; + sha512 = "bRm02Fnd+YrZDni0yr5y9Co1Z1zrjd7hkwY+gi/Y7zDFOxnESGrbYtpHvWT8fL9AqmYU3wDpsJZGyP4htRUNAQ=="; + }; + }; + "vega-expression-2.7.0" = { + name = "vega-expression"; + packageName = "vega-expression"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-expression/-/vega-expression-2.7.0.tgz"; + sha512 = "fMnHtcFfVAxuwjsKGh0qqP8OJNVABGIg0aSp33Jxh1D86LwDwaRe+EtwF1fv8YKD2AEiBl4UObC68QMT56MekQ=="; + }; + }; + "vega-force-4.0.6" = { + name = "vega-force"; + packageName = "vega-force"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-force/-/vega-force-4.0.6.tgz"; + sha512 = "acB5DshAhSbaxKAk/DgzUK4ondTAZbD3tRY4Cy0NmZL+6QqM3RRePM1PQBAFAQMp9kXT9X/fh8tOlMKx/rwQnQ=="; + }; + }; + "vega-format-1.0.3" = { + name = "vega-format"; + packageName = "vega-format"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-format/-/vega-format-1.0.3.tgz"; + sha512 = "hZpYZM/KRNnd+qmJ5oCGHvOzlxga9d2anqw+ji/jbA41piMzsyAa2f8CAoHpXgzsZNkGp+BL2Oya+251uZOjQw=="; + }; + }; + "vega-functions-5.7.3" = { + name = "vega-functions"; + packageName = "vega-functions"; + version = "5.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.7.3.tgz"; + sha512 = "9X9bKhKZvglfRaFIDg2yRyBzayabsQHRAyVk0bJBU04mgfj6myKRhO6JF4av+LgNHyJFsOPeJxkiOYZ3x6Z6rg=="; + }; + }; + "vega-geo-4.3.6" = { + name = "vega-geo"; + packageName = "vega-geo"; + version = "4.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.3.6.tgz"; + sha512 = "miRnxnf3KSgmHMR0H8y3NSg58BnijVtxg508PDrw3T4ARRYxGf5yglcEYFcc06iRYTV3B43pOg0Se5dLowmTEw=="; + }; + }; + "vega-hierarchy-4.0.8" = { + name = "vega-hierarchy"; + packageName = "vega-hierarchy"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.0.8.tgz"; + sha512 = "8O2asfoAEaW8Hfu/06m6t5BErrNo0OJzU8XyKon8aeGY2YbQMKT7fiEzUrzDC39Zb2suThuzBOjpcwiu7rh/Hg=="; + }; + }; + "vega-loader-4.3.2" = { + name = "vega-loader"; + packageName = "vega-loader"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.3.2.tgz"; + sha512 = "g+hd4xCxGP4zlSdvvprDrHTulUN1xB1k63ooqtCzhps3fji7N8DQ3RWPTJZLyuwYpjxim3BYrp4aJk3OHElcaA=="; + }; + }; + "vega-parser-6.0.4" = { + name = "vega-parser"; + packageName = "vega-parser"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.0.4.tgz"; + sha512 = "AxFvM0JgS/hyqlIdcN1B74PRO5cpU9SRRh8wBfirHRkFWPxqfP2EeFmQxisGV5wSqAUVTqqqk0suWQuU3YHPcQ=="; + }; + }; + "vega-projection-1.4.4" = { + name = "vega-projection"; + packageName = "vega-projection"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-projection/-/vega-projection-1.4.4.tgz"; + sha512 = "v1Tx/8khpOmzpscXkxq2+MGjs7jG3A8yFfQJ8kTh8eIko0f5V+QLujTfEvdllYXw6f3DE6K2fYInb71B0GAjIw=="; + }; + }; + "vega-regression-1.0.8" = { + name = "vega-regression"; + packageName = "vega-regression"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.0.8.tgz"; + sha512 = "NdLoDctaxtCKP4udGg2SmplyK8098L8EAFEy/TEECx0wbRcBzPs2e/U4uCShzoPHILFULdOqs+sq/xwhp9X3lA=="; + }; + }; + "vega-runtime-6.1.2" = { + name = "vega-runtime"; + packageName = "vega-runtime"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.2.tgz"; + sha512 = "baaMe8PKynJlJfpcZR4jHDSbTM9TYzU4x/XLphQ/6lZnF9WMH+gGOVlVRWZCLH4K0sgCxBMKC/THOpRFkO6jJA=="; + }; + }; + "vega-scale-7.1.0" = { + name = "vega-scale"; + packageName = "vega-scale"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.1.0.tgz"; + sha512 = "8QgHarFLgnX60DL9h91GNSzvXtBVUfCx57+XKUlCROfHti4KASTRMicBgfJ3lwJBACNefpEW+9ut+1iuIHONwQ=="; + }; + }; + "vega-scenegraph-4.9.1" = { + name = "vega-scenegraph"; + packageName = "vega-scenegraph"; + version = "4.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.1.tgz"; + sha512 = "4OyFlMXwecM7C18zrXeBgckzLaFncLdnj1ExcF3dFfsgPLBSRW2x+eCRQZmD12UHoLFGuehB5s3YNfoQtCP5YA=="; + }; + }; + "vega-selections-5.1.3" = { + name = "vega-selections"; + packageName = "vega-selections"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.3.tgz"; + sha512 = "fy+EBPA3pA3i4IeQ2EUHQI83RZMCS4ZoXu1RI1Oa/CFLu8iXxwraRaD9sUH93GPj4pU22g4ywjbHzsrZ7x4ONg=="; + }; + }; + "vega-statistics-1.7.8" = { + name = "vega-statistics"; + packageName = "vega-statistics"; + version = "1.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.8.tgz"; + sha512 = "JkxS7hkFLOMBgEOfITQ1kisLGuWtJ0gAhxQ1OmuIx5Un9yyFY3+hk8HSgeZHwIPktsV+2Bx5aPUHES85YzBD/Q=="; + }; + }; + "vega-time-2.0.3" = { + name = "vega-time"; + packageName = "vega-time"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-time/-/vega-time-2.0.3.tgz"; + sha512 = "LXsB5Ej56jcDRvoWHp1YegNuZSD+cFWGBEWobRXbigmRNDfa4HGmzUon46G+KBj+VeRRGeu5Zq4LSG2goWmIYw=="; + }; + }; + "vega-transforms-4.9.2" = { + name = "vega-transforms"; + packageName = "vega-transforms"; + version = "4.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.9.2.tgz"; + sha512 = "vDI8jJOlnswSuEf6BekI04jWNttgOLzDRONaWZGTH8X5yI3GgkB4Ts45U0LayRExQSq7gxt95k/02jXGGzOTpA=="; + }; + }; + "vega-typings-0.18.2" = { + name = "vega-typings"; + packageName = "vega-typings"; + version = "0.18.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.18.2.tgz"; + sha512 = "t7PAmcqPUmSV44l2NVJOoblhomPlgjO7rxAUs/HXnmyVbGHI+6ulUPjGBWWZU1ebu09T+SYazAwjr6lAd2CHgQ=="; + }; + }; + "vega-util-1.15.1" = { + name = "vega-util"; + packageName = "vega-util"; + version = "1.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-util/-/vega-util-1.15.1.tgz"; + sha512 = "kEbRQiVUP42dyou2LF8I+3TlBtk4TODTlnLzdSoI//uahXvDnz1ulfprWljfcHPbVjziObaFNWkpT56oSMTx+g=="; + }; + }; + "vega-view-5.8.2" = { + name = "vega-view"; + packageName = "vega-view"; + version = "5.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-view/-/vega-view-5.8.2.tgz"; + sha512 = "d+u5FGs3t7LUVRoGimvroHkbO2orrtJMUt2P8UVu4alMdDcgZUSmwOZWc/gMkBGlWD8P9q7832xTWdJ3gSXL4A=="; + }; + }; + "vega-view-transforms-4.5.7" = { + name = "vega-view-transforms"; + packageName = "vega-view-transforms"; + version = "4.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.7.tgz"; + sha512 = "dcrEHJL/+KPAe7Eq4Me7rq5+O13yWL1X/n3Fu6xKGL2TnBSBy4WVla+WFBdD82GRIU0Fi5DFkL/dE3cTeitvag=="; + }; + }; + "vega-voronoi-4.1.4" = { + name = "vega-voronoi"; + packageName = "vega-voronoi"; + version = "4.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.1.4.tgz"; + sha512 = "z5aAprA9XbdKZ2oAs1tWR9Cw+W9LQJZCn9kH+x6VmnqiVhCbMZPDoZK9sIgso163RDF9Fdu+0zLXX58l+AjzWA=="; + }; + }; + "vega-wordcloud-4.1.2" = { + name = "vega-wordcloud"; + packageName = "vega-wordcloud"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.2.tgz"; + sha512 = "LZzqaRuE0bR9x9e9dLax6GYnUO+MtJhGx5fRk4F0Q8+X2f0u/BfOyMG459tnbyZQIy9SP8ZBLBlkp+ujmK8XXQ=="; + }; + }; "vendors-1.0.4" = { name = "vendors"; packageName = "vendors"; @@ -50396,13 +50846,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.0-rc.13" = { + "vue-3.0.0" = { name = "vue"; packageName = "vue"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.0-rc.13.tgz"; - sha512 = "xCW8EAVSMdU7z+3BWBFV9hO36Tg6vN25fYN6agC6/z/3JlAyo0hVqQtqmGaDAHVlO110rPowfkGIWqStPhTdcw=="; + url = "https://registry.npmjs.org/vue/-/vue-3.0.0.tgz"; + sha512 = "ZMrAARZ32sGIaYKr7Fk2GZEBh/VhulSrGxcGBiAvbN4fhjl3tuJyNFbbbLFqGjndbLoBW66I2ECq8ICdvkKdJw=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -54417,24 +54867,24 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.6" sources."@vue/cli-ui-addon-widgets-4.5.6" - (sources."@vue/compiler-core-3.0.0-rc.13" // { + (sources."@vue/compiler-core-3.0.0" // { dependencies = [ sources."@babel/types-7.11.5" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.0.0-rc.13" - (sources."@vue/compiler-sfc-3.0.0-rc.13" // { + sources."@vue/compiler-dom-3.0.0" + (sources."@vue/compiler-sfc-3.0.0" // { dependencies = [ sources."@babel/types-7.11.5" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.0.0-rc.13" - sources."@vue/reactivity-3.0.0-rc.13" - sources."@vue/runtime-core-3.0.0-rc.13" - sources."@vue/runtime-dom-3.0.0-rc.13" - sources."@vue/shared-3.0.0-rc.13" + sources."@vue/compiler-ssr-3.0.0" + sources."@vue/reactivity-3.0.0" + sources."@vue/runtime-core-3.0.0" + sources."@vue/runtime-dom-3.0.0" + sources."@vue/shared-3.0.0" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -55863,7 +56313,7 @@ in (sources."vue-codemod-0.0.4" // { dependencies = [ sources."globby-10.0.2" - sources."vue-3.0.0-rc.13" + sources."vue-3.0.0" ]; }) sources."watch-1.0.2" @@ -66690,7 +67140,7 @@ in sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.0" - sources."oas-resolver-2.4.4" + sources."oas-resolver-2.5.0" sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."oauth-sign-0.9.0" @@ -81823,10 +82273,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.14.1.tgz"; - sha512 = "8UGSiSRXw2I8grlN2mbu7WuJbekZiPKWqbB2/nRzg+ifdB7gxKFs7G4J+GPxHNOqJdMIuuXFbu8OdzmVzx8R0g=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.14.2.tgz"; + sha512 = "4dLL/PvePCi4GvI88OjcT1lERIj4jpspXeUvivkYvGxI2NypkmrADuxa32Y3kIZ0D+bAM2ZR6MyOqAyztmRKcg=="; }; dependencies = [ sources."isexe-2.0.0" @@ -90372,6 +90822,195 @@ in bypassCache = true; reconstructLock = true; }; + vega-cli = nodeEnv.buildNodePackage { + name = "vega-cli"; + packageName = "vega-cli"; + version = "5.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.15.0.tgz"; + sha512 = "1Mv7+T84L6EIPIsC3fslhywNDfguy135EN4uAcFCWhErQXG3yzel2gNyvlsA0ixTAi5oG7mFL6ftkTB6r2CzIw=="; + }; + dependencies = [ + sources."@types/color-name-1.1.1" + sources."abbrev-1.1.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-4.2.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."camelcase-5.3.1" + sources."canvas-2.6.1" + sources."chownr-1.1.4" + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-2.20.3" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."d3-array-2.7.1" + sources."d3-color-2.0.0" + sources."d3-delaunay-5.3.0" + sources."d3-dispatch-2.0.0" + sources."d3-dsv-2.0.0" + sources."d3-force-2.1.1" + sources."d3-format-2.0.0" + sources."d3-geo-2.0.1" + sources."d3-geo-projection-3.0.0" + sources."d3-hierarchy-2.0.0" + sources."d3-interpolate-2.0.1" + sources."d3-path-2.0.0" + sources."d3-quadtree-2.0.0" + sources."d3-scale-3.2.2" + sources."d3-shape-2.0.0" + sources."d3-time-2.0.0" + sources."d3-time-format-3.0.0" + sources."d3-timer-2.0.0" + sources."debug-3.2.6" + sources."decamelize-1.2.0" + sources."decompress-response-4.2.1" + sources."deep-extend-0.6.0" + sources."delaunator-4.0.1" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."emoji-regex-8.0.0" + sources."find-up-4.1.0" + sources."fs-minipass-1.2.7" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."get-caller-file-2.0.5" + sources."glob-7.1.6" + sources."has-unicode-2.0.1" + sources."iconv-lite-0.4.24" + sources."ignore-walk-3.0.3" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-1.0.0" + sources."locate-path-5.0.0" + sources."mimic-response-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."nan-2.14.1" + sources."needle-2.5.2" + sources."node-fetch-2.6.1" + sources."node-pre-gyp-0.11.0" + sources."nopt-4.0.3" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-1.4.8" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" + sources."process-nextick-args-2.0.1" + sources."rc-1.2.8" + sources."readable-stream-2.3.7" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-1.17.0" + sources."rimraf-2.7.1" + sources."rw-1.3.3" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.3" + sources."simple-concat-1.0.1" + sources."simple-get-3.1.0" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-4.4.13" + sources."topojson-client-3.1.0" + sources."util-deprecate-1.0.2" + sources."vega-5.15.0" + sources."vega-canvas-1.2.4" + sources."vega-crossfilter-4.0.4" + sources."vega-dataflow-5.7.2" + sources."vega-encode-4.8.2" + sources."vega-event-selector-2.0.5" + sources."vega-expression-2.7.0" + sources."vega-force-4.0.6" + sources."vega-format-1.0.3" + sources."vega-functions-5.7.3" + sources."vega-geo-4.3.6" + sources."vega-hierarchy-4.0.8" + sources."vega-loader-4.3.2" + sources."vega-parser-6.0.4" + sources."vega-projection-1.4.4" + sources."vega-regression-1.0.8" + sources."vega-runtime-6.1.2" + sources."vega-scale-7.1.0" + sources."vega-scenegraph-4.9.1" + sources."vega-selections-5.1.3" + sources."vega-statistics-1.7.8" + sources."vega-time-2.0.3" + sources."vega-transforms-4.9.2" + sources."vega-typings-0.18.2" + sources."vega-util-1.15.1" + sources."vega-view-5.8.2" + sources."vega-view-transforms-4.5.7" + sources."vega-voronoi-4.1.4" + sources."vega-wordcloud-4.1.2" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + (sources."wrap-ansi-6.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."wrappy-1.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."yargs-parser-18.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Command line utilities for server-side Vega."; + homepage = "https://github.com/vega/vega#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; @@ -94624,10 +95263,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.10.1"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.1.tgz"; - sha512 = "R9SEt/nWTuZ8weB040L7yyaIVARlZ0ian1Kv6ptu4+xyVlIMobTZXaBTtgyhlMWqcQ3BpsAZu4q/2plRVG3tLQ=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.11.0.tgz"; + sha512 = "tAEVZvlNLhmF2NLzhOm6UnejjPUp/iiEdxDLdP1Cm3M2YOJ7QLwrYtr0lzoNLLxQkzJwXmuBX01idECTWln82g=="; }; dependencies = [ sources."agent-base-4.3.0" From af9f04db793d6355a0f8fe27bbf83addeec2e11e Mon Sep 17 00:00:00 2001 From: Serval Date: Sat, 19 Sep 2020 20:28:59 +0800 Subject: [PATCH 345/463] v2ray: 4.27.5 -> 4.28.2 --- pkgs/tools/networking/v2ray/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index bc8a0873f78..fac43cabab8 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.27.5"; + version = "4.28.2"; src = fetchFromGitHub { owner = "v2ray"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "168kz8hq7mcfy6h758mmrky550p04bi9jsfqhy67jcxq81874m2k"; + sha256 = "0q2gpnx7nrnrdkc8fq1ghbki8yyh11hs5bw8rb48jsrnigrg73b8"; }; - vendorSha256 = "0m889byxw70vv1mzlivalq444byp0y182nqqzdr458gfifvpc7s7"; + vendorSha256 = "1ghpb5ijpmmq1qysjifj6ss1zk1h2l55r6w7l4a01bp8sxncxarc"; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202009020005"; - geoipSha256 = "1xsy678cpqv6ycnhzl3pms76ic40aggq46q9dsd5ghj94mcx9837"; + geoipRev = "202009160005"; + geoipSha256 = "00hilqqnpfyvxxaiamwmkdpzid763xgig1vk4rxv76npwyixsmj4"; in fetchurl { url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20200901194123"; - geositeSha256 = "0fjx1wrq14d9v326k4fjwca3h5nv8ghk11kprf6jkjncjszwvgby"; + geositeRev = "20200918144814"; + geositeSha256 = "08zdw20wdksp96436j3my145qvyvr9a15lj8j4wdagr64iap5nx7"; in fetchurl { url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; From 5a59522f2b6e22eb6ca3c9d2b1a9ea0057b2b906 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:31:12 +0200 Subject: [PATCH 346/463] closurecompiler: use jre8 --- 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 0ae5f8a3a58..a5286cf23d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8549,7 +8549,9 @@ in clean = callPackage ../development/compilers/clean { }; - closurecompiler = callPackage ../development/compilers/closure { }; + closurecompiler = callPackage ../development/compilers/closure { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; cmdstan = callPackage ../development/compilers/cmdstan { }; From 5092ae7f5de772bf0b05e9558f5ba4abf5643735 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:31:42 +0200 Subject: [PATCH 347/463] emscripten: use jre8 --- 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 a5286cf23d3..73aafb27e75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3422,7 +3422,9 @@ in choose = callPackage ../tools/text/choose { }; - emscripten = callPackage ../development/compilers/emscripten { }; + emscripten = callPackage ../development/compilers/emscripten { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); From db0d3d8d365dccf826223d753dd9234aa643a074 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:34:49 +0200 Subject: [PATCH 348/463] erlang: use openjdk8 --- pkgs/development/interpreters/erlang/generic-builder.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index a53a917b7b3..18b658ae37c 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,6 +1,7 @@ { pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused , libxml2, libxslt, ncurses, openssl, perl, autoconf -, openjdk ? null # javacSupport +# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731 +, openjdk8 ? null # javacSupport , unixODBC ? null # odbcSupport , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport , parallelBuild ? false @@ -17,7 +18,7 @@ , enableThreads ? true , enableSmpSupport ? true , enableKernelPoll ? true -, javacSupport ? false, javacPackages ? [ openjdk ] +, javacSupport ? false, javacPackages ? [ openjdk8 ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] , wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" @@ -36,7 +37,7 @@ assert wxSupport -> (if stdenv.isDarwin else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk != null; +assert javacSupport -> openjdk8 != null; let inherit (stdenv.lib) optional optionals optionalAttrs optionalString; From 9426f615abcfe88ea7fc758e823840326753af45 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:36:16 +0200 Subject: [PATCH 349/463] mysql-workbench: use jre8 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73aafb27e75..d5cb3723f48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27216,6 +27216,7 @@ in gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};}; mysql = mysql; pcre = pcre-cpp; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); r128gain = callPackage ../applications/audio/r128gain { }; From 9a2d749b41726d10418b1a5ba54967d7fcbba00c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:39:11 +0200 Subject: [PATCH 350/463] polymake: use openjdk8 --- 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 d5cb3723f48..1ffe87d46dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22670,7 +22670,9 @@ in pommed_light = callPackage ../os-specific/linux/pommed-light {}; - polymake = callPackage ../applications/science/math/polymake { }; + polymake = callPackage ../applications/science/math/polymake { + openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; pond = callPackage ../applications/networking/instant-messengers/pond { }; From a1d10379b57c8fa9ca6c47dbd369d74f862eb413 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:49:55 +0200 Subject: [PATCH 351/463] elasticsearch: use jre8_headless --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ffe87d46dc..22a4f335958 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3443,17 +3443,21 @@ in elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { enableUnfree = false; utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { enableUnfree = false; utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch = elasticsearch6; elasticsearch-oss = elasticsearch6-oss; From 230bdb0c7d03b170df6fff021ae7d919a8c3aee0 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:50:52 +0200 Subject: [PATCH 352/463] mozart2: use jre8_headless --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22a4f335958..2ed065c0eeb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9502,6 +9502,7 @@ in mozart2 = callPackage ../development/compilers/mozart { emacs = emacs-nox; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; From 85ead32f5c2868a692cf3f7207dd8f211f9503a5 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:51:32 +0200 Subject: [PATCH 353/463] foundationdb: use openjdk8 --- 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 2ed065c0eeb..6e3fb9d7cfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3825,7 +3825,9 @@ in fusuma = callPackage ../tools/inputmethods/fusuma {}; - fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { }); + fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { + openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }); inherit (fdbPackages) foundationdb51 From 390a3bdd03ddae3a5cb3e5ae6167736579ccae05 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:52:32 +0200 Subject: [PATCH 354/463] abcl: use jdk8 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e3fb9d7cfb..bf1f4187622 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8396,7 +8396,10 @@ in ### DEVELOPMENT / COMPILERS - abcl = callPackage ../development/compilers/abcl {}; + abcl = callPackage ../development/compilers/abcl { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix; adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix; From d6f90eddb29be437991e608c821209b75221917a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:53:26 +0200 Subject: [PATCH 355/463] perlPackages.InlineJava: use jdk8 --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dcdb0e699d6..f1c9da714ba 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10230,7 +10230,8 @@ let propagatedBuildInputs = [ Inline ]; - makeMakerFlags = "J2SDK=${pkgs.jdk}"; + # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 + makeMakerFlags = "J2SDK=${pkgs.jdk8}"; # FIXME: Apparently tests want to access the network. doCheck = false; From 5ad9f732520ca262fe15d3338000f9a065146d5a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:55:51 +0200 Subject: [PATCH 356/463] cvc4: use jdk8 --- 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 bf1f4187622..b0157e37fcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26197,7 +26197,9 @@ in cvc3 = callPackage ../applications/science/logic/cvc3 { gmp = lib.overrideDerivation gmp (a: { dontDisableStatic = true; }); }; - cvc4 = callPackage ../applications/science/logic/cvc4 {}; + cvc4 = callPackage ../applications/science/logic/cvc4 { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; drat-trim = callPackage ../applications/science/logic/drat-trim {}; From 60078b46628bd73e57f133b7dc290ae591551dcf Mon Sep 17 00:00:00 2001 From: sohalt Date: Sat, 19 Sep 2020 14:58:07 +0200 Subject: [PATCH 357/463] sonic-lineup: 1.0.1 -> 1.1, fix build --- pkgs/applications/audio/sonic-lineup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index b837eb07cf1..526dd245691 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sonic-lineup"; - version = "1.0.1"; + version = "1.1"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/2610/${pname}-${version}.tar.gz"; - sha256 = "0w4v5zr81d8fh97y820r0vj1rrbl0kwgvhfkdnyl4hiabs97b1i7"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2765/${pname}-${version}.tar.gz"; + sha256 = "0k45k9fawcm4s5yy05x00pgww7j8m7k2cxcc7g0fn9vqy7vcbq9h"; }; buildInputs = From d10716e1dce8eed637da9fbd446e746b8b0dbf97 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 14:58:15 +0200 Subject: [PATCH 358/463] collectd: use jdk8 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0157e37fcf..95152222477 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2766,6 +2766,7 @@ in collectd = callPackage ../tools/system/collectd { libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; collectd-data = callPackage ../tools/system/collectd/data.nix { }; From 67ff41201fb339f341a55da49ae7adbaa89453b6 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:05:02 +0200 Subject: [PATCH 359/463] leo3: fix executable --- pkgs/applications/science/logic/leo3/binary.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix index dcea9c27acb..29a9adf94c4 100644 --- a/pkgs/applications/science/logic/leo3/binary.nix +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { mkdir -p "$out"/{bin,lib/java/leo3} cp "${jar}" "$out/lib/java/leo3/leo3.jar" echo "#!${runtimeShell}" > "$out/bin/leo3" - echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" > "$out/bin/leo3" + echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" >> "$out/bin/leo3" chmod a+x "$out/bin/leo3" ''; From c138ef99a3926bc7bad20d3a3e8aecd09a9ec152 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:06:48 +0200 Subject: [PATCH 360/463] jing-trang: use jdk8 --- 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 95152222477..7babe122403 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4675,7 +4675,9 @@ in jid = callPackage ../development/tools/jid { }; jing = res.jing-trang; - jing-trang = callPackage ../tools/text/xml/jing-trang { }; + jing-trang = callPackage ../tools/text/xml/jing-trang { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; jira-cli = callPackage ../development/tools/jira_cli { }; From 7887690d3ef7f516e38aebbf6bb91a786dab1db8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:07:56 +0200 Subject: [PATCH 361/463] freetts: use jdk8 --- 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 7babe122403..029c8f70874 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12384,7 +12384,9 @@ in freeimage = callPackage ../development/libraries/freeimage { }; - freetts = callPackage ../development/libraries/freetts { }; + freetts = callPackage ../development/libraries/freetts { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; frog = res.languageMachines.frog; From 2ecc520aa845b7f36355574d06a771b5dc4da99e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:25:19 +0200 Subject: [PATCH 362/463] xtreemfs: use jdk8 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 029c8f70874..c470a21c3f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8185,6 +8185,7 @@ in xtreemfs = callPackage ../tools/filesystems/xtreemfs { boost = boost165; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; xurls = callPackage ../tools/text/xurls {}; From 6784e7ec754cf343f14a054d22f9dcaee8a05ae7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:29:19 +0200 Subject: [PATCH 363/463] steam: use jdk8 --- pkgs/games/steam/fhsenv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 2c8063d4a05..32acef9757b 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -35,7 +35,7 @@ let # Steam VR procps usbutils - ] ++ lib.optional withJava jdk + ] ++ lib.optional withJava jdk8 # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 ++ lib.optional withPrimus primus ++ extraPkgs pkgs; From 204c3fccdc6d6fd161e5c837be04a6947053bd19 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:29:24 +0200 Subject: [PATCH 364/463] kodi: use jre8 --- pkgs/top-level/all-packages.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c470a21c3f1..1d11f943072 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24176,11 +24176,19 @@ in gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { }; + kodiPlain = callPackage ../applications/video/kodi { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; }; + kodiPlainWayland = callPackage ../applications/video/kodi { + useWayland = true; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - kodiGBM = callPackage ../applications/video/kodi { useGbm = true; }; + kodiGBM = callPackage ../applications/video/kodi { + useGbm = true; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); From b0b605b2f03ebe37690a5bc9900a241ac4c1cc07 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:30:06 +0200 Subject: [PATCH 365/463] awstats: use jdk8 --- 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 1d11f943072..55a251399cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1249,7 +1249,9 @@ in aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { }; - awstats = callPackage ../tools/system/awstats { }; + awstats = callPackage ../tools/system/awstats { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; awsweeper = callPackage ../tools/admin/awsweeper { }; From 96720c904a4db785e8586a77712e266ad1e75c44 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:30:56 +0200 Subject: [PATCH 366/463] rstudio: use jdk8 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55a251399cc..2a1facde46c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23003,6 +23003,7 @@ in rstudio = libsForQt514.callPackage ../applications/editors/rstudio { boost = boost166; llvmPackages = llvmPackages_7; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); From a47b5111874735ffe6a430796f4e86b4034549a1 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:32:16 +0200 Subject: [PATCH 367/463] zookeeper: use jre8 --- 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 2a1facde46c..4dfd7b14141 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17191,7 +17191,9 @@ in xinetd = callPackage ../servers/xinetd { }; - zookeeper = callPackage ../servers/zookeeper { }; + zookeeper = callPackage ../servers/zookeeper { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; From f5ac140ce7291b15199a1868bf75b2db75ec827d Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:34:11 +0200 Subject: [PATCH 368/463] gradle: use jdk8 --- 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 4dfd7b14141..b5ee127db83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11085,7 +11085,7 @@ in gputils = callPackage ../development/tools/misc/gputils { }; gradleGen = callPackage ../development/tools/build-managers/gradle { - java = jdk; + java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 }; gradle = res.gradleGen.gradle_latest; gradle_4_10 = res.gradleGen.gradle_4_10; From a609d7ed1f82bbf1bf6e29a2d6023a9c15b2da09 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:34:26 +0200 Subject: [PATCH 369/463] pdftk: use jre8 --- 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 b5ee127db83..349a36db4fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22568,7 +22568,9 @@ in }; pdfcpu = callPackage ../applications/graphics/pdfcpu { }; - pdftk = callPackage ../tools/typesetting/pdftk { }; + pdftk = callPackage ../tools/typesetting/pdftk { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; pdftk-legacy = lowPrio (callPackage ../tools/typesetting/pdftk/legacy.nix { }); pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; From e5ae2a019fffed513efd108f946e2d02b2db2466 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:35:45 +0200 Subject: [PATCH 370/463] gephi: use jdk8 --- 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 349a36db4fb..727a348c2b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12452,7 +12452,9 @@ in gecode_6 = qt5.callPackage ../development/libraries/gecode { }; gecode = gecode_6; - gephi = callPackage ../applications/science/misc/gephi { }; + gephi = callPackage ../applications/science/misc/gephi { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; gegl = callPackage ../development/libraries/gegl { inherit (darwin.apple_sdk.frameworks) OpenGL; From d74d629fffcc6e730ed16ef0039abea1c1b68d91 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:36:35 +0200 Subject: [PATCH 371/463] javaPackages.jogl_2_3_2: use jdk8 --- pkgs/development/java-modules/jogl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index 574629d8efd..d4e5f1b62bf 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }: +{ stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }: { jogl_2_3_2 = @@ -28,7 +28,8 @@ -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \; ''; - nativeBuildInputs = [ jdk ant git ]; + # TODO: upgrade to jdk https://github.com/NixOS/nixpkgs/pull/89731 + nativeBuildInputs = [ jdk8 ant git ]; buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ]; buildPhase = '' From b94338be057465081ffae216c0c303c98c571285 Mon Sep 17 00:00:00 2001 From: MetaDark Date: Sat, 19 Sep 2020 09:37:15 -0400 Subject: [PATCH 372/463] protontricks: 1.4.1 -> 1.4.2 Formatted with nixpkgs-fmt --- .../protontricks/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index fe7f41c4d08..02bc599f47d 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -1,18 +1,24 @@ -{ stdenv, lib, buildPythonApplication, fetchFromGitHub -, setuptools_scm, vdf -, wine, winetricks, zenity +{ stdenv +, lib +, buildPythonApplication +, fetchFromGitHub +, setuptools_scm +, vdf +, wine +, winetricks +, zenity , pytest }: buildPythonApplication rec { pname = "protontricks"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "083ncg6yjd7s3dx91zd52w166x709mnxknwwr78ggka8d8vlyi0b"; + sha256 = "0ri4phi1rna9snrxa6gl23walyack09mgax7zpjqfpxivwls3ach"; }; # Fix interpreter in mock run.sh for tests @@ -47,7 +53,7 @@ buildPythonApplication rec { description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; homepage = "https://github.com/Matoking/protontricks"; license = licenses.gpl3; - platforms = with platforms; linux; maintainers = with maintainers; [ metadark ]; + platforms = platforms.linux; }; } From d066d52ed588b1e060fda2b85e4a711b560c7e3c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:37:51 +0200 Subject: [PATCH 373/463] cassandra: use jre8 --- pkgs/top-level/all-packages.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 727a348c2b3..10804a28f39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16293,10 +16293,18 @@ in cadvisor = callPackage ../servers/monitoring/cadvisor { }; - cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { }; - cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { }; - cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { }; - cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { }; + cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; cassandra = cassandra_3_11; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { From 2c6535887c4c3468477043670bb70050077cf829 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:38:51 +0200 Subject: [PATCH 374/463] apacheKafka*: use jre8 --- pkgs/servers/apache-kafka/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index a8baefa98ea..337e6c2a875 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, gnugrep, gnused, ps, +{ stdenv, fetchurl, jre8, makeWrapper, bash, coreutils, gnugrep, gnused, ps, majorVersion ? "1.0" }: let @@ -54,6 +54,8 @@ let sha256 = "1vng5ipkjzqy0wijc706w2m1rjl5d0nsgbxiacci739y1jmjnn5r"; }; }; + + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 in with versionMap.${majorVersion}; From bf97938f50bd9dfcd2d5db1b24b003fb65fe1e92 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:39:25 +0200 Subject: [PATCH 375/463] apache-jena*: use jdk8 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10804a28f39..a4d8e870120 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16308,11 +16308,11 @@ in cassandra = cassandra_3_11; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { - java = jdk; + java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; apache-jena-fuseki = callPackage ../servers/nosql/apache-jena/fuseki-binary.nix { - java = jdk; + java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; apcupsd = callPackage ../servers/apcupsd { }; From 7533579fedf42b9a78b6f9b786d69a693d5b08d4 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:41:24 +0200 Subject: [PATCH 376/463] sweethome3d: use jdk8 --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4d8e870120..733756789cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23179,8 +23179,13 @@ in linuxstopmotion = callPackage ../applications/video/linuxstopmotion { }; - sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { }) + sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }) // (callPackage ../applications/misc/sweethome3d/editors.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 sweethome3dApp = sweethome3d.application; }) ); From 3aab81d3d182b7c355c993ec8d7a09558283a2b0 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:42:41 +0200 Subject: [PATCH 377/463] tlaplus: use jre8 --- 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 733756789cc..e3fe772cf8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26369,7 +26369,9 @@ in z3 = callPackage ../applications/science/logic/z3 { python = python2; }; z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {}; - tlaplus = callPackage ../applications/science/logic/tlaplus {}; + tlaplus = callPackage ../applications/science/logic/tlaplus { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; From d3609a65ce0200b78511361122eb0f5ed7af948f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:43:17 +0200 Subject: [PATCH 378/463] rhino: use jdk8 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3fe772cf8b..67abda41acf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15208,8 +15208,8 @@ in resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { - javac = jdk; - jvm = jre; + javac = jdk8; + jvm = jre8; }; rlog = callPackage ../development/libraries/rlog { }; From 59f0ec77163da98f477c6d7df74a1d103b870f27 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:44:41 +0200 Subject: [PATCH 379/463] elasticmq*: use jdk8 --- pkgs/top-level/all-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67abda41acf..448459d74c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16416,9 +16416,14 @@ in biboumi = callPackage ../servers/xmpp/biboumi { }; - elasticmq = callPackage ../servers/elasticmq { }; + elasticmq = callPackage ../servers/elasticmq { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { }; + elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; eventstore = callPackage ../servers/nosql/eventstore { Nuget = dotnetPackages.Nuget; From 8b8a4a1ebe4c56b07c68feb9c6ece2b3aa846adc Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:45:51 +0200 Subject: [PATCH 380/463] i2p: use jdk8 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 448459d74c6..c37ee1658e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4479,7 +4479,10 @@ in i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; - i2p = callPackage ../tools/networking/i2p {}; + i2p = callPackage ../tools/networking/i2p { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; i2pd = callPackage ../tools/networking/i2pd { }; From d7aae610fd7732e02e8fb070c29c914fa988b5b1 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:48:01 +0200 Subject: [PATCH 381/463] hadoop: use jre8 --- 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 c37ee1658e0..eea5bc19900 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9996,7 +9996,9 @@ in guile = guile_2_2; - inherit (callPackages ../applications/networking/cluster/hadoop { }) + inherit (callPackages ../applications/networking/cluster/hadoop { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }) hadoop_2_7 hadoop_2_8 hadoop_2_9 From 92c406d41f1d8f74214227f91575090b22b9cf43 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:48:52 +0200 Subject: [PATCH 382/463] belle-sip: use jre8 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eea5bc19900..eecf6faeb27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11940,6 +11940,7 @@ in belle-sip = callPackage ../development/libraries/belle-sip { stdenv = gcc8Stdenv; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; libbfd = callPackage ../development/libraries/libbfd { }; From 3f3430072a5cdb140dc917fd6e1005945545cbe1 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:52:45 +0200 Subject: [PATCH 383/463] arduino: use jdk8 --- 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 eecf6faeb27..c887f550cbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -743,7 +743,9 @@ in arduino-cli = callPackage ../development/arduino/arduino-cli { }; - arduino-core = callPackage ../development/arduino/arduino-core { }; + arduino-core = callPackage ../development/arduino/arduino-core { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; arduino-mk = callPackage ../development/arduino/arduino-mk {}; From d48b03d237a735b49925fff81158b90df3559005 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 15:53:34 +0200 Subject: [PATCH 384/463] alloy*: use jre8 --- 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 c887f550cbc..2618b2053ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10481,7 +10481,9 @@ in adtool = callPackage ../tools/admin/adtool { }; - inherit (callPackage ../development/tools/alloy { }) + inherit (callPackage ../development/tools/alloy { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }) alloy4 alloy5 alloy; From 6efb7252f5b63b2b1bd181b2a4dd9831334366eb Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 16:11:57 +0200 Subject: [PATCH 385/463] avian: use jdk8 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2618b2053ca..5a673d63932 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8490,6 +8490,7 @@ in avian = callPackage ../development/compilers/avian { inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; bigloo = callPackage ../development/compilers/bigloo { }; From 0f14a327a05dc56287e13bf9e8f636b643720044 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 16:13:16 +0200 Subject: [PATCH 386/463] buck: use jdk8 --- 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 5a673d63932..861d055df5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10685,7 +10685,9 @@ in wxGTK = wxGTK30; }; - buck = callPackage ../development/tools/build-managers/buck { }; + buck = callPackage ../development/tools/build-managers/buck { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; buildkite-agent = buildkite-agent3; buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; From bd54f5d77bf951a88a795f98e56443e256e3db3c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 16:13:41 +0200 Subject: [PATCH 387/463] axoloti: use jdk8 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 861d055df5d..38ed0b148eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1264,6 +1264,7 @@ in axoloti = callPackage ../applications/audio/axoloti { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { }; libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix { From 5f4e8aed48b2ffd9a95086236d68278067b8cd41 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 16:14:47 +0200 Subject: [PATCH 388/463] freemind: use jdk8 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38ed0b148eb..471693d369c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20762,7 +20762,10 @@ in python3Packages = python37Packages; }; - freemind = callPackage ../applications/misc/freemind { }; + freemind = callPackage ../applications/misc/freemind { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; freenet = callPackage ../applications/networking/p2p/freenet { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 From 0db2aa49a07a8593a5e256ff8e5e470406487a75 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 16:15:38 +0200 Subject: [PATCH 389/463] java-service-wrapper: use jdk8 --- 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 471693d369c..883fa6c7cc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9322,7 +9322,9 @@ in jasmin = callPackage ../development/compilers/jasmin { }; - java-service-wrapper = callPackage ../tools/system/java-service-wrapper { }; + java-service-wrapper = callPackage ../tools/system/java-service-wrapper { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; From 259316e514051a271b37682314b7b75b854c565f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 16:16:55 +0200 Subject: [PATCH 390/463] libmatthew_java: use jdk8 --- 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 883fa6c7cc8..69ada5a1824 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13891,7 +13891,9 @@ in guile = guile_2_0; }; - libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { }; + libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; libmatroska = callPackage ../development/libraries/libmatroska { }; From 42ecb331554a7fc8826875a3867f74c9a114a33f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 16:18:31 +0200 Subject: [PATCH 391/463] hdf_java, hdfview: use jdk8 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69ada5a1824..49d5a90aa55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4394,11 +4394,11 @@ in })); hdfview = callPackage ../tools/misc/hdfview { - javac = jdk; + javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 }; hdf_java = callPackage ../tools/misc/hdfjava { - javac = jdk; + javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 }; hecate = callPackage ../applications/editors/hecate { }; From cdeae180359acf52b02c15c0758aeee5537a2ccc Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 16:23:21 +0200 Subject: [PATCH 392/463] projectlibre: use jdk8 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49d5a90aa55..b3eed77103f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6420,7 +6420,10 @@ in profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; - projectlibre = callPackage ../applications/misc/projectlibre { }; + projectlibre = callPackage ../applications/misc/projectlibre { + jre = jre8; + jdk = jdk8; + }; projectm = libsForQt5.callPackage ../applications/audio/projectm { }; From 0a1ffc28f8e2853c8272a0679ee119448f6f210a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 16:27:05 +0200 Subject: [PATCH 393/463] scalafix: use jdk8 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3eed77103f..8eaad3ec5f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9772,7 +9772,10 @@ in metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { }; - scalafix = callPackage ../development/tools/scalafix { }; + scalafix = callPackage ../development/tools/scalafix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; scalafmt = callPackage ../development/tools/scalafmt { }; sdcc = callPackage ../development/compilers/sdcc { From 4044eb04e311caf5c84a031503c3accb28a7bded Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 16:28:27 +0200 Subject: [PATCH 394/463] rabbitmq-java-client: use jdk8 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8eaad3ec5f8..12ea56b5890 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15162,7 +15162,10 @@ in range-v3 = callPackage ../development/libraries/range-v3 {}; - rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; + rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; rapidcheck = callPackage ../development/libraries/rapidcheck {}; From 5c542d1caff425d4c44e8230851b9a6cadb21678 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 16:33:10 +0200 Subject: [PATCH 395/463] vuze: use jdk8 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12ea56b5890..82742e7f538 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23930,7 +23930,10 @@ in vue = callPackage ../applications/misc/vue { }; - vuze = callPackage ../applications/networking/p2p/vuze { }; + vuze = callPackage ../applications/networking/p2p/vuze { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; vwm = callPackage ../applications/window-managers/vwm { }; From e714798f27be8a48a0712baf2b150f0e1c7ceeb9 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Thu, 19 Sep 2019 19:58:50 +0200 Subject: [PATCH 396/463] sqldiff: init at 3.28.0 --- pkgs/development/libraries/sqlite/tools.nix | 43 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/sqlite/tools.nix diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix new file mode 100644 index 00000000000..6e97f06e617 --- /dev/null +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, unzip, sqlite, tcl }: + +let + archiveVersion = import ./archive-version.nix stdenv.lib; + mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { + inherit pname; + version = "3.28.0"; + + src = assert version == sqlite.version; fetchurl { + url = "https://sqlite.org/2019/sqlite-src-${archiveVersion version}.zip"; + sha256 = "15v57b113bpgcshfsx5jw93szar3da94rr03i053xhl15la7jllh"; + }; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ tcl ]; + + makeFlags = [ makeTarget ]; + + installPhase = "install -Dt $out/bin ${makeTarget}"; + + meta = with stdenv.lib; { + inherit description homepage; + downloadPage = http://sqlite.org/download.html; + license = licenses.publicDomain; + maintainers = with maintainers; [ pesterhazy johnazoidberg ]; + platforms = platforms.unix; + }; + }; +in +{ + sqldiff = mkTool { + pname = "sqldiff"; + makeTarget = "sqldiff"; + description = "A tool that displays the differences between SQLite databases"; + homepage = "https://www.sqlite.org/sqldiff.html"; + }; + sqlite-analyzer = mkTool { + pname = "sqlite-analyzer"; + makeTarget = "sqlite3_analyzer"; + description = "A tool that shows statistics about SQLite databases"; + homepage = "https://www.sqlite.org/sqlanalyze.html"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fe0c43e78a..f690ca56c0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15412,7 +15412,9 @@ in sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); - sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/analyzer.nix { }); + sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/tools.nix { }).sqlite-analyzer; + + sqldiff = lowPrio (callPackage ../development/libraries/sqlite/tools.nix { }).sqldiff; sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { }; From 1e136a97fb769dacdbc932e2866440dcd57a22a2 Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Fri, 20 Sep 2019 08:19:04 +0200 Subject: [PATCH 397/463] sqldiff, sqlite-analyzer: Fix Darwin build lowPrio dropped, too, because the contents of these derivations don't appear in any others. --- pkgs/development/libraries/sqlite/tools.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 6e97f06e617..bfaaf5c7cf2 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, sqlite, tcl }: +{ stdenv, fetchurl, unzip, sqlite, tcl, Foundation }: let archiveVersion = import ./archive-version.nix stdenv.lib; @@ -12,7 +12,7 @@ let }; nativeBuildInputs = [ unzip ]; - buildInputs = [ tcl ]; + buildInputs = [ tcl ] ++ stdenv.lib.optional stdenv.isDarwin Foundation; makeFlags = [ makeTarget ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f690ca56c0a..24156fd29d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15412,9 +15412,9 @@ in sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); - sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/tools.nix { }).sqlite-analyzer; - - sqldiff = lowPrio (callPackage ../development/libraries/sqlite/tools.nix { }).sqldiff; + inherit (callPackage ../development/libraries/sqlite/tools.nix { + inherit (darwin.apple_sdk.frameworks) Foundation; + }) sqlite-analyzer sqldiff; sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { }; From 0e574bc186abd383c4225115e8eba4f509858eff Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Wed, 6 Nov 2019 17:23:45 +0100 Subject: [PATCH 398/463] sqlite-analyzer: 3.28.0 -> 3.30.0 --- pkgs/development/libraries/sqlite/tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index bfaaf5c7cf2..c79f9a5a745 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,11 +4,11 @@ let archiveVersion = import ./archive-version.nix stdenv.lib; mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { inherit pname; - version = "3.28.0"; + version = "3.30.0"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2019/sqlite-src-${archiveVersion version}.zip"; - sha256 = "15v57b113bpgcshfsx5jw93szar3da94rr03i053xhl15la7jllh"; + sha256 = "0d4i87q0f618pmrgax0mr5x7m8bywikrwjvixag3biyhgl5rx7fd"; }; nativeBuildInputs = [ unzip ]; From 6ca39b3e2197bfc6f7ef9cd774b87edd67540df1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 19 Sep 2020 18:11:50 +0300 Subject: [PATCH 399/463] sqlite tools.nix: 3.30.0 > 3.33.0 --- pkgs/development/libraries/sqlite/default.nix | 2 +- pkgs/development/libraries/sqlite/tools.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 3647516c803..4393b631461 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "sqlite"; version = "3.33.0"; - # NB! Make sure to update analyzer.nix src (in the same directory). + # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; sha256 = "05dvdfaxd552gj5p7k0i72sfam7lykaw1g2pfn52jnppqx42qshh"; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index c79f9a5a745..3ac1f617862 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,11 +4,11 @@ let archiveVersion = import ./archive-version.nix stdenv.lib; mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { inherit pname; - version = "3.30.0"; + version = "3.33.0"; src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2019/sqlite-src-${archiveVersion version}.zip"; - sha256 = "0d4i87q0f618pmrgax0mr5x7m8bywikrwjvixag3biyhgl5rx7fd"; + url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; + sha256 = "1f09srlrmcab1sf8j2d89s2kvknlbxk7mbsiwpndw9mall27dgwh"; }; nativeBuildInputs = [ unzip ]; From f3bef958dcbcf4c15eb90ac547f6c33e411bc4f5 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 17:34:40 +0200 Subject: [PATCH 400/463] dbus-java: use jdk8 --- pkgs/development/libraries/java/dbus-java/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 5e574151650..0133138b478 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, gettext, jdk, libmatthew_java}: +{stdenv, fetchurl, gettext, jdk8, libmatthew_java}: +let jdk = jdk8; in stdenv.mkDerivation { name = "dbus-java-2.7"; src = fetchurl { From 09a496939d564ad5452ff0015cf9d91b70d75317 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 17:36:39 +0200 Subject: [PATCH 401/463] areca: use jdk8 --- pkgs/top-level/all-packages.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82742e7f538..6d19e4e5f01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16126,6 +16126,9 @@ in smack = callPackage ../development/libraries/java/smack { }; swt = callPackage ../development/libraries/java/swt { }; + swt_jdk8 = callPackage ../development/libraries/java/swt { + jdk = jdk8; + }; ### DEVELOPMENT / LIBRARIES / JAVASCRIPT @@ -26730,7 +26733,11 @@ in auctex = callPackage ../tools/typesetting/tex/auctex { }; - areca = callPackage ../applications/backup/areca { }; + areca = callPackage ../applications/backup/areca { + jdk = jdk8; + jre = jre8; + swt = swt_jdk8; + }; attract-mode = callPackage ../misc/emulators/attract-mode { }; From 936537e21460acdf38635a40c646972c08395861 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 17:38:15 +0200 Subject: [PATCH 402/463] drip: use jdk8 --- pkgs/development/tools/drip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix index 2a7d2c6626b..b4edf8ec081 100644 --- a/pkgs/development/tools/drip/default.nix +++ b/pkgs/development/tools/drip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk, which, makeWrapper }: +{ stdenv, fetchFromGitHub, jdk8, which, makeWrapper }: stdenv.mkDerivation rec { pname = "drip"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk ]; + buildInputs = [ jdk8 ]; postPatch = '' patchShebangs . From bf92a5440e61f99ca29b472a2e226536d8f689e9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 17:39:26 +0200 Subject: [PATCH 403/463] global-platform-pro: use jdk8 --- pkgs/development/tools/global-platform-pro/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index a9fb671f4a3..2f125d3ea8a 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, jdk, maven, makeWrapper, jre_headless, pcsclite }: +{ stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }: +let jdk = jdk8; jre_headless = jre8_headless; in # TODO: This is quite a bit of duplicated logic with gephi. Factor it out? stdenv.mkDerivation rec { pname = "global-platform-pro"; From 12a9e3043a13aa3ade1fb36606b818c862d3246c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 17:40:08 +0200 Subject: [PATCH 404/463] ili2c: use jdk8 --- pkgs/tools/misc/ili2c/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/tools/misc/ili2c/default.nix index 43eed8367c4..2bda116e66c 100644 --- a/pkgs/tools/misc/ili2c/default.nix +++ b/pkgs/tools/misc/ili2c/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, jdk, ant, makeWrapper, jre }: +{ stdenv, fetchFromGitHub, jdk8, ant, makeWrapper, jre8 }: +let jdk = jdk8; jre = jre8; in stdenv.mkDerivation rec { pname = "ili2c"; version = "5.0.8"; From ffc9f680e8b9ea73231bb82fe6456b006cbaea6c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 17:40:36 +0200 Subject: [PATCH 405/463] jasmin: use jdk8 --- pkgs/development/compilers/jasmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/development/compilers/jasmin/default.nix index ef1b3055190..7defdc5c689 100644 --- a/pkgs/development/compilers/jasmin/default.nix +++ b/pkgs/development/compilers/jasmin/default.nix @@ -1,13 +1,13 @@ { stdenv , fetchurl , unzip -, jdk +, jdk8 , ant , makeWrapper -, jre , callPackage }: +let jre = jdk8.jre; jdk = jdk8; in stdenv.mkDerivation rec { pname = "jasmin"; version = "2.4"; From 0f75334612200f2bdb9607e677a1f76ea27cc5b9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 17:42:18 +0200 Subject: [PATCH 406/463] jitsi: use jdk8 --- .../networking/instant-messengers/jitsi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 63bcc58ac3e..938be9a9778 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk +{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk8 # Optional, Jitsi still runs without, but you may pass null: , alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg }: +let jdk = jdk8; in stdenv.mkDerivation rec { pname = "jitsi"; version = "2.10.5550"; From 6eab2acc6a7228ce3f1f9cfe8742d21d1e13d0e2 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 17:43:00 +0200 Subject: [PATCH 407/463] multimc: use jdk8 --- pkgs/games/multimc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index bcdd950de4a..472a8b2966c 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,6 +1,7 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: let + jdk = jdk8; libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in mkDerivation rec { pname = "multimc"; From 0fc9ad9622602a8c43202afa907c60f9bd1a6779 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 17:43:55 +0200 Subject: [PATCH 408/463] opentsdb: use jdk8 --- pkgs/tools/misc/opentsdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 3b9623d5ad0..5429ecea2c6 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,8 +1,8 @@ -{ stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools +{ stdenv, autoconf, automake, curl, fetchurl, jdk8, makeWrapper, nettools , python, git }: -with stdenv.lib; +let jdk = jdk8; jre = jdk8.jre; in stdenv.mkDerivation rec { pname = "opentsdb"; From 94b17d9694add331c87d684de22c65183960d345 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 17:47:06 +0200 Subject: [PATCH 409/463] zap: use jdk8 --- pkgs/tools/networking/zap/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 2d8902f6909..f12578b2733 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, jdk, ant, runtimeShell }: +{ stdenv, fetchFromGitHub, jdk8, ant, runtimeShell }: +let jdk = jdk8; in stdenv.mkDerivation rec { pname = "zap"; version = "2.7.0"; From 70bc8cdd3fee800473f1a638d3299ddc9147f5ec Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 19 Sep 2020 17:57:21 +0200 Subject: [PATCH 410/463] azureus: use jdk8 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d19e4e5f01..159d31a2dfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1272,7 +1272,10 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; - azureus = callPackage ../tools/networking/p2p/azureus { }; + azureus = callPackage ../tools/networking/p2p/azureus { + jdk = jdk8; + swt = swt_jdk8; + }; b3sum = callPackage ../tools/security/b3sum {}; From 9f74a469515fbe2693725d41376aa0778b0bc585 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 22 Jul 2020 22:02:50 +0200 Subject: [PATCH 411/463] miniflux: 2.0.21 -> 2.0.23 Changelog: https://github.com/miniflux/miniflux/releases/tag/2.0.22 Changelog: https://github.com/miniflux/miniflux/releases/tag/2.0.23 --- pkgs/servers/miniflux/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 8420f53aba3..55a328b21d5 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,17 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: -buildGoPackage rec { +let pname = "miniflux"; - version = "2.0.21"; + version = "2.0.23"; + +in buildGoModule { + inherit pname version; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0yhzmfs35jfc7vq26r9c14v4lnv8sxj3pv23r2cx2rfx47b1zmk7"; + sha256 = "0v0n5lvrfn3ngs1s1m3hv95dvnqn8ysksb044m4ifk2cr3b77ryc"; }; - goPackagePath = "miniflux.app"; + vendorSha256 = "1iin5r9l8wb9gm0bwgdmpx0cp1q35ij4y7zf98lnj2kvb3jv5crp"; nativeBuildInputs = [ installShellFiles ]; @@ -23,9 +26,11 @@ buildGoPackage rec { postInstall = '' mv $out/bin/miniflux.app $out/bin/miniflux - installManPage go/src/${goPackagePath}/miniflux.1 + installManPage miniflux.1 ''; + passthru.tests = nixosTests.miniflux; + meta = with stdenv.lib; { description = "Minimalist and opinionated feed reader"; homepage = "https://miniflux.app/"; @@ -33,4 +38,3 @@ buildGoPackage rec { maintainers = with maintainers; [ rvolosatovs benpye ]; }; } - From 7fb1ee093d63001aae82b97299c71169ca6b35d1 Mon Sep 17 00:00:00 2001 From: Matthias Meschede Date: Sun, 13 Sep 2020 22:13:58 +0200 Subject: [PATCH 412/463] nodePackages.vega-lite: init at version 4.15.0 Co-authored-by: Doron Behar --- pkgs/development/node-packages/default.nix | 15 ++ .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 174 ++++++++++++++---- 3 files changed, 150 insertions(+), 40 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 24a13a060f6..ef0b5af59cd 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -181,6 +181,21 @@ let ]; }; + vega-lite = super.vega-lite.override { + # npx tries to install vega from scratch at vegalite runtime if it + # can't find it. We thus replace it with a direct call to the nix + # derivation. This might not be necessary anymore in future vl + # versions: https://github.com/vega/vega-lite/issues/6863. + postInstall = '' + substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2pdf \ + --replace "npx -p vega vg2pdf" "${self.vega-cli}/bin/vg2pdf" + substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2svg \ + --replace "npx -p vega vg2svg" "${self.vega-cli}/bin/vg2svg" + substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2png \ + --replace "npx -p vega vg2png" "${self.vega-cli}/bin/vg2png" + ''; + }; + webtorrent-cli = super.webtorrent-cli.override { buildInputs = [ self.node-gyp-build ]; }; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index acb9e4c29c2..6a4affb915f 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -200,6 +200,7 @@ , "uglify-js" , "ungit" , "vega-cli" +, "vega-lite" , "vim-language-server" , "vscode-css-languageserver-bin" , "vscode-html-languageserver-bin" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 5407e684c34..201deab6607 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4045,6 +4045,15 @@ let sha512 = "4QQNE/b+digosu3mnj4E7aNQGKnlpzXa9JvQYPtexpO7v9gnDeqwc1DxF8vLJWLDCNoO6hH0EgO8K/7PtJl8wg=="; }; }; + "@types/clone-2.1.0" = { + name = "_at_types_slash_clone"; + packageName = "@types/clone"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/clone/-/clone-2.1.0.tgz"; + sha512 = "d/aS/lPOnUSruPhgNtT8jW39fHRVTLQy9sodysP1kkG8EdAtdZu1vt8NJaYA8w/6Z9j8izkAsx1A/yJhcYR1CA=="; + }; + }; "@types/color-name-1.1.1" = { name = "_at_types_slash_color-name"; packageName = "@types/color-name"; @@ -4198,6 +4207,15 @@ let sha512 = "mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw=="; }; }; + "@types/fast-json-stable-stringify-2.0.0" = { + name = "_at_types_slash_fast-json-stable-stringify"; + packageName = "@types/fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha512 = "mky/O83TXmGY39P1H9YbUpjV6l6voRYlufqfFCvel8l1phuy8HRjdWc1rrPuN53ITBJlbyMSV6z3niOySO5pgQ=="; + }; + }; "@types/fs-capacitor-2.0.0" = { name = "_at_types_slash_fs-capacitor"; packageName = "@types/fs-capacitor"; @@ -8194,13 +8212,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.755.0" = { + "aws-sdk-2.756.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.755.0"; + version = "2.756.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.755.0.tgz"; - sha512 = "APei6/d3ki6wi9pp6XvQ7QTiOhDBCo1qCOQZ5n8POUE1yrB7/6SNWami9OTj2TavFvnz7OuPr5YZ2/Ra45N49A=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.756.0.tgz"; + sha512 = "Hk6DzcsXq1WRg+UVHDH56iQz31kDtg/NRqtJL1A0BrZ/PtNSLTHsQQllpcAi09UxLDMzBoDXymZ8kYg0Migq8w=="; }; }; "aws-sign2-0.6.0" = { @@ -26351,6 +26369,15 @@ let sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; }; }; + "json-stringify-pretty-compact-2.0.0" = { + name = "json-stringify-pretty-compact"; + packageName = "json-stringify-pretty-compact"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz"; + sha512 = "WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ=="; + }; + }; "json-stringify-safe-5.0.1" = { name = "json-stringify-safe"; packageName = "json-stringify-safe"; @@ -40342,13 +40369,13 @@ let sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92"; }; }; - "remark-mdx-2.0.0-next.7" = { + "remark-mdx-2.0.0-next.8" = { name = "remark-mdx"; packageName = "remark-mdx"; - version = "2.0.0-next.7"; + version = "2.0.0-next.8"; src = fetchurl { - url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.7.tgz"; - sha512 = "JHYCfxJzvjTw8h5y10f+mCvbfIt5klAkWlULqPu1nM/r6ghF3tzJl0AFQFj5b/m/7U553+yYb/y4n0julMERYA=="; + url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.8.tgz"; + sha512 = "mjP0yo6BgjYrx5a+gKWYRFWbGnRiWi4Fdf17xGCr9VkSMnG4Dyo06spqbaLfHwl0KkQ/RQZlR2sn1mKnYduJdw=="; }; }; "remark-message-control-6.0.0" = { @@ -42223,6 +42250,15 @@ let sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="; }; }; + "serialize-javascript-5.0.1" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; + }; + }; "serialize-to-js-3.1.1" = { name = "serialize-to-js"; packageName = "serialize-to-js"; @@ -46003,13 +46039,13 @@ let sha512 = "hAu/ig5N8i0trXXbrC7rwbXV4DhpEAsZhYXDs1305OjmDgjGC0thINbb0197idy3Pp+B6w7u426SUM43GAP7qw=="; }; }; - "swagger-ui-dist-3.33.0" = { + "swagger-ui-dist-3.34.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.33.0"; + version = "3.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.33.0.tgz"; - sha512 = "IIF2OFr2+nFNDvQtQ/ZxC+qVQhFguV7UztD6nzdfkN4P7nOuM0amEa/8er7MKSFArc4rKGH4WkihUQczbBfUag=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.34.0.tgz"; + sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; "swagger2openapi-5.4.0" = { @@ -46093,13 +46129,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.27.4" = { + "systeminformation-4.27.5" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.27.4"; + version = "4.27.5"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.4.tgz"; - sha512 = "VlFlxbkvSddq16F/nHC0GRaKBZOKWbAuRbck4G9muHhCUcDKskhNkVbaBBFxxqwcp0IyVozLS96eAVmkRZTG4w=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.5.tgz"; + sha512 = "EysogxKqREk54ZYDEFcsCODv8GymKZcyiSfegYit8dKhPjzuQr+KX4GFHjssWjYrWFEIM2bYNsFrZX5eufeAXg=="; }; }; "syswide-cas-5.3.0" = { @@ -48128,13 +48164,13 @@ let sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="; }; }; - "typescript-4.0.2" = { + "typescript-4.0.3" = { name = "typescript"; packageName = "typescript"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz"; - sha512 = "e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz"; + sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -59081,10 +59117,10 @@ in coc-r-lsp = nodeEnv.buildNodePackage { name = "coc-r-lsp"; packageName = "coc-r-lsp"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-r-lsp/-/coc-r-lsp-1.2.0.tgz"; - sha512 = "+HpMgywqTOkClNI/UD1rpH6WDLmxtKLDVQX3bEmsJNSC70sLcMKhJRh+HUBx0tL2gnNwGYKgUl7uH9rKoPzAbQ=="; + url = "https://registry.npmjs.org/coc-r-lsp/-/coc-r-lsp-1.2.1.tgz"; + sha512 = "SOsCwIuQeE4eiX/Scgs2nL1WnR0JwFZ2/Edh3dx5ijmZSlEPxdc0PnMUN0hT9y96jK5/ZHAByC3qEperpWqPUA=="; }; dependencies = [ sources."vscode-jsonrpc-5.0.1" @@ -60821,7 +60857,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."typescript-4.0.2" + sources."typescript-4.0.3" sources."unherit-1.1.3" (sources."unified-7.1.0" // { dependencies = [ @@ -61619,7 +61655,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.27.4" + sources."systeminformation-4.27.5" sources."term-size-2.2.0" sources."through-2.3.8" sources."tmp-0.2.1" @@ -63145,7 +63181,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.755.0" + sources."aws-sdk-2.756.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."base64-js-1.3.1" @@ -67678,7 +67714,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.27.4" + sources."systeminformation-4.27.5" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -69795,7 +69831,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.755.0" // { + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -75532,7 +75568,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.33.0" + sources."swagger-ui-dist-3.34.0" sources."tail-2.0.4" sources."through-2.3.8" sources."tmp-0.0.33" @@ -76241,7 +76277,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.755.0" // { + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."buffer-4.9.2" sources."uuid-3.3.2" @@ -83753,7 +83789,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.755.0" // { + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -86788,7 +86824,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.755.0" // { + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -89002,7 +89038,7 @@ in sources."rehype-parse-7.0.1" sources."rehype-retext-2.0.4" sources."remark-frontmatter-2.0.0" - sources."remark-mdx-2.0.0-next.7" + sources."remark-mdx-2.0.0-next.8" sources."remark-message-control-6.0.0" (sources."remark-parse-8.0.3" // { dependencies = [ @@ -90428,10 +90464,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz"; - sha512 = "e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz"; + sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; }; buildInputs = globalBuildInputs; meta = { @@ -91011,6 +91047,64 @@ in bypassCache = true; reconstructLock = true; }; + vega-lite = nodeEnv.buildNodePackage { + name = "vega-lite"; + packageName = "vega-lite"; + version = "4.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-4.15.0.tgz"; + sha512 = "381Kszxei5Rhg8WkcUE7yPHafLndBbdR8nBSJi4zFsn8iAfCVjn7h7QL9DphNix5V7Ko1nhOadxqNaxGsiD71w=="; + }; + dependencies = [ + sources."@types/clone-2.1.0" + sources."@types/color-name-1.1.1" + sources."@types/fast-json-stable-stringify-2.0.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."array-flat-polyfill-1.0.1" + sources."camelcase-5.3.1" + sources."cliui-6.0.0" + sources."clone-2.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."decamelize-1.2.0" + sources."emoji-regex-8.0.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."find-up-4.1.0" + sources."get-caller-file-2.0.5" + sources."is-fullwidth-code-point-3.0.0" + sources."json-stringify-pretty-compact-2.0.0" + sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."set-blocking-2.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."tslib-2.0.1" + sources."vega-event-selector-2.0.5" + sources."vega-expression-2.7.0" + sources."vega-util-1.15.1" + sources."which-module-2.0.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.0" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Vega-Lite is a concise high-level language for interactive visualization."; + homepage = https://vega.github.io/vega-lite/; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; @@ -94804,10 +94898,10 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.1.0.tgz"; - sha512 = "aWjIuLt1OVQxaDVffnt3bnGmLA8zGgAJaFwPA+a+QYVPh1vhIKjVfh3SbOFLV0kRPvGBITbw17n5CsmiBS4LQQ=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.1.1.tgz"; + sha512 = "4TlkHFYkrZ3WppLA5XkPmBLI5lnEpFsXvpeqxCf5PzkratZiVklNXsvoQkLhUU43q7ZL3AOXtaHAd9jLNJoU0w=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -94891,7 +94985,7 @@ in sources."safe-buffer-5.2.1" sources."schema-utils-2.7.1" sources."semver-6.3.0" - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-5.0.1" sources."slash-3.0.0" sources."source-list-map-2.0.1" sources."source-map-0.6.1" From 9c12892e7ba11c32ea9f4e7a2349c7e7cc5974f9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 19 Sep 2020 19:31:15 +0300 Subject: [PATCH 413/463] joplin: fix build by adding missing deps ZHF: #97479 --- pkgs/development/node-packages/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index ef0b5af59cd..be1b58acd79 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -207,6 +207,8 @@ let # https://sharp.pixelplumbing.com/install vips + libsecret + self.node-gyp-build self.node-pre-gyp ]; }; From ea72791b9bfe3303635484daa6f5bc772ce590f9 Mon Sep 17 00:00:00 2001 From: Yves Fischer Date: Sat, 19 Sep 2020 21:48:24 +0200 Subject: [PATCH 414/463] qcad: 3.25.0.0 -> 3.25.2.0 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 26b6f329764..0472a88c356 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -11,13 +11,13 @@ mkDerivationWith stdenv.mkDerivation rec { pname = "qcad"; - version = "3.25.0.0"; + version = "3.25.2.0"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "07qph2645m1wi9yi04ixdvx8dli03q1vimj3laqdmnpipi54lljc"; + sha256 = "1lz6q9n2p0l7k8rwqsdj6av9p3426423g5avc4y6s7nbk36280mz"; }; patches = [ From 14fb04180ab847f35ba4c5494a55966f8c309185 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 19 Sep 2020 22:56:23 +0300 Subject: [PATCH 415/463] charles: Use jdk8 explicitly --- pkgs/applications/networking/charles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 11eb24ff703..3dd9fe2c4f8 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -3,7 +3,7 @@ stdenv , makeWrapper , makeDesktopItem , fetchurl -, jre +, jdk8 }: let @@ -31,7 +31,7 @@ let buildInputs = [ makeWrapper ]; installPhase = '' - makeWrapper ${jre}/bin/java $out/bin/charles \ + makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \ --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" for fn in lib/*.jar; do From 0e6477d64dd7f5419f433fd33eb565fb9717dd7e Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Sat, 19 Sep 2020 21:29:16 +0000 Subject: [PATCH 416/463] vscodium: 1.48.2 -> 1.49.1 --- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 5039fa4707c..d311e644a29 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "17frdyli375l20mb7sb5bmw000p9cplj4pagmhnb6nibi9wqypdx"; - x86_64-darwin = "1dh5k36fjdfwhidlsg1grjwy3s9jik3pg6xpdgi6946vzqv1vxll"; + x86_64-linux = "10v13j1zg1bpgmr99vqhs1gwcipvnbkln0w6yphwn9440fw9fyp4"; + x86_64-darwin = "1mgi2awrqsm11l1yb8rgmfrxvjfn9z3qvp5np76vgbaibq2ihh0k"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.2"; + version = "1.49.1"; pname = "vscodium"; executableName = "codium"; From 07dd821d954840d2ee16314194f56d0da15e9a2b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 19 Sep 2020 13:37:57 -0700 Subject: [PATCH 417/463] pulseeffects: 4.8.0 -> 4.8.1 --- pkgs/applications/audio/pulseeffects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index a3ee0e23ec6..a7b97e9daaf 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -44,13 +44,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "9dQNYWBx8iAifRTZr2FRlYv4keZt5Cfahwi/w01duFg="; + sha256 = "17yfs3ja7vflywhxbn3n3r8n6hl829x257kzplg2vpppppg6ylj6"; }; nativeBuildInputs = [ From 4637721bc13d41387dddc4953574150c469d9d35 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 19 Sep 2020 02:06:32 +0100 Subject: [PATCH 418/463] truvari: fix build be less strict about versions --- pkgs/applications/science/biology/truvari/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix index e64c9d3493e..84cc9909a48 100644 --- a/pkgs/applications/science/biology/truvari/default.nix +++ b/pkgs/applications/science/biology/truvari/default.nix @@ -25,13 +25,15 @@ python3Packages.buildPythonApplication rec { prePatch = '' substituteInPlace ./setup.py \ - --replace '"progressbar2==3.41.0",' '"progressbar2==3.47.0",' \ - --replace '"pysam==0.15.2",' '"pysam==0.15.4",' \ - --replace '"pyfaidx==0.5.5.2",' '"pyfaidx==0.5.8",' + --replace '"progressbar2==3.41.0",' '"progressbar2",' \ + --replace '"pysam==0.15.2",' '"pysam",' \ + --replace '"pyfaidx==0.5.5.2",' '"pyfaidx",' \ + --replace '"intervaltree==3.0.2",' '"intervaltree",' ''; meta = with lib; { description = "Structural variant comparison tool for VCFs"; + homepage = "https://github.com/spiralgenetics/truvari"; license = licenses.mit; maintainers = with maintainers; [ scalavision ]; longDescription = '' From 6898bcff086d9f543256c7d53ae372015ad8c4b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Sep 2020 03:15:24 +0200 Subject: [PATCH 419/463] pythonPackages.textfsm: init at 1.1.1 --- .../python-modules/textfsm/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/textfsm/default.nix diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix new file mode 100644 index 00000000000..04bc47913d8 --- /dev/null +++ b/pkgs/development/python-modules/textfsm/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, six +, future +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "textfsm"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "0fq2hphd89hns11nh0yifcp6brg6yy4n4hbvfk6avbjd7s40789a"; + }; + + patches = [ + (fetchpatch { + # remove pytest-runner dependency + url = "https://github.com/google/textfsm/commit/212db75fea4a79aca0f8f85a78954ffbc5667096.patch"; + sha256 = "0n6qh3sz9wy5gdpq9jjxx8firis48ypr20yacs5bqri59sziwjp0"; + }) + ]; + + propagatedBuildInputs = [ six future ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Python module for parsing semi-structured text into python tables"; + homepage = "https://github.com/google/textfsm"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0bf49fe103..ea315f46244 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6921,6 +6921,8 @@ in { testfixtures = callPackage ../development/python-modules/testfixtures { }; + textfsm = callPackage ../development/python-modules/textfsm { }; + testpath = callPackage ../development/python-modules/testpath { }; testrepository = callPackage ../development/python-modules/testrepository { }; From 278d069304b494c570a8783a4d106e027b7c3477 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Sep 2020 03:32:44 +0200 Subject: [PATCH 420/463] python3Packages.ntc-templates: init at 1.5.0 --- .../python-modules/ntc-templates/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/ntc-templates/default.nix diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix new file mode 100644 index 00000000000..923f8c19698 --- /dev/null +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, textfsm +, pytestCheckHook +, ruamel_yaml +, yamllint +}: + +buildPythonPackage rec { + pname = "ntc-templates"; + version = "1.5.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "networktocode"; + repo = pname; + rev = "v${version}"; + sha256 = "0pvd9n7hcmxl9cr8m1xlqcjmy3k2hga0qmn2k3x9hripjis7pbbi"; + }; + + propagatedBuildInputs = [ textfsm ]; + + checkInputs = [ pytestCheckHook ruamel_yaml yamllint ]; + + # https://github.com/networktocode/ntc-templates/issues/743 + disabledTests = [ "test_raw_data_against_mock" "test_verify_parsed_and_reference_data_exists" ]; + + meta = with lib; { + description = "TextFSM templates for parsing show commands of network devices"; + homepage = "https://github.com/networktocode/ntc-templates"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea315f46244..534e38e397a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4032,6 +4032,8 @@ in { nplusone = callPackage ../development/python-modules/nplusone { }; + ntc-templates = callPackage ../development/python-modules/ntc-templates { }; + ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; ntplib = callPackage ../development/python-modules/ntplib { }; From d956ed6ac863448b16df235b54931a8b7ffce2a8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Sep 2020 03:42:55 +0200 Subject: [PATCH 421/463] pythonPackages.yamlordereddictloader: init at 0.4.0 --- .../yamlordereddictloader/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/yamlordereddictloader/default.nix diff --git a/pkgs/development/python-modules/yamlordereddictloader/default.nix b/pkgs/development/python-modules/yamlordereddictloader/default.nix new file mode 100644 index 00000000000..ce9602a4720 --- /dev/null +++ b/pkgs/development/python-modules/yamlordereddictloader/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, ordereddict +, pyyaml +}: + +buildPythonPackage rec { + pname = "yamlordereddictloader"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "03h8wa6pzqjiw25s3jv9gydn77gs444mf31lrgvpgy53kswz0c3z"; + }; + + propagatedBuildInputs = [ pyyaml ] ++ lib.optional (isPy27) ordereddict; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "yamlordereddictloader" ]; + + meta = with lib; { + description = "YAML loader and dump for PyYAML allowing to keep keys order"; + homepage = "https://github.com/fmenabe/python-yamlordereddictloader"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 534e38e397a..ed2d3709e59 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7573,6 +7573,8 @@ in { yamllint = callPackage ../development/python-modules/yamllint { }; + yamlordereddictloader = callPackage ../development/python-modules/yamlordereddictloader { }; + yanc = callPackage ../development/python-modules/yanc { }; yapf = callPackage ../development/python-modules/yapf { }; From a5f77e0583c81426c8759210256fbe2951a524d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Sep 2020 03:45:28 +0200 Subject: [PATCH 422/463] pythonPackages.junos_eznc: fix build --- pkgs/development/python-modules/junos-eznc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index f351ea7a1c3..22ff5caad80 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -7,9 +7,12 @@ , paramiko , netaddr , ncclient +, ntc-templates , lxml , jinja2 , pyyaml +, transitions +, yamlordereddictloader , nose }: @@ -22,11 +25,10 @@ buildPythonPackage rec { sha256 = "521659fe94da796897abc16773c3d84fa44d3e1f5386c71fbaef44cb80159855"; }; - checkInputs = [ nose ]; propagatedBuildInputs = [ - scp six pyserial paramiko netaddr ncclient lxml jinja2 pyyaml + scp six pyserial paramiko netaddr ncclient ntc-templates lxml jinja2 pyyaml transitions yamlordereddictloader ]; checkPhase = '' From 9d58eb47f2c888cee983b1cbe26b249d75d95a53 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 19 Sep 2020 00:10:11 -0700 Subject: [PATCH 423/463] docker_18_09: fix build The cross-compilation patch introduced in https://github.com/NixOS/nixpkgs/pull/92140 fixes an issue introduced in Docker CE 19.03, and will not apply to (and is not needed for) previous versions. --- pkgs/applications/virtualization/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 78d6631c2dc..14cfa7b3120 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -79,7 +79,7 @@ rec { sha256 = sha256; }; - patches = [ + patches = lib.optional (versionAtLeast version "19.03") [ # Replace hard-coded cross-compiler with $CC (fetchpatch { url = https://github.com/docker/docker-ce/commit/2fdfb4404ab811cb00227a3de111437b829e55cf.patch; From 5315ce0e40c6c57c90c9487ec16f343663c73894 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 10 Sep 2020 15:13:57 -0400 Subject: [PATCH 424/463] python3Packages.hyppo: init at 0.1.3 --- .../python-modules/hyppo/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/hyppo/default.nix diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix new file mode 100644 index 00000000000..5b2869e10d1 --- /dev/null +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytestCheckHook , pytestcov , numba +, numpy +, scikitlearn +, scipy +}: + +buildPythonPackage rec { + pname = "hyppo"; + version = "0.1.3"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "neurodata"; + repo = pname; + rev = "v${version}"; + sha256 = "0qdnb1l4hz4dgwhapz1fp9sb2vxxvr8h2ngsbvyf50h3kapcn19r"; + }; + + propagatedBuildInputs = [ + numba + numpy + scikitlearn + scipy + ]; + + checkInputs = [ pytestCheckHook pytestcov ]; + pytestFlagsArray = [ "--ignore=docs" ]; + + meta = with lib; { + homepage = "https://github.com/neurodata/hyppo"; + description = "Indepedence testing in Python"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed2d3709e59..7f8eb5647e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2764,6 +2764,8 @@ in { hypothesis = if isPy3k then callPackage ../development/python-modules/hypothesis { } else self.hypothesis_4; + hyppo = callPackage ../development/python-modules/hyppo { }; + i3ipc = callPackage ../development/python-modules/i3ipc { }; i3-py = callPackage ../development/python-modules/i3-py { }; From 1179840f9a88b8a548f4b11d1a03aa25a790c379 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 10 Sep 2020 15:14:42 -0400 Subject: [PATCH 425/463] python3Packages.graspy: 0.2.0 -> 0.3.0 --- .../python-modules/graspy/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/graspy/default.nix b/pkgs/development/python-modules/graspy/default.nix index 2a7fab12fa2..0281e6a9734 100644 --- a/pkgs/development/python-modules/graspy/default.nix +++ b/pkgs/development/python-modules/graspy/default.nix @@ -2,8 +2,9 @@ , buildPythonPackage , isPy27 , fetchFromGitHub -, pytest +, pytestCheckHook , pytestcov +, hyppo , matplotlib , networkx , numpy @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "graspy"; - version = "0.2"; + version = "0.3"; disabled = isPy27; @@ -22,10 +23,11 @@ buildPythonPackage rec { owner = "neurodata"; repo = pname; rev = "v${version}"; - sha256 = "1ss7d71lwblimg7ri88ir9w59j0ri13wl75091hjf7q0mchqr6yd"; + sha256 = "0lab76qiryxvwl6zrcikhnxil1xywl0wkkm2vzi4v9mdzpa7w29r"; }; propagatedBuildInputs = [ + hyppo matplotlib networkx numpy @@ -34,14 +36,9 @@ buildPythonPackage rec { seaborn ]; - checkInputs = [ pytest pytestcov ]; - - checkPhase = '' - runHook preCheck - # `test_autogmm` takes too long; fixed in next release (graspy/pull/328) - pytest tests -k 'not test_autogmm' - runHook postCheck - ''; + checkInputs = [ pytestCheckHook pytestcov ]; + pytestFlagsArray = [ "tests" "--ignore=docs" ]; + disabledTests = [ "gridplot_outputs" ]; meta = with lib; { homepage = "https://graspy.neurodata.io"; From 7ea5b08cfcc5a4bdd206395f7f5922041df6178c Mon Sep 17 00:00:00 2001 From: Lars Jellema Date: Sat, 19 Sep 2020 12:56:52 +0200 Subject: [PATCH 426/463] gnat: fix build --- pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index d3f7d382c19..5714b228c59 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -15,6 +15,8 @@ if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" fi +cInclude=0 + source @out@/nix-support/utils.bash # Flirting with a layer violation here. From 670fe111f45d08dd2b098a362b6fb57435afeecc Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Sun, 20 Sep 2020 00:39:58 -0400 Subject: [PATCH 427/463] celluloid: 0.19 -> 0.20 https://github.com/celluloid-player/celluloid/releases/tag/v0.20 --- pkgs/applications/video/celluloid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index 80a30852dae..ca9ecb48188 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "celluloid"; - version = "0.19"; + version = "0.20"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; rev = "v${version}"; - sha256 = "1jdmwljckajqb3ys8azd1nyy49nvq9kb2knrrqdcfnvzq0m5lpqr"; + hash = "sha256-fEZnH8EqU6CykgKINXnKChuBUlisroa97B1vjcx2cWA="; }; nativeBuildInputs = [ From d61c16cda48a581dfecfce69099773d9737d5b76 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 19 Sep 2020 23:15:56 +0100 Subject: [PATCH 428/463] sslyze: fix build need to further relax cryptography module version requirements --- pkgs/development/python-modules/sslyze/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index c127f6ea2e5..24b334ef882 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { patchPhase = '' substituteInPlace setup.py \ - --replace "cryptography>=2.6,<=2.9" "cryptography>=2.6,<=3" + --replace "cryptography>=2.6,<=2.9" "cryptography" ''; checkInputs = [ pytest ]; @@ -39,6 +39,7 @@ buildPythonPackage rec { tests/plugins_tests/certificate_info/test_certificate_utils.py \ -k "not (TestScanner and test_client_certificate_missing)" ''; + pythonImportsCheck = [ "sslyze" ]; propagatedBuildInputs = [ nassl cryptography typing-extensions faker ]; From f8473b1d3984e7305335f296e9a6e956875ba0ea Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 20 Sep 2020 00:20:30 -0700 Subject: [PATCH 429/463] openssh_hpn: fix source --- pkgs/tools/networking/openssh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1748a2d21d0..64e6757891e 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = if hpnSupport then fetchurl { url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz"; - sha256 = "0lwr7xzhy8m4y0vzi1a78ddhag3qp6cba0c37mnhivbhb67dkywp"; + sha256 = "1ssdwgdxnvjwigisqi8c053znps5a4jf7bzsi99y0xyfzbw0x55k"; } else fetchurl { From e11a487567fcc5f43aa13312969c6fc995f4ade0 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:11:30 +0200 Subject: [PATCH 430/463] josm: use latest jdk --- 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 f3273cb51db..97e6f7598fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21456,7 +21456,7 @@ in joe = callPackage ../applications/editors/joe { }; - josm = callPackage ../applications/misc/josm { jre = jdk11; }; + josm = callPackage ../applications/misc/josm { }; jwm = callPackage ../applications/window-managers/jwm { }; From aabe6e23a688bbfe81685984f05706e9c945056c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:12:33 +0200 Subject: [PATCH 431/463] dbeaver: use latest jdk --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97e6f7598fa..b4ceb8a0c48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3049,9 +3049,7 @@ in davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { - jdk = jdk11; - }; + dbeaver = callPackage ../applications/misc/dbeaver { }; dbench = callPackage ../development/tools/misc/dbench { }; From 8ba71cef5d814042962b4e046d6a35c1595d2bbd Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:13:56 +0200 Subject: [PATCH 432/463] mediathekview: use latest jre --- 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 b4ceb8a0c48..befcbedf4c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21911,7 +21911,7 @@ in mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - mediathekview = callPackage ../applications/video/mediathekview { jre = openjdk11; }; + mediathekview = callPackage ../applications/video/mediathekview { }; meteo = callPackage ../applications/networking/weather/meteo { }; From eb61d33a3d0a6d32c8225e27b9f1789a0471428a Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sat, 19 Sep 2020 10:11:27 +0100 Subject: [PATCH 433/463] maintainers: remove joncojonathan --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1fff2727848..73f86b83d74 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3725,12 +3725,6 @@ githubId = 1843676; name = "Jonathan Reeve"; }; - joncojonathan = { - email = "joncojonathan@gmail.com"; - github = "joncojonathan"; - githubId = 11414454; - name = "Jonathan Haddock"; - }; jonringer = { email = "jonringer117@gmail.com"; github = "jonringer"; From 328fa73819f684fb513b4b0964d9babb3e239794 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sat, 19 Sep 2020 10:12:37 +0100 Subject: [PATCH 434/463] deja-dup: remove joncojonathan as maintainer --- pkgs/applications/backup/deja-dup/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index d283dc7107d..6aa6c5a17ac 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://wiki.gnome.org/Apps/DejaDup"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jtojnar joncojonathan ]; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; } From 01fed03489631636e90b1d376fbfc194d93622fd Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:17:02 +0200 Subject: [PATCH 435/463] closurecompiler: use latest jdk --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index befcbedf4c8..77a573e26b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8577,9 +8577,7 @@ in clean = callPackage ../development/compilers/clean { }; - closurecompiler = callPackage ../development/compilers/closure { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + closurecompiler = callPackage ../development/compilers/closure { }; cmdstan = callPackage ../development/compilers/cmdstan { }; From 9481828bd9632a3f26c8608487dbfe5cf2e22bc9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:17:10 +0200 Subject: [PATCH 436/463] emscripten: use latest jdk --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77a573e26b4..bb858e5197d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3429,9 +3429,7 @@ in choose = callPackage ../tools/text/choose { }; - emscripten = callPackage ../development/compilers/emscripten { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + emscripten = callPackage ../development/compilers/emscripten { }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); From ff078a7e0f0fe16fea672d83ab8dfe91417a93b9 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sat, 19 Sep 2020 10:13:56 +0100 Subject: [PATCH 437/463] keepass: remove joncojonathan as maintainer --- 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 1d668e039bd..d1a6154a0ef 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -84,7 +84,7 @@ with builtins; buildDotnetPackage rec { dynlibPath = stdenv.lib.makeLibraryPath [ gtk2 ]; - postInstall = + postInstall = let extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh; in @@ -108,7 +108,7 @@ with builtins; buildDotnetPackage rec { meta = { description = "GUI password manager with strong cryptography"; homepage = "http://www.keepass.info/"; - maintainers = with stdenv.lib.maintainers; [ amorsillo obadz joncojonathan jraygauthier ]; + maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ]; platforms = with stdenv.lib.platforms; all; license = stdenv.lib.licenses.gpl2; }; From 84a0da26d0a26f398d16f75045c295adf368b05f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:19:00 +0200 Subject: [PATCH 438/463] runelite: use latest jdk --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb858e5197d..9dd438e4a11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6779,9 +6779,7 @@ in rubocop = callPackage ../development/tools/rubocop { }; - runelite = callPackage ../games/runelite { - jre = openjdk11; - }; + runelite = callPackage ../games/runelite { }; runningx = callPackage ../tools/X11/runningx { }; From 609e3aa50777ccea330366d3da2245a75a83834c Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sat, 19 Sep 2020 10:15:13 +0100 Subject: [PATCH 439/463] gramps: remove joncojonathan as maintainer --- pkgs/applications/misc/gramps/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index e5a2b87f16e..09717cd6426 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -13,14 +13,13 @@ in buildPythonApplication rec { pname = "gramps"; nativeBuildInputs = [ wrapGAppsHook gettext ]; - buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] + buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map # Graphviz support ++ stdenv.lib.optional enableGraphviz graphviz # Ghostscript support ++ stdenv.lib.optional enableGhostscript ghostscript - ; src = fetchFromGitHub { @@ -60,6 +59,5 @@ in buildPythonApplication rec { description = "Genealogy software"; homepage = "https://gramps-project.org"; license = licenses.gpl2; - maintainers = with maintainers; [ joncojonathan ]; }; } From 5e46e2a783229a75d4eadd57dce7d8331b71f29d Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:21:16 +0200 Subject: [PATCH 440/463] awstats: use latest jdk --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dd438e4a11..b06ecdc188e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1251,9 +1251,7 @@ in aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { }; - awstats = callPackage ../tools/system/awstats { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + awstats = callPackage ../tools/system/awstats { }; awsweeper = callPackage ../tools/admin/awsweeper { }; From 3426068afe541afb3b8c18beb6fb3850d5381701 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:23:20 +0200 Subject: [PATCH 441/463] arduino: use latest jdk --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b06ecdc188e..7858cee135a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -743,9 +743,7 @@ in arduino-cli = callPackage ../development/arduino/arduino-cli { }; - arduino-core = callPackage ../development/arduino/arduino-core { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + arduino-core = callPackage ../development/arduino/arduino-core { }; arduino-mk = callPackage ../development/arduino/arduino-mk {}; From effd6aa53a3c85e1236e2888515b1d6f947b11d9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:25:44 +0200 Subject: [PATCH 442/463] gpsprune: use latest jdk --- pkgs/applications/misc/gpsprune/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 63ca213c2c4..828b3ca9bf0 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk }: stdenv.mkDerivation rec { pname = "gpsprune"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk11 ]; + buildInputs = [ jdk ]; desktopItem = makeDesktopItem { name = "gpsprune"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildCommand = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/gpsprune.jar - makeWrapper ${jdk11}/bin/java $out/bin/gpsprune \ + makeWrapper ${jdk}/bin/java $out/bin/gpsprune \ --add-flags "-jar $out/share/java/gpsprune.jar" mkdir -p $out/share/applications cp $desktopItem/share/applications"/"* $out/share/applications From ef4cbbabd1f7b4e3306b944926545fd60a5a9906 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:32:06 +0200 Subject: [PATCH 443/463] clojure: use latest jdk --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 53cef387ae4..39db54babe4 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, installShellFiles, jdk11, rlwrap, makeWrapper }: +{ stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }: stdenv.mkDerivation rec { pname = "clojure"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = let - binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ]; + binPath = stdenv.lib.makeBinPath [ rlwrap jdk ]; in '' mkdir -p $out/libexec From e13e02f300baa9315def56a5ae1d9547b1086ebc Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:41:06 +0200 Subject: [PATCH 444/463] jedit: use latest jdk --- pkgs/applications/editors/jedit/default.nix | 8 ++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 178494b0498..18fe236983a 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -44,12 +44,8 @@ stdenv.mkDerivation { mkdir -p $out/share/applications mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop - patch package-files/linux/jedit << EOF - 5a6,8 - > # specify the correct JAVA_HOME - > JAVA_HOME=${jdk.jre.home}/jre - > - EOF + # specify the correct JAVA_HOME + sed -i '1a JAVA_HOME=${jdk}' package-files/linux/jedit sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit mkdir -p $out/bin cp package-files/linux/jedit $out/bin/jedit diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7858cee135a..60308319291 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21432,9 +21432,7 @@ in jdupes = callPackage ../tools/misc/jdupes { }; - jedit = callPackage ../applications/editors/jedit { - jdk = jdk8; # TODO: upgrade - }; + jedit = callPackage ../applications/editors/jedit { }; jgmenu = callPackage ../applications/misc/jgmenu { }; From 907fd8d6f6274847ad7486456f3ac9bc6c38fb65 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 20 Sep 2020 14:45:41 +0200 Subject: [PATCH 445/463] youtube-dl: 2020.09.14 -> 2020.09.20 https://github.com/ytdl-org/youtube-dl/releases/tag/2020.09.20 --- 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 aa502f8521a..e3b64939a0a 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.14"; + version = "2020.09.20"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "18wfhprbaszpxgqkac3hb050ngvdsaibbcifg88rkv5vc6bc2mq6"; + sha256 = "1pkw3hnkddk1kqv0in152q1k4jjgbmf2xvc9j3r5nd38z6f7j6mc"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 80a6743c37e12c6d58a2cb2f7c10e4c1682306af Mon Sep 17 00:00:00 2001 From: Hannes Weisbach Date: Thu, 10 Sep 2020 15:21:06 +0200 Subject: [PATCH 446/463] opencascade: enable macOS build and add features enable/fix macOS build and add options for TBB and GL2PS dependencies VTK integration needed a patch because implicit conversions in initializer lists are an error in C++11, which is the default in clang 7 used by nix. --- .../libraries/opencascade/default.nix | 25 +++++++++++++++---- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 8334bf195f7..c0b2366ab7f 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,6 +1,9 @@ { stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, - pkgconfig, fontconfig, freetype, expat, freeimage, vtk }: + pkgconfig, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, + OpenCL, Cocoa +}: +with stdenv.lib; stdenv.mkDerivation rec { pname = "opencascade-oce"; version = "0.18.3"; @@ -13,13 +16,21 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja pkgconfig ]; - buildInputs = [ libGL libGLU libXmu freetype fontconfig expat freeimage vtk ]; + buildInputs = [ + libGL libGLU libXmu freetype fontconfig expat freeimage vtk + gl2ps tbb + ] + ++ optionals stdenv.isDarwin [OpenCL Cocoa] + ; cmakeFlags = [ "-DOCE_INSTALL_PREFIX=${placeholder "out"}" "-DOCE_WITH_FREEIMAGE=ON" "-DOCE_WITH_VTK=ON" - ]; + "-DOCE_WITH_GL2PS=ON" + "-DOCE_MULTITHREAD_LIBRARY=TBB" + ] + ++ optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"]; patches = [ # Use fontconfig instead of hardcoded directory list @@ -33,6 +44,10 @@ stdenv.mkDerivation rec { url = "https://github.com/tpaviot/oce/commit/3b44656e93270d782009b06ec4be84d2a13f8126.patch"; sha256 = "1ccakkcwy5g0184m23x0mnh22i0lk45xm8kgiv5z3pl7nh35dh8k"; }) + (fetchpatch { + url = "https://github.com/tpaviot/oce/commit/cf50d078cd5fac03a48fd204938bd240930a08dc.patch"; + sha256 = "1xv94hcvggmb1c8vqwic1aiw9jw1sxk8mqbaak9xs9ycfqdvgdyc"; + }) ]; postPatch = '' @@ -41,11 +56,11 @@ stdenv.mkDerivation rec { --replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES ''; - meta = with stdenv.lib; { + meta = { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = "https://github.com/tpaviot/oce"; maintainers = [ maintainers.viric ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl21; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae19e77cadb..9987d9ee7e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14533,7 +14533,9 @@ in openbabel = callPackage ../development/libraries/openbabel { }; - opencascade = callPackage ../development/libraries/opencascade { }; + opencascade = callPackage ../development/libraries/opencascade { + inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; + }; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; opencl-headers = callPackage ../development/libraries/opencl-headers { }; From 4fc8c5098d28aa8980fe7f581121ddf731fdd901 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 24 Feb 2020 14:35:27 +0100 Subject: [PATCH 447/463] platforms: add bigEndian and littleEndian --- lib/systems/doubles.nix | 49 ++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index fb7d722e737..517a7296afd 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -50,32 +50,35 @@ in { none = []; - arm = filterDoubles predicates.isAarch32; - aarch64 = filterDoubles predicates.isAarch64; - x86 = filterDoubles predicates.isx86; - i686 = filterDoubles predicates.isi686; - x86_64 = filterDoubles predicates.isx86_64; - mips = filterDoubles predicates.isMips; - riscv = filterDoubles predicates.isRiscV; - vc4 = filterDoubles predicates.isVc4; - js = filterDoubles predicates.isJavaScript; + arm = filterDoubles predicates.isAarch32; + aarch64 = filterDoubles predicates.isAarch64; + x86 = filterDoubles predicates.isx86; + i686 = filterDoubles predicates.isi686; + x86_64 = filterDoubles predicates.isx86_64; + mips = filterDoubles predicates.isMips; + riscv = filterDoubles predicates.isRiscV; + vc4 = filterDoubles predicates.isVc4; + js = filterDoubles predicates.isJavaScript; - cygwin = filterDoubles predicates.isCygwin; - darwin = filterDoubles predicates.isDarwin; - freebsd = filterDoubles predicates.isFreeBSD; + bigEndian = filterDoubles predicates.isBigEndian; + littleEndian = filterDoubles predicates.isLittleEndian; + + cygwin = filterDoubles predicates.isCygwin; + darwin = filterDoubles predicates.isDarwin; + freebsd = filterDoubles predicates.isFreeBSD; # Should be better, but MinGW is unclear. - gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }); - illumos = filterDoubles predicates.isSunOS; - linux = filterDoubles predicates.isLinux; - netbsd = filterDoubles predicates.isNetBSD; - openbsd = filterDoubles predicates.isOpenBSD; - unix = filterDoubles predicates.isUnix; - wasi = filterDoubles predicates.isWasi; - redox = filterDoubles predicates.isRedox; - windows = filterDoubles predicates.isWindows; - genode = filterDoubles predicates.isGenode; + gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }); + illumos = filterDoubles predicates.isSunOS; + linux = filterDoubles predicates.isLinux; + netbsd = filterDoubles predicates.isNetBSD; + openbsd = filterDoubles predicates.isOpenBSD; + unix = filterDoubles predicates.isUnix; + wasi = filterDoubles predicates.isWasi; + redox = filterDoubles predicates.isRedox; + windows = filterDoubles predicates.isWindows; + genode = filterDoubles predicates.isGenode; - embedded = filterDoubles predicates.isNone; + embedded = filterDoubles predicates.isNone; mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"]; } From 2f934a967c67423d842c813ed5c1275e7a1e58d4 Mon Sep 17 00:00:00 2001 From: Yves Fischer Date: Sat, 19 Sep 2020 21:48:38 +0200 Subject: [PATCH 448/463] qcad: fix library browser the drawing library of qcad uses qt's database abstract for sqlite. Somehow the libqsqlite library file is not found in the default location. As workaround it is copied to the qcad library directory. --- pkgs/applications/misc/qcad/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 0472a88c356..ad3c884f25e 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -61,6 +61,10 @@ mkDerivationWith stdenv.mkDerivation rec { cp -r plugins $out/lib/plugins cp -r patterns $out/lib/patterns + # workaround to fix the library browser: + rm -r $out/lib/plugins/sqldrivers + ln -s -t $out/lib/plugins ${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}/sqldrivers + install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg runHook postInstall From 05f994426fbe0797ebccba259af7e1748dfd8820 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 19 Sep 2020 23:05:42 -0700 Subject: [PATCH 449/463] pythonPackages.glom: fix tests --- pkgs/development/python-modules/glom/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 6f52eb392a5..916812f1535 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -21,9 +21,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ boltons attrs face ]; checkInputs = [ pytest pyyaml ]; - checkPhase = "pytest glom/test"; - - doCheck = !isPy37; # https://github.com/mahmoud/glom/issues/72 + # test_cli.py checks the output of running "glom" + checkPhase = "PATH=$out/bin:$PATH pytest glom/test"; meta = with stdenv.lib; { homepage = "https://github.com/mahmoud/glom"; From b103ddb9abc757b818303207f73c0de6108fb20b Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sun, 20 Sep 2020 10:10:33 +0200 Subject: [PATCH 450/463] pythonPackages.mock-open: 1.3.1 -> 1.3.2 --- pkgs/development/python-modules/mock-open/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix index 449430a593d..7b6c97b8253 100644 --- a/pkgs/development/python-modules/mock-open/default.nix +++ b/pkgs/development/python-modules/mock-open/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mock-open"; - version = "1.3.1"; + version = "1.3.2"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "nivbend"; repo = pname; rev = "v${version}"; - sha256 = "0ikhrhlkl5c7qbigpsv44jw89ws1z7j06gzyg5dh1ki533ifbjm2"; + sha256 = "08m8mq7wws59zir06b7dzikb6gl6plq3kk2zqrmar6922zcbnk8m"; }; propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock; From 355d255d6cbb11cff39f6bc5ca16654fd6ef454d Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sun, 20 Sep 2020 15:15:28 +0200 Subject: [PATCH 451/463] pythonPackages.mock-open: 1.3.2 -> 1.4.0 --- .../python-modules/mock-open/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix index 7b6c97b8253..391ba29a98c 100644 --- a/pkgs/development/python-modules/mock-open/default.nix +++ b/pkgs/development/python-modules/mock-open/default.nix @@ -1,17 +1,24 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, mock }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, mock }: buildPythonPackage rec { pname = "mock-open"; - version = "1.3.2"; + version = "1.4.0"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "nivbend"; repo = pname; rev = "v${version}"; - sha256 = "08m8mq7wws59zir06b7dzikb6gl6plq3kk2zqrmar6922zcbnk8m"; + sha256 = "0qlz4y8jqxsnmqg03yp9f87rmnjrvmxm5qvm6n1218gm9k5dixbm"; }; + patches = lib.optional (pythonOlder "3.0") + (fetchpatch { + name = "ascii-only.patch"; + url = "https://github.com/das-g/mock-open/commit/521ff260da127949fe4aceff1667cba223c5b07b.patch"; + sha256 = "0ampbhk7kwkn0q5d2h9wrflkr8fji2bybmdck4qdzw1qkslfwwrn"; + }); + propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock; meta = with lib; { From a28068a992d3da5156d5594d50fb8ad2444f18b5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 20 Sep 2020 15:48:51 +0100 Subject: [PATCH 452/463] svgbob: fix build loosen lint settings --- pkgs/tools/graphics/svgbob/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index 374e090af6a..a8850609944 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -10,8 +10,11 @@ rustPlatform.buildRustPackage rec { rev = "0febc4377134a2ea3b3cd43ebdf5ea688a0e7432"; sha256 = "1n0w5b3fjgbczy1iw52172x1p3y1bvw1qpz77fkaxkhrkgfd7vwr"; }; - sourceRoot = "source/svgbob_cli"; + postPatch = '' + substituteInPlace ../svgbob/src/lib.rs \ + --replace '#![deny(warnings)]' "" + ''; cargoSha256 = "1y9jsnxmz51zychmmzp6mi29pb5ks2qww7lk5bshkhp56v51sm8d"; From d07100d89f3755304b22f36eb10ed2e2182e5c11 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 9 Sep 2020 11:42:25 +0300 Subject: [PATCH 453/463] python3Packages.crate: init at 0.24.0 --- .../python-modules/crate/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/crate/default.nix diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix new file mode 100644 index 00000000000..42236b4d7c2 --- /dev/null +++ b/pkgs/development/python-modules/crate/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, urllib3 +, isPy3k +, mock +, sqlalchemy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "crate"; + version = "0.24.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "028q9r1qyqkq185awkazhplfy7y1081963fnjzi3kf3lxvz6yhay"; + }; + + propagatedBuildInputs = [ + urllib3 + ]; + + checkInputs = [ + pytestCheckHook + sqlalchemy + mock + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/crate/crate-python"; + description = "A Python client library for CrateDB"; + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92f8b9690cb..c2c471d9772 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1311,6 +1311,8 @@ in { crashtest = callPackage ../development/python-modules/crashtest { }; + crate = callPackage ../development/python-modules/crate { }; + crayons = callPackage ../development/python-modules/crayons { }; crc16 = callPackage ../development/python-modules/crc16 { }; From b3178aee518ba410a358f6786c8435c203fc92a0 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 9 Sep 2020 11:43:00 +0300 Subject: [PATCH 454/463] python.pkgs.agate-sql: fix tests by adding crate to inputs --- pkgs/development/python-modules/agate-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index cd7a9cd526b..08516d05f00 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy }: +{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: buildPythonPackage rec { pname = "agate-sql"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; }; - propagatedBuildInputs = [ agate sqlalchemy ]; + propagatedBuildInputs = [ agate sqlalchemy crate ]; meta = with stdenv.lib; { description = "Adds SQL read/write support to agate."; From eb9393a4db3b1ef2c372ff8e70629beef1abc159 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 9 Sep 2020 11:43:25 +0300 Subject: [PATCH 455/463] csvkit: 1.0.4 -> 1.0.5 --- pkgs/tools/text/csvkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index 95ef4f22b77..b79011bcff6 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "csvkit"; - version = "1.0.4"; + version = "1.0.5"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1830lb95rh1iyi3drlwxzb6y3pqkii0qiyzd40c1kvhvaf1s6lqk"; + sha256 = "1ffmbzk4rxnl1yhqfl58v7kvl5m9cbvjm8v7xp4mvr00sgs91lvv"; }; propagatedBuildInputs = with python3.pkgs; [ From 8bf99f67876a83a789cd4f97bc9ec2021ac264de Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 9 Sep 2020 11:43:43 +0300 Subject: [PATCH 456/463] csvkit: fix tests Remove unneeded glibcLocales. Remove overrided agate-sql and agate-dbf, as these overrides are not needed. Use pytestCheckHook instead of overriding checkPhase. Add an upstream patch that fixes tests. --- pkgs/tools/text/csvkit/default.nix | 34 +++++++++++------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index b79011bcff6..9e02265e2dc 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, glibcLocales }: +{ lib, fetchpatch, python3 }: python3.pkgs.buildPythonApplication rec { pname = "csvkit"; @@ -9,36 +9,26 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1ffmbzk4rxnl1yhqfl58v7kvl5m9cbvjm8v7xp4mvr00sgs91lvv"; }; + patches = [ + # Fixes a failing dbf related test. Won't be needed on 1.0.6 or later. + (fetchpatch{ + url = "https://github.com/wireservice/csvkit/commit/5f22e664121b13d9ff005a9206873a8f97431dca.patch"; + sha256 = "1kg00z65x7l6dnm5nfsr5krs8m7mv23hhb1inkaqf5m5fpkpnvv7"; + }) + ]; + propagatedBuildInputs = with python3.pkgs; [ agate agate-excel - # dbf test fail with agate-dbf-0.2.2 - (agate-dbf.overridePythonAttrs(old: rec { - version = "0.2.1"; - src = python3.pkgs.fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "0brprva3vjypb5r9lk6zy10jazp681rxsqxzhz2lr869ir4krj80"; - };})) - # sql test fail with agate-sql-0.5.4 - (agate-sql.overridePythonAttrs(old: rec { - version = "0.5.3"; - src = python3.pkgs.fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "1d6rbahmdix7xi7ma2v86fpk5yi32q5dba5vama35w5mmn2pnyw7"; - };})) + agate-dbf + agate-sql six ]; checkInputs = with python3.pkgs; [ - glibcLocales nose + nose pytestCheckHook ]; - checkPhase = '' - LC_ALL="en_US.UTF-8" nosetests -e test_csvsql - ''; - meta = with lib; { description = "A suite of command-line tools for converting to and working with CSV"; maintainers = with maintainers; [ vrthra ]; From 172f3a197e38c885bc5a183ecb12b47081d78819 Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Fri, 11 Sep 2020 00:38:29 +0300 Subject: [PATCH 457/463] lldb_5, lldb_6: add patch for >=python-3.7 --- pkgs/development/compilers/llvm/5/lldb.nix | 10 ++++++++++ pkgs/development/compilers/llvm/6/lldb.nix | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index e0698e1dcf3..e827f76231f 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , zlib , ncurses @@ -20,6 +21,15 @@ stdenv.mkDerivation { src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq"; + patches = [ + # Fix PythonString::GetString for >=python-3.7 + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch"; + sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; + stripLen = 1; + }) + ]; + postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 80e298eaf8c..629749e10f3 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , zlib , ncurses @@ -20,6 +21,15 @@ stdenv.mkDerivation { src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb"; + patches = [ + # Fix PythonString::GetString for >=python-3.7 + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch"; + sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; + stripLen = 1; + }) + ]; + postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ From 09bc8c8d85b6a5c79dadeec9e7c1bbfc70e2c955 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Fri, 11 Sep 2020 23:34:14 +0800 Subject: [PATCH 458/463] can-isotp: 20180629 -> 20200910 --- pkgs/os-specific/linux/can-isotp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 7f16ecb9e6d..cccc7550fba 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation { pname = "can-isotp"; - version = "20180629"; + version = "20200910"; hardeningDisable = [ "pic" ]; src = fetchFromGitHub { owner = "hartkopp"; repo = "can-isotp"; - rev = "6003f9997587e6a563cebf1f246bcd0eb6deff3d"; - sha256 = "0b2pqb0vd1wgv2zpl7lvfavqkzr8mrwhrv7zdqkq3rz9givcv8w7"; + rev = "21a3a59e2bfad246782896841e7af042382fcae7"; + sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq"; }; KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; From 044533c99be5fd12c50354056422e0685f37228f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 12 Sep 2020 01:19:26 +0100 Subject: [PATCH 459/463] libndtypes, pythonPackages.ndtypes: unstable-2018-11-27 -> unstable-2019-08-01 this is the most recent commit to upstream's master at time of writing includes fixes of python package for darwin --- pkgs/development/libraries/libndtypes/default.nix | 8 ++++---- pkgs/development/python-modules/ndtypes/default.nix | 13 ++++++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index ffb2f56d67e..d27c1ba376d 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { pname = "libndtypes"; - version = "unstable-2018-11-27"; + version = "unstable-2019-08-01"; src = fetchFromGitHub { - owner = "plures"; + owner = "xnd-project"; repo = "ndtypes"; - rev = "4d810d0c4d54c81a7136f313f0ae6623853d574a"; - sha256 = "1kk1sa7f17ffh49jc1qlizlsj536fr3s4flb6x4rjyi81rp7psb9"; + rev = "3ce6607c96d8fe67b72cc0c97bf595620cdd274e"; + sha256 = "18303q0jfar1lmi4krp94plczb455zcgw772f9lb8xa5p0bkhx01"; }; # Override linker with cc (symlink to either gcc or clang) diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix index 0d5923820d2..0a6e5635a4f 100644 --- a/pkgs/development/python-modules/ndtypes/default.nix +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ stdenv +, buildPythonPackage +, python , numpy , libndtypes , isPy27 @@ -24,5 +26,14 @@ buildPythonPackage { postInstall = '' mkdir $out/include cp python/ndtypes/*.h $out/include + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${libndtypes}/lib $out/${python.sitePackages}/ndtypes/_ndtypes.*.so + ''; + + checkPhase = '' + pushd python + mv ndtypes _ndtypes + python test_ndtypes.py + popd ''; } From dcd6847ddb75553129e666ee6f3f9763d1d18b4d Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 12 Sep 2020 01:20:46 +0100 Subject: [PATCH 460/463] libxnd, pythonPackages.xnd: unstable-2018-11-27 -> unstable-2019-08-01 this is the most recent commit to upstream's master at time of writing includes fixes of python package for darwin --- pkgs/development/libraries/libxnd/default.nix | 16 ++++++++++++---- pkgs/development/python-modules/xnd/default.nix | 13 ++++++++++++- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index 7313b2582be..1fac0d86d4c 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "libxnd"; - version = "unstable-2018-11-27"; + version = "unstable-2019-08-01"; src = fetchFromGitHub { - owner = "plures"; + owner = "xnd-project"; repo = "xnd"; - rev = "8a9f3bd1d01d872828b40bc9dbd0bc0184524da3"; - sha256 = "10jh2kqvhpzwy50adayh9az7z2lm16yxy4flrh99alzzbqdyls44"; + rev = "6f305cd40d90b4f3fc2fe51ae144b433d186a6cc"; + sha256 = "1n31d64qwlc7m3qkzbafhp0dgrvgvkdx89ykj63kll7r1n3yk59y"; }; buildInputs = [ libndtypes ]; @@ -28,6 +28,14 @@ stdenv.mkDerivation { "--with-libs=${libndtypes}/lib" ]; + # other packages which depend on libxnd seem to expect overflow.h, but + # it doesn't seem to be included in the installed headers. for now this + # works, but the generic name of the header could produce problems + # with collisions down the line. + postInstall = '' + cp libxnd/overflow.h $out/include/overflow.h + ''; + doCheck = true; meta = { diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix index 558e414debf..3178e171f84 100644 --- a/pkgs/development/python-modules/xnd/default.nix +++ b/pkgs/development/python-modules/xnd/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ stdenv +, buildPythonPackage +, python , ndtypes , libndtypes , libxnd @@ -25,5 +27,14 @@ buildPythonPackage { postInstall = '' mkdir $out/include cp python/xnd/*.h $out/include + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${libxnd}/lib $out/${python.sitePackages}/xnd/_xnd.*.so + ''; + + checkPhase = '' + pushd python + mv xnd _xnd + python test_xnd.py + popd ''; } From eb86bff30d874d7d65a7f7342dc81b70815a25df Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 12 Sep 2020 01:21:45 +0100 Subject: [PATCH 461/463] libgumath, pythonPackages.gumath: unstable-2018-11-27 -> unstable-2019-08-01 this is the most recent commit to upstream's master at time of writing includes fixes of python package for darwin --- .../libraries/libgumath/default.nix | 8 ++++---- .../python-modules/gumath/default.nix | 20 ++++++++++++++++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix index 27a10507a58..55e89d87664 100644 --- a/pkgs/development/libraries/libgumath/default.nix +++ b/pkgs/development/libraries/libgumath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "libgumath"; - version = "unstable-2018-11-27"; + version = "unstable-2019-08-01"; src = fetchFromGitHub { - owner = "plures"; + owner = "xnd-project"; repo = "gumath"; - rev = "5a9d27883b40432246d6a93cd6133157267fd166"; - sha256 = "0w2qzp7anxd1wzkvv5r2pdkkpgrnqzgrq47lrvpqc1i1wqzcwf0w"; + rev = "360ed454105ac5615a7cb7d216ad25bc4181b876"; + sha256 = "1wprkxpmjrk369fpw8rbq51r7jvqkcndqs209y7p560cnagmsxc6"; }; buildInputs = [ libndtypes libxnd ]; diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index 2937b876dec..ccf1627d7f3 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ stdenv +, buildPythonPackage +, python , numba , ndtypes , xnd @@ -25,4 +27,20 @@ buildPythonPackage { --replace 'add_runtime_library_dirs = ["$ORIGIN"]' \ 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' ''; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${libgumath}/lib $out/${python.sitePackages}/gumath/_gumath.*.so + ''; + + checkPhase = '' + pushd python + mv gumath _gumath + # minor precision issues + substituteInPlace test_gumath.py --replace 'test_sin' 'dont_test_sin' + python test_gumath.py + python test_xndarray.py + popd + ''; + } + From 43c0499f3a000b1ec56f36c7ea178834644b08de Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 20 Sep 2020 09:13:34 -0700 Subject: [PATCH 462/463] python38Packages.shouldbe: disable for python3.8 --- pkgs/development/python-modules/shouldbe/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/shouldbe/default.nix b/pkgs/development/python-modules/shouldbe/default.nix index 1623d216ac9..068ed934311 100644 --- a/pkgs/development/python-modules/shouldbe/default.nix +++ b/pkgs/development/python-modules/shouldbe/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, pythonAtLeast , fetchPypi , nose , forbiddenfruit @@ -8,6 +9,8 @@ buildPythonPackage rec { version = "0.1.2"; pname = "shouldbe"; + # incompatible, https://github.com/DirectXMan12/should_be/issues/4 + disabled = pythonAtLeast "3.8"; src = fetchPypi { inherit pname version; From 9a4468b935107263ca8e9bab2219e72647a20bf2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 20 Sep 2020 14:15:31 -0400 Subject: [PATCH 463/463] linux: 5.9-rc4 -> 5.9-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 57c6b941c8d..b9db2f103e8 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9-rc4"; + version = "5.9-rc5"; extraMeta.branch = "5.9"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "080qd0dmxs0zmkpcx62vnf719wgkk64a3012r4vsaiymzhddxy8k"; + sha256 = "1f410hkrk1b5g9wkh6078ph03fiyxpmbd5kdl9w592afphcddbrc"; }; # Should the testing kernels ever be built on Hydra?