From a9f7c1022ee16629db62d0442fda5191f479f3aa Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 12 May 2020 07:03:39 +0200 Subject: [PATCH 001/220] 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/220] 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/220] 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/220] 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/220] 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/220] 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/220] 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/220] 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 33cf7bc739d464e2dc4a335e6fee76524dbbf993 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 29 Aug 2020 20:12:03 +0200 Subject: [PATCH 009/220] 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 e2fd022d633127cf9349333ad40e507387a859bf Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sat, 12 Sep 2020 09:10:06 +0200 Subject: [PATCH 010/220] 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 011/220] 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 ad7b27b4c848826e12b76f5fc05f3dfa3e9b50a9 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sat, 12 Sep 2020 17:00:44 +0200 Subject: [PATCH 012/220] 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 6d0c57fb934f18f0e513685981bad0e2f1f9f723 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 14 Sep 2020 15:56:26 +0000 Subject: [PATCH 013/220] 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 a839779e0a4f57d55e123c0729844d4592731150 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 15 Sep 2020 12:08:37 +0300 Subject: [PATCH 014/220] 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 5684d011e44e8ddf09193bc441ab43b9d4c4a820 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Tue, 15 Sep 2020 10:17:23 -0400 Subject: [PATCH 015/220] 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 e469ddc9794075e4f00135e731d89c6096cf9e4d Mon Sep 17 00:00:00 2001 From: lb5tr Date: Tue, 15 Sep 2020 08:24:50 -0700 Subject: [PATCH 016/220] 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 7621c8b1fc23ed61b29bb3482a936de27b3fc9a7 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 15 Sep 2020 22:55:01 +0100 Subject: [PATCH 017/220] 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 809ed03259eb5bb5f82c44e9bdf2812308a43c8d Mon Sep 17 00:00:00 2001 From: eyjhb Date: Wed, 16 Sep 2020 15:05:20 +0200 Subject: [PATCH 018/220] 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 5cae66cb841d3ba45a144c5b3c39c153476aea9b Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Tue, 8 Sep 2020 08:40:48 +0200 Subject: [PATCH 019/220] 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 020/220] 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 b529c6cf652860c3cda0c5e29d6233ea0d0a1e17 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Wed, 16 Sep 2020 21:16:01 +0200 Subject: [PATCH 021/220] 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 d219ce3a8236146625c7b6ec284c90bf19cfb39d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 16 Sep 2020 21:06:57 +0200 Subject: [PATCH 022/220] 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 0596ac5105166bd5b927cd6aa2882269f46b90b0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 17 Sep 2020 16:00:43 +0200 Subject: [PATCH 023/220] =?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 e8a612c06630048e407a28a45a665ea1504106aa Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 17 Sep 2020 19:55:20 +0200 Subject: [PATCH 024/220] =?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 025/220] =?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 9560e5d1aa95dc4282918f17aaf2eb8587bce2d9 Mon Sep 17 00:00:00 2001 From: mlvzk Date: Fri, 18 Sep 2020 00:52:48 +0200 Subject: [PATCH 026/220] 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 ce6de89eeab2e4bed5098a48bdabe296b6c8971e Mon Sep 17 00:00:00 2001 From: Jason O'Conal Date: Fri, 18 Sep 2020 11:54:45 +0930 Subject: [PATCH 027/220] 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 028/220] 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 029/220] 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 030/220] 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 031/220] 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 032/220] 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 033/220] 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 034/220] 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 035/220] 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 036/220] 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 037/220] 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 038/220] 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 039/220] 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 040/220] 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 041/220] 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 042/220] 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 043/220] 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 044/220] 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 045/220] 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 046/220] 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 047/220] 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 048/220] 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 049/220] 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 050/220] 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 051/220] 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 052/220] 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 053/220] 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 054/220] 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 055/220] 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 056/220] 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 057/220] 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 058/220] 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 059/220] 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 060/220] 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 061/220] 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 062/220] 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 063/220] 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 064/220] 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 065/220] 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 066/220] 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 067/220] 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 068/220] 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 069/220] 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 070/220] 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 071/220] 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 072/220] 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 073/220] 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 074/220] 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 075/220] 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 076/220] 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 077/220] 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 078/220] 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 079/220] 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 080/220] 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 081/220] 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 082/220] 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 083/220] 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 084/220] 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 085/220] 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 086/220] 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 087/220] 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 088/220] 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 089/220] 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 090/220] 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 091/220] 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 092/220] 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 093/220] 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 094/220] 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 095/220] 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 096/220] 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 097/220] 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 098/220] 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 099/220] 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 100/220] 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 101/220] 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 102/220] 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 103/220] 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 104/220] 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 105/220] 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 106/220] 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 107/220] 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 108/220] 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 109/220] 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 110/220] 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 111/220] 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 112/220] 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 113/220] 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 114/220] 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 115/220] 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 116/220] 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 117/220] 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 118/220] 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 119/220] 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 120/220] 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 121/220] 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 122/220] 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 123/220] 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 124/220] 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 125/220] 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 126/220] 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 127/220] 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 128/220] 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 129/220] 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 130/220] 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 131/220] 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 132/220] 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 133/220] 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 134/220] 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 135/220] 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 136/220] 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 137/220] 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 138/220] 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 139/220] 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 140/220] 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 141/220] 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 142/220] 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 143/220] 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 144/220] 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 145/220] 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 146/220] 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 147/220] 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 148/220] 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 149/220] 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 150/220] 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 151/220] 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 152/220] 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 153/220] 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 154/220] 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 155/220] 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 156/220] 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 157/220] 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 158/220] 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 159/220] 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 160/220] 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 161/220] 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 162/220] 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 163/220] 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 164/220] 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 165/220] 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 166/220] 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 167/220] 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 168/220] 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 169/220] 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 170/220] 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 171/220] 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 172/220] 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 173/220] 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 174/220] 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 175/220] 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 176/220] 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 177/220] 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 178/220] 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 179/220] 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 180/220] 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 181/220] 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 182/220] 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 183/220] 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 184/220] 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 185/220] 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 186/220] 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 187/220] 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 188/220] 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 189/220] 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 190/220] 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 191/220] 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 192/220] 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 193/220] 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 194/220] 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 195/220] 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 196/220] 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 197/220] 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 198/220] 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 199/220] 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 200/220] 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 201/220] 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 202/220] 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 203/220] 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 204/220] 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 205/220] 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 206/220] 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 207/220] 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 208/220] 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 209/220] 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 210/220] 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 211/220] 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 212/220] 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 213/220] 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 214/220] 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 215/220] 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 216/220] 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 217/220] 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 218/220] 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 219/220] 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 220/220] 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?