From 852739337bd5ab4c57fd1eab9e62e76ac2f1a7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 7 Apr 2021 20:46:10 +0200 Subject: [PATCH 001/129] nixos/k3s: add to environment.systemPackages for adminstration --- nixos/modules/services/cluster/k3s/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 5ab0286a38a..b5506057db8 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -81,6 +81,8 @@ in # supporting it, or their bundled containerd systemd.enableUnifiedCgroupHierarchy = false; + environment.systemPackages = [ config.services.k3s.package ]; + systemd.services.k3s = { description = "k3s service"; after = [ "network.service" "firewall.service" ] ++ (optional cfg.docker "docker.service"); From 11a38f62f0bfcb655e339498897b0d25ac37fa97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 9 Apr 2021 11:50:03 +0200 Subject: [PATCH 002/129] k3s: add tokenFile option To avoid having secrets in the nix store. --- .../modules/services/cluster/k3s/default.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index b5506057db8..99e47e867b3 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -35,10 +35,20 @@ in token = mkOption { type = types.str; - description = "The k3s token to use when connecting to the server. This option only makes sense for an agent."; + description = '' + The k3s token to use when connecting to the server. This option only makes sense for an agent. + WARNING: This option will expose store your token unencrypted world-readable in the nix store. + If this is undesired use the tokenFile option instead. + ''; default = ""; }; + tokenFile = mkOption { + type = types.nullOr types.path; + description = "File path containing k3s token to use when connecting to the server. This option only makes sense for an agent."; + default = null; + }; + docker = mkOption { type = types.bool; default = false; @@ -68,8 +78,8 @@ in message = "serverAddr should be set if role is 'agent'"; } { - assertion = cfg.role == "agent" -> cfg.token != ""; - message = "token should be set if role is 'agent'"; + assertion = cfg.role == "agent" -> cfg.token != "" || cfg.tokenFile != null; + message = "token or tokenFile should be set if role is 'agent'"; } ]; @@ -104,7 +114,12 @@ in "${cfg.package}/bin/k3s ${cfg.role}" ] ++ (optional cfg.docker "--docker") ++ (optional cfg.disableAgent "--disable-agent") - ++ (optional (cfg.role == "agent") "--server ${cfg.serverAddr} --token ${cfg.token}") + ++ (optional (cfg.role == "agent") "--server ${cfg.serverAddr} ${ + if cfg.tokenFile != null then + "--token-file ${cfg.tokenFile}" + else + "--token ${cfg.token}" + }") ++ [ cfg.extraFlags ] ); }; From 963b0a1dbf32b80eb6375973bff48af313c2a7c5 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 11 Jun 2021 12:56:07 +0200 Subject: [PATCH 003/129] grub2: 2.06-rc1 -> 2.06 * GCC 10 support. * clang 10 support. * SBAT support. * LUKS2 support. * Drop small MBR gap support. * Xen Security Modules (XSM/FLASK) support. * The lockdown mechanism similar to the Linux kernel one. * Disable the os-prober by default. * Many backports of GRUB distros specific patches. * BootHole and BootHole2 fixes. * XFS bigtime support. * ...and tons of other fixes and cleanups... --- pkgs/tools/misc/grub/2.0x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index fcf29beb188..d9c4ceeca2c 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -39,7 +39,7 @@ let canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.06-rc1"; + version = "2.06"; in ( @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; rev = "${pname}-${version}"; - sha256 = "1ngc960g4w91rg13l724v6nlj6fq1adxp6is2mrq4bnp7sm9mysa"; + sha256 = "1vkxr6b4p7h259vayjw8bfgqj57x68byy939y4bmyaz6g7fgrv0f"; }; patches = [ From 61017153168e3a0640cadd74d9d8db30a1a2117e Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 1 Jul 2021 07:04:17 +0000 Subject: [PATCH 004/129] phosh: 0.11.0 -> 0.12.0 --- pkgs/applications/window-managers/phosh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index dc1080d97b2..9fa0959ed50 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -37,14 +37,14 @@ let }; in stdenv.mkDerivation rec { pname = "phosh"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "104qib4blh32s7bg6j3xza3s9syrxrvyh2wpyh5yx7v5wqarr20x"; + sha256 = "1s0lgq04qz562iri535wpwvfkmmngdpclyl329cf7rc9ihy1kjvs"; }; nativeBuildInputs = [ From 8cf86dbfaeaa8c42a8fdda7af5a9946732b79562 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 1 Jul 2021 07:04:17 +0000 Subject: [PATCH 005/129] phoc: 0.7.0 -> 0.7.1 --- pkgs/applications/misc/phoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 2e3f3230512..aad2a4d0e48 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -36,14 +36,14 @@ let }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "0afiyr2slg38ksrqn19zygsmjy9k5bpwv6n7zjas3s5djr6hch45"; + sha256 = "0n188xa2pwl4258naxhz45cvipcid8y1zvlbddll9xydrrh9bwqn"; }; nativeBuildInputs = [ From 19e51737870e427e840a86a2aa29a726f016468e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 29 Jun 2021 14:54:33 +0200 Subject: [PATCH 006/129] janus-gateway: init at 0.11.3 --- pkgs/servers/janus-gateway/default.nix | 59 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/servers/janus-gateway/default.nix diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix new file mode 100644 index 00000000000..6c6d6759f32 --- /dev/null +++ b/pkgs/servers/janus-gateway/default.nix @@ -0,0 +1,59 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gengetopt +, glib, libconfig, libnice, jansson, boringssl, zlib, srtp, libuv +, libmicrohttpd, curl, libwebsockets, sofia_sip, libogg, libopus +, usrsctp, ffmpeg +}: + +let + libwebsockets_janus = libwebsockets.overrideAttrs (_: { + configureFlags = [ + "-DLWS_MAX_SMP=1" + "-DLWS_WITHOUT_EXTENSIONS=0" + ]; + }); +in + +stdenv.mkDerivation rec { + pname = "janus-gateway"; + version = "0.11.3"; + + src = fetchFromGitHub { + owner = "meetecho"; + repo = pname; + rev = "v${version}"; + sha256 = "15nadpz67w24f4wz8ya0kx0a1jc4wxv1kl0d5fr7kckkdyijh7gz"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; + + buildInputs = [ + glib libconfig libnice jansson boringssl zlib srtp libuv libmicrohttpd + curl libwebsockets_janus sofia_sip libogg libopus usrsctp ffmpeg + ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--enable-boringssl=${boringssl}" + "--enable-libsrtp2" + "--enable-turn-rest-api" + "--enable-json-logger" + "--enable-gelf-event-handler" + "--enable-post-processing" + ]; + + outputs = [ "out" "dev" "doc" "man" ]; + + postInstall = '' + moveToOutput share/janus "$doc" + moveToOutput etc "$doc" + ''; + + meta = with lib; { + description = "General purpose WebRTC server"; + homepage = "https://janus.conf.meetecho.com/"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab5098bf2aa..ef4c9d77fe9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19478,6 +19478,8 @@ in ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; + janus-gateway = callPackage ../servers/janus-gateway { }; + jboss = callPackage ../servers/http/jboss { }; jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { }; From 05aa9f6b1c7e30a6f101aa40fe2eaf47ff24d275 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 28 Jun 2021 13:28:17 +0200 Subject: [PATCH 007/129] fltk13: 1.3.5 -> 1.3.6 --- pkgs/development/libraries/fltk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 5cbd993fc64..6045fd6bf21 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.3.5"; + version = "1.3.6"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; - sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7"; + sha256 = "1arp1niiz3qxm8iacpmilwpc5rinsm6hsk4a6fsxfywvkvppbb4s"; }; patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; From a888c7fb80b460e573abdd83fe462ca3fc6bc988 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 10 Jul 2021 01:54:25 +0000 Subject: [PATCH 008/129] xorg.xorgserver: 1.20.11 -> 1.20.12 https://lists.x.org/archives/xorg-announce/2021-July/003098.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 125c329c4bd..9a75403cec6 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3102,11 +3102,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { pname = "xorg-server"; - version = "1.20.11"; + version = "1.20.12"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2"; - sha256 = "0jacqgin8kcyy8fyv0lhgb4if8g9hp60rm3ih3s1mgps7xp7jk4i"; + url = "mirror://xorg/individual/xserver/xorg-server-1.20.12.tar.xz"; + sha256 = "1b4ckvxaiiiwdxwyfzbbfkr384qqy5qzfsm37z0fr08x8f9w0v9k"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 4bb1867903e..42cb2da3a0d 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.12.tar.xz From 907eab093dc99d837da836390610bf137075acbd Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 10 Jul 2021 10:05:59 +0300 Subject: [PATCH 009/129] aws-sam-translator: 1.36.0 -> 1.37.0 --- .../development/python-modules/aws-sam-translator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 166ba0b7249..bad8ee9bd2d 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.36.0"; + version = "1.37.0"; src = fetchPypi { inherit pname version; - sha256 = "fa1b990d9329d19052e7b91cf0b19371ed9d31a529054b616005884cd662b584"; + sha256 = "0p2qd8gwxsfq17nmrlkpf31aqbfzjrwjk3n4p8vhci8mm11dk138"; }; # Tests are not included in the PyPI package From de6a909e3f85930492da1c37a0cdfe3da0f11ad5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 10 Jul 2021 10:06:41 +0300 Subject: [PATCH 010/129] aws-sam-cli: 1.23.0 -> 1.26.0 closes https://github.com/NixOS/nixpkgs/issues/129565 --- pkgs/development/tools/aws-sam-cli/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 3837e2e3707..f07bcdd5fd5 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -5,11 +5,11 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.23.0"; + version = "1.26.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0j0q6p08c3l9z0yc2cggw797k47cjh6ljpchiqgg0fh6mk32215f"; + sha256 = "11aqdwhs7wa6cp9zijqi4in3zvwirfnlcy45rrnsq0jdsh3i9hbh"; }; # Tests are not included in the PyPI package @@ -40,6 +40,8 @@ python3.pkgs.buildPythonApplication rec { # fix over-restrictive version bounds postPatch = '' substituteInPlace requirements/base.txt \ + --replace "click~=7.1" "click~=8.0" \ + --replace "Flask~=1.1.2" "Flask~=2.0" \ --replace "dateparser~=0.7" "dateparser>=0.7" \ --replace "docker~=4.2.0" "docker>=4.2.0" \ --replace "requests==2.23.0" "requests~=2.24" \ From a7784fe00a07a9e14df8014b8009491dddb6c652 Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Sun, 11 Jul 2021 18:12:19 +0100 Subject: [PATCH 011/129] buildFHSUserEnv: document `profile` parameter --- doc/builders/special/fhs-environments.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/builders/special/fhs-environments.section.md b/doc/builders/special/fhs-environments.section.md index 146ded53240..43dc99b7c18 100644 --- a/doc/builders/special/fhs-environments.section.md +++ b/doc/builders/special/fhs-environments.section.md @@ -18,6 +18,8 @@ Additional commands to be executed for finalizing the derivation with runner script. - `runScript` A command that would be executed inside the sandbox and passed all the command line arguments. It defaults to `bash`. +- `profile` + Optional script for `/etc/profile` within the sandbox. One can create a simple environment using a `shell.nix` like that: From 70580fdab7f76f8e2024337a2b6c6712ce6eba6a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 11 Jul 2021 15:51:54 -0700 Subject: [PATCH 012/129] nix-template: 0.1.0 -> 0.1.1 --- .../nix-template/default.nix | 24 +++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix index 0345830fb9d..f56222f403a 100644 --- a/pkgs/tools/package-management/nix-template/default.nix +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -1,17 +1,33 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub +, makeWrapper +, nix +, openssl +, pkg-config +, Security +}: rustPlatform.buildRustPackage rec { pname = "nix-template"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "jonringer"; repo = pname; rev = "v${version}"; - sha256 = "1h6xdvhzg7nb0s82b3r5bsh8bfdb1l5sm7fa24lfwd396xp9yyig"; + sha256 = "sha256-A1b/fgSr27sfMDnTi4R3PUZfhAdLA5wUOd4yh9/4Bnk="; }; - cargoSha256 = "0hp31b5q4s6grkha2jz55945cbjkqdpvx1l8m49zv5prczhd7mz5"; + cargoSha256 = "sha256-resyY/moqLo4KWOKUvFJiOWealCmcEsLFgkN12slKN0="; + + nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ openssl ] + ++ lib.optional stdenv.isDarwin Security; + + # needed for nix-prefetch-url + postInstall = '' + wrapProgram $out/bin/nix-template \ + --prefix PATH : ${lib.makeBinPath [ nix ]} + ''; meta = with lib; { description = "Make creating nix expressions easy"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df6c3f0a82e..828a3f022cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3079,7 +3079,9 @@ in nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor); - nix-template = callPackage ../tools/package-management/nix-template { }; + nix-template = callPackage ../tools/package-management/nix-template { + inherit (darwin.apple_sdk.frameworks) Security; + }; nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime; From dc6937ca17d5927e4849825c3b2342a823a48c5a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 12 Jul 2021 06:17:37 +0000 Subject: [PATCH 013/129] innernet: 1.3.1 -> 1.4.0 --- pkgs/tools/networking/innernet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index cee4956269e..f643702d625 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tonarino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tnwq86gAbi24O8/26134gJCf9+wol1zma980t9iHEKY="; + sha256 = "sha256-n+xNWhOkRCIcoBHR8u+xZK81fU0usIfFhYg3BO9yXik="; }; - cargoSha256 = "sha256-Wy+i1lmXpsy0Sy0GF5XUfXsLQHeV7cQo9nUxUEFnHOU="; + cargoSha256 = "sha256-cTqQtJpuwVlUKfAK8ASf6vq6PU2NE8PT/el/Hz4HgtA="; nativeBuildInputs = with llvmPackages; [ llvm From 9fffabf9eef5ed6e220aebe7d9a134d91242cfbc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Jul 2021 13:53:51 +0200 Subject: [PATCH 014/129] fltk*: Refactor, fltk14: 1.4.x-r13121 -> 1.4.x-2021-07-04 --- pkgs/development/libraries/fltk/1.4.nix | 55 +----- pkgs/development/libraries/fltk/common.nix | 205 ++++++++++++++++++++ pkgs/development/libraries/fltk/default.nix | 47 +---- pkgs/top-level/all-packages.nix | 21 +- 4 files changed, 230 insertions(+), 98 deletions(-) create mode 100644 pkgs/development/libraries/fltk/common.nix diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index 38926f298d4..2a430844ebe 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -1,52 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi -, freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng -, libtiff, freetype, Cocoa, AGL, GLUT -}: - -let - version = "1.4.x-r13121"; -in - -stdenv.mkDerivation { - pname = "fltk"; - inherit version; - - src = fetchurl { - url = "https://www.fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz"; - sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63"; - }; - - patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] - ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; - - propagatedBuildInputs = [ xorgproto ] - ++ (if stdenv.isDarwin - then [ freetype libtiff ] - else [ xlibsWrapper libXi freeglut ]); - - configureFlags = [ - "--enable-gl" - "--enable-largefile" - "--enable-shared" - "--enable-threads" - "--enable-xft" - ]; - - preConfigure = '' - make clean - rm VERSION - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "A C++ cross-platform lightweight GUI library"; - homepage = "https://www.fltk.org"; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.gpl2; - }; - +import ./common.nix rec { + version = "1.4.x-2021-07-04"; + rev = "1008cdfab27609a6f6a0e82dadad9fd9cbd8a66d"; + sha256 = "1h057dyhd04b9bjci952b2l7brxv183l9jw9i50mn9qjfljmvqim"; } diff --git a/pkgs/development/libraries/fltk/common.nix b/pkgs/development/libraries/fltk/common.nix new file mode 100644 index 00000000000..06e1c05c7d0 --- /dev/null +++ b/pkgs/development/libraries/fltk/common.nix @@ -0,0 +1,205 @@ +{ version, rev, sha256 }: + +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, zlib +, libjpeg +, libpng +, fontconfig +, freetype +, libX11 +, libXext +, libXinerama +, libXfixes +, libXcursor +, libXft +, libXrender +, ApplicationServices +, Carbon +, Cocoa + +, withGL ? true +, libGL +, libGLU +, glew +, OpenGL + +, withCairo ? true +, cairo + +, withPango ? (lib.strings.versionAtLeast version "1.4" && stdenv.hostPlatform.isLinux) +, pango + +, withDocs ? true +, doxygen +, graphviz +, texlive + +, withExamples ? true +, withShared ? true +}: + +let + onOff = value: if value then "ON" else "OFF"; + tex = texlive.combine { + inherit (texlive) + scheme-medium varwidth multirow hanging adjustbox collectbox stackengine + sectsty tocloft newunicodechar etoc; + }; +in +stdenv.mkDerivation rec { + pname = "fltk"; + inherit version; + + src = fetchFromGitHub { + owner = "fltk"; + repo = "fltk"; + inherit rev sha256; + }; + + outputs = [ "out" ] + ++ lib.optional withExamples "bin" + ++ lib.optional withDocs "doc"; + + # Manually move example & test binaries to $bin to avoid cyclic dependencies on dev binaries + outputBin = lib.optionalString withExamples "out"; + + patches = lib.optionals stdenv.hostPlatform.isDarwin [ + ./nsosv.patch + ]; + + postPatch = '' + patchShebangs documentation/make_* + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals withDocs [ + doxygen + graphviz + tex + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + ApplicationServices + Carbon + ] ++ lib.optionals (withGL && !stdenv.hostPlatform.isDarwin) [ + libGL + libGLU + ] ++ lib.optionals (withExamples && withGL) [ + glew + ]; + + propagatedBuildInputs = [ + zlib + libjpeg + libpng + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + freetype + fontconfig + libX11 + libXext + libXinerama + libXfixes + libXcursor + libXft + libXrender + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Cocoa + ] ++ lib.optionals (withGL && stdenv.hostPlatform.isDarwin) [ + OpenGL + ] ++ lib.optionals withCairo [ + cairo + ] ++ lib.optionals withPango [ + pango + ]; + + cmakeFlags = [ + # Common + "-DOPTION_BUILD_SHARED_LIBS=${onOff withShared}" + "-DOPTION_USE_SYSTEM_ZLIB=ON" + "-DOPTION_USE_SYSTEM_LIBJPEG=ON" + "-DOPTION_USE_SYSTEM_LIBPNG=ON" + + # X11 + "-DOPTION_USE_XINERAMA=${onOff stdenv.hostPlatform.isLinux}" + "-DOPTION_USE_XFIXES=${onOff stdenv.hostPlatform.isLinux}" + "-DOPTION_USE_XCURSOR=${onOff stdenv.hostPlatform.isLinux}" + "-DOPTION_USE_XFT=${onOff stdenv.hostPlatform.isLinux}" + "-DOPTION_USE_XRENDER=${onOff stdenv.hostPlatform.isLinux}" + "-DOPTION_USE_XDBE=${onOff stdenv.hostPlatform.isLinux}" + + # GL + "-DOPTION_USE_GL=${onOff withGL}" + "-DOpenGL_GL_PREFERENCE=GLVND" + + # Cairo + "-DOPTION_CAIRO=${onOff withCairo}" + "-DOPTION_CAIROEXT=${onOff withCairo}" + + # Pango + "-DOPTION_USE_PANGO=${onOff withPango}" + + # Examples & Tests + "-DFLTK_BUILD_EXAMPLES=${onOff withExamples}" + + # Docs + "-DOPTION_BUILD_HTML_DOCUMENTATION=${onOff withDocs}" + "-DOPTION_BUILD_PDF_DOCUMENTATION=${onOff withDocs}" + "-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}" + "-DOPTION_INSTALL_PDF_DOCUMENTATION=${onOff withDocs}" + "-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}" + ]; + + preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) '' + # unresolved symbols in cairo dylib without this: https://github.com/fltk/fltk/issues/250 + export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup" + ''; + + postBuild = lib.optionalString withDocs '' + make docs + ''; + + postInstall = lib.optionalString withExamples '' + mkdir -p $bin/bin + mv bin/{test,examples}/* $bin/bin/ + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Library/Frameworks + mv $out{,/Library/Frameworks}/FLTK.framework + + moveAppBundles() { + echo "Moving and symlinking $1" + appname="$(basename "$1")" + binname="$(basename "$(find "$1"/Contents/MacOS/ -type f -executable | head -n1)")" + curpath="$(dirname "$1")" + + mkdir -p "$curpath"/../Applications/ + mv "$1" "$curpath"/../Applications/ + [ -f "$curpath"/"$binname" ] && rm "$curpath"/"$binname" + ln -s ../Applications/"$appname"/Contents/MacOS/"$binname" "$curpath"/"$binname" + } + + rm $out/bin/fluid.icns + for app in $out/bin/*.app ${lib.optionalString withExamples "$bin/bin/*.app"}; do + moveAppBundles "$app" + done + ''; + + postFixup = '' + substituteInPlace $out/bin/fltk-config \ + --replace "/$out/" "/" + ''; + + meta = with lib; { + description = "A C++ cross-platform lightweight GUI library"; + homepage = "https://www.fltk.org"; + platforms = platforms.unix; + # LGPL2 with static linking exception + # https://www.fltk.org/COPYING.php + license = licenses.lgpl2Only; + }; +} diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 6045fd6bf21..831a96f71f3 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,46 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi -, freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng -, libtiff, freetype, Cocoa, AGL, GLUT -}: - -let +import ./common.nix rec { version = "1.3.6"; -in - -stdenv.mkDerivation { - pname = "fltk"; - inherit version; - - src = fetchurl { - url = "https://www.fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; - sha256 = "1arp1niiz3qxm8iacpmilwpc5rinsm6hsk4a6fsxfywvkvppbb4s"; - }; - - patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] - ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; - - propagatedBuildInputs = [ xorgproto ] - ++ (if stdenv.isDarwin - then [ freetype libtiff ] - else [ xlibsWrapper libXi freeglut ]); - - configureFlags = [ - "--enable-gl" - "--enable-largefile" - "--enable-shared" - "--enable-threads" - "--enable-xft" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "A C++ cross-platform lightweight GUI library"; - homepage = "https://www.fltk.org"; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.gpl2; - }; + rev = "release-${version}"; + sha256 = "0vzk4d6j927v7dxywr5xlqlf70myal1xikkdfvd11p94rcdf9bsv"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1113a5e02c..bdb5861ae1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15056,12 +15056,27 @@ in flite = callPackage ../development/libraries/flite { }; fltk13 = callPackage ../development/libraries/fltk { - inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL; }; fltk14 = callPackage ../development/libraries/fltk/1.4.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL; }; - fltk = res.fltk13; + fltk13-minimal = fltk13.override { + withGL = false; + withCairo = false; + withPango = false; + withExamples = false; + withDocs = false; + }; + fltk14-minimal = fltk14.override { + withGL = false; + withCairo = false; + withPango = false; + withExamples = false; + withDocs = false; + }; + fltk = fltk13; + fltk-minimal = fltk13-minimal; flyway = callPackage ../development/tools/flyway { }; From e12985318cc082ad018e1b283480dbc7229004e5 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 8 Jul 2021 14:12:02 +0200 Subject: [PATCH 015/129] afterstep: Fix libSM usage & build on non-NixOS Linux --- .../window-managers/afterstep/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index fbb4a7a5e49..ec7d3ae5004 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config -, libjpeg, libtiff, libpng, freetype +, libtiff , fltk, gtk -, libX11, libXext, libICE +, libICE, libSM , dbus , fetchpatch }: @@ -24,8 +24,16 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + # Causes fatal ldconfig cache generation attempt on non-NixOS Linux + for mkfile in autoconf/Makefile.common.lib.in libAfter{Base,Image}/Makefile.in; do + substituteInPlace $mkfile \ + --replace 'test -w /etc' 'false' + done + ''; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ]; + buildInputs = [ libtiff fltk gtk libICE libSM dbus ]; # A strange type of bug: dbus is not immediately found by pkg-config preConfigure = '' From 6425fa659bc153825df60b6065041f5ee8784268 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 8 Jul 2021 14:15:53 +0200 Subject: [PATCH 016/129] virtualgl*: Fix missing library FLTK doesn't dictate linking against libXi, so virtualgl should declare that its own buildInputs. --- pkgs/tools/X11/virtualgl/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 362a86fff37..5974b2bd3d5 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake -, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk +, libGL, libGLU, libXv, libXtst, libXi, libjpeg_turbo, fltk , xorg , opencl-headers, opencl-clhpp, ocl-icd }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libjpeg_turbo libGL libGLU fltk - libX11 libXv libXtst xorg.xcbutilkeysyms + libXv libXtst libXi xorg.xcbutilkeysyms opencl-headers opencl-clhpp ocl-icd ]; From b4c52472a47d25104ed170aa3a37a097fdcfc70a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 12 Jul 2021 12:15:03 +0200 Subject: [PATCH 017/129] fltrator: Use fltk-minimal Alternative would be to patch in the flags required for cairo, but this is easier and more in-tune with the project. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdb5861ae1a..558c075f66a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28739,7 +28739,9 @@ in exult = callPackage ../games/exult { }; - fltrator = callPackage ../games/fltrator { }; + fltrator = callPackage ../games/fltrator { + fltk = fltk-minimal; + }; factorio = callPackage ../games/factorio { releaseType = "alpha"; }; From b6793cfd0f9032d8acdf45da24e4b0a333379fc3 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Mon, 12 Jul 2021 12:45:15 +0200 Subject: [PATCH 018/129] kcolorpicker: init at 0.1.6 --- .../libraries/kcolorpicker/default.nix | 24 +++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/kcolorpicker/default.nix diff --git a/pkgs/development/libraries/kcolorpicker/default.nix b/pkgs/development/libraries/kcolorpicker/default.nix new file mode 100644 index 00000000000..75a07b17a7e --- /dev/null +++ b/pkgs/development/libraries/kcolorpicker/default.nix @@ -0,0 +1,24 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase }: + +mkDerivation rec { + pname = "kcolorpicker"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "ksnip"; + repo = "kColorPicker"; + rev = "v${version}"; + sha256 = "1167xwk75yiz697vddbz3lq42l7ckhyl2cvigy4m05qgg9693ksd"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase ]; + + meta = with lib; { + description = "Qt based Color Picker with popup menu"; + homepage = "https://github.com/ksnip/kColorPicker"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ fliegendewurst ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 60b4609479d..eb75d05d4f7 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -80,6 +80,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // { kde2-decoration = callPackage ../data/themes/kde2 { }; + kcolorpicker = callPackage ../development/libraries/kcolorpicker { }; + kdiagram = callPackage ../development/libraries/kdiagram { }; kdsoap = callPackage ../development/libraries/kdsoap { }; From b4f96d2543ef2188c989084737f1165446d44fa1 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Mon, 12 Jul 2021 12:45:40 +0200 Subject: [PATCH 019/129] kimageannotator: init at 0.5.1 --- .../libraries/kimageannotator/default.nix | 24 +++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/kimageannotator/default.nix diff --git a/pkgs/development/libraries/kimageannotator/default.nix b/pkgs/development/libraries/kimageannotator/default.nix new file mode 100644 index 00000000000..3188415ea04 --- /dev/null +++ b/pkgs/development/libraries/kimageannotator/default.nix @@ -0,0 +1,24 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, kcolorpicker, qttools }: + +mkDerivation rec { + pname = "kimageannotator"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "ksnip"; + repo = "kImageAnnotator"; + rev = "v${version}"; + sha256 = "0hfvrd78lgwd7bccz0fx2pr7g0v3s401y5plra63rxwk55ffkxf8"; + }; + + nativeBuildInputs = [ cmake qttools ]; + buildInputs = [ qtbase kcolorpicker ]; + + meta = with lib; { + description = "Tool for annotating images"; + homepage = "https://github.com/ksnip/kImageAnnotator"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ fliegendewurst ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index eb75d05d4f7..4c3518436de 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -88,6 +88,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // { kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { }; + kimageannotator = callPackage ../development/libraries/kimageannotator { }; + kproperty = callPackage ../development/libraries/kproperty { }; kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { }; From ff2c16095d559ed0a89a972ed93faeb3f8e24749 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 6 Jun 2021 14:24:26 +0300 Subject: [PATCH 020/129] docker: 20.10.6 -> 20.10.7 --- pkgs/applications/virtualization/docker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ee7c4d6bcfa..d1580331169 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -222,14 +222,14 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.6"; + version = "20.10.7"; rev = "v${version}"; - sha256 = "15kknb26vyzjgqmn8r81a1sy1i5br6bvngqd5xljihppnxvp2gvl"; + sha256 = "1r854jrjph4v1n5lr82z0cl0241ycili4qr3qh3k3bmqx790cds3"; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk"; + sha256 = "0xhn11kgcbzda4z9j0rflvq0nfivizh3jrzhanwn5vnghafy4zqw"; }; runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95 runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb"; From 1553e742f522da7cc4cf7e9d79c0dc53d8da86b4 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 6 Jun 2021 14:32:42 +0300 Subject: [PATCH 021/129] docker: improve readability, drop unneeded substitutes --- .../virtualization/docker/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index d1580331169..166b7094e96 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -77,6 +77,10 @@ rec { extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); + postPatch = '' + patchShebangs . + ''; + buildPhase = '' export GOCACHE="$TMPDIR/go-cache" # build engine @@ -88,11 +92,6 @@ rec { cd - ''; - postPatch = '' - patchShebangs . - substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd - ''; - installPhase = '' cd ./go/src/${goPackagePath} install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd @@ -144,6 +143,14 @@ rec { sqlite lvm2 btrfs-progs systemd libseccomp ] ++ optionals (buildxSupport) [ docker-buildx ]; + postPatch = '' + patchShebangs . + substituteInPlace ./scripts/build/.variables --replace "set -eu" "" + '' + optionalString buildxSupport '' + substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ + ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} + ''; + # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables buildPhase = '' export GOCACHE="$TMPDIR/go-cache" @@ -162,14 +169,6 @@ rec { cd - ''; - postPatch = '' - patchShebangs . - substituteInPlace ./scripts/build/.variables --replace "set -eu" "" - '' + optionalString buildxSupport '' - substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ - ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} - ''; - outputs = ["out" "man"]; installPhase = '' From 2c7bdb05dee8d8e5e9b3bd763554618c27b50a24 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 6 Jun 2021 14:35:36 +0300 Subject: [PATCH 022/129] docker: enable buildx support by default --- pkgs/applications/virtualization/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 166b7094e96..27ad496b03c 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -8,7 +8,7 @@ rec { , moby-src , runcRev, runcSha256 , containerdRev, containerdSha256 - , tiniRev, tiniSha256, buildxSupport ? false + , tiniRev, tiniSha256, buildxSupport ? true # package dependencies , stdenv, fetchFromGitHub, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc From fc38adafeaae8c83997b8dcf7671da3db8bb277f Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Tue, 15 Jun 2021 13:12:02 +0300 Subject: [PATCH 023/129] docker: narrow patchShebangs --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 27ad496b03c..51a776b79a2 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -78,7 +78,7 @@ rec { extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); postPatch = '' - patchShebangs . + patchShebangs hack/make.sh hack/make/ ''; buildPhase = '' @@ -144,7 +144,7 @@ rec { ] ++ optionals (buildxSupport) [ docker-buildx ]; postPatch = '' - patchShebangs . + patchShebangs man scripts/build/ substituteInPlace ./scripts/build/.variables --replace "set -eu" "" '' + optionalString buildxSupport '' substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ From e2b28504ab046141e2405bebc08f5e8dfacda986 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 12 Jul 2021 19:33:03 +0300 Subject: [PATCH 024/129] docker: add @mikroskeem to maintainers --- pkgs/applications/virtualization/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 51a776b79a2..ec358507c2d 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -210,7 +210,7 @@ rec { homepage = "https://www.docker.com/"; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; - maintainers = with maintainers; [ offline tailhook vdemeester periklis ]; + maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem ]; platforms = with platforms; linux ++ darwin; }; From 1556a9559b6f0c9bb2a1f0b5431e0efcfd2581be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 13 Jul 2021 07:11:46 +0000 Subject: [PATCH 025/129] cloudflared: 2021.6.0 -> 2021.7.0 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index ed4ffffe451..374062f0d80 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.6.0"; + version = "2021.7.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-cX0kdBPDgwjHphxGWrnXohHPp1nzs4SnvCry4AxMtp0="; + sha256 = "sha256-FQejuKBDUCCcEq9ZmSMigdvqowTurCYEhOiXQN7exIE="; }; vendorSha256 = null; From 2ff6e037a94045f63ebd161236f37740d83e911b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 13 Jul 2021 18:10:33 +0200 Subject: [PATCH 026/129] icingaweb2: 2.8.3 -> 2.9.0 --- pkgs/servers/icingaweb2/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 6e8cdd5dca4..7923674a3b7 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: +{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper, php }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.8.3"; + version = "2.9.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "sha256-wk6rTEYRS0q0HpQRbFAmfeYVrF/xLP/HchEXNqqNpYg="; + sha256 = "1vp2gdvgvw960178yaqql6iza0rg2h8japsnass3kkrwrmb2liq5"; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { Analyse problems and act on them. ''; homepage = "https://www.icinga.com/products/icinga-web-2/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ das_j ]; }; From aae29c6e10d033894bd1568f3e272b73edf75b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 13 Jul 2021 18:21:44 +0200 Subject: [PATCH 027/129] icingaweb2-ipl: Init at 0.6.0 --- pkgs/servers/icingaweb2/ipl.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 27 insertions(+) create mode 100644 pkgs/servers/icingaweb2/ipl.nix diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix new file mode 100644 index 00000000000..35b9357009c --- /dev/null +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -0,0 +1,26 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "icingaweb2-ipl"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "Icinga"; + repo = "icinga-php-library"; + rev = "v${version}"; + sha256 = "0nzvd84r9f1mypfhq4p37hsvkrbd5wzgs1m9qhj45ncvf5rq49f1"; + }; + + installPhase = '' + mkdir -p "$out" + cp -r * "$out" + ''; + + meta = { + description = "PHP library package for Icingaweb 2"; + homepage = "https://github.com/Icinga/icinga-php-library"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ das_j ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280283e0761..777680a2e8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19491,6 +19491,7 @@ in icecream = callPackage ../servers/icecream { }; + icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { }; icingaweb2 = callPackage ../servers/icingaweb2 { }; icingaweb2Modules = { theme-april = callPackage ../servers/icingaweb2/theme-april { }; From 3af5d881e0576325c572655a90c7604739804acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 13 Jul 2021 18:22:12 +0200 Subject: [PATCH 028/129] icingaweb2-thirdparty: Init at 0.10.0 --- pkgs/servers/icingaweb2/thirdparty.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 27 insertions(+) create mode 100644 pkgs/servers/icingaweb2/thirdparty.nix diff --git a/pkgs/servers/icingaweb2/thirdparty.nix b/pkgs/servers/icingaweb2/thirdparty.nix new file mode 100644 index 00000000000..ae3ce9538c9 --- /dev/null +++ b/pkgs/servers/icingaweb2/thirdparty.nix @@ -0,0 +1,26 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "icingaweb2-thirdparty"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "Icinga"; + repo = "icinga-php-thirdparty"; + rev = "v${version}"; + sha256 = "03zq6p2xyjrln8hdfks70hg8mwa51d3pnkswnzavpbxlbk83vzz5"; + }; + + installPhase = '' + mkdir -p "$out" + cp -r * "$out" + ''; + + meta = { + description = "Third party dependencies for Icingaweb 2"; + homepage = "https://github.com/Icinga/icinga-php-thirdparty"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ das_j ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 777680a2e8a..88fec149214 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19492,6 +19492,7 @@ in icecream = callPackage ../servers/icecream { }; icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { }; + icingaweb2-thirdparty = callPackage ../servers/icingaweb2/thirdparty.nix { }; icingaweb2 = callPackage ../servers/icingaweb2 { }; icingaweb2Modules = { theme-april = callPackage ../servers/icingaweb2/theme-april { }; From 6d203a68c624bbedaa7995f88d2e1e091bdb97f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 13 Jul 2021 18:22:28 +0200 Subject: [PATCH 029/129] nixos/icingaweb2: Add ipl and thirdparty libraries These are required since 2.9.0 --- .../from_md/release-notes/rl-2111.section.xml | 10 +++++++++- .../manual/release-notes/rl-2111.section.md | 2 ++ .../web-apps/icingaweb2/icingaweb2.nix | 18 ++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 53c1a18a507..66a3f908129 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -479,7 +479,7 @@ - + yggdrasil was upgraded to a new major @@ -488,6 +488,14 @@ changelog. + + + icingaweb2 was upgraded to a new release + which requires a manual database upgrade, see + upstream + changelog. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index ad56b5cd7d7..d270a362079 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -120,6 +120,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `yggdrasil` was upgraded to a new major release with breaking changes, see [upstream changelog](https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.4.0). +- `icingaweb2` was upgraded to a new release which requires a manual database upgrade, see [upstream changelog](https://github.com/Icinga/icingaweb2/releases/tag/v2.9.0). + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index eea49bda283..f8f0854f1bc 100644 --- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -23,6 +23,16 @@ in { ''; }; + libraryPaths = mkOption { + type = attrsOf package; + default = { }; + description = '' + Libraries to add to the Icingaweb2 library path. + The name of the attribute is the name of the library, the value + is the package to add. + ''; + }; + virtualHost = mkOption { type = nullOr str; default = "icingaweb2"; @@ -167,6 +177,9 @@ in { services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { ${poolName} = { user = "icingaweb2"; + phpEnv = { + ICINGAWEB_LIBDIR = toString (pkgs.linkFarm "icingaweb2-libdir" (mapAttrsToList (name: path: { inherit name path; }) cfg.libraryPaths)); + }; phpPackage = pkgs.php.withExtensions ({ enabled, all }: [ all.imagick ] ++ enabled); phpOptions = '' date.timezone = "${cfg.timezone}" @@ -184,6 +197,11 @@ in { }; }; + services.icingaweb2.libraryPaths = { + ipl = pkgs.icingaweb2-ipl; + thirdparty = pkgs.icingaweb2-thirdparty; + }; + systemd.services."phpfpm-${poolName}".serviceConfig.ReadWritePaths = [ "/etc/icingaweb2" ]; services.nginx = { From eeb810d943dd451a2e6c3928f189bd3cce19c1e6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:13:59 +0200 Subject: [PATCH 030/129] python3Packages.archinfo: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 580b05b82ad..60c3e8905b5 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.8761"; + version = "9.0.9031"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mdry5JQIW1b2p9a+c6RfHE6HYs54WKFofPkzFCgpUXg="; + sha256 = "sha256-pzBMyw5FwQV1FyhvOxUq39s96p0KKSrkEvJzhJQdS4E="; }; checkInputs = [ From a12662eba86a5f5d77c24fe55e8e8618d32bbc6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:14:02 +0200 Subject: [PATCH 031/129] python3Packages.ailment: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 961a6cff196..a6c99e72c0a 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.8761"; + version = "9.0.9031"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UAtVWh3BBZZmU5+BR0+2B+rivzR4E7bZK1ro1uKngtE="; + sha256 = "sha256-xyNTcGTGH8030CJif6an+kDZIfOUVDMiRhFamVajAzk="; }; propagatedBuildInputs = [ pyvex ]; From bc4acb5bb05c35eab0c2a81a18f2f31b982d3ecf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:14:05 +0200 Subject: [PATCH 032/129] python3Packages.pyvex: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index b2f43db50cf..d021b6b06d3 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.8761"; + version = "9.0.9031"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3aLpMiOJfgELfnpqTyXAL6Uofbm4UW4VRRsYzTTAofg="; + sha256 = "sha256-bl6bWv4c+tlaWcxrYCiljC9C+wAZZVyk+1O0rlb4kxA="; }; postPatch = lib.optionalString stdenv.isDarwin '' From c36a4169cf5ce22aae96b05173b9ddcb132dd3bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:14:07 +0200 Subject: [PATCH 033/129] python3Packages.claripy: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index d8257f446d1..2c25d258e57 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.8761"; + version = "9.0.9031"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MEG6J7FBjufFqvmfV+LTtgDJb8eZuUrDq4am/mnYCZI="; + sha256 = "sha256-UCmt2Vm8OWyKa0fmPlGuvzaFddUWs6quavUgIZasoJg="; }; # Use upstream z3 implementation From 700bcad84d58043dadcd8249aa1bfabba156d163 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:14:10 +0200 Subject: [PATCH 034/129] python3Packages.cle: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 87091509fb0..d6731260937 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.8761"; + version = "9.0.9031"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cJpwtAX2cck/SoTfm8G93Imyyqn1B2Izkxk9O7WtRrk="; + sha256 = "sha256-+9aW7J8FXuKtU20dpqnoj37McPxzbkjKuYZIO8QeFF0="; }; propagatedBuildInputs = [ From c70dfa0b7b38a968b0e5588c3976413934e4c611 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 14 Jul 2021 10:24:28 +0800 Subject: [PATCH 035/129] neochat: 1.1.1 -> 1.2 --- .../instant-messengers/neochat/default.nix | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix index c0e0c80b459..b6706d64786 100644 --- a/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -3,56 +3,58 @@ , fetchFromGitLab , pkg-config , cmake -, qtquickcontrols2 -, qtmultimedia -, qtgraphicaleffects -, qtkeychain -, libpulseaudio -, olm -, libsecret , cmark , extra-cmake-modules +, kconfig +, kdbusaddons +, ki18n , kirigami2 , kitemmodels -, ki18n , knotifications -, kdbusaddons -, kconfig -, libquotient , kquickimageedit +, libpulseaudio +, libquotient +, libsecret +, olm +, qqc2-desktop-style +, qtgraphicaleffects +, qtkeychain +, qtmultimedia +, qtquickcontrols2 }: mkDerivation rec { pname = "neochat"; - version = "1.1.1"; + version = "1.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HvLPsU+fxlyPDP7i9OSnZ/C1RjouOQCp+4WCl6FlFJo="; + sha256 = "sha256-Kpv7BY/qS0A3xFlYFhz1RRNwQVsyhOTHHGDbWRTTv1I="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; buildInputs = [ - qtkeychain - qtquickcontrols2 - qtmultimedia - qtgraphicaleffects - olm - libsecret cmark + kconfig + kdbusaddons + ki18n kirigami2 kitemmodels - ki18n knotifications - kdbusaddons - kconfig - libquotient kquickimageedit libpulseaudio + libquotient + libsecret + olm + qtgraphicaleffects + qtkeychain + qtmultimedia + qtquickcontrols2 + qqc2-desktop-style ]; meta = with lib; { From 39682c11090ada5128322dec615e9cb5818550cc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 14 Jul 2021 04:20:00 +0000 Subject: [PATCH 036/129] dqlite: 1.7.0 -> 1.8.0 https://github.com/canonical/dqlite/releases/tag/v1.8.0 --- pkgs/development/libraries/dqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 83e63abb3c6..15785d25fe2 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lCMTmKnDv/fb5fP/Ch8AwpuNfmR+gecxeIweO6hHj5U="; + sha256 = "0ghvwlgj5574kpgc53bfhqp4437xxvr05061wwxplpjxn37hy26d"; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; From 77898696a8522fe342d5936ba5c8d83642572da9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 14 Jul 2021 04:20:00 +0000 Subject: [PATCH 037/129] lxd: 4.15 -> 4.16 --- pkgs/tools/admin/lxd/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index fde3e829cc1..ac831c9da48 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -19,13 +19,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.15"; + version = "4.16"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "sha256-UXipGNWclBKgr0r0wav85Gnhp2SXkTvDFr9gKJWismU="; + sha256 = "1da9avmxs8sy92d9nrdgry2x685ral58zgf89yr88qxc0llbzq7r"; }; postPatch = '' @@ -40,6 +40,9 @@ buildGoPackage rec { cp -r _dist/src/* ../../.. popd + # required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939 + export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" + makeFlagsArray+=("-tags libsqlite3") ''; From e1e1f539f04add2531f3e8444add152bcc0ab21e Mon Sep 17 00:00:00 2001 From: Abdelhakim Qbaich Date: Wed, 14 Jul 2021 00:24:54 -0700 Subject: [PATCH 038/129] nvidia-x11: compile nvidia-uvm.ko with HMM support --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 70fc5126a93..e6ad62b1128 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -20,7 +20,7 @@ buildPhase() { sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile - make IGNORE_PREEMPT_RT_PRESENCE=1 SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES + make IGNORE_PREEMPT_RT_PRESENCE=1 NV_BUILD_SUPPORTS_HMM=1 SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES cd .. fi From 6f49212893102c82c1231ad0e29a7329a507008a Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Mon, 12 Jul 2021 12:45:57 +0200 Subject: [PATCH 039/129] spectacle: add deps for annotating screenshots --- pkgs/applications/kde/spectacle.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index c6861b218de..67a027440cf 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -4,17 +4,20 @@ ki18n, xcb-util-cursor, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, - qtx11extras, knewstuff, kwayland, qttools + qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator }: mkDerivation { pname = "spectacle"; - meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; + meta = with lib; { + maintainers = with maintainers; [ ttuegel ]; + broken = versionOlder qtbase.version "5.15"; + }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor - knewstuff kwayland + knewstuff kwayland kcolorpicker kimageannotator ]; postPatch = '' substituteInPlace desktop/org.kde.spectacle.desktop.cmake \ From d3bc5d5b7a9e0d5fc0f33aa0f0e91e50e9921805 Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 6 Jul 2021 18:23:29 +0200 Subject: [PATCH 040/129] discourse.plugins: Update and add metadata --- .../discourse/plugins/all-plugins.nix | 6 ++-- .../discourse-canned-replies/default.nix | 12 ++++++-- .../plugins/discourse-github/Gemfile | 8 ++++- .../plugins/discourse-github/Gemfile.lock | 12 +++++--- .../plugins/discourse-github/default.nix | 13 ++++++-- .../plugins/discourse-github/gemset.nix | 30 +++++++++++++++---- .../plugins/discourse-math/default.nix | 12 ++++++-- .../plugins/discourse-solved/default.nix | 12 ++++++-- .../discourse-spoiler-alert/default.nix | 12 ++++++-- .../discourse-yearly-review/default.nix | 12 ++++++-- 10 files changed, 98 insertions(+), 31 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix index e6640cbbe97..f64fbb137df 100644 --- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix +++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix @@ -3,10 +3,10 @@ let callPackage = newScope args; in { - discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {}; - discourse-solved = callPackage ./discourse-solved {}; discourse-canned-replies = callPackage ./discourse-canned-replies {}; - discourse-math = callPackage ./discourse-math {}; discourse-github = callPackage ./discourse-github {}; + discourse-math = callPackage ./discourse-math {}; + discourse-solved = callPackage ./discourse-solved {}; + discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {}; discourse-yearly-review = callPackage ./discourse-yearly-review {}; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index 05c153cd70b..558abec36f4 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -1,11 +1,17 @@ -{ mkDiscoursePlugin, fetchFromGitHub }: +{ lib, mkDiscoursePlugin, fetchFromGitHub }: mkDiscoursePlugin { name = "discourse-canned-replies"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse-canned-replies"; - rev = "7ee748f18a276aca42185e2079c1d4cadeecdaf8"; - sha256 = "0j10kxfr6v2rdd58smg2i7iac46z74qnnjk8b91jd1svazhis1ph"; + rev = "e3f1de8928df5955b64994079b7e2073556e5456"; + sha256 = "1g4fazm6cn6hbfd08mq2zhc6dgm4qj1r1f1amhbgxhk6qsxf42cd"; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-canned-replies"; + maintainers = with maintainers; [ talyz ]; + license = licenses.gpl2Only; + description = "Adds support for inserting a canned reply into the composer window via a UI"; }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile index f0205f4ff1d..7c0e7f435ae 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile @@ -1,3 +1,9 @@ -source 'https://rubygems.org' +# frozen_string_literal: true + +source "https://rubygems.org" + +git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } + +# gem "rails" gem 'sawyer', '0.8.2' gem 'octokit', '4.21.0' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index f28833a35c0..0486ea1402b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -1,21 +1,25 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - faraday (1.4.2) + faraday (1.5.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) + faraday-httpclient (1.0.1) faraday-net_http (1.0.1) faraday-net_http_persistent (1.1.0) + faraday-patron (1.0.0) multipart-post (2.1.1) octokit (4.21.0) faraday (>= 0.9) @@ -27,11 +31,11 @@ GEM faraday (> 0.8, < 2.0) PLATFORMS - ruby + x86_64-linux DEPENDENCIES octokit (= 4.21.0) sawyer (= 0.8.2) BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index e5d8cff0a9f..bb6d16bfe46 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -1,4 +1,4 @@ -{ mkDiscoursePlugin, fetchFromGitHub }: +{ lib, mkDiscoursePlugin, fetchFromGitHub }: mkDiscoursePlugin { name = "discourse-github"; @@ -6,7 +6,14 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "151e353a5a1971157c70c2e2b0f56387f212a81f"; - sha256 = "00kra6zd2k1f2vwcdvxnxnammzh72f5qxcqbb94m0z6maj598wdy"; + rev = "154fd5ea597640c2259ce489b4ce75b48ac1973c"; + sha256 = "0wb5p219z42rc035rnh2iwrbsj000nxa9shbmc325rzcg6xlhdhw"; }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-github"; + maintainers = with maintainers; [ talyz ]; + license = licenses.mit; + description = "Adds GitHub badges and linkback functionality"; + }; + } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index bad1f962957..ae20ec89521 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -5,21 +5,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; faraday = { - dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07mhk70gv453pg38md346470hknyhipdqppnplq706ll3k3lzb7v"; + sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah"; type = "gem"; }; - version = "1.4.2"; + version = "1.5.0"; }; faraday-em_http = { groups = ["default"]; @@ -51,6 +51,16 @@ }; version = "1.1.0"; }; + faraday-httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; faraday-net_http = { groups = ["default"]; platforms = []; @@ -71,6 +81,16 @@ }; version = "1.1.0"; }; + faraday-patron = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; + }; multipart-post = { groups = ["default"]; platforms = []; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index 8cf2a4abc0d..0e751c1dc54 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -1,11 +1,17 @@ -{ mkDiscoursePlugin, fetchFromGitHub }: +{ lib, mkDiscoursePlugin, fetchFromGitHub }: mkDiscoursePlugin { name = "discourse-math"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse-math"; - rev = "143ddea4558ea9a1b3fd71635bc11e055763c8e7"; - sha256 = "18pq5ybl3g34i39cpixc3nszvq8gx5yji58zlbbl6428mm011cbx"; + rev = "aed0c83cee568d5239143bcf1df59c5fbe86b276"; + sha256 = "1k6kpnhf8s2l0w9zr5pn3wvn8w0n3gwkv7qkv0mkhkzy246ag20z"; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-math"; + maintainers = with maintainers; [ talyz ]; + license = licenses.mit; + description = "Official MathJax support for Discourse"; }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index c382a83d089..2d451418bdd 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -1,11 +1,17 @@ -{ mkDiscoursePlugin, fetchFromGitHub }: +{ lib, mkDiscoursePlugin, fetchFromGitHub }: mkDiscoursePlugin { name = "discourse-solved"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "179611766d53974308e6f7def21836997c3c55fc"; - sha256 = "sha256:1s77h42d3bv2lqw33akxh8ss482vxnz4d7qz6xicwqfwv34qjf03"; + rev = "b96374bf4ab7e6d5cecb0761918b060a524eb9bf"; + sha256 = "0zrv70p0wz93akpcj6gpwjkw7az3iz9bx4n2z630kyrlmxdbj32a"; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-solved"; + maintainers = with maintainers; [ talyz ]; + license = licenses.mit; + description = "Allow accepted answers on topics"; }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index 8eba43e47e4..da47dbf182c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -1,11 +1,17 @@ -{ mkDiscoursePlugin, fetchFromGitHub }: +{ lib, mkDiscoursePlugin, fetchFromGitHub }: mkDiscoursePlugin { name = "discourse-spoiler-alert"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse-spoiler-alert"; - rev = "e200cfa571d252cab63f3d30d619b370986e4cee"; - sha256 = "0ya69ix5g77wz4c9x9gmng6l25ghb5xxlx3icr6jam16q14dzc33"; + rev = "ec14a2316da0a4fc055cfc21c68a60040188a2b4"; + sha256 = "11n977gp8va7jkqa6i3ja279k4nmkhk5l4hg9xhs229450m1rnfp"; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-spoiler-alert"; + maintainers = with maintainers; [ talyz ]; + license = licenses.mit; + description = "Hide spoilers behind the spoiler-alert jQuery plugin"; }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index 8e76123ae59..b20e16118c7 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -1,11 +1,17 @@ -{ mkDiscoursePlugin, fetchFromGitHub }: +{ lib, mkDiscoursePlugin, fetchFromGitHub }: mkDiscoursePlugin { name = "discourse-yearly-review"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "d1471bdb68945f55342e72e2c525b4f628419a50"; - sha256 = "sha256:0xpl0l1vpih8xzb6y7k1lm72nj4ya99378viyhqfvpwzsn5pha2a"; + rev = "95149df2282d62eebeb265b4895df15a2b259d03"; + sha256 = "02n27al8n8cxz3dx4awlnd4qhv8a0fmjac57yyblmpviapja1wj7"; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-yearly-review"; + maintainers = with maintainers; [ talyz ]; + license = licenses.mit; + description = "Publishes an automated Year in Review topic"; }; } From 3300282db3f8711a5ed5a5f627c4ddfb83168e3b Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 6 Jul 2021 18:28:04 +0200 Subject: [PATCH 041/129] discourse: Add `update-plugins` action to update.py --- pkgs/servers/web-apps/discourse/default.nix | 1 - pkgs/servers/web-apps/discourse/update.py | 100 ++++++++++++++++++-- 2 files changed, 92 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 5a3301040d3..ae5d1818c61 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -64,7 +64,6 @@ let }); in stdenv.mkDerivation (builtins.removeAttrs args [ "bundlerEnvArgs" ] // { - inherit name pname version src meta; pluginName = if name != null then name else "${pname}-${version}"; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index c401ab552bb..d10a49be58f 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix bundler nix-update python3 python3Packages.requests python3Packages.click python3Packages.click-log +#! nix-shell -i python3 -p bundix bundler nix-update nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log import click import click_log @@ -8,17 +8,22 @@ import tempfile import re import logging import subprocess -import pathlib +import os +import stat +import json +import requests from distutils.version import LooseVersion +from pathlib import Path from typing import Iterable -import requests logger = logging.getLogger(__name__) class DiscourseRepo: version_regex = re.compile(r'^v\d+\.\d+\.\d+$') + _latest_commit_sha = None + def __init__(self, owner: str = 'discourse', repo: str = 'discourse'): self.owner = owner self.repo = repo @@ -35,6 +40,15 @@ class DiscourseRepo: versions.sort(key=lambda x: LooseVersion(x.replace('v', '')), reverse=True) return versions + @property + def latest_commit_sha(self) -> str: + if self._latest_commit_sha is None: + r = requests.get(f'https://api.github.com/repos/{self.owner}/{self.repo}/commits?per_page=1') + r.raise_for_status() + self._latest_commit_sha = r.json()[0]['sha'] + + return self._latest_commit_sha + @staticmethod def rev2version(tag: str) -> str: """ @@ -57,19 +71,23 @@ class DiscourseRepo: def _call_nix_update(pkg, version): """calls nix-update from nixpkgs root dir""" - nixpkgs_path = pathlib.Path(__file__).parent / '../../../../' + nixpkgs_path = Path(__file__).parent / '../../../../' return subprocess.check_output(['nix-update', pkg, '--version', version], cwd=nixpkgs_path) +def _nix_eval(expr: str): + nixpkgs_path = Path(__file__).parent / '../../../../' + return json.loads(subprocess.check_output(['nix', 'eval', '--json', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True)) + + def _get_current_package_version(pkg: str): - nixpkgs_path = pathlib.Path(__file__).parent / '../../../../' - return subprocess.check_output(['nix', 'eval', '--raw', f'nixpkgs.{pkg}.version'], text=True) + return _nix_eval(f'{pkg}.version') def _diff_file(filepath: str, old_version: str, new_version: str): repo = DiscourseRepo() - current_dir = pathlib.Path(__file__).parent + current_dir = Path(__file__).parent old = repo.get_file(filepath, 'v' + old_version) new = repo.get_file(filepath, 'v' + new_version) @@ -148,7 +166,7 @@ def update(rev): version = repo.rev2version(rev) logger.debug(f"Using version {version}") - rubyenv_dir = pathlib.Path(__file__).parent / "rubyEnv" + rubyenv_dir = Path(__file__).parent / "rubyEnv" for fn in ['Gemfile.lock', 'Gemfile']: with open(rubyenv_dir / fn, 'w') as f: @@ -159,6 +177,72 @@ def update(rev): _call_nix_update('discourse', repo.rev2version(rev)) +@cli.command() +def update_plugins(): + """Update plugins to their latest revision. + + """ + plugins = [ + {'name': 'discourse-canned-replies'}, + {'name': 'discourse-github'}, + {'name': 'discourse-math'}, + {'name': 'discourse-solved'}, + {'name': 'discourse-spoiler-alert'}, + {'name': 'discourse-yearly-review'}, + ] + + for plugin in plugins: + fetcher = plugin.get('fetcher') or "fetchFromGitHub" + owner = plugin.get('owner') or "discourse" + name = plugin.get('name') + repo_name = plugin.get('repo_name') or name + + repo = DiscourseRepo(owner=owner, repo=repo_name) + prev_commit_sha = _nix_eval(f'discourse.plugins.{name}.src.rev') + + if prev_commit_sha == repo.latest_commit_sha: + click.echo(f'Plugin {name} is already at the latest revision') + continue + + filename = _nix_eval(f'builtins.unsafeGetAttrPos "src" discourse.plugins.{name}')['file'] + prev_hash = _nix_eval(f'discourse.plugins.{name}.src.outputHash') + new_hash = subprocess.check_output([ + 'nix-universal-prefetch', fetcher, + '--owner', owner, + '--repo', repo_name, + '--rev', repo.latest_commit_sha, + ], text=True).strip("\n") + + click.echo(f"Update {name}, {prev_commit_sha} -> {repo.latest_commit_sha} in {filename}") + + with open(filename, 'r+') as f: + content = f.read() + content = content.replace(prev_commit_sha, repo.latest_commit_sha) + content = content.replace(prev_hash, new_hash) + f.seek(0) + f.write(content) + f.truncate() + + rubyenv_dir = Path(filename).parent + gemfile = rubyenv_dir / "Gemfile" + gemfile_text = '' + for line in repo.get_file('plugin.rb', repo.latest_commit_sha).splitlines(): + if 'gem ' in line: + gemfile_text = gemfile_text + line + os.linesep + + if len(gemfile_text) > 0: + if os.path.isfile(gemfile): + os.remove(gemfile) + + subprocess.check_output(['bundle', 'init'], cwd=rubyenv_dir) + os.chmod(gemfile, stat.S_IREAD | stat.S_IWRITE | stat.S_IRGRP | stat.S_IROTH) + + with open(gemfile, 'a') as f: + f.write(gemfile_text) + + subprocess.check_output(['bundle', 'lock', '--update'], cwd=rubyenv_dir) + subprocess.check_output(['bundix'], cwd=rubyenv_dir) + if __name__ == '__main__': cli() From eb122119a0fbd7f0c7b78dfcdfbc5d0cfada0c0f Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 6 Jul 2021 18:29:13 +0200 Subject: [PATCH 042/129] discourseAllPlugins: Provide a discourse derivation with all plugins --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c035ff6702..83d023cc9e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2481,6 +2481,10 @@ in discourse = callPackage ../servers/web-apps/discourse { }; + discourseAllPlugins = discourse.override { + plugins = lib.filter (p: p ? pluginName) (builtins.attrValues discourse.plugins); + }; + discourse-mail-receiver = callPackage ../servers/web-apps/discourse/mail_receiver { }; discocss = callPackage ../tools/misc/discocss { }; From 20548f050e72a789ebbfe413b0fe7aa815e55c27 Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 6 Jul 2021 18:37:00 +0200 Subject: [PATCH 043/129] nixos/discourse: Update plugin documentation Update the documentation regarding plugins to reflect recent changes. --- nixos/modules/services/web-apps/discourse.nix | 19 +++----- nixos/modules/services/web-apps/discourse.xml | 43 ++++++++++++++----- 2 files changed, 39 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index d3ae072f86a..8d5302ba267 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -475,21 +475,16 @@ in plugins = lib.mkOption { type = lib.types.listOf lib.types.package; default = []; - example = '' - [ - (pkgs.fetchFromGitHub { - owner = "discourse"; - repo = "discourse-spoiler-alert"; - rev = "e200cfa571d252cab63f3d30d619b370986e4cee"; - sha256 = "0ya69ix5g77wz4c9x9gmng6l25ghb5xxlx3icr6jam16q14dzc33"; - }) + example = lib.literalExample '' + with config.services.discourse.package.plugins; [ + discourse-canned-replies + discourse-github ]; ''; description = '' - Discourse plugins to install as a - list of derivations. As long as a plugin supports the - standard install method, packaging it should only require - fetching its source with an appropriate fetcher. + Plugins to install as part of + Discourse, expressed as a list of + derivations. ''; }; diff --git a/nixos/modules/services/web-apps/discourse.xml b/nixos/modules/services/web-apps/discourse.xml index bae56242321..1d6866e7b35 100644 --- a/nixos/modules/services/web-apps/discourse.xml +++ b/nixos/modules/services/web-apps/discourse.xml @@ -262,9 +262,31 @@ services.discourse = { You can install Discourse plugins using the - option. As long as a plugin supports the standard install - method, packaging it should only require fetching its source - with an appropriate fetcher. + option. Pre-packaged plugins are provided in + <your_discourse_package_here>.plugins. If + you want the full suite of plugins provided through + nixpkgs, you can also set the option to + pkgs.discourseAllPlugins. + + + + Plugins can be built with the + <your_discourse_package_here>.mkDiscoursePlugin + function. Normally, it should suffice to provide a + name and src attribute. If + the plugin has Ruby dependencies, however, they need to be + packaged in accordance with the Developing + with Ruby section of the Nixpkgs manual and the + appropriate gem options set in bundlerEnvArgs + (normally gemdir is sufficient). A plugin's + Ruby dependencies are listed in its + plugin.rb file as function calls to + gem. To construct the corresponding + Gemfile, run bundle + init, then add the gem lines to it + verbatim. @@ -280,7 +302,10 @@ services.discourse = { For example, to add the discourse-spoiler-alert - plugin and disable it by default: + and discourse-solved + plugins, and disable discourse-spoiler-alert + by default: services.discourse = { @@ -301,13 +326,9 @@ services.discourse = { passwordFile = "/path/to/smtp_password_file"; }; mail.incoming.enable = true; - plugins = [ - (pkgs.fetchFromGitHub { - owner = "discourse"; - repo = "discourse-spoiler-alert"; - rev = "e200cfa571d252cab63f3d30d619b370986e4cee"; - sha256 = "0ya69ix5g77wz4c9x9gmng6l25ghb5xxlx3icr6jam16q14dzc33"; - }) + plugins = with config.services.discourse.package.plugins; [ + discourse-spoiler-alert + discourse-solved ]; siteSettings = { plugins = { From a2dbc3af1d50edb8d646817e7abe799bcf369f20 Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 7 Jul 2021 12:51:28 +0200 Subject: [PATCH 044/129] discourse: Remove architecture bound platforms from Gemfile.lock Maybe bundix doesn't handle them properly? They cause runtime issues and don't seem necessary when the binary gems are built from scratch anyway. --- pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock | 12 +----------- pkgs/servers/web-apps/discourse/update.py | 4 ++++ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index af968cdf331..adefcc318a6 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -186,11 +186,6 @@ GEM jwt (2.2.3) kgio (2.11.3) libv8-node (15.14.0.1) - libv8-node (15.14.0.1-arm64-darwin-20) - libv8-node (15.14.0.1-x86_64-darwin-18) - libv8-node (15.14.0.1-x86_64-darwin-19) - libv8-node (15.14.0.1-x86_64-darwin-20) - libv8-node (15.14.0.1-x86_64-linux) listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -465,12 +460,7 @@ GEM zeitwerk (2.4.2) PLATFORMS - arm64-darwin-20 ruby - x86_64-darwin-18 - x86_64-darwin-19 - x86_64-darwin-20 - x86_64-linux DEPENDENCIES actionmailer (= 6.1.3.2) @@ -600,4 +590,4 @@ DEPENDENCIES yaml-lint BUNDLED WITH - 2.2.16 + 2.2.20 diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index d10a49be58f..ae4dadfc3a7 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -173,6 +173,10 @@ def update(rev): f.write(repo.get_file(fn, rev)) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) + for platform in ['arm64-darwin-20', 'x86_64-darwin-18', + 'x86_64-darwin-19', 'x86_64-darwin-20', + 'x86_64-linux']: + subprocess.check_output(['bundle', 'lock', '--remove-platform', platform], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) _call_nix_update('discourse', repo.rev2version(rev)) From 61f4429fbd99842f14e77190f171b579923522ea Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 9 Jul 2021 16:35:35 +0200 Subject: [PATCH 045/129] discourse: Use `terser` when building assets Discourse prefers to use `terser` when building js assets, see https://github.com/discourse/discourse/pull/12656. It still wants to find `uglify-js` in order to not fall back to a ruby js compression library, so let's keep it around for now. A fix for this has been submitted upstream in https://github.com/discourse/discourse/pull/13683. --- pkgs/servers/web-apps/discourse/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index ae5d1818c61..d018fe5fa1a 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -150,6 +150,7 @@ let brotli procps nodePackages.uglify-js + nodePackages.terser ]; patches = [ From 60d78d7f1f218e19b1d0997ff4798c97a274cc47 Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 14 Jul 2021 13:16:02 +0200 Subject: [PATCH 046/129] discourse: 2.7.4 -> 2.7.5 --- pkgs/servers/web-apps/discourse/default.nix | 4 ++-- pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock | 6 +++--- pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index d018fe5fa1a..72ea8a943dc 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -9,13 +9,13 @@ }: let - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-3cvrdWBXRM5F8qFEqbe8ru1U0wBqCkRxK7GAV0beJNk="; + sha256 = "sha256-OykWaiBAHcZy41i+aRzBHCRgwnfQUBijHjb+ofIk25M="; }; runtimeDeps = [ diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index adefcc318a6..1f7a3641caa 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -209,7 +209,7 @@ GEM rack (>= 1.1.3) method_source (1.0.0) mini_mime (1.1.0) - mini_portile2 (2.5.1) + mini_portile2 (2.5.3) mini_racer (0.4.0) libv8-node (~> 15.14.0.0) mini_scheduler (0.13.0) @@ -227,7 +227,7 @@ GEM multipart-post (2.1.1) mustache (1.1.1) nio4r (2.5.7) - nokogiri (1.11.5) + nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.5) @@ -262,7 +262,7 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - onebox (2.2.15) + onebox (2.2.17) addressable (~> 2.7.0) htmlentities (~> 4.3) multi_json (~> 1.11) diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 974df1ed4ea..2fe2587d25f 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -1135,10 +1135,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2"; + sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.3"; }; mini_racer = { dependencies = ["libv8-node"]; @@ -1284,10 +1284,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m"; + sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; type = "gem"; }; - version = "1.11.5"; + version = "1.11.7"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -1414,10 +1414,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a76xmwikcg2lv8k2cawzhmi2hx7j145v12mbpriby6zff797z4g"; + sha256 = "1swlysqwfc6mb7smv52yv12sd79dchjf2f6r738wrag0wp5hazqy"; type = "gem"; }; - version = "2.2.15"; + version = "2.2.17"; }; openssl = { groups = ["default"]; From 895e757e862556b2aaabec2260cb1175a3d01ba9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 14 Jul 2021 08:56:26 -0500 Subject: [PATCH 047/129] reviewdog: 0.11.0 -> 0.12.0 https://github.com/reviewdog/reviewdog/releases/tag/v0.12.0 --- pkgs/development/tools/misc/reviewdog/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index fccee0ede2b..24e2e0fea6b 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0n7hk3va25ym8sb900i1s1hjszgwrfl7gfsjbj1m330fidh3q6jc"; + sha256 = "18fk4xzl6ys3azyw9ap14zgf3av5fdsrdn4mxx9calimvzbl4nfp"; }; - vendorSha256 = "0xscirzi0gqww33ngwh29jiylarj0w5snn9kvv43wfrphb6c79s5"; + vendorSha256 = "1qcp8v426500cpfrchazsh5rw4nr0c31vmrhbfgb9js4vxrn8acr"; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Automated code review tool integrated with any code analysis tools regardless of programming language"; homepage = "https://github.com/reviewdog/reviewdog"; - changelog = "https://github.com/reviewdog/reviewdog/releases/tag/v${version}"; + changelog = "https://github.com/reviewdog/reviewdog/raw/v${version}/CHANGELOG.md"; maintainers = [ maintainers.marsam ]; license = licenses.mit; }; From c4ad4c99c5ca39d9c8035d4e3a72151945cc376c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 14 Jul 2021 16:08:53 +0200 Subject: [PATCH 048/129] lighttable: deprecate phases --- pkgs/applications/editors/lighttable/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index b19b1ac2b68..0b550c5f11d 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv"; }; - phases = [ "installPhase" ]; + dontConfigure = true; installPhase = '' tar xf ${src} From ac5d822f3917729e4a829e27087c7098e1227fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 14 Jul 2021 11:27:38 -0300 Subject: [PATCH 049/129] qogir-icon-theme: 2020-11-22 -> 2021-07-14 --- pkgs/data/icons/qogir-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index e647b02f010..266fd561bd4 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2020-11-22"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "04rkpsiz8jg9i55mslsh7a6wgyp30ja3xss7qacqimdab236300d"; + sha256 = "0anma2ss3yqr9njx4ay2nyxjkgnj7ky17c93ipwgrvgsv8jk5nn2"; }; nativeBuildInputs = [ gtk3 ]; From 6f6d4a12c1888042d23257aaa98f5c3c78f2cae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 14 Jul 2021 11:28:42 -0300 Subject: [PATCH 050/129] qogir-icon-theme: run installPhase hooks --- pkgs/data/icons/qogir-icon-theme/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index 266fd561bd4..e7e1e51d7e1 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -18,9 +18,11 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; installPhase = '' + runHook preInstall patchShebangs install.sh mkdir -p $out/share/icons name= ./install.sh -d $out/share/icons + runHook postInstall ''; meta = with lib; { From 2a99a029c55a1cf9ec7dc24181d72a2c0ceac687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 14 Jul 2021 11:30:47 -0300 Subject: [PATCH 051/129] qogir-icon-theme: fix license --- pkgs/data/icons/qogir-icon-theme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index e7e1e51d7e1..7e03ca53d81 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flat colorful design icon theme"; homepage = "https://github.com/vinceliuice/Qogir-icon-theme"; - license = with licenses; [ gpl3 ]; + license = with licenses; [ gpl3Only ]; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; From 6159106f30bc7025ee3925eb9e25352a01c9b668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 14 Jul 2021 11:31:25 -0300 Subject: [PATCH 052/129] qogir-icon-theme: make relative symlinks for duplicates This approximately halves the size of the package --- pkgs/data/icons/qogir-icon-theme/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index 7e03ca53d81..00de4f6760c 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }: stdenv.mkDerivation rec { pname = "qogir-icon-theme"; @@ -11,17 +11,22 @@ stdenv.mkDerivation rec { sha256 = "0anma2ss3yqr9njx4ay2nyxjkgnj7ky17c93ipwgrvgsv8jk5nn2"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ gtk3 jdupes ]; propagatedBuildInputs = [ hicolor-icon-theme ]; dontDropIconThemeCache = true; + # These fixup steps are slow and unnecessary. + dontPatchELF = true; + dontRewriteSymlinks = true; + installPhase = '' runHook preInstall patchShebangs install.sh mkdir -p $out/share/icons name= ./install.sh -d $out/share/icons + jdupes -l -r $out/share/icons runHook postInstall ''; From 3680a85bcbddf681d0cdd419c8a3e32b39255e37 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 14 Jul 2021 16:33:41 +0200 Subject: [PATCH 053/129] workcraft: deeprecate phases --- pkgs/applications/science/logic/workcraft/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 7fb73419c07..63a94636560 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; installPhase = '' mkdir -p $out/share @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.mit; maintainers = with lib.maintainers; [ timor ]; - inherit version; }; } From acdd581a7a56d91614b54484136ba368e477b375 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 14 Jul 2021 16:35:06 +0200 Subject: [PATCH 054/129] swingsane: deprecate phases --- pkgs/applications/graphics/swingsane/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index e9507129a2c..c9d119a7d60 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; + dontConfigure = true; installPhase = let From b6fb4cedaff9a705f0154df0c9b8d968f3eee764 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 14 Jul 2021 16:41:30 +0200 Subject: [PATCH 055/129] verifast: deprecate phases --- pkgs/applications/science/logic/verifast/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 2d625a1c1b2..e426f7b8098 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { sha256 = "169kshjq4cf4i9v92azv0xaflrnik5686w7fwcgdhd6qkbzflzl6"; }; + dontConfigure = true; dontStrip = true; - phases = "unpackPhase installPhase"; installPhase = '' mkdir -p $out/bin cp -R bin $out/libexec From 48e281f963b32eb3d08702c5bf0a0838f13ea377 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 14 Jul 2021 20:08:39 +0200 Subject: [PATCH 056/129] cosign: enable PIV key support This was disabled by default in cosign 0.5.0 [0] and we did not enabled it back when we upgraded cosign [1]. The support for PIV keys is enabled by default and can be disabled if needed. [0] https://github.com/sigstore/cosign/commit/749c7e3e5d80f3fa976f31084317a556718c3e54 [1] https://github.com/NixOS/nixpkgs/commit/de0014a227e45b6e82dcf817807e5700138c992f --- pkgs/tools/security/cosign/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 550f965b07d..bdc32570dfa 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC, pivKeySupport ? true }: buildGoModule rec { pname = "cosign"; @@ -12,8 +12,8 @@ buildGoModule rec { }; buildInputs = - lib.optional stdenv.isLinux (lib.getDev pcsclite) - ++ lib.optionals stdenv.isDarwin [ PCSC ]; + lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) + ++ lib.optionals (stdenv.isDarwin && pivKeySupport) [ PCSC ]; nativeBuildInputs = [ pkg-config ]; @@ -21,6 +21,9 @@ buildGoModule rec { subPackages = [ "cmd/cosign" ]; + preBuild = '' + buildFlagsArray+=(${lib.optionalString pivKeySupport "-tags=pivkey"}) + ''; ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}"]; meta = with lib; { From 62ab958fb027d58602bad376c5b1d10e0e15d185 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 14 Jul 2021 14:58:15 -0400 Subject: [PATCH 057/129] root: 6.24.00 -> 6.24.02 --- pkgs/applications/science/misc/root/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index a97be6ec76f..759b541ef77 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.24.00"; + version = "6.24.02"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "12crjzd7pzx5qpk2pb3z0rhmxlw5gsqaqzfl48qiq8c9l940b8wx"; + sha256 = "sha256-BQfhCV4nnMxyQPZR0llmAkMlF5+oWhJZtpS1ZyOtfBw="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; From 0e1d475fecd5147e19f6a4e0d1c5e121558d4b6b Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 14 Jul 2021 16:12:01 -0300 Subject: [PATCH 058/129] omnisharp-roslyn: 1.37.8 -> 1.37.12 --- .../tools/omnisharp-roslyn/default.nix | 4 +- .../tools/omnisharp-roslyn/deps.nix | 388 ++++++++++-------- 2 files changed, 212 insertions(+), 180 deletions(-) diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index a07f2f91156..7cf36fd1f89 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -66,13 +66,13 @@ let in stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.37.8"; + version = "1.37.12"; src = fetchFromGitHub { owner = "OmniSharp"; repo = pname; rev = "v${version}"; - sha256 = "1zi31m6ngk4rm7444n6q7mim096w5h4j2biwmvwmcf5yvig845za"; + sha256 = "0gyy49v3pslr0l0q6h8hzah4s0iwkhkyckyrj3g2cg08w20b10gw"; }; nativeBuildInputs = [ makeWrapper msbuild ]; diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix index de6761045d4..b64d5894da8 100644 --- a/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -1,34 +1,34 @@ { fetchurl }: [ { name = "cake.scripting.abstractions"; - version = "0.3.0"; + version = "0.6.4"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.3.0/cake.scripting.abstractions.0.3.0.nupkg"; - sha256 = "009yca6zskcwx9hg3gpgapvzl5mvisl8ni737plbznx033bhw8s8"; + url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.6.4/cake.scripting.abstractions.0.6.4.nupkg"; + sha256 = "14fcixlj2xazf6cb46gw8jgbsz89c6s8fnhvppxs8q12pygmkx0l"; }; } { name = "cake.scripting.transport"; - version = "0.3.0"; + version = "0.6.4"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.3.0/cake.scripting.transport.0.3.0.nupkg"; - sha256 = "0sc7rlnrqq30753h5cg3fndrlmix4vp2sxqb4sl044296mzcszl4"; + url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.6.4/cake.scripting.transport.0.6.4.nupkg"; + sha256 = "08cwj572mvmlagj5jry11j2l2fqc6yl4sw0szvql4ard9cx7j51n"; }; } { name = "dotnet.script.dependencymodel"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel/1.0.2/dotnet.script.dependencymodel.1.0.2.nupkg"; - sha256 = "0nqqplwykgbkpyidvkls9nrwxkpl1w1zrv8l7smjm62s18z5mqxb"; + url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel/1.1.0/dotnet.script.dependencymodel.1.1.0.nupkg"; + sha256 = "0ly1jwvzndrhgvrwy7kagabyca40j8w9p5jvvfj4wlpffvxq44xl"; }; } { name = "dotnet.script.dependencymodel.nuget"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel.nuget/1.0.1/dotnet.script.dependencymodel.nuget.1.0.1.nupkg"; - sha256 = "1ja9wsc73l5bqx0nv8lzyj2l65h1i7sk77wc7biplb80wm1rvsj4"; + url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel.nuget/1.1.0/dotnet.script.dependencymodel.nuget.1.1.0.nupkg"; + sha256 = "1kvjrm28jlfmcsy5fna8hy814chbcsc39ka12h8mgpdvjkr93njr"; }; } { @@ -41,10 +41,10 @@ } { name = "icsharpcode.decompiler"; - version = "7.0.0.6372-preview3"; + version = "7.1.0.6543"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/icsharpcode.decompiler/7.0.0.6372-preview3/icsharpcode.decompiler.7.0.0.6372-preview3.nupkg"; - sha256 = "0g7ki0ia1qcp9z9hgs2f63yffx66y8zi43k7nrf2n122ll1f0hsg"; + url = "https://api.nuget.org/v3-flatcontainer/icsharpcode.decompiler/7.1.0.6543/icsharpcode.decompiler.7.1.0.6543.nupkg"; + sha256 = "1xrajs5dcd7aqsg9ibhdcy39yrd8737kknkmqf907n7fqs2jxr46"; }; } { @@ -113,26 +113,34 @@ } { name = "microsoft.build"; - version = "16.9.0"; + version = "16.10.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/16.9.0/microsoft.build.16.9.0.nupkg"; - sha256 = "0kgfx3iqmc58f3a59ggc1wi486fjrqnzgayxldhpr2w7q5600w5p"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/16.10.0/microsoft.build.16.10.0.nupkg"; + sha256 = "1ran3fp016wvj8d2ahv0cmwhm6hjjh64w82s7cy52s7qffrgjk46"; }; } { name = "microsoft.build.framework"; - version = "16.9.0"; + version = "16.10.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/16.9.0/microsoft.build.framework.16.9.0.nupkg"; - sha256 = "1yddq21q82p28k6cdq3hzic20l6dcma2fzfbm35zanfljxdsb4cf"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/16.10.0/microsoft.build.framework.16.10.0.nupkg"; + sha256 = "17a8qxgq0jzxpjannhxkcg0941b64yb7z0yq75gz6hsq9ln3agja"; + }; + } + { + name = "microsoft.build.locator"; + version = "1.4.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.locator/1.4.1/microsoft.build.locator.1.4.1.nupkg"; + sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx"; }; } { name = "microsoft.build.tasks.core"; - version = "16.9.0"; + version = "16.10.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/16.9.0/microsoft.build.tasks.core.16.9.0.nupkg"; - sha256 = "1gpra00srwvwzi0a3d5nkjik9y8glh6qn0qdba4f5wiza1l2bdzw"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/16.10.0/microsoft.build.tasks.core.16.10.0.nupkg"; + sha256 = "0yc3p4bksxmbq1n8wfqgn6b6x9ccyzq229f0mn08z4jfima3cnxg"; }; } { @@ -145,18 +153,18 @@ } { name = "microsoft.build.utilities.core"; - version = "16.9.0"; + version = "16.10.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/16.9.0/microsoft.build.utilities.core.16.9.0.nupkg"; - sha256 = "0g05hmpzj33bknigdz5samw5pqss1q0sscv34sr53w2aiki5nx2c"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/16.10.0/microsoft.build.utilities.core.16.10.0.nupkg"; + sha256 = "1rh3gzrz8mmzilvs33cxngv0a805nb47s615rvj4xk5igm384w14"; }; } { name = "microsoft.codeanalysis.analyzers"; - version = "3.0.0"; + version = "3.3.2"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.0.0/microsoft.codeanalysis.analyzers.3.0.0.nupkg"; - sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.3.2/microsoft.codeanalysis.analyzers.3.3.2.nupkg"; + sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }; } { @@ -169,66 +177,82 @@ } { name = "microsoft.codeanalysis.common"; - version = "3.10.0-1.21125.6"; + version = "4.0.0-2.21322.50"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/3.10.0-1.21125.6/microsoft.codeanalysis.common.3.10.0-1.21125.6.nupkg"; - sha256 = "0rj7210v3i16pwjswa6fz3ksg19ncn8g7nm8qp8ly3xf9v5j25kn"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.0.0-2.21322.50/microsoft.codeanalysis.common.4.0.0-2.21322.50.nupkg"; + sha256 = "1j9yl7m0lr03fjklzjyiac1lrgs8541frqmi4xlldn8a2sx3h97x"; }; } { name = "microsoft.codeanalysis.csharp"; - version = "3.10.0-1.21125.6"; + version = "4.0.0-2.21322.50"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.3.10.0-1.21125.6.nupkg"; - sha256 = "194h2r33f2w2ssbnrp21ly3m7md9mizhhanmccqbkqg3pbjd2lik"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.4.0.0-2.21322.50.nupkg"; + sha256 = "1mmcl4rj3n1q7zh1n9b9ph3lvm8i51sdm87q3sgiczv2pxrihzs6"; }; } { name = "microsoft.codeanalysis.csharp.features"; - version = "3.10.0-1.21125.6"; + version = "4.0.0-2.21322.50"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.features.3.10.0-1.21125.6.nupkg"; - sha256 = "027njgyzc4w136sa9f68n8fx62qpzb4nigx50knljgk622k3acjl"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.features.4.0.0-2.21322.50.nupkg"; + sha256 = "11pzbswlznz71m248c1p4fi4i3zzvpc4a71px9j2lhnm57zy2lvy"; }; } { name = "microsoft.codeanalysis.csharp.scripting"; - version = "3.10.0-1.21125.6"; + version = "4.0.0-2.21322.50"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.scripting.3.10.0-1.21125.6.nupkg"; - sha256 = "1378ad9cfv5zlzix96q0viqylqzhgcb52zb8bc5y9k8rvnjqgppk"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.scripting.4.0.0-2.21322.50.nupkg"; + sha256 = "0piiyg1l27cy6s4ii80phrdsyhl8zvwbj9aljqkg53gki520x19p"; }; } { name = "microsoft.codeanalysis.csharp.workspaces"; - version = "3.10.0-1.21125.6"; + version = "4.0.0-2.21322.50"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.workspaces.3.10.0-1.21125.6.nupkg"; - sha256 = "1yhcm1qm7jjmp1fkpkkzq136frjqc558w49ygdiknyk253llqvm7"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.workspaces.4.0.0-2.21322.50.nupkg"; + sha256 = "0q6jkgjh1dylmjx8a79ighgbai1jr2fhls9m7khi87anzc3wdcl2"; + }; + } + { + name = "microsoft.codeanalysis.externalaccess.omnisharp"; + version = "4.0.0-2.21322.50"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.0.0-2.21322.50/microsoft.codeanalysis.externalaccess.omnisharp.4.0.0-2.21322.50.nupkg"; + sha256 = "1rv5qsj8lsfqxdzd6zazrzwzaxwmj6szd9hv2ckbb4lypkn8ifs8"; + }; + } + { + name = "microsoft.codeanalysis.externalaccess.omnisharp.csharp"; + version = "4.0.0-2.21322.50"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.0.0-2.21322.50/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.0.0-2.21322.50.nupkg"; + sha256 = "0ygp7hnm6mn9khh6z573avhvbcx5459fmyz4z657dx9p2v1f0fs0"; }; } { name = "microsoft.codeanalysis.features"; - version = "3.10.0-1.21125.6"; + version = "4.0.0-2.21322.50"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/3.10.0-1.21125.6/microsoft.codeanalysis.features.3.10.0-1.21125.6.nupkg"; - sha256 = "1ydzx96a925a98zdxd6l9kgkl7b67sfbnkam61y0hkvgfdg1xg1a"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.0.0-2.21322.50/microsoft.codeanalysis.features.4.0.0-2.21322.50.nupkg"; + sha256 = "1grkql2wcqsqlmqnfchw6wxynwpz4x9wgqd00zpc1g04z9lqimq6"; }; } { name = "microsoft.codeanalysis.scripting.common"; - version = "3.10.0-1.21125.6"; + version = "4.0.0-2.21322.50"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/3.10.0-1.21125.6/microsoft.codeanalysis.scripting.common.3.10.0-1.21125.6.nupkg"; - sha256 = "1blr101n2l7k0bmc248blh36a7nxbbjw3kirsn154zrbmc8s8m1m"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.0.0-2.21322.50/microsoft.codeanalysis.scripting.common.4.0.0-2.21322.50.nupkg"; + sha256 = "1c14bg99ywxdvlp5zc08ijc030rxmpb3171kz2z6f5kr02vf296x"; }; } { name = "microsoft.codeanalysis.workspaces.common"; - version = "3.10.0-1.21125.6"; + version = "4.0.0-2.21322.50"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/3.10.0-1.21125.6/microsoft.codeanalysis.workspaces.common.3.10.0-1.21125.6.nupkg"; - sha256 = "029scic0mdbmw8gm6wmg5wsnjfx0s4wbfw5lbvyrpbfvdcagvyb2"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.0.0-2.21322.50/microsoft.codeanalysis.workspaces.common.4.0.0-2.21322.50.nupkg"; + sha256 = "1c0m5pg156x8zh50x7rp25p8cn09gbv50wpbz2p1nc5ff5dyavf5"; }; } { @@ -257,18 +281,18 @@ } { name = "microsoft.extensions.caching.abstractions"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/3.1.12/microsoft.extensions.caching.abstractions.3.1.12.nupkg"; - sha256 = "1p65fs9rjrygviwbqdd214p9y7acpln6zhbd6b741slvp2jwjmyg"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/5.0.0/microsoft.extensions.caching.abstractions.5.0.0.nupkg"; + sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb"; }; } { name = "microsoft.extensions.caching.memory"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/3.1.12/microsoft.extensions.caching.memory.3.1.12.nupkg"; - sha256 = "0ydrnqwnph5npf3rwzw1kzq0g3c2kajicdk251fdnjkx6yiw1vsp"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/5.0.0/microsoft.extensions.caching.memory.5.0.0.nupkg"; + sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca"; }; } { @@ -281,10 +305,10 @@ } { name = "microsoft.extensions.configuration"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/3.1.12/microsoft.extensions.configuration.3.1.12.nupkg"; - sha256 = "02bp53ahr98q3h8fzjl9rrxi48zja966dalrkbsqxqk1c5g1kl48"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/5.0.0/microsoft.extensions.configuration.5.0.0.nupkg"; + sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; }; } { @@ -297,10 +321,10 @@ } { name = "microsoft.extensions.configuration.abstractions"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/3.1.12/microsoft.extensions.configuration.abstractions.3.1.12.nupkg"; - sha256 = "0g35m4q03aag60pi3i5xi3p9q398w4jlq18n0n5qzq0xrlmny6k9"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/5.0.0/microsoft.extensions.configuration.abstractions.5.0.0.nupkg"; + sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }; } { @@ -313,42 +337,42 @@ } { name = "microsoft.extensions.configuration.binder"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/3.1.12/microsoft.extensions.configuration.binder.3.1.12.nupkg"; - sha256 = "18xizhcjwknwvj0fwdm91pssrpwndz7gzdlx48hph53z8cqqvkbv"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/5.0.0/microsoft.extensions.configuration.binder.5.0.0.nupkg"; + sha256 = "0sld0bh2k5kss32i3nf8mwqkjagmw0d1cdfmxm87ckiicwm413a0"; }; } { name = "microsoft.extensions.configuration.commandline"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/3.1.12/microsoft.extensions.configuration.commandline.3.1.12.nupkg"; - sha256 = "1c2qldblfp5m376a2nc82ljxjk0ljzrj48iwcvl6j48sjwcn3jl4"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/5.0.0/microsoft.extensions.configuration.commandline.5.0.0.nupkg"; + sha256 = "084hnz5l0vr15ay23rksqipslqnz3pp30w9hsirpx1iqdm5688mc"; }; } { name = "microsoft.extensions.configuration.environmentvariables"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/3.1.12/microsoft.extensions.configuration.environmentvariables.3.1.12.nupkg"; - sha256 = "08wb14rp6pgsqwakvn0491mmarqhwbihq8gnri7bnf6chaaqbxml"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/5.0.0/microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg"; + sha256 = "03gvckj10ljk1mir9g8cf3cajsnihhvmh8z8341gkr9h5653qkv0"; }; } { name = "microsoft.extensions.configuration.fileextensions"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/3.1.12/microsoft.extensions.configuration.fileextensions.3.1.12.nupkg"; - sha256 = "03qg5mjs2f6ihs5dp6d7gbv5bxd98xdvmpwzxp8qyqifjgpkprkj"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/5.0.0/microsoft.extensions.configuration.fileextensions.5.0.0.nupkg"; + sha256 = "1wq229r3xcmm9wh9sqdpvmfv4qpbp2zms9x6xk7g7sbb8h32hnz3"; }; } { name = "microsoft.extensions.configuration.json"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/3.1.12/microsoft.extensions.configuration.json.3.1.12.nupkg"; - sha256 = "0mhq8d6iijhjyk9jv2k3fnqr6gpbxlzarb5m6y48dx5amnf89k42"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/5.0.0/microsoft.extensions.configuration.json.5.0.0.nupkg"; + sha256 = "0hq5i483bjbvprp1la9l3si82x1ydxbvkpfc7r3s7zgxg957fyp9"; }; } { @@ -361,10 +385,10 @@ } { name = "microsoft.extensions.dependencyinjection"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/3.1.12/microsoft.extensions.dependencyinjection.3.1.12.nupkg"; - sha256 = "0fkcyxayj1mzdj124mabzvhl1p5irwab02rxnwf8bnvszkwgam8l"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/5.0.0/microsoft.extensions.dependencyinjection.5.0.0.nupkg"; + sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }; } { @@ -377,42 +401,42 @@ } { name = "microsoft.extensions.dependencyinjection.abstractions"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/3.1.12/microsoft.extensions.dependencyinjection.abstractions.3.1.12.nupkg"; - sha256 = "0flixm1physp9gxqzrrplzqkpfz4lljiak7fw87g65av0cksval2"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/5.0.0/microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg"; + sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }; } { name = "microsoft.extensions.dependencymodel"; - version = "3.1.6"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/3.1.6/microsoft.extensions.dependencymodel.3.1.6.nupkg"; - sha256 = "13m2na8a5mglbbjjp0dxb8ifkf23grkyk1g8585mr7v6cbj098ac"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/5.0.0/microsoft.extensions.dependencymodel.5.0.0.nupkg"; + sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; }; } { name = "microsoft.extensions.fileproviders.abstractions"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/3.1.12/microsoft.extensions.fileproviders.abstractions.3.1.12.nupkg"; - sha256 = "11plp1izss3sz03a76gpicwfs0l3jqad0yhz0dam6iirdniharvx"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/5.0.0/microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg"; + sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1"; }; } { name = "microsoft.extensions.fileproviders.physical"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/3.1.12/microsoft.extensions.fileproviders.physical.3.1.12.nupkg"; - sha256 = "1lgqvpbqhq2izgq2cka9ls5l99gymhx1ynh1887rjb890cb9hg42"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/5.0.0/microsoft.extensions.fileproviders.physical.5.0.0.nupkg"; + sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd"; }; } { name = "microsoft.extensions.filesystemglobbing"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/3.1.12/microsoft.extensions.filesystemglobbing.3.1.12.nupkg"; - sha256 = "16binlxq56n6a3vkmxhlrhiyl01fb2zvyzfh00hwa4ixxfl1is8n"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/5.0.0/microsoft.extensions.filesystemglobbing.5.0.0.nupkg"; + sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb"; }; } { @@ -425,18 +449,10 @@ } { name = "microsoft.extensions.logging"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/3.1.12/microsoft.extensions.logging.3.1.12.nupkg"; - sha256 = "12i0kvv4fl2y15dgzqzhqhj7fxy4qapqd78xwi1wsvrlbn9pp9h0"; - }; - } - { - name = "microsoft.extensions.logging.abstractions"; - version = "1.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/1.1.0/microsoft.extensions.logging.abstractions.1.1.0.nupkg"; - sha256 = "0vgp0jqi7rik4p5i86ib1lzhwldc3kyf4w38a1pd3086gfz021ab"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/5.0.0/microsoft.extensions.logging.5.0.0.nupkg"; + sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }; } { @@ -449,26 +465,34 @@ } { name = "microsoft.extensions.logging.abstractions"; - version = "3.1.12"; + version = "2.1.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/3.1.12/microsoft.extensions.logging.abstractions.3.1.12.nupkg"; - sha256 = "0yv681ddcrsn8cf0fnfi3jgcrmganf05r8lsw82d8rk0ljbjivz5"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.1.1/microsoft.extensions.logging.abstractions.2.1.1.nupkg"; + sha256 = "1sgpwj0sa0ac7m5fnkb482mnch8fsv8hfbvk53c6lyh47s1xhdjg"; + }; + } + { + name = "microsoft.extensions.logging.abstractions"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/5.0.0/microsoft.extensions.logging.abstractions.5.0.0.nupkg"; + sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }; } { name = "microsoft.extensions.logging.configuration"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/3.1.12/microsoft.extensions.logging.configuration.3.1.12.nupkg"; - sha256 = "0nrijpk4azaw5xk4473yb9sc1aal7phjrbswdg7dr6yrfibpb3fn"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/5.0.0/microsoft.extensions.logging.configuration.5.0.0.nupkg"; + sha256 = "1kmjax24w0ph362jr64rr6f8pyn6ayq39k502q9yrgr7zgrv65pa"; }; } { name = "microsoft.extensions.logging.console"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/3.1.12/microsoft.extensions.logging.console.3.1.12.nupkg"; - sha256 = "0vr65vcw15kycbpxk5z04nwcxlkcq0ljsnb4njcbzdcj4p87bcmr"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/5.0.0/microsoft.extensions.logging.console.5.0.0.nupkg"; + sha256 = "162akclrhk5r62fza8yr30p5824inwmrpq2s510c3a64v76v9cqz"; }; } { @@ -481,10 +505,10 @@ } { name = "microsoft.extensions.options"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/3.1.12/microsoft.extensions.options.3.1.12.nupkg"; - sha256 = "0phxp1m5p2sfn7mgdb4dzb2rscda8wwzgr0hqqyh19faf0kg2msm"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/5.0.0/microsoft.extensions.options.5.0.0.nupkg"; + sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }; } { @@ -497,10 +521,10 @@ } { name = "microsoft.extensions.options.configurationextensions"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/3.1.12/microsoft.extensions.options.configurationextensions.3.1.12.nupkg"; - sha256 = "1vvxhy31mf3z7al8gh9pvzn4z67ma6zc7wwc6f7bvbg6k235wz2v"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/5.0.0/microsoft.extensions.options.configurationextensions.5.0.0.nupkg"; + sha256 = "1085yrfgc70am43v8i5rxh14kal3bhdd5q85vgny5qp7y1rw0xyw"; }; } { @@ -513,10 +537,10 @@ } { name = "microsoft.extensions.primitives"; - version = "3.1.12"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/3.1.12/microsoft.extensions.primitives.3.1.12.nupkg"; - sha256 = "0ns4dsrfglas2qdn6qdyg004yjsk578fgfq76rs16hjr3iw9dkks"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/5.0.0/microsoft.extensions.primitives.5.0.0.nupkg"; + sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }; } { @@ -639,6 +663,14 @@ sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; }; } + { + name = "microsoft.net.stringtools"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.net.stringtools/1.0.0/microsoft.net.stringtools.1.0.0.nupkg"; + sha256 = "06yakiyzgss399giivfx6xdrnfxqfsvy5fzm90scjanvandv0sdj"; + }; + } { name = "microsoft.sourcelink.common"; version = "1.0.0"; @@ -657,26 +689,26 @@ } { name = "microsoft.testplatform.objectmodel"; - version = "16.6.1"; + version = "16.9.4"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.6.1/microsoft.testplatform.objectmodel.16.6.1.nupkg"; - sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.9.4/microsoft.testplatform.objectmodel.16.9.4.nupkg"; + sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; }; } { name = "microsoft.testplatform.translationlayer"; - version = "16.6.1"; + version = "16.9.4"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/16.6.1/microsoft.testplatform.translationlayer.16.6.1.nupkg"; - sha256 = "1j5pg3qdgqxila90x5h1hvq8wk53s4zf225x5zddmx6q26r9zq83"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/16.9.4/microsoft.testplatform.translationlayer.16.9.4.nupkg"; + sha256 = "0y5w2zflvq06jim2i6d49qi45ix0b8vlyf024w29n5g1lb570qf0"; }; } { name = "microsoft.visualstudio.debugger.contracts"; - version = "16.9.0-beta.20604.1"; + version = "17.2.0-beta.21262.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.debugger.contracts/16.9.0-beta.20604.1/microsoft.visualstudio.debugger.contracts.16.9.0-beta.20604.1.nupkg"; - sha256 = "0sy1ahy1xv39mkk5inhb63lmfnmkcc6vjljhljx0l2lkrrc33k0h"; + url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/78665e4c-b767-412b-9804-2b1ef7a48b8a/nuget/v3/flat2/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21262.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21262.1.nupkg"; + sha256 = "10fi1jdxnxvww1qzfhqi53fn0a411gvpvcsb0pvwvj7qk0lzs7c9"; }; } { @@ -1191,22 +1223,6 @@ sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }; } - { - name = "system.componentmodel.annotations"; - version = "4.4.1"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.annotations/4.4.1/system.componentmodel.annotations.4.4.1.nupkg"; - sha256 = "1d46yx6h36bssqyshq44qxx0fsx43bjf09zrlbvqfigacfsp9mph"; - }; - } - { - name = "system.componentmodel.annotations"; - version = "4.7.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.annotations/4.7.0/system.componentmodel.annotations.4.7.0.nupkg"; - sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; - }; - } { name = "system.componentmodel.composition"; version = "4.5.0"; @@ -1263,6 +1279,14 @@ sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63"; }; } + { + name = "system.configuration.configurationmanager"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/4.7.0/system.configuration.configurationmanager.4.7.0.nupkg"; + sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d"; + }; + } { name = "system.console"; version = "4.3.0"; @@ -1287,6 +1311,14 @@ sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }; } + { + name = "system.diagnostics.diagnosticsource"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/5.0.0/system.diagnostics.diagnosticsource.5.0.0.nupkg"; + sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; + }; + } { name = "system.diagnostics.process"; version = "4.3.0"; @@ -1409,10 +1441,10 @@ } { name = "system.io.pipelines"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.0/system.io.pipelines.5.0.0.nupkg"; - sha256 = "1kdvbzr98sdddm18r3gbsbcxpv58gm1yy3iig8zg9dvp7mli7453"; + url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.1/system.io.pipelines.5.0.1.nupkg"; + sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }; } { @@ -1431,14 +1463,6 @@ sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }; } - { - name = "system.memory"; - version = "4.5.2"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.2/system.memory.4.5.2.nupkg"; - sha256 = "1g24dwqfcmf4gpbgbhaw1j49xmpsz389l6bw2xxbsmnzvsf860ld"; - }; - } { name = "system.memory"; version = "4.5.3"; @@ -1631,14 +1655,6 @@ sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }; } - { - name = "system.reflection.typeextensions"; - version = "4.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }; - } { name = "system.reflection.typeextensions"; version = "4.3.0"; @@ -1847,6 +1863,14 @@ sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }; } + { + name = "system.security.cryptography.algorithms"; + version = "4.3.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.1/system.security.cryptography.algorithms.4.3.1.nupkg"; + sha256 = "1m2wnzg3m3c0s11jg4lshcl2a47d78zri8khc21yrz34jjkbyls2"; + }; + } { name = "system.security.cryptography.cng"; version = "4.3.0"; @@ -1911,6 +1935,14 @@ sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9"; }; } + { + name = "system.security.cryptography.protecteddata"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.7.0/system.security.cryptography.protecteddata.4.7.0.nupkg"; + sha256 = "1s1sh8k10s0apa09c5m2lkavi3ys90y657whg2smb3y8mpkfr5vm"; + }; + } { name = "system.security.cryptography.x509certificates"; version = "4.3.0"; @@ -2017,10 +2049,10 @@ } { name = "system.text.encodings.web"; - version = "4.7.1"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/4.7.1/system.text.encodings.web.4.7.1.nupkg"; - sha256 = "1wj7r07mjwbf9a79kapy2l9m8mcq8b3nbhg0zaprlsav09k85fmb"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/5.0.0/system.text.encodings.web.5.0.0.nupkg"; + sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; }; } { @@ -2033,10 +2065,10 @@ } { name = "system.text.json"; - version = "4.7.2"; + version = "5.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.2/system.text.json.4.7.2.nupkg"; - sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.json/5.0.0/system.text.json.5.0.0.nupkg"; + sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; }; } { From 0f3628c80f76d352321e4f7473d9380f339e6d44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Jul 2021 21:35:45 +0200 Subject: [PATCH 059/129] python3Packages.pypck: 0.7.9 -> 0.7.10 --- pkgs/development/python-modules/pypck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 3d39b3516b6..b0ea3fdcb24 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.9"; + version = "0.7.10"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "0clpi6bplzw7qg2m0hgwqr71zwxrh901gwprhd1yjykn30njp5bw"; + sha256 = "sha256-B2imewEONewj1Y+Q316reIBZB/b9WQAu67x9cLMkRTU="; }; checkInputs = [ From 9fd1126cd4fc1ad1a8f9f9135c61a984ef0a33f3 Mon Sep 17 00:00:00 2001 From: Alexander Rezvov Date: Wed, 14 Jul 2021 22:57:17 +0300 Subject: [PATCH 060/129] exim: add redis lookup support --- pkgs/servers/mail/exim/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 122d00c5f0a..702808f950a 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -5,6 +5,7 @@ , enablePAM ? false, pam , enableSPF ? true, libspf2 , enableDMARC ? true, opendmarc +, enableRedis ? false, hiredis }: stdenv.mkDerivation rec { @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { ++ lib.optional enableAuthDovecot dovecot ++ lib.optional enablePAM pam ++ lib.optional enableSPF libspf2 - ++ lib.optional enableDMARC opendmarc; + ++ lib.optional enableDMARC opendmarc + ++ lib.optional enableRedis hiredis; preBuild = '' sed ' @@ -78,6 +80,13 @@ stdenv.mkDerivation rec { s:^# \(SUPPORT_DMARC\)=.*:\1=yes: s:^# \(LDFLAGS += -lopendmarc\):\1: ''} + ${lib.optionalString enableRedis '' + s:^# \(LOOKUP_REDIS=yes\)$:\1: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lhiredis -L${hiredis}/lib/hiredis: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lhiredis -L${hiredis}/lib/hiredis: + s:^\(LOOKUP_INCLUDE\)=\(.*\):\1=\2 -I${hiredis}/include/hiredis/: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${hiredis}/include/hiredis/: + ''} #/^\s*#.*/d #/^\s*$/d ' < src/EDITME > Local/Makefile From 1cbb9c64d107556de1f9d1442cce958b56d2aad1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 14 Jul 2021 16:23:09 -0400 Subject: [PATCH 061/129] root,root5: apply nixpkgs-fmt --- pkgs/applications/science/misc/root/5.nix | 29 ++++++-- .../science/misc/root/default.nix | 68 ++++++++++++++++--- 2 files changed, 84 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 75607fdda34..0da3014507a 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,6 +1,27 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, pcre, pkg-config, python2 -, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, xz, gsl_1, xxHash -, Cocoa, OpenGL, noSplash ? false }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake +, pcre +, pkg-config +, python2 +, libX11 +, libXpm +, libXft +, libXext +, libGLU +, libGL +, zlib +, libxml2 +, lz4 +, xz +, gsl_1 +, xxHash +, Cocoa +, OpenGL +, noSplash ? false +}: stdenv.mkDerivation rec { pname = "root"; @@ -15,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl_1 xxHash ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] - ; + ; patches = [ ./sw_vers_root5.patch diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 759b541ef77..8aa9006d523 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,8 +1,39 @@ -{ stdenv, lib, fetchurl, makeWrapper, cmake, git, ftgl, gl2ps, glew, gsl -, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre, nlohmann_json -, pkg-config, python, xxHash, zlib, zstd -, libAfterImage, giflib, libjpeg, libtiff, libpng -, Cocoa, CoreSymbolication, OpenGL, noSplash ? false }: +{ stdenv +, lib +, fetchurl +, makeWrapper +, cmake +, git +, ftgl +, gl2ps +, glew +, gsl +, libX11 +, libXpm +, libXft +, libXext +, libGLU +, libGL +, libxml2 +, lz4 +, xz +, pcre +, nlohmann_json +, pkg-config +, python +, xxHash +, zlib +, zstd +, libAfterImage +, giflib +, libjpeg +, libtiff +, libpng +, Cocoa +, CoreSymbolication +, OpenGL +, noSplash ? false +}: stdenv.mkDerivation rec { pname = "root"; @@ -14,10 +45,29 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; - buildInputs = [ ftgl gl2ps glew pcre zlib zstd libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng nlohmann_json python.pkgs.numpy ] - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] - ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ] - ; + buildInputs = [ + ftgl + gl2ps + glew + pcre + zlib + zstd + libxml2 + lz4 + xz + gsl + xxHash + libAfterImage + giflib + libjpeg + libtiff + libpng + nlohmann_json + python.pkgs.numpy + ] + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] + ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ] + ; patches = [ ./sw_vers.patch From 202cd8e94b5dfa656687f9b8483bdfcce866bee5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:14:16 +0200 Subject: [PATCH 062/129] python3Packages.angrop: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index aa6f72eae54..e5ab1954276 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.8761"; + version = "9.0.9031"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M/4kEESL9OH4KyPgsrlVzm54OtU28pDox5qtV7Up2ew="; + sha256 = "sha256-3q/3iFR0FFOcvgmNVXtgi1Spu5xfXNJFy+QoIh8amOY="; }; propagatedBuildInputs = [ From 9c1c556dcf5659185c597b8d726b92eba9823f04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Jul 2021 22:51:38 +0200 Subject: [PATCH 063/129] python3Packages.nampa: init at 1.0 --- .../python-modules/nampa/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/nampa/default.nix diff --git a/pkgs/development/python-modules/nampa/default.nix b/pkgs/development/python-modules/nampa/default.nix new file mode 100644 index 00000000000..9f572d141c7 --- /dev/null +++ b/pkgs/development/python-modules/nampa/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, future +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "nampa"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "thebabush"; + repo = pname; + rev = version; + sha256 = "14b6xjm497wrfw4kv24zhsvz2l6zknvx36w8i754hfwz3s3fsl6a"; + }; + + propagatedBuildInputs = [ + future + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + # https://github.com/thebabush/nampa/pull/13 + substituteInPlace setup.py \ + --replace "0.1.1" "${version}" + ''; + + pythonImportsCheck = [ "nampa" ]; + + meta = with lib; { + description = "Python implementation of the FLIRT technology"; + homepage = "https://github.com/thebabush/nampa"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78db6b3db5c..eec04d0e32b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4674,6 +4674,8 @@ in { names = callPackage ../development/python-modules/names { }; + nampa = callPackage ../development/python-modules/nampa { }; + nanoleaf = callPackage ../development/python-modules/nanoleaf { }; nanomsg-python = callPackage ../development/python-modules/nanomsg-python { From 74af8f2d6b62bf4fa504189f68a24b3cb4a361a3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 14 Jul 2021 23:52:27 +0300 Subject: [PATCH 064/129] spotify-unwrapped: add wrapGAppsHook to fix https://github.com/NixOS/nixpkgs/issues/120070 --- pkgs/applications/audio/spotify/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index db0f69c80ab..d81ab4b3ac7 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, openssl, freetype +{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, wrapGAppsHook, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon @@ -82,7 +82,7 @@ stdenv.mkDerivation { sha512 = "dabb55d2ba41f977b6d3f03bfcf147d11785136dd1277efc62011c8371ef25cc04531266bd16608639b9b6a500c1a18a45f44ba7a43e17ab5ac139e36eff7149"; }; - nativeBuildInputs = [ makeWrapper squashfsTools ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; dontStrip = true; dontPatchELF = true; @@ -109,6 +109,9 @@ stdenv.mkDerivation { runHook postUnpack ''; + # Prevent double wrapping + dontWrapGApps = true; + installPhase = '' runHook preInstall @@ -138,6 +141,7 @@ stdenv.mkDerivation { librarypath="${lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ + ''${gappsWrapperArgs[@]} \ --prefix LD_LIBRARY_PATH : "$librarypath" \ --prefix PATH : "${gnome.zenity}/bin" From 8a80d96506f666575c08d86e41830300f9dff43c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Jul 2021 22:53:35 +0200 Subject: [PATCH 065/129] python3Packages.angr: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/angr/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 092d3a53e94..285a125a725 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -13,6 +13,7 @@ , GitPython , itanium_demangler , mulpyplexer +, nampa , networkx , progressbar2 , protobuf @@ -42,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.8761"; + version = "9.0.9031"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-vPqCezHYJP3ue3/J/Pni9jPvSJ+om7nAVgPTU6z5xBE="; + sha256 = "sha256-qWAz9SHfQU0cdk4yVekJn5OIDPJPbi63CDdlHDq1Opw="; }; propagatedBuildInputs = [ @@ -65,6 +66,7 @@ buildPythonPackage rec { GitPython itanium_demangler mulpyplexer + nampa networkx progressbar2 protobuf @@ -83,7 +85,13 @@ buildPythonPackage rec { doCheck = false; # See http://angr.io/api-doc/ - pythonImportsCheck = [ "angr" "claripy" "cle" "pyvex" "archinfo" ]; + pythonImportsCheck = [ + "angr" + "claripy" + "cle" + "pyvex" + "archinfo" + ]; meta = with lib; { description = "Powerful and user-friendly binary analysis platform"; From e88e934dbbddf5a2358234c04e11d0625c515b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 9 Jul 2021 19:45:15 +0200 Subject: [PATCH 066/129] oxen: init at 9.1.3 --- .../applications/blockchains/oxen/default.nix | 67 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 71 insertions(+) create mode 100644 pkgs/applications/blockchains/oxen/default.nix diff --git a/pkgs/applications/blockchains/oxen/default.nix b/pkgs/applications/blockchains/oxen/default.nix new file mode 100644 index 00000000000..6fd91495b47 --- /dev/null +++ b/pkgs/applications/blockchains/oxen/default.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch +, cmake, pkg-config +, boost, openssl, unbound +, pcsclite, readline, libsodium, hidapi +, rapidjson +, curl, sqlite +, trezorSupport ? true +, libusb1 +, protobuf +, python3 +}: + +stdenv.mkDerivation rec { + pname = "oxen"; + version = "9.1.3"; + + src = fetchFromGitHub { + owner = "oxen-io"; + repo = "oxen-core"; + rev = "v${version}"; + sha256 = "11g3wqn0syk47yfcsdql5737kpad8skwdxhifn2yaz9zy8n3xqqb"; + fetchSubmodules = true; + }; + + # Required for static linking, the only supported install path + lbzmqsrc = fetchurl { + url = "https://github.com/zeromq/libzmq/releases/download/v4.3.3/zeromq-4.3.3.tar.gz"; + sha512 = "4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1"; + }; + + postPatch = '' + # remove vendored libraries + rm -r external/rapidjson + sed -i s,/lib/,/lib64/, external/loki-mq/cmake/local-libzmq//LocalLibzmq.cmake + ''; + + postInstall = '' + rm -R $out/lib $out/include + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + boost openssl unbound + pcsclite readline + libsodium hidapi rapidjson + protobuf curl sqlite + ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + # "-DUSE_DEVICE_TREZOR=ON" + # "-DBUILD_GUI_DEPS=ON" + "-DReadline_ROOT_DIR=${readline.dev}" + # It build with shared libs but doesn't install them. Fail. + # "-DBUILD_SHARED_LIBS=ON" + "-DLIBZMQ_TARBALL_URL=${lbzmqsrc}" + ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; + + meta = with lib; { + description = "Private cryptocurrency based on Monero"; + homepage = "https://oxen.io/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.viric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38969dc50f7..9aec30db92e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28347,6 +28347,10 @@ in boost = boost17x; }; + oxen = callPackage ../applications/blockchains/oxen { + boost = boost17x; + }; + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { boost = boost17x; }; From 4d9f1ee6627565a4e0ba526c0e2e9fafda6746ec Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 14 Jul 2021 22:19:35 +0100 Subject: [PATCH 067/129] tektoncd-cli: 0.19.1 -> 0.20.0 --- .../networking/cluster/tektoncd-cli/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index a7778af231d..0db134bdb21 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,20 +2,18 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-duJSTk5LmJWbaVYybZZHWDe8E/ZqZLCCsdPIiH5d/G4="; + sha256 = "sha256-aVR1xNmL6M/m+1znt70vrCtuABCqDz0sDp8mDFI2uIg="; }; vendorSha256 = null; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}") - ''; + ldflags = [ "-s" "-w" "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -27,7 +25,7 @@ buildGoModule rec { # Some tests try to write to the home dir export HOME="$TMPDIR" # Change the golden files to match our desired version - sed -i "s/dev/${version}/" pkg/cmd/version/testdata/TestGetVersions-*.golden + sed -i "s/dev/${version}/" pkg/cmd/version/testdata/{TestGetVersions-,TestGetComponentVersions/}*.golden ''; postInstall = '' @@ -43,8 +41,7 @@ buildGoModule rec { installCheckPhase = '' runHook preInstallCheck $out/bin/tkn --help - # New tkn version functionality outputs empty https://github.com/tektoncd/cli/issues/1389 - # $out/bin/tkn version | grep "Client version: ${version}" + $out/bin/tkn version | grep "Client version: ${version}" runHook postInstallCheck ''; From f969bf1ee30bcf0c45078460a9a87db0f353e225 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Jul 2021 23:21:09 +0200 Subject: [PATCH 068/129] python3Packages.pwntools: 4.5.1 -> 4.6.0 --- pkgs/development/python-modules/pwntools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index e3422aff024..d0ea1b19849 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -27,12 +27,12 @@ let debuggerName = lib.strings.getName debugger; in buildPythonPackage rec { - version = "4.5.1"; + version = "4.6.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "97f945aed7ffa9d3e87f8759df83a5eac6dc2112907f35d0aee66a9bf62fd8eb"; + sha256 = "sha256-FWnmE+XgbtRztgo/xxN2xK1bz1YhbqdywlrQIANHAww="; }; postPatch = '' From 682d097e0f5641d41bee532d8a1d1f9e5bca0eb0 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 14 Jul 2021 22:21:26 +0100 Subject: [PATCH 069/129] open-policy-agent: 0.30.0 -> 0.30.2 --- pkgs/development/tools/open-policy-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 6737f161754..17dc0900fdb 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.30.0"; + version = "0.30.2"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-AjNr+t30ftF92+cEfvt8iHBDVD/SO52ojJRLAkYF9l4="; + sha256 = "sha256-pyqG8k2jHUhYZ1ftfAjxpJ4H1P1uWfqSdGcyR7pw1rE="; }; vendorSha256 = null; From 36f416cc3bfc7f579c6cb7412811fce85455a588 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Jul 2021 23:28:57 +0200 Subject: [PATCH 070/129] python3Packages.pure-python-adb-homeassistant: 0.1.6.dev0 -> 0.1.7.dev0 --- .../pure-python-adb-homeassistant/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix index acb9b73403b..919ab61c60c 100644 --- a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix +++ b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix @@ -4,19 +4,21 @@ }: buildPythonPackage rec { pname = "pure-python-adb-homeassistant"; - version = "0.1.6.dev0"; + version = "0.1.7.dev0"; src = fetchPypi { inherit pname version; - sha256 = "fe6d90220a6880649f6d6df4e707ce5034676710ee6146145ef995f7b769a482"; + sha256 = "sha256-xXXEp8oYGcJLTfoBDUSZrIHSgDvB2EHbVMHoG4Hk+t8="; }; # Disable tests as they require docker, docker-compose and a dedicated # android emulator doCheck = false; + pythonImportsCheck = [ "adb_messenger" ]; + meta = with lib; { - description = "Pure python implementation of the adb client"; + description = "Python implementation of the ADB client"; homepage = "https://github.com/JeffLIrion/pure-python-adb"; license = licenses.mit; maintainers = [ maintainers.makefu ]; From b1d1ecb7f14badc78e8eeb739d9f68e4f61f4eda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Jul 2021 23:35:23 +0200 Subject: [PATCH 071/129] python3Packages.pure-eval: 0.1.0 -> 0.2.1 --- .../python-modules/pure-eval/default.nix | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix index c8fde03d79d..866b2bdcadf 100644 --- a/pkgs/development/python-modules/pure-eval/default.nix +++ b/pkgs/development/python-modules/pure-eval/default.nix @@ -1,8 +1,15 @@ -{ buildPythonPackage, isPy3k, lib, fetchFromGitHub, setuptools-scm, toml, pytest }: +{ lib +, buildPythonPackage +, isPy3k +, fetchFromGitHub +, setuptools-scm +, toml +, pytestCheckHook +}: buildPythonPackage rec { pname = "pure_eval"; - version = "0.1.0"; + version = "0.2.1"; disabled = !isPy3k; @@ -10,15 +17,24 @@ buildPythonPackage rec { owner = "alexmojaki"; repo = pname; rev = "v${version}"; - sha256 = "1d3gpc9mrmwdk6l87x7ll23vwv6l8l2iqvi63r86j7bj5s8m2ci8"; + sha256 = "sha256-+Vucu16NFPtQ23AbBH/cQU+klxp6DMicSScbnKegLZI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ toml ]; + buildInputs = [ + setuptools-scm + ]; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ + toml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pure_eval" ]; meta = with lib; { description = "Safely evaluate AST nodes without side effects"; From 00fd3a9b91e241a4eac8f45bafe95ea25ad04ec6 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 14 Jul 2021 22:38:22 +0100 Subject: [PATCH 072/129] octant: 0.21.0 -> 0.22.0 --- .../applications/networking/cluster/octant/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index dcdf134b26a..dbbf6524871 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "octant"; - version = "0.21.0"; + version = "0.22.0"; src = let @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-Ben2wAquHADWBv1MEfPWxs96pLz1bK2F6bLoYVTSkng="; - aarch64-linux = "sha256-1kK0Gu4cQYk+QDJJJiiDan4SnP3Xjr8nLOBtv26UDV4="; - x86_64-darwin = "sha256-gOkHpUTWKrikKYZmkfgck3Lf3g5Pakcn0i2A9Hd07UE="; - aarch64-darwin = "sha256-Xpl8odVXw4WzF7CEZ+Bbxa6oQDBv9VMzHCNOjIcFGzE="; + x86_64-linux = "sha256-1/vyV6pUqovVpovTYFF4d75wJvtTNdrbLZyjw1lLacA="; + aarch64-linux = "sha256-1duNW0Edj0jrpv/RMrebtZF4ph6j3PXCJ2RFejOopGQ="; + x86_64-darwin = "sha256-Ur5jBPk5hA6cGg+pPf36Ijh94gWEdaWlJK3yCMBYyEU="; + aarch64-darwin = "sha256-RaiXW+MUihk291UWmrf6gLpyrd5stIkhyWNFEQ0daCk="; }; dontConfigure = true; From 3094fba6835b630c7191e7c9e60780270bc96079 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 14 Jul 2021 22:38:40 +0100 Subject: [PATCH 073/129] octant-desktop: 0.21.0 -> 0.22.0 --- pkgs/applications/networking/cluster/octant/desktop.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/octant/desktop.nix b/pkgs/applications/networking/cluster/octant/desktop.nix index 4095a7907eb..e793df71a58 100644 --- a/pkgs/applications/networking/cluster/octant/desktop.nix +++ b/pkgs/applications/networking/cluster/octant/desktop.nix @@ -2,7 +2,7 @@ let pname = "octant-desktop"; - version = "0.21.0"; + version = "0.22.0"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -15,8 +15,8 @@ let src = fetchurl { url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-Woridi8uGsxvccdeaDzVLs+2YrRKUnm3WbX5LhorM1Y="; - x86_64-darwin = "sha256-NF3bm8WFEs4kgrUp+7qCbj6Z6pUMRUp7h4nhJQDJnoY="; + x86_64-linux = "sha256-xMdNoH0UE/KLIQ0DjJfb+ZB/q2F+kyFEncrQ9YYJgE0="; + x86_64-darwin = "sha256-y3fmxrsQ0hCa1wuMiRGHf79kpi25qXv/idKrVT87oc0="; }.${system}; }; From 46e3102da1c4b32937499e7262196d6502c36bdf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Jul 2021 23:49:26 +0200 Subject: [PATCH 074/129] python3Packages.stack-data: 0.0.7 -> 0.1.0 --- .../python-modules/stack-data/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index f529a8a00b0..cbbd3a878d7 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/pkgs/development/python-modules/stack-data/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - pname = "stack_data"; - version = "0.0.7"; + pname = "stack-data"; + version = "0.1.0"; src = fetchFromGitHub { owner = "alexmojaki"; - repo = pname; + repo = "stack_data"; rev = "v${version}"; - sha256 = "148lhxihak8jm5dvryhsiykmn3s4mrlba8ki4dy1nbd8jnz06a4w"; + sha256 = "sha256-dRIRDMq0tc1QuBHvppPwJA5PVGHyVRhoBlX5BsdDzec="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -45,6 +45,14 @@ buildPythonPackage rec { typeguard ]; + disabledTests = [ + # AssertionError + "test_variables" + "test_example" + ]; + + pythonImportsCheck = [ "stack_data" ]; + meta = with lib; { description = "Extract data from stack frames and tracebacks"; homepage = "https://github.com/alexmojaki/stack_data/"; From 668efc9f526272e41901e22fa6e29fb7fc0c59a0 Mon Sep 17 00:00:00 2001 From: Artur Cygan Date: Thu, 15 Jul 2021 00:20:45 +0200 Subject: [PATCH 075/129] python3Packages.crytic-compile: 0.1.13 -> 0.2.0 --- .../development/python-modules/crytic-compile/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index a5ae90c57e3..127e6f92933 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -2,19 +2,15 @@ buildPythonPackage rec { pname = "crytic-compile"; - version = "0.1.13"; + version = "0.2.0"; disabled = pythonOlder "3.6"; - patchPhase = '' - substituteInPlace setup.py --replace 'version="0.1.11",' 'version="${version}",' - ''; - src = fetchFromGitHub { owner = "crytic"; repo = "crytic-compile"; rev = version; - sha256 = "sha256-KJRfkUyUI0M7HevY4XKOtCvU+SFlsJIl3kTIccWfNmw="; + sha256 = "sha256-Kuc7g5+4TIcQTWYjG4uPN0Rxfom/A/xpek5K5ErlbdU="; }; propagatedBuildInputs = [ pysha3 setuptools ]; From 36a247932e1daa76098c0a4130b8e2e08ac8e14f Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 15 Jul 2021 01:33:10 +0300 Subject: [PATCH 076/129] nwg-wrapper: init at 0.0.1 --- .../applications/misc/nwg-wrapper/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/misc/nwg-wrapper/default.nix diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/applications/misc/nwg-wrapper/default.nix new file mode 100644 index 00000000000..9567b051f59 --- /dev/null +++ b/pkgs/applications/misc/nwg-wrapper/default.nix @@ -0,0 +1,41 @@ +{ lib, python3Packages, fetchFromGitHub, gtk-layer-shell, gtk3, gobject-introspection, wrapGAppsHook, wlr-randr }: + +python3Packages.buildPythonPackage rec { + pname = "nwg-wrapper"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = pname; + rev = "v${version}"; + sha256 = "1rpkcjr0chmgsfkan88lsi476bamg9a6y7h0x9zsh60a9rdf7dl8"; + }; + + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + + buildInputs = [ gtk3 gtk-layer-shell ]; + + propagatedBuildInputs = with python3Packages; [ i3ipc pygobject3 ]; + + # ValueError: Namespace GtkLayerShell not available + strictDeps = false; + + # No tests + doCheck = false; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : "${lib.makeBinPath [ wlr-randr ]}" + ) + ''; + + pythonImportsCheck = [ "nwg_wrapper" ]; + + meta = with lib; { + description = "Wrapper to display a script output or a text file content on the desktop in sway or other wlroots-based compositors"; + homepage = "https://github.com/nwg-piotr/nwg-wrapper/"; + license = licenses.mit; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b9f9561022..117f8bd457e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25847,6 +25847,8 @@ in nwg-panel = callPackage ../applications/misc/nwg-panel { }; + nwg-wrapper = callPackage ../applications/misc/nwg-wrapper { }; + ocenaudio = callPackage ../applications/audio/ocenaudio { }; onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; From 6c4e15b2c20ee3a00e5ea93ddb2e7ea56c1aa486 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 15 Jul 2021 06:23:32 +0300 Subject: [PATCH 077/129] flashfocus: 2.2.2 -> 2.2.3 --- pkgs/misc/flashfocus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 2b645817a7e..1bac8b0fe0c 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "flashfocus"; - version = "2.2.2"; + version = "2.2.3"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1z20d596rnc7cs0rrd221gjn14dmbr11djv94y9p4v7rr788sswv"; + sha256 = "0cn44hryvz2wl7xklaslxsb3l2i3f8jkgmml0n9v2ks22j5l4r4h"; }; nativeBuildInputs = with python3.pkgs; [ From e57571bdb6ff5e4938555994aa98f2373083e5f0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 11 Jul 2021 19:30:45 +0200 Subject: [PATCH 078/129] =?UTF-8?q?gappa:=201.3.5=20=E2=86=92=201.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/gappa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix index c7c5c9c6fa7..be1d6f253bc 100644 --- a/pkgs/applications/science/logic/gappa/default.nix +++ b/pkgs/applications/science/logic/gappa/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "gappa-1.4.0"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.4.0.tar.gz"; - sha256 = "sha256-/IDIf5XnFBqVllgH5GtQ6C8g7vxheaVcXNoZiXlsPGA="; + url = "https://gforge.inria.fr/frs/download.php/file/38436/gappa-1.4.0.tar.gz"; + sha256 = "12x42z901pr05ldmparqdi8sq9s7fxbavhzk2dbq3l6hy247dwbb"; }; buildInputs = [ gmp mpfr boost.dev ]; From aee00346d85676cebd22484547d3795c0ca0ac0f Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Thu, 15 Jul 2021 08:37:58 +0200 Subject: [PATCH 079/129] ocamlPackages.bls12-381 (#129509) ocamlPackages.ff: init at 0.4.0 tezos-rust-libs: init at 1.0 ocamlPackages.bls12-381: init at 0.3.15 --- .../libraries/tezos-rust-libs/default.nix | 36 ++++++++++++++++++ .../ocaml-modules/bls12-381/default.nix | 38 +++++++++++++++++++ pkgs/development/ocaml-modules/ff/default.nix | 32 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/ocaml-packages.nix | 4 ++ 5 files changed, 112 insertions(+) create mode 100644 pkgs/development/libraries/tezos-rust-libs/default.nix create mode 100644 pkgs/development/ocaml-modules/bls12-381/default.nix create mode 100644 pkgs/development/ocaml-modules/ff/default.nix diff --git a/pkgs/development/libraries/tezos-rust-libs/default.nix b/pkgs/development/libraries/tezos-rust-libs/default.nix new file mode 100644 index 00000000000..bd406d63245 --- /dev/null +++ b/pkgs/development/libraries/tezos-rust-libs/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitLab, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "tezos-rust-libs"; + version = "1.0"; + + src = fetchFromGitLab { + owner = "tezos"; + repo = "tezos-rust-libs"; + rev = "v${version}"; + sha256 = "1ffkzbvb0ls4wk9205g3xh2c26cmwnl68x43gh6dm9z4xsic94v5"; + }; + + cargoSha256 = "0dgyqfr3dvvdwdi1wvpd7v9j21740jy4zwrwiwknw7csb4bq9wfx"; + + preBuild = '' + mkdir .cargo + mv cargo-config .cargo/config + ''; + + postInstall = '' + mkdir $out/lib/tezos-rust-libs + cp -r rustc-bls12-381/include $out/include + cp $out/lib/librustc_bls12_381.a $out/lib/tezos-rust-libs + cp $out/lib/librustzcash.a $out/lib/tezos-rust-libs + ''; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/tezos/tezos-rust-libs"; + description = "Tezos: all rust dependencies and their dependencies"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix new file mode 100644 index 00000000000..08bb426d8ab --- /dev/null +++ b/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitLab, buildDunePackage, ff, zarith, ctypes, tezos-rust-libs, alcotest }: + +buildDunePackage rec { + pname = "bls12-381"; + version = "0.3.15"; + + src = fetchFromGitLab { + owner = "dannywillems"; + repo = "ocaml-bls12-381"; + rev = version; + sha256 = "1s8n657fsl2gs01p7v2ffpcfzymavifhhpriyx1gq5qh4zvvw4vr"; + }; + useDune2 = true; + + minimalOCamlVersion = "4.08"; + propagatedBuildInputs = [ + ff + zarith + ctypes + tezos-rust-libs + ]; + + checkInputs = [ + alcotest + ]; + + # This is a hack to work around the hack used in the dune files + OPAM_SWITCH_PREFIX = "${tezos-rust-libs}"; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381"; + description = "OCaml binding for bls12-381 from librustzcash"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ff/default.nix b/pkgs/development/ocaml-modules/ff/default.nix new file mode 100644 index 00000000000..2a51b377e88 --- /dev/null +++ b/pkgs/development/ocaml-modules/ff/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitLab, buildDunePackage, zarith, alcotest }: + +buildDunePackage rec { + pname = "ff"; + version = "0.4.0"; + + src = fetchFromGitLab { + owner = "dannywillems"; + repo = "ocaml-ff"; + rev = version; + sha256 = "1ik29srzkd0pl48p1si9p1c4f8vmx5rgm02yv2arj3vg0a1nfhdv"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + zarith + ]; + + checkInputs = [ + alcotest + ]; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/dannywillems/ocaml-ff"; + description = "OCaml implementation of Finite Field operations"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b9f9561022..a0c734e2da3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1979,6 +1979,8 @@ in tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { }; + tezos-rust-libs = callPackage ../development/libraries/tezos-rust-libs { }; + behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; bfetch = callPackage ../tools/misc/bfetch { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 31ef92e4204..7b12fbbd3a6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -78,6 +78,8 @@ let bitv = callPackage ../development/ocaml-modules/bitv { }; + bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { }; + bolt = callPackage ../development/ocaml-modules/bolt { }; bos = callPackage ../development/ocaml-modules/bos { }; @@ -371,6 +373,8 @@ let fdkaac = callPackage ../development/ocaml-modules/fdkaac { }; + ff = callPackage ../development/ocaml-modules/ff { }; + fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { }; fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { }; From d873c3d4dce60a37624557d0c44522d429d3dabd Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 30 Jun 2021 19:30:50 +0200 Subject: [PATCH 080/129] nodePackages: Add jsonplaceholder --- pkgs/development/node-packages/default.nix | 13 +++++++++++++ pkgs/development/node-packages/node-packages.json | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 5c99ceab208..0ee37197e82 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -107,6 +107,19 @@ let nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ]; }); + jsonplaceholder = super.jsonplaceholder.override (drv: { + buildInputs = [ nodejs ]; + postInstall = '' + exe=$out/bin/jsonplaceholder + mkdir -p $out/bin + cat >$exe < Date: Thu, 15 Jul 2021 09:34:54 +0200 Subject: [PATCH 081/129] ocamlPackages.resto: init at 0.6.1 (#129522) ocamlPackages.resto: init at 0.6.1 ocamlPackages.resto-acl: init at 0.6.1 ocamlPackages.resto-json: init at 0.6.1 ocamlPackages.resto-directory: init at 0.6.1 ocamlPackages.resto-cohttp: init at 0.6.1 ocamlPackages.ezresto: init at 0.6.1 ocamlPackages.ezresto-directory: init at 0.6.1 ocamlPackages.resto-cohttp-server: init at 0.6.1 ocamlPackages.resto-cohttp-client: init at 0.6.1 ocamlPackages.resto-cohttp-self-serving-client: init at 0.6.1 --- pkgs/development/ocaml-modules/resto/acl.nix | 13 +++++++++ .../ocaml-modules/resto/cohttp-client.nix | 20 +++++++++++++ .../resto/cohttp-self-serving-client.nix | 27 ++++++++++++++++++ .../ocaml-modules/resto/cohttp-server.nix | 25 +++++++++++++++++ .../ocaml-modules/resto/cohttp.nix | 12 ++++++++ .../ocaml-modules/resto/default.nix | 28 +++++++++++++++++++ .../ocaml-modules/resto/directory.nix | 11 ++++++++ .../ocaml-modules/resto/ezresto-directory.nix | 13 +++++++++ .../ocaml-modules/resto/ezresto.nix | 12 ++++++++ pkgs/development/ocaml-modules/resto/json.nix | 12 ++++++++ pkgs/top-level/ocaml-packages.nix | 12 ++++++++ 11 files changed, 185 insertions(+) create mode 100644 pkgs/development/ocaml-modules/resto/acl.nix create mode 100644 pkgs/development/ocaml-modules/resto/cohttp-client.nix create mode 100644 pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix create mode 100644 pkgs/development/ocaml-modules/resto/cohttp-server.nix create mode 100644 pkgs/development/ocaml-modules/resto/cohttp.nix create mode 100644 pkgs/development/ocaml-modules/resto/default.nix create mode 100644 pkgs/development/ocaml-modules/resto/directory.nix create mode 100644 pkgs/development/ocaml-modules/resto/ezresto-directory.nix create mode 100644 pkgs/development/ocaml-modules/resto/ezresto.nix create mode 100644 pkgs/development/ocaml-modules/resto/json.nix diff --git a/pkgs/development/ocaml-modules/resto/acl.nix b/pkgs/development/ocaml-modules/resto/acl.nix new file mode 100644 index 00000000000..7ac05cd62da --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/acl.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, resto, uri }: + +buildDunePackage { + pname = "resto-acl"; + inherit (resto) src version meta useDune2 doCheck; + + minimalOCamlVersion = "4.05"; + + propagatedBuildInputs = [ + resto + uri + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/cohttp-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-client.nix new file mode 100644 index 00000000000..2dc651045ba --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/cohttp-client.nix @@ -0,0 +1,20 @@ +{ buildDunePackage +, resto +, resto-directory +, resto-cohttp +, uri +, lwt +}: + +buildDunePackage { + pname = "resto-cohttp-client"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + resto-directory + resto-cohttp + uri + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix new file mode 100644 index 00000000000..88f2ef25e6a --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix @@ -0,0 +1,27 @@ +{ lib +, buildDunePackage +, resto +, resto-directory +, resto-acl +, resto-cohttp +, resto-cohttp-client +, resto-cohttp-server +, uri +, lwt +}: + +buildDunePackage { + pname = "resto-cohttp-self-serving-client"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + resto-directory + resto-acl + resto-cohttp + resto-cohttp-client + resto-cohttp-server + uri + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/cohttp-server.nix b/pkgs/development/ocaml-modules/resto/cohttp-server.nix new file mode 100644 index 00000000000..61a5d93e9fc --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/cohttp-server.nix @@ -0,0 +1,25 @@ +{ lib +, buildDunePackage +, resto +, resto-directory +, resto-acl +, resto-cohttp +, cohttp-lwt-unix +, conduit-lwt-unix +, lwt +}: + +buildDunePackage { + pname = "resto-cohttp-server"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + resto-directory + resto-acl + resto-cohttp + cohttp-lwt-unix + conduit-lwt-unix + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/cohttp.nix b/pkgs/development/ocaml-modules/resto/cohttp.nix new file mode 100644 index 00000000000..c29e589057c --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/cohttp.nix @@ -0,0 +1,12 @@ +{ buildDunePackage, resto, resto-directory, cohttp-lwt }: + +buildDunePackage { + pname = "resto-cohttp"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + resto-directory + cohttp-lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix new file mode 100644 index 00000000000..13d55b1af21 --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitLab, buildDunePackage, uri }: + +buildDunePackage rec { + pname = "resto"; + version = "0.6.1"; + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = "resto"; + rev = "v${version}"; + sha256 = "13h3zga7h2jhgbyda1q53szbpxcz3vvy3c51mlqk3jh9jq2wrn87"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + uri + ]; + + # resto has infinite recursion in their tests + doCheck = false; + + meta = { + description = "A minimal OCaml library for type-safe HTTP/JSON RPCs"; + homepage = "https://gitlab.com/nomadic-labs/resto"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/resto/directory.nix b/pkgs/development/ocaml-modules/resto/directory.nix new file mode 100644 index 00000000000..7539bf98ffd --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/directory.nix @@ -0,0 +1,11 @@ +{ lib, buildDunePackage, resto, resto-json, lwt }: + +buildDunePackage { + pname = "resto-directory"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/ezresto-directory.nix b/pkgs/development/ocaml-modules/resto/ezresto-directory.nix new file mode 100644 index 00000000000..fa208cc3fbb --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/ezresto-directory.nix @@ -0,0 +1,13 @@ +{ buildDunePackage, resto, resto-directory, ezresto, lwt }: + +buildDunePackage { + pname = "ezresto-directory"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + ezresto + resto-directory + resto + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/ezresto.nix b/pkgs/development/ocaml-modules/resto/ezresto.nix new file mode 100644 index 00000000000..8b3b2c6cd71 --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/ezresto.nix @@ -0,0 +1,12 @@ +{ lib, buildDunePackage, resto, resto-json, uri }: + +buildDunePackage { + pname = "ezresto"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + uri + resto + resto-json + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/json.nix b/pkgs/development/ocaml-modules/resto/json.nix new file mode 100644 index 00000000000..e861cac6d31 --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/json.nix @@ -0,0 +1,12 @@ +{ lib, buildDunePackage, resto, json-data-encoding, json-data-encoding-bson }: + +buildDunePackage { + pname = "resto-json"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + json-data-encoding + json-data-encoding-bson + ]; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7b12fbbd3a6..53dc64729e1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1163,6 +1163,18 @@ let reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { }); + ezresto = callPackage ../development/ocaml-modules/resto/ezresto.nix { }; + ezresto-directory = callPackage ../development/ocaml-modules/resto/ezresto-directory.nix { }; + + resto = callPackage ../development/ocaml-modules/resto { }; + resto-acl = callPackage ../development/ocaml-modules/resto/acl.nix { }; + resto-cohttp = callPackage ../development/ocaml-modules/resto/cohttp.nix { }; + resto-cohttp-client = callPackage ../development/ocaml-modules/resto/cohttp-client.nix { }; + resto-cohttp-self-serving-client = callPackage ../development/ocaml-modules/resto/cohttp-self-serving-client.nix { }; + resto-cohttp-server = callPackage ../development/ocaml-modules/resto/cohttp-server.nix { }; + resto-directory = callPackage ../development/ocaml-modules/resto/directory.nix { }; + resto-json = callPackage ../development/ocaml-modules/resto/json.nix { }; + rope = callPackage ../development/ocaml-modules/rope { }; routes = callPackage ../development/ocaml-modules/routes { }; From 204f7dc3350f0b5c97b236c3fff0f65002c857f6 Mon Sep 17 00:00:00 2001 From: Daniel Hines Date: Thu, 15 Jul 2021 03:52:14 -0400 Subject: [PATCH 082/129] ocamlPackages.irmin: 2.6.0 -> 2.7.1 (#129434) * ocamlPackages.irmin: 2.6.0 -> 2.7.1 https://github.com/mirage/irmin/releases/tag/2.7.1 * ocamlPackages.index: 1.3.1 -> 1.4.0 https://github.com/mirage/index/releases/tag/1.4.0 * ocamlPackages.repr: 0.3.0 -> 0.4.0 https://github.com/mirage/repr/releases/tag/0.4.0 Co-authored-by: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> --- pkgs/development/ocaml-modules/index/default.nix | 7 ++++--- pkgs/development/ocaml-modules/irmin/pack.nix | 4 ++-- pkgs/development/ocaml-modules/irmin/ppx.nix | 4 ++-- pkgs/development/ocaml-modules/repr/default.nix | 4 ++-- pkgs/development/ocaml-modules/repr/ppx.nix | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index 61ecb65510c..8e503f5ddd2 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -1,16 +1,16 @@ { lib, fetchurl, buildDunePackage , repr, ppx_repr, fmt, logs, mtime, stdlib-shims -, cmdliner, progress, semaphore-compat +, cmdliner, progress, semaphore-compat, optint , alcotest, crowbar, re }: buildDunePackage rec { pname = "index"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "sha256-ycZi/TFLoGRloSpjYqH5FCHWP3eyiTCIDLESEn5inuI="; + sha256 = "13xd858c50fs651p1y8x70323ff0gzbf6zgc0a25f6xh3rsmkn4c"; }; minimumOCamlVersion = "4.08"; @@ -28,6 +28,7 @@ buildDunePackage rec { progress repr semaphore-compat + optint ]; checkInputs = [ diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index 16ef675c1f8..5955dda8ed9 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage -, alcotest-lwt, index, irmin, irmin-layers, irmin-test, ocaml_lwt, fpath +, alcotest-lwt, index, irmin, irmin-layers, irmin-test, ocaml_lwt, fpath, optint }: buildDunePackage rec { @@ -12,7 +12,7 @@ buildDunePackage rec { useDune2 = true; buildInputs = [ fpath ]; - propagatedBuildInputs = [ index irmin irmin-layers ocaml_lwt ]; + propagatedBuildInputs = [ index irmin irmin-layers ocaml_lwt optint ]; checkInputs = [ alcotest-lwt irmin-test ]; diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index c7eed70d9d9..673238843ff 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "1db134221e82c424260a0e206b640fcb82902be35eea4137af2bcd9c98d3ac0f"; + sha256 = "fac7c032f472fb369378ad2d8fe77e7cd3b3c1c6a0d7bf59980b69528891b399"; }; minimumOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/repr/default.nix b/pkgs/development/ocaml-modules/repr/default.nix index cd7e1e014e4..282d24d9b73 100644 --- a/pkgs/development/ocaml-modules/repr/default.nix +++ b/pkgs/development/ocaml-modules/repr/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "repr"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-fuzz-${version}.tbz"; - sha256 = "sha256-2b0v5RwutvyidzEDTEb5p33IvJ+3t2IW+KVxYD1ufXQ="; + sha256 = "1kpwgncyxcrq90dn7ilja7c5i88whc3fz4fmq1lwr0ar95d7d48p"; }; minimumOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/repr/ppx.nix b/pkgs/development/ocaml-modules/repr/ppx.nix index 7ef2c55c2c2..561015254d7 100644 --- a/pkgs/development/ocaml-modules/repr/ppx.nix +++ b/pkgs/development/ocaml-modules/repr/ppx.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, ppx_deriving, ppxlib, repr, alcotest, hex }: +{ lib, buildDunePackage, ppx_deriving, ppxlib, repr, alcotest, hex }: buildDunePackage { pname = "ppx_repr"; From b9cb6066f750243fd181973c731c5fba5ba8f229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Thu, 15 Jul 2021 15:11:37 +0700 Subject: [PATCH 083/129] flare: 1.12rc1 -> 1.12rc2 --- pkgs/games/flare/default.nix | 2 +- pkgs/games/flare/desktop.patch | 15 +++++++++++++++ pkgs/games/flare/engine.nix | 6 ++++-- pkgs/games/flare/game.nix | 4 ++-- 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 pkgs/games/flare/desktop.patch diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix index 3ecade9b97e..ec06933b200 100644 --- a/pkgs/games/flare/default.nix +++ b/pkgs/games/flare/default.nix @@ -1,7 +1,7 @@ { lib, buildEnv, callPackage, makeWrapper, Cocoa }: buildEnv { - name = "flare-1.12rc1"; + name = "flare-1.12rc2"; paths = [ (callPackage ./engine.nix { inherit Cocoa; }) diff --git a/pkgs/games/flare/desktop.patch b/pkgs/games/flare/desktop.patch new file mode 100644 index 00000000000..1ef3c21d010 --- /dev/null +++ b/pkgs/games/flare/desktop.patch @@ -0,0 +1,15 @@ +diff --git a/distribution/flare.desktop.in b/distribution/flare.desktop.in +index c740e2a6..eef91a89 100644 +--- a/distribution/flare.desktop.in ++++ b/distribution/flare.desktop.in +@@ -14,8 +14,8 @@ Comment[fr]=Un jeu de rôle d'action monojoueur en 2D isométrique + Comment[gl]=Xogo individual de acción e rol cunha vista isométrica en dúas dimensións. + Comment[ru]=Изометрический ролевой боевик для одного игрока + Comment[uk]=Ізометричний рольовий екшн (Action/RPG) для одного гравця +-TryExec=@FLARE_EXECUTABLE_PATH@ +-Exec=@FLARE_EXECUTABLE_PATH@ ++TryExec=flare ++Exec=flare + Categories=Game;RolePlaying; + Icon=flare + Terminal=false diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix index 9104195febc..1f1f35a3762 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { pname = "flare-engine"; - version = "1.12rc1"; + version = "1.12rc2"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "0bl5vayf87y2jd6b1w4nn7pbrhix6dj86xv5kzqxz6b2y65lq73p"; + sha256 = "10il9dpbcka1w5glmhv48bqwww44csmhq426lvsc7z84444gvvgq"; }; + patches = [ ./desktop.patch ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ] ++ lib.optional stdenv.isDarwin Cocoa; diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix index 7eae29f84d1..10e27b4d39c 100644 --- a/pkgs/games/flare/game.nix +++ b/pkgs/games/flare/game.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flare-game"; - version = "1.12rc1"; + version = "1.12rc2"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "1i2fa2hds5ph8gf5b9647vrn7ycz2fl9xaaaybz8yrjmnpx27bzc"; + sha256 = "0k9fnbaqfgmih8bd0sh3kbk6f6v74i95wrbkij48gp48pq8yqbf9"; }; nativeBuildInputs = [ cmake ]; From 0637e4c7c665ed148632e561dbf861f75304bae9 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 15 Jul 2021 08:10:40 +0000 Subject: [PATCH 084/129] linux: 4.4.274 -> 4.4.275 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9a5dcb7e1ad..5b7050b7069 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.274"; + version = "4.4.275"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1n4wawk8fi5s22177994vq9hzay49cackdabl9r1x8y2i9jcqmg4"; + sha256 = "1aiwq6019sibsw5smj6ii28cr64dv24c19k4n8c09nakhmhcg94i"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From aa445dcd9a5ff5a2a5af570c3c6c6bf5b7bf0810 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 15 Jul 2021 08:10:48 +0000 Subject: [PATCH 085/129] linux: 4.9.274 -> 4.9.275 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index a4d57135e4a..71a5f5eec31 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.274"; + version = "4.9.275"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0xdi33f25lbpplx36cz7chdsn7a6xdjvwxgvnmvrw7b2y0g45m95"; + sha256 = "08mz7mzmhk5n1gwadrc5fw8s40jk0rayvdpjcricl4sv56574lb6"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From d2f67b4efb0f7104ab0d9bc1cd53900140391fe0 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 15 Jul 2021 08:11:24 +0000 Subject: [PATCH 086/129] linux: 5.13.1 -> 5.13.2 --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index c13b37a74aa..da90ee69de8 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.1"; + version = "5.13.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "140a9ngzlarin84mnnwgx6z3ckw431d578aixxl60ll5853gdakj"; + sha256 = "0dx9khk7fh003xyb3xix0kc0rmjncg7ric5p830zhadnrw4hv563"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From 2913c538914377c93225af91f5a41ac62fb7a34c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 15 Jul 2021 08:12:12 +0000 Subject: [PATCH 087/129] linux-rt_5_4: 5.4.123-rt59 -> 5.4.129-rt61 --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index ec3aa7f7006..4c49dc9c42a 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.123-rt59"; # updated by ./update-rt.sh + version = "5.4.129-rt61"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1pi223dls52piw65s3v4ml23wdyy73xpbdvp511187b6zgzk7zlf"; + sha256 = "1ps64gx85lmbriq445hd2hcv4g4b1d1cwf4r3nd90x6i2cj4c9j4"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1m1mnmk7h35p7dv6mg3pla6pw3b645hbbccjmp1jc3fyn6qiy6fq"; + sha256 = "0b3hp6a7afkjqd7an4hj423nq6flwzd42kjcyk4pifv5fx6c7pgq"; }; }; in [ rt-patch ] ++ kernelPatches; From 26af402042644205fd8369fb63b5b62bdf4d8df0 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 15 Jul 2021 08:12:22 +0000 Subject: [PATCH 088/129] linux_latest-libre: 18132 -> 18165 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 76b5c1cf146..65632456963 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18132"; - sha256 = "01mgpfx5cddq4bgffydkxpm3xlgf7zfjr1c1icsyn7f2pibd114q"; + rev = "18165"; + sha256 = "17birwp6byxr4yb8cbc0afssli84ds1p2sisjl4g6rx3r7yqvsxn"; } , ... }: From d980856325f12312746880e73de10ddefc49951b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 15 Jul 2021 10:37:02 +0200 Subject: [PATCH 089/129] nodePackages: Regenerate --- .../node-packages/node-packages.nix | 1779 ++++++++++++----- 1 file changed, 1296 insertions(+), 483 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f8d14701048..8f5537d1b2b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1201.1" = { + "@angular-devkit/architect-0.1201.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1201.1"; + version = "0.1201.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.1.tgz"; - sha512 = "n7ycxrIPbtnV7q8PH5Uvs8Jd++u6hWUiB+8EUxznSfdHGA+fE7TTnJTkc27LoMlYZAImc/Axp/uyYZ6Awt72ZQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.2.tgz"; + sha512 = "hR5kI03WoeEY9dkAsQNLlhL1iEFC2L77ansaKquN+HCAeOGHby4w95suSlZUAg0r6ZhPhPH0tkIRZXU9NMa09g=="; }; }; "@angular-devkit/core-12.0.5" = { @@ -76,6 +76,15 @@ let sha512 = "z5+O3ugXbo8djKPjUtf/UfnYCmco2K1LVhQ6cWLhKi3NKRBiHeNmZh5nAycqFD8/Q+oI/+Ao40MkmkK1Tq0jsw=="; }; }; + "@angular-devkit/core-12.1.2" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "12.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.2.tgz"; + sha512 = "TeaRbvsNEeAkRJcIBlT6yUNh0vaVVBGBYfXYFIMg/I04ex/HI0ApEowu78GeTzCqlE0r4t+WaGT46m7+NIljKg=="; + }; + }; "@angular-devkit/schematics-12.0.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -94,6 +103,15 @@ let sha512 = "oRsvlhJQLXkGWdJvArOby+G4j8UX2uCHwrN4EC1hXUKs84UsD+UATYOAh4h2auy+I+sdrmELUaHwdI4wdKpqnw=="; }; }; + "@angular-devkit/schematics-12.1.2" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "12.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.2.tgz"; + sha512 = "/UGcAJChq+g7wf46Exr5iIyuVw3j4TxTIntTpuKg/z/xf9Y+8mzJAZgGittu/yFcHAJ9aYcOHctffrfEdV7QSA=="; + }; + }; "@angular-devkit/schematics-cli-12.1.1" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; @@ -2272,22 +2290,22 @@ let sha512 = "i2YECSldnkzPAhVmrxksuKSbqBKfMbHrexGqDJm7dy6KoIx+JSilbA5Lz0YNhA7VEgCy1X01GHlWBvqhCNQW8g=="; }; }; - "@fluentui/font-icons-mdl2-8.1.5" = { + "@fluentui/font-icons-mdl2-8.1.6" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.1.5"; + version = "8.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.5.tgz"; - sha512 = "xwjLgoT6pl2EIWEIOsR3rc36isN5vjRLt4gYxKY3cmYCjjpkgCsOtxXtDsd9ck6JR0lr6cPIDp8O3Y1R8YILvQ=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.6.tgz"; + sha512 = "tNAaX72NQYbvR9zeiOiVQBQhYtVgPUgh68LKTGywuYGc2WffBu20Xk9wII8iLGmAijLI1QClaCQxaRAL0IkfBA=="; }; }; - "@fluentui/foundation-legacy-8.1.5" = { + "@fluentui/foundation-legacy-8.1.6" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.1.5"; + version = "8.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.5.tgz"; - sha512 = "tzsCaowUqyxsvB/MORaHbpkIBvftrr5ERtAJbr6ZZmLNWkQ4r7UOVTZk608/ZHn4L/ZEKKespgYzSWshriqDPw=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.6.tgz"; + sha512 = "TJzUFcpfcJefXNmTOAJBKgIlQXDPw/dIcpO9l2nBfORvy4RnrJK4QjpdJPp5XOhDPtDVjlKPB1WvavoRkPRrbg=="; }; }; "@fluentui/keyboard-key-0.2.17" = { @@ -2317,13 +2335,13 @@ let sha512 = "5vZUyXnbOb9M1rMLzQ7Kj5uadHgSTsp3gv0xDv6bfPvzB9RgQa3dEuJ6TA34tLezw8sFYuA6NnKd57nlb4aXMA=="; }; }; - "@fluentui/react-7.173.0" = { + "@fluentui/react-7.173.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.173.0"; + version = "7.173.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.173.0.tgz"; - sha512 = "ngJG5ES3vbI9/gZKgTyJo7gpwBe/UDHT6Hhs7TJyKLd+h2mQaZ60PZjlIMVtrkCaCVVkY+sSE3rV/goyYSFrQQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.173.1.tgz"; + sha512 = "+6PB+CwwL2GNHy4GrDR6871ng7A7FRGXSHQzGqfeLq7Dr7vjO82fGuIsrIaFO1Ry1lug6c41uC5Bon/mKcs1KQ=="; }; }; "@fluentui/react-8.22.0" = { @@ -2344,13 +2362,13 @@ let sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg=="; }; }; - "@fluentui/react-focus-8.1.6" = { + "@fluentui/react-focus-8.1.8" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.1.6"; + version = "8.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.6.tgz"; - sha512 = "OJeFOGlvDCh/PHVz+IWEQo8ls0viNgFF0qQAp8KAPZxxxhsIkGkVRkMhj1rMtfub0dZlqP6QxjmjX22bQfzu9A=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.8.tgz"; + sha512 = "EUI1TZwM7T2keNEjqIAkeV9ALMlLjz7abqHk0AypKJG3v4YPQHycal37KAHQb+gdVJX2hjVQLxynI1yrquKFUw=="; }; }; "@fluentui/react-hooks-8.2.4" = { @@ -2389,13 +2407,13 @@ let sha512 = "QYLFBnwa6xJj0phEy6r+iO5bXWXxkhS1uNngUwfWsHaTskDa4PXDDdjZAXjTVV935xqmoM4GZhZk+Tcoe/OaXA=="; }; }; - "@fluentui/style-utilities-8.1.5" = { + "@fluentui/style-utilities-8.2.0" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.1.5"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.1.5.tgz"; - sha512 = "2MUjnVGuEAheGpnszmbWktxd5Haay8RsY2Y4patzFJcuFuK8ttk8m7Ghd0a5yDTz4BLRQjNLtjmj0ns1LJBFSw=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.2.0.tgz"; + sha512 = "gdAgBnevDOHbgqAKCaQG4CXN6dONMg8BRSZNqha0I9WdgLJy7F7t4xVo8elPjlDUP72ciYT8J9Z/YNljZzbE0w=="; }; }; "@fluentui/theme-1.7.4" = { @@ -2461,13 +2479,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.15.1" = { + "@google-cloud/pubsub-2.16.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.15.1"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.15.1.tgz"; - sha512 = "avBYmN1n9BsY8RzntkEP3SG1gSfEm0iOoUwoWjtrmWAk+6QZw0C093HJCGClteo+EwIQDhgyn2cXc5QInegSeg=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.0.tgz"; + sha512 = "1cZveyznm9qHXzRqlbS3GLeDiaFp8JVN6Urkrt5hgJGWP/IY9kxuJ0ZCnCeZE4x9O/+a5hWgKaQtBKseJYw//Q=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2614,6 +2632,15 @@ let sha512 = "AxtZcm0mArQhY9z8T3TynCYVEaSKxNCa9mVhVwBCUnsuUEe8Zn94bPYYKVQSLt+hJJ1y0ukr3mUvtWfcATL/IQ=="; }; }; + "@grpc/grpc-js-1.3.5" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.5.tgz"; + sha512 = "V29L2QNKkLWM3bcJfVFMSo+Z7kkO8A1s7MAfdzBXLYEC1PE5/M0n1iXBDiD5aUtyVLh5GILcbme2bGtIHl0FMQ=="; + }; + }; "@grpc/proto-loader-0.6.2" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -3964,13 +3991,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.192" = { + "@microsoft/load-themed-styles-1.10.195" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.192"; + version = "1.10.195"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.192.tgz"; - sha512 = "JeNt/3Wf/GzU731Zfrw64t5Nc4u2Weh2ANnKNXk0S6Eln1zrqSTMJhoXErwCTTBs4XW+I6d8W+k5XTtQh3f0aA=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.195.tgz"; + sha512 = "KDCKYsdIo3/ivmu4kzn/LmdttAOwz/bU2C1KywyKy8jHuTj/gU9LBD2htDNGbHQgKObOuqGTpUNNVpVe92Gghw=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4045,13 +4072,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-15.11.0" = { + "@netlify/build-15.11.4" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "15.11.0"; + version = "15.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-15.11.0.tgz"; - sha512 = "Sw4AGRGJUPzBJMNsvJUWjmr60rlWB1GYiynmTlI/qhUnjB2LgnP7bZLMFDTiHbfgigiK7WEV3NObqNEbE1r8CA=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-15.11.4.tgz"; + sha512 = "iSTIJgj7l/lnudqTmTj3cNPQLFVxKoZZNR09vUxRe8yDd1eFcgaYZBt15UZf4DBcwxsyS0tuz4vSLbpC/gR/VQ=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -4081,22 +4108,22 @@ let sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="; }; }; - "@netlify/framework-info-5.7.0" = { + "@netlify/framework-info-5.7.2" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.7.0"; + version = "5.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.7.0.tgz"; - sha512 = "9uPUtRM+vwpCR+JYQiRorAw9nWVZRHfvrlbu4aowLCIkHXeQPo8IsT2++z+6zK72E5IJDKF01Qqv6uZ/Y6se9w=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.7.2.tgz"; + sha512 = "5yO26VRpeXmXorl1kNYbXxgFsJSNcrDaQVnAT9XPqZ5mb7vtjEP/ddEHkNpDsYBj/Y8VBPCvkPhDizg7UPenSw=="; }; }; - "@netlify/functions-utils-1.4.4" = { + "@netlify/functions-utils-1.4.6" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.4.4"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.4.4.tgz"; - sha512 = "2PmAPz4QevLXgwQV13+9zbfGlqP6pebaYS25lhEdXQHk7PCKu9/ejNMdCqZg68jOF3lQ/D86HSluy3vhBXgYGg=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.4.6.tgz"; + sha512 = "i/tu8kQ4yzPc68UFNbziMxYaGVTRO6vo5T80oMJaTwdATX2GePljImxfc8/wK9JkwVSpCd1xREKrbu3r5mYoLA=="; }; }; "@netlify/git-utils-1.0.11" = { @@ -4126,13 +4153,13 @@ let sha512 = "shUFM+l1ALeGCgy4Lag2wQzOD3zcHW0+HFdWXCRsvtjHdNwTMBnbYg7ztnWurwgMthwiQ1jiTmWr8hFrui7Vng=="; }; }; - "@netlify/plugins-list-2.19.1" = { + "@netlify/plugins-list-2.19.2" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.19.1"; + version = "2.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.19.1.tgz"; - sha512 = "7en2ywbQUbAX1j8AKMqoWOij1hcTSRPIdaK7FXbQvaMYfl8INDN9QwvzvQy9D9CsZ/eWF13RHYx/4y592XXz3Q=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.19.2.tgz"; + sha512 = "b1HONWSfqmkSExpelWjonK1plrKwoYxITXFZ0GnS8v3Ek+C8md+e4CvXVBnTCKEpqgERaiG6LQA9H8Tkm6nk5g=="; }; }; "@netlify/routing-local-proxy-0.30.2" = { @@ -4153,13 +4180,22 @@ let sha512 = "YFi1Sf+ktQICS3tAKu7/uiGzLXgi8RNVwH9naUkziXwXQNH2oxDhKgy0/Zv5Nw0zMDJyKWrJ3xObWEC57mJ/KA=="; }; }; - "@netlify/zip-it-and-ship-it-4.12.0" = { + "@netlify/zip-it-and-ship-it-4.13.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.12.0"; + version = "4.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.12.0.tgz"; - sha512 = "LV64orYCV7EYLLXPZvYPKwkCRroXuwfGmaq6gnktN4Ey1NoIVTOySFBIuin90i9Le3bWEHE/WLBnw52ohcPYtw=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.13.0.tgz"; + sha512 = "hBl/ipIv8nWBmza466rNUxZzjX9Ly0pUZZQCkdagLPuWD5JS98F7H5PmMEsqifFrOZQRP55MPVmqFlpV5FM9+g=="; + }; + }; + "@netlify/zip-it-and-ship-it-4.13.1" = { + name = "_at_netlify_slash_zip-it-and-ship-it"; + packageName = "@netlify/zip-it-and-ship-it"; + version = "4.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.13.1.tgz"; + sha512 = "F8ow71Zz3Kvuj/5V1X8N5gTjFfrcGYaQoLgUk4PrHYnrLH32vMQ9769uxazCl69wm5JAdQE5gfpsey9YymUBOw=="; }; }; "@node-red/editor-api-1.3.5" = { @@ -4252,13 +4288,13 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/arborist-2.6.4" = { + "@npmcli/arborist-2.7.0" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "2.6.4"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.6.4.tgz"; - sha512 = "A/pDQ/VZpdxaqsQS5XOWrhrPuC+ER7HLq+4ZkEmnO2yo/USFCWEsiUPYKhfY+sWXK3pgKjN7B7CEFmAnSoAt3g=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.7.0.tgz"; + sha512 = "wWYXW3aGdLygc5b1MGEMliVZ1fEQb8zAtz7PuIwb0gHoc1u9X3RItpIomvA4zCQsVWrlFYnQHc87aAvlD08Ekg=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -4513,13 +4549,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-8.2.1" = { + "@octokit/openapi-types-8.3.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "8.2.1"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-8.2.1.tgz"; - sha512 = "BJz6kWuL3n+y+qM8Pv+UGbSxH6wxKf/SBs5yzGufMHwDefsa+Iq7ZGy1BINMD2z9SkXlIzk1qiu988rMuGXEMg=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-8.3.0.tgz"; + sha512 = "ZFyQ30tNpoATI7o+Z9MWFUzUgWisB8yduhcky7S4UYsRijgIGSnwUKzPBDGzf/Xkx1DuvUtqzvmuFlDSqPJqmQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4585,13 +4621,13 @@ let sha512 = "Kn6WrI2ZvmAztdx+HEaf88RuJn+LK72S8g6OpciE4kbZddAN84fu4fiPGxcEu052WmqKVnA/cnQsbNlrYC6rqQ=="; }; }; - "@octokit/types-6.18.1" = { + "@octokit/types-6.19.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.18.1"; + version = "6.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.18.1.tgz"; - sha512 = "5YsddjO1U+xC8ZYKV8yZYebW55PCc7qiEEeZ+wZRr6qyclynzfyD65KZ5FdtIeP0/cANyFaD7hV69qElf1nMsQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.19.0.tgz"; + sha512 = "9wdZFiJfonDyU6DjIgDHxAIn92vdSUBOwAXbO2F9rOFt6DJwuAkyGLu1CvdJPphCbPBoV9iSDMX7y4fu0v6AtA=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -5305,13 +5341,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.1.1" = { + "@schematics/angular-12.1.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.1.1"; + version = "12.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.1.tgz"; - sha512 = "ukSKoAWfXt28TiHlRrEzKFW63V3jroRF3xnBKtsaL3AZ4MVJiHzOWXkzDAZBaEOLUH/l6Xhm64NMgOqMEAg1rQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.2.tgz"; + sha512 = "nnFPp9uHLinP05r9TFsWT+fwlbwbLHg3yzJr+0aIOX1OsZQFV8hblEFEqdzFQJyx1uGMp4nvBHvCUlYv9GVQLg=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5341,13 +5377,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.13.3" = { + "@serverless/components-3.13.4" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.13.3"; + version = "3.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.13.3.tgz"; - sha512 = "pG7XgMbMO8x+XbnG7RJ5WIBoZTG+6PMZsOSVF1ID37/Y5WhAM6PjI0PSJTgRzgheBJm6H96lIGvHXR1sN1xqHQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.13.4.tgz"; + sha512 = "Qv0hDwj5dG2WaCnVvfzZ4LggMWPfONVtCUWIM7LbCGwVq+K3nnkdql1nJqrfCMkqc3rz2hjxck35ckOPxDiVRQ=="; }; }; "@serverless/core-1.1.2" = { @@ -5377,13 +5413,13 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.2.3" = { + "@serverless/platform-client-4.2.4" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.3.tgz"; - sha512 = "dyELLbrf/9+O+sjuIL7ymlH8zwCOsG+tf2TjeEjXooVSvNqUoZ4ZadENjxInUV841l0ddwkihwzH/54Yw+/qkg=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.4.tgz"; + sha512 = "DMq4GfckQ+Us64NQZJOtdtKHA3PQU5FZNXwi7QdV5QaVw3PtLjLN65FD7t8PcZ9YmCwL7QOsrCfT5oPJBblBNg=="; }; }; "@serverless/platform-client-china-2.2.0" = { @@ -5908,13 +5944,13 @@ let sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; }; - "@szmarczak/http-timer-4.0.5" = { + "@szmarczak/http-timer-4.0.6" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz"; - sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"; + sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; "@tencent-sdk/capi-1.1.8" = { @@ -6430,13 +6466,13 @@ let sha512 = "uFIEJESFKNNiuKt93ri5PnvRntAHCm/Aw9tTO2L25xXJSLzC/ARGmpDSJkuTCit7sUW5xUxr91Ta+UOiYaO3+A=="; }; }; - "@types/eslint-7.2.14" = { + "@types/eslint-7.28.0" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "7.2.14"; + version = "7.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.14.tgz"; - sha512 = "pESyhSbUOskqrGcaN+bCXIQDyT5zTaRWfj5ZjjSlMatgGjIn3QQPfocAu4WSabUR7CGyLZ2CQaZyISOEX7/saw=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz"; + sha512 = "07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A=="; }; }; "@types/eslint-scope-3.7.1" = { @@ -7060,13 +7096,13 @@ let sha512 = "hBOx4SUlEPKwRi6PrXuTGw1z6lz0fjsibcWCM378YxsSu/6+C30L6CR49zIBKHiwNWCYIcOLjg4OHKZaFeLAug=="; }; }; - "@types/node-16.3.1" = { + "@types/node-16.3.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.3.1"; + version = "16.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.3.1.tgz"; - sha512 = "N87VuQi7HEeRJkhzovao/JviiqKjDKMVKxKMfUvSKw+MbkbW8R0nA3fi/MQhhlxV2fQ+2ReM+/Nt4efdrJx3zA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.3.2.tgz"; + sha512 = "jJs9ErFLP403I+hMLGnqDRWT0RYKSvArxuBVh2veudHV7ifEC1WAmjJADacZ7mRbA2nWgHtn8xyECMAot0SkAw=="; }; }; "@types/node-6.14.13" = { @@ -7402,13 +7438,13 @@ let sha512 = "O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ=="; }; }; - "@types/unist-2.0.5" = { + "@types/unist-2.0.6" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.5.tgz"; - sha512 = "wnra4Vw9dopnuybR6HBywJ/URYpYrKLoepBTEtgfJup8Ahoi2zJECPP2cwiXp7btTvOT2CULv87aQRA4eZSP6g=="; + url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz"; + sha512 = "PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="; }; }; "@types/url-join-4.0.0" = { @@ -7456,13 +7492,13 @@ let sha512 = "1m6uReH8R/RuLVQGvTT/4LlWq67jZEUxp+FBHt0hYv2BT7TUwFbKI0wa7JZVEU/XtlcnX1QcTuZ36es4rGj7jg=="; }; }; - "@types/vscode-1.58.0" = { + "@types/vscode-1.58.1" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.58.0"; + version = "1.58.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.58.0.tgz"; - sha512 = "enznxcBi4uYt20LWal09E0+VKEHZlq9PZawTu/mpWCVCFWWbiyR8HNI1ikBP1Ypqv8b3A/0md3DY1jcx+oQ8kQ=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.58.1.tgz"; + sha512 = "sa76rDXiSif09he8KoaWWUQxsuBr2+uND0xn1GUbEODkuEjp2p7Rqd3t5qlvklfmAedLFdL7MdnsPa57uzwcOw=="; }; }; "@types/webpack-4.41.30" = { @@ -7573,13 +7609,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.28.2" = { + "@typescript-eslint/eslint-plugin-4.28.3" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.2.tgz"; - sha512 = "PGqpLLzHSxq956rzNGasO3GsAPf2lY9lDUBXhS++SKonglUmJypaUtcKzRtUte8CV7nruwnDxtLUKpVxs0wQBw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.3.tgz"; + sha512 = "jW8sEFu1ZeaV8xzwsfi6Vgtty2jf7/lJmQmDkDruBjYAbx5DA8JtbcMnP0rNPUG+oH5GoQBTSp+9613BzuIpYg=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7591,13 +7627,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.28.2" = { + "@typescript-eslint/experimental-utils-4.28.3" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.2.tgz"; - sha512 = "MwHPsL6qo98RC55IoWWP8/opTykjTp4JzfPu1VfO2Z0MshNP0UZ1GEV5rYSSnZSUI8VD7iHvtIPVGW5Nfh7klQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.3.tgz"; + sha512 = "zZYl9TnrxwEPi3FbyeX0ZnE8Hp7j3OCR+ELoUfbwGHGxWnHg9+OqSmkw2MoCVpZksPCZYpQzC559Ee9pJNHTQw=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7609,22 +7645,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.28.2" = { + "@typescript-eslint/parser-4.28.3" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.2.tgz"; - sha512 = "Q0gSCN51eikAgFGY+gnd5p9bhhCUAl0ERMiDKrTzpSoMYRubdB8MJrTTR/BBii8z+iFwz8oihxd0RAdP4l8w8w=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.3.tgz"; + sha512 = "ZyWEn34bJexn/JNYvLQab0Mo5e+qqQNhknxmc8azgNd4XqspVYR5oHq9O11fLwdZMRcj4by15ghSlIEq+H5ltQ=="; }; }; - "@typescript-eslint/scope-manager-4.28.2" = { + "@typescript-eslint/scope-manager-4.28.3" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.2.tgz"; - sha512 = "MqbypNjIkJFEFuOwPWNDjq0nqXAKZvDNNs9yNseoGBB1wYfz1G0WHC2AVOy4XD7di3KCcW3+nhZyN6zruqmp2A=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.3.tgz"; + sha512 = "/8lMisZ5NGIzGtJB+QizQ5eX4Xd8uxedFfMBXOKuJGP0oaBBVEMbJVddQKDXyyB0bPlmt8i6bHV89KbwOelJiQ=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7636,13 +7672,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.28.2" = { + "@typescript-eslint/types-4.28.3" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.2.tgz"; - sha512 = "Gr15fuQVd93uD9zzxbApz3wf7ua3yk4ZujABZlZhaxxKY8ojo448u7XTm/+ETpy0V0dlMtj6t4VdDvdc0JmUhA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.3.tgz"; + sha512 = "kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7654,13 +7690,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.28.2" = { + "@typescript-eslint/typescript-estree-4.28.3" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.2.tgz"; - sha512 = "86lLstLvK6QjNZjMoYUBMMsULFw0hPHJlk1fzhAVoNjDBuPVxiwvGuPQq3fsBMCxuDJwmX87tM/AXoadhHRljg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.3.tgz"; + sha512 = "YAb1JED41kJsqCQt1NcnX5ZdTA93vKFCMP4lQYG6CFxd0VzDJcKttRlMrlG+1qiWAw8+zowmHU1H0OzjWJzR2w=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7672,13 +7708,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.28.2" = { + "@typescript-eslint/visitor-keys-4.28.3" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.2.tgz"; - sha512 = "aT2B4PLyyRDUVUafXzpZFoc0C9t0za4BJAKP5sgWIhG+jHECQZUEjuQSCIwZdiJJ4w4cgu5r3Kh20SOdtEBl0w=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.3.tgz"; + sha512 = "ri1OzcLnk1HH4gORmr1dllxDzzrN6goUIz/P4MHFV0YZJDCADPR3RvYNp0PW2SetKTThar6wlbFTL00hV2Q+fg=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -9229,6 +9265,15 @@ let sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21"; }; }; + "ansi-align-1.1.0" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz"; + sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba"; + }; + }; "ansi-align-2.0.0" = { name = "ansi-align"; packageName = "ansi-align"; @@ -11038,13 +11083,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.943.0" = { + "aws-sdk-2.946.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.943.0"; + version = "2.946.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.943.0.tgz"; - sha512 = "1/WDupJrIB0SJEzIOf+UpqmG0AP5AXoDXhbW7CEujHerOd+/b5A1ubeHKGQJvBN4tAktgsvGpDiBRfB9MpJU5g=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.946.0.tgz"; + sha512 = "d0fbVNHdpoeszGUcxOV8m+/kLNxUfKP5QsGwaRjcQfvEokFmvdKsvw87LhepFOa00NaI4J3jt8AbsX4mvmcChg=="; }; }; "aws-sign2-0.6.0" = { @@ -12559,13 +12604,13 @@ let sha512 = "wrDhHe7LUkqaytxgbsFXoemzHRv6e8FrVNWWsQCgUfmuVYW6ke44hoGc9VdpjgfIsJ/ejmCFA8wDtDqACNAvyw=="; }; }; - "bittorrent-dht-10.0.0" = { + "bittorrent-dht-10.0.1" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "10.0.0"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-10.0.0.tgz"; - sha512 = "mrM18HMabvd3n/hQa4PYe942nWvBsJCBQb5PfT9kUJLlspNPGiulZYSCgWs7+XarS7nufYrGEp07f9eKTKIrgw=="; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-10.0.1.tgz"; + sha512 = "aR0vAgm+SgLiwTCEtNgeuqtT2deg+E/xHCTb7iryikvLbqbR58oFHbNYX4CM6EzyNGSKfcdBKp1gWI5Gcn2Aaw=="; }; }; "bittorrent-dht-6.4.2" = { @@ -13126,6 +13171,15 @@ let sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb"; }; }; + "boxen-0.6.0" = { + name = "boxen"; + packageName = "boxen"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz"; + sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6"; + }; + }; "boxen-1.3.0" = { name = "boxen"; packageName = "boxen"; @@ -14458,13 +14512,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001243" = { + "caniuse-lite-1.0.30001245" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001243"; + version = "1.0.30001245"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz"; - sha512 = "vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz"; + sha512 = "768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA=="; }; }; "canvas-2.8.0" = { @@ -16951,6 +17005,15 @@ let sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021"; }; }; + "configstore-2.1.0" = { + name = "configstore"; + packageName = "configstore"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; + sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; + }; + }; "configstore-3.1.5" = { name = "configstore"; packageName = "configstore"; @@ -17213,13 +17276,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.27.1" = { + "contentful-management-7.28.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.27.1"; + version = "7.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.27.1.tgz"; - sha512 = "ex97MGOQ8lhjGyMZSKuT04Ir13ALOBHvdpQqPxz9SRtbpO6W5XhfCOh0NFqIsXS3C87k2bTi2OV06AsHCQ/PRg=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.28.0.tgz"; + sha512 = "GJLgrYCJNPlkBCNW9Vn8UoTPdUZgGtVV/5vkzS+kjvS+yIiSZNyDpKAUPNVDFHWFwZr9VSUzUf94NVN/NtvidQ=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -21263,6 +21326,15 @@ let sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; }; }; + "dot-prop-3.0.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; + sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + }; + }; "dot-prop-4.2.1" = { name = "dot-prop"; packageName = "dot-prop"; @@ -21731,13 +21803,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.772" = { + "electron-to-chromium-1.3.776" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.772"; + version = "1.3.776"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.772.tgz"; - sha512 = "X/6VRCXWALzdX+RjCtBU6cyg8WZgoxm9YA02COmDOiNJEZ59WkQggDbWZ4t/giHi/3GS+cvdrP6gbLISANAGYA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.776.tgz"; + sha512 = "V0w7eFSBoFPpdw4xexjVPZ770UDZIevSwkkj4W97XbE3IsCsTRFpa7/yXGZ88EOQAUEA09JMMsWK0xsw0kRAYw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -24298,6 +24370,15 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; + "fast-memoize-2.5.2" = { + name = "fast-memoize"; + packageName = "fast-memoize"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz"; + sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="; + }; + }; "fast-printf-1.6.6" = { name = "fast-printf"; packageName = "fast-printf"; @@ -24883,6 +24964,15 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; + "filled-array-1.1.0" = { + name = "filled-array"; + packageName = "filled-array"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; + sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; + }; + }; "filter-obj-1.1.0" = { name = "filter-obj"; packageName = "filter-obj"; @@ -27359,13 +27449,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.17.1" = { + "google-gax-2.18.0" = { name = "google-gax"; packageName = "google-gax"; - version = "2.17.1"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.17.1.tgz"; - sha512 = "CoR7OYuEzIDt3mp7cLYL+oGPmYdImS1WEwIvjF0zk0LhEBBmvRjWHTpBwazLGsT8hz+6zPh/4fjIjNaUxzIvzg=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.18.0.tgz"; + sha512 = "PosKicp9XjnMIBMFOWkUfmVVEY6T9EdEs4t24Z3s7t/NOiL7zQAHBuIdCZ5/voxPiZr4SbyCOHF59/KqDjS70A=="; }; }; "google-p12-pem-3.1.0" = { @@ -27440,6 +27530,15 @@ let sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; }; }; + "got-5.7.1" = { + name = "got"; + packageName = "got"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; + sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; + }; + }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -30132,6 +30231,15 @@ let sha512 = "hUDjc3vBkh/uk1gPfMAD/7Z188Q8cvTGl0nxwaCdwSbzFh6ZKkZh+s2ozVxbE5G9ZNRyeY0+lgbAIOUFsFf98w=="; }; }; + "inquirer-8.1.2" = { + name = "inquirer"; + packageName = "inquirer"; + version = "8.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-8.1.2.tgz"; + sha512 = "DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q=="; + }; + }; "inquirer-autocomplete-prompt-1.4.0" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -30798,13 +30906,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.4.0" = { + "is-core-module-2.5.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz"; - sha512 = "6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz"; + sha512 = "TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg=="; }; }; "is-data-descriptor-0.1.4" = { @@ -33075,6 +33183,15 @@ let sha512 = "7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="; }; }; + "json-server-0.8.23" = { + name = "json-server"; + packageName = "json-server"; + version = "0.8.23"; + src = fetchurl { + url = "https://registry.npmjs.org/json-server/-/json-server-0.8.23.tgz"; + sha1 = "28e4ffd51c8d893295280eb4064d9703594de5a2"; + }; + }; "json-stable-stringify-0.0.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; @@ -34030,6 +34147,15 @@ let sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; }; }; + "latest-version-2.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; + sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; + }; + }; "latest-version-3.1.0" = { name = "latest-version"; packageName = "latest-version"; @@ -34084,6 +34210,15 @@ let sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; + "lazy-req-1.1.0" = { + name = "lazy-req"; + packageName = "lazy-req"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz"; + sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac"; + }; + }; "lazyness-1.2.0" = { name = "lazyness"; packageName = "lazyness"; @@ -36550,6 +36685,15 @@ let sha512 = "S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ=="; }; }; + "lowdb-0.13.1" = { + name = "lowdb"; + packageName = "lowdb"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowdb/-/lowdb-0.13.1.tgz"; + sha1 = "ebb1057269721b40c316cedb1877e68d7f14ca0c"; + }; + }; "lowdb-1.0.0" = { name = "lowdb"; packageName = "lowdb"; @@ -37855,15 +37999,6 @@ let sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; - "mem-8.1.1" = { - name = "mem"; - packageName = "mem"; - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz"; - sha512 = "qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA=="; - }; - }; "mem-fs-2.2.1" = { name = "mem-fs"; packageName = "mem-fs"; @@ -38188,6 +38323,15 @@ let sha1 = "1fbf19c136e78b4b2c4e1f5541915fb0d589abe7"; }; }; + "method-override-2.3.10" = { + name = "method-override"; + packageName = "method-override"; + version = "2.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz"; + sha1 = "e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4"; + }; + }; "method-override-3.0.0" = { name = "method-override"; packageName = "method-override"; @@ -41097,6 +41241,15 @@ let sha512 = "zfWC/gICcqb74D9ndyvxZWaI1jzcoHmf4UTHWQchBNuNMxdBLJMDiUgZ1tjGLEIe/BMhj2DxKD8HOuc2062pDQ=="; }; }; + "node-status-codes-1.0.0" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; + sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; + }; + }; "node-swt-0.1.1" = { name = "node-swt"; packageName = "node-swt"; @@ -41953,13 +42106,13 @@ let sha512 = "gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="; }; }; - "object-inspect-1.10.3" = { + "object-inspect-1.11.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.10.3"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz"; - sha512 = "e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz"; + sha512 = "jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="; }; }; "object-inspect-1.4.1" = { @@ -42196,13 +42349,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "office-ui-fabric-react-7.173.0" = { + "office-ui-fabric-react-7.173.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.173.0"; + version = "7.173.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.173.0.tgz"; - sha512 = "CXiIneX2lGL1l9vQa2t0nHnngKGUeCnOb0xoK58aGUeWKZuDpiVmxguokkvmrVr8F4hNb8thLfbyqFWpa7VJHQ=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.173.1.tgz"; + sha512 = "7FKJ4lVXGkVRQccPz3XDeCAysE0h687elFyaRir3BUVAtkqoye9IB7IF/68SsUQahv6Q0LI3YTWym0IG/tlBEQ=="; }; }; "omggif-1.0.10" = { @@ -43519,6 +43672,15 @@ let sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0"; }; }; + "package-json-2.4.0" = { + name = "package-json"; + packageName = "package-json"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; + sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; + }; + }; "package-json-4.0.1" = { name = "package-json"; packageName = "package-json"; @@ -45148,6 +45310,15 @@ let sha1 = "72b726aa6fac1edeee42256c7d8dc256b335677f"; }; }; + "pluralize-3.1.0" = { + name = "pluralize"; + packageName = "pluralize"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-3.1.0.tgz"; + sha1 = "84213d0a12356069daa84060c559242633161368"; + }; + }; "pluralize-5.1.0" = { name = "pluralize"; packageName = "pluralize"; @@ -50819,13 +50990,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.53.1" = { + "rollup-2.53.2" = { name = "rollup"; packageName = "rollup"; - version = "2.53.1"; + version = "2.53.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.1.tgz"; - sha512 = "yiTCvcYXZEulNWNlEONOQVlhXA/hgxjelFSjNcrwAAIfYx/xqjSHwqg/cCaWOyFRKr+IQBaXwt723m8tCaIUiw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz"; + sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -51152,6 +51323,15 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; + "rxjs-7.2.0" = { + name = "rxjs"; + packageName = "rxjs"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.2.0.tgz"; + sha512 = "aX8w9OpKrQmiPKfT1bqETtUr9JygIz6GZ+gql8v7CijClsP0laoFUdKzxFAoWuRdSlOdU2+crss+cMf+cqMTnw=="; + }; + }; "s3-stream-upload-2.0.2" = { name = "s3-stream-upload"; packageName = "s3-stream-upload"; @@ -51935,13 +52115,13 @@ let sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; - "service-runner-2.8.3" = { + "service-runner-2.8.4" = { name = "service-runner"; packageName = "service-runner"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.8.3.tgz"; - sha512 = "oOP54jRgWE9IBeStnYI9lIdJ333HHe+8pjAvBpDmRyOXNcsvVMN22hbuX93YVlTUE87I8J80ORZ3u01DgNKMYg=="; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.8.4.tgz"; + sha512 = "x190eUDdtwmstQluk10aeA89gw0uTtm8OFzlXO6oMgv5MoCcp1PedNI1aCVsQoBHfiraExKhokvEZoxl6xTfQw=="; }; }; "set-blocking-1.0.0" = { @@ -52988,13 +53168,13 @@ let sha512 = "Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg=="; }; }; - "snyk-sbt-plugin-2.11.2" = { + "snyk-sbt-plugin-2.11.3" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "2.11.2"; + version = "2.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.2.tgz"; - sha512 = "EY9foT2bpl+Dbzj28zewJs7VyAhA4uQIiBABNCi9iaIXGfQLkhiXswkcwysOHxm6RxrXbMsbci0OvuDD7zh4Dg=="; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.3.tgz"; + sha512 = "xcZAYENuEx+SG51AuLLL59jpN/qerJdSdznTANoyNM7bJjVhTvLTjEfoOxbeogZwKmFDKKUfc6Vw+EdEy8VZug=="; }; }; "snyk-tree-1.0.0" = { @@ -55571,13 +55751,13 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.1.2" = { + "strtok3-6.1.3" = { name = "strtok3"; packageName = "strtok3"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.1.2.tgz"; - sha512 = "ECqYgTe/FU1r2fSgXaCywfhoveNNxDWcGSaJesD7OvlrQLIwSck8mZT6xxYdnI4q0l8SwrrExx/01chzUM4Dzw=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.1.3.tgz"; + sha512 = "ssWSKFOeUTurMSucgyUf+a6Z9mVTYrsYiyEK5RLnh8BM6sFrKSljVlnjZXIDxMguYfdQI+mUPFHo88FYTxq1XA=="; }; }; "structured-source-3.0.2" = { @@ -57210,6 +57390,15 @@ let sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; }; }; + "timed-out-3.1.3" = { + name = "timed-out"; + packageName = "timed-out"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; + sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; + }; + }; "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; @@ -59109,6 +59298,15 @@ let sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; + "underscore-db-0.10.0" = { + name = "underscore-db"; + packageName = "underscore-db"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore-db/-/underscore-db-0.10.0.tgz"; + sha1 = "a4bd7f5a9c7f2eec31e4784b402241df36671499"; + }; + }; "underscore.string-2.3.3" = { name = "underscore.string"; packageName = "underscore.string"; @@ -59793,6 +59991,15 @@ let sha1 = "150e65da42bf7742445b958a64eb9b85d1d2b180"; }; }; + "unzip-response-1.0.2" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"; + sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; + }; + }; "unzip-response-2.0.1" = { name = "unzip-response"; packageName = "unzip-response"; @@ -59856,6 +60063,15 @@ let sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc"; }; }; + "update-notifier-1.0.3" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz"; + sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a"; + }; + }; "update-notifier-2.5.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -59937,13 +60153,13 @@ let sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; - "urijs-1.19.6" = { + "urijs-1.19.7" = { name = "urijs"; packageName = "urijs"; - version = "1.19.6"; + version = "1.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/urijs/-/urijs-1.19.6.tgz"; - sha512 = "eSXsXZ2jLvGWeLYlQA3Gh36BcjF+0amo92+wHPyN1mdR8Nxf75fuEuYTd9c0a+m/vhCjRK0ESlE9YNLW+E1VEw=="; + url = "https://registry.npmjs.org/urijs/-/urijs-1.19.7.tgz"; + sha512 = "Id+IKjdU0Hx+7Zx717jwLPsPeUqz7rAtuVBRLLs+qn+J2nf9NGITWVCxcijgYxBqe83C7sqsQPs6H1pyz3x9gA=="; }; }; "urix-0.1.0" = { @@ -62476,13 +62692,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.2.2" = { + "webtorrent-1.2.4" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.2.2.tgz"; - sha512 = "1pM8HsB4WG1MBRV7retGf6AtMQ5osngMvA6x/kUEGfqhQTAJXaBjqEOW19+48H0UbC9PtQuvSDHDDrNcjuzXDA=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.2.4.tgz"; + sha512 = "oQf2HYtylJSHlPX8FDqn79JEO2Og856X78oZHH3So7zJK0RlQVdDolH82MvjbrVxDv6Mfa7s1rIjPKcy+hQEFw=="; }; }; "well-known-symbols-2.0.0" = { @@ -62692,6 +62908,15 @@ let sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; + "widest-line-1.0.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; + sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + }; + }; "widest-line-2.0.1" = { name = "widest-line"; packageName = "widest-line"; @@ -64223,6 +64448,15 @@ let sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; }; }; + "yargs-4.8.1" = { + name = "yargs"; + packageName = "yargs"; + version = "4.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; + sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; + }; + }; "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; @@ -64598,22 +64832,22 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.1.1"; + version = "12.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.1.tgz"; - sha512 = "rQZItn3kpYEX6tH7wquAEhJuxVpW6sYKO2tSi8Suxrm+iz1RPRnfhSwS1WIEumnwpFRtH/8P+lOrScax1ldYkg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.2.tgz"; + sha512 = "oBJcSqXJyPzWGYft5/nD3hJhunxTGXlI4++9ehzdF/fRipOLLMqf77vi/4rUA2DGuaPMbYJeunBnIsgXRGIHIg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1201.1" - sources."@angular-devkit/core-12.1.1" - sources."@angular-devkit/schematics-12.1.1" + sources."@angular-devkit/architect-0.1201.2" + sources."@angular-devkit/core-12.1.2" + sources."@angular-devkit/schematics-12.1.2" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@schematics/angular-12.1.1" + sources."@schematics/angular-12.1.2" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -64729,7 +64963,7 @@ in sources."ini-2.0.0" sources."inquirer-8.1.1" sources."ip-1.1.5" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -65406,11 +65640,11 @@ in sources."ora-5.4.0" ]; }) - sources."@types/eslint-7.2.14" + sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.49" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -65449,7 +65683,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -65476,7 +65710,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -65534,7 +65768,7 @@ in sources."interpret-1.4.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -65885,7 +66119,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -66028,7 +66262,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.30001243" + sources."caniuse-lite-1.0.30001245" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -66156,7 +66390,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -66350,7 +66584,7 @@ in sources."is-boolean-object-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.4" sources."is-descriptor-1.0.2" @@ -66518,7 +66752,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object-path-0.11.5" sources."object-visit-1.0.1" @@ -67166,7 +67400,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -67177,7 +67411,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -67204,7 +67438,7 @@ in sources."homedir-polyfill-1.0.3" sources."ini-1.3.8" sources."is-3.3.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" (sources."jake-10.8.2" // { @@ -67271,7 +67505,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -67306,14 +67540,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.943.0" // { + (sources."aws-sdk-2.946.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -67398,7 +67632,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.1.1" + sources."inquirer-8.1.2" sources."ip-1.1.5" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -67453,9 +67687,9 @@ in sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - (sources."rxjs-6.6.7" // { + (sources."rxjs-7.2.0" // { dependencies = [ - sources."tslib-1.14.1" + sources."tslib-2.1.0" ]; }) sources."safe-buffer-5.2.1" @@ -67517,10 +67751,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.6.1"; + version = "10.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.6.1.tgz"; - sha512 = "aB78X9QuUsHuClTPJgVCKLxG+YVq3RQRs+6U1lO70VKe0lVkTVRmbIyhwi91jwH3Ddwm/7HF+bfJjO4yyRWwBg=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.6.2.tgz"; + sha512 = "2AVJj3hY7YyOkROHZKAyfqbTawRQw+u8y/WGmERm6zu1gW/t0A7ihonchEGbEwzinszDADPzvAZvvMq1BdPe8Q=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -67533,7 +67767,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -68060,7 +68294,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" ]; }) sources."proxy-addr-2.0.7" @@ -68358,7 +68592,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uri-js-4.4.1" - sources."urijs-1.19.6" + sources."urijs-1.19.7" sources."uuid-3.4.0" sources."verror-1.10.0" sources."vscode-jsonrpc-6.0.0" @@ -68451,7 +68685,7 @@ in sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -68653,7 +68887,7 @@ in sources."is-boolean-object-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-date-object-1.0.4" sources."is-generator-function-1.0.9" sources."is-negative-zero-2.0.1" @@ -68679,7 +68913,7 @@ in sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" sources."object-assign-4.1.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -68981,7 +69215,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-expression-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-plain-obj-1.1.0" @@ -69240,7 +69474,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -69382,7 +69616,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-2.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -69765,7 +69999,7 @@ in sources."ms-2.1.2" sources."ncp-2.0.0" sources."no-case-3.0.4" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -70059,7 +70293,7 @@ in sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -70708,10 +70942,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.6.tgz"; - sha512 = "MQuXdCblmy5Qnrlqmb7ntDjpgxtdXsbdAgxf23Ai2QFpf14bdc+gz4U/+9pOEpSswODtMvMqnjfTA1lY7p2AfQ=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.7.tgz"; + sha512 = "EiD4lpcGW2WyzxEDpRMYPrjxAa0FhG69SzDoc1KbDht2Do/vgnRzvrtIsufPT14dALAesieN3kVVMCCfA9S6jA=="; }; dependencies = [ sources."@chemzqm/neovim-5.2.13" @@ -70829,7 +71063,7 @@ in sources."node-fetch-2.6.1" sources."node-int64-0.4.0" sources."npm-run-path-2.0.2" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -71000,7 +71234,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -71098,7 +71332,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -71296,7 +71530,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -71897,10 +72131,10 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.155"; + version = "1.1.156"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.155.tgz"; - sha512 = "8UgCdjUkXDc+cN45tuWnVVd3S04SoNv6JuB51BdPkzq2iWcpIfYNHepLIxdkzdCw0I0MQkAqWCo+buRbEVNW9g=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.156.tgz"; + sha512 = "lPtMmvdxFMVKm7KYKWVDmYyQo1KpG7oOwre4WlKj4+TeWxhOfkxz2q1HtsoYeideu0X9Y6GCGNlBpeZbFMhP4g=="; }; dependencies = [ sources."pyright-1.1.156" @@ -71977,10 +72211,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.47.1"; + version = "0.47.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.47.1.tgz"; - sha512 = "ff5hTzmCPr3iqfc9XZ7KwxSSJWVT4KaCZHsz+Ue+PgY9PHY6X1E/ZHknXLXwbXx4JmOD8NPpMM0db/ShgeIMpA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.47.2.tgz"; + sha512 = "DtUoWcXd++TT9PjjB5JDT3r+2c6wdZZlf2pCXeInELfwW/P4p10BKxP8EnMhkNq4jIzfP0V9QAwLMMppACFuRA=="; }; buildInputs = globalBuildInputs; meta = { @@ -72089,7 +72323,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" - sources."@types/unist-2.0.5" + sources."@types/unist-2.0.6" sources."ajv-8.6.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -72109,7 +72343,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -72147,7 +72381,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -72199,7 +72433,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -72456,7 +72690,7 @@ in sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."minimatch-3.0.4" @@ -72638,7 +72872,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -73290,7 +73524,7 @@ in sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -73610,7 +73844,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -73750,7 +73984,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -73981,7 +74215,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -74070,7 +74304,7 @@ in sources."mute-stream-0.0.7" sources."next-tick-1.0.0" sources."object-assign-4.1.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."onetime-2.0.1" sources."os-tmpdir-1.0.2" @@ -75290,13 +75524,13 @@ in }) sources."@malept/cross-spawn-promise-1.1.1" sources."@sindresorhus/is-4.0.1" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/glob-7.1.4" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -75528,14 +75762,14 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."inquirer-8.1.1" // { + (sources."inquirer-8.1.2" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" ]; }) sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-docker-2.2.1" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -75737,7 +75971,7 @@ in sources."rimraf-2.7.1" sources."roarr-2.15.4" sources."run-async-2.4.1" - sources."rxjs-6.6.7" + sources."rxjs-7.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -75798,7 +76032,7 @@ in sources."tough-cookie-2.5.0" sources."trim-newlines-1.0.0" sources."trim-repeated-1.0.0" - sources."tslib-1.14.1" + sources."tslib-2.1.0" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -75923,12 +76157,12 @@ in sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."@sindresorhus/is-4.0.1" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -75963,7 +76197,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -76000,7 +76234,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -76053,7 +76287,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" @@ -76261,7 +76495,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.173.0" + sources."@fluentui/react-7.173.1" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -76275,7 +76509,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.192" + sources."@microsoft/load-themed-styles-1.10.195" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -77005,7 +77239,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-dir-1.0.0" @@ -77302,7 +77536,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.173.0" + sources."office-ui-fabric-react-7.173.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -78595,7 +78829,7 @@ in }) sources."@segment/loosely-validate-event-2.0.0" sources."@sindresorhus/is-4.0.1" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" sources."@types/glob-7.1.4" @@ -78836,7 +79070,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -79104,7 +79338,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -79416,7 +79650,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.4" sources."is-descriptor-1.0.2" @@ -79757,7 +79991,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -80857,7 +81091,7 @@ in sources."indent-string-2.1.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-finite-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -81329,7 +81563,7 @@ in sources."into-stream-3.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" @@ -81611,12 +81845,12 @@ in sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.1.0" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.15.1" // { + (sources."@google-cloud/pubsub-2.16.0" // { dependencies = [ sources."google-auth-library-7.3.0" ]; }) - sources."@grpc/grpc-js-1.3.4" + sources."@grpc/grpc-js-1.3.5" sources."@grpc/proto-loader-0.6.4" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/move-file-1.1.2" // { @@ -81645,7 +81879,7 @@ in sources."@types/json-schema-7.0.8" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -81994,7 +82228,7 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.17.1" // { + (sources."google-gax-2.18.0" // { dependencies = [ sources."google-auth-library-7.3.0" ]; @@ -82629,7 +82863,7 @@ in sources."inquirer-7.3.3" sources."inquirer-autocomplete-prompt-1.4.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-2.0.0" @@ -82751,7 +82985,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -83211,7 +83445,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -83532,14 +83766,13 @@ in sources."@turist/fetch-7.1.7" sources."@turist/time-0.0.1" sources."@types/common-tags-1.8.1" - sources."@types/debug-4.1.6" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/node-fetch-2.5.11" - sources."@types/unist-2.0.5" + sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" sources."@types/yoga-layout-1.9.2" @@ -83604,7 +83837,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -83654,7 +83887,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.27.1" + sources."contentful-management-7.28.0" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { @@ -83700,7 +83933,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -83839,7 +84072,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-decimal-1.0.4" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" @@ -83953,7 +84186,7 @@ in sources."npm-run-path-2.0.2" sources."nth-check-2.0.0" sources."object-assign-4.1.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-path-0.11.5" sources."on-finished-2.3.0" sources."once-1.4.0" @@ -84111,7 +84344,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.1.2" + sources."strtok3-6.1.3" sources."style-to-object-0.3.0" sources."supports-color-5.5.0" sources."term-size-2.2.1" @@ -84627,7 +84860,7 @@ in sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" @@ -84927,7 +85160,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -85223,7 +85456,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" sources."oauth-sign-0.9.0" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -85414,7 +85647,7 @@ in sources."ini-1.3.8" sources."interpret-1.1.0" sources."is-absolute-1.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -85910,7 +86143,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -86312,7 +86545,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -86704,7 +86937,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.3" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."opener-1.5.2" sources."portfinder-1.0.28" sources."qs-6.10.1" @@ -87481,7 +87714,7 @@ in sources."path-key-2.0.1" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-7.4.2" @@ -88030,7 +88263,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.943.0" // { + (sources."aws-sdk-2.946.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -88914,7 +89147,7 @@ in sources."mime-types-2.1.31" sources."ms-2.1.3" sources."native-promise-only-0.8.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" @@ -89208,6 +89441,568 @@ in bypassCache = true; reconstructLock = true; }; + jsonplaceholder = nodeEnv.buildNodePackage { + name = "jsonplaceholder"; + packageName = "jsonplaceholder"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonplaceholder/-/jsonplaceholder-0.3.3.tgz"; + sha1 = "f2de92d8c2f9211e7b4e859ef73d44d32b1b5bfd"; + }; + dependencies = [ + sources."accepts-1.3.7" + sources."ajv-6.12.6" + sources."ansi-align-1.1.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."anymatch-1.3.2" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-flatten-1.1.1" + sources."array-unique-0.2.1" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."async-each-1.0.3" + sources."asynckit-0.4.0" + sources."atob-2.1.2" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."basic-auth-2.0.1" + sources."bcrypt-pbkdf-1.0.2" + sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" + sources."body-parser-1.19.0" + sources."boxen-0.6.0" + sources."braces-1.8.5" + sources."bytes-3.1.0" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."camelcase-2.1.1" + sources."capture-stack-trace-1.0.1" + sources."caseless-0.12.0" + sources."chalk-1.1.3" + sources."chokidar-1.7.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."isobject-3.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."cli-boxes-1.0.0" + sources."cliui-3.2.0" + sources."clone-1.0.4" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."combined-stream-1.0.8" + sources."component-emitter-1.3.0" + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + ]; + }) + (sources."configstore-2.1.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."connect-pause-0.1.1" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."cors-2.8.5" + sources."create-error-class-3.0.2" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."deep-extend-0.6.0" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dot-prop-3.0.0" + sources."duplexer2-0.1.4" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."error-ex-1.3.2" + sources."errorhandler-1.5.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."express-4.17.1" + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."extglob-0.3.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."file-uri-to-path-1.0.0" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.4" + sources."filled-array-1.1.0" + sources."finalhandler-1.1.2" + sources."find-up-1.1.2" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."forwarded-0.2.0" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."fsevents-1.2.13" + sources."function-bind-1.1.1" + sources."get-caller-file-1.0.3" + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."got-5.7.1" + sources."graceful-fs-4.2.6" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + sources."hosted-git-info-2.8.9" + sources."http-errors-1.7.2" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.24" + sources."imurmurhash-0.1.4" + sources."inherits-2.0.3" + sources."ini-1.3.8" + sources."invert-kv-1.0.0" + sources."ipaddr.js-1.9.1" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.3" + ]; + }) + sources."is-arrayish-0.2.1" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-core-module-2.5.0" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.3" + ]; + }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.3" + ]; + }) + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-finite-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-2.0.1" + sources."is-npm-1.0.0" + sources."is-number-2.1.0" + sources."is-obj-1.0.1" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-promise-2.2.2" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.2.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isobject-2.1.0" + sources."isstream-0.1.2" + sources."jju-1.4.0" + sources."jsbn-0.1.1" + sources."json-parse-helpfulerror-1.0.3" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-server-0.8.23" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."kind-of-3.2.2" + sources."latest-version-2.0.0" + sources."lazy-req-1.1.0" + sources."lcid-1.0.0" + sources."load-json-file-1.1.0" + sources."lodash-4.17.21" + sources."lodash.assign-4.2.0" + sources."lowdb-0.13.1" + sources."lowercase-keys-1.0.1" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."math-random-1.0.4" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."method-override-2.3.10" + sources."methods-1.1.2" + sources."micromatch-2.3.11" + sources."mime-1.6.0" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" + sources."minimist-1.2.5" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) + sources."ms-2.0.0" + sources."nan-2.14.2" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.3" + ]; + }) + sources."negotiator-0.6.2" + sources."node-status-codes-1.0.0" + sources."node-uuid-1.4.8" + sources."normalize-package-data-2.5.0" + sources."normalize-path-2.1.1" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + (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."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."object.omit-2.0.1" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."os-homedir-1.0.2" + sources."os-locale-1.4.0" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."package-json-2.4.0" + sources."parse-glob-3.0.4" + sources."parse-json-2.2.0" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.7" + sources."path-to-regexp-0.1.7" + sources."path-type-1.1.0" + sources."performance-now-2.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pluralize-3.1.0" + sources."posix-character-classes-0.1.1" + sources."prepend-http-1.0.4" + sources."preserve-0.2.0" + sources."process-nextick-args-2.0.1" + sources."proxy-addr-2.0.7" + sources."psl-1.8.0" + sources."punycode-2.1.1" + sources."qs-6.7.0" + (sources."randomatic-3.1.1" // { + dependencies = [ + sources."is-number-4.0.0" + sources."kind-of-6.0.3" + ]; + }) + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."rc-1.2.8" + sources."read-all-stream-3.1.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.7" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.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."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" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.3" + sources."micromatch-3.1.10" + ]; + }) + sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" + sources."registry-auth-token-3.4.0" + sources."registry-url-3.1.0" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" + sources."repeating-2.0.1" + (sources."request-2.88.2" // { + dependencies = [ + sources."qs-6.5.2" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.20.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."semver-5.7.1" + sources."semver-diff-2.1.0" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."server-destroy-1.0.1" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setprototypeof-1.1.1" + sources."slide-1.1.6" + (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."isobject-3.0.1" + ]; + }) + sources."snapdragon-util-3.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.1" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.9" + sources."split-string-3.1.0" + sources."sshpk-1.16.1" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."statuses-1.5.0" + sources."steno-0.4.4" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + sources."timed-out-3.1.3" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + (sources."to-regex-range-2.1.1" // { + dependencies = [ + sources."is-number-3.0.0" + ]; + }) + sources."toidentifier-1.0.0" + sources."tough-cookie-2.5.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.18" + sources."underscore-db-0.10.0" + sources."union-value-1.0.1" + sources."unpipe-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + sources."isobject-3.0.1" + ]; + }) + sources."unzip-response-1.0.2" + sources."update-notifier-1.0.3" + sources."uri-js-4.4.1" + sources."urix-0.1.0" + sources."url-parse-lax-1.0.0" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."validate-npm-package-license-3.0.4" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."which-module-1.0.0" + sources."widest-line-1.0.0" + sources."window-size-0.2.0" + sources."wrap-ansi-2.1.0" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" + sources."y18n-3.2.2" + sources."yargs-4.8.1" + (sources."yargs-parser-2.4.1" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A simple fake REST API server for testing and prototyping."; + homepage = "http://jsonplaceholder.typicode.com"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; kaput-cli = nodeEnv.buildNodePackage { name = "kaput-cli"; packageName = "kaput-cli"; @@ -89390,7 +90185,7 @@ in sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-downloader-helper-1.0.18" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-treeify-1.1.33" sources."onetime-5.1.2" sources."os-tmpdir-1.0.2" @@ -89442,7 +90237,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."universalify-0.1.2" sources."uri-js-4.4.1" - sources."urijs-1.19.6" + sources."urijs-1.19.7" sources."which-1.3.1" sources."widest-line-3.1.0" sources."wrap-ansi-7.0.0" @@ -89492,7 +90287,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -89777,7 +90572,7 @@ in sources."is-boolean-object-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-date-object-1.0.4" sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.9" @@ -89809,7 +90604,7 @@ in sources."node-fetch-2.6.1" sources."node-localstorage-1.3.1" sources."object-assign-4.1.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -90636,7 +91431,7 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-8.2.1" + sources."@octokit/openapi-types-8.3.0" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" @@ -90648,7 +91443,7 @@ in }) sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.6.7" - sources."@octokit/types-6.18.1" + sources."@octokit/types-6.19.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -90908,7 +91703,7 @@ in sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-date-object-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -91056,7 +91851,7 @@ in sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.2" @@ -92304,7 +93099,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -92477,7 +93272,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.30001243" + sources."caniuse-lite-1.0.30001245" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -92601,7 +93396,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -92776,7 +93571,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" @@ -93638,7 +94433,7 @@ in sources."inherits-2.0.4" sources."inquirer-0.12.0" sources."interpret-1.4.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" @@ -93849,7 +94644,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -93982,19 +94777,19 @@ in dependencies = [ sources."@fluentui/date-time-utilities-8.2.1" sources."@fluentui/dom-utilities-2.1.3" - sources."@fluentui/font-icons-mdl2-8.1.5" - sources."@fluentui/foundation-legacy-8.1.5" + sources."@fluentui/font-icons-mdl2-8.1.6" + sources."@fluentui/foundation-legacy-8.1.6" sources."@fluentui/keyboard-key-0.3.3" sources."@fluentui/merge-styles-8.1.3" sources."@fluentui/react-8.22.0" - sources."@fluentui/react-focus-8.1.6" + sources."@fluentui/react-focus-8.1.8" sources."@fluentui/react-hooks-8.2.4" sources."@fluentui/react-window-provider-2.1.3" sources."@fluentui/set-version-8.1.3" - sources."@fluentui/style-utilities-8.1.5" + sources."@fluentui/style-utilities-8.2.0" sources."@fluentui/theme-2.1.4" sources."@fluentui/utilities-8.2.1" - sources."@microsoft/load-themed-styles-1.10.192" + sources."@microsoft/load-themed-styles-1.10.195" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/cors-2.8.12" @@ -94420,7 +95215,7 @@ in sources."mime-types-2.1.31" sources."ms-2.1.3" sources."native-promise-only-0.8.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" @@ -94507,10 +95302,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "4.1.23"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.1.23.tgz"; - sha512 = "cppRgtCdYfp6dN4azxosLQeezhQ8XkYU9wFCvMN5BYx0FhXe7nb7szqYmTUSglErg9h3CPCVic34z/YlstTmlw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.3.2.tgz"; + sha512 = "7Ay83ddXvtUrwksfrpz6w69aGQzTIM4j0DQaqlvPWoPObfPxauIScOcFlFvTaAR+bAsPjpNqE17UpKcqPaDlJA=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -94644,12 +95439,30 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-15.11.0" // { + (sources."@netlify/build-15.11.4" // { dependencies = [ + (sources."@netlify/zip-it-and-ship-it-4.13.1" // { + dependencies = [ + sources."execa-5.1.1" + sources."locate-path-6.0.0" + sources."p-locate-5.0.0" + sources."pkg-dir-5.0.0" + sources."semver-7.3.5" + sources."yargs-16.2.0" + ]; + }) sources."ansi-styles-4.3.0" sources."boxen-4.2.0" sources."chalk-3.0.0" - sources."execa-3.4.0" + sources."cp-file-9.1.0" + (sources."execa-3.4.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."human-signals-1.1.1" + ]; + }) + sources."get-stream-6.0.1" + sources."human-signals-2.1.0" sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" @@ -94678,13 +95491,20 @@ in ]; }) sources."@netlify/esbuild-0.13.6" - (sources."@netlify/framework-info-5.7.0" // { + (sources."@netlify/framework-info-5.7.2" // { dependencies = [ - sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - sources."@netlify/functions-utils-1.4.4" + (sources."@netlify/functions-utils-1.4.6" // { + dependencies = [ + sources."@netlify/zip-it-and-ship-it-4.13.1" + sources."cp-file-9.1.0" + sources."pkg-dir-5.0.0" + sources."resolve-2.0.0-next.3" + sources."yargs-16.2.0" + ]; + }) (sources."@netlify/git-utils-1.0.11" // { dependencies = [ sources."braces-3.0.2" @@ -94699,26 +95519,22 @@ in (sources."@netlify/plugin-edge-handlers-1.11.21" // { dependencies = [ sources."@types/node-14.17.5" + sources."typescript-4.3.5" ]; }) - sources."@netlify/plugins-list-2.19.1" + sources."@netlify/plugins-list-2.19.2" sources."@netlify/routing-local-proxy-0.30.2" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" ]; }) - (sources."@netlify/zip-it-and-ship-it-4.12.0" // { + (sources."@netlify/zip-it-and-ship-it-4.13.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."cliui-7.0.4" sources."cp-file-9.1.0" sources."pkg-dir-5.0.0" sources."resolve-2.0.0-next.3" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" ]; }) (sources."@nodelib/fs.scandir-2.1.5" // { @@ -94771,10 +95587,8 @@ in }) (sources."@oclif/errors-1.3.5" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."clean-stack-3.0.1" sources."escape-string-regexp-4.0.0" - sources."wrap-ansi-7.0.0" ]; }) sources."@oclif/linewrap-1.0.0" @@ -94835,7 +95649,7 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-8.2.1" + sources."@octokit/openapi-types-8.3.0" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.4.1" @@ -94846,7 +95660,7 @@ in }) sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.6.7" - sources."@octokit/types-6.18.1" + sources."@octokit/types-6.19.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -94883,7 +95697,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/node-fetch-2.5.11" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -94891,8 +95705,8 @@ in sources."@types/semver-7.3.7" sources."@types/yargs-13.0.12" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.28.2" - (sources."@typescript-eslint/typescript-estree-4.28.2" // { + sources."@typescript-eslint/types-4.28.3" + (sources."@typescript-eslint/typescript-estree-4.28.3" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -94909,7 +95723,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.28.2" + sources."@typescript-eslint/visitor-keys-4.28.3" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."acorn-8.4.1" @@ -95001,10 +95815,8 @@ in }) (sources."boxen-5.0.1" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."camelcase-6.2.0" sources."type-fest-0.20.2" - sources."wrap-ansi-7.0.0" ]; }) sources."brace-expansion-1.1.11" @@ -95042,7 +95854,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."cardinal-2.1.1" (sources."chalk-4.1.1" // { dependencies = [ @@ -95110,7 +95922,7 @@ in ]; }) sources."cli-width-2.2.1" - sources."cliui-6.0.0" + sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -95266,11 +96078,7 @@ in sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - (sources."detective-typescript-7.0.0" // { - dependencies = [ - sources."typescript-3.9.10" - ]; - }) + sources."detective-typescript-7.0.0" (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -95308,7 +96116,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -95406,7 +96214,7 @@ in ]; }) sources."@sindresorhus/is-2.1.1" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@types/yargs-15.0.14" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -95617,7 +96425,7 @@ in sources."ci-info-2.0.0" ]; }) - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" @@ -95740,7 +96548,6 @@ in }) (sources."locate-path-6.0.0" // { dependencies = [ - sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) @@ -95919,7 +96726,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object-treeify-1.1.33" sources."object-visit-1.0.1" @@ -95975,8 +96782,12 @@ in }) sources."p-finally-2.0.1" sources."p-is-promise-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.1.0" + (sources."p-locate-4.1.0" // { + dependencies = [ + sources."p-limit-2.3.0" + ]; + }) sources."p-map-4.0.0" sources."p-reduce-2.1.0" (sources."p-timeout-2.0.1" // { @@ -96126,7 +96937,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.53.1" + sources."rollup-2.53.2" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -96352,7 +97163,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.3.5" + sources."typescript-3.9.10" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -96437,7 +97248,7 @@ in ]; }) sources."word-wrap-1.2.3" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" ]; @@ -96446,15 +97257,20 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" - sources."y18n-4.0.3" + sources."y18n-5.0.8" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."cliui-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.3" + sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.2.9" sources."yarn-1.22.10" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -96732,7 +97548,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -97561,7 +98377,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -97876,12 +98692,12 @@ in ]; }) sources."@sindresorhus/is-2.1.1" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -98061,7 +98877,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -98403,10 +99219,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "11.8.2"; + version = "11.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.8.2.tgz"; - sha512 = "+TWwhsFUJrar3z1KdCdwNLW6VQkqbU6pBZQtUVMfoAaeHq/L5SAnF6CwIzE/8hmKMNvxFAEe5Ow41ibhLa2iIg=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.8.3.tgz"; + sha512 = "NslIB6Af7GagVrN+bvBkObLyawIZfOnDnl8n9MHE+dFt0aChRYtvR6T2BLJKzOPIepCLmmh0NRR/qha0ExAELQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -98510,6 +99326,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" + sources."fast-memoize-2.5.2" sources."fastq-1.11.1" sources."figgy-pudding-3.5.2" sources."fill-range-7.0.1" @@ -98605,13 +99422,10 @@ in ]; }) sources."make-fetch-happen-9.0.3" - sources."map-age-cleaner-0.1.3" - sources."mem-8.1.1" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-db-1.48.0" sources."mime-types-2.1.31" - sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -98642,7 +99456,6 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" - sources."p-defer-1.0.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-map-4.0.0" @@ -99232,7 +100045,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -99370,7 +100183,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -99382,7 +100195,7 @@ in sources."error-ex-1.3.2" (sources."es-abstract-1.18.3" // { dependencies = [ - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" ]; }) sources."es-to-primitive-1.2.1" @@ -99511,7 +100324,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -100218,7 +101031,7 @@ in ]; }) sources."serve-static-1.14.1" - (sources."service-runner-2.8.3" // { + (sources."service-runner-2.8.4" // { dependencies = [ sources."semver-7.3.5" sources."yargs-14.2.3" @@ -100478,7 +101291,7 @@ in sources."ipaddr.js-2.0.1" sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-date-object-1.0.4" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -101109,7 +101922,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."into-stream-6.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -101334,7 +102147,7 @@ in sources."ini-1.3.8" sources."ip-1.1.5" sources."is-binary-path-2.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -101814,7 +102627,7 @@ in ]; }) sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -102102,7 +102915,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."invert-kv-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-1.0.0" sources."is-stream-1.1.0" sources."is-url-1.2.4" @@ -102225,7 +103038,7 @@ in sources."pako-0.2.9" ]; }) - sources."urijs-1.19.6" + sources."urijs-1.19.7" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."vlq-0.2.3" @@ -102320,7 +103133,7 @@ in sources."mkdirp-0.5.5" sources."mute-stream-0.0.8" sources."ncp-0.4.2" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -102505,7 +103318,7 @@ in sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.8" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -102693,7 +103506,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -102922,7 +103735,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103219,7 +104032,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.4" sources."is-deflate-1.0.0" @@ -103392,7 +104205,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -104646,7 +105459,7 @@ in sources."ink-2.7.1" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."js-tokens-4.0.0" @@ -104792,10 +105605,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.53.1"; + version = "2.53.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.1.tgz"; - sha512 = "yiTCvcYXZEulNWNlEONOQVlhXA/hgxjelFSjNcrwAAIfYx/xqjSHwqg/cCaWOyFRKr+IQBaXwt723m8tCaIUiw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz"; + sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -104850,14 +105663,14 @@ in sources."@types/node-12.12.70" sources."@types/node-fetch-2.5.11" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.58.0" - sources."@typescript-eslint/eslint-plugin-4.28.2" - sources."@typescript-eslint/experimental-utils-4.28.2" - sources."@typescript-eslint/parser-4.28.2" - sources."@typescript-eslint/scope-manager-4.28.2" - sources."@typescript-eslint/types-4.28.2" - sources."@typescript-eslint/typescript-estree-4.28.2" - sources."@typescript-eslint/visitor-keys-4.28.2" + sources."@types/vscode-1.58.1" + sources."@typescript-eslint/eslint-plugin-4.28.3" + sources."@typescript-eslint/experimental-utils-4.28.3" + sources."@typescript-eslint/parser-4.28.3" + sources."@typescript-eslint/scope-manager-4.28.3" + sources."@typescript-eslint/types-4.28.3" + sources."@typescript-eslint/typescript-estree-4.28.3" + sources."@typescript-eslint/visitor-keys-4.28.3" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -105014,7 +105827,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -105076,7 +105889,7 @@ in sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."nth-check-2.0.0" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."once-1.4.0" sources."optionator-0.9.1" sources."os-homedir-1.0.2" @@ -105121,7 +105934,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.53.1" + sources."rollup-2.53.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -105293,7 +106106,7 @@ in sources."node-uuid-1.4.1" sources."node-wsfederation-0.1.1" sources."oauth-https://github.com/ciaranj/node-oauth/tarball/master" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" (sources."openid-2.0.9" // { dependencies = [ sources."qs-6.10.1" @@ -105535,7 +106348,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.13.3" // { + (sources."@serverless/components-3.13.4" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -105565,7 +106378,7 @@ in }) sources."@serverless/dashboard-plugin-5.4.3" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.2.3" // { + (sources."@serverless/platform-client-4.2.4" // { dependencies = [ sources."adm-zip-0.4.16" sources."js-yaml-3.14.1" @@ -105592,12 +106405,11 @@ in sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.2" sources."@types/caseless-0.12.2" - sources."@types/debug-4.1.6" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.171" sources."@types/long-4.0.1" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/request-2.48.6" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -105658,7 +106470,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.943.0" // { + (sources."aws-sdk-2.946.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -105925,7 +106737,7 @@ in (sources."got-11.8.2" // { dependencies = [ sources."@sindresorhus/is-4.0.1" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."cacheable-request-7.0.2" sources."decompress-response-6.0.0" sources."defer-to-connect-2.0.1" @@ -106243,7 +107055,7 @@ in sources."strip-dirs-2.1.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.1.2" + sources."strtok3-6.1.3" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" @@ -107012,10 +107824,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.658.0"; + version = "1.661.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.658.0.tgz"; - sha512 = "h39A1Y14Rr14o6Xfk78KwyLiuVGLCjpMwZQoK/6jNvaTPJAaxPG68HHuzjBJ5/j43w7AB8KBfqyf08+NKAIETA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.661.0.tgz"; + sha512 = "rsbvFX6ZGO+657CXO5VRSFpupULrjRBqy3YTlDnIuK8tXvRvDQj/hDtDqnUHzcJhUlC52hjTCGxmcXHysRnhsg=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -107093,7 +107905,7 @@ in sources."tslib-2.3.0" ]; }) - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/debug-4.1.6" sources."@types/emscripten-1.39.5" @@ -107641,7 +108453,7 @@ in sources."yallist-2.1.2" ]; }) - (sources."snyk-sbt-plugin-2.11.2" // { + (sources."snyk-sbt-plugin-2.11.3" // { dependencies = [ sources."tmp-0.1.0" ]; @@ -107773,7 +108585,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -107870,7 +108682,7 @@ in sources."ini-1.3.8" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -108148,7 +108960,7 @@ in sources."errno-0.1.8" (sources."es-abstract-1.18.3" // { dependencies = [ - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" ]; }) (sources."es-get-iterator-1.1.2" // { @@ -108721,7 +109533,7 @@ in sources."shellsubstitute-1.2.0" (sources."side-channel-1.0.4" // { dependencies = [ - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" ]; }) sources."signal-exit-3.0.3" @@ -109039,7 +109851,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.943.0" // { + (sources."aws-sdk-2.946.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -109292,7 +110104,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -109425,7 +110237,7 @@ in sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."object-hash-0.3.0" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -109857,7 +110669,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" - sources."@types/unist-2.0.5" + sources."@types/unist-2.0.6" sources."ajv-8.6.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -109877,7 +110689,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109915,7 +110727,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -109966,7 +110778,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -110157,7 +110969,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -110655,7 +111467,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" @@ -111225,7 +112037,7 @@ in sources."@textlint/types-12.0.2" sources."@textlint/utils-12.0.2" sources."@types/mdast-3.0.4" - sources."@types/unist-2.0.5" + sources."@types/unist-2.0.6" sources."ajv-8.6.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -111286,7 +112098,7 @@ in sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-date-object-1.0.4" sources."is-decimal-1.0.4" sources."is-file-1.0.0" @@ -111515,7 +112327,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse5-5.0.3" - sources."@types/unist-2.0.5" + sources."@types/unist-2.0.6" sources."acorn-8.4.1" sources."acorn-jsx-5.3.2" sources."alex-9.1.0" @@ -111653,7 +112465,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-2.0.0" @@ -112022,7 +112834,7 @@ in dependencies = [ sources."@textlint/ast-node-types-4.4.3" sources."@types/structured-source-3.0.0" - sources."@types/unist-2.0.5" + sources."@types/unist-2.0.6" sources."bail-1.0.5" sources."boundary-1.0.1" sources."buffer-from-1.1.1" @@ -112139,7 +112951,7 @@ in sources."is-regex-1.1.3" sources."is-string-1.0.6" sources."is-symbol-1.0.4" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."string.prototype.trimend-1.0.4" @@ -112246,7 +113058,7 @@ in sources."is-regex-1.1.3" sources."is-string-1.0.6" sources."is-symbol-1.0.4" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."string.prototype.trimend-1.0.4" @@ -112310,13 +113122,12 @@ in }; dependencies = [ sources."@sindresorhus/is-3.1.2" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.2" - sources."@types/debug-4.1.6" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -112701,7 +113512,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.1.2" + sources."strtok3-6.1.3" sources."supports-color-7.2.0" sources."tar-4.4.13" sources."tlds-1.208.0" @@ -113674,7 +114485,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."internmap-1.0.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."lru-cache-6.0.0" @@ -113943,7 +114754,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -114204,13 +115015,13 @@ in src = ../../misc/vscode-extensions/vscode-lldb/build-deps; dependencies = [ sources."@discoveryjs/json-ext-0.5.3" - sources."@types/eslint-7.2.14" + sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.58.0" + sources."@types/vscode-1.58.1" sources."@types/yauzl-2.9.2" sources."@ungap/promise-all-settled-1.1.2" sources."@webassemblyjs/ast-1.11.1" @@ -114254,7 +115065,7 @@ in sources."buffer-from-1.1.1" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" (sources."chalk-4.1.1" // { dependencies = [ sources."supports-color-7.2.0" @@ -114294,7 +115105,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -114342,7 +115153,7 @@ in sources."inherits-2.0.4" sources."interpret-2.2.0" sources."is-binary-path-2.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -114400,7 +115211,7 @@ in sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."nth-check-2.0.0" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."once-1.4.0" sources."onetime-5.1.2" sources."os-homedir-1.0.2" @@ -114861,8 +115672,8 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.1" - sources."@types/unist-2.0.5" + sources."@types/node-16.3.2" + sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" @@ -115216,7 +116027,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -116033,7 +116844,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -116592,11 +117403,11 @@ in sha512 = "I1S1w4QLoKmH19pX6YhYN0NiSXaWY8Ou00oA+aMcr9IUGeF5azns+IKBkfoAAG9Bu5zOIzZt/mN35OffBya8AQ=="; }; dependencies = [ - sources."@types/eslint-7.2.14" + sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -116619,11 +117430,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.772" + sources."electron-to-chromium-1.3.776" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -116708,7 +117519,7 @@ in sources."human-signals-2.1.0" sources."import-local-3.0.2" sources."interpret-2.2.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-plain-object-2.0.4" sources."is-stream-2.0.0" sources."isexe-2.0.0" @@ -116761,7 +117572,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -117397,10 +118208,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.3.1.tgz"; - sha512 = "C29onCkDUhQORBMG4+0JPOEC5zDnkXXB7ZJjJaC3WqmXvTWH4P7FfYys5uSXr/UzT3JjoqnwTWPjhunJZZkYxA=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.4.0.tgz"; + sha512 = "IWGhkJ0QocFN+2R3M79ANIes4AwDWjmqmqZRN/yAOcy/eqUBeHPXHPSb7Pj7XCp3EiejihpIY/u7O00Qc25gOw=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.2" @@ -117415,7 +118226,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -117426,7 +118237,7 @@ in sources."bep53-range-1.1.0" sources."binary-search-1.3.6" sources."bitfield-4.0.0" - (sources."bittorrent-dht-10.0.0" // { + (sources."bittorrent-dht-10.0.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -117707,7 +118518,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.2.2" // { + (sources."webtorrent-1.2.4" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -117785,10 +118596,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.21.0"; + version = "0.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.21.0.tgz"; - sha512 = "lUp4qhxfBlTieoV+pkLJq09QnwL8daYM+3abAvfRLUUKDQaKTS4hM3NjWNVdtVHS/Oc7IFY44F2K2VZ/q5kMAw=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.21.1.tgz"; + sha512 = "13Ann9t+BdAmBKsPlSWoYCISUIo+UFcAVf+YQg9wc7HdLZ0FlIhL5Mhn9+l9GMeO2PGRYEiCEAMbNiGn36Y84g=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -117861,7 +118672,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-2.6.4" // { + (sources."@npmcli/arborist-2.7.0" // { dependencies = [ sources."semver-7.3.5" ]; @@ -118167,7 +118978,7 @@ in sources."ip-regex-2.1.0" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-docker-1.1.0" sources."is-extglob-2.1.1" sources."is-finite-1.1.0" @@ -118728,7 +119539,7 @@ in }) sources."get-stream-6.0.1" sources."has-flag-4.0.0" - sources."inquirer-8.1.1" + sources."inquirer-8.1.2" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.0" sources."locate-path-6.0.0" @@ -118743,6 +119554,7 @@ in sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."restore-cursor-3.1.0" + sources."rxjs-7.2.0" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -118753,6 +119565,7 @@ in ]; }) sources."supports-color-7.2.0" + sources."tslib-2.1.0" sources."type-fest-0.21.3" sources."which-2.0.2" ]; @@ -118792,7 +119605,7 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.1" + sources."@types/node-16.3.2" sources."@types/node-fetch-2.5.11" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" From 6050b7079d602f28e13b0cc09ce2ab3387212b7c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 30 Jun 2021 19:54:56 +0200 Subject: [PATCH 090/129] cypress.tests.example: Generate files --- .../cypress-example-kitchensink.nix | 17 + .../cypress-example-kitchensink/node-env.nix | 567 + .../node-packages.nix | 10290 ++++++++++++++++ 3 files changed, 10874 insertions(+) create mode 100644 pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix create mode 100644 pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix create mode 100644 pkgs/development/web/cypress/cypress-example-kitchensink/node-packages.nix diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix new file mode 100644 index 00000000000..653dbe4a257 --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit callPackage; + inherit nodeEnv; +} diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix new file mode 100644 index 00000000000..c2b723195b7 --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix @@ -0,0 +1,567 @@ +# This file originates from node2nix + +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: + +let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node_${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit nodejs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + } // extraArgs); + + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + in + stdenv.mkDerivation ({ + name = "node-dependencies-${name}-${version}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + nodeDependencies = buildNodeDependencies args; + in + stdenv.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell < Date: Wed, 30 Jun 2021 19:54:23 +0200 Subject: [PATCH 091/129] cypress.tests.example: init --- .../cypress-example-kitchensink/README.md | 24 ++++++++ .../cypress-example-kitchensink/default.nix | 59 +++++++++++++++++++ .../cypress-example-kitchensink/regen-nix | 21 +++++++ .../cypress-example-kitchensink/regen-nix.nix | 8 +++ .../cypress-example-kitchensink/src.nix | 6 ++ pkgs/development/web/cypress/default.nix | 28 ++++++++- 6 files changed, 143 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/web/cypress/cypress-example-kitchensink/README.md create mode 100644 pkgs/development/web/cypress/cypress-example-kitchensink/default.nix create mode 100755 pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix create mode 100644 pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix.nix create mode 100644 pkgs/development/web/cypress/cypress-example-kitchensink/src.nix diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/README.md b/pkgs/development/web/cypress/cypress-example-kitchensink/README.md new file mode 100644 index 00000000000..d5a6460ed9f --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/README.md @@ -0,0 +1,24 @@ + +# `cypress-example-kitchensink` + +This directory 'packages' [cypress-example-kitchensink](https://github.com/cypress-io/cypress-example-kitchensink), +which is used in `cypress.passthru.tests`. + +The app is not really intended for deployment, so I didn't bother with actual packaging, just testing. +If your real-world app looks like `cypress-example-kitchensink`, you'll want to use Nix multiple outputs so you don't deploy your test videos along with your app. +Alternatively, you can set it up so that one derivation builds your server exe and another derivation takes that server exe and runs it with the cypress e2e tests. + +## Peculiarities + +**cypress and Cypress** are distinct names. + - `cypress` is the npm module, containing the executable `cypress` + - whereas the executable `Cypress` comes from `pkgs.cypress`, a binary distribution (as of writing) by cypress.io. + +**updateScript** is not provided for this example project. This seems preferable, + because updates to it aren't particularly valuable and have a significant overhead. + The goal is to smoke test `cypress`; not run the latest test suite (which it isn't anyway). + +## Updating + + - update the hash in `src.nix` + - run `regen-nix` diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix new file mode 100644 index 00000000000..86fec895000 --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix @@ -0,0 +1,59 @@ +{ callPackage +, cypress +, nodejs-12_x +, # FIXME: duplicated from ./regen-nix. node2nix should expose this + nodePackages +, xorg +, pkgs +, stdenv +, +}: + +let + fromNode2nix = import ./cypress-example-kitchensink.nix { + inherit pkgs; + }; + + nodeDependencies = fromNode2nix.shell.nodeDependencies.overrideAttrs (o: { + CYPRESS_INSTALL_BINARY = "0"; + PUPPETEER_SKIP_DOWNLOAD = "1"; + }); + + fontConfigEtc = ( + pkgs.nixos { config.fonts.fontconfig.enable = true; } + ).config.environment.etc.fonts.source; + +in +stdenv.mkDerivation { + name = "cypress-example-kitchensink"; + src = callPackage ./src.nix { }; + passthru.fc = fontConfigEtc; + nativeBuildInputs = [ + cypress + nodejs-12_x + xorg.xorgserver + nodePackages.jsonplaceholder + ]; + FONTCONFIG_PATH = fontConfigEtc; + postPatch = '' + # Use our own offline backend. 15011 means js0n ;) + sed -e 's^https://jsonplaceholder.cypress.io^http://localhost:15011^g' -i $(find . -type f) + ''; + buildPhase = '' + ln -s ${nodeDependencies}/lib/node_modules ./node_modules + PATH="${nodeDependencies}/bin:$PATH" + runHook preBuild + PORT=15011 jsonplaceholder & + # assumption: jsonplaceholder start far quicker than cypress run + + export CYPRESS_RUN_BINARY=${cypress}/bin/Cypress + export HOME=$PWD/home + mkdir $HOME + npm run test + runHook postBuild + ''; + installPhase = '' + mkdir $out + cp -r cypress/videos $out/ + ''; +} diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix new file mode 100755 index 00000000000..86061211d7b --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell ./regen-nix.nix +#!nix-shell -i bash + +node2nix \ + --nodejs-12 \ + --input $src/package.json \ + --lock $src/package-lock.json \ + --composition cypress-example-kitchensink.nix \ + --development \ + ; + +# node2nix produces opinionated expressions that work for in-repo packaging +# but aren't ideal for Nixpkgs: +sed -i cypress-example-kitchensink.nix \ + -e 's^fetchgit^fetchgit callPackage^' +sed -i node-packages.nix \ + -e 's^fetchgit, ^fetchgit, callPackage, ^' \ + -e 's^src = .*/nix/store/.*-source^src = callPackage ./src.nix {}^' \ + -e 's^nix-gitignore.gitignoreSourcePure^(ignore: src: src)^' \ + ; diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix.nix new file mode 100644 index 00000000000..f7276c5c2ec --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix.nix @@ -0,0 +1,8 @@ +{ pkgs ? import ../../../../.. { config = { }; overlays = [ ]; } }: + +pkgs.mkShell { + nativeBuildInputs = [ + pkgs.nodePackages.node2nix + ]; + src = pkgs.callPackage ./src.nix { }; +} diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/src.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/src.nix new file mode 100644 index 00000000000..8f9999a704f --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/src.nix @@ -0,0 +1,6 @@ +{ fetchFromGitHub }: fetchFromGitHub { + owner = "cypress-io"; + repo = "cypress-example-kitchensink"; + rev = "1572887a2003c2f35ff46d14f5f1cdfef975c9be"; + sha256 = "sha256-A7d95b9V707iOzlIg+3nItPPB8HNVVOjPhGqa8MXRPE="; +} diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 0b61aa23086..cf7d3481bf4 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,4 +1,20 @@ -{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsa-lib, udev, unzip, wrapGAppsHook, mesa }: +{ + alsa-lib, + autoPatchelfHook, + callPackage, + fetchzip, + gnome2, + gtk2, + gtk3, + lib, + mesa, + nss, + stdenv, + udev, + unzip, + wrapGAppsHook, + xorg, +}: stdenv.mkDerivation rec { pname = "cypress"; @@ -9,8 +25,6 @@ stdenv.mkDerivation rec { sha256 = "1mr46raha5aqi8ba0cqvyil5z4vcr46hnxqqmpk3fkrr8awd2897"; }; - passthru.updateScript = ./update.sh; - # don't remove runtime deps dontPatchELF = true; @@ -41,6 +55,14 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = ./update.sh; + + tests = { + example = callPackage ./cypress-example-kitchensink {}; + }; + }; + meta = with lib; { description = "Fast, easy and reliable testing for anything that runs in a browser"; homepage = "https://www.cypress.io"; From 9332afa7d30192d5e05a3a435be452e34c7140cc Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 15 Jul 2021 10:42:21 +0200 Subject: [PATCH 092/129] cypress: Format with nixpkgs-fmt --- pkgs/development/web/cypress/default.nix | 46 +++++++++++++----------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index cf7d3481bf4..811a63b0cef 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,19 +1,18 @@ -{ - alsa-lib, - autoPatchelfHook, - callPackage, - fetchzip, - gnome2, - gtk2, - gtk3, - lib, - mesa, - nss, - stdenv, - udev, - unzip, - wrapGAppsHook, - xorg, +{ alsa-lib +, autoPatchelfHook +, callPackage +, fetchzip +, gnome2 +, gtk2 +, gtk3 +, lib +, mesa +, nss +, stdenv +, udev +, unzip +, wrapGAppsHook +, xorg }: stdenv.mkDerivation rec { @@ -31,9 +30,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook unzip ]; buildInputs = with xorg; [ - libXScrnSaver libXdamage libXtst libxshmfence + libXScrnSaver + libXdamage + libXtst + libxshmfence ] ++ [ - nss gtk2 alsa-lib gnome2.GConf gtk3 + nss + gtk2 + alsa-lib + gnome2.GConf + gtk3 mesa # for libgbm ]; @@ -59,7 +65,7 @@ stdenv.mkDerivation rec { updateScript = ./update.sh; tests = { - example = callPackage ./cypress-example-kitchensink {}; + example = callPackage ./cypress-example-kitchensink { }; }; }; @@ -67,7 +73,7 @@ stdenv.mkDerivation rec { description = "Fast, easy and reliable testing for anything that runs in a browser"; homepage = "https://www.cypress.io"; license = licenses.mit; - platforms = ["x86_64-linux"]; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ tweber mmahut ]; }; } From 1a81de7c7231343983b983c4787b926919eaf169 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 15 Jul 2021 10:54:54 +0200 Subject: [PATCH 093/129] signal-desktop: 5.8.0 -> 5.9.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 9357a02a640..daf1c476e67 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.8.0"; # Please backport all updates to the stable channel. + version = "5.9.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0icwmlnnnlsj2g1p2q4lf7hlhys3rakaim7bah5qkmhwkrzkk30y"; + sha256 = "1pmyi9b0b5h6mi6dwml41x4igy8rfpsv6j67izh78m5gla8wp34h"; }; nativeBuildInputs = [ From b22b804e67e546edda690b3ae9a7d0c7cd38f37e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 15 Jul 2021 10:58:56 +0200 Subject: [PATCH 094/129] chromiumBeta: 92.0.4515.93 -> 92.0.4515.101 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a8afe2ea8af..3270024d764 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "92.0.4515.93", - "sha256": "077i1rw84cgcmg2k0p1ycg5pwvnhgsa3qdfsr7icrn7gmagagqd0", - "sha256bin64": "1gf4qv8wvaagdgsinf2gprx9wcfgm8jql6870k50bi26mjqv9800", + "version": "92.0.4515.101", + "sha256": "1jcas265hhlqd9f63h4zw4n4xsl26c5zmjlmbf1px5icvcjfb2xd", + "sha256bin64": "0sb5l5nzfzisvrnhcfwhdh9rn6z6pkzqz4p92c40q2mlhmjrfhj0", "deps": { "gn": { "version": "2021-05-07", From 393414db77d618a92067cf765c8f549b43cd6bfe Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 15 Jul 2021 11:11:03 +0200 Subject: [PATCH 095/129] gitkraken: 7.6.1 -> 7.7.0 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c0cc9d5e2b1..3e10add49d4 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.6.1"; + version = "7.7.0"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-wpfTozXxanZkYtYQHY950PLsVO4lXLt5OOP/xDCrFEw="; + sha256 = "0zb94ipi777qkznxpgb7ah31mx9b63713k92vhxhz4glna59lvk3"; }; dontBuild = true; From e22bd59820d07822e84a46d3c3f4b4a4186b8497 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 15 Jul 2021 11:29:15 +0200 Subject: [PATCH 096/129] nixos/xwayland: Correctly set the default package This will fix #129922 and also improve the descriptions and default texts. --- nixos/modules/programs/xwayland.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/nixos/modules/programs/xwayland.nix b/nixos/modules/programs/xwayland.nix index 7e9a424a715..cb3c9c5b156 100644 --- a/nixos/modules/programs/xwayland.nix +++ b/nixos/modules/programs/xwayland.nix @@ -10,14 +10,16 @@ in { options.programs.xwayland = { - enable = mkEnableOption '' - Xwayland X server allows running X programs on a Wayland compositor. - ''; + enable = mkEnableOption "Xwayland (an X server for interfacing X11 apps with the Wayland protocol)"; defaultFontPath = mkOption { type = types.str; default = optionalString config.fonts.fontDir.enable "/run/current-system/sw/share/X11/fonts"; + defaultText = literalExample '' + optionalString config.fonts.fontDir.enable + "/run/current-system/sw/share/X11/fonts"; + ''; description = '' Default font path. Setting this option causes Xwayland to be rebuilt. ''; @@ -25,7 +27,15 @@ in package = mkOption { type = types.path; - description = "The Xwayland package"; + default = pkgs.xwayland.override (oldArgs: { + inherit (cfg) defaultFontPath; + }); + defaultText = literalExample '' + pkgs.xwayland.override (oldArgs: { + inherit (config.programs.xwayland) defaultFontPath; + }); + ''; + description = "The Xwayland package to use."; }; }; @@ -37,9 +47,5 @@ in environment.systemPackages = [ cfg.package ]; - programs.xwayland.package = pkgs.xwayland.override (oldArgs: { - inherit (cfg) defaultFontPath; - }); - }; } From 0e06fbbfa08f6ffc1ad3496ee18f90e76565bbc9 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 15 Jul 2021 17:59:59 +0700 Subject: [PATCH 097/129] the-powder-toy: 95.0 -> 96.0.348 --- pkgs/games/the-powder-toy/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 703578c2d4e..1dec8da537a 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -1,28 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, scons, pkg-config, SDL2, lua, fftwFloat, - zlib, bzip2, curl, darwin }: +{ lib, stdenv, fetchFromGitHub, meson, luajit, ninja, pkg-config +, python3, SDL2, lua, fftwFloat, zlib, bzip2, curl, darwin }: stdenv.mkDerivation rec { pname = "the-powder-toy"; - version = "95.0"; + version = "96.0.348"; src = fetchFromGitHub { owner = "The-Powder-Toy"; repo = "The-Powder-Toy"; rev = "v${version}"; - sha256 = "18rp2g1mj0gklra06wm9dm57h73hmm301npndh0y8ap192i5s8sa"; + sha256 = "sha256-PAnjNeqGJPW7TeoIsaOnuOb1loyKs8pjBseKoD0CvQU="; }; - nativeBuildInputs = [ scons pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config python3 ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin - [ darwin.apple_sdk.frameworks.Cocoa ]; - - buildInputs = [ SDL2 lua fftwFloat zlib bzip2 curl ]; + buildInputs = [ luajit SDL2 lua fftwFloat zlib bzip2 curl ]; installPhase = '' - install -Dm 755 build/powder* "$out/bin/powder" + install -Dm 755 powder $out/bin/powder ''; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + enableParallelBuilding = true; meta = with lib; { From 358457208c35abb322fd622dc225ac56f846f7d3 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 15 Jul 2021 12:55:13 +0100 Subject: [PATCH 098/129] infracost: 0.9.3 -> 0.9.4 --- pkgs/tools/misc/infracost/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index c912eb3322b..3d91dd6d9ab 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "infracost"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-3AH/VUKIno/jObep5GNfIpyOW5TcfZ5UZyornJWTGOw="; + sha256 = "sha256-OQwMO9bhPK+Wjob8rAFYJQRpAYf1bPdRi2BjETjpSpE="; }; vendorSha256 = "sha256-zMEtVPyzwW4SrbpydDFDqgHEC0/khkrSxlEnQ5I0he8="; @@ -25,12 +25,7 @@ buildGoModule rec { ''; postInstall = '' - # panic if .config directory can't be accessed - # https://github.com/infracost/infracost/pull/862 - export HOME="$TMPDIR" - mkdir -p "$HOME/.config/infracost" export INFRACOST_SKIP_UPDATE_CHECK=true - installShellCompletion --cmd infracost \ --bash <($out/bin/infracost completion --shell bash) \ --fish <($out/bin/infracost completion --shell fish) \ @@ -41,10 +36,7 @@ buildGoModule rec { installCheckPhase = '' runHook preInstallCheck - export HOME="$TMPDIR" - mkdir -p "$HOME/.config/infracost" export INFRACOST_SKIP_UPDATE_CHECK=true - $out/bin/infracost --help $out/bin/infracost --version | grep "v${version}" @@ -60,7 +52,7 @@ buildGoModule rec { This helps developers, DevOps et al. quickly see the cost breakdown and compare different deployment options upfront. ''; - license = [ licenses.asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ davegallant jk ]; }; } From 1bec00a411831204ccc0c4f238ffa4ea3e0ff8e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Jul 2021 14:35:15 +0200 Subject: [PATCH 099/129] python3Packages.dill: 0.3.1.1 -> 0.3.4 --- .../python-modules/dill/default.nix | 50 +++++++++++-------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 0983805780f..ac574174278 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -1,37 +1,47 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , isPy27 -, nose +, pytestCheckHook }: buildPythonPackage rec { pname = "dill"; - version = "0.3.1.1"; + version = "0.3.4"; + doCheck = !isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "42d8ef819367516592a825746a18073ced42ca169ab1f5f4044134703e7a049c"; + src = fetchFromGitHub { + owner = "uqfoundation"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0x702gh50wb3n820p2p9w49cn4a354y207pllwc7snfxprv6hypm"; }; - # python2 can't import a test fixture - doCheck = !isPy27; - checkInputs = [ nose ]; - checkPhase = '' - PYTHONPATH=$PWD/tests:$PYTHONPATH - nosetests \ - --ignore-files="test_classdef" \ - --ignore-files="test_objects" \ - --ignore-files="test_selected" \ - --exclude="test_the_rest" \ - --exclude="test_importable" - ''; + checkInputs = [ + pytestCheckHook + ]; + # Tests seem to fail because of import pathing and referencing items/classes in modules. # Seems to be a Nix/pathing related issue, not the codebase, so disabling failing tests. + disabledTestPaths = [ + "tests/test_diff.py" + "tests/test_module.py" + "tests/test_objects.py" + ]; - meta = { + disabledTests = [ + "test_class_objects" + "test_method_decorator" + "test_importable" + "test_the_rest" + ]; + + pythonImportsCheck = [ "dill" ]; + + meta = with lib; { description = "Serialize all of python (almost)"; homepage = "https://github.com/uqfoundation/dill/"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From 5a1b72a6b183c4968ce61762929f8997b470b956 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Thu, 15 Jul 2021 15:01:53 +0200 Subject: [PATCH 100/129] mathematica: 12.3.0 -> 12.3.1 --- pkgs/applications/science/math/mathematica/l10ns.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index d9f6a0c74e8..7de63c287ea 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -8,10 +8,10 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ { - version = "12.3.0"; + version = "12.3.1"; lang = "en"; language = "English"; - sha256 = "045df045f6e796ded59f64eb2e0f1949ac88dcba1d5b6e05fb53ea0a4aed7215"; + sha256 = "51b9cab12fd91b009ea7ad4968a2c8a59e94dc55d2e6cc1d712acd5ba2c4d509"; } { version = "11.3.0"; From adaa18d64e6955c0b0fa272d6ec3110df5515433 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 15 Jul 2021 23:50:47 +0900 Subject: [PATCH 101/129] vscode-extensions.vspacecode.vspacecode: 0.9.1 -> 0.10.1 --- 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 19b816fbc77..0db089dfa05 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1335,8 +1335,8 @@ let mktplcRef = { name = "vspacecode"; publisher = "VSpaceCode"; - version = "0.9.1"; - sha256 = "sha256-/qJKYXR0DznqwF7XuJsz+OghIBzdWjm6dAlaRX4wdRU="; + version = "0.10.1"; + sha256 = "sha256-H7SCC/ZhDswMQjLX+qpQa6A1N83MobJRPC4pyIbZ1kA="; }; meta = { license = lib.licenses.mit; From 2d2162b25f5c55eab1bf434575248544a9fbd06a Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 15 Jul 2021 23:52:08 +0900 Subject: [PATCH 102/129] vscode-extensions.vspacecode.whichkey: 0.8.5 -> 0.9.2 --- 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 0db089dfa05..ecddd603d56 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1347,8 +1347,8 @@ let mktplcRef = { name = "whichkey"; publisher = "VSpaceCode"; - version = "0.8.5"; - sha256 = "sha256-p5fukIfk/tZFQrkf6VuT4fjmeGtKAqHDh6r6ky847ks="; + version = "0.9.2"; + sha256 = "sha256-f+t2d8iWW88OYzuYFxzQPnmFMgx/DELBywYhA8A/0EU="; }; meta = { license = lib.licenses.mit; From 491994686fb797cb94f7a8bec3c5ba9cdb30f4e3 Mon Sep 17 00:00:00 2001 From: Akshat Agarwal Date: Thu, 15 Jul 2021 21:42:55 +0530 Subject: [PATCH 103/129] tremor-rs: 0.11.2 -> 0.11.5 --- pkgs/tools/misc/tremor-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index 9c0a68805a6..5f6acfd9696 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tremor"; - version = "0.11.2"; + version = "0.11.5"; src = fetchFromGitHub { owner = "tremor-rs"; repo = "tremor-runtime"; rev = "v${version}"; - sha256 = "sha256-FedRwFVc+m25+Elj1Vp/fInbK6DVsUpniw29/dtecWo="; + sha256 = "sha256-fE0f0tCI2V+HqHZwn9cO+xs0o3o6w0nrJg9Et0zJMOE="; }; - cargoSha256 = "sha256-jxXoFOwoBSkn7pv10ctLpD7ko8bokc1ADkB7NQFRC7c="; + cargoHash = "sha256-dky9ejzMgKXlzpg+9bmkd7th+EHBpNmZJkgYt2pjuuI="; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; From 520ce89b2958444f3db973751b5c42888a76420e Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 15 Jul 2021 18:17:51 +0200 Subject: [PATCH 104/129] mudlet: 4.9.1 -> 4.12.0 (#126121) Co-authored-by: Sandro --- pkgs/games/mudlet/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index b6f66b30769..139baece4a6 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -1,24 +1,24 @@ -{ fetchFromGitHub, fetchpatch, lib, stdenv, wrapQtAppsHook, git, pcre, pugixml, qtbase, libsForQt5, qtmultimedia, qttools, yajl, libzip, hunspell -, boost, libGLU, lua, cmake, which, }: +{ fetchFromGitHub, lib, stdenv, wrapQtAppsHook, git, pcre, pugixml, qtbase, libsForQt5, libsecret, qtmultimedia, qttools, yajl, libzip, hunspell +, boost, libGLU, lua, cmake, which, pkg-config, }: let luaEnv = lua.withPackages(ps: with ps; [ luazip luafilesystem lrexlib-pcre luasql-sqlite3 lua-yajl luautf8 ]); in stdenv.mkDerivation rec { pname = "mudlet"; - version = "4.9.1"; + version = "4.12.0"; src = fetchFromGitHub { owner = "Mudlet"; repo = "Mudlet"; rev = "Mudlet-${version}"; fetchSubmodules = true; - sha256 = "0i022qcmlq4xwl2yh4xd5qdc0ag52605qmqqz6bim0h8f3dp8cx1"; + sha256 = "023plm5mwm15xikmdh1mq3gx1n7y4a0r0kw9fvk3rvm9brm78hzp"; }; - nativeBuildInputs = [ cmake wrapQtAppsHook git qttools which ]; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook git qttools which ]; buildInputs = [ - pcre pugixml qtbase libsForQt5.qtkeychain qtmultimedia luaEnv libzip libGLU yajl boost hunspell + pcre pugixml qtbase libsForQt5.qtkeychain qtmultimedia luaEnv libsecret libzip libGLU yajl boost hunspell ]; WITH_FONTS = "NO"; From 53ca0b16646ae358e37c396f6c5f8955977002c1 Mon Sep 17 00:00:00 2001 From: Viacheslav Lotsmanov Date: Thu, 15 Jul 2021 19:25:38 +0300 Subject: [PATCH 105/129] psi-plus: add more build options (#129710) Co-authored-by: Sandro --- .../instant-messengers/psi-plus/default.nix | 72 ++++++++++++++++--- 1 file changed, 62 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index c9b4c7e5292..01a8a71f032 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,14 +1,45 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake -, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine -, libidn, qca-qt5, libXScrnSaver, hunspell -, libsecret, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qtmultimedia +, qtx11extras +, qttools +, libidn +, qca-qt5 +, libXScrnSaver +, hunspell +, libsecret +, libgcrypt +, libotr +, html-tidy +, libgpgerror +, libsignal-protocol-c , usrsctp -# Voice messages +, chatType ? "basic" # See the assertion below for available options +, qtwebkit +, qtwebengine + +, enablePlugins ? true + + # Voice messages , voiceMessagesSupport ? true , gst_all_1 + +, enablePsiMedia ? false +, pkg-config }: +assert builtins.elem (lib.toLower chatType) [ + "basic" # Basic implementation, no web stuff involved + "webkit" # Legacy one, based on WebKit (see https://wiki.qt.io/Qt_WebKit) + "webengine" # QtWebEngine (see https://wiki.qt.io/QtWebEngine) +]; + +assert enablePsiMedia -> enablePlugins; + mkDerivation rec { pname = "psi-plus"; version = "1.5.1549"; @@ -21,19 +52,40 @@ mkDerivation rec { }; cmakeFlags = [ - "-DENABLE_PLUGINS=ON" + "-DCHAT_TYPE=${chatType}" + "-DENABLE_PLUGINS=${if enablePlugins then "ON" else "OFF"}" + "-DBUILD_PSIMEDIA=${if enablePsiMedia then "ON" else "OFF"}" ]; - nativeBuildInputs = [ cmake qttools ]; + nativeBuildInputs = [ + cmake + qttools + ] ++ lib.optionals enablePsiMedia [ + pkg-config + ]; buildInputs = [ - qtbase qtmultimedia qtx11extras qtwebengine - libidn qca-qt5 libXScrnSaver hunspell - libsecret libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c + qtbase + qtmultimedia + qtx11extras + libidn + qca-qt5 + libXScrnSaver + hunspell + libsecret + libgcrypt + libotr + html-tidy + libgpgerror + libsignal-protocol-c usrsctp ] ++ lib.optionals voiceMessagesSupport [ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ] ++ lib.optionals (chatType == "webkit") [ + qtwebkit + ] ++ lib.optionals (chatType == "webengine") [ + qtwebengine ]; preFixup = lib.optionalString voiceMessagesSupport '' From 57aff6b0ae29df302511c60d979dfe8349bd8a92 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 15 Jul 2021 18:51:53 +0200 Subject: [PATCH 106/129] fig2dev: apply patch for CVE-2021-3561 --- pkgs/applications/graphics/fig2dev/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index c7484f4cbfe..31d14185dcd 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , ghostscript , libpng , makeWrapper @@ -20,6 +21,15 @@ stdenv.mkDerivation rec { sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3"; }; + patches = [ + (fetchpatch { + name = "CVE-2021-3561.patch"; + # Using Debian patch since it is not possible to download it directly from Sourceforge + url = "https://sources.debian.org/data/main/f/fig2dev/1:3.2.8-3/debian/patches/33_sanitize-color.patch"; + sha256 = "1bppr3li03nj4qjibnddr2f38mpk55pcn5z6k98pf00gabq33fgs"; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpng ]; From d35a78fb7d744af5ba1b4b37a858306790711d64 Mon Sep 17 00:00:00 2001 From: toastal Date: Thu, 15 Jul 2021 02:02:26 +0700 Subject: [PATCH 107/129] kanit-font: init at 2020-06-16 --- pkgs/data/fonts/kanit/default.nix | 39 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/data/fonts/kanit/default.nix diff --git a/pkgs/data/fonts/kanit/default.nix b/pkgs/data/fonts/kanit/default.nix new file mode 100644 index 00000000000..9b5be79061c --- /dev/null +++ b/pkgs/data/fonts/kanit/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "kanit"; + version = "unstable-2020-06-16"; + + src = fetchFromGitHub { + owner = "cadsondemak"; + repo = pname; + rev = "467dfe842185681d8042cd608b8291199dd37cda"; + sha256 = "0p0klb0376r8ki4ap2j99j7jcsq6wgb7m1hf3j1dkncwm7ikmg3h"; + }; + + installPhase = '' + mkdir -p $out/share/doc/${pname}/css/ $out/share/fonts/{opentype,truetype} + + cp $src/OFL.txt $src/documentation/{BRIEF.md,features.html} $out/share/doc/${pname} + cp $src/documentation/css/fonts.css $out/share/doc/${pname}/css + cp $src/fonts/otf/*.otf $out/share/fonts/opentype + cp $src/fonts/ttf/*.ttf $out/share/fonts/truetype + ''; + + meta = with lib; { + homepage = "https://cadsondemak.github.io/kanit/"; + description = "A loopless Thai and sans serif Latin typeface for contemporary and futuristic uses"; + longDescription = '' + Kanit means mathematics in Thai, and the Kanit typeface family is a formal + Loopless Thai and Sans Latin design. It is a combination of concepts, + mixing a Humanist Sans Serif motif with the curves of Capsulated Geometric + styles that makes it suitable for various uses, contemporary and + futuristic. A notable detail is that the stroke terminals have flat angles, + which allows the design to enjoy decreased spacing between letters while + preserving readability and legibility at smaller point sizes. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.toastal ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9c6fb0d95e..66b25b7eeb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22310,6 +22310,8 @@ in juno-theme = callPackage ../data/themes/juno { }; + kanit-font = callPackage ../data/fonts/kanit { }; + kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {}; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; From 59a701509b0d31cede328c7ddecf209f96d6540f Mon Sep 17 00:00:00 2001 From: toastal Date: Thu, 15 Jul 2021 13:12:31 +0700 Subject: [PATCH 108/129] add toastal to maintainers --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e1e77aa83ef..3b6742d835f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10678,6 +10678,16 @@ githubId = 9853194; name = "Philipp Bartsch"; }; + toastal = { + email = "toastal+nix@posteo.net"; + github = "toastal"; + githubId = 561087; + name = "toastal"; + keys = [{ + longkeyid = "ed25519/5CCE6F1466D47C9E"; + fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E"; + }]; + }; tobim = { email = "nix@tobim.fastmail.fm"; github = "tobim"; From 08479fc25fa7d61afd5fee18399b8e87aa9c81ec Mon Sep 17 00:00:00 2001 From: foxit64 <56247270+foxit64@users.noreply.github.com> Date: Thu, 15 Jul 2021 19:36:37 +0200 Subject: [PATCH 109/129] remove foxit64 as maintainer (#130284) Co-authored-by: foxit64 Co-authored-by: Sandro --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/misc/dstask/default.nix | 2 +- pkgs/applications/misc/gopacked/default.nix | 3 +-- pkgs/servers/monitoring/telegraf/default.nix | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e1e77aa83ef..76c7f3a29dc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11878,12 +11878,6 @@ githubId = 8686360; name = "Illia Shestakov"; }; - foxit64 = { - email = "o4nsxy05@gmail.com"; - github = "foxit64"; - githubId = 56247270; - name = "Foxit"; - }; masaeedu = { email = "masaeedu@gmail.com"; github = "masaeedu"; diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index cd1c659ec5b..c17ed9b3af5 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { description = "Command line todo list with super-reliable git sync"; homepage = src.meta.homepage; license = licenses.mit; - maintainers = with maintainers; [ stianlagstad foxit64 ]; + maintainers = with maintainers; [ stianlagstad ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/applications/misc/gopacked/default.nix index 57f6be40ab0..42b886e4c72 100644 --- a/pkgs/applications/misc/gopacked/default.nix +++ b/pkgs/applications/misc/gopacked/default.nix @@ -19,7 +19,6 @@ buildGoModule rec { description = "A simple text-based Minecraft modpack manager"; license = licenses.agpl3; homepage = src.meta.homepage; - maintainers = with maintainers; [ foxit64 ]; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 0a60ebc77c5..578bb10652a 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -27,6 +27,6 @@ buildGoModule rec { description = "The plugin-driven server agent for collecting & reporting metrics"; license = licenses.mit; homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; - maintainers = with maintainers; [ mic92 roblabla timstott foxit64 ]; + maintainers = with maintainers; [ mic92 roblabla timstott ]; }; } From abae2e9fb0aae5870bb0d4fa3b2ea871d41aa5be Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Thu, 15 Jul 2021 18:47:38 +0100 Subject: [PATCH 110/129] portaudio: fix build for arm64-darwin Hydra failed to build portaudio against the MacOS SDK 11.0, see [1]. The errors stem from the fact that certain functions in the SDK have been marked as depricated. When building locally on my machine (which uses a newer SDK version) there are no such errors. Therefore, until we get #101229 fixed we can ignore these deprication errors. [1]: https://hydra.nixos.org/build/147771864/nixlog/1 --- pkgs/development/libraries/portaudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 7f5818ae1bb..840c9e773f4 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-const-int-float-conversion -Wno-error=nullability-completeness-on-arrays"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=implicit-const-int-float-conversion -Wno-error=nullability-completeness-on-arrays"; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; From 35aac5ed6652d7d7a1df6c4d72d84a41025e74b6 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 16 Jul 2021 00:54:27 +0700 Subject: [PATCH 111/129] archivy: 1.3.1 -> 1.4.0 --- pkgs/applications/misc/archivy/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index 08d5524fc3a..0a89e4f4765 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -21,11 +21,11 @@ buildPythonApplication rec { pname = "archivy"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g7H22zJOQuxSmoJ3373eRcbderC67vkuiLN1CgaytFM="; + sha256 = "sha256-wQuR7cltDLr2u8BQ851MSjKmeLW8mQ/3bdEF5c9nxL0="; }; # Relax some dependencies @@ -38,7 +38,10 @@ buildPythonApplication rec { --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ --replace 'requests ==' 'requests >=' \ --replace 'validators ==' 'validators >=' \ - --replace 'tinydb ==' 'tinydb >=' + --replace 'tinydb ==' 'tinydb >=' \ + --replace 'Flask_WTF == 0.14.3' 'Flask_WTF' \ + --replace 'Werkzeug ==' 'Werkzeug >=' \ + --replace 'Flask ==' 'Flask >=' ''; propagatedBuildInputs = [ From 79c92e4f060d019f9b81ce45cc5066d028666bf7 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Thu, 15 Jul 2021 19:04:51 +0100 Subject: [PATCH 112/129] hyperspace-cli: init at 1.5.1 Co-authored-by: Jonathan Ringer Co-authored-by: Sandro --- pkgs/development/node-packages/default.nix | 18 + .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1708 +++++++++++++++-- pkgs/top-level/all-packages.nix | 2 + 4 files changed, 1604 insertions(+), 125 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 0ee37197e82..c5524b82077 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -35,6 +35,24 @@ let ''; }; + hyperspace-cli = super."@hyperspace/cli".override { + nativeBuildInputs = with pkgs; [ + makeWrapper + libtool + autoconf + automake + ]; + buildInputs = with pkgs; [ + nodePackages.node-gyp-build + nodejs + ]; + postInstall = '' + wrapProgram "$out/bin/hyp" --prefix PATH : ${ + pkgs.lib.makeBinPath [ pkgs.nodejs ] + } + ''; + }; + coc-imselect = super.coc-imselect.override { meta.broken = since "10"; }; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 1528be8c732..d8136523f91 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -3,6 +3,7 @@ , "@antora/cli" , "@antora/site-generator-default" , "@bitwarden/cli" +, "@hyperspace/cli" , "@nestjs/cli" , "@vue/cli" , "@webassemblyjs/cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 8f5537d1b2b..8c71d806d00 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1660,6 +1660,15 @@ let sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ=="; }; }; + "@corestore/networker-1.1.0" = { + name = "_at_corestore_slash_networker"; + packageName = "@corestore/networker"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@corestore/networker/-/networker-1.1.0.tgz"; + sha512 = "Pj5Cfyfck1OJfVd4diO4UVo8qabW9O/wgDz5HeY6Okuan98KjMxrAJZG8MPk7I+mjRoYDFgFPVgssx9zv420Ag=="; + }; + }; "@cronvel/get-pixels-3.4.0" = { name = "_at_cronvel_slash_get-pixels"; packageName = "@cronvel/get-pixels"; @@ -2830,6 +2839,69 @@ let sha512 = "H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q=="; }; }; + "@hyperspace/client-1.18.0" = { + name = "_at_hyperspace_slash_client"; + packageName = "@hyperspace/client"; + version = "1.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperspace/client/-/client-1.18.0.tgz"; + sha512 = "nK7jQ8IvrHwaF8gycCuqnNm1nOukzFJxDHZcVZ9Yx1O42zgynDVjDVNFa/scOW2sCAIDAnQrAI6wO4ClrtEYfQ=="; + }; + }; + "@hyperspace/migration-tool-1.2.1" = { + name = "_at_hyperspace_slash_migration-tool"; + packageName = "@hyperspace/migration-tool"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperspace/migration-tool/-/migration-tool-1.2.1.tgz"; + sha512 = "akc8pVshSwrkJsPkpWZzCbIYr5xiXoBZk9DIBAa15DUFo/y2B9eeXDiivDEVWp5tWH9cydUpzLR0XbCUojxr9A=="; + }; + }; + "@hyperspace/rpc-1.15.1" = { + name = "_at_hyperspace_slash_rpc"; + packageName = "@hyperspace/rpc"; + version = "1.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperspace/rpc/-/rpc-1.15.1.tgz"; + sha512 = "hp+NvIGLC1KvnR0FVWxtI8ep0I+KA6qto1vtz6bNC8C012QCgQXSMXZmP67su3b8zMLwaOUTOJuhZ1u3fNjtfw=="; + }; + }; + "@hyperswarm/dht-4.0.1" = { + name = "_at_hyperswarm_slash_dht"; + packageName = "@hyperswarm/dht"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperswarm/dht/-/dht-4.0.1.tgz"; + sha512 = "wMBbz0m8rgQMERt/Ot6BGo5Y8+ovJSZmqxF0oA2xYPT8vCVBIr8g2F1BkQcLbX2iKRLXRnhic02OEq8b41M0sw=="; + }; + }; + "@hyperswarm/discovery-2.0.1" = { + name = "_at_hyperswarm_slash_discovery"; + packageName = "@hyperswarm/discovery"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperswarm/discovery/-/discovery-2.0.1.tgz"; + sha512 = "LM0DxxXYFEOZoUhN4g9VhHKGeM2mQIf8rnfSu/epBLmASAKNoKMijgGUZwhrh06wPROdBSJumjVzKl+8GPnRhA=="; + }; + }; + "@hyperswarm/hypersign-2.1.1" = { + name = "_at_hyperswarm_slash_hypersign"; + packageName = "@hyperswarm/hypersign"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperswarm/hypersign/-/hypersign-2.1.1.tgz"; + sha512 = "RcczqJsu2VScRoyJdLbxpYMBNq+73HJT3FVzDZXSOob/WqEeiN2WIvuDtvmFoufAuO/3YVfde/NpZFc/OPjmjw=="; + }; + }; + "@hyperswarm/network-2.1.0" = { + name = "_at_hyperswarm_slash_network"; + packageName = "@hyperswarm/network"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperswarm/network/-/network-2.1.0.tgz"; + sha512 = "TvRRRd//a3q+JhpSh5PaHJfnP4oLM/0eZikyDh2Z+eaJpIZP+vZwdlpPd10neTsPq1zfJX8weRjYLFHNpoMZVg=="; + }; + }; "@iarna/toml-2.2.5" = { name = "_at_iarna_slash_toml"; packageName = "@iarna/toml"; @@ -4072,13 +4144,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-15.11.4" = { + "@netlify/build-15.11.5" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "15.11.4"; + version = "15.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-15.11.4.tgz"; - sha512 = "iSTIJgj7l/lnudqTmTj3cNPQLFVxKoZZNR09vUxRe8yDd1eFcgaYZBt15UZf4DBcwxsyS0tuz4vSLbpC/gR/VQ=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-15.11.5.tgz"; + sha512 = "qsL1bvVAa5ZPIkYxo1Z4vdOcq8sDxQhyKjDqPAEasLqfX3ZTABctze3WdD6WmpyR9wzQEJLpCy1s3ncTDeiU0w=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -4117,13 +4189,13 @@ let sha512 = "5yO26VRpeXmXorl1kNYbXxgFsJSNcrDaQVnAT9XPqZ5mb7vtjEP/ddEHkNpDsYBj/Y8VBPCvkPhDizg7UPenSw=="; }; }; - "@netlify/functions-utils-1.4.6" = { + "@netlify/functions-utils-1.4.7" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.4.6.tgz"; - sha512 = "i/tu8kQ4yzPc68UFNbziMxYaGVTRO6vo5T80oMJaTwdATX2GePljImxfc8/wK9JkwVSpCd1xREKrbu3r5mYoLA=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.4.7.tgz"; + sha512 = "e0y/iUsXWJq65ZUS3mn6ACJlQ6bfVSjtV6DO8Y194tevctnArtQA+F86L08zQklyhJbEV6cmyg4QbHhbLqTNOg=="; }; }; "@netlify/git-utils-1.0.11" = { @@ -4180,22 +4252,13 @@ let sha512 = "YFi1Sf+ktQICS3tAKu7/uiGzLXgi8RNVwH9naUkziXwXQNH2oxDhKgy0/Zv5Nw0zMDJyKWrJ3xObWEC57mJ/KA=="; }; }; - "@netlify/zip-it-and-ship-it-4.13.0" = { + "@netlify/zip-it-and-ship-it-4.14.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.13.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.13.0.tgz"; - sha512 = "hBl/ipIv8nWBmza466rNUxZzjX9Ly0pUZZQCkdagLPuWD5JS98F7H5PmMEsqifFrOZQRP55MPVmqFlpV5FM9+g=="; - }; - }; - "@netlify/zip-it-and-ship-it-4.13.1" = { - name = "_at_netlify_slash_zip-it-and-ship-it"; - packageName = "@netlify/zip-it-and-ship-it"; - version = "4.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.13.1.tgz"; - sha512 = "F8ow71Zz3Kvuj/5V1X8N5gTjFfrcGYaQoLgUk4PrHYnrLH32vMQ9769uxazCl69wm5JAdQE5gfpsey9YymUBOw=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.14.0.tgz"; + sha512 = "EFUYbcB7g/7Sa4KYZaqNrqe+mJJCeoosUNl8mFyeF3qIqn0po7txSZn0/y1sgjejuv9mRKv8sm7dH8kMM/HJcg=="; }; }; "@node-red/editor-api-1.3.5" = { @@ -4288,13 +4351,13 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/arborist-2.7.0" = { + "@npmcli/arborist-2.7.1" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.7.0.tgz"; - sha512 = "wWYXW3aGdLygc5b1MGEMliVZ1fEQb8zAtz7PuIwb0gHoc1u9X3RItpIomvA4zCQsVWrlFYnQHc87aAvlD08Ekg=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.7.1.tgz"; + sha512 = "EGDHJs6dna/52BrStr/6aaRcMLrYxGbSjT4V3JzvoTBY9/w5i2+1KNepmsG80CAsGADdo6nuNnFwb7sDRm8ZAw=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -5674,13 +5737,13 @@ let sha512 = "ti5fPYivhBGCJ7rZGznMX2UJE1M5lR811WvVyBWTRJwLYVFYkhxRXKfgZUXEB0tq8vpo3V7tm3syrBd5TLPIMA=="; }; }; - "@snyk/docker-registry-v2-client-2.2.2" = { + "@snyk/docker-registry-v2-client-2.2.4" = { name = "_at_snyk_slash_docker-registry-v2-client"; packageName = "@snyk/docker-registry-v2-client"; - version = "2.2.2"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.2.2.tgz"; - sha512 = "JkkpVZ8WIWWquazoSTSFlMhYOwt+tk+EMSwOxfu/C/wtaESADCORJBe52z0fAnc+xt3eVUVrM+7prJCIJeSrMg=="; + url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.2.4.tgz"; + sha512 = "7JoxHCYAjJQBOEa11Sdb1scjtq/K4HVDlcE10pNFKbmcUn5Gcm/VDJ2RMEbG2oBdmHTTJMJ5RopIiNMSFd669w=="; }; }; "@snyk/fast-glob-3.2.6-patch" = { @@ -8617,6 +8680,15 @@ let sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; }; }; + "abstract-extension-3.1.1" = { + name = "abstract-extension"; + packageName = "abstract-extension"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-extension/-/abstract-extension-3.1.1.tgz"; + sha512 = "qmUIqQEh6ZZBKN6JfysKgCEBqI4qVexE6/N/MUJjqtQhhuGR8a16GKnK6SGFKv/n1cAlbYxLDXbtyhkxSnVYRQ=="; + }; + }; "abstract-leveldown-6.0.3" = { name = "abstract-leveldown"; packageName = "abstract-leveldown"; @@ -9310,6 +9382,15 @@ let sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="; }; }; + "ansi-colors-3.2.3" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; + sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; + }; + }; "ansi-colors-3.2.4" = { name = "ansi-colors"; packageName = "ansi-colors"; @@ -9346,6 +9427,15 @@ let sha512 = "XnTdFDQzbEewrDx8epWXdw7oqHMvv315vEtfqDiEhhWghIf4++h26c3/FMz7iTLhNrnj56DNIXpbxHZq+3s6qw=="; }; }; + "ansi-diff-stream-1.2.1" = { + name = "ansi-diff-stream"; + packageName = "ansi-diff-stream"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; + sha512 = "PaKs34INoKpTzcjyKd2GM/CCEeTyDgWKuHSgF0z7ywjpbBFj/pzQf/30v+TR6VBBLia6Mso+W2ygU22ljqbi6A=="; + }; + }; "ansi-escape-sequences-4.1.0" = { name = "ansi-escape-sequences"; packageName = "ansi-escape-sequences"; @@ -10003,6 +10093,15 @@ let sha512 = "kY0YXa72/R7ruTxDqMHCDHnhW9pYvDT+46hQ7tnVDJUb+kp9BJcnOeiRIDheKp4Kn6z630UVywIgiK+4mYgJfA=="; }; }; + "arpeecee-2.2.0" = { + name = "arpeecee"; + packageName = "arpeecee"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arpeecee/-/arpeecee-2.2.0.tgz"; + sha512 = "K6TLPj72xmqyC8sV0CgUWqO5GqmxT6Vn/y8JdraUqpTchWeOQMslvPuqACsD77cnsx/Y0Xq0lkQFzqh/uLD9lw=="; + }; + }; "arr-diff-1.1.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -11056,6 +11155,15 @@ let sha512 = "SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA=="; }; }; + "await-lock-2.1.0" = { + name = "await-lock"; + packageName = "await-lock"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/await-lock/-/await-lock-2.1.0.tgz"; + sha512 = "t7Zm5YGgEEc/3eYAicF32m/TNvL+XOeYZy9CvBUeJY/szM7frLolFylhrlZNWV/ohWhcUXygrBGjYmoQdxF4CQ=="; + }; + }; "await-semaphore-0.1.3" = { name = "await-semaphore"; packageName = "await-semaphore"; @@ -11092,6 +11200,15 @@ let sha512 = "d0fbVNHdpoeszGUcxOV8m+/kLNxUfKP5QsGwaRjcQfvEokFmvdKsvw87LhepFOa00NaI4J3jt8AbsX4mvmcChg=="; }; }; + "aws-sdk-2.947.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.947.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.947.0.tgz"; + sha512 = "m58mW/0Yg2RnRCJSzWZS8JUMhoBQ4trjKf+uJ3bD24jeV+Nf6iIHQ1s4ogP2O2XXUreSRsJNe8l0cOPSOM37Lg=="; + }; + }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -12721,6 +12838,15 @@ let sha512 = "pkDss4xFVbMb4270aCyGD3qLv92314Et+FsKzilCLxDz5DuZ2/1g3w4nmBbu6nKApPspnjG7JcwTjGZnduB1yg=="; }; }; + "blake2b-universal-1.0.1" = { + name = "blake2b-universal"; + packageName = "blake2b-universal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/blake2b-universal/-/blake2b-universal-1.0.1.tgz"; + sha512 = "vmMqpF8E9RCde8/+Su/s2rZRxOBwAYQsTyCgok4kLWhWrzMrX0CzID6pVheNJSESY0S0FNTOG4QfRJqnSLOjFA=="; + }; + }; "blake2b-wasm-1.1.7" = { name = "blake2b-wasm"; packageName = "blake2b-wasm"; @@ -13846,6 +13972,24 @@ let sha512 = "I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A=="; }; }; + "buffer-json-2.0.0" = { + name = "buffer-json"; + packageName = "buffer-json"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-json/-/buffer-json-2.0.0.tgz"; + sha512 = "+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw=="; + }; + }; + "buffer-json-encoding-1.0.2" = { + name = "buffer-json-encoding"; + packageName = "buffer-json-encoding"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-json-encoding/-/buffer-json-encoding-1.0.2.tgz"; + sha512 = "zH4Q0aqJnv0xPVX+Imcp+EbiyYg9xq7//mvShmQ08E6wC1EeYg2+1OG2n9EEu0rfiuYjP+j5LsSmQVufdqflrg=="; + }; + }; "buffer-map-0.0.7" = { name = "buffer-map"; packageName = "buffer-map"; @@ -14107,6 +14251,15 @@ let sha512 = "crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A=="; }; }; + "byte-stream-2.1.0" = { + name = "byte-stream"; + packageName = "byte-stream"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/byte-stream/-/byte-stream-2.1.0.tgz"; + sha1 = "32eecba6253821d69510b9cf34b315ce3e55b31a"; + }; + }; "bytebuffer-3.5.5" = { name = "bytebuffer"; packageName = "bytebuffer"; @@ -14719,6 +14872,15 @@ let sha512 = "eoQC/yAgW3gKTKxjzyClvi+UzuY97YCjcl+lSqbsGIy7HeGaWxCPOQFivhUYm27hgsBMhsJJFya3kGvK6PMIcQ=="; }; }; + "chacha20-universal-1.0.4" = { + name = "chacha20-universal"; + packageName = "chacha20-universal"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chacha20-universal/-/chacha20-universal-1.0.4.tgz"; + sha512 = "/IOxdWWNa7nRabfe7+oF+jVkGjlr2xUL4J8l/OvzZhj+c9RpMqoo3Dq+5nU1j/BflRV4BKnaQ4+4oH1yBpQG1Q=="; + }; + }; "chai-4.3.4" = { name = "chai"; packageName = "chai"; @@ -15133,6 +15295,15 @@ let sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; + "chokidar-3.3.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + }; + }; "chokidar-3.5.1" = { name = "chokidar"; packageName = "chokidar"; @@ -17276,13 +17447,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.28.0" = { + "contentful-management-7.29.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.28.0"; + version = "7.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.28.0.tgz"; - sha512 = "GJLgrYCJNPlkBCNW9Vn8UoTPdUZgGtVV/5vkzS+kjvS+yIiSZNyDpKAUPNVDFHWFwZr9VSUzUf94NVN/NtvidQ=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.29.0.tgz"; + sha512 = "Wdyh+uaocvR2cim3NGEA43gX5Nw/rGTijE56zgjK2UFy0lg5Vm6p3wYetVTPO5cyTvnEWeoOIk9zJHUPaJtfCg=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -17753,6 +17924,15 @@ let sha512 = "waKkgHU2P19huhuMjCqCDWTYjxCIHoB+nnYjI7pVMUOC1giWxMNDrXkPw9QjWY+PWCFm49bD3wA/J+c7BGZ+og=="; }; }; + "corestore-5.8.2" = { + name = "corestore"; + packageName = "corestore"; + version = "5.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/corestore/-/corestore-5.8.2.tgz"; + sha512 = "8OJyqGo1m3PyVvQtUoVcKYz4m4QoBAJE/2rNMJ8SD/U03NGD1z1cYep/n/32I0f3IbujYP5+4lIfBMIDkasB2w=="; + }; + }; "cors-2.8.5" = { name = "cors"; packageName = "cors"; @@ -18671,6 +18851,15 @@ let sha512 = "X3VvImImJ5q6w0wOgJtxAX+RC06d26egp/A/vdSxqOrsRtAA9biXAkc4PZGj/3gx0+z+gDFri6BpcpwuG1/UEw=="; }; }; + "custom-error-class-1.0.0" = { + name = "custom-error-class"; + packageName = "custom-error-class"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/custom-error-class/-/custom-error-class-1.0.0.tgz"; + sha512 = "bHT5BAycUbsHYexiPuoIEM/o770u48yWBrZHw/f+BRVkERn19xTgNwcHt79A/AYMxUcOfPjb9OrKoj6rVvPJuA=="; + }; + }; "custom-error-instance-2.1.1" = { name = "custom-error-instance"; packageName = "custom-error-instance"; @@ -19598,6 +19787,15 @@ let sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; }; }; + "debug-1.0.5" = { + name = "debug"; + packageName = "debug"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-1.0.5.tgz"; + sha1 = "f7241217430f99dec4c2b473eab92228e874c2ac"; + }; + }; "debug-2.2.0" = { name = "debug"; packageName = "debug"; @@ -20381,6 +20579,24 @@ let sha1 = "bd5a96d45dbed3011bb81bdf68ddf54be8e1bd4e"; }; }; + "derive-key-1.0.1" = { + name = "derive-key"; + packageName = "derive-key"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/derive-key/-/derive-key-1.0.1.tgz"; + sha512 = "7DHGLGvxFF8umw8NEGH3n9KKgEN8duk4Fiy4WmN3QgNKEogDhaNIsTDd5JVN7ilB8xw4ike1Q08z8UJSJ7hebA=="; + }; + }; + "derived-key-storage-2.1.0" = { + name = "derived-key-storage"; + packageName = "derived-key-storage"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/derived-key-storage/-/derived-key-storage-2.1.0.tgz"; + sha512 = "4RKKrpf2YouCASaRHqUvyxtHABGLH7UJWNXPjsJxMvzCj4tettUvuyGsmP2/mpGYhSda7caZkS2oP4rqWjgkZg=="; + }; + }; "des.js-1.0.1" = { name = "des.js"; packageName = "des.js"; @@ -20615,6 +20831,15 @@ let sha1 = "7f742de066fc748bc8db820569dddce49bf0d456"; }; }; + "dht-rpc-4.9.6" = { + name = "dht-rpc"; + packageName = "dht-rpc"; + version = "4.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/dht-rpc/-/dht-rpc-4.9.6.tgz"; + sha512 = "gzZPsesqOh0Lj0GxjbNhPe42tppSt9qpcMXifcwtr2i3WnhgyhjlXTFrq/po9kl4X98M7+RxwmzpXzPt7hcXwA=="; + }; + }; "di-0.0.1" = { name = "di"; packageName = "di"; @@ -20696,6 +20921,15 @@ let sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; }; }; + "diff-file-tree-2.5.1" = { + name = "diff-file-tree"; + packageName = "diff-file-tree"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diff-file-tree/-/diff-file-tree-2.5.1.tgz"; + sha512 = "blHl14Eexjh6i1KV4GmrimpmWNZss82SiFmWEfgCnCBU8SCKxNcSAazwSvpXMIHhmL5kANSXlBK0z8eIbqmgYQ=="; + }; + }; "diff-match-patch-1.0.5" = { name = "diff-match-patch"; packageName = "diff-match-patch"; @@ -23542,6 +23776,15 @@ let sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw=="; }; }; + "execa-0.4.0" = { + name = "execa"; + packageName = "execa"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; + sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; + }; + }; "execa-0.7.0" = { name = "execa"; packageName = "execa"; @@ -24289,6 +24532,15 @@ let sha512 = "0EMw4TTUxsMDpDkCg0rXor2gsg+npVrMIHbEhvD0HZyIhUX6AktC/yasm+qKwfyswd06Qy95ZKk8p2crTo0iPA=="; }; }; + "fast-fifo-1.0.0" = { + name = "fast-fifo"; + packageName = "fast-fifo"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.0.0.tgz"; + sha512 = "4VEXmjxLj7sbs8J//cn2qhRap50dGzF5n8fjay8mau+Jn4hxSeR3xPFwxMaQq/pDaq7+KQk0PAbC2+nWDkJrmQ=="; + }; + }; "fast-glob-2.2.7" = { name = "fast-glob"; packageName = "fast-glob"; @@ -24928,6 +25180,15 @@ let sha512 = "mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ=="; }; }; + "filesize-7.0.0" = { + name = "filesize"; + packageName = "filesize"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filesize/-/filesize-7.0.0.tgz"; + sha512 = "Wsstw+O1lZ9gVmOI1thyeQvODsaoId2qw14lCqIzUhoHKXX7T2hVpB7BR6SvgodMBgWccrx/y2eyV8L7tDmY6A=="; + }; + }; "filestream-5.0.0" = { name = "filestream"; packageName = "filestream"; @@ -24937,6 +25198,15 @@ let sha512 = "5H3RqSaJp12THfZiNWodYM7TiKfQvrpX+EIOrB1XvCceTys4yvfEIl8wDp+/yI8qj6Bxym8m0NYWwVXDAet/+A=="; }; }; + "filesystem-constants-1.0.0" = { + name = "filesystem-constants"; + packageName = "filesystem-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filesystem-constants/-/filesystem-constants-1.0.0.tgz"; + sha512 = "/ue62eYa8Mk53dc1XXxT1nhwat3ygWMepjrFON8tBVjtjCTVUzM8JTEAQquNoZnmimM4dbxfV9tZeEav1KUccg=="; + }; + }; "fill-range-2.2.4" = { name = "fill-range"; packageName = "fill-range"; @@ -25225,6 +25495,15 @@ let sha512 = "lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q=="; }; }; + "flat-4.1.1" = { + name = "flat"; + packageName = "flat"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz"; + sha512 = "FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA=="; + }; + }; "flat-5.0.2" = { name = "flat"; packageName = "flat"; @@ -25819,6 +26098,15 @@ let sha1 = "006775509f3935701784d3ed2fc9f12c9df1bab2"; }; }; + "freemap-1.0.1" = { + name = "freemap"; + packageName = "freemap"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/freemap/-/freemap-1.0.1.tgz"; + sha512 = "14wmuUdlwYz3KrXwbtHe30k4oHnpDQjFrbx3GIkqZjE64hpwa6WDpvs/8p+08kZbhnip49Z58PX8t08E3H8m1g=="; + }; + }; "freeport-async-2.0.0" = { name = "freeport-async"; packageName = "freeport-async"; @@ -26161,6 +26449,15 @@ let sha512 = "WsOqncODWRlkjwll+73bAxVW3JPChDgaPX3DT4iTTm73UmG4VgALa7LaFblP232/DN60itkOrPZ8kaP1feksGQ=="; }; }; + "fsctl-1.0.0" = { + name = "fsctl"; + packageName = "fsctl"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fsctl/-/fsctl-1.0.0.tgz"; + sha512 = "uNHlfhyUJiVO2kHA6ZBnDkBhG1wM8fII+xGfCi5aBoWR7DLh9Q3nOAWe4fEETQzkptahITI1xbe5r23HuA5ECA=="; + }; + }; "fsevents-1.2.13" = { name = "fsevents"; packageName = "fsevents"; @@ -26170,6 +26467,15 @@ let sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; }; }; + "fsevents-2.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + }; + }; "fsevents-2.3.2" = { name = "fsevents"; packageName = "fsevents"; @@ -26980,6 +27286,15 @@ let sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; }; }; + "glob-7.1.3" = { + name = "glob"; + packageName = "glob"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; + sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; + }; + }; "glob-7.1.6" = { name = "glob"; packageName = "glob"; @@ -27845,6 +28160,15 @@ let sha512 = "mCcISYiaRZrJpfqOs0QWa6lfEM/C1V9ASkzFmuz43XBb5s1Vynh+CZy1ECeeJXVGx2PRByjYzb4Y4/zr1byr0w=="; }; }; + "guard-timeout-2.0.0" = { + name = "guard-timeout"; + packageName = "guard-timeout"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/guard-timeout/-/guard-timeout-2.0.0.tgz"; + sha512 = "35geHv72oal0cRUE5t1tZ5KHm3OVPXzFtiMG8AnRPV5FkkEf84RUpeQ0BCeCZunfSLGATW5ZVyALhJKgM7I/6A=="; + }; + }; "gud-1.0.0" = { name = "gud"; packageName = "gud"; @@ -28718,6 +29042,15 @@ let sha512 = "C8nwzS33zKvR7grYIoHvp8wPxBvk9sEJ6dsh3Bx+T/4jNNhDksqLS73NIWqHvInjRiOsrXgEY4+h/NjNbzzh0g=="; }; }; + "hmac-blake2b-2.0.0" = { + name = "hmac-blake2b"; + packageName = "hmac-blake2b"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hmac-blake2b/-/hmac-blake2b-2.0.0.tgz"; + sha512 = "JbGNtM1YRd8EQH/2vNTAP1oy5lJVPlBFYZfCJTu3k8sqOUm0rRIf/3+MCd5noVykETwTbun6jEOc+4Tu78ubHA=="; + }; + }; "hmac-drbg-1.0.1" = { name = "hmac-drbg"; packageName = "hmac-drbg"; @@ -28853,6 +29186,24 @@ let sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; }; }; + "hrpc-2.2.0" = { + name = "hrpc"; + packageName = "hrpc"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hrpc/-/hrpc-2.2.0.tgz"; + sha512 = "iuiO+k823AGyUnwW5dfwStjNVdX881KRvYw+E9RfFbJIXUZWG7OFj0aZYJY6v0752RBWhK6/clwiU++Aau+Aqw=="; + }; + }; + "hrpc-runtime-2.1.1" = { + name = "hrpc-runtime"; + packageName = "hrpc-runtime"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hrpc-runtime/-/hrpc-runtime-2.1.1.tgz"; + sha512 = "L9fSE/eMnJat/9TtlOVKFAiw2SlvB5RH/QbtSaNcYW/oWX1lBxwdrVTTcNOCWnSNLhDBgg5llxj9oM2SACB8WA=="; + }; + }; "hs-client-0.0.9" = { name = "hs-client"; packageName = "hs-client"; @@ -29421,6 +29772,24 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; + "hyperbeam-1.1.3" = { + name = "hyperbeam"; + packageName = "hyperbeam"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperbeam/-/hyperbeam-1.1.3.tgz"; + sha512 = "yozWXZx3yXVprf/MM9WqMt5WY60Im8k6ELJDNFGfyMeO+UieITbDmkvVwMnKQA3ptWqUK8fPf/tEGgklWh7Weg=="; + }; + }; + "hyperbee-1.5.5" = { + name = "hyperbee"; + packageName = "hyperbee"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.5.5.tgz"; + sha512 = "0zX5JzBgB0kW7stpq2RXiVxzETckGuXJX43hAD5Fom60NUvpnEl6Q2VGKGjfDET04FjPCZAqA08pM2JXa48LjQ=="; + }; + }; "hypercore-7.7.1" = { name = "hypercore"; packageName = "hypercore"; @@ -29430,6 +29799,33 @@ let sha512 = "boEiPCK848pNGACW1j111tJApu530e/UPpwbHytJZlrVf3YdgUIP1KL3aSi5xJFLUnuO8GLGl4lIsSeH8TaQQA=="; }; }; + "hypercore-9.10.0" = { + name = "hypercore"; + packageName = "hypercore"; + version = "9.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore/-/hypercore-9.10.0.tgz"; + sha512 = "vMaUNcYvtiiXbnjjhj3YbBK/KZEofXfrajiJxJ8rlWVXSyh2fIJcyxTJewfh58IW5bVYNrBPui/CpPyBZiXuZQ=="; + }; + }; + "hypercore-byte-stream-1.0.12" = { + name = "hypercore-byte-stream"; + packageName = "hypercore-byte-stream"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-byte-stream/-/hypercore-byte-stream-1.0.12.tgz"; + sha512 = "JnpLfCkvH9EPRZ8JXLBUAXo+L2wRQ504yWTwtveH+cSwwx0E8I2dbxXvNIsYGDeghOlX3hka0Ng3GiYI0risZw=="; + }; + }; + "hypercore-cache-1.0.2" = { + name = "hypercore-cache"; + packageName = "hypercore-cache"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-cache/-/hypercore-cache-1.0.2.tgz"; + sha512 = "AJ/q7y6EOrXnOH/4+DVcfDygsh1ZXMRGvNc67GBNqwCt22oSCOWhRI6EJ+3HEJciM9M2oSm1WX3qg6kgRhT/Gw=="; + }; + }; "hypercore-crypto-1.0.0" = { name = "hypercore-crypto"; packageName = "hypercore-crypto"; @@ -29439,6 +29835,33 @@ let sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw=="; }; }; + "hypercore-crypto-2.3.0" = { + name = "hypercore-crypto"; + packageName = "hypercore-crypto"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-2.3.0.tgz"; + sha512 = "HdI0VKwPHVIsbkJ2kFot5XRJoQOO1rGg0G2X+Z/mrP8vfZPFD5H1wwJ5nBDp0QYsZfHjOq0nOuUoW/NgdOZofA=="; + }; + }; + "hypercore-default-storage-1.1.1" = { + name = "hypercore-default-storage"; + packageName = "hypercore-default-storage"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-default-storage/-/hypercore-default-storage-1.1.1.tgz"; + sha512 = "y7dSX3VUT4I/X5Cj0h6hcKN2R+/QQIi1HnElnCqY3tQYbVaWYljdbVe3aBQIvkRCfOgWMfe2RbCLX4N78D5syg=="; + }; + }; + "hypercore-promisifier-1.1.0" = { + name = "hypercore-promisifier"; + packageName = "hypercore-promisifier"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-promisifier/-/hypercore-promisifier-1.1.0.tgz"; + sha512 = "W4W+fhbWZ5ydLjiAwydXD0yBe9b5cHafoyedVyQ2L8PEsGCeYEr4Efrq/Fyaa/0dheNJvfJGTOs0c36FPweDnw=="; + }; + }; "hypercore-protocol-6.12.0" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; @@ -29448,6 +29871,33 @@ let sha512 = "T3oy9/7QFejqJX2RGcCUU1944e5/eKbLlSz9JPTNN1QbYFJgat/r7eTyOO8SMSLUimUmQx6YBMKhgYbdKzp7Bw=="; }; }; + "hypercore-protocol-8.0.7" = { + name = "hypercore-protocol"; + packageName = "hypercore-protocol"; + version = "8.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-8.0.7.tgz"; + sha512 = "b5TXhqXUZ+Z7M/5/PlCTgElfufDRa3EzACd7y7BA7owLkxQreaUQ58wUO7nzJppDP1bnC2Hz6Hg7nlRPc75bKw=="; + }; + }; + "hypercore-streams-1.0.1" = { + name = "hypercore-streams"; + packageName = "hypercore-streams"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-streams/-/hypercore-streams-1.0.1.tgz"; + sha512 = "OcN2zq9DEoArC84q9VCSrf9Hx1QUkR6ineCOwyOwhE4v/8aUTOx87mAk1nyjMOf76DQmF+tl2vnS2FssLx5N+Q=="; + }; + }; + "hyperdrive-10.20.0" = { + name = "hyperdrive"; + packageName = "hyperdrive"; + version = "10.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-10.20.0.tgz"; + sha512 = "ejikKQc9L8qUzmmkGe2dk/FGzisY0RTtE1Jw4WfWWXGTun9t/yZ/sV4JfamNBJRd3C0BWV6ZQYeI+1xQDuK3WQ=="; + }; + }; "hyperdrive-9.16.0" = { name = "hyperdrive"; packageName = "hyperdrive"; @@ -29475,6 +29925,15 @@ let sha512 = "JolPS374h6oS1rmz1iebFfeDDvA2nAtiHbx9VJJGMgSDSx4Q77eeY09hDgZwY7KatSKUGWnnSyydSgVUb3+8Lw=="; }; }; + "hyperdrive-schemas-2.0.0" = { + name = "hyperdrive-schemas"; + packageName = "hyperdrive-schemas"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive-schemas/-/hyperdrive-schemas-2.0.0.tgz"; + sha512 = "mzD741NjsSt3ttIaavbh3zyNdR3zy0X55HRweNRsw/JEduWjaoOZa6EXz7ly2JxuD7MvAbJxsuNPlnVl9saL6w=="; + }; + }; "hyperlinker-1.0.0" = { name = "hyperlinker"; packageName = "hyperlinker"; @@ -29493,6 +29952,42 @@ let sha512 = "fUuDOrB47PqNK/BAMOS13v41UoaqIxqSLHX6CAbOD7OfT+/GCWO1/vPLfTNutOeXrv1ikuaZ3yux+33Z9vh+rw=="; }; }; + "hyperspace-3.19.0" = { + name = "hyperspace"; + packageName = "hyperspace"; + version = "3.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperspace/-/hyperspace-3.19.0.tgz"; + sha512 = "UF6OGzy3mjJ+XuWzjDN45NMD76WsFZoiq9F9TQpG6JGkbxbM1RXjMDG9JeqnjVg8nzylTwiNkskv7JvFmkR05Q=="; + }; + }; + "hyperspace-mirroring-service-1.0.7" = { + name = "hyperspace-mirroring-service"; + packageName = "hyperspace-mirroring-service"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperspace-mirroring-service/-/hyperspace-mirroring-service-1.0.7.tgz"; + sha512 = "EL2y0WL6r0u3xjOYWAIs6QdbMbZeHIaYxqdqWbjkP2V1pwabBoDwkW57kbIhwumCikU8dfIVXtrHsPJZwCSrfA=="; + }; + }; + "hyperswarm-2.15.3" = { + name = "hyperswarm"; + packageName = "hyperswarm"; + version = "2.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperswarm/-/hyperswarm-2.15.3.tgz"; + sha512 = "bESly7s6X7cLMWCn4dsAVE/ttNbbB13o6jku2B7fV2wIV/g7NVC/yF7S3NiknGlftKn/uLU3fhMmbOfdBvQ5IA=="; + }; + }; + "hypertrie-5.1.1" = { + name = "hypertrie"; + packageName = "hypertrie"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hypertrie/-/hypertrie-5.1.1.tgz"; + sha512 = "6PjBRPsTH+hqhMpjt1QmxXMFW6XaHNXkjxH1KrL1bp8Fpz7SPOvBNSaQVttvAP6GRzDKkeLraG4q3yJiSL4IhQ=="; + }; + }; "i-0.3.6" = { name = "i"; packageName = "i"; @@ -29583,6 +30078,15 @@ let sha512 = "snvtAQRforYUI+C2+45L2LBJy/0/uQUffxv8/uwiS98fSUoXHVrFPClgzWZWxT0drwkLHJRm9inZcYzTR42GLA=="; }; }; + "identify-filetype-1.0.0" = { + name = "identify-filetype"; + packageName = "identify-filetype"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/identify-filetype/-/identify-filetype-1.0.0.tgz"; + sha1 = "ce6e29aa762f031b82852a2392a38163fad790eb"; + }; + }; "ieee754-1.1.13" = { name = "ieee754"; packageName = "ieee754"; @@ -29718,6 +30222,15 @@ let sha1 = "d140fa8f614659bd6541233097ddaac25cdd991c"; }; }; + "immediate-3.3.0" = { + name = "immediate"; + packageName = "immediate"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz"; + sha512 = "HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="; + }; + }; "immediate-chunk-store-1.0.8" = { name = "immediate-chunk-store"; packageName = "immediate-chunk-store"; @@ -30636,6 +31149,15 @@ let sha512 = "1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="; }; }; + "ipv4-peers-2.0.0" = { + name = "ipv4-peers"; + packageName = "ipv4-peers"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipv4-peers/-/ipv4-peers-2.0.0.tgz"; + sha512 = "6ZMWB3JnCWT0gISUkzChcUEkJS6+LpGRU3h10f9Mfc0usVmyIcbcTN9+QPMg29gLOY8WtaKFbM5ME8qNySoh8g=="; + }; + }; "irc-framework-4.9.0" = { name = "irc-framework"; packageName = "irc-framework"; @@ -32733,6 +33255,15 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; + "js-yaml-3.13.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + }; + }; "js-yaml-3.14.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -34417,6 +34948,15 @@ let sha512 = "SnBIDo2pdO5VXh02ZmtAyPP6/+6YTJg2ibLtl9C34pWvmtMEmRTWpra+qO/hifkUtBTOtfx6S9vLDjBsBK4gRg=="; }; }; + "level-option-wrap-1.1.0" = { + name = "level-option-wrap"; + packageName = "level-option-wrap"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/level-option-wrap/-/level-option-wrap-1.1.0.tgz"; + sha1 = "ad20e68d9f3c22c8897531cc6aa7af596b1ed129"; + }; + }; "level-packager-5.1.1" = { name = "level-packager"; packageName = "level-packager"; @@ -36442,6 +36982,15 @@ let sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; }; }; + "log-symbols-3.0.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; + sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; + }; + }; "log-symbols-4.0.0" = { name = "log-symbols"; packageName = "log-symbols"; @@ -37063,13 +37612,13 @@ let sha512 = "EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ=="; }; }; - "make-fetch-happen-9.0.3" = { + "make-fetch-happen-9.0.4" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "9.0.3"; + version = "9.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.3.tgz"; - sha512 = "uZ/9Cf2vKqsSWZyXhZ9wHHyckBrkntgbnqV68Bfe8zZenlf7D6yuGMXvHZQ+jSnzPkjosuNP1HGasj1J4h8OlQ=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz"; + sha512 = "sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg=="; }; }; "make-iterator-1.0.1" = { @@ -37972,6 +38521,15 @@ let sha512 = "fPcI4r2yH02UUgMo308CVzIuXUaRUrBzMvjXX8J4XfcHgX9Y73iB0/VLp+S3TnxnTgIGrQ3BFb7kWGR7kkyS8g=="; }; }; + "mem-0.1.1" = { + name = "mem"; + packageName = "mem"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz"; + sha1 = "24df988c3102b03c074c1b296239c5b2e6647825"; + }; + }; "mem-4.3.0" = { name = "mem"; packageName = "mem"; @@ -38278,6 +38836,15 @@ let sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; + "merkle-tree-stream-4.0.0" = { + name = "merkle-tree-stream"; + packageName = "merkle-tree-stream"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merkle-tree-stream/-/merkle-tree-stream-4.0.0.tgz"; + sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; + }; + }; "mermaid-8.11.0" = { name = "mermaid"; packageName = "mermaid"; @@ -39043,13 +39610,13 @@ let sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; }; }; - "minipass-fetch-1.3.3" = { + "minipass-fetch-1.3.4" = { name = "minipass-fetch"; packageName = "minipass-fetch"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.3.tgz"; - sha512 = "akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ=="; + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.4.tgz"; + sha512 = "TielGogIzbUEtd1LsjZFs47RWuHHfhl6TiCx1InVxApBAmQ8bL0dL5ilkLGcRvuyW/A9nE+Lvn855Ewz8S0PnQ=="; }; }; "minipass-flush-1.0.5" = { @@ -39295,6 +39862,15 @@ let sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; + "mocha-7.2.0" = { + name = "mocha"; + packageName = "mocha"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"; + sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; + }; + }; "mocha-8.4.0" = { name = "mocha"; packageName = "mocha"; @@ -39475,6 +40051,15 @@ let sha1 = "665cb9edebe80d110e658db56c31d0aef51a8f97"; }; }; + "mountable-hypertrie-2.8.0" = { + name = "mountable-hypertrie"; + packageName = "mountable-hypertrie"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mountable-hypertrie/-/mountable-hypertrie-2.8.0.tgz"; + sha512 = "UYwewr82cZvrhJRQLWJtVJRWvJv+zQnp+2SnG051yO7c4rd3auUgwWJ71LyQKfVGq7OPYG1CUtXJKqbo+bVyPw=="; + }; + }; "mout-0.5.0" = { name = "mout"; packageName = "mout"; @@ -40141,6 +40726,15 @@ let sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; }; }; + "nanoiterator-1.2.1" = { + name = "nanoiterator"; + packageName = "nanoiterator"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoiterator/-/nanoiterator-1.2.1.tgz"; + sha512 = "M7V9cvfDErMg/H3j90zIGY7Fq3vIGjnnNXwcZ/EXO4plZT3dGNwvykfslHgtbJ8prOGuu3khmc87pND0jdmkcA=="; + }; + }; "nanolru-1.0.0" = { name = "nanolru"; packageName = "nanolru"; @@ -40159,6 +40753,33 @@ let sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; + "nanoresource-1.3.0" = { + name = "nanoresource"; + packageName = "nanoresource"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoresource/-/nanoresource-1.3.0.tgz"; + sha512 = "OI5dswqipmlYfyL3k/YMm7mbERlh4Bd1KuKdMHpeoVD1iVxqxaTMKleB4qaA2mbQZ6/zMNSxCXv9M9P/YbqTuQ=="; + }; + }; + "nanoresource-promise-1.2.2" = { + name = "nanoresource-promise"; + packageName = "nanoresource-promise"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoresource-promise/-/nanoresource-promise-1.2.2.tgz"; + sha512 = "XCRcRrCoTifA6XJqYaMqlHgWFrAq6aGNnXboRa/Dxa0TNkm3S13+RWCD7/XaB4ySunAmZzx81++OS4kqkDynuA=="; + }; + }; + "nanoresource-promise-2.0.0" = { + name = "nanoresource-promise"; + packageName = "nanoresource-promise"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoresource-promise/-/nanoresource-promise-2.0.0.tgz"; + sha512 = "C4nHaVqhpRYaSiKfXPC3bOiz5mnS3N1gkDhGaWmYLxr4KTAQdWqOr2pEVw4xVmAHJgA9n9anbfuVOacS/skbIA=="; + }; + }; "nanoscheduler-1.0.3" = { name = "nanoscheduler"; packageName = "nanoscheduler"; @@ -40872,6 +41493,15 @@ let sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406"; }; }; + "node-environment-flags-1.0.6" = { + name = "node-environment-flags"; + packageName = "node-environment-flags"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; + sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; + }; + }; "node-eta-0.9.0" = { name = "node-eta"; packageName = "node-eta"; @@ -41340,6 +41970,24 @@ let sha512 = "FbuXC+lK+GU2+63D1kC1ETiZo+Z7SIi7B+mxKTCH1byrh6WFvfBCN/wpherFz0a0bjGd7EKTst/cz0yLeNngug=="; }; }; + "noise-peer-2.1.1" = { + name = "noise-peer"; + packageName = "noise-peer"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/noise-peer/-/noise-peer-2.1.1.tgz"; + sha512 = "8bzZiV7D7GbHn4dSJ89EHYSpXWhveqH+yXjylgPA8qLFAXGizLkZOadZGpIVZqtQpbHuZGI4uUxVqVGHNGzC1A=="; + }; + }; + "noise-protocol-3.0.1" = { + name = "noise-protocol"; + packageName = "noise-protocol"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/noise-protocol/-/noise-protocol-3.0.1.tgz"; + sha512 = "4rQGZvismeb4tMf91O31oDYLGntkEs4p4wa69+14juHTV4A3COtWyDck9PwBqFjg7S8TPZLCUXUdOnOZQJ5UBA=="; + }; + }; "nomnom-1.8.1" = { name = "nomnom"; packageName = "nomnom"; @@ -41745,6 +42393,15 @@ let sha512 = "PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA=="; }; }; + "npm-run-path-1.0.0" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; + sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; + }; + }; "npm-run-path-2.0.2" = { name = "npm-run-path"; packageName = "npm-run-path"; @@ -42196,6 +42853,15 @@ let sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; + "object.assign-4.1.0" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; + }; + }; "object.assign-4.1.2" = { name = "object.assign"; packageName = "object.assign"; @@ -44545,6 +45211,15 @@ let sha1 = "365417dede44430d1c11af61027facf074bdfc53"; }; }; + "path-key-1.0.0" = { + name = "path-key"; + packageName = "path-key"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; + sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; + }; + }; "path-key-2.0.1" = { name = "path-key"; packageName = "path-key"; @@ -47066,6 +47741,15 @@ let sha512 = "4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw=="; }; }; + "protocol-buffers-4.2.0" = { + name = "protocol-buffers"; + packageName = "protocol-buffers"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protocol-buffers/-/protocol-buffers-4.2.0.tgz"; + sha512 = "hNp56d5uuREVde7UqP+dmBkwzxrhJwYU5nL/mdivyFfkRZdgAgojkyBeU3jKo7ZHrjdSx6Q1CwUmYJI6INt20g=="; + }; + }; "protocol-buffers-encodings-1.1.1" = { name = "protocol-buffers-encodings"; packageName = "protocol-buffers-encodings"; @@ -47075,6 +47759,15 @@ let sha512 = "5aFshI9SbhtcMiDiZZu3g2tMlZeS5lhni//AGJ7V34PQLU5JA91Cva7TIs6inZhYikS3OpnUzAUuL6YtS0CyDA=="; }; }; + "protocol-buffers-schema-3.5.1" = { + name = "protocol-buffers-schema"; + packageName = "protocol-buffers-schema"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.1.tgz"; + sha512 = "YVCvdhxWNDP8/nJDyXLuM+UFsuPk4+1PB7WGPVDzm3HTHbzFLxQYeW2iZpS4mmnXrQJGBzt230t/BbEb7PrQaw=="; + }; + }; "protocols-1.4.8" = { name = "protocols"; packageName = "protocols"; @@ -48038,6 +48731,15 @@ let sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; }; }; + "pumpify-2.0.1" = { + name = "pumpify"; + packageName = "pumpify"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz"; + sha512 = "m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw=="; + }; + }; "punycode-1.3.2" = { name = "punycode"; packageName = "punycode"; @@ -48650,6 +49352,15 @@ let sha1 = "f7d97d92dee6665ec5f6da08c7f963cad4b2ac99"; }; }; + "random-words-1.1.1" = { + name = "random-words"; + packageName = "random-words"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-words/-/random-words-1.1.1.tgz"; + sha512 = "Rdk5EoQePyt9Tz3RjeMELi2BSaCI+jDiOkBr4U+3fyBRiiW3qqEuaegGAUMOZ4yGWlQscFQGqQpdic3mAbNkrw=="; + }; + }; "randomatic-3.1.1" = { name = "randomatic"; packageName = "randomatic"; @@ -48866,6 +49577,15 @@ let sha512 = "eizTZL2ZO0ZseLqfD4t3Qd0M3b3Nr0MBWpX81EbPMIud/1d/CSfUIx2GQK8fWiAeHoSekO5EOeFib2udTZLwYw=="; }; }; + "reachdown-1.1.0" = { + name = "reachdown"; + packageName = "reachdown"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reachdown/-/reachdown-1.1.0.tgz"; + sha512 = "6LsdRe4cZyOjw4NnvbhUd/rGG7WQ9HMopPr+kyL018Uci4kijtxcGR5kVb5Ln13k4PEE+fEFQbjfOvNw7cnXmA=="; + }; + }; "react-16.14.0" = { name = "react"; packageName = "react"; @@ -49343,6 +50063,15 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; + "readdirp-3.2.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; + }; + }; "readdirp-3.5.0" = { name = "readdirp"; packageName = "readdirp"; @@ -49613,6 +50342,15 @@ let sha512 = "Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="; }; }; + "refpool-1.2.2" = { + name = "refpool"; + packageName = "refpool"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/refpool/-/refpool-1.2.2.tgz"; + sha512 = "uxnVlknIezgMMYQu2RDU/OCkyHntFHnC68PqghdKun2z3W3t5CmAt4uDr28TcPP2GQNsTAjvX1+vpHVrjvcolg=="; + }; + }; "reftools-1.1.9" = { name = "reftools"; packageName = "reftools"; @@ -51656,6 +52394,15 @@ let sha512 = "Vnc2bItbjMw5WUtQtxLL4Atl17KaUHdLdxIb3a89CQTAo/1G1YjmiNe2GAAgZHSBi6UYRoB/oRmuJz8HLZmnmA=="; }; }; + "secretstream-stream-2.0.0" = { + name = "secretstream-stream"; + packageName = "secretstream-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/secretstream-stream/-/secretstream-stream-2.0.0.tgz"; + sha512 = "5w3SlraZgFADOa5ScmJIXB/D/Qm2rFksmRNHSs913P9Z6s9ODsknAi85zni1v0KmTd4DovNKxHr3HCObYHes7Q=="; + }; + }; "secure-compare-3.0.1" = { name = "secure-compare"; packageName = "secure-compare"; @@ -52223,6 +52970,42 @@ let sha1 = "27d171efcc82a118b99639ff581660242b506e7c"; }; }; + "sha256-universal-1.1.2" = { + name = "sha256-universal"; + packageName = "sha256-universal"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sha256-universal/-/sha256-universal-1.1.2.tgz"; + sha512 = "sheCCiEJve+8rS/fgCaXax8SpXrLzPipCvp0+VDXXjDEHw2DdYqV2PdHVNMNWZrQ3fiQjaor4rQCzYdr3g7TIA=="; + }; + }; + "sha256-wasm-2.2.1" = { + name = "sha256-wasm"; + packageName = "sha256-wasm"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sha256-wasm/-/sha256-wasm-2.2.1.tgz"; + sha512 = "OkqDgOpo86LzdWlpYVC/MfcQ1jytfR/wxPsGFJTWeEIyLaJg4spZTNQ40vuhYsLNDFidxqvMGae6u9VirkgqqA=="; + }; + }; + "sha512-universal-1.1.2" = { + name = "sha512-universal"; + packageName = "sha512-universal"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sha512-universal/-/sha512-universal-1.1.2.tgz"; + sha512 = "QGS+eFX3ycFiRl5TxIxWv5ltAYXaLpnUeLMJpnEVIB7dEI/7pw3X0kYe3msuE4XaHERReuqDKBYRrCiQsqlESQ=="; + }; + }; + "sha512-wasm-2.3.1" = { + name = "sha512-wasm"; + packageName = "sha512-wasm"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sha512-wasm/-/sha512-wasm-2.3.1.tgz"; + sha512 = "YxBYNsaHzTJh5gmk6AbD5aAvXktHy5LsjqbaEVdL60XslC4C7U23w2Mt8g+UDcvidr/K9aFZy3V71Y86Ech27A=="; + }; + }; "shallow-clone-3.0.1" = { name = "shallow-clone"; packageName = "shallow-clone"; @@ -52457,6 +53240,15 @@ let sha512 = "oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g=="; }; }; + "shuffled-priority-queue-2.1.0" = { + name = "shuffled-priority-queue"; + packageName = "shuffled-priority-queue"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shuffled-priority-queue/-/shuffled-priority-queue-2.1.0.tgz"; + sha512 = "xhdh7fHyMsr0m/w2kDfRJuBFRS96b9l8ZPNWGaQ+PMvnUnZ/Eh+gJJ9NsHBd7P9k0399WYlCLzsy18EaMfyadA=="; + }; + }; "shush-1.0.0" = { name = "shush"; packageName = "shush"; @@ -52592,6 +53384,24 @@ let sha512 = "n1STz1tfnemvYndzWakgKa0JB4s/LrUG4btXMetWB9N9ZoIAJQd0ZtWj9sBwWxIZ/X/tYdA/tq+KHfFNAGzZhQ=="; }; }; + "simple-handshake-3.0.0" = { + name = "simple-handshake"; + packageName = "simple-handshake"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-handshake/-/simple-handshake-3.0.0.tgz"; + sha512 = "8Te0vlxvhpNCMgwnWFTbRR6Re2l8hq8wyXQc3lY9dPYXFxYwVkh79LhDQHFCOWRavmbiOdfqq1l5HT/73Rn2/w=="; + }; + }; + "simple-hypercore-protocol-2.1.1" = { + name = "simple-hypercore-protocol"; + packageName = "simple-hypercore-protocol"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-hypercore-protocol/-/simple-hypercore-protocol-2.1.1.tgz"; + sha512 = "xKuomRCfDDf+r6PDOD3RD88cjOLcbJ0E3Iz9Z+daB4Sq3FVv6efKYsOytgzTfSZMzkszF9EpYHGIILdVI669qA=="; + }; + }; "simple-markdown-0.4.4" = { name = "simple-markdown"; packageName = "simple-markdown"; @@ -52601,6 +53411,15 @@ let sha512 = "ZmlNUGR1KI12sPHeQ7dQY1qM5KfOgFqClNNVO8zQ9Pg6u7gHLCPFGD+VC7MCwpGDMd1uw3Bb2TfFfR8d6bB34A=="; }; }; + "simple-message-channels-1.2.1" = { + name = "simple-message-channels"; + packageName = "simple-message-channels"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-message-channels/-/simple-message-channels-1.2.1.tgz"; + sha512 = "knSr69GKW9sCjzpoy817xQelpOASUQ53TXCBcSLDKLE7GTGpUAhZzOZYrdbX2Ig//m+8AIrNp7sM7HDNHBRzXw=="; + }; + }; "simple-peer-6.4.4" = { name = "simple-peer"; packageName = "simple-peer"; @@ -52718,6 +53537,15 @@ let sha512 = "51yTA4ZqBY0tHTsBVGy3KAmMI7ArtwSOSmfFwJnZHFL+K76RMzZLx4m59HY5HSByjGHF3q+Fmcl8e5bMF160iQ=="; }; }; + "siphash24-universal-1.0.0" = { + name = "siphash24-universal"; + packageName = "siphash24-universal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/siphash24-universal/-/siphash24-universal-1.0.0.tgz"; + sha512 = "TasWcrGz+ITPEvE6Bhz8hACI39bSuoO9aRBYk601lhFZRpkHikbmmCbD5OkBFenYUmhOCjbOSZDbaHb8+FdWkg=="; + }; + }; "sisteransi-1.0.5" = { name = "sisteransi"; packageName = "sisteransi"; @@ -53483,6 +54311,15 @@ let sha512 = "Uk+JpqHEbzsEmiMxwL7TB/ndhMEpc52KdReYXXSIX2oRFPaI7ZDlDImF8KbkFWbYl9BJRtc82AZ/kNf4/0n9KA=="; }; }; + "sodium-javascript-0.7.3" = { + name = "sodium-javascript"; + packageName = "sodium-javascript"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.7.3.tgz"; + sha512 = "J2Zzj61bo41oBO4yEM9hTaNo3J98AcmFctjRg3D7+0A5cXdB1jlQOHV1qo2NavDU3BpqCfxdHW5UXCv565zh6Q=="; + }; + }; "sodium-native-2.4.9" = { name = "sodium-native"; packageName = "sodium-native"; @@ -53510,6 +54347,15 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; + "sodium-universal-3.0.4" = { + name = "sodium-universal"; + packageName = "sodium-universal"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-3.0.4.tgz"; + sha512 = "WnBQ0GDo/82shKQHZBZT9h4q4miCtxkbzcwVLsCBPWNq4qbq8BXhKICt9nPwQAsJ43ct/rF61FKu4t0druUBug=="; + }; + }; "sonic-boom-1.4.1" = { name = "sonic-boom"; packageName = "sonic-boom"; @@ -54959,6 +55805,15 @@ let sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw=="; }; }; + "stream-equal-1.1.1" = { + name = "stream-equal"; + packageName = "stream-equal"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-equal/-/stream-equal-1.1.1.tgz"; + sha512 = "SaZxkvxujYBR6NTumhRTg/yztw2p30fzZ/jvSgQtlZFEGI7tdSNDaPbvT47QF92hx6Tar8hAhpr7ErpTNvtuCQ=="; + }; + }; "stream-exhaust-1.0.2" = { name = "stream-exhaust"; packageName = "stream-exhaust"; @@ -55139,6 +55994,15 @@ let sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; }; }; + "streamx-2.10.3" = { + name = "streamx"; + packageName = "streamx"; + version = "2.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/streamx/-/streamx-2.10.3.tgz"; + sha512 = "Ss4rEDWlTAUrIqaQsX6tNBNANHxSmbyrA5PlCji0a6xdJtVzfkEMLLrkVW5OSyr4TshiSb1WA2TqMGMUpGnouQ=="; + }; + }; "strftime-0.10.0" = { name = "strftime"; packageName = "strftime"; @@ -55895,6 +56759,15 @@ let sha512 = "cm7TQq9I8dA5LKUr+r8W7RzQlLsmTdCr6wXmjYueOoh/bQu55ODEw7GFhT42pUyoaLtO2rgmx1+8cSIjY9lR9g=="; }; }; + "subleveldown-5.0.1" = { + name = "subleveldown"; + packageName = "subleveldown"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/subleveldown/-/subleveldown-5.0.1.tgz"; + sha512 = "cVqd/URpp7si1HWu5YqQ3vqQkjuolAwHypY1B4itPlS71/lsf6TQPZ2Y0ijT22EYVkvH5ove9JFJf4u7VGPuZw=="; + }; + }; "subscriptions-transport-ws-0.9.19" = { name = "subscriptions-transport-ws"; packageName = "subscriptions-transport-ws"; @@ -56075,6 +56948,15 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; + "supports-color-6.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; + sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; + }; + }; "supports-color-6.1.0" = { name = "supports-color"; packageName = "supports-color"; @@ -56859,6 +57741,15 @@ let sha512 = "HIeWmj77uOOHb0QX7siN3OtwV3CTntquin6TNVg6SHOqCP3hYKmox90eeFOGaY1MqJ9WYDDjkyZrW6qS5AWpbw=="; }; }; + "tempy-0.1.0" = { + name = "tempy"; + packageName = "tempy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tempy/-/tempy-0.1.0.tgz"; + sha1 = "8527413cd07100834fcc9cbb8242be95ba0e1fee"; + }; + }; "tempy-0.2.1" = { name = "tempy"; packageName = "tempy"; @@ -57345,6 +58236,15 @@ let sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; }; }; + "thunky-map-1.0.1" = { + name = "thunky-map"; + packageName = "thunky-map"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky-map/-/thunky-map-1.0.1.tgz"; + sha512 = "RC34aHdxC9CYpvuO1TLBnsFa2G9KWFvUbbIbYnqX3hWdUfECWUzjDmv1XRgjRsQ9oGVmUZC+pOD4fAUWB6HU4Q=="; + }; + }; "tildify-1.2.0" = { name = "tildify"; packageName = "tildify"; @@ -57363,6 +58263,15 @@ let sha1 = "afb89542301c3b5010d118c66b5d63920f5e9a7a"; }; }; + "time-ordered-set-1.0.2" = { + name = "time-ordered-set"; + packageName = "time-ordered-set"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/time-ordered-set/-/time-ordered-set-1.0.2.tgz"; + sha512 = "vGO99JkxvgX+u+LtOKQEpYf31Kj3i/GNwVstfnh4dyINakMgeZCpew1e3Aj+06hEslhtHEd52g7m5IV+o1K8Mw=="; + }; + }; "time-stamp-1.1.0" = { name = "time-stamp"; packageName = "time-stamp"; @@ -59136,6 +60045,15 @@ let sha512 = "9QqdvpGQTXgxthP+lY4e/gIBy+RuqcBaC6JVwT5I3bDLgT/btL6twZMR0pI3/Fgah9G/pdwzIprE5gL6v9UvyQ=="; }; }; + "uint64be-3.0.0" = { + name = "uint64be"; + packageName = "uint64be"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uint64be/-/uint64be-3.0.0.tgz"; + sha512 = "mliiCSrsE29aNBI7O9W5gGv6WmA9kBR8PtTt6Apaxns076IRdYrrtFhXHEWMj5CSum3U7cv7/pi4xmi4XsIOqg=="; + }; + }; "ultron-1.0.2" = { name = "ultron"; packageName = "ultron"; @@ -60369,6 +61287,15 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; + "username-2.3.0" = { + name = "username"; + packageName = "username"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/username/-/username-2.3.0.tgz"; + sha1 = "ba37dd53ac7d6225e77730fdd79244f1fc058e1e"; + }; + }; "username-5.1.0" = { name = "username"; packageName = "username"; @@ -61540,6 +62467,15 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; + "vm2-3.9.3" = { + name = "vm2"; + packageName = "vm2"; + version = "3.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.3.tgz"; + sha512 = "smLS+18RjXYMl9joyJxMNI9l4w7biW8ilSDaVRvFBDwOH8P0BK1ognFQTpg0wyQ6wIKLTblHJvROW692L/E53Q=="; + }; + }; "voc-1.2.0" = { name = "voc"; packageName = "voc"; @@ -64097,6 +65033,15 @@ let sha512 = "3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q=="; }; }; + "xor-distance-2.0.0" = { + name = "xor-distance"; + packageName = "xor-distance"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xor-distance/-/xor-distance-2.0.0.tgz"; + sha512 = "AsAqZfPAuWx7qB/0kyRDUEvoU3QKsHWzHU9smFlkaiprEpGfJ/NBbLze2Uq0rdkxCxkNM9uOLvz/KoNBCbZiLQ=="; + }; + }; "xorshift-0.2.1" = { name = "xorshift"; packageName = "xorshift"; @@ -64151,6 +65096,15 @@ let sha512 = "zd3ytX2cm+tcSndRU+krm0eL4TMMpZE7evs5hLRAoOy6gviqLfe3qOlkjF3i5SeAkQUCeJk0lJZrEU56kHRfWw=="; }; }; + "xsalsa20-universal-1.0.0" = { + name = "xsalsa20-universal"; + packageName = "xsalsa20-universal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xsalsa20-universal/-/xsalsa20-universal-1.0.0.tgz"; + sha512 = "0M/X61wiKKAGAMqsxEyJ0kY6NtjpcMiKinYSSsl4K7ypgvqXDTMwQK6hxnYE1s1Jm7h6YKcN8obDUg2CC+jVGA=="; + }; + }; "xspfr-0.3.1" = { name = "xspfr"; packageName = "xspfr"; @@ -64583,6 +65537,15 @@ let sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; }; }; + "yargs-unparser-1.6.0" = { + name = "yargs-unparser"; + packageName = "yargs-unparser"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz"; + sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="; + }; + }; "yargs-unparser-2.0.0" = { name = "yargs-unparser"; packageName = "yargs-unparser"; @@ -64673,6 +65636,15 @@ let sha512 = "Bu3kN5sTOyAcbO/cKEQf6KOxsLta9oRF59saLOKnt3OQM+hXapnWaAHcrat3dygd6l34KjxwM5AMJp09TDa8yw=="; }; }; + "yesno-0.3.1" = { + name = "yesno"; + packageName = "yesno"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yesno/-/yesno-0.3.1.tgz"; + sha512 = "7RbCXegyu6DykWPWU0YEtW8gFJH8KBL2d5l2fqB0XpkH0Y9rk59YSSWpzEv7yNJBGAouPc67h3kkq0CZkpBdFw=="; + }; + }; "yn-3.1.1" = { name = "yn"; packageName = "yn"; @@ -64986,14 +65958,14 @@ in sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" - sources."make-fetch-happen-9.0.3" + sources."make-fetch-happen-9.0.4" sources."mime-db-1.48.0" sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -65601,6 +66573,511 @@ in bypassCache = true; reconstructLock = true; }; + "@hyperspace/cli" = nodeEnv.buildNodePackage { + name = "_at_hyperspace_slash_cli"; + packageName = "@hyperspace/cli"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperspace/cli/-/cli-1.5.1.tgz"; + sha512 = "+VU/4tWRLf8jVMYyYo1A/rzkZHg0F3LLSvxNti0515a8VD8iyGbyd07nbh88yZC0SWpzMtUZ9ULtKXB2E53MWQ=="; + }; + dependencies = [ + sources."@corestore/networker-1.1.0" + sources."@hyperspace/client-1.18.0" + sources."@hyperspace/migration-tool-1.2.1" + sources."@hyperspace/rpc-1.15.1" + sources."@hyperswarm/dht-4.0.1" + sources."@hyperswarm/discovery-2.0.1" + sources."@hyperswarm/hypersign-2.1.1" + sources."@hyperswarm/network-2.1.0" + sources."@leichtgewicht/ip-codec-2.0.2" + sources."@types/node-16.3.2" + sources."abstract-extension-3.1.1" + sources."abstract-leveldown-6.2.3" + sources."ansi-colors-3.2.3" + (sources."ansi-diff-stream-1.2.1" // { + dependencies = [ + sources."through2-2.0.5" + ]; + }) + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."anymatch-3.1.2" + sources."argparse-1.0.10" + sources."arpeecee-2.2.0" + sources."array-lru-1.1.1" + sources."atomic-batcher-1.0.2" + sources."await-lock-2.1.0" + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + sources."binary-extensions-2.2.0" + (sources."bitfield-rle-2.2.1" // { + dependencies = [ + sources."varint-4.0.1" + ]; + }) + sources."blake2b-2.1.3" + sources."blake2b-universal-1.0.1" + sources."blake2b-wasm-1.1.7" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browser-stdout-1.3.1" + sources."buffer-5.7.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.1" + sources."buffer-json-2.0.0" + sources."buffer-json-encoding-1.0.2" + sources."bulk-write-stream-1.1.4" + (sources."byte-stream-2.1.0" // { + dependencies = [ + sources."debug-1.0.5" + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."bytes-3.1.0" + sources."call-bind-1.0.2" + sources."call-me-maybe-1.0.1" + sources."camelcase-5.3.1" + (sources."chacha20-universal-1.0.4" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."chalk-1.1.3" + sources."chokidar-3.5.2" + sources."cliclopts-1.1.1" + (sources."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."wrap-ansi-5.1.0" + ]; + }) + sources."clone-2.1.2" + sources."codecs-2.2.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."concat-map-0.0.1" + (sources."concat-stream-2.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."core-util-is-1.0.2" + sources."corestore-5.8.2" + sources."count-trailing-zeros-1.0.1" + sources."cross-spawn-async-2.2.5" + sources."crypto-random-string-1.0.0" + sources."custom-error-class-1.0.0" + sources."dat-encoding-5.0.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."deferred-leveldown-5.3.0" + sources."define-properties-1.1.3" + sources."defined-0.0.0" + sources."derive-key-1.0.1" + sources."derived-key-storage-2.1.0" + sources."dht-rpc-4.9.6" + sources."diff-3.5.0" + (sources."diff-file-tree-2.5.1" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + sources."dns-packet-5.3.0" + sources."duplexify-3.7.1" + sources."emoji-regex-7.0.3" + sources."encoding-down-6.3.0" + sources."end-of-stream-1.4.4" + sources."errno-0.1.8" + (sources."es-abstract-1.18.3" // { + dependencies = [ + sources."object.assign-4.1.2" + ]; + }) + sources."es-to-primitive-1.2.1" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."execa-0.4.0" + sources."fast-bitfield-1.2.2" + sources."fast-fifo-1.0.0" + sources."fd-lock-1.2.0" + sources."filesystem-constants-1.0.0" + sources."fill-range-7.0.1" + sources."find-up-3.0.0" + sources."flat-4.1.1" + sources."flat-tree-1.8.0" + sources."freemap-1.0.1" + sources."fs.realpath-1.0.0" + sources."fsctl-1.0.0" + sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."generate-function-2.3.1" + sources."generate-object-property-1.2.0" + sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.1.1" + sources."glob-7.1.3" + sources."glob-parent-5.1.2" + sources."growl-1.10.5" + sources."guard-timeout-2.0.0" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-bigints-1.0.1" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" + sources."hashlru-2.3.0" + sources."he-1.2.0" + sources."hmac-blake2b-2.0.0" + sources."hrpc-2.2.0" + sources."hrpc-runtime-2.1.1" + sources."hyperbeam-1.1.3" + sources."hyperbee-1.5.5" + sources."hypercore-9.10.0" + (sources."hypercore-byte-stream-1.0.12" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."hypercore-cache-1.0.2" + (sources."hypercore-crypto-2.3.0" // { + dependencies = [ + sources."uint64be-3.0.0" + ]; + }) + sources."hypercore-default-storage-1.1.1" + sources."hypercore-promisifier-1.1.0" + (sources."hypercore-protocol-8.0.7" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."hypercore-streams-1.0.1" + sources."hyperdrive-10.20.0" + sources."hyperdrive-schemas-2.0.0" + sources."hyperspace-3.19.0" + (sources."hyperspace-mirroring-service-1.0.7" // { + dependencies = [ + sources."nanoresource-promise-2.0.0" + ]; + }) + sources."hyperswarm-2.15.3" + sources."hypertrie-5.1.1" + sources."identify-filetype-1.0.0" + sources."ieee754-1.2.1" + sources."immediate-3.3.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."inspect-custom-symbol-1.1.1" + sources."ipv4-peers-2.0.0" + sources."is-bigint-1.0.2" + sources."is-binary-path-2.1.0" + sources."is-boolean-object-1.1.1" + sources."is-buffer-2.0.5" + sources."is-callable-1.2.3" + sources."is-core-module-2.5.0" + sources."is-date-object-1.0.4" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" + sources."is-negative-zero-2.0.1" + sources."is-number-7.0.0" + sources."is-number-object-1.0.5" + sources."is-options-1.0.1" + sources."is-property-1.0.2" + sources."is-regex-1.1.3" + sources."is-stream-1.1.0" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."js-yaml-3.13.1" + sources."k-bucket-5.1.0" + sources."last-one-wins-1.0.4" + sources."level-6.0.1" + sources."level-codec-9.0.2" + sources."level-concat-iterator-2.0.1" + sources."level-errors-2.0.1" + (sources."level-iterator-stream-4.0.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."level-js-5.0.2" + sources."level-option-wrap-1.1.0" + sources."level-packager-5.1.1" + sources."level-supports-1.0.1" + (sources."leveldown-5.6.0" // { + dependencies = [ + sources."node-gyp-build-4.1.1" + ]; + }) + sources."levelup-4.4.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.21" + (sources."log-symbols-3.0.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."supports-color-5.5.0" + ]; + }) + sources."lru-cache-4.1.5" + sources."ltgt-2.2.1" + sources."mem-0.1.1" + sources."memory-pager-1.5.0" + sources."merkle-tree-stream-4.0.0" + sources."mime-1.6.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-1.0.4" + sources."mkdirp-classic-0.5.3" + (sources."mocha-7.2.0" // { + dependencies = [ + sources."chokidar-3.3.0" + sources."debug-3.2.6" + sources."fsevents-2.1.3" + sources."mkdirp-0.5.5" + sources."ms-2.1.1" + sources."readdirp-3.2.0" + sources."supports-color-6.0.0" + ]; + }) + sources."moment-2.29.1" + sources."mountable-hypertrie-2.8.0" + sources."ms-2.0.0" + sources."multicast-dns-7.2.3" + sources."mutexify-1.3.1" + sources."nanoassert-1.1.0" + sources."nanoguard-1.3.0" + sources."nanoiterator-1.2.1" + sources."nanoresource-1.3.0" + sources."nanoresource-promise-1.2.2" + sources."napi-macros-2.0.0" + sources."node-environment-flags-1.0.6" + sources."node-gyp-build-4.2.3" + (sources."noise-peer-2.1.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + (sources."noise-protocol-3.0.1" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."normalize-path-3.0.0" + sources."npm-run-path-1.0.0" + sources."object-assign-4.1.1" + sources."object-inspect-1.11.0" + sources."object-keys-1.1.1" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.1.2" + sources."once-1.4.0" + sources."p-debounce-2.1.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-1.0.0" + sources."path-parse-1.0.7" + sources."picomatch-2.3.0" + sources."pify-2.3.0" + sources."pretty-bytes-4.0.2" + sources."pretty-hash-1.0.1" + sources."process-nextick-args-2.0.1" + sources."progress-string-1.2.2" + sources."protocol-buffers-4.2.0" + sources."protocol-buffers-encodings-1.1.1" + sources."protocol-buffers-schema-3.5.1" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."pump-3.0.0" + (sources."pumpify-2.0.1" // { + dependencies = [ + sources."duplexify-4.1.1" + sources."readable-stream-3.6.0" + ]; + }) + sources."random-access-file-2.2.0" + sources."random-access-memory-3.1.2" + sources."random-access-storage-1.4.1" + sources."random-words-1.1.1" + sources."randombytes-2.1.0" + sources."range-parser-1.2.1" + sources."reachdown-1.1.0" + sources."readable-stream-2.3.7" + sources."readdirp-3.6.0" + sources."record-cache-1.1.1" + sources."refpool-1.2.2" + sources."remove-trailing-separator-1.1.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-1.20.0" + sources."safe-buffer-5.1.2" + (sources."secretstream-stream-2.0.0" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."sha256-universal-1.1.2" + (sources."sha256-wasm-2.2.1" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."sha512-universal-1.1.2" + (sources."sha512-wasm-2.3.1" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."shuffled-priority-queue-2.1.0" + sources."signed-varint-2.0.1" + (sources."simple-handshake-3.0.0" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."simple-hypercore-protocol-2.1.1" + sources."simple-message-channels-1.2.1" + (sources."siphash24-1.2.0" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."siphash24-universal-1.0.0" + (sources."sodium-javascript-0.7.3" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."sodium-native-3.2.1" + (sources."sodium-universal-3.0.4" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."sparse-bitfield-3.0.3" + sources."speedometer-1.1.0" + sources."sprintf-js-1.0.3" + sources."stream-collector-1.0.1" + sources."stream-equal-1.1.1" + sources."stream-shift-1.0.1" + sources."streamx-2.10.3" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + (sources."subcommand-2.1.1" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + (sources."subleveldown-5.0.1" // { + dependencies = [ + sources."abstract-leveldown-6.3.0" + ]; + }) + sources."supports-color-2.0.0" + sources."temp-dir-1.0.0" + sources."tempy-0.1.0" + sources."textextensions-5.12.0" + (sources."through2-4.0.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."thunky-1.1.0" + sources."thunky-map-1.0.1" + sources."time-ordered-set-1.0.2" + sources."timeout-refresh-1.0.3" + sources."to-regex-range-5.0.1" + sources."typedarray-0.0.6" + sources."uint64be-2.0.2" + sources."unbox-primitive-1.0.1" + sources."unique-string-1.0.0" + (sources."unixify-1.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."unordered-array-remove-1.0.2" + sources."unordered-set-2.0.1" + sources."username-2.3.0" + sources."util-deprecate-1.0.2" + (sources."utp-native-2.5.3" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."varint-5.0.0" + sources."vm2-3.9.3" + sources."which-1.3.1" + sources."which-boxed-primitive-1.0.2" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) + sources."wrappy-1.0.2" + sources."xor-distance-2.0.0" + sources."xsalsa20-1.1.0" + sources."xsalsa20-universal-1.0.0" + sources."xtend-4.0.2" + sources."y18n-4.0.3" + sources."yallist-2.1.2" + (sources."yargs-13.3.2" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."yargs-parser-13.1.2" + sources."yargs-unparser-1.6.0" + sources."yesno-0.3.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A CLI for the hyper:// space network."; + homepage = "https://github.com/hypercore-protocol/hypercore-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; @@ -72264,10 +73741,10 @@ in coc-solargraph = nodeEnv.buildNodePackage { name = "coc-solargraph"; packageName = "coc-solargraph"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.2.1.tgz"; - sha512 = "7e+5qluZxgGrw3l/3ib3BLPm2XlfHp1Gxkcb33vmJAw4CC0TDCB+pw2DyWPVGC3t68rLGGAzo5pYCtaGRoxojw=="; + url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.2.2.tgz"; + sha512 = "KwL3QM6RXsungMkjF0wXsJ6CZuP5h/Lll54Hs49OTJskbQaJTh98DCaCWiIKqBXIuAfxaESEQNihLT2MyefL+Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -73570,7 +75047,7 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-9.0.3" + sources."make-fetch-happen-9.0.4" sources."md5-file-5.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -73587,7 +75064,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -79804,7 +81281,7 @@ in sources."semver-5.7.1" ]; }) - (sources."make-fetch-happen-9.0.3" // { + (sources."make-fetch-happen-9.0.4" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -79862,7 +81339,7 @@ in sources."minipass-3.1.3" ]; }) - (sources."minipass-fetch-1.3.3" // { + (sources."minipass-fetch-1.3.4" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -82406,7 +83883,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" @@ -83887,7 +85364,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.28.0" + sources."contentful-management-7.29.0" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { @@ -88263,7 +89740,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.946.0" // { + (sources."aws-sdk-2.947.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -91761,7 +93238,7 @@ in sources."semver-5.7.1" ]; }) - sources."make-fetch-happen-9.0.3" + sources."make-fetch-happen-9.0.4" sources."map-obj-4.2.1" (sources."meow-8.1.2" // { dependencies = [ @@ -91798,7 +93275,7 @@ in }) sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -95302,10 +96779,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "4.3.2"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.3.2.tgz"; - sha512 = "7Ay83ddXvtUrwksfrpz6w69aGQzTIM4j0DQaqlvPWoPObfPxauIScOcFlFvTaAR+bAsPjpNqE17UpKcqPaDlJA=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.4.2.tgz"; + sha512 = "VR0FrWp5wRUxTSTq/RDv6Lybhi/KL8UCf1pQN6xyUDBamysfPneunOB/TNa29cazM+AXslVYxe8VnDJxMjBaiA=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -95439,30 +96916,12 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-15.11.4" // { + (sources."@netlify/build-15.11.5" // { dependencies = [ - (sources."@netlify/zip-it-and-ship-it-4.13.1" // { - dependencies = [ - sources."execa-5.1.1" - sources."locate-path-6.0.0" - sources."p-locate-5.0.0" - sources."pkg-dir-5.0.0" - sources."semver-7.3.5" - sources."yargs-16.2.0" - ]; - }) sources."ansi-styles-4.3.0" sources."boxen-4.2.0" sources."chalk-3.0.0" - sources."cp-file-9.1.0" - (sources."execa-3.4.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."human-signals-1.1.1" - ]; - }) - sources."get-stream-6.0.1" - sources."human-signals-2.1.0" + sources."execa-3.4.0" sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" @@ -95493,18 +96952,11 @@ in sources."@netlify/esbuild-0.13.6" (sources."@netlify/framework-info-5.7.2" // { dependencies = [ + sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - (sources."@netlify/functions-utils-1.4.6" // { - dependencies = [ - sources."@netlify/zip-it-and-ship-it-4.13.1" - sources."cp-file-9.1.0" - sources."pkg-dir-5.0.0" - sources."resolve-2.0.0-next.3" - sources."yargs-16.2.0" - ]; - }) + sources."@netlify/functions-utils-1.4.7" (sources."@netlify/git-utils-1.0.11" // { dependencies = [ sources."braces-3.0.2" @@ -95519,7 +96971,6 @@ in (sources."@netlify/plugin-edge-handlers-1.11.21" // { dependencies = [ sources."@types/node-14.17.5" - sources."typescript-4.3.5" ]; }) sources."@netlify/plugins-list-2.19.2" @@ -95529,12 +96980,17 @@ in sources."execa-3.4.0" ]; }) - (sources."@netlify/zip-it-and-ship-it-4.13.0" // { + (sources."@netlify/zip-it-and-ship-it-4.14.0" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."cliui-7.0.4" sources."cp-file-9.1.0" sources."pkg-dir-5.0.0" sources."resolve-2.0.0-next.3" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" ]; }) (sources."@nodelib/fs.scandir-2.1.5" // { @@ -95587,8 +97043,10 @@ in }) (sources."@oclif/errors-1.3.5" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."clean-stack-3.0.1" sources."escape-string-regexp-4.0.0" + sources."wrap-ansi-7.0.0" ]; }) sources."@oclif/linewrap-1.0.0" @@ -95815,8 +97273,10 @@ in }) (sources."boxen-5.0.1" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."camelcase-6.2.0" sources."type-fest-0.20.2" + sources."wrap-ansi-7.0.0" ]; }) sources."brace-expansion-1.1.11" @@ -95922,7 +97382,7 @@ in ]; }) sources."cli-width-2.2.1" - sources."cliui-7.0.4" + sources."cliui-6.0.0" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -96078,7 +97538,11 @@ in sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - sources."detective-typescript-7.0.0" + (sources."detective-typescript-7.0.0" // { + dependencies = [ + sources."typescript-3.9.10" + ]; + }) (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -96548,6 +98012,7 @@ in }) (sources."locate-path-6.0.0" // { dependencies = [ + sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) @@ -96782,12 +98247,8 @@ in }) sources."p-finally-2.0.1" sources."p-is-promise-1.1.0" - sources."p-limit-3.1.0" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."p-map-4.0.0" sources."p-reduce-2.1.0" (sources."p-timeout-2.0.1" // { @@ -97163,7 +98624,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-3.9.10" + sources."typescript-4.3.5" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -97248,7 +98709,7 @@ in ]; }) sources."word-wrap-1.2.3" - (sources."wrap-ansi-7.0.0" // { + (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" ]; @@ -97257,20 +98718,15 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" - sources."y18n-5.0.8" + sources."y18n-4.0.3" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."cliui-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-20.2.9" + sources."yargs-parser-18.1.3" sources."yarn-1.22.10" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -97367,7 +98823,7 @@ in sources."minimatch-3.0.4" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" @@ -99421,7 +100877,7 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-9.0.3" + sources."make-fetch-happen-9.0.4" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-db-1.48.0" @@ -99431,7 +100887,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -106312,10 +107768,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.51.2"; + version = "2.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.51.2.tgz"; - sha512 = "I2g7zrS9cGNfwMJFQiypUX0DlrxgbhRrmIWyhq784FFljgssEN/6dq5sYBp0nBaK5yPBlqSWILXzQ3jaeG7vIw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.52.0.tgz"; + sha512 = "MoEA+YLQsfknLuc2d/uV8vTehnAsAJqOXCyQLOZn3/QQ+rdwUFzasbg0m+zZdNMespfcHDTTht+CUgS2/svUJw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -106470,7 +107926,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.946.0" // { + (sources."aws-sdk-2.947.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -106650,6 +108106,7 @@ in sources."dir-glob-3.0.1" sources."dot-qs-0.2.0" sources."dotenv-10.0.0" + sources."dotenv-expand-5.1.0" sources."duplexer3-0.1.4" sources."duplexify-4.1.1" sources."duration-0.2.2" @@ -106702,7 +108159,7 @@ in sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" - sources."filesize-6.4.0" + sources."filesize-7.0.0" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" @@ -107824,10 +109281,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.661.0"; + version = "1.662.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.661.0.tgz"; - sha512 = "rsbvFX6ZGO+657CXO5VRSFpupULrjRBqy3YTlDnIuK8tXvRvDQj/hDtDqnUHzcJhUlC52hjTCGxmcXHysRnhsg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.662.0.tgz"; + sha512 = "sVSFIZ5cxhKoe2Gr3KD3LHKuTlCzVgA0KPa/2NhwyHFVQoSmoVirqntUt4V3taiEOFAk+F++cQ9jAcx2Qlc8nA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -107849,7 +109306,7 @@ in sources."semver-7.3.5" ]; }) - sources."@snyk/docker-registry-v2-client-2.2.2" + sources."@snyk/docker-registry-v2-client-2.2.4" sources."@snyk/fast-glob-3.2.6-patch" (sources."@snyk/fix-1.650.0" // { dependencies = [ @@ -109851,7 +111308,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.946.0" // { + (sources."aws-sdk-2.947.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -118208,10 +119665,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.4.0.tgz"; - sha512 = "IWGhkJ0QocFN+2R3M79ANIes4AwDWjmqmqZRN/yAOcy/eqUBeHPXHPSb7Pj7XCp3EiejihpIY/u7O00Qc25gOw=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.0.tgz"; + sha512 = "buPr+byINi11QWrnhaHO4adV2pYDkn9V80dI8SbEXkbFmYoopk3NdvstQz62lnPVUbKnJSAg7Abj93fdLIIG/w=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.2" @@ -118672,8 +120129,9 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-2.7.0" // { + (sources."@npmcli/arborist-2.7.1" // { dependencies = [ + sources."mkdirp-1.0.4" sources."semver-7.3.5" ]; }) @@ -119061,7 +120519,7 @@ in sources."lru-cache-6.0.0" sources."macos-release-2.5.0" sources."make-dir-1.3.0" - (sources."make-fetch-happen-9.0.3" // { + (sources."make-fetch-happen-9.0.4" // { dependencies = [ sources."http-cache-semantics-4.1.0" ]; @@ -119094,7 +120552,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66b25b7eeb4..8b6449ca57f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1323,6 +1323,8 @@ in inherit (nodePackages) bitwarden-cli; + inherit (nodePackages) hyperspace-cli; + bkyml = callPackage ../tools/misc/bkyml { }; blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; From 0bad36dfc95e55c98d42dbc5d261a8be1c7f3730 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 15 Jul 2021 21:18:43 +0200 Subject: [PATCH 113/129] kde.spectacle: format --- pkgs/applications/kde/spectacle.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index 67a027440cf..587877ad7a7 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -1,18 +1,13 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - ki18n, xcb-util-cursor, - kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins, - knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, - qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator +{ mkDerivation, lib +, extra-cmake-modules, kdoctools +, ki18n, xcb-util-cursor +, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins +, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi +, qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator }: mkDerivation { pname = "spectacle"; - meta = with lib; { - maintainers = with maintainers; [ ttuegel ]; - broken = versionOlder qtbase.version "5.15"; - }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications @@ -24,4 +19,8 @@ mkDerivation { --replace "Exec=@QtBinariesDir@/qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" ''; propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; + meta = with lib; { + maintainers = with maintainers; [ ttuegel ]; + broken = versionOlder qtbase.version "5.15"; + }; } From 56b1922df698508d0a001a3d4e123cfd49c9919d Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Thu, 15 Jul 2021 16:20:46 +0200 Subject: [PATCH 114/129] ocamlPackages.lwt-watcher: init at 0.1 --- .../ocaml-modules/lwt-watcher/default.nix | 30 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/ocaml-modules/lwt-watcher/default.nix diff --git a/pkgs/development/ocaml-modules/lwt-watcher/default.nix b/pkgs/development/ocaml-modules/lwt-watcher/default.nix new file mode 100644 index 00000000000..23caa894736 --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt-watcher/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitLab +, buildDunePackage +, lwt +}: + +buildDunePackage rec { + pname = "lwt-watcher"; + version = "0.1"; + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = pname; + rev = "v${version}"; + sha256 = "0kaf7py02i0dn9rvrbzxh4ljfg059wc8xvm093m9wy7lsa68rax9"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + lwt + ]; + + doCheck = true; + + meta = { + description = "One-to-many broadcast in Lwt"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 53dc64729e1..e5a792caf0f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -630,6 +630,8 @@ let lwt-dllist = callPackage ../development/ocaml-modules/lwt-dllist { }; + lwt-watcher = callPackage ../development/ocaml-modules/lwt-watcher { }; + lwt_log = callPackage ../development/ocaml-modules/lwt_log { }; lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { }; From e3e5a9178fc8f8be3c41d83cfa0a687a6dd277ac Mon Sep 17 00:00:00 2001 From: Danil <6057430gu@gmail.com> Date: Fri, 16 Jul 2021 02:36:32 +0700 Subject: [PATCH 115/129] afetch: init at 2.2.0 (#130197) --- pkgs/tools/misc/afetch/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/afetch/default.nix diff --git a/pkgs/tools/misc/afetch/default.nix b/pkgs/tools/misc/afetch/default.nix new file mode 100644 index 00000000000..aea2ff1ff2b --- /dev/null +++ b/pkgs/tools/misc/afetch/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "afetch"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "13-CF"; + repo = "afetch"; + rev = "V${version}"; + sha256 = "sha256-bHP3DJpgh89AaCX4c1tQGaZ/PiWjArED1rMdszFUq+U="; + }; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + description = "A fetch program written in C"; + homepage = "https://github.com/13-CF/afetch"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 jk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 958c3eb82a8..24c9308b5d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -808,6 +808,8 @@ in afew = callPackage ../applications/networking/mailreaders/afew { }; + afetch = callPackage ../tools/misc/afetch { }; + afio = callPackage ../tools/archivers/afio { }; afl = callPackage ../tools/security/afl { From 7d5b18c878223d8fef8897ad0d414d0df201dbb7 Mon Sep 17 00:00:00 2001 From: Scott Little <50145141+CodeLongAndProsper90@users.noreply.github.com> Date: Thu, 15 Jul 2021 15:01:46 -0500 Subject: [PATCH 116/129] Add twilight.nvim to vimPlugins (#130219) --- pkgs/misc/vim-plugins/generated.nix | 196 +++++++++++++------------ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 105 insertions(+), 92 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 704b064aa0a..a6fcc2fcde0 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-07-12"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "d098124e59ba38b0fcd97b41eec4a6de81bc09ab"; - sha256 = "1q524z5xaxshgwwfwbzgad7d6ni9f1ldk2f67chnywd0v8c6qr7f"; + rev = "d8f4e8b7081724c0b9ff2491dd68409b3da69b0f"; + sha256 = "0rwj9rhkzg004jv9q8wr86l9xak4wqf7l5skq1nf8k0xis9aw6d3"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-13"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "fca28c101eba19beffb9ce3018f1523f192adbfc"; - sha256 = "1fzlhjnr8yvzcy8r1sj54app0gfvjcawsg10kj213z4k69z9v7ri"; + rev = "835e9d292fd591388a063217c0691a964068f4db"; + sha256 = "0k2c7blh442qn6v9nwj29b79inwklcdpskmdgl9395v6k6m0977z"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1256,12 +1256,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-07-13"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "1b39ec8dde1e263570418cb65e0b6f63dce20ba0"; - sha256 = "0mybjvr4kmkcf0sqr7hwlwfg9s9bzvqqw3sn46aqclqqhliimj2v"; + rev = "49151bc9f7a52b02e5aac5eb76bbb80ba81e3726"; + sha256 = "02csaq7x99l5h175kyy0bwdb8kdq3caldj6gkpc7lx7zdc987pwn"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1474,12 +1474,12 @@ final: prev: falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2021-06-11"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "0893abf44cd6dda4d50e98c4ab1f9aea8e61d617"; - sha256 = "12fa2kwg2495qhs845g31a9iszlrry4jc19famgpjg1glgm9lkrm"; + rev = "0a67fda0cb7908a43ea4d3c7b8d3d413e305c2be"; + sha256 = "1yjdj6n74z34lq7aayxnngkvyrcpgii9mh92l50jyq22mbqng4hj"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -1631,12 +1631,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter-nvim"; - version = "2021-07-05"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "9866548f1c543ba90d7bb8a62c4fa939a5dcba46"; - sha256 = "04289wv1zw7r30x7whzf2s9gis7g3a7l8wswsxiwf55zvrqr95j7"; + rev = "a87e9727b6e994f33c9a147b426d58c36af1f358"; + sha256 = "1agqs6jzxznkma7nwmq5h52l4gzvabsrbkhj7c46svwqn7ndh3qq"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -1883,12 +1883,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; - version = "2021-07-06"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "npxbr"; repo = "glow.nvim"; - rev = "76e834e6c44ac176202a541cb46755303bdcc88d"; - sha256 = "0byzim4zl9hgr50qh8caq8d50xkjiplh1kp1jrpmfclzxwzzq3l3"; + rev = "3688c38b70eaa680a7100a53e2f12bcd367de225"; + sha256 = "18xkgwy3gfaq45wzixpr3ngskqqg0c2nziykvy323fimjvbvqxan"; }; meta.homepage = "https://github.com/npxbr/glow.nvim/"; }; @@ -2075,12 +2075,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-07-06"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "3c46b25e2a12544e52c23377c4a0c43ab920ad65"; - sha256 = "0sajb93635rxgv5v3bhbakbfpg958vsj8yaln7d91ab87zhbq1zj"; + rev = "9c849dac4b8efe6ad30aabec995dabfb5b251046"; + sha256 = "0z0ddrqhpirjdck9j0dmaxx0ra5hlcll0iawqb0078xg181bhnwh"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2724,12 +2724,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-06-30"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "3232af465ed86b9a188389e52ce3c47cd811c3f3"; - sha256 = "1qcvi8kklggzl4k88n6zhxb08hh2srhm9vvnfrknlz751pgd8z3x"; + rev = "d8fcb9a11c510e461ef61830721390c23438a4b2"; + sha256 = "1i7lal86npc39cccqdj4b7g6xfdr6dl08v8ka0j714n27carzw2g"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -2808,12 +2808,12 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-07-10"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "05356257ff2ecd340f01a1f09ebb86be3eccc003"; - sha256 = "1s6djj76mghbzqz0sydivfc1jhrwmqq64p4dcigji1jasm2z88fn"; + rev = "1db8e5588bfd2038efb690de5991746c8bf03543"; + sha256 = "00mpza33p3yybr3fgigx7gy8faj8f5ypdws9aymxs30a12p67d1q"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3132,12 +3132,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-07-12"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "90b1901774c11b86f3d36f7d17803125bfbe82b8"; - sha256 = "1fi4dajrhrsfj64bxz9vpd2ipsjnsx51sqc34qg0iw47qraw8yij"; + rev = "bf148e2534097988e61ed334edaf31b67134369b"; + sha256 = "157k4gbs0r92zwm41hh40gqxc9774g05ngan936ivnnfg5j9igsg"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3180,12 +3180,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-07-12"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "4b084b7bdbdec913ba2432c54eb0b5d72183c4ac"; - sha256 = "1fngbp7gvfqk0jidll36mvh0ixsrlsr0bh8g2fxy2x9v26zdpw61"; + rev = "ded36f5e87c943b75cc27406562cb591f6c250c6"; + sha256 = "1vkw0m2q3asv43jsmvcr72qmhj597ma3gfz9ahknl8gdq1nqpw3d"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; @@ -3288,12 +3288,12 @@ final: prev: nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-03-25"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "81f3eaba295b3fceb2d032db57e5eae99ae480f8"; - sha256 = "0zws0b20n8ak2s3hffsb0rrwdjh8sx3sgrilmmmvr0d2ivsfqwlb"; + rev = "de0e2edeac61039d8c9fb01a43b0305baad0a28b"; + sha256 = "1zg6085pp33la4jyqlq04f211jgznpmq8w4sr8aj1l6wql5imkj4"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -3444,12 +3444,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-07-11"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "6b10db9b39fbdb696dc354cc81b0102a04f36668"; - sha256 = "0pbpf3im0z13h6q4labp5qmlgg78pgfn3yba0dnsqkzmh2p66fav"; + rev = "e599e15f9400e6b587e3160d2dff83764cb4ab7d"; + sha256 = "08mn2z6q94x8fwic9r0vhzw0y93sm9ww6z458bd9hsxibfjsklgc"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3492,12 +3492,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-07-05"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "d66f0e45243a46fc3fd0d84ed7d54e37882207ba"; - sha256 = "0rwihzz2lcyza86bgmmvny685g1nlz23yagz5agdqjzibqz973xf"; + rev = "344564ab6a5e5417e899f15818f53c812dfea287"; + sha256 = "1gqi0s4cprxal0qmm3kl1q1iv7r3xnbbfy0yfh6sba080yiycnnf"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3528,12 +3528,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-07-13"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "a3e530ea915634afb43b21e621d45515f7bdff77"; - sha256 = "1dx95vnwz65d07irb3c6dy7nkalmfla501dwcyhyk3zygws50zaw"; + rev = "29879b29b63fcd315e247a110a505e6a337b584a"; + sha256 = "18ybvc2l07l91gkl3w63l58pm9q7bx2p0fmkyxpqb48cii98n4yj"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3552,12 +3552,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-07-11"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "55f2737dcfb2f0d846623ae3996cf141bb692fab"; - sha256 = "10g1qbknzh6b5nfh316976s2blqamivgi6gpwpydsdsnc59pshdz"; + rev = "344b6f0b581dd72e40bbbb78b4f147e5003e0ce6"; + sha256 = "1xdcdwjqk2r2cg47gxld2c06yfnbpj6nnm2j5nskqa3nbyrpf27c"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3660,12 +3660,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-13"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "bc7796a5fd8a9c0373413105f0fbd5ea44583538"; - sha256 = "0qz8pqbj9ijd1qp16fqr4q7fpdjb6j0574q8bsp3lg3x8355skzy"; + rev = "a7b5ffd7bdbf299fb296777311ec2b4c5e52450a"; + sha256 = "18yjh7w4jy3mx8vagqz8ygly07jib5yzymzdp6pjqgr72iwrc7f6"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3756,12 +3756,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-11"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "647268183f8eb164bf8c94ec1c87634f51f5c34a"; - sha256 = "1xf4px6vsxm623dvj7jgd0i73k1a9k5rq7jjz7azd0mv54dm5hbj"; + rev = "2b785889a4d0613465f72eccabd42468b345658d"; + sha256 = "1xnhdkp9x071s8rimqcmhipmwgl44p36anfscg7984jrgax861cm"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3820,8 +3820,8 @@ final: prev: src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "802a9d576d836531447f29423fe15abce19d82f7"; - sha256 = "19ww2r4jzmwp4pb2c78aj7jp8a93s25nmlxgzfgb7hpixg8q16p0"; + rev = "15e8a45517c596b9acd9406bcb6f650d6bfdb339"; + sha256 = "1m1bc5w1qw8cxjnhhanh7rw78d3zkdxm6vgldh22zhmvgj1cb7zl"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4068,12 +4068,12 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-07-11"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "d9a9b44e6de4d8b5326317432c91c7f6508269f7"; - sha256 = "10c1h1xs2s2wijhpil88fr5rhzibsg568960pqga24ms9rs2qy44"; + rev = "2715d35f27cbdfe6231e48212d12be383013f442"; + sha256 = "0z1vlsdmhlw6pbga9nypsihzjybglyr8is3maqbyqswrmz1yg87h"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -4417,12 +4417,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-07-07"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "0bf6e0986ddc5677a6ca60a59624e49234c368a5"; - sha256 = "0anvnb1szy2w5dsvnznkdcppmcn6sd2d1419ny0bv3hb4bg07jcy"; + rev = "d19be1409e0bd1fe8717a369e4782c141d63d5d4"; + sha256 = "1g3v2xmcdwipk247n2ph7s6dzkwbyhir5ssgjgixfmdx92kavv5m"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4501,12 +4501,12 @@ final: prev: semshi = buildVimPluginFrom2Nix { pname = "semshi"; - version = "2019-12-01"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "numirias"; repo = "semshi"; - rev = "801d0c971d3d7291cf2fc22d74ac69155a71a279"; - sha256 = "0adq1qxlxd53ps5byjvqmzk266f3wbvqmw74dkx6vd41zqw38wfx"; + rev = "39c7500032f35711aecb492affd989433b984f14"; + sha256 = "14hv67fhmq85m382grc6h07r5xs83mmx3j8nf94j60gwbybhlkdb"; }; meta.homepage = "https://github.com/numirias/semshi/"; }; @@ -4899,12 +4899,12 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2021-07-12"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "4c22054dffdd84811664cb6957b001a8617333ae"; - sha256 = "16r27kzpk4xww82x18m6m0hwbplsdw96vcmkyy9r6ndxq0hcblqi"; + rev = "e431d0425f4b132caef736ab682ba917edee30e9"; + sha256 = "17d5qa5y809sss4rk5gl75fxbh04nychjgpag6xjd8fzwd51xmzr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -5008,12 +5008,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency-nvim"; - version = "2021-04-17"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "721300e3d6f4a7157a781014d3d69bb1c7b702a3"; - sha256 = "1981lfk7xckvf2jmhnnrb58iwb1s3qzz84g52h4rvbjr7dbrr4xk"; + rev = "5173a42d4a306567a90c41fb90ee660a3274d34f"; + sha256 = "0baphixbfwq3fd3wcxf1fjgb7qwr7l0p6c8rpqf80msb0d7ikv77"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -5069,12 +5069,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-07-11"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "5692edd004fed1dbd55c90775c34a051298724e7"; - sha256 = "0mzgbnm9ic173spnm9w9da7yl79fqg6p7s1sv0w3d3m7qqvz0bpz"; + rev = "876bed9632d8da78761f3d8edd3c153478c0a13f"; + sha256 = "0dp32x9gpbs9hxp6akprak0f83wbmzsx1y6wwhc5dhgs3v23krh6"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5272,6 +5272,18 @@ final: prev: meta.homepage = "https://github.com/Quramy/tsuquyomi/"; }; + twilight-nvim = buildVimPluginFrom2Nix { + pname = "twilight-nvim"; + version = "2021-07-13"; + src = fetchFromGitHub { + owner = "folke"; + repo = "twilight.nvim"; + rev = "f5718ddbd9bba3184493a4fc11cd38342966904f"; + sha256 = "1j532h0imw782rvhg75ryqmy5lm0clg32fs3a1cm84srx97l05fp"; + }; + meta.homepage = "https://github.com/folke/twilight.nvim/"; + }; + typescript-vim = buildVimPluginFrom2Nix { pname = "typescript-vim"; version = "2020-12-08"; @@ -5658,12 +5670,12 @@ final: prev: vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2021-05-18"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "531bcc9e5a4cb1b1fb4dec8face230bf3d205ac7"; - sha256 = "05yapm3g9rj7k69dhlm7hspakbczwwlbx1lcdydvkx639ka7j09d"; + rev = "97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256"; + sha256 = "0cbxjb1q7xlxykzq4ab4n3ny768ysf97f7h7d9spfmw286j3c2wi"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -5886,12 +5898,12 @@ final: prev: vim-capslock = buildVimPluginFrom2Nix { pname = "vim-capslock"; - version = "2019-11-13"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-capslock"; - rev = "84c9e467a7b8e5aabf33674ed17c6356cf98777c"; - sha256 = "1c2fr8s9im3vxrszsrzm6wvad6disbdslmq6lqdp4603ialy4kja"; + rev = "a910e686986b239a7885e67ab6914638f88e914b"; + sha256 = "0aiqs4m5vfc22lcjkb2iphpb2qi7bz994lbjr2frsb8g8h508h18"; }; meta.homepage = "https://github.com/tpope/vim-capslock/"; }; @@ -6654,12 +6666,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-07-10"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "f1bace622bcb0e81c5aa41fc663de5c0c34d54f4"; - sha256 = "0f8dzv3rdlzmcmd5j71rsvqa95dznc56kj2k9ynakn28lcvpjvyc"; + rev = "daf9389e827dd19d804ffaad19cc8b64e389da6c"; + sha256 = "0kcjfi61md9n0fgnypamvqsc9k4mykr9wx978qna2xjb19vfkvad"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -7761,12 +7773,12 @@ final: prev: vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2021-07-09"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "b662ebc5fb5f995d8565aa3f2cb5c48fa018bbd7"; - sha256 = "0l2a5cl6j1bmxc536893dfy7dcgrmzb70lh4wj1bd4nms409wrqx"; + rev = "8b4bccebf7a16938c77073983d643ba22aa04079"; + sha256 = "11livwi2pvnrxj7mildh46a6rli6hibpbffc9a5q6vxkvn9s6v29"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -9598,12 +9610,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-07-04"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "da39c4955c2ad0ffa28f5cba81651b568697629c"; - sha256 = "02c7kxfalp52k2ij5r6hjnvqd2azkhx9sglqr85bc53rvh1rgi7y"; + rev = "9c806d2a014a21ef4bce49a18791d04e1a66bdf7"; + sha256 = "0imqzcdw28d5nmv2837x1m07pmir1yh9zbf52nsnvibw09z26kg8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -9611,12 +9623,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-07-12"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "a064c48ade2a4df3d010e02b2d528fc2534a62eb"; - sha256 = "03za8pwaqi2bhkq9zgial6fpipkbij530f54alaqc8mrd6nydz90"; + rev = "a77ae61c332f2ce8f07b69be036edd6858446d2b"; + sha256 = "194x8m1zpmpkyw33468yqlmval3wf7s0hhpr53dnnviza6dbaifa"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8dc6f9aa993..3ed642d76e8 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -152,6 +152,7 @@ folke/lsp-colors.nvim@main folke/todo-comments.nvim@main folke/tokyonight.nvim@main folke/trouble.nvim@main +folke/twilight.nvim@main folke/which-key.nvim@main freitass/todo.txt-vim frigoeu/psc-ide-vim From bf9ecde815f448669f62b09b3ece7c106b5d4f8d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Jul 2021 22:10:31 +0200 Subject: [PATCH 117/129] python3Packages.pyavm: 0.9.4 -> 0.9.5 (#130230) Co-authored-by: Sandro --- .../python-modules/pyavm/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pyavm/default.nix b/pkgs/development/python-modules/pyavm/default.nix index 4535767a69c..c5127be1a87 100644 --- a/pkgs/development/python-modules/pyavm/default.nix +++ b/pkgs/development/python-modules/pyavm/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook , astropy , astropy-helpers , pillow @@ -9,29 +9,35 @@ buildPythonPackage rec { pname = "pyavm"; - version = "0.9.4"; + version = "0.9.5"; src = fetchPypi { pname = "PyAVM"; inherit version; - sha256 = "f298b864e5bc101ecbb0e46252e95e18a180ac28ba6ec362e63c12a7e914e386"; + sha256 = "sha256-gV78ypvYwohHmdjP3lN5F97PfmxuV91tvw5gsYeZ7i8="; }; - propagatedBuildInputs = [ astropy-helpers ]; + propagatedBuildInputs = [ + astropy-helpers + ]; - checkInputs = [ pytest astropy pillow ]; - - checkPhase = "pytest"; + checkInputs = [ + astropy + pillow + pytestCheckHook + ]; # Disable automatic update of the astropy-helper module postPatch = '' substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" ''; + pythonImportsCheck = [ "pyavm" ]; + meta = with lib; { description = "Simple pure-python AVM meta-data handling"; - homepage = "http://astrofrog.github.io/pyavm/"; + homepage = "https://astrofrog.github.io/pyavm/"; license = licenses.mit; - maintainers = [ maintainers.smaret ]; + maintainers = with maintainers; [ smaret ]; }; } From dadf56e3a6835f2cc8047e4ae8569b0343d53892 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Jul 2021 22:13:34 +0200 Subject: [PATCH 118/129] python3Packages.pyhocon: 0.3.53 -> 0.3.58 (#130158) Co-authored-by: Sandro --- .../python-modules/pyhocon/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index 487f7ca66f3..f69a21115f2 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -1,38 +1,39 @@ { lib , buildPythonPackage , fetchFromGitHub -# Runtime inputs: -, pyparsing -# Check inputs: -, pytest , mock +, pyparsing +, pytestCheckHook +, python-dateutil }: buildPythonPackage rec { pname = "pyhocon"; - version = "0.3.53"; + version = "0.3.58"; src = fetchFromGitHub { owner = "chimpler"; repo = "pyhocon"; rev = version; - sha256 = "1lr56piiasnq1aiwli8ldw2wc3xjfck8az991mr5rdbqqsrh9vkv"; + sha256 = "sha256-ddspVDKy9++cISWH6R95r+gJrzNGqMTybI04OgVtIUU="; }; - propagatedBuildInputs = [ pyparsing ]; + propagatedBuildInputs = [ + pyparsing + python-dateutil + ]; - checkInputs = [ pytest mock ]; + checkInputs = [ + mock + pytestCheckHook + ]; - # Tests fail because necessary data files aren't packaged for PyPi yet. - # See https://github.com/chimpler/pyhocon/pull/203 - doCheck = false; + pythonImportsCheck = [ "pyhocon" ]; meta = with lib; { homepage = "https://github.com/chimpler/pyhocon/"; description = "HOCON parser for Python"; - # Long description copied from - # https://github.com/chimpler/pyhocon/blob/55a9ea3ebeeac5764bdebebfbeacbf099f64db26/setup.py - # (the tip of master as of 2019-03-24). + # taken from https://pypi.org/project/pyhocon/ longDescription = '' A HOCON parser for Python. It additionally provides a tool (pyhocon) to convert any HOCON content into json, yaml and properties From 8e170dc44a9d782c6991c7f9386187be3d5ffbbc Mon Sep 17 00:00:00 2001 From: Moritz Hedtke <13287984+mohe2015@users.noreply.github.com> Date: Thu, 15 Jul 2021 22:14:41 +0200 Subject: [PATCH 119/129] discord: fix updater script (#128633) Co-authored-by: Sandro --- .../instant-messengers/discord/base.nix | 11 +++++- .../instant-messengers/discord/default.nix | 4 +-- .../discord/update-discord.sh | 36 ------------------- 3 files changed, 12 insertions(+), 39 deletions(-) delete mode 100755 pkgs/applications/networking/instant-messengers/discord/update-discord.sh diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index a8b2b02f0bf..2d67236c90e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -5,6 +5,7 @@ , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence , mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu +, writeScript, common-updater-scripts }: let @@ -71,7 +72,15 @@ in stdenv.mkDerivation rec { mimeType = "x-scheme-handler/discord"; }; - passthru.updateScript = ./update-discord.sh; + passthru.updateScript = writeScript "discord-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnugrep common-updater-scripts + set -eou pipefail; + url=$(curl -sI "https://discordapp.com/api/download/${builtins.replaceStrings ["discord-" "discord"] ["" "stable"] pname}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') + version=''${url##https://dl*.discordapp.net/apps/linux/} + version=''${version%%/*.tar.gz} + update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix + ''; meta = with lib; { description = "All-in-one cross-platform voice and text chat for gamers"; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index f7435aa3ae3..d2d8c9a3ec5 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.125"; + version = "0.0.126"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0ly5a6l7rvl54mc39xma14jrcrf11q3ndnkkr16by5hy3palmz9g"; + sha256 = "EraTDRKd6t0c9U68tSRdGkeB1hfqNS4KUewEXwkL8io="; }; }; }.${branch} diff --git a/pkgs/applications/networking/instant-messengers/discord/update-discord.sh b/pkgs/applications/networking/instant-messengers/discord/update-discord.sh deleted file mode 100755 index 34c1574c65a..00000000000 --- a/pkgs/applications/networking/instant-messengers/discord/update-discord.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash -# script to generate ./default.nix - -set -e -exec >"${BASH_SOURCE%/*}/default.nix" - -cat < Date: Thu, 15 Jul 2021 13:28:11 -0700 Subject: [PATCH 120/129] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 104 ++++++++++++++-------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index a6fcc2fcde0..dfc5f19de1d 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -221,12 +221,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-07-08"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "e40bd7e5d08818380b244916c9dbd6bc9c5657a2"; - sha256 = "03qb5ziwpd1x1jwvwsdipindlc0izwlmgnhinxyabhb17shsay7r"; + rev = "f5e5dda7587db72b074edbc3b573d52df639f9a5"; + sha256 = "1ddr28v44llmfsdf2l3ybgwijhv49dddghdk396nk0sw883a3hs8"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-14"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "835e9d292fd591388a063217c0691a964068f4db"; - sha256 = "0k2c7blh442qn6v9nwj29b79inwklcdpskmdgl9395v6k6m0977z"; + rev = "8ed122e474a0316f8b967bb6c35a47e8dd383453"; + sha256 = "0zk12wd1xs668j3wfdd5vyj685irnjsksrmn2dln6vsyb7xpq3r5"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -557,12 +557,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-07-09"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "acc2b95be6652d79f86d586e52c7566557608476"; - sha256 = "1cp6sqvy3xwssr6dn7nzbxb4a2jpskqdbivpaf7984zd2sx8sqrq"; + rev = "3c3f118f8d48707f1890c2c212c083228aeac596"; + sha256 = "0nim2hd0pn910ymm87zwfcw5b7x64h3dsnqhc20yj0r3s5xjg6qi"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -966,12 +966,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-07-13"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "0cd4c51246206c9c1e893dd4418e35d17ed67d52"; - sha256 = "1wqmm96waqm11vkin5xzklvmr9z9j3iajvk1bmk9zxdffng6b2hv"; + rev = "6ccd2d35581f5c497b2fe3e6a9ecbbb494210d6e"; + sha256 = "0fg8gv38xvsv7y739m1wix5a384zjn0hqnmkqiz244jxii1l0p8y"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1631,12 +1631,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter-nvim"; - version = "2021-07-14"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "a87e9727b6e994f33c9a147b426d58c36af1f358"; - sha256 = "1agqs6jzxznkma7nwmq5h52l4gzvabsrbkhj7c46svwqn7ndh3qq"; + rev = "9efa18bc9552a8b2a00644f79d41f279be322e45"; + sha256 = "0hfq580ng3wlzkc9g44pz1ciwa9ax46ylka3s3y4v79szhviykby"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -1823,12 +1823,12 @@ final: prev: git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree-nvim"; - version = "2021-05-27"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "b036b2f8a0f9cd973ab25292460e0c7b323616ef"; - sha256 = "1mn2pwcp482p7rrg0jk8i2g9pql58yqylzpp31308ssw32j8f9fj"; + rev = "97adf37032c213201c823e98b0555f7279525d62"; + sha256 = "0vca7pyipch3y3g19sfwqx33l8jh3h7r9wv3hlfw960iyqc2xia7"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -2424,12 +2424,12 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit-nvim"; - version = "2021-07-13"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "d3f6a7f629931880df3c86ef5d123db1eed9c26a"; - sha256 = "0z9zsl56ikrk7y9njflj9la2wr5iaxbqp73xay69flgkycsnbpy7"; + rev = "3dc36a82276d4ff88badadf3dfdcc34b57d0e0fd"; + sha256 = "18sl35wi7zq2y4y4bny5pz160m584c8mli1b6vjvr84gvjmyg7sv"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; @@ -2724,12 +2724,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-07-14"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "d8fcb9a11c510e461ef61830721390c23438a4b2"; - sha256 = "1i7lal86npc39cccqdj4b7g6xfdr6dl08v8ka0j714n27carzw2g"; + rev = "a787bcd1d9afb2bd6bab13834c5b28e727f266c0"; + sha256 = "12i4bvgm26sfvdanjjwz1572nfnyax1i2bwawfkz2ab34xlwcr0y"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3180,12 +3180,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-07-13"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "ded36f5e87c943b75cc27406562cb591f6c250c6"; - sha256 = "1vkw0m2q3asv43jsmvcr72qmhj597ma3gfz9ahknl8gdq1nqpw3d"; + rev = "4a6eb9d52d544d378c82f17c448eb9c697cf448c"; + sha256 = "14hsyy23xb5p8lfna3kiarr0na1n1bykr8scwslczhpi9fwcgq85"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; @@ -3288,12 +3288,12 @@ final: prev: nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-07-13"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "de0e2edeac61039d8c9fb01a43b0305baad0a28b"; - sha256 = "1zg6085pp33la4jyqlq04f211jgznpmq8w4sr8aj1l6wql5imkj4"; + rev = "2c14ed0e153cdcd0a1c7d1eabec6820bb6b3f8a2"; + sha256 = "0gny5xw4knvjlkgazygpkwy8fk2x8igh45f980ypjghfkiw8h5f8"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -3492,12 +3492,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-07-14"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "344564ab6a5e5417e899f15818f53c812dfea287"; - sha256 = "1gqi0s4cprxal0qmm3kl1q1iv7r3xnbbfy0yfh6sba080yiycnnf"; + rev = "cebafb95622205a414a6c10bf0e40d197cc652b1"; + sha256 = "1qd8gaigkyhkz5nrizc3jhwa69v4fcymd2446l0s24pv3kxc2an3"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3660,12 +3660,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-14"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "a7b5ffd7bdbf299fb296777311ec2b4c5e52450a"; - sha256 = "18yjh7w4jy3mx8vagqz8ygly07jib5yzymzdp6pjqgr72iwrc7f6"; + rev = "9d49032a64d8a275123ad7f84e9c699d279307fe"; + sha256 = "18z22v8qn6jhg16hsrldqaqqp987w1nnqz0lhn0byzbsac62xwga"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3760,8 +3760,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "2b785889a4d0613465f72eccabd42468b345658d"; - sha256 = "1xnhdkp9x071s8rimqcmhipmwgl44p36anfscg7984jrgax861cm"; + rev = "d779ee79f0426711f84b770bf6ff4afda4f41c1e"; + sha256 = "0svnb4fsqsjhlqcikq0kgrwyrqfqplgvx93mhw1qhpmwfbgqn6vi"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3972,12 +3972,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-07-13"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "3a48ecad19a111b629cc5c5afa62d0513e440dc6"; - sha256 = "1ngm3c5piivxzsx05p1bzyac9rlsy050qzlwq1zvc15zz70gfkk0"; + rev = "d693133efb4a1f171d581dad8d399d6a3cd4b90a"; + sha256 = "1avcdfsq14nqbqrvlgz7cslaxi1ni5lsvz78dj5xc35ppgwyr1ci"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4417,12 +4417,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-07-13"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "d19be1409e0bd1fe8717a369e4782c141d63d5d4"; - sha256 = "1g3v2xmcdwipk247n2ph7s6dzkwbyhir5ssgjgixfmdx92kavv5m"; + rev = "da8fb66af44fe2472b58fbf0b83ad4fe2243aaea"; + sha256 = "0mkjb42ff0w80kbik6hwdx1hvhxlihq17fqypdagmxk58wn71z9y"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4561,12 +4561,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-06-24"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "8703f642db4e545525e6fb10e97c843c74c61964"; - sha256 = "1rmrxr53i7vmwh7wrrbcb24jyrqrph6bqr2bifhhgwy1kxx04gvg"; + rev = "960afef88aef374d3525e1536bdd505727b42d67"; + sha256 = "08yj3p31d5gnd3qyv6dcpz87s3kwz1kgcb5h92w83wf64r6fzq61"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -5073,8 +5073,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "876bed9632d8da78761f3d8edd3c153478c0a13f"; - sha256 = "0dp32x9gpbs9hxp6akprak0f83wbmzsx1y6wwhc5dhgs3v23krh6"; + rev = "37a3a68a78e15900254ae5d9d4f9f0b5100a1735"; + sha256 = "1a5hsjsz62nb5hlrd0k8wbcnyxa3574jgipphs9s2llf6qfwkfh1"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9623,12 +9623,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-07-14"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "a77ae61c332f2ce8f07b69be036edd6858446d2b"; - sha256 = "194x8m1zpmpkyw33468yqlmval3wf7s0hhpr53dnnviza6dbaifa"; + rev = "431f520553bfe721d1ef5db0bb23ec03a86c00a0"; + sha256 = "1a9j27404hi8s3v7h9kghl7xwgmcblbranlp6kclvvrl7wahvnhg"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From 6106af0894c8e83d4df6f4d7c326485036629e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 15 Jul 2021 22:30:19 +0200 Subject: [PATCH 121/129] python3Packages.gruut-ipa: 0.9.2 -> 0.9.3 --- pkgs/development/python-modules/gruut-ipa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix index 67930bcd034..50140ef8308 100644 --- a/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/pkgs/development/python-modules/gruut-ipa/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "gruut-ipa"; - version = "0.9.2"; + version = "0.9.3"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; - rev = "df74f7dff562d868ad8088b7251f9e7206271d37"; - sha256 = "0b2znvjngffxc0mlmqmcai8l22ff09kc39bj6f0lkjw735vclnzh"; + rev = "v${version}"; + sha256 = "sha256-d/AbvgAD3GHXpwhqjT5Xt9q7Kix+eFMX4kW2BywZWX0="; }; postPatch = '' From 153eff12fb6c719d45bc83d6364a4c591c9a9339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 15 Jul 2021 22:33:03 +0200 Subject: [PATCH 122/129] python3Packages.gruut: 1.2.0 -> 1.2.3 --- pkgs/development/python-modules/gruut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index c922d0b52d4..75d0c365e61 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -28,14 +28,14 @@ let in buildPythonPackage rec { pname = "gruut"; - version = "1.2.0"; + version = "1.2.3"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; rev = "v${version}"; - sha256 = "1763qmcd1gxap27jppqaywx03k5cagcl62z2p2qdiqigdksplm2g"; + sha256 = "sha256-qY4xsoVk1hyY9dYmVXaqDRjcShUQmp8VZOzAQNiC6EM="; }; postPatch = '' From e435736deeb23d9c03ed72cc47218948fa986a2d Mon Sep 17 00:00:00 2001 From: Joshua Campbell Date: Mon, 12 Jul 2021 23:15:40 -0700 Subject: [PATCH 123/129] func: init at 3.0.3568 --- .../azure-functions-core-tools/default.nix | 74 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/tools/azure-functions-core-tools/default.nix diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix new file mode 100644 index 00000000000..9396821f8c6 --- /dev/null +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, lib +, config +, fetchurl +, unzip +, makeWrapper +, icu +, libunwind +, curl +, zlib +, libuuid +, dotnetbuildhelpers +, dotnetCorePackages +, coreclr +, openssl +}: + +stdenv.mkDerivation rec { + pname = "azure-functions-core-tools"; + version = "3.0.3568"; + + src = fetchurl { + url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.linux-x64.${version}.zip"; + sha256 = "0yxdqc5d1xsixjj2dlvs32d6fz4vh58ih2l00lc456fg15mfw3lg"; + }; + + buildInputs = [ + unzip + makeWrapper + dotnetbuildhelpers + ]; + + nativeBuildInputs = [ + icu + libunwind + curl + zlib + dotnetCorePackages.sdk_3_1 + ]; + + libPath = lib.makeLibraryPath [ + libunwind + libuuid + stdenv.cc.cc + curl + zlib + icu + openssl + ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/bin + cp -prd * $out/bin + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" "$out/bin/func" + chmod +x $out/bin/func $out/bin/gozip + find $out/bin -type f -name "*.so" -exec patchelf --set-rpath "${libPath}" {} \; + wrapProgram "$out/bin/func" --prefix LD_LIBRARY_PATH : ${libPath} + ''; + dontStrip = true; # Causes rpath patching to break if not set + + meta = with lib; { + homepage = "https://github.com/Azure/azure-functions-core-tools"; + description = "Command line tools for Azure Functions"; + license = licenses.mit; + maintainers = with maintainers; [ jshcmpbll ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 178b989b24e..899ebb4b942 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1239,6 +1239,8 @@ in azure-cli = callPackage ../tools/admin/azure-cli { }; + azure-functions-core-tools = callPackage ../development/tools/azure-functions-core-tools { }; + azure-storage-azcopy = callPackage ../development/tools/azcopy { }; azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; From c9cfa6599cd775b5b1a0d9e5a7aa803bf80bb6b2 Mon Sep 17 00:00:00 2001 From: boppyt <71049646+boppyt@users.noreply.github.com> Date: Thu, 15 Jul 2021 14:42:00 -0700 Subject: [PATCH 124/129] osu-lazer: 2021.703.0 -> 2021.707.0 (#130283) * osu-lazer: 2021.703.0 -> 2021.707.0-lazer * Update pkgs/games/osu-lazer/default.nix Co-authored-by: oxalica Co-authored-by: oxalica --- pkgs/games/osu-lazer/default.nix | 4 ++-- pkgs/games/osu-lazer/deps.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 4209311154d..d4ae6046f1c 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.703.0"; + version = "2021.707.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "52wGjNVCh1dyPgDfKnsfPcCI1Jh1R70zRUs/jNyaBI8="; + sha256 = "UdsN/kvpqZrOiigxGttwrExlOkEFa2xWqDQS/d7y/0k="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index f6da6d5c140..4684d79d95c 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -781,13 +781,13 @@ }) (fetchNuGet { name = "ppy.LocalisationAnalyser"; - version = "2021.614.0"; - sha256 = "0b3b72lvjz8lfh0n5rilmf91j0phgmy1jjnw0v6l7qral72lhd4y"; + version = "2021.706.0"; + sha256 = "087x61vi1rv1slzr8hhcslngdd41p2d5r8yhpqm1kmls24csv556"; }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.702.0"; - sha256 = "16lx73gikjl2bmndqh3vizfn1whjvvq2iwy8sll3yqwb20bg7kaa"; + version = "2021.707.0"; + sha256 = "1ai8yam6v67y9z8yipqjn578bk2qzqm05ncyqfgig3in6baxwpna"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -796,8 +796,8 @@ }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2021.701.0"; - sha256 = "0ii5ki983vxjq0iq28nzb9xqkmg8iscwj77hcnpf14cj7xiyg454"; + version = "2021.706.0"; + sha256 = "1yacqy8h93vph3faf4y0iwhlnlmbny3zj57cm2bh04z2gk0l17am"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; From 2efc69ebaf766b0f8a3877b5401c5d6d40da367b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20Donk=C3=B3?= Date: Fri, 16 Jul 2021 00:04:11 +0200 Subject: [PATCH 125/129] bitwig-studio4: add version 4 (#130262) Co-authored-by: Sandro --- .../audio/bitwig-studio/bitwig-studio4.nix | 75 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix new file mode 100644 index 00000000000..b6dea53012d --- /dev/null +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchurl, alsa-lib, cairo, dpkg, freetype +, gdk-pixbuf, glib, gtk3, lib, xorg +, libglvnd, libjack2, ffmpeg +, libxkbcommon, xdg-utils, zlib, pulseaudio +, wrapGAppsHook, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "bitwig-studio"; + version = "4.0"; + + src = fetchurl { + url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; + sha256 = "38381c1a382abd9543931f34d5ae1789c31ec1217a1c852b5c5c442ccaf97063"; + }; + + nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; + + unpackCmd = '' + mkdir -p root + dpkg-deb -x $curSrc root + ''; + + dontBuild = true; + dontWrapGApps = true; # we only want $gappsWrapperArgs here + + buildInputs = with xorg; [ + alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r opt/bitwig-studio $out/libexec + ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio + cp -r usr/share $out/share + substitute usr/share/applications/com.bitwig.BitwigStudio.desktop \ + $out/share/applications/com.bitwig.BitwigStudio.desktop \ + --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio + + runHook postInstall + ''; + + postFixup = '' + # patchelf fails to set rpath on BitwigStudioEngine, so we use + # the LD_LIBRARY_PATH way + + find $out -type f -executable \ + -not -name '*.so.*' \ + -not -name '*.so' \ + -not -name '*.jar' \ + -not -path '*/resources/*' | \ + while IFS= read -r f ; do + patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f + wrapProgram $f \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : "${lib.makeBinPath [ xdg-utils ffmpeg ]}" \ + --suffix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath buildInputs}" + done + + ''; + + meta = with lib; { + description = "A digital audio workstation"; + longDescription = '' + Bitwig Studio is a multi-platform music-creation system for + production, performance and DJing, with a focus on flexible + editing tools and a super-fast workflow. + ''; + homepage = "https://www.bitwig.com/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ bfortz michalrus mrVanDalo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6263f99c137..134d2693560 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23193,8 +23193,9 @@ in inherit (pkgs) bitwig-studio1; }; bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { }; + bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { }; - bitwig-studio = bitwig-studio3; + bitwig-studio = bitwig-studio4; bgpdump = callPackage ../tools/networking/bgpdump { }; From 0c98c6bbc43daa8af7554a3efe1983c0c096d979 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 15 Jul 2021 16:04:43 -0600 Subject: [PATCH 126/129] git-sync: unstable-2015-10-24 -> unstable-2021-07-14 (#130306) Co-authored-by: Sandro --- .../git-and-tools/git-sync/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index add7bfc5526..15d0fe9bc0f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git -}: +{ lib, stdenv, fetchFromGitHub, coreutils, git, gnugrep, gnused, makeWrapper, inotify-tools }: stdenv.mkDerivation rec { pname = "git-sync"; - version = "20151024"; + version = "unstable-2021-07-14"; src = fetchFromGitHub { owner = "simonthum"; repo = "git-sync"; - rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7"; - sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz"; + rev = "7d3d34bf3ee2483fba00948f5b97f964b849a590"; + sha256 = "sha256-PuYREW5NBkYF1tlcLTbOI8570nvHn5ifN8OIInfNNxI="; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,10 +17,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -a git-sync $out/bin/git-sync + cp -a git-* $out/bin/ ''; wrapperPath = with lib; makeBinPath [ + inotify-tools coreutils git gnugrep From bc7fa146a209bac15a571b0b8067aac1a2128cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Jul 2021 00:11:37 +0200 Subject: [PATCH 127/129] node-packages: remove libusb usage --- pkgs/development/node-packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index c5524b82077..daa97bfddde 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -308,7 +308,7 @@ let }; teck-programmer = super.teck-programmer.override { - buildInputs = [ pkgs.libusb ]; + buildInputs = [ pkgs.libusb1 ]; }; vega-cli = super.vega-cli.override { From 6d1dd6af0420953ab628df75fa8cefb471af7a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Jul 2021 00:13:16 +0200 Subject: [PATCH 128/129] monero: cleanup --- pkgs/applications/blockchains/monero/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 2a12bfe872b..7dd2e569021 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -4,17 +4,9 @@ , zeromq, pcsclite, readline, libsodium, hidapi , randomx, rapidjson , CoreData, IOKit, PCSC -, trezorSupport ? true -, libusb1 ? null -, protobuf ? null -, python3 ? null +, trezorSupport ? true, libusb1, protobuf, python3 }: -with lib; - -assert stdenv.isDarwin -> IOKit != null; -assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; - stdenv.mkDerivation rec { pname = "monero"; version = "0.17.2.0"; @@ -45,8 +37,8 @@ stdenv.mkDerivation rec { zeromq pcsclite readline libsodium hidapi randomx rapidjson protobuf - ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ] - ++ optionals trezorSupport [ libusb1 protobuf python3 ]; + ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ] + ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" @@ -54,7 +46,7 @@ stdenv.mkDerivation rec { "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" "-DRandomX_ROOT_DIR=${randomx}" - ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; + ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; outputs = [ "out" "source" ]; From 3d3d8a10ae890f38ddf35f3a190251b4d932fd00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Jul 2021 01:27:26 +0200 Subject: [PATCH 129/129] monero-gui: cleanup --- .../blockchains/monero-gui/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 59e09939e80..d7a27dd4bcc 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -9,14 +9,9 @@ , boost, libunwind, libsodium, pcsclite , randomx, zeromq, libgcrypt, libgpgerror , hidapi, rapidjson, quirc -, trezorSupport ? true -, libusb1 -, protobuf -, python3 +, trezorSupport ? true, libusb1, protobuf, python3 }: -with lib; - stdenv.mkDerivation rec { pname = "monero-gui"; version = "0.17.2.2"; @@ -30,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook - (getDev qttools) + (lib.getDev qttools) ]; buildInputs = [ @@ -41,8 +36,8 @@ stdenv.mkDerivation rec { randomx libgcrypt libgpgerror boost libunwind libsodium pcsclite zeromq hidapi rapidjson quirc - ] ++ optionals trezorSupport [ libusb1 protobuf python3 ] - ++ optionals stdenv.isDarwin [ qtmacextras ]; + ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ] + ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; postUnpack = '' # copy monero sources here @@ -98,7 +93,7 @@ stdenv.mkDerivation rec { done; ''; - meta = { + meta = with lib; { description = "Private, secure, untraceable currency"; homepage = "https://getmonero.org/"; license = licenses.bsd3;