From d586d24f7ae18355f6a0ededfe62bebb6ad0e5df Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 8 Feb 2021 17:54:12 +0000 Subject: [PATCH 01/54] fetchFromBitbucket: remove hack for Mercurial Bitbucket deleted all its Mercurial repositories, so presumably this doesn't do anything any more. --- pkgs/build-support/fetchbitbucket/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/fetchbitbucket/default.nix b/pkgs/build-support/fetchbitbucket/default.nix index a99f72e9eaa7..e6e40c4379bb 100644 --- a/pkgs/build-support/fetchbitbucket/default.nix +++ b/pkgs/build-support/fetchbitbucket/default.nix @@ -6,5 +6,4 @@ inherit name; url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz"; meta.homepage = "https://bitbucket.org/${owner}/${repo}/"; - extraPostFetch = ''rm -f "$out"/.hg_archival.txt''; # impure file; see #12002 } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; } From a526d49118f9fd29c996672920fe0d48c7c72732 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 26 Feb 2021 04:20:00 +0000 Subject: [PATCH 02/54] grpc: 1.35.0 -> 1.36.1 https://github.com/grpc/grpc/releases/tag/v1.36.0 https://github.com/grpc/grpc/releases/tag/v1.36.1 --- pkgs/development/libraries/grpc/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index d6a1b44fe426..5374dc75e1a8 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf , gflags, libnsl }: stdenv.mkDerivation rec { - version = "1.35.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.36.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0vxgp3kqxsglavzs91ybpkkh7aaywxcryacp5z3z6dpsgmw0mscd"; + sha256 = "0lb6pls9m05bvr6bvqzp6apdchhsazc5866yvmgkm979xcrzdy2z"; fetchSubmodules = true; }; patches = [ @@ -21,12 +21,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ] + buildInputs = [ zlib c-ares c-ares.cmake-config re2 openssl protobuf gflags ] ++ lib.optionals stdenv.isLinux [ libnsl ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_RE2_PROVIDER=package" "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" From 5ca140cf05a8b6f5edfadd9a7c7e3bcac9aa6add Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 26 Feb 2021 04:20:00 +0000 Subject: [PATCH 03/54] python38Packages.grpcio-tools: 1.35.0 -> 1.36.1 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 8ac1cd6f0d6c..d2d06450b925 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.35.0"; + version = "1.36.1"; src = fetchPypi { inherit pname version; - sha256 = "9e2a41cba9c5a20ae299d0fdd377fe231434fa04cbfbfb3807293c6ec10b03cf"; + sha256 = "80ef584f7b917f575e4b8f2ec59cd4a4d98c2046e801a735f3136b05742a36a6"; }; outputs = [ "out" "dev" ]; From ecd4264f354c293328dfb0cc8cf0bba270959f1f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Mar 2021 22:49:10 +0000 Subject: [PATCH 04/54] goreleaser: 0.157.0 -> 0.158.0 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index b5fc2d0d2bc0..f3dd909d22ba 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.157.0"; + version = "0.158.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wUlAllWBGJBZ98lbf2pOfW3a31r74py5Zh7uszkRYqA="; + sha256 = "sha256-ewwJHn55zzry2hhMNuRUlGwC995r0ooPJGqKYaCh4WE="; }; - vendorSha256 = "sha256-8SOUFlbwGwRuOB50V9eXE9KQWGiSexTZct6Rux6Stuw="; + vendorSha256 = "sha256-awgkYMidTDcUjQt7hA5cSiwSAsNo5iUqKcG4+2lCXIM="; buildFlagsArray = [ "-ldflags=" From 85a8657aa69940eebd905c18b5d94adfef2695d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Mar 2021 01:53:29 +0000 Subject: [PATCH 05/54] mergerfs: 2.32.3 -> 2.32.4 --- pkgs/tools/filesystems/mergerfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 6da9b9c92a9a..6f0a40d76afe 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.32.3"; + version = "2.32.4"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-loOBMrAtvJAcFdcgwzEEko7TMM07Ocx+1umxjnLB1uY="; + sha256 = "sha256-VTnAAJWya1JLZA0gjzpUsdnO5XQP8sJzEP8qHBH+t5k="; }; nativeBuildInputs = [ From 38a63351cc1700118b4bd01a566b1fa040a72ae4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Mar 2021 13:35:16 +0000 Subject: [PATCH 06/54] circleci-cli: 0.1.12214 -> 0.1.15085 --- pkgs/development/tools/misc/circleci-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 80e8119b6b31..c22f839321ca 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.12214"; + version = "0.1.15085"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YV/fqATdGqlAdpKuOMq8KO9UQ+4D1PHwIE5O1zqndHQ="; + sha256 = "sha256-KcC9KfAeUM3pMSNThL+w/kzpQYzcMYV6YoNEN4q6duA="; }; - vendorSha256 = "sha256-6FBMLwoLM2BtnMHQfpY7f7NiQt5evsL4CfYTZvr3gAs="; + vendorSha256 = "sha256-j7VP/QKKMdmWQ60BYpChG4syDlll7CY4rb4wfb4+Z1s="; doCheck = false; From 601c844e4ce1eff830cb246164c559e06fb8b992 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 6 Mar 2021 05:00:00 -0500 Subject: [PATCH 07/54] shadowsocks-rust: 1.9.1 -> 1.9.2 https://github.com/shadowsocks/shadowsocks-rust/releases/tag/v1.9.2 --- pkgs/tools/networking/shadowsocks-rust/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index cf761c8ca273..27b8197f4c42 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, libiconv }: rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "1lxx9xzkv3y2qjffa5dmwv0ygka71dx3c2995ggcgy5fb19yrghc"; + sha256 = "1mqxfw21ilcy0gc2jrn5f385y3g9inabp9fjc39m5ydljja4g5b9"; }; - cargoSha256 = "0p93dv4nlwl5167dmp160l09wqba5d40gaiwc6vbzb4iqdicgwls"; + cargoSha256 = "1ja2hcsa2wa0zmblz4ps35jcx1y29j469lf4i9a7sw0kgh3xp1ha"; RUSTC_BOOTSTRAP = 1; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; checkFlags = [ "--skip=http_proxy" "--skip=udp_tunnel" ]; @@ -24,5 +24,6 @@ rustPlatform.buildRustPackage rec { description = "A Rust port of shadowsocks"; license = licenses.mit; maintainers = [ maintainers.marsam ]; + broken = stdenv.isAarch64; # crypto2 crate doesn't build on aarch64 }; } From 01f13677b92672436829d0c4ba81315bf6a20541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 08:37:31 +0100 Subject: [PATCH 08/54] pythonPackages.google-music: drop --- .../python-modules/google-music/default.nix | 41 ------------------- pkgs/top-level/python-packages.nix | 2 - 2 files changed, 43 deletions(-) delete mode 100644 pkgs/development/python-modules/google-music/default.nix diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix deleted file mode 100644 index 90978ad2cba7..000000000000 --- a/pkgs/development/python-modules/google-music/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, appdirs -, audio-metadata -, google-music-proto -, httpx -, protobuf -, requests_oauthlib -, tenacity -}: - -buildPythonPackage rec { - pname = "google-music"; - version = "3.7.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp"; - }; - - propagatedBuildInputs = [ - appdirs - audio-metadata - google-music-proto - httpx - protobuf - requests_oauthlib - tenacity - ]; - - # No tests - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/thebigmunch/google-music"; - description = "A Google Music API wrapper"; - license = licenses.mit; - maintainers = with maintainers; [ jakewaksbaum ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ada815948ff3..9332b4a7d33c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2776,8 +2776,6 @@ in { googlemaps = callPackage ../development/python-modules/googlemaps { }; - google-music = callPackage ../development/python-modules/google-music { }; - google-music-proto = callPackage ../development/python-modules/google-music-proto { }; google-music-utils = callPackage ../development/python-modules/google-music-utils { }; From 396f04a75f85a7a86551e82a0e410b1fcfa91127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 08:36:45 +0100 Subject: [PATCH 09/54] pythonPackages.google-music-proto: drop --- .../google-music-proto/default.nix | 48 ------------------- pkgs/top-level/python-packages.nix | 2 - 2 files changed, 50 deletions(-) delete mode 100644 pkgs/development/python-modules/google-music-proto/default.nix diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix deleted file mode 100644 index a883f707bdf1..000000000000 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, attrs -, audio-metadata -, importlib-metadata -, marshmallow -, pendulum -, protobuf -}: - -buildPythonPackage rec { - pname = "google-music-proto"; - version = "2.10.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "91b78c0de4f59b1e5503fd6d49cb3fec029d9199cca0794c87667e643342e987"; - }; - - postPatch = '' - sed -i -e "/audio-metadata/c\'audio-metadata'," -e "/marshmallow/c\'marshmallow'," setup.py - substituteInPlace setup.py \ - --replace "'attrs>=18.2,<19.4'" "'attrs'" - ''; - - propagatedBuildInputs = [ - attrs - audio-metadata - marshmallow - pendulum - protobuf - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - - # No tests - doCheck = false; - pythonImportsCheck = [ "google_music_proto" ]; - - meta = with lib; { - homepage = "https://github.com/thebigmunch/google-music-proto"; - description = "Sans-I/O wrapper of Google Music API calls"; - license = licenses.mit; - maintainers = with maintainers; [ jakewaksbaum ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9332b4a7d33c..ff380603d321 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2776,8 +2776,6 @@ in { googlemaps = callPackage ../development/python-modules/googlemaps { }; - google-music-proto = callPackage ../development/python-modules/google-music-proto { }; - google-music-utils = callPackage ../development/python-modules/google-music-utils { }; google-pasta = callPackage ../development/python-modules/google-pasta { }; From eb563d8bea51fec01a7142d5a4413a08608dd333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 08:38:27 +0100 Subject: [PATCH 10/54] pythonPackages.google-music-utils: drop --- .../google-music-utils/default.nix | 40 ------------------- pkgs/top-level/python-packages.nix | 2 - 2 files changed, 42 deletions(-) delete mode 100644 pkgs/development/python-modules/google-music-utils/default.nix diff --git a/pkgs/development/python-modules/google-music-utils/default.nix b/pkgs/development/python-modules/google-music-utils/default.nix deleted file mode 100644 index 801b4b78a178..000000000000 --- a/pkgs/development/python-modules/google-music-utils/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, audio-metadata -, multidict -, poetry -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "google-music-utils"; - version = "2.5.0"; - - # Pypi tarball doesn't contain tests - src = fetchFromGitHub { - owner = "thebigmunch"; - repo = "google-music-utils"; - rev = version; - sha256 = "0vwbrgakk23fypjspmscz4gllnb3dksv2njy4j4bm8vyr6fwbi5f"; - }; - format = "pyproject"; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'multidict = "^4.0"' 'multidict = ">4.0"' - ''; - - nativeBuildInputs = [ poetry ]; - - propagatedBuildInputs = [ audio-metadata multidict ]; - - checkInputs = [ pytestCheckHook ]; - - meta = with lib; { - homepage = "https://github.com/thebigmunch/google-music-utils"; - description = "A set of utility functionality for google-music and related projects"; - license = licenses.mit; - maintainers = with maintainers; [ jakewaksbaum ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff380603d321..9c1d2945cc03 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2776,8 +2776,6 @@ in { googlemaps = callPackage ../development/python-modules/googlemaps { }; - google-music-utils = callPackage ../development/python-modules/google-music-utils { }; - google-pasta = callPackage ../development/python-modules/google-pasta { }; google-resumable-media = callPackage ../development/python-modules/google-resumable-media { }; From 9fc36e1b7f846915fd152b70ea4ca5f9d4e099ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 08:44:50 +0100 Subject: [PATCH 11/54] google-music-scripts: drop --- .../audio/google-music-scripts/default.nix | 59 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 pkgs/tools/audio/google-music-scripts/default.nix diff --git a/pkgs/tools/audio/google-music-scripts/default.nix b/pkgs/tools/audio/google-music-scripts/default.nix deleted file mode 100644 index 481a7ecb75b3..000000000000 --- a/pkgs/tools/audio/google-music-scripts/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, python3 }: - -let - py = python3.override { - packageOverrides = self: super: { - loguru = super.loguru.overridePythonAttrs (oldAttrs: rec { - version = "0.4.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0j47cg3gi8in4z6z4w3by6x02mpkkfl78gr85xjn5rg0nxiz7pfm"; - }; - }); - }; - }; - -in - -with py.pkgs; - -buildPythonApplication rec { - pname = "google-music-scripts"; - version = "4.5.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0apwgj86whrc077dfymvyb4qwj19bawyrx49g4kg364895v0rbbq"; - }; - - # there are already later releases present - postPatch = '' - substituteInPlace setup.py \ - --replace "tomlkit>=0.5,<0.6" "tomlkit" \ - --replace "attrs>=18.2,<19.4" "attrs" - ''; - - propagatedBuildInputs = [ - appdirs - audio-metadata - google-music - google-music-proto - google-music-utils - loguru - pendulum - natsort - tomlkit - ]; - - # No tests - checkPhase = '' - $out/bin/gms --help >/dev/null - ''; - - meta = with lib; { - homepage = "https://github.com/thebigmunch/google-music-scripts"; - description = "A CLI utility for interacting with Google Music"; - license = licenses.mit; - maintainers = with maintainers; [ jakewaksbaum ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cd6418e1e817..dc5b8015defb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -259,6 +259,7 @@ mapAliases ({ goimports = gotools; # added 2018-09-16 gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23 google-gflags = gflags; # added 2019-07-25 + google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # added 2021-03-07 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5aee51d878ac..e6095875da4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4875,8 +4875,6 @@ in google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { }; - google-music-scripts = callPackage ../tools/audio/google-music-scripts { }; - google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; gdown = with python3Packages; toPythonApplication gdown; From 1080bd321cf5d402c7efbab380f5c8b6718b5aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 08:46:10 +0100 Subject: [PATCH 12/54] google-musicmanager: drop --- .../audio/google-musicmanager/default.nix | 77 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 11 --- 3 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 pkgs/applications/audio/google-musicmanager/default.nix diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix deleted file mode 100644 index e10a961a9e64..000000000000 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, fetchurl -, flac, expat, libidn, qtbase, qtwebkit, libvorbis }: -assert stdenv.hostPlatform.system == "x86_64-linux"; - -stdenv.mkDerivation rec { - version = "beta_1.0.467.4929-r0"; # friendly to nix-env version sorting algo - product = "google-musicmanager"; - name = "${product}-${version}"; - - # When looking for newer versions, since google doesn't let you list their repo dirs, - # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/Release - # fetch an appropriate packages file such as main/binary-amd64/Packages: - # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-amd64/Packages - # which will contain the links to all available *.debs for the arch. - - src = fetchurl { - url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_amd64.deb"; - sha256 = "0yaprpbp44var88kdj1h11fqkhgcklixr69jyia49v9m22529gg2"; - }; - - unpackPhase = '' - ar vx ${src} - tar xvf data.tar.xz - tar xvf control.tar.gz - ''; - - prePatch = '' - sed -i "s@\(Exec=\).*@\1$out/bin/google-musicmanager@" opt/google/musicmanager/google-musicmanager.desktop - ''; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/lib - mkdir -p $out/share/applications - - cp -r opt $out - find -name "*.so*" -exec cp "{}" $out/lib \; - ln -s $out/opt/google/musicmanager/google-musicmanager $out/bin - ln -s $out/opt/google/musicmanager/google-musicmanager.desktop $out/share/applications - - for i in 16 32 48 128 - do - iconDirectory=$out/usr/share/icons/hicolor/"$i"x"$i"/apps - - mkdir -p $iconDirectory - ln -s $out/opt/google/musicmanager/product_logo_"$i".png $iconDirectory/google-musicmanager.png - done - ''; - - postFixup = '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/minidump_upload):${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ - $out/opt/google/musicmanager/minidump_upload - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/MusicManager):$out/lib:${lib.makeLibraryPath [ - flac - expat - libidn - qtbase - qtwebkit - libvorbis - stdenv.cc.cc.lib - ]}" \ - $out/opt/google/musicmanager/MusicManager - ''; - - meta = with lib; { - description = "Uploads music from your computer to Google Play"; - homepage = "https://support.google.com/googleplay/answer/1229970"; - license = licenses.unfree; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dc5b8015defb..4ac6a8e5946c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -260,6 +260,7 @@ mapAliases ({ gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23 google-gflags = gflags; # added 2019-07-25 google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # added 2021-03-07 + google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6095875da4e..bb11fb3f4531 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22370,17 +22370,6 @@ in inherit (ocamlPackages) google-drive-ocamlfuse; - google-musicmanager = callPackage ../applications/audio/google-musicmanager { - inherit (qt514) qtbase qtwebkit; - # Downgrade to 1.34 to get libidn.so.11 - libidn = (libidn.overrideAttrs (oldAttrs: { - src = fetchurl { - url = "mirror://gnu/libidn/libidn-1.34.tar.gz"; - sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; - }; - })).out; - }; - googler = callPackage ../applications/misc/googler { python = python3; }; From aef2a70f67a6b051eb20b87d58f22ecd6ba63925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 08:47:46 +0100 Subject: [PATCH 13/54] google-play-music-desktop-player: drop --- .../default.nix | 82 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 3 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 pkgs/applications/audio/google-play-music-desktop-player/default.nix diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix deleted file mode 100644 index f86eed1d34da..000000000000 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype -, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr -, nss, pango, udev, xorg -}: - -let - version = "4.7.1"; - - deps = [ - alsaLib - atk - at-spi2-atk - cairo - cups - dbus - expat - fontconfig - freetype - GConf - gdk-pixbuf - glib - gtk2 - gtk3 - libpulseaudio - nspr - nss - pango - stdenv.cc.cc - udev - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - ]; - -in - -stdenv.mkDerivation { - pname = "google-play-music-desktop-player"; - inherit version; - - src = fetchurl { - url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; - sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r"; - }; - - dontBuild = true; - nativeBuildInputs = [ dpkg makeWrapper ]; - - unpackPhase = '' - dpkg -x $src . - ''; - - installPhase = '' - mkdir -p $out - cp -r ./usr/share $out - cp -r ./usr/bin $out - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/share/google-play-music-desktop-player/Google Play Music Desktop Player" - - wrapProgram $out/bin/google-play-music-desktop-player \ - --prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath deps}" - ''; - - meta = { - homepage = "https://www.googleplaymusicdesktopplayer.com/"; - description = "A beautiful cross platform Desktop Player for Google Play Music"; - license = lib.licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = [ lib.maintainers.SuprDewd ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4ac6a8e5946c..968be61d7a18 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -261,6 +261,7 @@ mapAliases ({ google-gflags = gflags; # added 2019-07-25 google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # added 2021-03-07 google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07 + google-play-music-desktop-player = throw "google-play-music-desktop-player has been removed because Google Play Music was discontinued"; # added 2021-03-07 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb11fb3f4531..65d62cc1d39c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22822,10 +22822,6 @@ in google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; - google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player { - inherit (gnome2) GConf; - }; - gosmore = callPackage ../applications/misc/gosmore { }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { From e3efd45261ebf5407947167f246b74f515c09aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 08:51:31 +0100 Subject: [PATCH 14/54] mopidy-gmusic: drop --- pkgs/applications/audio/mopidy/default.nix | 2 -- pkgs/applications/audio/mopidy/gmusic.nix | 29 ---------------------- pkgs/applications/audio/mopidy/mopidy.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 5 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 pkgs/applications/audio/mopidy/gmusic.nix diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 2c19afb16a22..44d48fb3783a 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -12,8 +12,6 @@ let mopidy = callPackage ./mopidy.nix { }; - mopidy-gmusic = callPackage ./gmusic.nix { }; - mopidy-iris = callPackage ./iris.nix { }; mopidy-local = callPackage ./local.nix { }; diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix deleted file mode 100644 index 6e76d6af87d3..000000000000 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, python3Packages, mopidy }: - -python3Packages.buildPythonApplication rec { - pname = "mopidy-gmusic"; - version = "4.0.0"; - - src = python3Packages.fetchPypi { - inherit version; - pname = "Mopidy-GMusic"; - sha256 = "14yswmlfs659rs3k595606m77lw9c6pjykb5pikqw21sb97haxl3"; - }; - - propagatedBuildInputs = [ - mopidy - python3Packages.requests - python3Packages.gmusicapi - python3Packages.cachetools - ]; - - doCheck = false; - - meta = with lib; { - homepage = "https://www.mopidy.com/"; - description = "Mopidy extension for playing music from Google Play Music"; - license = licenses.asl20; - maintainers = [ maintainers.jgillich ]; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 63a28eb0f58e..d53bfee9efd2 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -42,7 +42,7 @@ pythonPackages.buildPythonApplication rec { homepage = "https://www.mopidy.com/"; description = '' An extensible music server that plays music from local disk, Spotify, - SoundCloud, Google Play Music, and more + SoundCloud, and more ''; license = licenses.asl20; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 968be61d7a18..09272281829d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -386,6 +386,7 @@ mapAliases ({ mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25 mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 + mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07 mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mysql-client = hiPrio mariadb.client; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65d62cc1d39c..6d7bfcb7518d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23885,7 +23885,6 @@ in inherit (mopidyPackages) mopidy - mopidy-gmusic mopidy-iris mopidy-local mopidy-moped From 874ecc62d28f99bf956697a930bb0f6b4024d5d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 08:52:43 +0100 Subject: [PATCH 15/54] tuijam: drop --- pkgs/applications/audio/tuijam/default.nix | 45 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/applications/audio/tuijam/default.nix diff --git a/pkgs/applications/audio/tuijam/default.nix b/pkgs/applications/audio/tuijam/default.nix deleted file mode 100644 index d9b9012521cb..000000000000 --- a/pkgs/applications/audio/tuijam/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ buildPythonApplication -, fetchFromGitHub -, lib -, python3Packages -}: - -buildPythonApplication rec { - pname = "tuijam"; - version = "unstable-2020-06-05"; - - src = fetchFromGitHub { - owner = "cfangmeier"; - repo = pname; - rev = "7baec6f6e80ee90da0d0363b430dd7d5695ff03b"; - sha256 = "1l0s88jvj99jkxnczw5nfj78m8vihh29g815n4mg9jblad23mgx5"; - }; - - buildInputs = [ python3Packages.Babel ]; - - # the package has no tests - doCheck = false; - - propagatedBuildInputs = with python3Packages; [ - gmusicapi - google-api-python-client - mpv - pydbus - pygobject3 - pyyaml - requests - rsa - urwid - ]; - - meta = with lib; { - description = "A fancy TUI client for Google Play Music"; - longDescription = '' - TUIJam seeks to make a simple, attractive, terminal-based interface to - listening to music for Google Play Music All-Access subscribers. - ''; - homepage = "https://github.com/cfangmeier/tuijam"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 09272281829d..8785ba1aa4b5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -733,6 +733,7 @@ mapAliases ({ trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29 truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 + tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07 uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d7bfcb7518d..bea0b00ad427 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -662,8 +662,6 @@ in arc_unpacker = callPackage ../tools/archivers/arc_unpacker { }; - tuijam = callPackage ../applications/audio/tuijam { inherit (python3Packages) buildPythonApplication; }; - opnplug = callPackage ../applications/audio/adlplug { adlplugChip = "-DADLplug_CHIP=OPN2"; pname = "OPNplug"; From 46aeb3a48dae283c319979e976871f976ac3c870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 08:53:59 +0100 Subject: [PATCH 16/54] beets: remove Google Play Music support --- pkgs/tools/audio/beets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 2be0b1bc76f6..5cae647cf8f7 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -16,7 +16,6 @@ , enableDiscogs ? true , enableEmbyupdate ? true , enableFetchart ? true -, enableGmusic ? true , enableKeyfinder ? true, keyfinder-cli , enableKodiupdate ? true , enableLastfm ? true @@ -54,7 +53,6 @@ let discogs = enableDiscogs; embyupdate = enableEmbyupdate; fetchart = enableFetchart; - gmusic = enableGmusic; keyfinder = enableKeyfinder; kodiupdate = enableKodiupdate; lastgenre = enableLastfm; @@ -144,7 +142,6 @@ in pythonPackages.buildPythonApplication rec { ++ lib.optional enableCheck beetsExternalPlugins.check ++ lib.optional enableConvert ffmpeg ++ lib.optional enableDiscogs pythonPackages.discogs_client - ++ lib.optional enableGmusic pythonPackages.gmusicapi ++ lib.optional enableKeyfinder keyfinder-cli ++ lib.optional enableLastfm pythonPackages.pylast ++ lib.optional enableMpd pythonPackages.mpd2 @@ -209,6 +206,9 @@ in pythonPackages.buildPythonApplication rec { echo echo completion tests passed > test/rsrc/test_completion.sh sed -i -e 's/len(mf.images)/0/' test/test_zero.py + + # Google Play Music was discontinued + rm -r beetsplug/gmusic.py ''; postInstall = '' From b961b571bb9c33f553d51822ae1191ab93454793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 08:49:59 +0100 Subject: [PATCH 17/54] pythonPackages.gmusicapi: drop --- .../python-modules/gmusicapi/default.nix | 40 ------------------- pkgs/top-level/python-packages.nix | 2 - 2 files changed, 42 deletions(-) delete mode 100644 pkgs/development/python-modules/gmusicapi/default.nix diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix deleted file mode 100644 index c9fc464f0694..000000000000 --- a/pkgs/development/python-modules/gmusicapi/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, validictory -, decorator -, mutagen -, protobuf -, setuptools -, requests -, dateutil -, proboscis -, mock -, appdirs -, oauth2client -, pyopenssl -, gpsoauth -, MechanicalSoup -, future -}: - -buildPythonPackage rec { - pname = "gmusicapi"; - version = "13.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "14dqs64nhy84dykyyrdjmsirc7m169zsvwa8abh4v0xcm658lm5k"; - }; - - propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ]; - - doCheck = false; - pythonImportsCheck = [ "gmusicapi" ]; - - meta = with lib; { - description = "An unofficial API for Google Play Music"; - homepage = "https://pypi.python.org/pypi/gmusicapi/"; - license = licenses.bsd3; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c1d2945cc03..62ca34846593 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2651,8 +2651,6 @@ in { gmpy = callPackage ../development/python-modules/gmpy { }; - gmusicapi = callPackage ../development/python-modules/gmusicapi { }; - gntp = callPackage ../development/python-modules/gntp { }; gnureadline = callPackage ../development/python-modules/gnureadline { }; From 00210fcf0d7066c772a6cbe9d4668e6d0bc13f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 7 Mar 2021 15:49:23 +0100 Subject: [PATCH 18/54] beetsExternalPlugins.alternatives: 0.9.0 -> 0.10.2 --- pkgs/tools/audio/beets/plugins/alternatives.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix index 797aab16c1ae..c0b9123d96a5 100644 --- a/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -2,19 +2,26 @@ pythonPackages.buildPythonApplication rec { pname = "beets-alternatives"; - version = "0.9.0"; + version = "0.10.2"; src = fetchFromGitHub { repo = "beets-alternatives"; owner = "geigerzaehler"; - # This is 0.8.2 with fixes against Beets 1.4.6 and Python 3 compatibility. rev = "v${version}"; - sha256 = "19160gwg5j6asy8mc21g2kf87mx4zs9x2gbk8q4r6330z4kpl5pm"; + sha256 = "1dsz94fb29wra1f9580w20bz2f1bgkj4xnsjgwgbv14flbfw4bp0"; }; - nativeBuildInputs = [ beets pythonPackages.nose ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "addopts = --cov --cov-report=term --cov-report=html" "" + ''; - checkPhase = "nosetests"; + nativeBuildInputs = [ beets ]; + + checkInputs = with pythonPackages; [ + pytestCheckHook + mock + ]; meta = { description = "Beets plugin to manage external files"; From 3c51c0f39a53f466fffbf3929b03768c1ec3968b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 7 Mar 2021 15:56:44 +0100 Subject: [PATCH 19/54] beetsExternalPlugins.check: mark as broken --- pkgs/tools/audio/beets/plugins/check.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/audio/beets/plugins/check.nix b/pkgs/tools/audio/beets/plugins/check.nix index 259b62a23b05..a575836ef388 100644 --- a/pkgs/tools/audio/beets/plugins/check.nix +++ b/pkgs/tools/audio/beets/plugins/check.nix @@ -31,5 +31,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/geigerzaehler/beets-check"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; + broken = true; }; } From fe18908ed6441da96a8f5e89ae4025bb1c567221 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sun, 7 Mar 2021 16:36:33 +0100 Subject: [PATCH 20/54] traefik: 2.4.3 -> 2.4.6 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index e8282ec4c0ba..f09f99e66b56 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.4.3"; + version = "2.4.6"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-lCUwzd+ECi2g5jv6ksxrlDdx7cjLgBnaBdYbgzADkcg="; + sha256 = "1f2gj9axmdisp4yza5pa60x2s79vdybgsb5ddyfwkl5m89sh0r2z"; stripRoot = false; }; - vendorSha256 = "sha256-kCRXDEuaxFVZuP7PkmZIiXjhMUWjMYbOOtWl4V81DeI="; + vendorSha256 = "1w9crp4bk5dk0ph558w9mj8cylm2z6bc81hghmv86ild524a0l9v"; doCheck = false; From 6feb61233bc66d00bdb28dc2375bd2c5221858fd Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 29 May 2020 14:25:48 +0200 Subject: [PATCH 21/54] linux: make sure all config options have the same value Currently, kernel config options whose value is "yes" always override options whose value is "no". This is not always desired. Generally speaking, if someone defines an option to have the value "no", presumably they are disabling the option for a reason, so it's not always OK to silently enable it due to another, probably unrelated reason. For example, a user may want to reduce the kernel attack surface and therefore may want to disable features that are being enabled in common-config.nix. In fact, common-config.nix was already silently enabling options that were intended to be disabled in hardened/config.nix for security reasons, such as INET_DIAG. By eliminating the custom merge function, these config options will now use the default module option merge functions which make sure that all options with the highest priority have the same value. A user that wishes to override an option defined in common-config.nix can currently use mkForce or mkOverride to do so, e.g.: BINFMT_MISC = mkForce (option no); That said, this is not going to be necessary in the future, because the plan is for kernel config options defined in nixpkgs to use a lower priority by default, like it currently happens for other module options. --- nixos/modules/system/boot/kernel_config.nix | 22 +-------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/nixos/modules/system/boot/kernel_config.nix b/nixos/modules/system/boot/kernel_config.nix index 783685c9dfe4..5d9534024b06 100644 --- a/nixos/modules/system/boot/kernel_config.nix +++ b/nixos/modules/system/boot/kernel_config.nix @@ -2,24 +2,6 @@ with lib; let - findWinner = candidates: winner: - any (x: x == winner) candidates; - - # winners is an ordered list where first item wins over 2nd etc - mergeAnswer = winners: locs: defs: - let - values = map (x: x.value) defs; - inter = intersectLists values winners; - winner = head winners; - in - if defs == [] then abort "This case should never happen." - else if winner == [] then abort "Give a valid list of winner" - else if inter == [] then mergeOneOption locs defs - else if findWinner values winner then - winner - else - mergeAnswer (tail winners) locs defs; - mergeFalseByDefault = locs: defs: if defs == [] then abort "This case should never happen." else if any (x: x == false) (getValues defs) then false @@ -28,9 +10,7 @@ let kernelItem = types.submodule { options = { tristate = mkOption { - type = types.enum [ "y" "m" "n" null ] // { - merge = mergeAnswer [ "y" "m" "n" ]; - }; + type = types.enum [ "y" "m" "n" null ]; default = null; internal = true; visible = true; From d81067f3f3c1c82231eeca2b0e69b89d544ea028 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 10 Jun 2020 16:29:14 +0200 Subject: [PATCH 22/54] linux: fix fallout from conflicting kernel configs The parent commit forbids conflicting kernel config options. Fix the hardened kernels by allowing options in common-config.nix to be overridden by conflicting ones in hardened/config.nix. I'm explicitly avoiding using a higher priority (e.g. using mkForce) in hardened/config.nix so that the user can easily override the options in that file. --- pkgs/os-specific/linux/kernel/common-config.nix | 13 +++++++------ pkgs/os-specific/linux/kernel/hardened/config.nix | 10 +++++++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 24c992dc907d..62fe54bbe3fd 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -193,16 +193,17 @@ let NET_DROP_MONITOR = yes; # needed for ss - INET_DIAG = module; - INET_TCP_DIAG = module; - INET_UDP_DIAG = module; - INET_RAW_DIAG = whenAtLeast "4.14" module; - INET_DIAG_DESTROY = whenAtLeast "4.9" yes; + # Use a lower priority to allow these options to be overridden in hardened/config.nix + INET_DIAG = mkDefault module; + INET_TCP_DIAG = mkDefault module; + INET_UDP_DIAG = mkDefault module; + INET_RAW_DIAG = whenAtLeast "4.14" (mkDefault module); + INET_DIAG_DESTROY = whenAtLeast "4.9" (mkDefault yes); # enable multipath-tcp MPTCP = whenAtLeast "5.6" yes; MPTCP_IPV6 = whenAtLeast "5.6" yes; - INET_MPTCP_DIAG = whenAtLeast "5.9" module; + INET_MPTCP_DIAG = whenAtLeast "5.9" (mkDefault module); }; wireless = { diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index bd0518650d6c..acffa383f076 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -65,7 +65,7 @@ assert (versionAtLeast version "4.9"); PANIC_TIMEOUT = freeform "-1"; GCC_PLUGINS = yes; # Enable gcc plugin options - # Gather additional entropy at boot time for systems that may = no;ot have appropriate entropy sources. + # Gather additional entropy at boot time for systems that may not have appropriate entropy sources. GCC_PLUGIN_LATENT_ENTROPY = yes; GCC_PLUGIN_STRUCTLEAK = whenAtLeast "4.11" yes; # A port of the PaX structleak plugin @@ -79,6 +79,14 @@ assert (versionAtLeast version "4.9"); PROC_KCORE = no; # Exposes kernel text image layout INET_DIAG = no; # Has been used for heap based attacks in the past + # INET_DIAG=n causes the following options to not exist anymore, but since they are defined in common-config.nix, + # make them optional + INET_DIAG_DESTROY = option no; + INET_RAW_DIAG = option no; + INET_TCP_DIAG = option no; + INET_UDP_DIAG = option no; + INET_MPTCP_DIAG = option no; + # Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage. CC_STACKPROTECTOR_REGULAR = whenOlder "4.18" no; CC_STACKPROTECTOR_STRONG = whenOlder "4.18" yes; From 5b7551970d5e78af2050d7e5b1a88fdda3e7566b Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 16 Jan 2021 01:51:17 -0800 Subject: [PATCH 23/54] maintainers: add zhaofengli --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c115c310a35b..fcf1f4a802fb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10556,6 +10556,12 @@ githubId = 1141948; name = "Zack Grannan"; }; + zhaofengli = { + email = "hello@zhaofeng.li"; + github = "zhaofengli"; + githubId = 2189609; + name = "Zhaofeng Li"; + }; zimbatm = { email = "zimbatm@zimbatm.com"; github = "zimbatm"; From 70fc42b44957b5c4a0633e09cc08f87fbbf4950f Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 16 Jan 2021 01:07:47 -0800 Subject: [PATCH 24/54] python3Packages.lima: init at 0.5 --- .../python-modules/lima/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/lima/default.nix diff --git a/pkgs/development/python-modules/lima/default.nix b/pkgs/development/python-modules/lima/default.nix new file mode 100644 index 000000000000..16a5f01ed7a9 --- /dev/null +++ b/pkgs/development/python-modules/lima/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, pytestCheckHook }: + +buildPythonPackage rec { + pname = "lima"; + version = "0.5"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0qqj0053r77ppkcyyk2fhpaxjzsl1h98nf9clpny6cs66sdl241v"; + }; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Lightweight Marshalling of Python 3 Objects."; + homepage = "https://github.com/b6d/lima"; + license = licenses.mit; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 476f9e89b703..991d4bc0deb9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3817,6 +3817,8 @@ in { lightparam = callPackage ../development/python-modules/lightparam { }; + lima = callPackage ../development/python-modules/lima { }; + limitlessled = callPackage ../development/python-modules/limitlessled { }; limits = callPackage ../development/python-modules/limits { }; From 0da9e83479b8c490c1ed07ce926464f5479ad33a Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 16 Jan 2021 01:23:15 -0800 Subject: [PATCH 25/54] python3Packages.flask-seasurf: init at 0.3.0 --- .../python-modules/flask-seasurf/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/flask-seasurf/default.nix diff --git a/pkgs/development/python-modules/flask-seasurf/default.nix b/pkgs/development/python-modules/flask-seasurf/default.nix new file mode 100644 index 000000000000..ff1f97c42184 --- /dev/null +++ b/pkgs/development/python-modules/flask-seasurf/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, flask }: + +buildPythonPackage rec { + pname = "Flask-SeaSurf"; + version = "0.3.0"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "maxcountryman"; + repo = "flask-seasurf"; + rev = version; + sha256 = "02hsvppsz1d93v641f14fdnd22gbc12ilc9k9kn7wl119n5s3pd8"; + }; + + propagatedBuildInputs = [ flask ]; + + pythonImportsCheck = [ "flask_seasurf" ]; + + meta = with lib; { + description = "A Flask extension for preventing cross-site request forgery"; + homepage = "https://github.com/maxcountryman/flask-seasurf"; + license = licenses.bsd3; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 991d4bc0deb9..15147e1de829 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2382,6 +2382,8 @@ in { flask_script = callPackage ../development/python-modules/flask-script { }; + flask-seasurf = callPackage ../development/python-modules/flask-seasurf { }; + flask-silk = callPackage ../development/python-modules/flask-silk { }; flask-socketio = callPackage ../development/python-modules/flask-socketio { }; From 120bc6754b2f4f89343f7acd924a3398382e9834 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 16 Jan 2021 01:49:52 -0800 Subject: [PATCH 26/54] pythonPackages.flask-sslify: init at 0.1.5 --- .../python-modules/flask-sslify/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/flask-sslify/default.nix diff --git a/pkgs/development/python-modules/flask-sslify/default.nix b/pkgs/development/python-modules/flask-sslify/default.nix new file mode 100644 index 000000000000..ad4bc4dc0523 --- /dev/null +++ b/pkgs/development/python-modules/flask-sslify/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchPypi, buildPythonPackage, flask }: + +buildPythonPackage rec { + pname = "Flask-SSLify"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gjl1m828z5dm3c5dpc2qjgi4llf84cp72mafr0ib5fd14y1sgnk"; + }; + + propagatedBuildInputs = [ flask ]; + + doCheck = false; + pythonImportsCheck = [ "flask_sslify" ]; + + meta = with lib; { + description = "A Flask extension that redirects all incoming requests to HTTPS"; + homepage = "https://github.com/kennethreitz42/flask-sslify"; + license = licenses.bsd2; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 15147e1de829..e4c40bce85a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2392,6 +2392,8 @@ in { flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { }; + flask-sslify = callPackage ../development/python-modules/flask-sslify { }; + flask-swagger = callPackage ../development/python-modules/flask-swagger { }; flask-swagger-ui = callPackage ../development/python-modules/flask-swagger-ui { }; From 64cfeeffd04e969fc70ada6ee25c585159b0b7bc Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 18 Jan 2021 14:14:28 -0800 Subject: [PATCH 27/54] pythonPackages.xmlsec: init at 1.3.9 --- .../python-modules/xmlsec/default.nix | 47 +++++++++++++++++++ .../xmlsec/reset-lxml-in-tests.patch | 22 +++++++++ pkgs/top-level/python-packages.nix | 4 ++ 3 files changed, 73 insertions(+) create mode 100644 pkgs/development/python-modules/xmlsec/default.nix create mode 100644 pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix new file mode 100644 index 000000000000..82f4a968ba6e --- /dev/null +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +, libxslt +, libxml2 +, libtool +, pkg-config +, xmlsec +, pkgconfig +, setuptools-scm +, toml +, lxml +, hypothesis +}: + +buildPythonPackage rec { + pname = "xmlsec"; + version = "1.3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c4k42zv3plm6v65p7z6l5rxyf50h40d02nhc16vq7cjrfvdf4rx"; + }; + + # https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116 + patches = [ + ./reset-lxml-in-tests.patch + ]; + + nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm toml ]; + + buildInputs = [ xmlsec libxslt libxml2 libtool ]; + + propagatedBuildInputs = [ lxml ]; + + # Full git clone required for test_doc_examples + checkInputs = [ pytestCheckHook hypothesis ]; + disabledTestPaths = [ "tests/test_doc_examples.py" ]; + + meta = with lib; { + description = "Python bindings for the XML Security Library"; + homepage = "https://github.com/mehcode/python-xmlsec"; + license = licenses.mit; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch b/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch new file mode 100644 index 000000000000..0968583faa63 --- /dev/null +++ b/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch @@ -0,0 +1,22 @@ +diff --git a/tests/base.py b/tests/base.py +index b05de1d..5ec356f 100644 +--- a/tests/base.py ++++ b/tests/base.py +@@ -94,6 +94,7 @@ class TestMemoryLeaks(unittest.TestCase): + + def load_xml(self, name, xpath=None): + """returns xml.etree""" ++ etree.set_default_parser(parser=etree.XMLParser()) + root = etree.parse(self.path(name)).getroot() + if xpath is None: + return root +diff --git a/tests/test_doc_examples.py b/tests/test_doc_examples.py +index 2fc490f..53d2377 100644 +--- a/tests/test_doc_examples.py ++++ b/tests/test_doc_examples.py +@@ -42,3 +42,5 @@ def test_doc_example(example): + """ + with cd(example.parent): + runpy.run_path(str(example)) ++ from lxml import etree ++ etree.set_default_parser(parser=etree.XMLParser()) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4c40bce85a8..131e8c9e8d59 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8632,6 +8632,10 @@ in { xmlschema = callPackage ../development/python-modules/xmlschema { }; + xmlsec = callPackage ../development/python-modules/xmlsec { + inherit (pkgs) libxslt libxml2 libtool pkg-config xmlsec; + }; + xmltodict = callPackage ../development/python-modules/xmltodict { }; xmodem = callPackage ../development/python-modules/xmodem { }; From 6bc385a122e11564ca1a27962dbb8084963d613c Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 18 Jan 2021 14:15:29 -0800 Subject: [PATCH 28/54] python3Packages.python3-saml: init at 1.10.1 --- .../python-modules/python3-saml/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/python3-saml/default.nix diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix new file mode 100644 index 000000000000..00774cc40f88 --- /dev/null +++ b/pkgs/development/python-modules/python3-saml/default.nix @@ -0,0 +1,40 @@ +{ lib, fetchurl, fetchFromGitHub, buildPythonPackage, isPy3k, +isodate, lxml, xmlsec, freezegun }: + +buildPythonPackage rec { + pname = "python3-saml"; + version = "1.10.1"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "onelogin"; + repo = "python3-saml"; + rev = "v${version}"; + sha256 = "1yk02xq90bm7p6k091av6gapb5h2ccxzgrbm03sj2x8h0wff9s8k"; + }; + + patches = [ + # Remove the dependency on defusedxml + # + # This patch is already merged upstream and does not introduce any + # functionality changes. + (fetchurl { + url = "https://github.com/onelogin/python3-saml/commit/4b6c4b1f2ed3f6eab70ff4391e595b808ace168c.patch"; + sha256 = "11gqn7ib2hmlx5wp4xhi375v5ajapwmj4lpw0y44bh5ww8cypvqy"; + }) + ]; + + propagatedBuildInputs = [ + isodate lxml xmlsec + ]; + + checkInputs = [ freezegun ]; + pythonImportsCheck = [ "onelogin.saml2" ]; + + meta = with lib; { + description = "OneLogin's SAML Python Toolkit for Python 3"; + homepage = "https://github.com/onelogin/python3-saml"; + license = licenses.mit; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 131e8c9e8d59..815a40a6be1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6383,6 +6383,8 @@ in { python-awair = callPackage ../development/python-modules/python-awair { }; + python3-saml = callPackage ../development/python-modules/python3-saml { }; + python-axolotl = callPackage ../development/python-modules/python-axolotl { }; python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; From 0aa2fcb9ff49e81faf31e36d2622d189425dbbb2 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 18 Jan 2021 14:18:23 -0800 Subject: [PATCH 29/54] powerdns-admin: init at 0.2.3 --- .../networking/powerdns-admin/default.nix | 111 ++ .../networking/powerdns-admin/package.json | 16 + .../powerdns-admin/update-asset-deps.sh | 20 + .../networking/powerdns-admin/yarndeps.nix | 1453 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 1602 insertions(+) create mode 100644 pkgs/applications/networking/powerdns-admin/default.nix create mode 100644 pkgs/applications/networking/powerdns-admin/package.json create mode 100755 pkgs/applications/networking/powerdns-admin/update-asset-deps.sh create mode 100644 pkgs/applications/networking/powerdns-admin/yarndeps.nix diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix new file mode 100644 index 000000000000..4ef89e261635 --- /dev/null +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -0,0 +1,111 @@ +{ lib, stdenv, fetchFromGitHub, mkYarnPackage, writeText, python3Packages }: + +let + version = "0.2.3"; + src = fetchFromGitHub { + owner = "ngoduykhanh"; + repo = "PowerDNS-Admin"; + rev = "v${version}"; + sha256 = "16faz57d77mxkflkvwyi8gb9wvnq2vhw79b84v1fmqvxri1yaphw"; + }; + + pythonDeps = with python3Packages; [ + flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-sslify + mysqlclient sqlalchemy + configobj bcrypt requests ldap pyotp qrcode dnspython_1 + gunicorn python3-saml pyopenssl pytz cssmin jsmin authlib bravado-core + lima pytimeparse pyyaml + ]; + + assets = mkYarnPackage { + inherit src version; + packageJSON = ./package.json; + yarnNix = ./yarndeps.nix; + + nativeBuildInputs = pythonDeps; + patchPhase = '' + sed -i -r -e "s|'cssmin',\s?'cssrewrite'|'cssmin'|g" powerdnsadmin/assets.py + ''; + buildPhase = '' + # The build process expects the directory to be writable + # with node_modules at a specific path + # https://github.com/ngoduykhanh/PowerDNS-Admin/blob/master/.yarnrc + + approot=deps/powerdns-admin-assets + + ln -s $node_modules $approot/powerdnsadmin/static/node_modules + FLASK_APP=$approot/powerdnsadmin/__init__.py flask assets build + ''; + installPhase = '' + # https://github.com/ngoduykhanh/PowerDNS-Admin/blob/54b257768f600c5548a1c7e50eac49c40df49f92/docker/Dockerfile#L43 + mkdir $out + cp -r $approot/powerdnsadmin/static/{generated,assets,img} $out + find $node_modules/icheck/skins/square -name '*.png' -exec cp {} $out/generated \; + + mkdir $out/fonts + cp $node_modules/ionicons/dist/fonts/* $out/fonts + cp $node_modules/bootstrap/dist/fonts/* $out/fonts + cp $node_modules/font-awesome/fonts/* $out/fonts + ''; + distPhase = "true"; + }; + + assetsPy = writeText "assets.py" '' + from flask_assets import Environment + assets = Environment() + assets.register('js_login', 'generated/login.js') + assets.register('js_validation', 'generated/validation.js') + assets.register('css_login', 'generated/login.css') + assets.register('js_main', 'generated/main.js') + assets.register('css_main', 'generated/main.css') + ''; +in stdenv.mkDerivation rec { + pname = "powerdns-admin"; + + inherit src version; + + nativeBuildInputs = [ python3Packages.wrapPython ]; + + pythonPath = pythonDeps; + + gunicornScript = '' + #!/bin/sh + if [ ! -z $CONFIG ]; then + exec python -m gunicorn.app.wsgiapp "powerdnsadmin:create_app(config='$CONFIG')" "$@" + fi + + exec python -m gunicorn.app.wsgiapp "powerdnsadmin:create_app()" "$@" + ''; + + postPatch = '' + rm -r powerdnsadmin/static powerdnsadmin/assets.py + ''; + + installPhase = '' + runHook preInstall + + # Nasty hack: call wrapPythonPrograms to set program_PYTHONPATH (see tribler) + wrapPythonPrograms + + mkdir -p $out/share $out/bin + cp -r powerdnsadmin $out/share/powerdnsadmin + + ln -s ${assets} $out/share/powerdnsadmin/static + ln -s ${assetsPy} $out/share/powerdnsadmin/assets.py + + echo "$gunicornScript" > $out/bin/powerdns-admin + chmod +x $out/bin/powerdns-admin + wrapProgram $out/bin/powerdns-admin \ + --set PATH ${python3Packages.python}/bin \ + --set PYTHONPATH $out/share:$program_PYTHONPATH + + runHook postInstall + ''; + + meta = with lib; { + description = "A PowerDNS web interface with advanced features"; + homepage = "https://github.com/ngoduykhanh/PowerDNS-Admin"; + license = licenses.mit; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/applications/networking/powerdns-admin/package.json b/pkgs/applications/networking/powerdns-admin/package.json new file mode 100644 index 000000000000..cb21306308cf --- /dev/null +++ b/pkgs/applications/networking/powerdns-admin/package.json @@ -0,0 +1,16 @@ +{ + "dependencies": { + "admin-lte": "2.4.9", + "bootstrap": "^3.4.1", + "bootstrap-validator": "^0.11.9", + "datatables.net-plugins": "^1.10.19", + "icheck": "^1.0.2", + "jquery-slimscroll": "^1.3.8", + "jquery-ui-dist": "^1.12.1", + "jquery.quicksearch": "^2.4.0", + "jtimeout": "^3.1.0", + "multiselect": "^0.9.12" + }, + "name": "powerdns-admin-assets", + "version": "0.2.3" +} diff --git a/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh b/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh new file mode 100755 index 000000000000..86dcb8cbf659 --- /dev/null +++ b/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../.. -i bash -p wget yarn2nix-moretea.yarn2nix jq + +# This script is based upon: +# pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh + +set -euo pipefail + +if [[ $# -ne 1 || $1 == -* ]]; then + echo "Regenerates the Yarn dependency lock files for the powerdns-admin package." + echo "Usage: $0 " + exit 1 +fi + +WEB_SRC="https://raw.githubusercontent.com/ngoduykhanh/PowerDNS-Admin/v$1" + +wget "$WEB_SRC/package.json" -O - | jq ".name = \"powerdns-admin-assets\" | .version = \"$1\"" > package.json +wget "$WEB_SRC/yarn.lock" -O yarn.lock +yarn2nix --lockfile=yarn.lock > yarndeps.nix +rm yarn.lock diff --git a/pkgs/applications/networking/powerdns-admin/yarndeps.nix b/pkgs/applications/networking/powerdns-admin/yarndeps.nix new file mode 100644 index 000000000000..ce65d28c0087 --- /dev/null +++ b/pkgs/applications/networking/powerdns-admin/yarndeps.nix @@ -0,0 +1,1453 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "JSONStream___JSONStream_1.3.3.tgz"; + path = fetchurl { + name = "JSONStream___JSONStream_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.3.tgz"; + sha1 = "27b4b8fbbfeab4e71bcf551e7f27be8d952239bf"; + }; + } + { + name = "acorn_node___acorn_node_1.3.0.tgz"; + path = fetchurl { + name = "acorn_node___acorn_node_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.3.0.tgz"; + sha1 = "5f86d73346743810ef1269b901dbcbded020861b"; + }; + } + { + name = "acorn___acorn_4.0.13.tgz"; + path = fetchurl { + name = "acorn___acorn_4.0.13.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz"; + sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; + }; + } + { + name = "acorn___acorn_5.6.2.tgz"; + path = fetchurl { + name = "acorn___acorn_5.6.2.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.6.2.tgz"; + sha1 = "b1da1d7be2ac1b4a327fb9eab851702c5045b4e7"; + }; + } + { + name = "admin_lte___admin_lte_2.4.9.tgz"; + path = fetchurl { + name = "admin_lte___admin_lte_2.4.9.tgz"; + url = "https://registry.yarnpkg.com/admin-lte/-/admin-lte-2.4.9.tgz"; + sha1 = "effc04dbb587ccb7d674d4cf663cc141f925ed73"; + }; + } + { + name = "almond___almond_0.3.3.tgz"; + path = fetchurl { + name = "almond___almond_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/almond/-/almond-0.3.3.tgz"; + sha1 = "a0e7c95ac7624d6417b4494b1e68bff693168a20"; + }; + } + { + name = "array_filter___array_filter_0.0.1.tgz"; + path = fetchurl { + name = "array_filter___array_filter_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz"; + sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; + }; + } + { + name = "array_map___array_map_0.0.0.tgz"; + path = fetchurl { + name = "array_map___array_map_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz"; + sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; + }; + } + { + name = "array_reduce___array_reduce_0.0.0.tgz"; + path = fetchurl { + name = "array_reduce___array_reduce_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz"; + sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; + }; + } + { + name = "asn1.js___asn1.js_4.10.1.tgz"; + path = fetchurl { + name = "asn1.js___asn1.js_4.10.1.tgz"; + url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz"; + sha1 = "b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"; + }; + } + { + name = "assert___assert_1.4.1.tgz"; + path = fetchurl { + name = "assert___assert_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz"; + sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; + }; + } + { + name = "astw___astw_2.2.0.tgz"; + path = fetchurl { + name = "astw___astw_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/astw/-/astw-2.2.0.tgz"; + sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; + }; + } + { + name = "balanced_match___balanced_match_1.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + } + { + name = "base64_js___base64_js_1.3.0.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz"; + sha1 = "cab1e6118f051095e58b5281aea8c1cd22bfc0e3"; + }; + } + { + name = "bn.js___bn.js_4.11.9.tgz"; + path = fetchurl { + name = "bn.js___bn.js_4.11.9.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz"; + sha1 = "26d556829458f9d1e81fc48952493d0ba3507828"; + }; + } + { + name = "bootstrap_colorpicker___bootstrap_colorpicker_2.5.3.tgz"; + path = fetchurl { + name = "bootstrap_colorpicker___bootstrap_colorpicker_2.5.3.tgz"; + url = "https://registry.yarnpkg.com/bootstrap-colorpicker/-/bootstrap-colorpicker-2.5.3.tgz"; + sha1 = "b50aff8590fbaa6b5aa63a5624e4213f1659a49d"; + }; + } + { + name = "bootstrap_datepicker___bootstrap_datepicker_1.8.0.tgz"; + path = fetchurl { + name = "bootstrap_datepicker___bootstrap_datepicker_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.8.0.tgz"; + sha1 = "c63513931e6f09f16ae9f11b62f32d950df3958e"; + }; + } + { + name = "bootstrap_daterangepicker___bootstrap_daterangepicker_2.1.30.tgz"; + path = fetchurl { + name = "bootstrap_daterangepicker___bootstrap_daterangepicker_2.1.30.tgz"; + url = "https://registry.yarnpkg.com/bootstrap-daterangepicker/-/bootstrap-daterangepicker-2.1.30.tgz"; + sha1 = "f893dbfff5a4d7dfaab75460e8ea6969bb89689a"; + }; + } + { + name = "bootstrap_slider___bootstrap_slider_9.10.0.tgz"; + path = fetchurl { + name = "bootstrap_slider___bootstrap_slider_9.10.0.tgz"; + url = "https://registry.yarnpkg.com/bootstrap-slider/-/bootstrap-slider-9.10.0.tgz"; + sha1 = "1103d6bc00cfbfa8cfc9a2599ab518c55643da3f"; + }; + } + { + name = "bootstrap_timepicker___bootstrap_timepicker_0.5.2.tgz"; + path = fetchurl { + name = "bootstrap_timepicker___bootstrap_timepicker_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/bootstrap-timepicker/-/bootstrap-timepicker-0.5.2.tgz"; + sha1 = "10ed9f2a2f0b8ccaefcde0fcf6a0738b919a3835"; + }; + } + { + name = "bootstrap_validator___bootstrap_validator_0.11.9.tgz"; + path = fetchurl { + name = "bootstrap_validator___bootstrap_validator_0.11.9.tgz"; + url = "https://registry.yarnpkg.com/bootstrap-validator/-/bootstrap-validator-0.11.9.tgz"; + sha1 = "fb7058eef53623e78f5aa7967026f98f875a9404"; + }; + } + { + name = "bootstrap___bootstrap_3.4.1.tgz"; + path = fetchurl { + name = "bootstrap___bootstrap_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz"; + sha1 = "c3a347d419e289ad11f4033e3c4132b87c081d72"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "brorand___brorand_1.1.0.tgz"; + path = fetchurl { + name = "brorand___brorand_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + }; + } + { + name = "browser_pack___browser_pack_6.1.0.tgz"; + path = fetchurl { + name = "browser_pack___browser_pack_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.1.0.tgz"; + sha1 = "c34ba10d0b9ce162b5af227c7131c92c2ecd5774"; + }; + } + { + name = "browser_resolve___browser_resolve_1.11.2.tgz"; + path = fetchurl { + name = "browser_resolve___browser_resolve_1.11.2.tgz"; + url = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz"; + sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; + }; + } + { + name = "browserify_aes___browserify_aes_1.2.0.tgz"; + path = fetchurl { + name = "browserify_aes___browserify_aes_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz"; + sha1 = "326734642f403dabc3003209853bb70ad428ef48"; + }; + } + { + name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; + path = fetchurl { + name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; + sha1 = "8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"; + }; + } + { + name = "browserify_des___browserify_des_1.0.1.tgz"; + path = fetchurl { + name = "browserify_des___browserify_des_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.1.tgz"; + sha1 = "3343124db6d7ad53e26a8826318712bdc8450f9c"; + }; + } + { + name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; + path = fetchurl { + name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; + sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + }; + } + { + name = "browserify_sign___browserify_sign_4.0.4.tgz"; + path = fetchurl { + name = "browserify_sign___browserify_sign_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz"; + sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; + }; + } + { + name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; + path = fetchurl { + name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha1 = "2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"; + }; + } + { + name = "browserify___browserify_16.2.2.tgz"; + path = fetchurl { + name = "browserify___browserify_16.2.2.tgz"; + url = "https://registry.yarnpkg.com/browserify/-/browserify-16.2.2.tgz"; + sha1 = "4b1f66ba0e54fa39dbc5aa4be9629142143d91b0"; + }; + } + { + name = "buffer_from___buffer_from_1.1.0.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz"; + sha1 = "87fcaa3a298358e0ade6e442cfce840740d1ad04"; + }; + } + { + name = "buffer_xor___buffer_xor_1.0.3.tgz"; + path = fetchurl { + name = "buffer_xor___buffer_xor_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + }; + } + { + name = "buffer___buffer_5.1.0.tgz"; + path = fetchurl { + name = "buffer___buffer_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.1.0.tgz"; + sha1 = "c913e43678c7cb7c8bd16afbcddb6c5505e8f9fe"; + }; + } + { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + path = fetchurl { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; + }; + } + { + name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; + path = fetchurl { + name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz"; + sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db"; + }; + } + { + name = "charm___charm_0.1.2.tgz"; + path = fetchurl { + name = "charm___charm_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz"; + sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296"; + }; + } + { + name = "chart.js___chart.js_1.0.2.tgz"; + path = fetchurl { + name = "chart.js___chart.js_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/chart.js/-/chart.js-1.0.2.tgz"; + sha1 = "ad57d2229cfd8ccf5955147e8121b4911e69dfe7"; + }; + } + { + name = "cipher_base___cipher_base_1.0.4.tgz"; + path = fetchurl { + name = "cipher_base___cipher_base_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz"; + sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de"; + }; + } + { + name = "ckeditor___ckeditor_4.11.3.tgz"; + path = fetchurl { + name = "ckeditor___ckeditor_4.11.3.tgz"; + url = "https://registry.yarnpkg.com/ckeditor/-/ckeditor-4.11.3.tgz"; + sha1 = "91f66d7ddb5bff3874514fe539779686874ed655"; + }; + } + { + name = "classie___classie_1.0.0.tgz"; + path = fetchurl { + name = "classie___classie_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/classie/-/classie-1.0.0.tgz"; + sha1 = "fc9b29b47e64e374a2062fb624d05a61cd703ab2"; + }; + } + { + name = "combine_source_map___combine_source_map_0.8.0.tgz"; + path = fetchurl { + name = "combine_source_map___combine_source_map_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz"; + sha1 = "a58d0df042c186fcf822a8e8015f5450d2d79a8b"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } + { + name = "console_browserify___console_browserify_1.1.0.tgz"; + path = fetchurl { + name = "console_browserify___console_browserify_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz"; + sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; + }; + } + { + name = "constants_browserify___constants_browserify_1.0.0.tgz"; + path = fetchurl { + name = "constants_browserify___constants_browserify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + }; + } + { + name = "convert_source_map___convert_source_map_1.1.3.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz"; + sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "create_ecdh___create_ecdh_4.0.3.tgz"; + path = fetchurl { + name = "create_ecdh___create_ecdh_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz"; + sha1 = "c9111b6f33045c4697f144787f9254cdc77c45ff"; + }; + } + { + name = "create_hash___create_hash_1.2.0.tgz"; + path = fetchurl { + name = "create_hash___create_hash_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz"; + sha1 = "889078af11a63756bcfb59bd221996be3a9ef196"; + }; + } + { + name = "create_hmac___create_hmac_1.1.7.tgz"; + path = fetchurl { + name = "create_hmac___create_hmac_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz"; + sha1 = "69170c78b3ab957147b2b8b04572e47ead2243ff"; + }; + } + { + name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; + path = fetchurl { + name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha1 = "396cf9f3137f03e4b8e532c58f698254e00f80ec"; + }; + } + { + name = "datatables.net_bs___datatables.net_bs_1.10.19.tgz"; + path = fetchurl { + name = "datatables.net_bs___datatables.net_bs_1.10.19.tgz"; + url = "https://registry.yarnpkg.com/datatables.net-bs/-/datatables.net-bs-1.10.19.tgz"; + sha1 = "08763b4e4d0cef1a427d019dc15e717c7ed67a4d"; + }; + } + { + name = "datatables.net_plugins___datatables.net_plugins_1.10.20.tgz"; + path = fetchurl { + name = "datatables.net_plugins___datatables.net_plugins_1.10.20.tgz"; + url = "https://registry.yarnpkg.com/datatables.net-plugins/-/datatables.net-plugins-1.10.20.tgz"; + sha1 = "c89f6bed3fa7e6605cbeaa35d60f223659e84c8c"; + }; + } + { + name = "datatables.net___datatables.net_1.10.19.tgz"; + path = fetchurl { + name = "datatables.net___datatables.net_1.10.19.tgz"; + url = "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.19.tgz"; + sha1 = "97a1ed41c85e62d61040603481b59790a172dd1f"; + }; + } + { + name = "date_now___date_now_0.1.4.tgz"; + path = fetchurl { + name = "date_now___date_now_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz"; + sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; + }; + } + { + name = "defined___defined_1.0.0.tgz"; + path = fetchurl { + name = "defined___defined_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz"; + sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; + }; + } + { + name = "deps_sort___deps_sort_2.0.0.tgz"; + path = fetchurl { + name = "deps_sort___deps_sort_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz"; + sha1 = "091724902e84658260eb910748cccd1af6e21fb5"; + }; + } + { + name = "des.js___des.js_1.0.0.tgz"; + path = fetchurl { + name = "des.js___des.js_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz"; + sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; + }; + } + { + name = "detective___detective_5.1.0.tgz"; + path = fetchurl { + name = "detective___detective_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/detective/-/detective-5.1.0.tgz"; + sha1 = "7a20d89236d7b331ccea65832e7123b5551bb7cb"; + }; + } + { + name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; + path = fetchurl { + name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; + sha1 = "40e8ee98f55a2149607146921c63e1ae5f3d2875"; + }; + } + { + name = "domain_browser___domain_browser_1.2.0.tgz"; + path = fetchurl { + name = "domain_browser___domain_browser_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz"; + sha1 = "3d31f50191a6749dd1375a7f522e823d42e54eda"; + }; + } + { + name = "domhelper___domhelper_0.9.1.tgz"; + path = fetchurl { + name = "domhelper___domhelper_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/domhelper/-/domhelper-0.9.1.tgz"; + sha1 = "26554e5bac2c9e9585dca500978df5067d64bd00"; + }; + } + { + name = "duplexer2___duplexer2_0.1.4.tgz"; + path = fetchurl { + name = "duplexer2___duplexer2_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + }; + } + { + name = "elliptic___elliptic_6.5.3.tgz"; + path = fetchurl { + name = "elliptic___elliptic_6.5.3.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz"; + sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"; + }; + } + { + name = "eve_raphael___eve_raphael_0.5.0.tgz"; + path = fetchurl { + name = "eve_raphael___eve_raphael_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz"; + sha1 = "17c754b792beef3fa6684d79cf5a47c63c4cda30"; + }; + } + { + name = "events___events_2.1.0.tgz"; + path = fetchurl { + name = "events___events_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-2.1.0.tgz"; + sha1 = "2a9a1e18e6106e0e812aa9ebd4a819b3c29c0ba5"; + }; + } + { + name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; + path = fetchurl { + name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha1 = "7fcbdb198dc71959432efe13842684e0525acb02"; + }; + } + { + name = "fastclick___fastclick_1.0.6.tgz"; + path = fetchurl { + name = "fastclick___fastclick_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/fastclick/-/fastclick-1.0.6.tgz"; + sha1 = "161625b27b1a5806405936bda9a2c1926d06be6a"; + }; + } + { + name = "flot___flot_0.8.3.tgz"; + path = fetchurl { + name = "flot___flot_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/flot/-/flot-0.8.3.tgz"; + sha1 = "6d9b93c7aa2cfb30dfa1af9c1ec4c94070b1217f"; + }; + } + { + name = "font_awesome___font_awesome_4.7.0.tgz"; + path = fetchurl { + name = "font_awesome___font_awesome_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz"; + sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "fullcalendar___fullcalendar_3.10.0.tgz"; + path = fetchurl { + name = "fullcalendar___fullcalendar_3.10.0.tgz"; + url = "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-3.10.0.tgz"; + sha1 = "cc5e87d518fd6550e142816a31dd191664847919"; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + { + name = "glob___glob_7.1.2.tgz"; + path = fetchurl { + name = "glob___glob_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz"; + sha1 = "c19c9df9a028702d678612384a6552404c636d15"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + { + name = "hash_base___hash_base_3.0.4.tgz"; + path = fetchurl { + name = "hash_base___hash_base_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz"; + sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + }; + } + { + name = "hash.js___hash.js_1.1.7.tgz"; + path = fetchurl { + name = "hash.js___hash.js_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz"; + sha1 = "0babca538e8d4ee4a0f8988d68866537a003cf42"; + }; + } + { + name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; + path = fetchurl { + name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + }; + } + { + name = "htmlescape___htmlescape_1.1.1.tgz"; + path = fetchurl { + name = "htmlescape___htmlescape_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz"; + sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; + }; + } + { + name = "https_browserify___https_browserify_1.0.0.tgz"; + path = fetchurl { + name = "https_browserify___https_browserify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; + }; + } + { + name = "icheck___icheck_1.0.2.tgz"; + path = fetchurl { + name = "icheck___icheck_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/icheck/-/icheck-1.0.2.tgz"; + sha1 = "06d08da3d47ae448c153b2639b86e9ad7fdf7128"; + }; + } + { + name = "ieee754___ieee754_1.1.12.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.1.12.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz"; + sha1 = "50bf24e5b9c8bb98af4964c941cdb0918da7b60b"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "inherits___inherits_2.0.1.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + } + { + name = "inherits___inherits_2.0.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + } + { + name = "inline_source_map___inline_source_map_0.6.2.tgz"; + path = fetchurl { + name = "inline_source_map___inline_source_map_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz"; + sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; + }; + } + { + name = "inputmask___inputmask_3.3.11.tgz"; + path = fetchurl { + name = "inputmask___inputmask_3.3.11.tgz"; + url = "https://registry.yarnpkg.com/inputmask/-/inputmask-3.3.11.tgz"; + sha1 = "1421c94ae28c3dcd1b4d26337b508bb34998e2d8"; + }; + } + { + name = "insert_module_globals___insert_module_globals_7.1.0.tgz"; + path = fetchurl { + name = "insert_module_globals___insert_module_globals_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.1.0.tgz"; + sha1 = "dbb3cea71d3a43d5a07ef0310fe5f078aa4dbf35"; + }; + } + { + name = "ion_rangeslider___ion_rangeslider_2.3.0.tgz"; + path = fetchurl { + name = "ion_rangeslider___ion_rangeslider_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/ion-rangeslider/-/ion-rangeslider-2.3.0.tgz"; + sha1 = "7957ce2e78acfc956b8c43009373da91f743347e"; + }; + } + { + name = "ionicons___ionicons_3.0.0.tgz"; + path = fetchurl { + name = "ionicons___ionicons_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ionicons/-/ionicons-3.0.0.tgz"; + sha1 = "40b8daf4fd7a31150bd002160f66496e22a98c3c"; + }; + } + { + name = "is_buffer___is_buffer_1.1.6.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + }; + } + { + name = "isarray___isarray_2.0.4.tgz"; + path = fetchurl { + name = "isarray___isarray_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-2.0.4.tgz"; + sha1 = "38e7bcbb0f3ba1b7933c86ba1894ddfc3781bbb7"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "jquery_knob___jquery_knob_1.2.11.tgz"; + path = fetchurl { + name = "jquery_knob___jquery_knob_1.2.11.tgz"; + url = "https://registry.yarnpkg.com/jquery-knob/-/jquery-knob-1.2.11.tgz"; + sha1 = "f37c39dbc1c7a6a6c12cdb2ed4f6bffb683f10d6"; + }; + } + { + name = "jquery_mousewheel___jquery_mousewheel_3.1.13.tgz"; + path = fetchurl { + name = "jquery_mousewheel___jquery_mousewheel_3.1.13.tgz"; + url = "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz"; + sha1 = "06f0335f16e353a695e7206bf50503cb523a6ee5"; + }; + } + { + name = "jquery_slimscroll___jquery_slimscroll_1.3.8.tgz"; + path = fetchurl { + name = "jquery_slimscroll___jquery_slimscroll_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/jquery-slimscroll/-/jquery-slimscroll-1.3.8.tgz"; + sha1 = "8481c44e7a47687653908a28f7f70aed64c84e36"; + }; + } + { + name = "jquery_sparkline___jquery_sparkline_2.4.0.tgz"; + path = fetchurl { + name = "jquery_sparkline___jquery_sparkline_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/jquery-sparkline/-/jquery-sparkline-2.4.0.tgz"; + sha1 = "1be8b7b704dd3857152708aefb1d4a4b3a69fb33"; + }; + } + { + name = "jquery_ui_dist___jquery_ui_dist_1.12.1.tgz"; + path = fetchurl { + name = "jquery_ui_dist___jquery_ui_dist_1.12.1.tgz"; + url = "https://registry.yarnpkg.com/jquery-ui-dist/-/jquery-ui-dist-1.12.1.tgz"; + sha1 = "5c0815d3cc6f90ff5faaf5b268a6e23b4ca904fa"; + }; + } + { + name = "jquery_ui___jquery_ui_1.12.1.tgz"; + path = fetchurl { + name = "jquery_ui___jquery_ui_1.12.1.tgz"; + url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz"; + sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; + }; + } + { + name = "jquery.quicksearch___jquery.quicksearch_2.4.0.tgz"; + path = fetchurl { + name = "jquery.quicksearch___jquery.quicksearch_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/jquery.quicksearch/-/jquery.quicksearch-2.4.0.tgz"; + sha1 = "240c9f435e936c63bf8fbba355144ffdddf9ea26"; + }; + } + { + name = "jquery___jquery_3.3.1.tgz"; + path = fetchurl { + name = "jquery___jquery_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz"; + sha1 = "958ce29e81c9790f31be7792df5d4d95fc57fbca"; + }; + } + { + name = "json_stable_stringify___json_stable_stringify_0.0.1.tgz"; + path = fetchurl { + name = "json_stable_stringify___json_stable_stringify_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz"; + sha1 = "611c23e814db375527df851193db59dd2af27f45"; + }; + } + { + name = "jsonify___jsonify_0.0.0.tgz"; + path = fetchurl { + name = "jsonify___jsonify_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + }; + } + { + name = "jsonparse___jsonparse_1.3.1.tgz"; + path = fetchurl { + name = "jsonparse___jsonparse_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + }; + } + { + name = "jtimeout___jtimeout_3.1.0.tgz"; + path = fetchurl { + name = "jtimeout___jtimeout_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/jtimeout/-/jtimeout-3.1.0.tgz"; + sha1 = "4cd65b28eff8b9f8c61d08889a9ac3abdf5d9893"; + }; + } + { + name = "jvectormap___jvectormap_1.2.2.tgz"; + path = fetchurl { + name = "jvectormap___jvectormap_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/jvectormap/-/jvectormap-1.2.2.tgz"; + sha1 = "2e4408b24a60473ff106c1e7243e375ae5ca85da"; + }; + } + { + name = "labeled_stream_splicer___labeled_stream_splicer_2.0.1.tgz"; + path = fetchurl { + name = "labeled_stream_splicer___labeled_stream_splicer_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz"; + sha1 = "9cffa32fd99e1612fd1d86a8db962416d5292926"; + }; + } + { + name = "lexical_scope___lexical_scope_1.2.0.tgz"; + path = fetchurl { + name = "lexical_scope___lexical_scope_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/lexical-scope/-/lexical-scope-1.2.0.tgz"; + sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; + }; + } + { + name = "lodash.memoize___lodash.memoize_3.0.4.tgz"; + path = fetchurl { + name = "lodash.memoize___lodash.memoize_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; + sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; + }; + } + { + name = "md5.js___md5.js_1.3.4.tgz"; + path = fetchurl { + name = "md5.js___md5.js_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz"; + sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; + }; + } + { + name = "miller_rabin___miller_rabin_4.0.1.tgz"; + path = fetchurl { + name = "miller_rabin___miller_rabin_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha1 = "f080351c865b0dc562a8462966daa53543c78a4d"; + }; + } + { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + path = fetchurl { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"; + }; + } + { + name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; + path = fetchurl { + name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist___minimist_0.0.8.tgz"; + path = fetchurl { + name = "minimist___minimist_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + } + { + name = "minimist___minimist_1.2.0.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + } + { + name = "mkdirp___mkdirp_0.5.1.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + } + { + name = "module_deps___module_deps_6.1.0.tgz"; + path = fetchurl { + name = "module_deps___module_deps_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/module-deps/-/module-deps-6.1.0.tgz"; + sha1 = "d1e1efc481c6886269f7112c52c3236188e16479"; + }; + } + { + name = "moment___moment_2.24.0.tgz"; + path = fetchurl { + name = "moment___moment_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz"; + sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"; + }; + } + { + name = "moment___moment_2.22.2.tgz"; + path = fetchurl { + name = "moment___moment_2.22.2.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz"; + sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66"; + }; + } + { + name = "morris.js___morris.js_0.5.0.tgz"; + path = fetchurl { + name = "morris.js___morris.js_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/morris.js/-/morris.js-0.5.0.tgz"; + sha1 = "725767135cfae059aae75999bb2ce6a1c5d1b44b"; + }; + } + { + name = "multiselect___multiselect_0.9.12.tgz"; + path = fetchurl { + name = "multiselect___multiselect_0.9.12.tgz"; + url = "https://registry.yarnpkg.com/multiselect/-/multiselect-0.9.12.tgz"; + sha1 = "d15536e986dd6a0029b160d6613bcedf81e4c7ed"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "os_browserify___os_browserify_0.3.0.tgz"; + path = fetchurl { + name = "os_browserify___os_browserify_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + }; + } + { + name = "pace___pace_0.0.4.tgz"; + path = fetchurl { + name = "pace___pace_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/pace/-/pace-0.0.4.tgz"; + sha1 = "d66405d5f5bc12d25441a6e26c878dbc69e77a77"; + }; + } + { + name = "pako___pako_1.0.6.tgz"; + path = fetchurl { + name = "pako___pako_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz"; + sha1 = "0101211baa70c4bca4a0f63f2206e97b7dfaf258"; + }; + } + { + name = "parents___parents_1.0.1.tgz"; + path = fetchurl { + name = "parents___parents_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz"; + sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; + }; + } + { + name = "parse_asn1___parse_asn1_5.1.1.tgz"; + path = fetchurl { + name = "parse_asn1___parse_asn1_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz"; + sha1 = "f6bf293818332bd0dab54efb16087724745e6ca8"; + }; + } + { + name = "path_browserify___path_browserify_0.0.0.tgz"; + path = fetchurl { + name = "path_browserify___path_browserify_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz"; + sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_parse___path_parse_1.0.5.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz"; + sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + }; + } + { + name = "path_platform___path_platform_0.11.15.tgz"; + path = fetchurl { + name = "path_platform___path_platform_0.11.15.tgz"; + url = "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz"; + sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2"; + }; + } + { + name = "pbkdf2___pbkdf2_3.0.16.tgz"; + path = fetchurl { + name = "pbkdf2___pbkdf2_3.0.16.tgz"; + url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz"; + sha1 = "7404208ec6b01b62d85bf83853a8064f8d9c2a5c"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.0.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; + sha1 = "a37d732f4271b4ab1ad070d35508e8290788ffaa"; + }; + } + { + name = "process___process_0.11.10.tgz"; + path = fetchurl { + name = "process___process_0.11.10.tgz"; + url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + } + { + name = "public_encrypt___public_encrypt_4.0.2.tgz"; + path = fetchurl { + name = "public_encrypt___public_encrypt_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz"; + sha1 = "46eb9107206bf73489f8b85b69d91334c6610994"; + }; + } + { + name = "punycode___punycode_1.3.2.tgz"; + path = fetchurl { + name = "punycode___punycode_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + } + { + name = "punycode___punycode_1.4.1.tgz"; + path = fetchurl { + name = "punycode___punycode_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + } + { + name = "querystring_es3___querystring_es3_0.2.1.tgz"; + path = fetchurl { + name = "querystring_es3___querystring_es3_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + }; + } + { + name = "querystring___querystring_0.2.0.tgz"; + path = fetchurl { + name = "querystring___querystring_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + } + { + name = "randombytes___randombytes_2.0.6.tgz"; + path = fetchurl { + name = "randombytes___randombytes_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz"; + sha1 = "d302c522948588848a8d300c932b44c24231da80"; + }; + } + { + name = "randomfill___randomfill_1.0.4.tgz"; + path = fetchurl { + name = "randomfill___randomfill_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz"; + sha1 = "c92196fc86ab42be983f1bf31778224931d61458"; + }; + } + { + name = "raphael___raphael_2.2.7.tgz"; + path = fetchurl { + name = "raphael___raphael_2.2.7.tgz"; + url = "https://registry.yarnpkg.com/raphael/-/raphael-2.2.7.tgz"; + sha1 = "231b19141f8d086986d8faceb66f8b562ee2c810"; + }; + } + { + name = "read_only_stream___read_only_stream_2.0.0.tgz"; + path = fetchurl { + name = "read_only_stream___read_only_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz"; + sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; + }; + } + { + name = "readable_stream___readable_stream_2.3.6.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz"; + sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"; + }; + } + { + name = "resolve___resolve_1.1.7.tgz"; + path = fetchurl { + name = "resolve___resolve_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + } + { + name = "resolve___resolve_1.7.1.tgz"; + path = fetchurl { + name = "resolve___resolve_1.7.1.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz"; + sha1 = "aadd656374fd298aee895bc026b8297418677fd3"; + }; + } + { + name = "ripemd160___ripemd160_2.0.2.tgz"; + path = fetchurl { + name = "ripemd160___ripemd160_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz"; + sha1 = "a1c1a6f624751577ba5d07914cbc92850585890c"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "select2___select2_4.0.5.tgz"; + path = fetchurl { + name = "select2___select2_4.0.5.tgz"; + url = "https://registry.yarnpkg.com/select2/-/select2-4.0.5.tgz"; + sha1 = "7aac50692561985b34d3b82ec55e226f8960d40a"; + }; + } + { + name = "sha.js___sha.js_2.4.11.tgz"; + path = fetchurl { + name = "sha.js___sha.js_2.4.11.tgz"; + url = "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz"; + sha1 = "37a5cf0b81ecbc6943de109ba2960d1b26584ae7"; + }; + } + { + name = "shasum___shasum_1.0.2.tgz"; + path = fetchurl { + name = "shasum___shasum_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/shasum/-/shasum-1.0.2.tgz"; + sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; + }; + } + { + name = "shell_quote___shell_quote_1.6.1.tgz"; + path = fetchurl { + name = "shell_quote___shell_quote_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz"; + sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + }; + } + { + name = "slimscroll___slimscroll_0.9.1.tgz"; + path = fetchurl { + name = "slimscroll___slimscroll_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/slimscroll/-/slimscroll-0.9.1.tgz"; + sha1 = "f675cdc601d80ada20f16004d227d156fd1187b2"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "stream_browserify___stream_browserify_2.0.1.tgz"; + path = fetchurl { + name = "stream_browserify___stream_browserify_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz"; + sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; + }; + } + { + name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; + path = fetchurl { + name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; + sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; + }; + } + { + name = "stream_http___stream_http_2.8.3.tgz"; + path = fetchurl { + name = "stream_http___stream_http_2.8.3.tgz"; + url = "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz"; + sha1 = "b2d242469288a5a27ec4fe8933acf623de6514fc"; + }; + } + { + name = "stream_splicer___stream_splicer_2.0.0.tgz"; + path = fetchurl { + name = "stream_splicer___stream_splicer_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.0.tgz"; + sha1 = "1b63be438a133e4b671cc1935197600175910d83"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "subarg___subarg_1.0.0.tgz"; + path = fetchurl { + name = "subarg___subarg_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz"; + sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; + }; + } + { + name = "syntax_error___syntax_error_1.4.0.tgz"; + path = fetchurl { + name = "syntax_error___syntax_error_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz"; + sha1 = "2d9d4ff5c064acb711594a3e3b95054ad51d907c"; + }; + } + { + name = "through2___through2_2.0.3.tgz"; + path = fetchurl { + name = "through2___through2_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz"; + sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { + name = "timers_browserify___timers_browserify_1.4.2.tgz"; + path = fetchurl { + name = "timers_browserify___timers_browserify_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz"; + sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d"; + }; + } + { + name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz"; + path = fetchurl { + name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; + sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + }; + } + { + name = "tty_browserify___tty_browserify_0.0.1.tgz"; + path = fetchurl { + name = "tty_browserify___tty_browserify_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz"; + sha1 = "3f05251ee17904dfd0677546670db9651682b811"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "umd___umd_3.0.3.tgz"; + path = fetchurl { + name = "umd___umd_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz"; + sha1 = "aa9fe653c42b9097678489c01000acb69f0b26cf"; + }; + } + { + name = "url___url_0.11.0.tgz"; + path = fetchurl { + name = "url___url_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "util_extend___util_extend_1.0.3.tgz"; + path = fetchurl { + name = "util_extend___util_extend_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz"; + sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f"; + }; + } + { + name = "util___util_0.10.3.tgz"; + path = fetchurl { + name = "util___util_0.10.3.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + } + { + name = "util___util_0.10.4.tgz"; + path = fetchurl { + name = "util___util_0.10.4.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz"; + sha1 = "3aa0125bfe668a4672de58857d3ace27ecb76901"; + }; + } + { + name = "vm_browserify___vm_browserify_1.0.1.tgz"; + path = fetchurl { + name = "vm_browserify___vm_browserify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.0.1.tgz"; + sha1 = "a15d7762c4c48fa6bf9f3309a21340f00ed23063"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "xtend___xtend_4.0.1.tgz"; + path = fetchurl { + name = "xtend___xtend_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + }; + } + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e6416b0c0a4..64c1117ae403 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20084,6 +20084,8 @@ in powerdns = callPackage ../servers/dns/powerdns { }; + powerdns-admin = callPackage ../applications/networking/powerdns-admin { }; + dnsdist = callPackage ../servers/dns/dnsdist { }; pdns-recursor = callPackage ../servers/dns/pdns-recursor { }; From 128a37174f8091d7a7f00ecb8daf91dd02f9c64c Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Tue, 23 Feb 2021 19:21:12 +0000 Subject: [PATCH 30/54] aws-workspaces: init at 3.1.3.925 --- .../remote/aws-workspaces/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/applications/networking/remote/aws-workspaces/default.nix diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/applications/networking/remote/aws-workspaces/default.nix new file mode 100644 index 000000000000..acfacadd55e3 --- /dev/null +++ b/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -0,0 +1,65 @@ +{ stdenv, lib +, makeWrapper, dpkg, fetchurl, autoPatchelfHook +, curl, kerberos, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking +}: + +stdenv.mkDerivation rec { + pname = "aws-workspaces"; + version = "3.1.3.925"; + + src = fetchurl { + # ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/Packages + urls = [ + "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" + "https://web.archive.org/web/20210307233836/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" + ]; + sha256 = "5b57edb4f6f8c950164fd8104bf62df4c452ab5b16cb65d48db3636959a0f0ad"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; + + # Crashes at startup when stripping: + # "Failed to create CoreCLR, HRESULT: 0x80004005" + dontStrip = true; + + buildInputs = [ + stdenv.cc.cc.lib + kerberos + curl + lttng-ust + libpulseaudio + gtk3 + openssl_1_1.out + icu + webkitgtk + librsvg + gdk-pixbuf + libsoup + glib-networking + ]; + + unpackPhase = '' + ${dpkg}/bin/dpkg -x $src $out + ''; + + installPhase = '' + mkdir -p $out/bin + mv $out/opt/workspacesclient/* $out/bin + + wrapProgram $out/bin/workspacesclient \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ + --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ + --set GIO_EXTRA_MODULES "${glib-networking.out}/lib/gio/modules" + ''; + + meta = with lib; { + description = "Client for Amazon WorkSpaces, a managed, secure Desktop-as-a-Service (DaaS) solution"; + homepage = "https://clients.amazonworkspaces.com"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; # TODO Mac support + maintainers = [ maintainers.mausch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d6fe1396d9a..10375d42877e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1042,6 +1042,8 @@ in aws-vault = callPackage ../tools/admin/aws-vault { }; + aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { }; + iamy = callPackage ../tools/admin/iamy { }; azure-cli = callPackage ../tools/admin/azure-cli { }; From a4e8fb87ab5feb543fc57734e49966f8e3269d60 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Mar 2021 10:35:36 +0000 Subject: [PATCH 31/54] fluent-bit: 1.7.1 -> 1.7.2 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index a504efbf1eb2..762d93ea1e9b 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1xzbsnij0xsgd5j11frkf35w8rkr55hq2yl7myaxrgzh686a8law"; + sha256 = "sha256-5R26NvhSYesMk/8i9+5H3pZTgbdbnuQ1rLlCa/gWJGc="; }; nativeBuildInputs = [ cmake flex bison ]; From 64f91849d483e8201e9a6fc888e72c8fac6a2446 Mon Sep 17 00:00:00 2001 From: Owen Shepherd Date: Mon, 8 Mar 2021 00:46:01 +0000 Subject: [PATCH 32/54] oranchelo-icon-theme: init at 0.8.0.1 --- .../icons/oranchelo-icon-theme/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/data/icons/oranchelo-icon-theme/default.nix diff --git a/pkgs/data/icons/oranchelo-icon-theme/default.nix b/pkgs/data/icons/oranchelo-icon-theme/default.nix new file mode 100644 index 000000000000..9288b9307f55 --- /dev/null +++ b/pkgs/data/icons/oranchelo-icon-theme/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, gtk3, plasma5Packages, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "oranchelo-icon-theme"; + version = "0.8.0.1"; + + src = fetchFromGitHub { + owner = "OrancheloTeam"; + repo = pname; + rev = "096c8c8d550ac9a85f5f34f3f30243e6f198df2d"; + sha256 = "sha256-TKi42SA33pGKdrPtGTpvxFbOP+5N93Y4BvO4CRTveLM="; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + plasma5Packages.breeze-icons + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + mkdir -p $out/share/icons + cp -r $Oranchelo* $out/share/icons/ + ''; + + meta = with lib; { + description = "Oranchelo icon theme"; + homepage = "https://github.com/OrancheloTeam/oranchelo-icon-theme"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ _414owen ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e6416b0c0a4..ca290b8f31f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20949,6 +20949,8 @@ in openzone-cursors = callPackage ../data/themes/openzone { }; + oranchelo-icon-theme = callPackage ../data/icons/oranchelo-icon-theme { }; + orbitron = callPackage ../data/fonts/orbitron { }; orchis = callPackage ../data/themes/orchis { }; From 942e1a363f968678197c6108d1069b8b483ca619 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 7 Mar 2021 21:20:34 +0100 Subject: [PATCH 33/54] python3Packages.pytest-cid: init at 1.1.1 --- .../python-modules/pytest-cid/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-cid/default.nix diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix new file mode 100644 index 000000000000..c1c918c4d60c --- /dev/null +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, py-cid +, pytestCheckHook +, pytest-cov +}: + +buildPythonPackage rec { + pname = "pytest-cid"; + version = "1.1.1"; + format = "flit"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "ntninja"; + repo = pname; + rev = "1ff9ec43ac9eaf76352ea7e7a060cd081cb8b68a"; # Version has no git tag + sha256 = "sha256-H2RtMGYWukowTTfqZSx+hikxzkqw1v5bA4AfZfiVl8U="; + }; + + propagatedBuildInputs = [ + py-cid + ]; + + checkInputs = [ + pytestCheckHook + pytest-cov + ]; + + pythonImportsCheck = [ "pytest_cid" ]; + + meta = with lib; { + homepage = "https://github.com/ntninja/pytest-cid"; + description = "A simple wrapper around py-cid for easily writing tests involving CIDs in datastructures"; + license = licenses.mpl20; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2b8afa2c56b..6df69c87410e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6249,6 +6249,8 @@ in { pytest-check = callPackage ../development/python-modules/pytest-check { }; + pytest-cid = callPackage ../development/python-modules/pytest-cid { }; + pytest-click = callPackage ../development/python-modules/pytest-click { }; pytest-cov = self.pytestcov; # self 2021-01-04 From 75890e7b35e2feb9cd61b908ae14dd130bb113ce Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 11:50:27 -0500 Subject: [PATCH 34/54] python3Packages.botocore: 1.20.20 -> 1.20.22 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 5714cbf5fb8e..29f00d87ad3a 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.20"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.22"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-gMMqgfse6L36B0p5v7iFuyAG6Kl4LyNTwMn2OScE4To="; + sha256 = "sha256-MuhvnRhVW9O03GlKJjmhwfyMi0KknaVDuVrJ0ExAdws="; }; propagatedBuildInputs = [ From 719cc9b198e62abd40545e6f52949f19faf3ff88 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 11:51:14 -0500 Subject: [PATCH 35/54] python3Packages.boto3: 1.17.20 -> 1.17.22 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 1c035a2470aa..32b3bfc4b838 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.20"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.22"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-Ihnx6+iNJmr6VRb5k5g+uodCuVf6T9aFTzxzqjAw6TE="; + sha256 = "sha256-Thd8ndSsRdnkGGfPt0f0yYXWsF/xRjesWGGmDaqVx8E="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 854419130689657487831af63dfc4ed5dfe50fb9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 11:52:17 -0500 Subject: [PATCH 36/54] awscli: 1.19.20 -> 1.19.22 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 264eb7b09c41..ce3dbcc74be8 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.20"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.22"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-Fu+KuGOGDUMXgwUKabZjaCBQHdlLLBwPJXU4rlohKNs="; + sha256 = "sha256-yu2IltNbOLB44M+0u5lTjHHllDndBHp4rNfMwFOKMgw="; }; # https://github.com/aws/aws-cli/issues/4837 From 1e5eae6f4b43aa3837ad4174c64ecd85e16eb4bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Mar 2021 19:01:06 +0100 Subject: [PATCH 37/54] python3Packages.adafruit-platformdetect: 3.2.0 -> 3.3.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 75eb4d0052cc..22d2bfda8115 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Adafruit-PlatformDetect"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "a14c642b1f6849e57b5c442e81e809c9e1e3a0bcfebfd54b15a9f9fd273f9611"; + sha256 = "sha256-F5p3RO9847YQ7tDzb0r3+6dSCEAWoyxtMGBwhywR3/0="; }; nativeBuildInputs = [ setuptools-scm ]; From 71ec323d0968c702fd1c529bc16308ddaee9143c Mon Sep 17 00:00:00 2001 From: Serval Date: Tue, 9 Mar 2021 02:18:07 +0800 Subject: [PATCH 38/54] v2ray: 4.34.0 -> 4.35.1 Also handle SRI hash produced by nix unstable in update script. --- pkgs/tools/networking/v2ray/default.nix | 16 ++++++++-------- pkgs/tools/networking/v2ray/update.sh | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 022504695483..852cd23360c2 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.34.0"; + version = "4.35.1"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "0x6smffpvnrk76plnsk31qqznkyz06dh4sazncp2l3y9va8k2jb1"; + sha256 = "07fih1hnnv1a4aj6sb63408vqf10bgk74lhqqv63lvm7gaz73srd"; }; - vendorSha256 = "077jnjsmhzr0idrk7pifr5s2r9yjf1v9bvj177n2k2ln8w3wgx3g"; + vendorSha256 = "sha256-+kI9p0lu4PbLe6jhWqTfRYXHFOOrKmY36LzdcQT9BWw="; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202101070033"; - geoipSha256 = "11naj51pzchdrjmkp1dqzcby1i2fhbq0mncwm4d5q5mh3chyizsf"; + geoipRev = "202103080146"; + geoipSha256 = "1qwmz5fxqqxcjw5jm9dvgpmbin2q69j9wdx4xv3pm8fc47wzx8w5"; in fetchurl { url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20210106164413"; - geositeSha256 = "0chc7jb3yzgrrjkpd3s1rlim5qgf6j2kp952fvkhpwmnap86aip7"; + geositeRev = "20210308021214"; + geositeSha256 = "1fp787wlzdjn2gxx4zmqrqqzqcq4xd10pqx8q919fag0kkzdm23s"; in fetchurl { url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; @@ -68,7 +68,7 @@ let }; in runCommand "v2ray-${version}" { - inherit version; + inherit src version; inherit (core) meta; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/v2ray/update.sh b/pkgs/tools/networking/v2ray/update.sh index 08062b1e9969..3b3a9de7385c 100755 --- a/pkgs/tools/networking/v2ray/update.sh +++ b/pkgs/tools/networking/v2ray/update.sh @@ -61,7 +61,7 @@ set +o pipefail vendorSha256=$( nix-build "$nixpkgs" -A v2ray --no-out-link 2>&1 | tee /dev/stderr | - sed -nE 's/.*got:\s*sha256:(\w+)$/\1/p' + sed -nE 's/.*got:\s*(sha256\S+)$/\1/p' ) [[ "$vendorSha256" ]] sed --in-place \ From c666f8df979341a6c1f10284c2f8e33c0650345e Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 8 Mar 2021 19:36:00 +0100 Subject: [PATCH 39/54] vscode-extensions.gruntfuggly.todo-tree: 0.0.198 -> 0.0.201 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 7224e302f131..f751097a5894 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -365,8 +365,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.198"; - sha256 = "0riy2k8dbsnpk8vkv814fr8zh87y425s24nklcx4b7mfrszv7xbn"; + version = "0.0.201"; + sha256 = "1hjck1r2byc45rp28gn15wbmcrl1wjng7kn5lyhr6mgjjwqh5pa8"; }; meta = with lib; { license = licenses.mit; From 6cb28a7a47e2844f927c596a4b575ceb7fe0f64b Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 8 Mar 2021 19:44:05 +0100 Subject: [PATCH 40/54] bolt: 0.9 -> 0.9.1 --- pkgs/os-specific/linux/bolt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index d692e30a03f9..d38a97387f5a 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "bolt"; - version = "0.9"; + version = "0.9.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "bolt"; repo = "bolt"; rev = version; - sha256 = "sha256-lcJE+bMK2S2GObHMy/Fu12WGb3T1HrWjsNyZPz4/f4E="; + sha256 = "1phgp8fs0dlj74kbkqlvfniwc32daz47b3pvsxlfxqzyrp77xrfm"; }; nativeBuildInputs = [ From a96be025a1541a842fe8f32a90cc0c1cc2a13c9f Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 8 Mar 2021 21:46:55 +0300 Subject: [PATCH 41/54] =?UTF-8?q?lagrange:=201.1.4=20=E2=86=92=201.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/networking/browsers/lagrange/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 78eef775558b..deea3decc294 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.1.4"; + version = "1.2.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-EN0fQ5Scwrd7Tv31upQVbuqoNCoYudtruwtPR1IKTzE="; + sha256 = "sha256-Y+BiXKxlUSZXaLcz75l333ZBkKyII9IyTmKQwjshBkE="; fetchSubmodules = true; }; From 22640c527df57b1e15ba49fed8c8ab34168d6fb7 Mon Sep 17 00:00:00 2001 From: SuperSandro2000 Date: Mon, 8 Mar 2021 11:43:31 +0000 Subject: [PATCH 42/54] Update nodePackages --- .../node-packages/node-packages.nix | 1017 ++++++++--------- 1 file changed, 483 insertions(+), 534 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 58c44890f4ee..68c934bee738 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1597,6 +1597,15 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; + "@deepcode/dcignore-1.0.2" = { + name = "_at_deepcode_slash_dcignore"; + packageName = "@deepcode/dcignore"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@deepcode/dcignore/-/dcignore-1.0.2.tgz"; + sha512 = "DPgxtHuJwBORpqRkPXzzOT+uoPRVJmaN7LR+pmeL6DQM90kj6G6GFUH1i/YpRH8NbML8ZGEDwB9f9u4UwD2pzg=="; + }; + }; "@devicefarmer/adbkit-2.11.3" = { name = "_at_devicefarmer_slash_adbkit"; packageName = "@devicefarmer/adbkit"; @@ -3658,13 +3667,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-9.8.4" = { + "@netlify/build-9.8.5" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "9.8.4"; + version = "9.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-9.8.4.tgz"; - sha512 = "+ep+IPKkv6ZYHieeZ4Z6DkKpcFzSkpA2yYlwbxUw+R5SxgIVIvO7dGGRY+4Z8nMz3J29O0Ak0F5//gdwuxhjMA=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-9.8.5.tgz"; + sha512 = "/lT+bfnMgaenYLVAdQd8T1GPyohpN4LR2JkvWLlnm4JEWkyiXF/W5DaMOPBGxGIzIZq4ml9wh+YFZ9lzq6J89g=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -4252,13 +4261,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-6.12.0" = { + "@octokit/types-6.12.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.12.0"; + version = "6.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.12.0.tgz"; - sha512 = "KwOf16soD7aDEEi/PgNeJlHzjZPfrmmNy+7WezSdrpnqZ7YImBJcNnX9+5RUHt1MnA4h8oISRHTqaZDGsX9DRQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.12.1.tgz"; + sha512 = "eZTTWJxGBon01Ra4EX86rvlMZGkU5SeJ8BtwQlsv2wEqZttpjtefLetJndZTVbJ25qFKoyKMWsRFnwlOx7ZaDQ=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -5233,6 +5242,15 @@ let sha512 = "ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA=="; }; }; + "@snyk/code-client-3.1.4" = { + name = "_at_snyk_slash_code-client"; + packageName = "@snyk/code-client"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.1.4.tgz"; + sha512 = "ZZWPWAaKgNii/HYtyO9guFDVpi5T/SoCWQIo/B/RbLbXLrdZ5VIHsn0E4ztY7Y69GjQCyrus5pu7adlYrwQtEQ=="; + }; + }; "@snyk/composer-lockfile-parser-1.4.1" = { name = "_at_snyk_slash_composer-lockfile-parser"; packageName = "@snyk/composer-lockfile-parser"; @@ -5260,6 +5278,15 @@ let sha512 = "DIFLEhr8m1GrAwsLGInJmpcQMacjuhf3jcbpQTR+LeMvZA9IuKq+B7kqw2O2FzMiHMZmUb5z+tV+BR7+IUHkFQ=="; }; }; + "@snyk/fast-glob-3.2.6-patch" = { + name = "_at_snyk_slash_fast-glob"; + packageName = "@snyk/fast-glob"; + version = "3.2.6-patch"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/fast-glob/-/fast-glob-3.2.6-patch.tgz"; + sha512 = "E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg=="; + }; + }; "@snyk/gemfile-1.2.0" = { name = "_at_snyk_slash_gemfile"; packageName = "@snyk/gemfile"; @@ -5269,6 +5296,15 @@ let sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="; }; }; + "@snyk/glob-parent-5.1.2-patch.1" = { + name = "_at_snyk_slash_glob-parent"; + packageName = "@snyk/glob-parent"; + version = "5.1.2-patch.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/glob-parent/-/glob-parent-5.1.2-patch.1.tgz"; + sha512 = "OkUPdHgxIWKAAzceG1nraNA0kgI+eS0I9wph8tll9UL0slD2mIWSj4mAqroGovaEXm8nHedoUfuDRGEb6wnzCQ=="; + }; + }; "@snyk/graphlib-2.1.9-patch.3" = { name = "_at_snyk_slash_graphlib"; packageName = "@snyk/graphlib"; @@ -5728,6 +5764,15 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; + "@types/braces-3.0.0" = { + name = "_at_types_slash_braces"; + packageName = "@types/braces"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/braces/-/braces-3.0.0.tgz"; + sha512 = "TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw=="; + }; + }; "@types/cacheable-request-6.0.1" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; @@ -5890,13 +5935,13 @@ let sha512 = "DLVpLEGTEZGBXOYoYoagHSxXkDHONc0fZouF2ayw7Q18aRu1Afwci+1CFKvPpouCUOVWP+dmCaAWpQjswe7kpg=="; }; }; - "@types/eslint-7.2.6" = { + "@types/eslint-7.2.7" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "7.2.6"; + version = "7.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.6.tgz"; - sha512 = "I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.7.tgz"; + sha512 = "EHXbc1z2GoQRqHaAT7+grxlTJ3WE2YNeD6jlpPoRc83cCoThRY+NUWjCUZaYmk51OICkPXn2hhphcWcWXgNW0Q=="; }; }; "@types/eslint-scope-3.7.0" = { @@ -5989,6 +6034,15 @@ let sha512 = "mky/O83TXmGY39P1H9YbUpjV6l6voRYlufqfFCvel8l1phuy8HRjdWc1rrPuN53ITBJlbyMSV6z3niOySO5pgQ=="; }; }; + "@types/flat-cache-2.0.0" = { + name = "_at_types_slash_flat-cache"; + packageName = "@types/flat-cache"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/flat-cache/-/flat-cache-2.0.0.tgz"; + sha512 = "fHeEsm9hvmZ+QHpw6Fkvf19KIhuqnYLU6vtWLjd5BsMd/qVi7iTkMioDZl0mQmfNRA1A6NwvhrSRNr9hGYZGww=="; + }; + }; "@types/fs-capacitor-2.0.0" = { name = "_at_types_slash_fs-capacitor"; packageName = "@types/fs-capacitor"; @@ -6250,6 +6304,33 @@ let sha512 = "oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q=="; }; }; + "@types/lodash.chunk-4.2.6" = { + name = "_at_types_slash_lodash.chunk"; + packageName = "@types/lodash.chunk"; + version = "4.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash.chunk/-/lodash.chunk-4.2.6.tgz"; + sha512 = "SPlusB7jxXyGcTXYcUdWr7WmhArO/rmTq54VN88iKMxGUhyg79I4Q8n4riGn3kjaTjOJrVlHhxgX/d7woak5BQ=="; + }; + }; + "@types/lodash.omit-4.5.6" = { + name = "_at_types_slash_lodash.omit"; + packageName = "@types/lodash.omit"; + version = "4.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.6.tgz"; + sha512 = "KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ=="; + }; + }; + "@types/lodash.union-4.6.6" = { + name = "_at_types_slash_lodash.union"; + packageName = "@types/lodash.union"; + version = "4.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz"; + sha512 = "Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw=="; + }; + }; "@types/long-4.0.1" = { name = "_at_types_slash_long"; packageName = "@types/long"; @@ -6277,6 +6358,15 @@ let sha512 = "SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw=="; }; }; + "@types/micromatch-4.0.1" = { + name = "_at_types_slash_micromatch"; + packageName = "@types/micromatch"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.1.tgz"; + sha512 = "my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw=="; + }; + }; "@types/mime-1.3.2" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; @@ -6385,13 +6475,13 @@ let sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="; }; }; - "@types/node-10.17.54" = { + "@types/node-10.17.55" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.54"; + version = "10.17.55"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.54.tgz"; - sha512 = "c8Lm7+hXdSPmWH4B9z/P/xIXhFK3mCQin4yCYMd2p1qpMG5AfgyJuYZ+3q2dT7qLiMMMGMd5dnkFpdqJARlvtQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.55.tgz"; + sha512 = "koZJ89uLZufDvToeWO5BrC4CR4OUfHnUz2qoPs/daQH6qq3IN62QFxCTZ+bKaCE0xaoCAJYE4AXre8AbghCrhg=="; }; }; "@types/node-12.12.70" = { @@ -6421,13 +6511,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.14.31" = { + "@types/node-14.14.32" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.31"; + version = "14.14.32"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz"; - sha512 = "vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.32.tgz"; + sha512 = "/Ctrftx/zp4m8JOujM5ZhwzlWLx22nbQJiVqz8/zE15gOeEW+uly3FSX4fGFpcfEvFzXcMCJwq9lGVWgyARXhg=="; }; }; "@types/node-6.14.13" = { @@ -6538,13 +6628,13 @@ let sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="; }; }; - "@types/qs-6.9.5" = { + "@types/qs-6.9.6" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.5"; + version = "6.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz"; - sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz"; + sha512 = "0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA=="; }; }; "@types/range-parser-1.2.3" = { @@ -6619,6 +6709,15 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; + "@types/sarif-2.1.3" = { + name = "_at_types_slash_sarif"; + packageName = "@types/sarif"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.3.tgz"; + sha512 = "zf+EoIplTkQW2TV2mwtJtlI0g540Z3Rs9tX9JqRAtyjnDCqkP+eMTgWCj3PGNbQpi+WXAjvC3Ou/dvvX2sLK4w=="; + }; + }; "@types/sass-1.16.0" = { name = "_at_types_slash_sass"; packageName = "@types/sass"; @@ -6745,13 +6844,13 @@ let sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; }; }; - "@types/uglify-js-3.12.0" = { + "@types/uglify-js-3.13.0" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.12.0.tgz"; - sha512 = "sYAF+CF9XZ5cvEBkI7RtrG9g2GtMBkviTnBxYYyq+8BWvO4QtXfwwR6a2LFwCi4evMKZfpv6U43ViYvv17Wz3Q=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.0.tgz"; + sha512 = "EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q=="; }; }; "@types/unist-2.0.3" = { @@ -8392,13 +8491,13 @@ let sha512 = "TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg=="; }; }; - "adm-zip-0.5.3" = { + "adm-zip-0.5.4" = { name = "adm-zip"; packageName = "adm-zip"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.3.tgz"; - sha512 = "zsoTXEwRNCxBzRHLENFLuecCcwzzXiEhWo1r3GP68iwi8Q/hW2RrqgeY1nfJ/AhNQNWnZq/4v0TbfMsUkI+TYw=="; + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.4.tgz"; + sha512 = "GMQg1a1cAegh+/EgWbz+XHZrwB467iB/IgtToldvxs7Xa5Br8mPmvCeRfY/Un2fLzrlIPt6Yu7Cej+8Ut9TGPg=="; }; }; "adverb-where-0.0.9" = { @@ -8572,13 +8671,13 @@ let sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; }; }; - "ajv-7.1.1" = { + "ajv-7.2.1" = { name = "ajv"; packageName = "ajv"; - version = "7.1.1"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-7.1.1.tgz"; - sha512 = "ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-7.2.1.tgz"; + sha512 = "+nu0HDv7kNSOua9apAVc979qd932rrZeb3WOvoiD31A/p1mIE5/9bN2027pE2rOPYEdS3UHzsvof4hY+lM9/WQ=="; }; }; "ajv-errors-1.0.1" = { @@ -9544,13 +9643,13 @@ let sha512 = "Tq3yV/T4wxBsD2Wign8W9VQKhaUxzzRmjEiSoOK0SLqPgDP/N1TKdYyBeIEu56T4I9iO4fKTTR0mN9NWkBA0sg=="; }; }; - "archiver-5.2.0" = { + "archiver-5.3.0" = { name = "archiver"; packageName = "archiver"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-5.2.0.tgz"; - sha512 = "QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ=="; + url = "https://registry.npmjs.org/archiver/-/archiver-5.3.0.tgz"; + sha512 = "iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg=="; }; }; "archiver-utils-2.1.0" = { @@ -13891,13 +13990,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001196" = { + "caniuse-lite-1.0.30001197" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001196"; + version = "1.0.30001197"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001196.tgz"; - sha512 = "CPvObjD3ovWrNBaXlAIGWmg2gQQuJ5YhuciUOjPRox6hIQttu8O+b51dx6VIpIY9ESd2d0Vac1RKpICdG4rGUg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001197.tgz"; + sha512 = "8aE+sqBqtXz4G8g35Eg/XEaFr2N7rd/VQ6eABGBmNtcB8cN6qNJhMi6oSFy4UWWZgqgL3filHT8Nha4meu3tsw=="; }; }; "canvas-2.7.0" = { @@ -15052,13 +15151,13 @@ let sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; }; }; - "clipboard-2.0.6" = { + "clipboard-2.0.7" = { name = "clipboard"; packageName = "clipboard"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz"; - sha512 = "g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg=="; + url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.7.tgz"; + sha512 = "8M8WEZcIvs0hgOma+wAPkrUxpv0PMY1L6VsAJh/2DOKARIMpyWe6ZLcEoe1qktl6/ced5ceYHs+oGedSbgZ3sg=="; }; }; "clipboardy-1.2.3" = { @@ -16519,13 +16618,13 @@ let sha512 = "5AKrTtmiioQWloJ3WRFZb0/uR1lrRboaVE9go++XZltvRnZkN2/kQjaZ0gtFxynU5u5k9mWVtk8mNcgJ9yoRbQ=="; }; }; - "constructs-3.3.58" = { + "constructs-3.3.61" = { name = "constructs"; packageName = "constructs"; - version = "3.3.58"; + version = "3.3.61"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.58.tgz"; - sha512 = "TSDyDQmHWs0fBJQjQIjVC5Hd7iLy62Pd6PTN4wOlr4dRGkByYS7Fzb87HOIewN6AZAZPxjCVR7MqtJM8RgVBsg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.61.tgz"; + sha512 = "9zg2/Bl9y0Z/9eQ3NO8BcCWlAVs6hXGCcRH2bQLSqExyrE54qzh50Vtb7ULrKOkC5nT974VG+cWdeXrcC6JDqA=="; }; }; "consume-http-header-1.0.0" = { @@ -21796,13 +21895,13 @@ let sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; }; }; - "esbuild-0.8.56" = { + "esbuild-0.8.57" = { name = "esbuild"; packageName = "esbuild"; - version = "0.8.56"; + version = "0.8.57"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.8.56.tgz"; - sha512 = "PTMdAWK3JI2MNW811znGssGP5GR44tQPr++VQ1rPP0n8Z1cTKbCPD3S/kXPLr3ZZDIwAaVm08fuFym6Rp8l/0A=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.8.57.tgz"; + sha512 = "j02SFrUwFTRUqiY0Kjplwjm1psuzO1d6AjaXKuOR9hrY0HuPsT6sV42B6myW34h1q4CRy+Y3g4RU/cGJeI/nNA=="; }; }; "esc-exit-2.0.2" = { @@ -24091,15 +24190,6 @@ let sha1 = "2ad90d490f6828c1aa40292cf709ac3318210c3c"; }; }; - "find-yarn-workspace-root-1.2.1" = { - name = "find-yarn-workspace-root"; - packageName = "find-yarn-workspace-root"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz"; - sha512 = "dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q=="; - }; - }; "find-yarn-workspace-root-2.0.0" = { name = "find-yarn-workspace-root"; packageName = "find-yarn-workspace-root"; @@ -26071,13 +26161,13 @@ let sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; - "glob-parent-5.1.1" = { + "glob-parent-5.1.2" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; - sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; "glob-slash-1.0.0" = { @@ -28061,13 +28151,13 @@ let sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; }; }; - "htmlparser2-6.0.0" = { + "htmlparser2-6.0.1" = { name = "htmlparser2"; packageName = "htmlparser2"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.0.tgz"; - sha512 = "numTQtDZMoh78zJpaNdJ9MXb2cv5G3jwUoe3dMQODubZvLoGvTE/Ofp6sHvH8OGKcN/8A47pGLi/k58xHP/Tfw=="; + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.1.tgz"; + sha512 = "GDKPd+vk4jvSuvCbyuzx/unmXkk090Azec7LovXP8as1Hn8q9p3hbjmDGbUqqhknw0ajwit6LiiWqfiTUPMK7w=="; }; }; "http-auth-2.0.7" = { @@ -30456,13 +30546,13 @@ let sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; }; }; - "is-path-inside-3.0.2" = { + "is-path-inside-3.0.3" = { name = "is-path-inside"; packageName = "is-path-inside"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz"; - sha512 = "/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg=="; + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; }; }; "is-plain-obj-1.1.0" = { @@ -31779,13 +31869,13 @@ let sha512 = "fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g=="; }; }; - "jsdom-16.4.0" = { + "jsdom-16.5.0" = { name = "jsdom"; packageName = "jsdom"; - version = "16.4.0"; + version = "16.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz"; - sha512 = "lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w=="; + url = "https://registry.npmjs.org/jsdom/-/jsdom-16.5.0.tgz"; + sha512 = "QxZH0nmDTnTTVI0YDm4RUlaUPl5dcyn62G5TMDNfMmTW+J1u1v9gCR8WR+WZ6UghAa7nKJjDOFaI00eMMWvJFQ=="; }; }; "jsdom-7.2.2" = { @@ -31860,13 +31950,13 @@ let sha512 = "BMYxIjYG62wctUZFjYc5xKPNTgzTRRw2Fp8R9p4o0VeFE224ntyHgy9y7oKuCu+K1ev917NRoCLj7f2tyGTMAg=="; }; }; - "jsii-srcmak-0.1.249" = { + "jsii-srcmak-0.1.252" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.249"; + version = "0.1.252"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.249.tgz"; - sha512 = "l+zmAdckyvqsTKs18jn36aiFrFh8Zxuea2cQjtOCp5rsF1uOO8oYuwOAddtaCAa3j1dG6qhOvdm8Sfz7C0FMuA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.252.tgz"; + sha512 = "nRQ2JdGUgAi5YXkxQwJ4lM3K4oTeGzVTIT+4nQ6FBLC0/eHQrJYbqNbX27xb/JzqidVzv7y7C0ykZGiBDByKSQ=="; }; }; "json-bigint-0.2.3" = { @@ -34246,6 +34336,15 @@ let sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; }; }; + "lodash.chunk-4.2.0" = { + name = "lodash.chunk"; + packageName = "lodash.chunk"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz"; + sha1 = "66e5ce1f76ed27b4303d8c6512e8d1216e8106bc"; + }; + }; "lodash.clone-4.5.0" = { name = "lodash.clone"; packageName = "lodash.clone"; @@ -37729,13 +37828,13 @@ let sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; }; }; - "mocha-8.3.0" = { + "mocha-8.3.1" = { name = "mocha"; packageName = "mocha"; - version = "8.3.0"; + version = "8.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz"; - sha512 = "TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.3.1.tgz"; + sha512 = "5SBMxANWqOv5bw3Hx+HVgaWlcWcFEQDUdaUAr1AUU+qwtx6cowhn7gEDT/DwQP7uYxnvShdUOVLbTYAHOEGfDQ=="; }; }; "mock-require-3.0.3" = { @@ -42547,15 +42646,6 @@ let sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="; }; }; - "parse5-5.1.1" = { - name = "parse5"; - packageName = "parse5"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz"; - sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; - }; - }; "parse5-6.0.1" = { name = "parse5"; packageName = "parse5"; @@ -46472,6 +46562,15 @@ let sha512 = "AMD7w5hRXcFSb8s9u38acBZ+309u6GsiibP4/0YacJeaurRshogB7v/ZcVPxP5gD5+zIw6ixRHdutiYUJfwKHw=="; }; }; + "queue-6.0.2" = { + name = "queue"; + packageName = "queue"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz"; + sha512 = "iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA=="; + }; + }; "queue-microtask-1.2.2" = { name = "queue-microtask"; packageName = "queue-microtask"; @@ -50513,13 +50612,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.36.0" = { + "simple-git-2.36.1" = { name = "simple-git"; packageName = "simple-git"; - version = "2.36.0"; + version = "2.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.36.0.tgz"; - sha512 = "EJNaUgGYzBnQiyEkNZgbQSg76agbEDqlgHDr8DAXqV8xWvcefydbipye7YXtHMGbbEK998dcFezS8qF0sepZ5Q=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.36.1.tgz"; + sha512 = "bN18Ea/4IJgqgbZyE9VpVEUkAu9vyP0VWP7acP0CRC1p/N80GGJ0HhIVeFJsm8TdJLBowiJpdLesQuAZ5TFSKw=="; }; }; "simple-markdown-0.4.4" = { @@ -53708,13 +53807,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylelint-13.11.0" = { + "stylelint-13.12.0" = { name = "stylelint"; packageName = "stylelint"; - version = "13.11.0"; + version = "13.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.11.0.tgz"; - sha512 = "DhrKSWDWGZkCiQMtU+VroXM6LWJVC8hSK24nrUngTSQvXGK75yZUq4yNpynqrxD3a/fzKMED09V+XxO4z4lTbw=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.12.0.tgz"; + sha512 = "P8O1xDy41B7O7iXaSlW+UuFbE5+ZWQDb61ndGDxKIt36fMH50DtlQTbwLpFLf8DikceTAb3r6nPrRv30wBlzXw=="; }; }; "stylelint-8.4.0" = { @@ -54032,13 +54131,13 @@ let sha512 = "SROWH0rB0DJ+0Ii264cprmNu/NJyZacs5wFD71ya93Cg/oA2lKHgQm4F6j0EWA4ktFMzeuJJm/eX6fka39hEHA=="; }; }; - "svelte2tsx-0.1.178" = { + "svelte2tsx-0.1.179" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.1.178"; + version = "0.1.179"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.178.tgz"; - sha512 = "zfIFE+H5ndEBJ5CLTB3xJyUu/vwezThv1k9DvYFiIE7s9oNq4S1uxpqOU43n/KJKADA/nvk61O3H8ADSj7cLQQ=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.179.tgz"; + sha512 = "tfSRUuUziFPcD2w6fIfu9ybpkV2M7HQgmcelcdCC0bKVqR+pm6kdmIyo6L5kwR3IRjhq03DekkpVer1uXxTZ9A=="; }; }; "sver-compat-1.5.0" = { @@ -55842,6 +55941,15 @@ let sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; }; }; + "tough-cookie-4.0.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg=="; + }; + }; "township-client-1.3.2" = { name = "township-client"; packageName = "township-client"; @@ -56256,13 +56364,13 @@ let sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; }; - "tsutils-3.20.0" = { + "tsutils-3.21.0" = { name = "tsutils"; packageName = "tsutils"; - version = "3.20.0"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsutils/-/tsutils-3.20.0.tgz"; - sha512 = "RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg=="; + url = "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"; + sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; }; }; "ttl-1.3.1" = { @@ -57426,13 +57534,13 @@ let sha512 = "sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="; }; }; - "unist-util-is-4.0.4" = { + "unist-util-is-4.1.0" = { name = "unist-util-is"; packageName = "unist-util-is"; - version = "4.0.4"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.4.tgz"; - sha512 = "3dF39j/u423v4BBQrk1AQ2Ve1FxY5W3JKwXxVFzBODQ6WEvccguhgp802qQLKSnxPODE6WuRZtV+ohlUg4meBA=="; + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz"; + sha512 = "ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg=="; }; }; "unist-util-map-1.0.5" = { @@ -59263,13 +59371,13 @@ let sha512 = "gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w=="; }; }; - "vls-0.5.10" = { + "vls-0.7.2" = { name = "vls"; packageName = "vls"; - version = "0.5.10"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.5.10.tgz"; - sha512 = "/zXdkUatCptsDGmrEVh0A/LEQ48qEwrKe+7HiIwUOmiz+0DkoHsyf/j6eppXMVRWMcHWopwd9/VTNCRlFf2NFw=="; + url = "https://registry.npmjs.org/vls/-/vls-0.7.2.tgz"; + sha512 = "9nKgSPtNxQlc32K5GgZV++MdsCpNuac/SfxnEmVI0DCF4E0Uekj+RUo7Zk6NnA4veiNMN+AEjAIlbXYWPHgX6Q=="; }; }; "vm-browserify-1.1.2" = { @@ -61198,6 +61306,15 @@ let sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="; }; }; + "ws-7.4.4" = { + name = "ws"; + packageName = "ws"; + version = "7.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz"; + sha512 = "Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -63148,16 +63265,16 @@ in sources."@nestjs/schematics-7.2.8" sources."@schematics/schematics-0.1102.0" sources."@types/anymatch-1.3.1" - sources."@types/eslint-7.2.6" + sources."@types/eslint-7.2.7" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.7" sources."@types/json5-0.0.29" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" - (sources."@types/uglify-js-3.12.0" // { + (sources."@types/uglify-js-3.13.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -63207,7 +63324,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001196" + sources."caniuse-lite-1.0.30001197" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" @@ -63263,7 +63380,7 @@ in sources."function-bind-1.1.1" sources."get-stream-5.2.0" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.6" sources."has-1.0.3" @@ -63479,7 +63596,7 @@ in }) (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.54" + sources."@types/node-10.17.55" ]; }) sources."@apollographql/apollo-tools-0.4.9" @@ -63841,14 +63958,14 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.1" ]; }) sources."@types/normalize-package-data-2.4.0" - sources."@types/qs-6.9.5" + sources."@types/qs-6.9.6" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.9" sources."@types/through-0.0.30" @@ -64102,7 +64219,7 @@ in ]; }) sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001196" + sources."caniuse-lite-1.0.30001197" (sources."capital-case-1.0.4" // { dependencies = [ sources."tslib-2.1.0" @@ -64186,7 +64303,7 @@ in ]; }) sources."cli-width-3.0.0" - sources."clipboard-2.0.6" + sources."clipboard-2.0.7" (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -64479,7 +64596,7 @@ in sources."git-up-4.0.2" sources."git-url-parse-11.4.3" sources."glob-7.1.5" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" (sources."global-agent-2.1.12" // { dependencies = [ @@ -65726,7 +65843,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."browserslist-4.16.3" - sources."caniuse-lite-1.0.30001196" + sources."caniuse-lite-1.0.30001197" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -65831,7 +65948,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -67272,7 +67389,7 @@ in }; dependencies = [ sources."@jsii/spec-1.24.0" - sources."@types/node-10.17.54" + sources."@types/node-10.17.55" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."array-filter-1.0.0" @@ -67366,7 +67483,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.249" // { + (sources."jsii-srcmak-0.1.252" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -67469,7 +67586,7 @@ in sources."@types/archiver-5.1.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/readline-sync-1.4.3" sources."@types/stream-buffers-3.0.3" sources."@types/uuid-8.3.0" @@ -67477,7 +67594,7 @@ in sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."archiver-5.2.0" + sources."archiver-5.3.0" (sources."archiver-utils-2.1.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -67522,7 +67639,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.0" sources."concat-map-0.0.1" - sources."constructs-3.3.58" + sources."constructs-3.3.61" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" sources."crc32-stream-4.0.2" @@ -67642,7 +67759,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.249" // { + (sources."jsii-srcmak-0.1.252" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -68037,10 +68154,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.3.0.tgz"; - sha512 = "YMKmaWmrrfncd+kjF0Xz5by+V1CUsEVJubEO47syfQ5ZPov7TW4/I0OhMZJBjiTXGQJuI5zS8uQbG6VSdke/dA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.3.1.tgz"; + sha512 = "119J+uanlMO9xZA4yeyvjwbWKDckLUKUtJu6mreHuyQbd7x4Ea3qwjpWMlGl2+QLJQ78OPZjpbzzlc8FzDZY2A=="; }; buildInputs = globalBuildInputs; meta = { @@ -68512,7 +68629,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001196" + sources."caniuse-lite-1.0.30001197" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.0" // { @@ -68748,7 +68865,7 @@ in sources."is-glob-2.0.1" ]; }) - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" sources."globals-12.4.0" @@ -69268,7 +69385,7 @@ in sources."svg-tags-1.0.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.1.1" + sources."ajv-7.2.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -69297,7 +69414,7 @@ in sources."tsutils-2.29.0" ]; }) - sources."tsutils-3.20.0" + sources."tsutils-3.21.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."typescript-3.9.9" @@ -69478,10 +69595,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.36.1"; + version = "0.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.36.1.tgz"; - sha512 = "g4h0phqq6Wyf4S2kyRSklaokDcqRWqu7NmKL2HrU3S4MstwKddAzQ/jHBL/5akBa4WeL8/Mvj3v90sHuSPly3w=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.37.0.tgz"; + sha512 = "hATxP0epa85YwVzUSYivWgCChPENb9ugKC1G5TOD/flfPRUIGqVVJQDKbqCo+sWUbhYnGLeIl04CJfFhNk/xKA=="; }; buildInputs = globalBuildInputs; meta = { @@ -69590,7 +69707,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-7.1.1" + sources."ajv-7.2.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -69605,7 +69722,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001196" + sources."caniuse-lite-1.0.30001197" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -69666,7 +69783,7 @@ in sources."gensync-1.0.0-beta.2" sources."get-stdin-8.0.0" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" sources."globals-11.12.0" @@ -69835,7 +69952,7 @@ in sources."strip-ansi-6.0.0" sources."strip-indent-3.0.0" sources."style-search-0.1.0" - sources."stylelint-13.11.0" + sources."stylelint-13.12.0" sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" @@ -69849,7 +69966,7 @@ in sources."unified-9.2.1" sources."uniq-1.0.1" sources."unist-util-find-all-after-3.0.2" - sources."unist-util-is-4.0.4" + sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -70037,10 +70154,10 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.3.tgz"; - sha512 = "2SHFFjxkw2kl0hADDNUYX85OR/PbjqYPxFnpNp6G83SbeZBoJN8KDUl7TrIJ7BZ4UCiIilXnKQCHpxREiVPAEg=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.4.tgz"; + sha512 = "9ZEPHykSx2J/OwLFocXSK1Bg4p35AegacFb0ZaWV9s0IEtdNSkYi25Y9CscqV6fQheMfyEl0f4rlI4yh6DbcPg=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -70121,7 +70238,7 @@ in sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."globals-12.4.0" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -70179,7 +70296,7 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.1.1" + sources."ajv-7.2.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -70197,7 +70314,7 @@ in sources."typescript-4.2.3" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" - sources."vls-0.5.10" + sources."vls-0.7.2" (sources."vue-eslint-parser-7.6.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" @@ -70221,10 +70338,10 @@ in coc-vimlsp = nodeEnv.buildNodePackage { name = "coc-vimlsp"; packageName = "coc-vimlsp"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.11.0.tgz"; - sha512 = "tcou7cmYgzjLLPfLEyuea5umVkITER0IqDsJCc/3IeuPFyL03D7EDyeXIcyR+fJwXpJ0AzO6rzoLBMqpt4hYGg=="; + url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.11.1.tgz"; + sha512 = "vHerH6fO69i/5002OTCYMbBiswMcjKRMqLbIByw6aB4OuOXDBDi1zn+jX+LqRSI0sEsVJIL1VhqGvigOo2OWNg=="; }; buildInputs = globalBuildInputs; meta = { @@ -70697,7 +70814,7 @@ in sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."global-dirs-2.1.0" sources."globby-11.0.2" (sources."got-9.6.0" // { @@ -70790,7 +70907,7 @@ in sources."is-npm-4.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" @@ -71101,7 +71218,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -71472,7 +71589,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -72458,7 +72575,7 @@ in sources."find-up-4.1.0" sources."fs.realpath-1.0.0" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."globby-11.0.2" sources."graceful-fs-4.2.6" sources."ignore-5.1.8" @@ -72469,7 +72586,7 @@ in sources."is-glob-4.0.1" sources."is-number-7.0.0" sources."is-path-cwd-2.2.0" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-stream-2.0.0" sources."locate-path-5.0.0" sources."lodash-4.17.21" @@ -72553,7 +72670,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -72746,7 +72863,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.1" sources."abbrev-1.1.1" @@ -73364,7 +73481,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -73399,7 +73516,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001196" + sources."caniuse-lite-1.0.30001197" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -73647,7 +73764,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -73747,7 +73864,7 @@ in sources."@types/node-14.11.1" sources."@types/pg-7.14.5" sources."@types/pg-types-2.2.0" - sources."@types/qs-6.9.5" + sources."@types/qs-6.9.6" sources."@types/range-parser-1.2.3" (sources."@types/request-2.48.5" // { dependencies = [ @@ -74317,7 +74434,7 @@ in sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" (sources."glob-stream-6.1.0" // { dependencies = [ sources."glob-parent-3.1.0" @@ -74448,7 +74565,7 @@ in sources."is-negated-glob-1.0.0" sources."is-number-7.0.0" sources."is-path-cwd-2.2.0" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" sources."is-relative-1.0.0" @@ -75322,7 +75439,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."y18n-3.2.2" @@ -75446,7 +75563,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."globals-12.4.0" sources."has-flag-3.0.0" sources."ignore-4.0.6" @@ -75497,7 +75614,7 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.1.1" + sources."ajv-7.2.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -75605,7 +75722,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."globals-12.4.0" sources."has-flag-4.0.0" sources."ignore-4.0.6" @@ -75657,7 +75774,7 @@ in sources."supports-color-8.1.1" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.1.1" + sources."ajv-7.2.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -76033,7 +76150,7 @@ in sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" sources."@types/text-table-0.2.1" - (sources."@types/uglify-js-3.12.0" // { + (sources."@types/uglify-js-3.13.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -76260,7 +76377,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001196" + sources."caniuse-lite-1.0.30001197" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { dependencies = [ @@ -76724,7 +76841,7 @@ in sources."getenv-0.7.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."global-4.4.0" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" @@ -77837,7 +77954,7 @@ in sources."crypto-random-string-2.0.0" sources."del-6.0.0" sources."globby-11.0.2" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-stream-2.0.0" sources."p-map-4.0.0" sources."rimraf-3.0.2" @@ -78663,7 +78780,7 @@ in sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" (sources."globby-8.0.2" // { dependencies = [ @@ -79044,7 +79161,7 @@ in sources."@types/glob-7.1.3" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -79062,7 +79179,7 @@ in sources."ansicolors-0.3.2" sources."anymatch-3.1.1" sources."aproba-1.2.0" - sources."archiver-5.2.0" + sources."archiver-5.3.0" (sources."archiver-utils-2.1.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -79361,7 +79478,7 @@ in }) sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" @@ -79413,7 +79530,7 @@ in sources."is-npm-4.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-promise-2.2.2" sources."is-stream-2.0.0" sources."is-stream-ended-0.1.4" @@ -79816,7 +79933,7 @@ in sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."xdg-basedir-4.0.0" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.31" @@ -80806,7 +80923,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" - sources."ajv-7.1.1" + sources."ajv-7.2.1" sources."ajv-formats-1.5.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -80916,7 +81033,7 @@ in sources."is-interactive-1.0.0" sources."is-npm-5.0.0" sources."is-obj-2.0.0" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-plain-obj-1.1.0" sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" @@ -81180,7 +81297,7 @@ in sources."@nodelib/fs.walk-1.2.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -81317,7 +81434,7 @@ in sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."globby-11.0.1" (sources."got-9.6.0" // { dependencies = [ @@ -83726,7 +83843,7 @@ in sources."arch-2.2.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."clipboard-2.0.6" + sources."clipboard-2.0.7" sources."clipboardy-2.3.0" sources."clone-1.0.4" sources."concat-map-0.0.1" @@ -84071,7 +84188,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -84727,7 +84844,7 @@ in sources."getpass-0.1.7" sources."github-from-package-0.0.0" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."graceful-fs-4.2.6" sources."graphlib-2.1.8" sources."growly-1.3.0" @@ -85193,7 +85310,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -85573,7 +85690,7 @@ in sources."is-installed-globally-0.4.0" sources."is-npm-5.0.0" sources."is-obj-2.0.0" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-promise-2.2.2" sources."is-typedarray-1.0.0" sources."is-yarn-global-0.3.0" @@ -85751,7 +85868,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -85805,7 +85922,7 @@ in sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."graceful-fs-4.2.6" sources."http-errors-1.7.2" sources."http-proxy-1.18.1" @@ -85887,7 +86004,7 @@ in sources."void-elements-2.0.1" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."y18n-5.0.5" sources."yargs-16.2.0" sources."yargs-parser-20.2.6" @@ -86389,7 +86506,7 @@ in }) sources."@octokit/request-error-2.0.5" sources."@octokit/rest-18.3.4" - sources."@octokit/types-6.12.0" + sources."@octokit/types-6.12.1" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" @@ -86605,7 +86722,7 @@ in sources."git-url-parse-11.4.4" sources."gitconfiglocal-1.0.0" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."globby-11.0.2" sources."graceful-fs-4.2.6" sources."handlebars-4.7.7" @@ -87916,7 +88033,7 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -88058,7 +88175,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.7" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.13" @@ -88231,7 +88348,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001196" + sources."caniuse-lite-1.0.30001197" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -88461,7 +88578,7 @@ in sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" (sources."global-modules-2.0.0" // { dependencies = [ sources."global-prefix-3.0.0" @@ -89552,7 +89669,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -89685,7 +89802,7 @@ in sources."upper-case-1.1.3" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -89973,10 +90090,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.3.0"; + version = "8.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz"; - sha512 = "TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.3.1.tgz"; + sha512 = "5SBMxANWqOv5bw3Hx+HVgaWlcWcFEQDUdaUAr1AUU+qwtx6cowhn7gEDT/DwQP7uYxnvShdUOVLbTYAHOEGfDQ=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -90025,7 +90142,7 @@ in sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."growl-1.10.5" sources."has-flag-4.0.0" sources."he-1.2.0" @@ -90349,7 +90466,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-9.8.4" // { + (sources."@netlify/build-9.8.5" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -90396,7 +90513,7 @@ in sources."dir-glob-3.0.1" sources."fast-glob-3.2.5" sources."fill-range-7.0.1" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."globby-11.0.2" sources."ignore-5.1.8" sources."is-number-7.0.0" @@ -90473,7 +90590,7 @@ in sources."dir-glob-3.0.1" sources."fast-glob-3.2.5" sources."fill-range-7.0.1" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."globby-11.0.2" sources."ignore-5.1.8" sources."is-number-7.0.0" @@ -90575,7 +90692,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.12.0" + sources."@octokit/types-6.12.1" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-17.1.0" // { dependencies = [ @@ -90611,7 +90728,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/node-fetch-2.5.8" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" @@ -90625,7 +90742,7 @@ in sources."accepts-1.3.7" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" - sources."ajv-7.1.1" + sources."ajv-7.2.1" (sources."ansi-align-3.0.0" // { dependencies = [ sources."emoji-regex-7.0.3" @@ -90738,7 +90855,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001196" + sources."caniuse-lite-1.0.30001197" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -90758,7 +90875,7 @@ in dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."is-number-7.0.0" sources."to-regex-range-5.0.1" ]; @@ -91006,7 +91123,7 @@ in sources."envinfo-7.7.4" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."esbuild-0.8.56" + sources."esbuild-0.8.57" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -91168,7 +91285,7 @@ in sources."dir-glob-3.0.1" sources."fast-glob-3.2.5" sources."fill-range-7.0.1" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."ignore-5.1.8" sources."is-number-7.0.0" sources."micromatch-4.0.2" @@ -91312,7 +91429,7 @@ in sources."is-object-1.0.2" sources."is-observable-1.1.0" sources."is-path-cwd-2.2.0" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-plain-obj-2.1.0" sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" @@ -91965,7 +92082,7 @@ in sources."triple-beam-1.3.0" sources."trough-1.0.5" sources."tslib-1.14.1" - sources."tsutils-3.20.0" + sources."tsutils-3.21.0" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-fest-0.8.1" @@ -91986,7 +92103,7 @@ in sources."union-value-1.0.1" sources."uniq-1.0.1" sources."unique-string-2.0.0" - sources."unist-util-is-4.0.4" + sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" sources."unist-util-visit-2.0.3" sources."unist-util-visit-parents-3.1.1" @@ -92936,7 +93053,7 @@ in sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.4.3" + sources."ws-7.4.4" ]; }) (sources."mqtt-packet-6.9.0" // { @@ -93380,7 +93497,7 @@ in sources."fill-range-7.0.1" sources."fsevents-2.3.2" sources."get-stream-4.1.0" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."global-dirs-2.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.6" @@ -93400,7 +93517,7 @@ in sources."is-npm-4.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-typedarray-1.0.0" sources."is-yarn-global-0.3.0" sources."json-buffer-3.0.0" @@ -93520,7 +93637,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -93629,7 +93746,7 @@ in sources."get-stream-6.0.0" sources."github-url-from-git-1.5.0" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."global-dirs-2.1.0" sources."globby-11.0.2" (sources."got-10.7.0" // { @@ -93716,7 +93833,7 @@ in ]; }) sources."is-path-cwd-2.2.0" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-plain-obj-1.1.0" sources."is-promise-2.2.2" sources."is-scoped-2.1.0" @@ -94036,10 +94153,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "11.1.10"; + version = "11.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.1.10.tgz"; - sha512 = "T8o/3ls74Q8i3LbO9jjxI1YWA9ioJjjAnYt9BezbFn/D99STc+7pe633H0gLmNi4/5b1Xi3nlbI6UCbc6eb/pQ=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.2.0.tgz"; + sha512 = "JCQHyn3/kxaWHbxefb8JKNZTZgFySnGcPZQbhx33rZEW55VoCjS3/GRNCN5ITIIR/aHNobDtwM1MX7MF31jC2A=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.4" @@ -94158,7 +94275,7 @@ in sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" (sources."global-dirs-3.0.0" // { dependencies = [ sources."ini-2.0.0" @@ -94198,7 +94315,7 @@ in sources."is-npm-5.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-typedarray-1.0.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" @@ -94861,7 +94978,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001196" + sources."caniuse-lite-1.0.30001197" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -95898,262 +96015,59 @@ in patch-package = nodeEnv.buildNodePackage { name = "patch-package"; packageName = "patch-package"; - version = "6.4.5"; + version = "6.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/patch-package/-/patch-package-6.4.5.tgz"; - sha512 = "iZl3nNUEQ3cdoY1U4Gj7p9aIGgn27aD3Z32TEh+13remRlkEzbc1+CdjFvy/zT/JK2EtY4ERwoiHKQU9B0PEvw=="; + url = "https://registry.npmjs.org/patch-package/-/patch-package-6.4.6.tgz"; + sha512 = "AO2bh42z8AQL+0OUdcRpS5Z/0X8k9IQ1uc1HzlVye+2RQrtDeNgTk5SbS4rdbLJKtUWRpvPISrYZeyh+OK4AKw=="; }; 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."braces-3.0.2" 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."fill-range-7.0.1" + sources."find-yarn-workspace-root-2.0.0" 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.6" 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-docker-2.1.1" - 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."is-number-7.0.0" sources."is-wsl-2.2.0" - 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."micromatch-4.0.2" 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."open-7.4.2" 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."picomatch-2.2.2" 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.1" - 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."to-regex-range-5.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" ]; @@ -96832,7 +96746,7 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."yeast-0.1.2" @@ -96995,7 +96909,7 @@ in sources."git-node-fs-1.0.0" sources."git-sha1-0.1.2" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."has-1.0.3" sources."has-flag-4.0.0" sources."http-errors-1.7.3" @@ -97240,7 +97154,7 @@ in sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."get-stdin-8.0.0" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."globby-11.0.2" sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" @@ -98105,8 +98019,12 @@ in sources."@gardenapple/yargs-17.0.0-candidate.0" sources."@mozilla/readability-0.4.1" sources."abab-2.0.5" - sources."acorn-7.4.1" - sources."acorn-globals-6.0.0" + sources."acorn-8.0.5" + (sources."acorn-globals-6.0.0" // { + dependencies = [ + sources."acorn-7.4.1" + ]; + }) sources."acorn-walk-7.2.0" sources."ajv-6.12.6" sources."ansi-regex-5.0.0" @@ -98144,9 +98062,9 @@ in sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."escodegen-1.14.3" + sources."escodegen-2.0.0" sources."esprima-4.0.1" - sources."estraverse-4.3.0" + sources."estraverse-5.2.0" sources."esutils-2.0.3" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -98162,13 +98080,12 @@ in sources."html-encoding-sniffer-2.0.1" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" - sources."ip-regex-2.1.0" sources."is-fullwidth-code-point-3.0.0" sources."is-potential-custom-element-name-1.0.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."jsdom-16.4.0" + sources."jsdom-16.5.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -98181,7 +98098,7 @@ in sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."optionator-0.8.3" - sources."parse5-5.1.1" + sources."parse5-6.0.1" sources."performance-now-2.1.0" sources."prelude-ls-1.1.2" sources."psl-1.8.0" @@ -98208,11 +98125,12 @@ in sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."symbol-tree-3.2.4" - sources."tough-cookie-3.0.1" + sources."tough-cookie-4.0.0" sources."tr46-2.0.2" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" + sources."universalify-0.1.2" sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -98224,7 +98142,7 @@ in sources."whatwg-url-8.4.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.5" @@ -98322,7 +98240,7 @@ in sources."chokidar-3.5.1" sources."cipher-base-1.0.4" sources."classnames-2.2.6" - sources."clipboard-2.0.6" + sources."clipboard-2.0.7" sources."cliui-7.0.4" sources."clsx-1.1.1" sources."co-4.6.0" @@ -98378,7 +98296,7 @@ in sources."format-util-1.0.5" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."globals-11.12.0" sources."good-listener-1.2.2" sources."grapheme-splitter-1.0.4" @@ -98832,7 +98750,7 @@ in sources."functional-red-black-tree-1.0.1" sources."get-caller-file-2.0.5" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."globals-12.4.0" sources."globby-11.0.2" sources."graceful-fs-4.2.6" @@ -98840,7 +98758,7 @@ in sources."has-1.0.3" sources."has-flag-3.0.0" sources."he-1.2.0" - sources."htmlparser2-6.0.0" + sources."htmlparser2-6.0.1" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."ignore-5.1.8" @@ -98886,7 +98804,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.3.0" // { + (sources."mocha-8.3.1" // { dependencies = [ sources."argparse-2.0.1" (sources."debug-4.3.1" // { @@ -98982,7 +98900,7 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.1.1" + sources."ajv-7.2.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -98991,7 +98909,7 @@ in sources."to-regex-range-5.0.1" sources."traverse-0.3.9" sources."tslib-2.1.0" - (sources."tsutils-3.20.0" // { + (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -99203,7 +99121,7 @@ in sources."chokidar-3.5.1" sources."fill-range-7.0.1" sources."fsevents-2.3.2" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" @@ -99418,7 +99336,7 @@ in }) (sources."@serverless/platform-client-china-2.1.7" // { dependencies = [ - sources."adm-zip-0.5.3" + sources."adm-zip-0.5.4" sources."js-yaml-3.14.1" ]; }) @@ -99451,7 +99369,7 @@ in sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.168" sources."@types/long-4.0.1" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -99478,7 +99396,7 @@ in sources."file-type-4.4.0" ]; }) - (sources."archiver-5.2.0" // { + (sources."archiver-5.3.0" // { dependencies = [ sources."async-3.2.0" sources."bl-4.1.0" @@ -99780,7 +99698,7 @@ in sources."getpass-0.1.7" sources."github-from-package-0.0.0" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."globby-11.0.2" (sources."got-11.8.2" // { dependencies = [ @@ -100074,7 +99992,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.36.0" // { + (sources."simple-git-2.36.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -100236,7 +100154,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.5.5" @@ -100886,21 +100804,32 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.473.0"; + version = "1.476.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.473.0.tgz"; - sha512 = "UJuevb0qgRda13uhGKttzbKmK8f9GALG30LYsVDrvcx4i9NuWjPE8QuRGz1pQYze6UPVvIPSidyhBLNlOU446w=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.476.0.tgz"; + sha512 = "GLOZC1EQ9mcA38WF+6a6z4rZtvHTGUiokXYp66DVf70OoNDPwM00nL3AwWtFc39bLb04TSl8INgL87LIXiYLUg=="; }; dependencies = [ + sources."@deepcode/dcignore-1.0.2" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" sources."@octetstream/promisify-2.0.2" sources."@open-policy-agent/opa-wasm-1.2.0" sources."@sindresorhus/is-2.1.1" sources."@snyk/cli-interface-2.11.0" sources."@snyk/cocoapods-lockfile-parser-3.6.2" + (sources."@snyk/code-client-3.1.4" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) sources."@snyk/composer-lockfile-parser-1.4.1" sources."@snyk/dep-graph-1.23.1" sources."@snyk/docker-registry-v2-client-1.13.9" + sources."@snyk/fast-glob-3.2.6-patch" sources."@snyk/gemfile-1.2.0" + sources."@snyk/glob-parent-5.1.2-patch.1" sources."@snyk/graphlib-2.1.9-patch.3" (sources."@snyk/inquirer-7.3.3-patch" // { dependencies = [ @@ -100927,14 +100856,23 @@ in ]; }) sources."@szmarczak/http-timer-4.0.5" + sources."@types/braces-3.0.0" sources."@types/cacheable-request-6.0.1" sources."@types/debug-4.1.5" + sources."@types/flat-cache-2.0.0" sources."@types/graphlib-2.1.7" sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.6" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.31" + sources."@types/lodash-4.14.168" + sources."@types/lodash.chunk-4.2.6" + sources."@types/lodash.omit-4.5.6" + sources."@types/lodash.union-4.6.6" + sources."@types/micromatch-4.0.1" + sources."@types/node-14.14.32" sources."@types/responselike-1.0.0" + sources."@types/sarif-2.1.3" + sources."@types/uuid-8.3.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.3.0" @@ -100963,6 +100901,7 @@ in ]; }) sources."async-3.2.0" + sources."axios-0.21.1" sources."balanced-match-1.0.0" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" @@ -101072,9 +101011,11 @@ in sources."extend-3.0.2" sources."external-editor-3.1.0" sources."fast-levenshtein-2.0.6" + sources."fastq-1.11.0" sources."figures-3.2.0" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" + sources."follow-redirects-1.13.3" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" (sources."ftp-0.3.10" // { @@ -101123,6 +101064,7 @@ in }) sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" + sources."ignore-5.1.8" sources."immediate-3.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -101133,13 +101075,15 @@ in sources."is-ci-2.0.0" sources."is-deflate-1.0.0" sources."is-docker-2.1.1" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" sources."is-gzip-1.0.0" sources."is-installed-globally-0.3.2" sources."is-npm-4.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" @@ -101160,6 +101104,7 @@ in sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.camelcase-4.3.0" + sources."lodash.chunk-4.2.0" sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" sources."lodash.constant-3.0.0" @@ -101207,6 +101152,7 @@ in sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."make-dir-3.1.0" + sources."merge2-1.4.1" sources."micromatch-4.0.2" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" @@ -101279,6 +101225,8 @@ in ]; }) sources."pupa-2.1.1" + sources."queue-6.0.2" + sources."queue-microtask-1.2.2" sources."quick-lru-5.1.1" sources."raw-body-2.4.1" sources."rc-1.2.8" @@ -101293,8 +101241,10 @@ in sources."resolve-alpn-1.0.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" + sources."reusify-1.0.4" sources."rimraf-2.7.1" sources."run-async-2.4.1" + sources."run-parallel-1.2.0" sources."rxjs-6.6.6" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -101520,7 +101470,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -101538,7 +101488,7 @@ in sources."socket.io-adapter-2.1.0" sources."socket.io-parser-4.0.4" sources."vary-1.1.2" - sources."ws-7.4.3" + sources."ws-7.4.4" ]; buildInputs = globalBuildInputs; meta = { @@ -102911,14 +102861,14 @@ in dependencies = [ sources."cookie-0.4.1" sources."debug-4.1.1" - sources."ws-7.4.3" + sources."ws-7.4.4" ]; }) (sources."engine.io-client-3.5.1" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" - sources."ws-7.4.3" + sources."ws-7.4.4" ]; }) sources."engine.io-parser-2.2.1" @@ -103540,10 +103490,10 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "13.11.0"; + version = "13.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.11.0.tgz"; - sha512 = "DhrKSWDWGZkCiQMtU+VroXM6LWJVC8hSK24nrUngTSQvXGK75yZUq4yNpynqrxD3a/fzKMED09V+XxO4z4lTbw=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.12.0.tgz"; + sha512 = "P8O1xDy41B7O7iXaSlW+UuFbE5+ZWQDb61ndGDxKIt36fMH50DtlQTbwLpFLf8DikceTAb3r6nPrRv30wBlzXw=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -103582,7 +103532,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-7.1.1" + sources."ajv-7.2.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -103597,7 +103547,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001196" + sources."caniuse-lite-1.0.30001197" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -103657,7 +103607,7 @@ in sources."gensync-1.0.0-beta.2" sources."get-stdin-8.0.0" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" sources."globals-11.12.0" @@ -103838,7 +103788,7 @@ in sources."unified-9.2.1" sources."uniq-1.0.1" sources."unist-util-find-all-after-3.0.2" - sources."unist-util-is-4.0.4" + sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -103867,10 +103817,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.12.18"; + version = "0.12.19"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.18.tgz"; - sha512 = "x0UmFgcdiQwh8vpKRx/l4EIlG7UUqEjsu59t9sauALaU+fzVWYO/ADPpK+HRH4y+W5u07eEIx0MPrnCG5Djjxw=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.19.tgz"; + sha512 = "u4f5Zn1UvOTeNSTH83z/v8fifhU+kNEpbMff07kMkZFBFxTXdMEh2/qS9VFjJu/0Ala646HnapgZgnakVvnZuQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -103879,7 +103829,7 @@ in sources."@emmetio/abbreviation-2.2.1" sources."@emmetio/css-abbreviation-2.1.2" sources."@emmetio/scanner-1.0.0" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/parse-json-4.0.0" sources."@types/pug-2.0.4" sources."@types/sass-1.16.0" @@ -103901,7 +103851,7 @@ in sources."estree-walker-2.0.2" sources."fill-range-7.0.1" sources."fsevents-2.3.2" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."has-flag-3.0.0" sources."import-fresh-3.3.0" sources."is-arrayish-0.2.1" @@ -103932,7 +103882,7 @@ in sources."supports-color-5.5.0" sources."svelte-3.35.0" sources."svelte-preprocess-4.6.9" - sources."svelte2tsx-0.1.178" + sources."svelte2tsx-0.1.179" sources."to-regex-range-5.0.1" sources."tslib-2.1.0" sources."typescript-4.2.3" @@ -103961,10 +103911,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-2.2.0.tgz"; - sha512 = "78w27VB+Vvca8TNRZrpbN70OTaVXgyQKm/rBiEqFPZmEJkn6i3PqEgIniPqPY6H2kFevakixAfBaQlwuStZuBA=="; + url = "https://registry.npmjs.org/svgo/-/svgo-2.2.1.tgz"; + sha512 = "WrKhe5CMm/O5gchTQKGogKYXGbOC0JBZnHqvaCTEbsMuq4prxQHB/AZgif8WwD4+9Nim4EECObmyjvkdC43iNg=="; }; dependencies = [ sources."@trysound/sax-0.1.1" @@ -103975,7 +103925,6 @@ in sources."color-name-1.1.4" sources."commander-7.1.0" sources."css-select-3.1.2" - sources."css-select-base-adapter-0.1.1" sources."css-tree-1.1.2" sources."css-what-4.0.0" sources."csso-4.2.0" @@ -105244,7 +105193,7 @@ in sources."is-installed-globally-0.3.2" sources."is-npm-4.0.0" sources."is-obj-2.0.0" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-plain-obj-1.1.0" sources."is-typedarray-1.0.0" sources."is-whitespace-character-1.0.4" @@ -105445,7 +105394,7 @@ in sources."unified-message-control-3.0.3" sources."unique-string-2.0.0" sources."unist-util-inspect-5.0.1" - sources."unist-util-is-4.0.4" + sources."unist-util-is-4.1.0" sources."unist-util-modify-children-2.0.0" sources."unist-util-position-3.1.0" sources."unist-util-remove-position-2.0.1" @@ -105895,7 +105844,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.14.31" + sources."@types/node-14.14.32" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -106310,7 +106259,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -106865,7 +106814,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -107119,7 +107068,7 @@ in }) sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."y18n-5.0.5" sources."yallist-2.1.2" sources."yargs-16.2.0" @@ -107369,10 +107318,10 @@ in vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.1.2.tgz"; - sha512 = "i+IVvvla+7oyXU3Mb1Vc4hCymCEUbRRhJE7/So+wZNZZgtVH4SNWwhtjzNV2l9egYAyCqJnJKKtErwgJnfAHsA=="; + url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.1.3.tgz"; + sha512 = "BZAMbgNXq9GFg0HrXbQoPs+VLzJasM/UyN34v0wEMOo8jj/h8K1LUKHuHJkGhAEhyq80BwDbByDLrbcu7Sn6Zg=="; }; buildInputs = globalBuildInputs; meta = { @@ -107842,7 +107791,7 @@ in sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.3" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" (sources."global-modules-2.0.0" // { dependencies = [ sources."global-prefix-3.0.0" @@ -107878,7 +107827,7 @@ in sources."he-1.2.0" sources."hmac-drbg-1.0.1" sources."homedir-polyfill-1.0.3" - sources."htmlparser2-6.0.0" + sources."htmlparser2-6.0.1" sources."https-browserify-1.0.0" sources."ieee754-1.2.1" sources."iferr-0.1.5" @@ -108662,7 +108611,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.14.31" + sources."@types/node-14.14.32" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -108758,7 +108707,7 @@ in dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."is-number-7.0.0" sources."to-regex-range-5.0.1" ]; @@ -109608,7 +109557,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/yauzl-2.9.1" sources."JSONSelect-0.2.1" sources."acorn-7.4.1" @@ -109945,7 +109894,7 @@ in sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" (sources."global-dirs-2.1.0" // { dependencies = [ sources."ini-1.3.7" @@ -110010,7 +109959,7 @@ in sources."is-npm-5.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" - sources."is-path-inside-3.0.2" + sources."is-path-inside-3.0.3" sources."is-plain-object-2.0.4" sources."is-regex-1.1.2" sources."is-relative-0.1.3" @@ -110506,17 +110455,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.24.3"; + version = "5.24.4"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.24.3.tgz"; - sha512 = "x7lrWZ7wlWAdyKdML6YPvfVZkhD1ICuIZGODE5SzKJjqI9A4SpqGTjGJTc6CwaHqn19gGaoOR3ONJ46nYsn9rw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.24.4.tgz"; + sha512 = "RXOdxF9hFFFhg47BryCgyFrEyyu7Y/75/uiI2DoUiTMqysK+WczVSTppvkR47oZcmI/DPaXCiCiaXBP8QjkNpA=="; }; dependencies = [ - sources."@types/eslint-7.2.6" + sources."@types/eslint-7.2.7" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.46" sources."@types/json-schema-7.0.7" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -110539,7 +110488,7 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.3" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001196" + sources."caniuse-lite-1.0.30001197" sources."chrome-trace-event-1.0.2" sources."colorette-1.2.2" sources."commander-2.20.3" @@ -110684,7 +110633,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -111277,7 +111226,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.0" sources."fill-range-7.0.1" - sources."glob-parent-5.1.1" + sources."glob-parent-5.1.2" sources."globby-11.0.2" sources."ignore-5.1.8" sources."is-extglob-2.1.1" @@ -111615,7 +111564,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -111758,7 +111707,7 @@ in sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.31" + sources."@types/node-14.14.32" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" From 70701d0a687321fd23807f022b289b03b3a48b28 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 16:54:27 +0000 Subject: [PATCH 43/54] =?UTF-8?q?oh-my-zsh:=202021-03-01=20=E2=86=92=20202?= =?UTF-8?q?1-03-08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/shells/zsh/oh-my-zsh/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 65175b82757e..6960b3212ba3 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,18 +5,20 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-03-01"; + version = "2021-03-08"; pname = "oh-my-zsh"; - rev = "6fbad5bf72fad4ecf30ba4d4ffee62bac582f0ed"; + rev = "0ab87c26c17171ae6162ff379a0c704fa57dff2e"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1sd9lhgrig4vpdy0d1ls551gzs7y9q4hq2m0jakslqliyx5d6mpn"; + sha256 = "1ryf7wj7k7b63sg3ipjdmn3wnyjlh0saf2kz084jmy82hxhqpd8w"; }; installPhase = '' + runHook preInstall + outdir=$out/share/oh-my-zsh template=templates/zshrc.zsh-template @@ -64,6 +66,8 @@ stdenv.mkDerivation rec { . ~/.zsh_aliases fi EOF + + runHook postInstall ''; passthru = { From 6beb35e3441ed42cfafaf0d4be2688ef9b3bb754 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 8 Mar 2021 11:29:30 -0800 Subject: [PATCH 44/54] beets: unstable-2021-01-29 -> unstable-2021-03-08 --- pkgs/tools/audio/beets/default.nix | 56 ++++++++++++++++-------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 5cae647cf8f7..4f759324d5e3 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -8,6 +8,7 @@ , enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor , enableAcousticbrainz ? true , enableAcoustid ? true +, enableAura ? true , enableBadfiles ? true, flac, mp3val , enableBeatport ? true , enableBpsync ? true @@ -44,6 +45,7 @@ let optionalPlugins = { absubmit = enableAbsubmit; acousticbrainz = enableAcousticbrainz; + aura = enableAura; badfiles = enableBadfiles; beatport = enableBeatport; bpsync = enableBpsync; @@ -102,13 +104,13 @@ in pythonPackages.buildPythonApplication rec { # unstable does not require bs1770gain[2]. # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 # [2]: https://github.com/NixOS/nixpkgs/pull/90504 - version = "unstable-2021-01-29"; + version = "unstable-2021-03-08"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "04ea754d00e2873ae9aa2d9e07c5cefd790eaee2"; - sha256 = "sha256-BIa3hnOsBxThbA2WCE4q9eaFNtObr3erZBBqobVOSiQ="; + rev = "debd382837ef1d30574c2234710d536bb299f979"; + sha256 = "sha256-I6ejW3f72fdzWoz7g4n8pDYz2NiHGrorLegUQhQOSiI="; }; propagatedBuildInputs = [ @@ -126,31 +128,31 @@ in pythonPackages.buildPythonApplication rec { pythonPackages.confuse pythonPackages.mediafile gobject-introspection - ] ++ lib.optional enableAbsubmit essentia-extractor - ++ lib.optional enableAcoustid pythonPackages.pyacoustid - ++ lib.optional enableBeatport pythonPackages.requests_oauthlib + ] ++ lib.optional enableAbsubmit essentia-extractor + ++ lib.optional enableAcoustid pythonPackages.pyacoustid + ++ lib.optional enableBeatport pythonPackages.requests_oauthlib ++ lib.optional (enableFetchart - || enableDeezer - || enableEmbyupdate - || enableKodiupdate - || enableLoadext - || enablePlaylist - || enableSubsonicplaylist - || enableSubsonicupdate - || enableAcousticbrainz) - pythonPackages.requests - ++ lib.optional enableCheck beetsExternalPlugins.check - ++ lib.optional enableConvert ffmpeg - ++ lib.optional enableDiscogs pythonPackages.discogs_client - ++ lib.optional enableKeyfinder keyfinder-cli - ++ lib.optional enableLastfm pythonPackages.pylast - ++ lib.optional enableMpd pythonPackages.mpd2 - ++ lib.optional enableSonosUpdate pythonPackages.soco - ++ lib.optional enableThumbnails pythonPackages.pyxdg - ++ lib.optional enableWeb pythonPackages.flask - ++ lib.optional enableAlternatives beetsExternalPlugins.alternatives - ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts - ++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles + || enableDeezer + || enableEmbyupdate + || enableKodiupdate + || enableLoadext + || enablePlaylist + || enableSubsonicplaylist + || enableSubsonicupdate + || enableAcousticbrainz) pythonPackages.requests + ++ lib.optional enableCheck beetsExternalPlugins.check + ++ lib.optional enableConvert ffmpeg + ++ lib.optional enableDiscogs pythonPackages.discogs_client + ++ lib.optional enableKeyfinder keyfinder-cli + ++ lib.optional enableLastfm pythonPackages.pylast + ++ lib.optional enableMpd pythonPackages.mpd2 + ++ lib.optional enableSonosUpdate pythonPackages.soco + ++ lib.optional enableThumbnails pythonPackages.pyxdg + ++ lib.optional (enableAura + || enableWeb) pythonPackages.flask + ++ lib.optional enableAlternatives beetsExternalPlugins.alternatives + ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts + ++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles ; buildInputs = [ From 4bd09f9889a5b2aac57f55546efe04c2a019dabb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 7 Mar 2021 05:46:28 +0100 Subject: [PATCH 45/54] home-assistant: apply patch to fix stream component tests and reenable the two tests on aarch64. --- pkgs/servers/home-assistant/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6a922094232f..329bbac4fb70 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,9 @@ -{ stdenv, nixosTests, lib, fetchFromGitHub, python3 +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, python3 +, nixosTests # Look up dependencies of specified components in component-packages.nix , extraComponents ? [ ] @@ -84,7 +89,14 @@ in with py.pkgs; buildPythonApplication rec { }; # leave this in, so users don't have to constantly update their downstream patch handling - patches = []; + patches = [ + (fetchpatch { + # Fix I-frame interval in stream test video + # https://github.com/home-assistant/core/pull/47638 + url = "https://github.com/home-assistant/core/commit/d9bf63103fde44ddd38fb6b9a510d82609802b36.patch"; + sha256 = "1y34cmw9zqb2lxyzm0q7vxlm05wwz76mhysgnh1jn39484fn9f9m"; + }) + ]; postPatch = '' substituteInPlace setup.py \ @@ -331,12 +343,6 @@ in with py.pkgs; buildPythonApplication rec { # generic/test_camera.py: AssertionError: 500 == 200 "test_fetching_without_verify_ssl" "test_fetching_url_with_verify_ssl" - ] ++ lib.optionals (stdenv.isAarch64) [ - # tests getting stuck on aarch64 - # components/stream/test_hls.py - "test_stream_ended" - # components/stream/test_recorder.py - "test_record_stream" ]; preCheck = '' From 176f44dfe16a860fbf288843caa97d0a37a0848d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Mar 2021 05:32:47 +1000 Subject: [PATCH 46/54] shfmt: 3.2.2 -> 3.2.4 https://github.com/mvdan/sh/releases/tag/v3.2.4 --- pkgs/tools/text/shfmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index cb5bb8a28e81..85600ff54cf8 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shfmt"; - version = "3.2.2"; + version = "3.2.4"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "sha256-ZeyHidw8iHboo/LHTR9E3Sqj8euaRvDaYbPQMdecsrk="; + sha256 = "sha256-BkvsCIcm3qnfECNhY3DIPnBRih6D7rOHOQu9oc0YDZA="; }; vendorSha256 = "1ma7nvyn6ylbi8bd7x900i94pzs877kfy9xh0nf1bbify1vcpd29"; From 9e76aa2cca8b21f2dad37d1e18573248104938a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Mon, 8 Mar 2021 21:27:15 +0100 Subject: [PATCH 47/54] vimPlugins.nvim-autopairs: init at 2021-02-25 (#114409) --- 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 760354a3c11e..cc84a07dc552 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2950,6 +2950,18 @@ let meta.homepage = "https://github.com/nathunsmitty/nvim-ale-diagnostic/"; }; + nvim-autopairs= buildVimPluginFrom2Nix { + pname = "nvim-autopairs"; + version = "2021-02-25"; + src = fetchFromGitHub { + owner = "windwp"; + repo = "nvim-autopairs"; + rev = "1596756a90114cbe25d0f383825a1ae2145b459b"; + sha256 = "1c0h0082lkngn0ly4qpla98xgg71ax5r26v4q4h3gc77jf6mlqrd"; + }; + meta.homepage = "https://github.com/windwp/nvim-autopairs"; + }; + nvim-cm-racer = buildVimPluginFrom2Nix { pname = "nvim-cm-racer"; version = "2017-07-27"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c1cd27b8b968..8f47f4b0bce1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -707,6 +707,7 @@ whonore/Coqtail will133/vim-dirdiff wincent/command-t wincent/ferret +windwp/nvim-autopairs wlangstroth/vim-racket wsdjeg/vim-fetch xavierd/clang_complete From a2492b0831915aa9a24cdc4ff96b1288241898c7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 8 Mar 2021 12:42:29 -0800 Subject: [PATCH 48/54] beetsExternalPlugins.check: remove (broken) --- pkgs/tools/audio/beets/default.nix | 2 -- .../audio/beets/plugins/check-tests.patch | 17 --------- pkgs/tools/audio/beets/plugins/check.nix | 36 ------------------- pkgs/top-level/all-packages.nix | 1 - 4 files changed, 56 deletions(-) delete mode 100644 pkgs/tools/audio/beets/plugins/check-tests.patch delete mode 100644 pkgs/tools/audio/beets/plugins/check.nix diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 4f759324d5e3..61340938f51e 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -32,7 +32,6 @@ # External plugins , enableAlternatives ? false -, enableCheck ? false, liboggz , enableCopyArtifacts ? false , enableExtraFiles ? false @@ -140,7 +139,6 @@ in pythonPackages.buildPythonApplication rec { || enableSubsonicplaylist || enableSubsonicupdate || enableAcousticbrainz) pythonPackages.requests - ++ lib.optional enableCheck beetsExternalPlugins.check ++ lib.optional enableConvert ffmpeg ++ lib.optional enableDiscogs pythonPackages.discogs_client ++ lib.optional enableKeyfinder keyfinder-cli diff --git a/pkgs/tools/audio/beets/plugins/check-tests.patch b/pkgs/tools/audio/beets/plugins/check-tests.patch deleted file mode 100644 index 2de97b86c8b4..000000000000 --- a/pkgs/tools/audio/beets/plugins/check-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/test/cli_test.py b/test/cli_test.py -index 26df140..2eb913c 100644 ---- a/test/cli_test.py -+++ b/test/cli_test.py -@@ -372,12 +372,6 @@ class ToolListTest(TestHelper, TestCase): - self.assertIn('flac', stdout.getvalue()) - self.assertIn('oggz-validate', stdout.getvalue()) - -- def test_found_mp3val(self): -- shutil.copy('/bin/echo', os.path.join(self.temp_dir, 'mp3val')) -- with captureStdout() as stdout: -- beets.ui._raw_main(['check', '--list-tools']) -- self.assertRegexpMatches(stdout.getvalue(), r'mp3val *found') -- - def test_oggz_validate_not_found(self): - with captureStdout() as stdout: - beets.ui._raw_main(['check', '--list-tools']) diff --git a/pkgs/tools/audio/beets/plugins/check.nix b/pkgs/tools/audio/beets/plugins/check.nix deleted file mode 100644 index a575836ef388..000000000000 --- a/pkgs/tools/audio/beets/plugins/check.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }: - -pythonPackages.buildPythonApplication rec { - name = "beets-check"; - version = "0.12.0"; - - src = fetchFromGitHub { - repo = "beets-check"; - owner = "geigerzaehler"; - rev = "v${version}"; - sha256 = "0b2ijjf0gycs6b40sm33ida3sjygjiv4spb5mba52vysc7iwmnjn"; - }; - - nativeBuildInputs = [ beets ]; - checkInputs = [ pythonPackages.nose flac liboggz mp3val ]; - propagatedBuildInputs = [ flac liboggz mp3val ]; - - # patch out broken tests - patches = [ ./check-tests.patch ]; - - # patch out futures dependency, it is only needed for Python2 which we don't - # support. - prePatch = '' - sed -i "/futures/d" setup.py - ''; - - checkPhase = "nosetests"; - - meta = with lib; { - description = "Beets plugin to Verify and store checksums in your library"; - homepage = "https://github.com/geigerzaehler/beets-check"; - license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ]; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c8e41f88e39..079295366ff6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3034,7 +3034,6 @@ in }; in lib.recurseIntoAttrs { alternatives = callPackage ../tools/audio/beets/plugins/alternatives.nix pluginArgs; - check = callPackage ../tools/audio/beets/plugins/check.nix pluginArgs; copyartifacts = callPackage ../tools/audio/beets/plugins/copyartifacts.nix pluginArgs; extrafiles = callPackage ../tools/audio/beets/plugins/extrafiles.nix pluginArgs; }; From da4b660561b88c38b3bb7e66cc9c04fa9e2cfbf9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Mar 2021 17:06:31 +0000 Subject: [PATCH 49/54] jmol: 14.31.24 -> 14.31.32 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 32e7e7e5d723..27f9a5c2ab0b 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.24"; + version = "14.31.32"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-86nDeKRXSNKrmYeo1rRLfziLVnmEmdIJRfIv6DFIxcs="; + sha256 = "sha256-lY4DvtSAC8VDYwzZVZVHNXnyJiSn1vo829DEsLEG/hM="; }; patchPhase = '' From 39677da7a62c686fdb38884f86811f29db314555 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 8 Mar 2021 22:29:30 +0100 Subject: [PATCH 50/54] mindustry: 125.1 -> 126.1 (#115442) packr doesn't seem to have been updated (since 2019-10-23) soloud is not updated since the last version bump (still at b33dfc5) --- pkgs/games/mindustry/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index df645171a7f8..af8ff5f24f9d 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -29,20 +29,20 @@ let # Note: when raising the version, ensure that all SNAPSHOT versions in # build.gradle are replaced by a fixed version # (the current one at the time of release) (see postPatch). - version = "125.1"; + version = "126.1"; buildVersion = makeBuildVersion version; Mindustry = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "0p05ndxhl3zgwm4k9cbqclp995kvcjxxhmbkmpjvv7cphiw82hvw"; + sha256 = "cyg4TofSSFLv8pM3zzvc0FxXMiTm+OIchBJF9PDQrkg="; }; Arc = fetchFromGitHub { owner = "Anuken"; repo = "Arc"; rev = "v${version}"; - sha256 = "1injdyxwgc9dn49zvr4qggsfrsslkvh5d53z3yv28ayx48qpsgxk"; + sha256 = "uBIm82mt1etBB/HrNY6XGa7mmBfwd1E3RtqN8Rk5qeY="; }; soloud = fetchFromGitHub { owner = "Anuken"; @@ -114,7 +114,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0dk4w8h0kg0mgbn0ifmk29rw8aj917k3nf27qdf1lyr6wl8k7f8k"; + outputHash = "Mw8LZ1iW6vn4RkBBs8SWHp6mo2Bhj7tMZjLbyuJUqSI="; }; in From 2c0bc880a311822411784d9f9452cc7e42ced986 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Mar 2021 05:26:14 +1000 Subject: [PATCH 51/54] conmon: 2.0.26 -> 2.0.27 https://github.com/containers/conmon/releases/tag/v2.0.27 --- pkgs/applications/virtualization/conmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index e5df1c655d88..362844367409 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.26"; + version = "2.0.27"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q2lh02iZ7FDBPjtoKY5p3c6Vcn9Ey8DCMn/Oe7/74ug="; + sha256 = "sha256-LMvhSoKd652XVPzuId8Ortf0f08FUP1zCn06PgtRwkA="; }; nativeBuildInputs = [ pkg-config ]; From 4d1e4a3bf4265eba27e6d1b70587f66df93a7b48 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Mar 2021 05:27:41 +1000 Subject: [PATCH 52/54] buildah: 1.19.6 -> 1.19.8 https://github.com/containers/buildah/releases/tag/v1.19.8 --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 24ee987099b4..e5763e6aa918 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.19.6"; + version = "1.19.8"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-YTguBkQcMNjHMVMEN3/P+8fOC5eqmQvlRd1ny9umS/4="; + sha256 = "sha256-xhnhc4vhKw5T93076vS+pszIOpj22KzaPyzCvuHMaPE="; }; outputs = [ "out" "man" ]; From fab58377abea3fb53c5781cff510d908ea23e92c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Feb 2021 11:44:07 +0000 Subject: [PATCH 53/54] python37Packages.elementpath: 2.1.3 -> 2.1.4 --- pkgs/development/python-modules/elementpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index a5a639484ec1..f675d90e9355 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "2.1.3"; + version = "2.1.4"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "062l1dqbaz1pab3qz6x5zmja8m8gw1bxgfl4kx91gdh0zsiakg8j"; + sha256 = "00v6npm7d4bk4cnpzacxybn165x6vjqrydssznn0bxzv8aynm1vb"; }; # avoid circular dependency with xmlschema which directly depends on this From 3745271036ba37709f78d50eb11ccea27396d4ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Mar 2021 22:55:06 +0000 Subject: [PATCH 54/54] nodejs-15_x: 15.10.0 -> 15.11.0 --- pkgs/development/web/nodejs/v15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix index 050e752ed007..f564d5bcccb2 100644 --- a/pkgs/development/web/nodejs/v15.nix +++ b/pkgs/development/web/nodejs/v15.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "15.10.0"; - sha256 = "1i7fdlkkyh5ssncbvxmiz894a12mww4cmj7y4qzm9ddbbvqxhj3p"; + version = "15.11.0"; + sha256 = "1lfjm0jgzbr0a874c04pddbjnvjcdyx5vyaakdhp0fa222i92w0s"; }